diff --git a/.cargo/config b/.cargo/config
index f6764a55b4..056307787e 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,3 +1,3 @@
 [target.wasm32-unknown-unknown]
-runner = 'wasm-bindgen-test-runner-0.2.78'
+runner = 'wasm-bindgen-test-runner'
 rustflags = ["--cfg=web_sys_unstable_apis"]
diff --git a/.dockerignore b/.dockerignore
index 0e3ba081bc..09656908a3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,7 +5,7 @@ cmake-build-debug
 /Dockerfile
 
 /target
-!/target/release/mm2
+!/target/ci/mm2
 /mm2src/*/target
 
 /build
diff --git a/.github/workflows/virustotal_scan.yml b/.github/workflows/virustotal_scan.yml
new file mode 100644
index 0000000000..551990ddc0
--- /dev/null
+++ b/.github/workflows/virustotal_scan.yml
@@ -0,0 +1,18 @@
+name: VirusTotal Scan
+
+on:
+  release:
+    types: [created, edited, released, published]
+
+jobs:
+  virustotal:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: VirusTotal Scan
+        uses: crazy-max/ghaction-virustotal@v3
+        with:
+          vt_api_key: ${{ secrets.VT_API_KEY }}
+          update_release_body: true
+          files: |
+            .zip$
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc6a24afa1..645223074e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,5 +49,5 @@ and we use [rustfmt](https://github.com/rust-lang/rustfmt) to make our code clea
 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
+    WASM_BINDGEN_TEST_TIMEOUT=180 GECKODRIVER=PATH_TO_GECKO_DRIVER_BIN wasm-pack test --firefox --headless mm2src/mm2_main
     ```
diff --git a/Cargo.lock b/Cargo.lock
index a80490ac72..e7fae16a35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.12.2"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c"
+checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
  "gimli",
 ]
@@ -28,10 +28,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10"
 
 [[package]]
-name = "adler32"
-version = "1.1.0"
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
@@ -131,6 +131,15 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -158,15 +167,6 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.5.1"
@@ -210,7 +210,7 @@ dependencies = [
  "once_cell",
  "pin-project-lite 0.1.12",
  "pin-utils",
- "slab 0.4.2",
+ "slab",
  "smol",
  "wasm-bindgen-futures",
 ]
@@ -268,11 +268,11 @@ dependencies = [
 
 [[package]]
 name = "atomic-shim"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20fdac7156779a1a30d970e838195558b4810dd06aa69e7c7461bdc518edf9b"
+checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77"
 dependencies = [
- "crossbeam",
+ "crossbeam-utils 0.8.8",
 ]
 
 [[package]]
@@ -322,15 +322,15 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.5.6"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2504b827a8bef941ba3dd64bdffe9cf56ca182908a147edd6189c95fbcae7d"
+checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -338,13 +338,13 @@ dependencies = [
  "bytes 1.1.0",
  "futures-util",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "hyper",
  "itoa 1.0.1",
  "matchit",
  "memchr",
  "mime",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "pin-project-lite 0.2.9",
  "serde",
  "sync_wrapper",
@@ -357,28 +357,31 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.2.4"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17"
+checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
 dependencies = [
  "async-trait",
  "bytes 1.1.0",
  "futures-util",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "mime",
+ "tower-layer",
+ "tower-service",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.49"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c"
+checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
 dependencies = [
  "addr2line",
- "cfg-if 0.1.10",
+ "cc",
+ "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.3.7",
+ "miniz_oxide 0.5.4",
  "object",
  "rustc-demangle",
 ]
@@ -434,6 +437,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
+[[package]]
+name = "base64ct"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851"
+
 [[package]]
 name = "bech32"
 version = "0.8.1"
@@ -491,7 +500,7 @@ dependencies = [
  "hkd32",
  "hmac 0.11.0",
  "ripemd160",
- "secp256k1",
+ "secp256k1 0.20.3",
  "sha2 0.9.9",
  "subtle 2.4.0",
  "zeroize",
@@ -499,14 +508,13 @@ dependencies = [
 
 [[package]]
 name = "bitcoin"
-version = "0.27.1"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d"
+checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a"
 dependencies = [
  "bech32",
  "bitcoin_hashes",
- "bitcoinconsensus",
- "secp256k1",
+ "secp256k1 0.22.1",
 ]
 
 [[package]]
@@ -515,16 +523,6 @@ 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 = "1a8aa43b5cd02f856cb126a9af819e77b8910fdd74dd1407be649f2f5fe3a1b5"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "bitcrypto"
 version = "0.1.0"
@@ -535,7 +533,7 @@ dependencies = [
  "serialization",
  "sha-1",
  "sha2 0.9.9",
- "sha3",
+ "sha3 0.9.1",
  "siphasher",
 ]
 
@@ -545,15 +543,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitmaps"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "bitvec"
 version = "0.18.5"
@@ -773,9 +762,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.4.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "bv"
@@ -855,9 +844,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
 
 [[package]]
 name = "bzip2"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
 dependencies = [
  "bzip2-sys",
  "libc",
@@ -944,23 +933,25 @@ dependencies = [
  "bitcoin",
  "bitcrypto",
  "primitives",
- "rustc-hex 2.1.0",
+ "rustc-hex",
  "serialization",
  "serialization_derive",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.11"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
+ "iana-time-zone",
  "js-sys",
  "num-integer",
  "num-traits",
  "serde",
  "time 0.1.43",
  "wasm-bindgen",
+ "winapi",
 ]
 
 [[package]]
@@ -1023,6 +1014,16 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "coins"
 version = "0.1.0"
@@ -1041,6 +1042,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "chain",
  "common",
+ "cosmrs",
  "crossbeam",
  "crypto",
  "db_common",
@@ -1048,18 +1050,22 @@ dependencies = [
  "dirs",
  "ed25519-dalek",
  "ed25519-dalek-bip32 0.2.0",
+ "enum_from",
  "ethabi",
  "ethcore-transaction",
- "ethereum-types 0.4.2",
+ "ethereum-types",
  "ethkey",
  "futures 0.1.29",
  "futures 0.3.15",
+ "group 0.8.0",
  "gstuff",
- "hex 0.4.2",
+ "hex 0.4.3",
  "http 0.2.7",
+ "hyper",
+ "hyper-rustls",
  "itertools",
  "js-sys",
- "jsonrpc-core 8.0.1",
+ "jsonrpc-core",
  "keys",
  "lazy_static",
  "libc",
@@ -1067,12 +1073,13 @@ dependencies = [
  "lightning-background-processor",
  "lightning-invoice",
  "lightning-net-tokio",
- "lightning-persister",
- "metrics",
+ "lightning-rapid-gossip-sync",
  "mm2_core",
  "mm2_db",
  "mm2_err_handle",
  "mm2_io",
+ "mm2_metamask",
+ "mm2_metrics",
  "mm2_net",
  "mm2_number",
  "mm2_test_helpers",
@@ -1084,14 +1091,15 @@ dependencies = [
  "prost-build",
  "protobuf",
  "rand 0.7.3",
- "rlp 0.3.0",
+ "rlp",
  "rmp-serde",
  "rpc",
  "rpc_task",
  "rust-ini",
  "rustls 0.20.4",
  "script",
- "secp256k1",
+ "secp256k1 0.20.3",
+ "secp256k1 0.22.1",
  "ser_error",
  "ser_error_derive",
  "serde",
@@ -1100,19 +1108,22 @@ dependencies = [
  "serialization",
  "serialization_derive",
  "sha2 0.9.9",
- "sha3",
+ "sha3 0.9.1",
  "solana-client",
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
  "spl-token",
  "spv_validation",
+ "tendermint-config",
+ "tendermint-rpc",
  "tiny-bip39",
  "tokio",
  "tokio-rustls",
  "tonic",
  "tonic-build",
  "utxo_signer",
+ "uuid 0.7.4",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
@@ -1136,11 +1147,18 @@ dependencies = [
  "common",
  "crypto",
  "derive_more",
+ "ethereum-types",
  "futures 0.3.15",
- "hex 0.4.2",
+ "hex 0.4.3",
+ "lightning",
+ "lightning-background-processor",
+ "lightning-invoice",
  "mm2_core",
  "mm2_err_handle",
+ "mm2_metamask",
+ "mm2_metrics",
  "mm2_number",
+ "parking_lot 0.12.0",
  "rpc",
  "rpc_task",
  "ser_error",
@@ -1158,7 +1176,6 @@ dependencies = [
  "arrayref",
  "async-trait",
  "backtrace",
- "base64 0.10.1",
  "bytes 1.1.0",
  "cc",
  "cfg-if 1.0.0",
@@ -1169,10 +1186,10 @@ dependencies = [
  "fnv",
  "futures 0.1.29",
  "futures 0.3.15",
+ "futures-timer",
  "getrandom 0.2.6",
  "gstuff",
- "hdrhistogram 7.1.0",
- "hex 0.4.2",
+ "hex 0.4.3",
  "http 0.2.7",
  "http-body 0.1.0",
  "hyper",
@@ -1184,12 +1201,9 @@ dependencies = [
  "lightning",
  "log 0.4.14",
  "log4rs",
- "metrics",
- "metrics-core",
- "metrics-runtime",
- "metrics-util",
  "parking_lot 0.12.0",
  "parking_lot_core 0.6.2",
+ "primitive-types",
  "rand 0.7.3",
  "ser_error",
  "ser_error_derive",
@@ -1198,9 +1212,10 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_repr",
+ "sha2 0.9.9",
  "shared_ref_counter",
  "tokio",
- "uuid",
+ "uuid 0.7.4",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
@@ -1271,6 +1286,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
 [[package]]
 name = "core2"
 version = "0.4.0"
@@ -1280,6 +1301,38 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "cosmos-sdk-proto"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ca04d3795c18023c221a2143b29de9c70668ecb22d17783bc02ee780c6c404"
+dependencies = [
+ "prost",
+ "prost-types",
+ "tendermint-proto",
+]
+
+[[package]]
+name = "cosmrs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6989fdb6267eccb52762530b79ce0b385f4eaeb8b786522a95512e9bebb268c2"
+dependencies = [
+ "cosmos-sdk-proto",
+ "ecdsa",
+ "eyre",
+ "getrandom 0.2.6",
+ "k256",
+ "prost",
+ "prost-types",
+ "rand_core 0.6.3",
+ "serde",
+ "serde_json",
+ "subtle-encoding",
+ "tendermint",
+ "thiserror",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.1.4"
@@ -1369,13 +1422,13 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "cfg-if 0.1.10",
  "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
  "memoffset 0.5.4",
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -1388,7 +1441,7 @@ dependencies = [
  "crossbeam-utils 0.8.8",
  "lazy_static",
  "memoffset 0.6.4",
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -1408,7 +1461,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
@@ -1448,12 +1501,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "crunchy"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -1464,31 +1511,41 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 name = "crypto"
 version = "1.0.0"
 dependencies = [
+ "arrayref",
  "async-trait",
  "bip32",
  "bitcrypto",
+ "bs58",
  "common",
  "derive_more",
  "enum-primitive-derive",
+ "enum_from",
  "futures 0.3.15",
- "hex 0.4.2",
+ "hex 0.4.3",
  "http 0.2.7",
  "hw_common",
  "keys",
+ "lazy_static",
  "mm2_core",
  "mm2_err_handle",
+ "mm2_eth",
+ "mm2_metamask",
  "num-traits",
  "parking_lot 0.12.0",
  "primitives",
+ "rpc",
  "rpc_task",
- "rustc-hex 2.1.0",
- "secp256k1",
+ "rustc-hex",
+ "secp256k1 0.20.3",
  "ser_error",
  "ser_error_derive",
  "serde",
  "serde_derive",
  "serde_json",
+ "tiny-bip39",
  "trezor",
+ "wasm-bindgen-test",
+ "web3",
 ]
 
 [[package]]
@@ -1634,6 +1691,50 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "cxx"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b49af8e551e84f85d6def97c42b8d93bc5bb0817cce96b56a472b1b19b5bfc2"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "lazy_static",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "scratch",
+ "syn 1.0.95",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
+dependencies = [
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "dashmap"
 version = "4.0.2"
@@ -1655,11 +1756,12 @@ checksum = "72aa14c04dfae8dd7d8a2b1cb7ca2152618cd01336dbfe704b8dcbf8d41dbd69"
 name = "db_common"
 version = "0.1.0"
 dependencies = [
- "hex 0.4.2",
+ "common",
+ "hex 0.4.3",
  "log 0.4.14",
  "rusqlite",
  "sql-builder",
- "uuid",
+ "uuid 0.7.4",
 ]
 
 [[package]]
@@ -1869,9 +1971,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519"
-version = "1.0.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf038a7b6fd7ef78ad3348b63f3a17550877b0e28f8d68bcc94894d1412158bc"
+checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
 dependencies = [
  "signature",
 ]
@@ -1960,6 +2062,12 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "enum-as-inner"
 version = "0.4.0"
@@ -1983,6 +2091,16 @@ dependencies = [
  "syn 1.0.95",
 ]
 
+[[package]]
+name = "enum_from"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -2039,41 +2157,21 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
 [[package]]
 name = "ethabi"
-version = "6.1.0"
-source = "git+https://github.com/artemii235/ethabi#d70bfd94e05c49d9b28a5edb4def2ebfaa5e1053"
-dependencies = [
- "error-chain",
- "ethereum-types 0.4.2",
- "rustc-hex 2.1.0",
- "serde",
- "serde_derive",
- "serde_json",
- "tiny-keccak 1.4.4",
-]
-
-[[package]]
-name = "ethbloom"
-version = "0.5.3"
+version = "17.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6294da962646baa738414e8e718d1a1f0360a51d92de89ccbf91870418f5360"
+checksum = "e4966fba78396ff92db3b817ee71143eccd98acf0f876b8d600e585a670c5d1b"
 dependencies = [
- "crunchy 0.1.6",
- "ethereum-types-serialize",
- "fixed-hash 0.2.5",
+ "ethereum-types",
+ "hex 0.4.3",
+ "once_cell",
+ "regex",
  "serde",
- "tiny-keccak 1.4.4",
+ "serde_json",
+ "sha3 0.10.4",
+ "thiserror",
+ "uint",
 ]
 
 [[package]]
@@ -2082,8 +2180,8 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
 dependencies = [
- "crunchy 0.2.2",
- "fixed-hash 0.7.0",
+ "crunchy",
+ "fixed-hash",
  "impl-rlp",
  "impl-serde",
  "tiny-keccak 2.0.2",
@@ -2092,71 +2190,58 @@ dependencies = [
 [[package]]
 name = "ethcore-transaction"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
+source = "git+https://github.com/KomodoPlatform/mm2-parity-ethereum.git#223da7972113a548531804510708f87b629a48fd"
 dependencies = [
- "ethereum-types 0.4.2",
+ "ethereum-types",
  "ethkey",
  "keccak-hash",
- "rlp 0.3.0",
- "rustc-hex 1.0.0",
+ "rlp",
+ "rustc-hex",
  "unexpected",
 ]
 
-[[package]]
-name = "ethereum-types"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e742184dc63a01c8ea0637369f8faa27c40f537949908a237f95c05e68d2c96"
-dependencies = [
- "crunchy 0.1.6",
- "ethbloom 0.5.3",
- "ethereum-types-serialize",
- "fixed-hash 0.2.5",
- "serde",
- "uint 0.4.1",
-]
-
 [[package]]
 name = "ethereum-types"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
 dependencies = [
- "ethbloom 0.12.1",
- "fixed-hash 0.7.0",
+ "ethbloom",
+ "fixed-hash",
  "impl-rlp",
  "impl-serde",
  "primitive-types",
- "uint 0.9.1",
-]
-
-[[package]]
-name = "ethereum-types-serialize"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d77b32bc1891a79dad925f2acbc318ee942b38b9110f9dbc5fbeffcea350"
-dependencies = [
- "serde",
+ "uint",
 ]
 
 [[package]]
 name = "ethkey"
 version = "0.3.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
+source = "git+https://github.com/KomodoPlatform/mm2-parity-ethereum.git#223da7972113a548531804510708f87b629a48fd"
 dependencies = [
  "byteorder 1.4.3",
  "edit-distance",
- "ethereum-types 0.4.2",
+ "ethereum-types",
  "log 0.3.9",
  "mem",
  "rand 0.6.5",
- "rustc-hex 1.0.0",
- "secp256k1",
+ "rustc-hex",
+ "secp256k1 0.20.3",
  "serde",
  "serde_derive",
  "tiny-keccak 1.4.4",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "failure"
 version = "0.1.8"
@@ -2255,16 +2340,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "fixed-hash"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7afe6ce860afb14422711595a7b26ada9ed7de2f43c0b2ab79d09ee196287273"
-dependencies = [
- "rand 0.4.6",
- "rustc-hex 2.1.0",
-]
-
 [[package]]
 name = "fixed-hash"
 version = "0.7.0"
@@ -2273,7 +2348,7 @@ checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder 1.4.3",
  "rand 0.8.4",
- "rustc-hex 2.1.0",
+ "rustc-hex",
  "static_assertions",
 ]
 
@@ -2296,6 +2371,16 @@ dependencies = [
  "miniz_oxide 0.4.0",
 ]
 
+[[package]]
+name = "flex-error"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
+dependencies = [
+ "eyre",
+ "paste",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -2309,7 +2394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
 dependencies = [
  "matches",
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
 [[package]]
@@ -2466,7 +2551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 dependencies = [
  "gloo-timers",
- "send_wrapper 0.4.0",
+ "send_wrapper",
 ]
 
 [[package]]
@@ -2485,7 +2570,7 @@ dependencies = [
  "memchr",
  "pin-project-lite 0.2.9",
  "pin-utils",
- "slab 0.4.2",
+ "slab",
 ]
 
 [[package]]
@@ -2567,9 +2652,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.21.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c"
+checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
 
 [[package]]
 name = "gloo-timers"
@@ -2642,9 +2727,9 @@ dependencies = [
  "futures-util",
  "http 0.2.7",
  "indexmap",
- "slab 0.4.2",
+ "slab",
  "tokio",
- "tokio-util 0.7.2",
+ "tokio-util",
  "tracing",
 ]
 
@@ -2660,7 +2745,7 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
 ]
 
 [[package]]
@@ -2699,27 +2784,6 @@ dependencies = [
  "hashbrown 0.9.1",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "6.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d331ebcdbca4acbefe5da8c3299b2e246f198a8294cc5163354e743398b89d"
-dependencies = [
- "byteorder 1.4.3",
- "num-traits",
-]
-
-[[package]]
-name = "hdrhistogram"
-version = "7.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c22708574c44e924720c5b3a116326c688e6d532f438c77c007ec8768644f9"
-dependencies = [
- "byteorder 1.4.3",
- "crossbeam-channel 0.4.4",
- "num-traits",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.0"
@@ -2743,9 +2807,9 @@ checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hidapi"
@@ -2877,9 +2941,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes 1.1.0",
  "http 0.2.7",
@@ -2931,7 +2995,7 @@ dependencies = [
  "js-sys",
  "mm2_err_handle",
  "rusb",
- "secp256k1",
+ "secp256k1 0.20.3",
  "serde",
  "serde_derive",
  "wasm-bindgen",
@@ -2952,7 +3016,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "httparse",
  "httpdate",
  "itoa 1.0.1",
@@ -2991,14 +3055,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.1.5"
+name = "iana-time-zone"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
 dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
 ]
 
 [[package]]
@@ -3022,20 +3099,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "im"
-version = "15.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9"
-dependencies = [
- "bitmaps",
- "rand_core 0.6.3",
- "rand_xoshiro",
- "sized-chunks",
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "impl-codec"
 version = "0.6.0"
@@ -3051,7 +3114,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
 dependencies = [
- "rlp 0.5.0",
+ "rlp",
 ]
 
 [[package]]
@@ -3075,8 +3138,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "index_list"
-version = "0.2.7"
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "index_list"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce"
 
@@ -3086,7 +3155,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "hashbrown 0.11.2",
 ]
 
@@ -3162,6 +3231,27 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
 
+[[package]]
+name = "jemalloc-sys"
+version = "0.5.2+5.3.0-patched"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134163979b6eed9564c98637b710b40979939ba351f59952708234ea11b5f3f8"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "jemallocator"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6"
+dependencies = [
+ "jemalloc-sys",
+ "libc",
+]
+
 [[package]]
 name = "jobserver"
 version = "0.1.24"
@@ -3180,19 +3270,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonrpc-core"
-version = "8.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
-dependencies = [
- "futures 0.1.29",
- "log 0.3.9",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
 [[package]]
 name = "jsonrpc-core"
 version = "18.0.0"
@@ -3222,6 +3299,19 @@ dependencies = [
  "subtle 2.4.0",
 ]
 
+[[package]]
+name = "k256"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "ecdsa",
+ "elliptic-curve",
+ "sec1",
+ "sha2 0.9.9",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.0"
@@ -3230,11 +3320,12 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 
 [[package]]
 name = "keccak-hash"
-version = "0.1.2"
-source = "git+https://github.com/artemii235/parity-common#986aba04f5e11e855d08a41c40bf03b4ba2862b0"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82bc5d5ca345b067619615f62ac6f93e7daa67eb82d080bc380ed480708ec9e3"
 dependencies = [
- "ethereum-types 0.4.2",
- "tiny-keccak 1.4.4",
+ "primitive-types",
+ "tiny-keccak 2.0.2",
 ]
 
 [[package]]
@@ -3248,8 +3339,8 @@ dependencies = [
  "lazy_static",
  "primitives",
  "rand 0.6.5",
- "rustc-hex 2.1.0",
- "secp256k1",
+ "rustc-hex",
+ "secp256k1 0.20.3",
  "serde",
  "serde_derive",
 ]
@@ -3300,8 +3391,8 @@ dependencies = [
 
 [[package]]
 name = "libp2p"
-version = "0.45.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+version = "0.45.1"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "bytes 1.1.0",
  "futures 0.3.15",
@@ -3332,7 +3423,7 @@ dependencies = [
 [[package]]
 name = "libp2p-core"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "asn1_der",
  "bs58",
@@ -3367,7 +3458,7 @@ dependencies = [
 [[package]]
 name = "libp2p-dns"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "libp2p-core",
@@ -3394,7 +3485,7 @@ dependencies = [
 [[package]]
 name = "libp2p-floodsub"
 version = "0.36.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "cuckoofilter 0.5.0",
  "fnv",
@@ -3411,7 +3502,7 @@ dependencies = [
 [[package]]
 name = "libp2p-metrics"
 version = "0.6.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "libp2p-core",
  "libp2p-ping",
@@ -3422,7 +3513,7 @@ dependencies = [
 [[package]]
 name = "libp2p-mplex"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "asynchronous-codec",
  "bytes 1.1.0",
@@ -3439,7 +3530,7 @@ dependencies = [
 [[package]]
 name = "libp2p-noise"
 version = "0.36.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "bytes 1.1.0",
  "curve25519-dalek 3.2.0",
@@ -3460,7 +3551,7 @@ dependencies = [
 [[package]]
 name = "libp2p-ping"
 version = "0.36.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "futures-timer",
@@ -3475,7 +3566,7 @@ dependencies = [
 [[package]]
 name = "libp2p-plaintext"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "asynchronous-codec",
  "bytes 1.1.0",
@@ -3491,7 +3582,7 @@ dependencies = [
 [[package]]
 name = "libp2p-request-response"
 version = "0.18.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "async-trait",
  "bytes 1.1.0",
@@ -3507,8 +3598,8 @@ dependencies = [
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.36.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+version = "0.36.1"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "either",
  "fnv",
@@ -3527,7 +3618,7 @@ dependencies = [
 [[package]]
 name = "libp2p-swarm-derive"
 version = "0.27.2"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "quote 1.0.18",
  "syn 1.0.95",
@@ -3536,7 +3627,7 @@ dependencies = [
 [[package]]
 name = "libp2p-tcp"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "futures-timer",
@@ -3552,7 +3643,7 @@ dependencies = [
 [[package]]
 name = "libp2p-wasm-ext"
 version = "0.33.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "js-sys",
@@ -3565,7 +3656,7 @@ dependencies = [
 [[package]]
 name = "libp2p-websocket"
 version = "0.35.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "either",
  "futures 0.3.15",
@@ -3576,14 +3667,14 @@ dependencies = [
  "quicksink",
  "rw-stream-sink",
  "soketto",
- "url 2.2.2",
+ "url",
  "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
 version = "0.37.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "libp2p-core",
@@ -3636,7 +3727,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
  "digest 0.9.0",
  "subtle 2.4.0",
 ]
@@ -3647,7 +3738,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
  "digest 0.9.0",
  "subtle 2.4.0",
 ]
@@ -3724,42 +3815,43 @@ dependencies = [
 
 [[package]]
 name = "lightning"
-version = "0.0.106"
-source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
+version = "0.0.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dce6da860338d5a9ddc3fd42432465310cfab93b342bbd23b41b7c1f7c509d3"
 dependencies = [
  "bitcoin",
- "hex 0.4.2",
- "regex",
- "secp256k1",
 ]
 
 [[package]]
 name = "lightning-background-processor"
-version = "0.0.106"
+version = "0.0.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8de9d0de42bb933ffb8d33c6b0a75302f08b35126bfc74398ba01ad0c201f8d"
 dependencies = [
  "bitcoin",
- "db_common",
  "lightning",
- "lightning-invoice",
- "lightning-persister",
+ "lightning-rapid-gossip-sync",
 ]
 
 [[package]]
 name = "lightning-invoice"
-version = "0.14.0"
-source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32aa02b7fd0bd95e40b6ca8d9d9232b162d5e23b41bd2bc42abe9e9c78d34d72"
 dependencies = [
  "bech32",
  "bitcoin_hashes",
  "lightning",
  "num-traits",
- "secp256k1",
+ "secp256k1 0.22.1",
+ "serde",
 ]
 
 [[package]]
 name = "lightning-net-tokio"
-version = "0.0.106"
-source = "git+https://github.com/shamardy/rust-lightning?branch=0.0.106#af4a89c08c22d0110d386df0e288b2f825aaebbc"
+version = "0.0.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce57d093fbc643835bc64c0501b52a3531d2511dcb1237d0495d68fea3adc47d"
 dependencies = [
  "bitcoin",
  "lightning",
@@ -3767,50 +3859,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "lightning-persister"
-version = "0.0.106"
+name = "lightning-rapid-gossip-sync"
+version = "0.0.110"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391732631b14f7a1d9dc84dc3f644484d9b73190a31087b3856505cf0525bea0"
 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"
+name = "link-cplusplus"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
 dependencies = [
- "owning_ref",
- "scopeguard 0.3.3",
+ "cc",
 ]
 
 [[package]]
-name = "lock_api"
-version = "0.3.4"
+name = "linked-hash-map"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
-dependencies = [
- "scopeguard 1.1.0",
-]
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
 
 [[package]]
 name = "lock_api"
@@ -3818,7 +3889,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
- "scopeguard 1.1.0",
+ "scopeguard",
 ]
 
 [[package]]
@@ -3883,6 +3954,15 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "mach"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3910,7 +3990,7 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 [[package]]
 name = "mem"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
+source = "git+https://github.com/KomodoPlatform/mm2-parity-ethereum.git#223da7972113a548531804510708f87b629a48fd"
 
 [[package]]
 name = "memchr"
@@ -3933,7 +4013,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -3942,7 +4022,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -3958,56 +4038,62 @@ dependencies = [
 
 [[package]]
 name = "metrics"
-version = "0.12.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b70227ece8711a1aa2f99655efd795d0cff297a5b9fe39645a93aacf6ad39d"
+checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2"
 dependencies = [
- "metrics-core",
+ "ahash 0.7.6",
+ "metrics-macros",
 ]
 
 [[package]]
-name = "metrics-core"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c064b3a1ff41f4bf6c91185c8a0caeccf8a8a27e9d0f92cc54cf3dbec812f48"
-
-[[package]]
-name = "metrics-observer-prometheus"
-version = "0.1.4"
+name = "metrics-exporter-prometheus"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfe24ad8285ef8b239232135a65f89cc5fa4690bbfaf8907f4bef38f8b08eba"
+checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66"
 dependencies = [
- "hdrhistogram 6.3.4",
- "metrics-core",
+ "hyper",
+ "indexmap",
+ "ipnet",
+ "metrics",
  "metrics-util",
+ "parking_lot 0.11.1",
+ "quanta",
+ "thiserror",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
-name = "metrics-runtime"
-version = "0.13.1"
+name = "metrics-macros"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce0e4f69639ccc0c6b2f0612164f9817349eb25545ed1ffb5ef3e1e1c1d220b4"
+checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa"
 dependencies = [
- "arc-swap",
- "atomic-shim",
- "crossbeam-utils 0.7.2",
- "im",
- "metrics",
- "metrics-core",
- "metrics-observer-prometheus",
- "metrics-util",
- "parking_lot 0.10.2",
- "quanta",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+ "syn 1.0.95",
 ]
 
 [[package]]
 name = "metrics-util"
-version = "0.3.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11f8090a8886339f9468a04eeea0711e4cf27538b134014664308041307a1c5"
+checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50"
 dependencies = [
- "crossbeam-epoch 0.8.2",
- "serde",
+ "aho-corasick",
+ "atomic-shim",
+ "crossbeam-epoch 0.9.5",
+ "crossbeam-utils 0.8.8",
+ "hashbrown 0.11.2",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float",
+ "parking_lot 0.11.1",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
 ]
 
 [[package]]
@@ -4018,20 +4104,20 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.7"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
+checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
 dependencies = [
- "adler32",
+ "adler 0.2.2",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f"
+checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
 dependencies = [
- "adler",
+ "adler 1.0.2",
 ]
 
 [[package]]
@@ -4049,16 +4135,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.2"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
 dependencies = [
  "libc",
  "log 0.4.14",
- "miow",
- "ntapi",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "winapi",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -4077,12 +4161,13 @@ dependencies = [
  "async-std",
  "async-trait",
  "atomicdex-gossipsub",
+ "common",
  "derive_more",
  "env_logger 0.7.1",
  "futures 0.3.15",
  "futures-rustls 0.21.1",
  "getrandom 0.2.6",
- "hex 0.4.2",
+ "hex 0.4.3",
  "lazy_static",
  "libp2p",
  "libp2p-floodsub 0.22.0",
@@ -4090,7 +4175,7 @@ dependencies = [
  "rand 0.7.3",
  "regex",
  "rmp-serde",
- "secp256k1",
+ "secp256k1 0.20.3",
  "serde",
  "serde_bytes",
  "serde_json",
@@ -4101,6 +4186,28 @@ dependencies = [
  "wasm-timer",
 ]
 
+[[package]]
+name = "mm2_bin_lib"
+version = "1.0.0-beta"
+dependencies = [
+ "chrono",
+ "common",
+ "enum-primitive-derive",
+ "gstuff",
+ "jemallocator",
+ "js-sys",
+ "libc",
+ "mm2_core",
+ "mm2_main",
+ "mm2_rpc",
+ "num-traits",
+ "regex",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "mm2_core"
 version = "0.1.0"
@@ -4113,17 +4220,16 @@ dependencies = [
  "derive_more",
  "futures 0.3.15",
  "gstuff",
- "hex 0.4.2",
- "keys",
+ "hex 0.4.3",
  "lazy_static",
+ "mm2_metrics",
  "mm2_rpc",
  "primitives",
  "rand 0.7.3",
  "serde",
- "serde_bytes",
  "serde_json",
  "shared_ref_counter",
- "uuid",
+ "uuid 0.7.4",
 ]
 
 [[package]]
@@ -4134,7 +4240,7 @@ dependencies = [
  "common",
  "derive_more",
  "futures 0.3.15",
- "hex 0.4.2",
+ "hex 0.4.3",
  "itertools",
  "js-sys",
  "lazy_static",
@@ -4167,6 +4273,44 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "mm2_eth"
+version = "0.1.0"
+dependencies = [
+ "ethabi",
+ "ethkey",
+ "hex 0.4.3",
+ "indexmap",
+ "itertools",
+ "mm2_err_handle",
+ "secp256k1 0.20.3",
+ "serde",
+ "serde_json",
+ "web3",
+]
+
+[[package]]
+name = "mm2_gui_storage"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "common",
+ "db_common",
+ "derive_more",
+ "mm2_core",
+ "mm2_db",
+ "mm2_err_handle",
+ "mm2_number",
+ "mm2_test_helpers",
+ "rpc",
+ "ser_error",
+ "ser_error_derive",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "wasm-bindgen-test",
+]
+
 [[package]]
 name = "mm2_io"
 version = "0.1.0"
@@ -4205,14 +4349,15 @@ dependencies = [
  "dirs",
  "either",
  "enum-primitive-derive",
- "ethereum-types 0.4.2",
+ "enum_from",
+ "ethereum-types",
  "futures 0.1.29",
  "futures 0.3.15",
  "futures-rustls 0.21.1",
  "gstuff",
  "hash-db",
  "hash256-std-hasher",
- "hex 0.4.2",
+ "hex 0.4.3",
  "http 0.2.7",
  "hw_common",
  "hyper",
@@ -4222,12 +4367,13 @@ dependencies = [
  "keys",
  "lazy_static",
  "libc",
- "metrics",
  "mm2-libp2p",
  "mm2_core",
  "mm2_db",
  "mm2_err_handle",
+ "mm2_gui_storage",
  "mm2_io",
+ "mm2_metrics",
  "mm2_net",
  "mm2_number",
  "mm2_rpc",
@@ -4244,7 +4390,7 @@ dependencies = [
  "rpc",
  "rpc_task",
  "script",
- "secp256k1",
+ "secp256k1 0.20.3",
  "ser_error",
  "ser_error_derive",
  "serde",
@@ -4259,7 +4405,7 @@ dependencies = [
  "tokio",
  "trie-db",
  "trie-root 0.16.0",
- "uuid",
+ "uuid 0.7.4",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
@@ -4268,6 +4414,50 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "mm2_metamask"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "itertools",
+ "js-sys",
+ "jsonrpc-core",
+ "lazy_static",
+ "mm2_err_handle",
+ "mm2_eth",
+ "parking_lot 0.12.0",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web3",
+]
+
+[[package]]
+name = "mm2_metrics"
+version = "0.1.0"
+dependencies = [
+ "base64 0.10.1",
+ "common",
+ "derive_more",
+ "futures 0.3.15",
+ "hyper",
+ "hyper-rustls",
+ "itertools",
+ "metrics",
+ "metrics-exporter-prometheus",
+ "metrics-util",
+ "mm2_err_handle",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-timer",
+]
+
 [[package]]
 name = "mm2_net"
 version = "0.1.0"
@@ -4277,6 +4467,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "common",
  "derive_more",
+ "ethkey",
  "futures 0.3.15",
  "gstuff",
  "http 0.2.7",
@@ -4333,6 +4524,7 @@ dependencies = [
  "chrono",
  "common",
  "crossterm",
+ "crypto",
  "db_common",
  "futures 0.3.15",
  "gstuff",
@@ -4340,20 +4532,23 @@ dependencies = [
  "lazy_static",
  "mm2_core",
  "mm2_io",
+ "mm2_metrics",
  "mm2_net",
  "mm2_number",
  "rand 0.7.3",
  "regex",
+ "rpc",
  "serde",
+ "serde_derive",
  "serde_json",
- "uuid",
+ "uuid 0.7.4",
 ]
 
 [[package]]
 name = "mocktopus"
-version = "0.7.11"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1e54a5bbecd61a064cb9c6ef396f8c896aee14e5baba8d1d555f35167dfd7c3"
+checksum = "1e4f0d5a1621fea252541cf67533c4b9c32ee892d790768f4ad48f1063059537"
 dependencies = [
  "mocktopus_macros",
 ]
@@ -4380,11 +4575,11 @@ dependencies = [
  "byteorder 1.4.3",
  "data-encoding",
  "multihash",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "serde",
  "static_assertions",
  "unsigned-varint 0.7.1",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -4423,7 +4618,7 @@ checksum = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce"
 [[package]]
 name = "multistream-select"
 version = "0.11.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "bytes 1.1.0",
  "futures 0.3.15",
@@ -4433,6 +4628,15 @@ dependencies = [
  "unsigned-varint 0.7.1",
 ]
 
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec 1.6.1",
+]
+
 [[package]]
 name = "nix"
 version = "0.23.1"
@@ -4446,12 +4650,6 @@ dependencies = [
  "memoffset 0.6.4",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -4486,7 +4684,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "num-integer",
  "num-traits",
 ]
@@ -4497,7 +4695,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "num-integer",
  "num-traits",
  "serde",
@@ -4520,7 +4718,7 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "num-traits",
 ]
 
@@ -4530,7 +4728,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
@@ -4543,7 +4741,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -4578,6 +4776,15 @@ dependencies = [
  "syn 1.0.95",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "number_prefix"
 version = "0.4.0"
@@ -4586,15 +4793,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.20.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
+checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "opaque-debug"
@@ -4608,6 +4818,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "ordered-float"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "ouroboros"
 version = "0.13.0"
@@ -4702,7 +4921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f"
 dependencies = [
  "cfg-if 1.0.0",
- "ethereum-types 0.13.1",
+ "ethereum-types",
  "hashbrown 0.12.1",
  "impl-trait-for-tuples",
  "lru",
@@ -4730,37 +4949,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bcaa58ee64f8e4a3d02f5d8e6ed0340eae28fed6fdabd984ad1776e3b43848a"
 
-[[package]]
-name = "parking_lot"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
-dependencies = [
- "lock_api 0.1.5",
- "parking_lot_core 0.4.0",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.6.2",
- "rustc_version 0.2.3",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.7.2",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.11.1"
@@ -4768,7 +4956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
 dependencies = [
  "instant",
- "lock_api 0.4.6",
+ "lock_api",
  "parking_lot_core 0.8.0",
 ]
 
@@ -4778,23 +4966,10 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
 dependencies = [
- "lock_api 0.4.6",
+ "lock_api",
  "parking_lot_core 0.9.1",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-dependencies = [
- "libc",
- "rand 0.6.5",
- "rustc_version 0.2.3",
- "smallvec 0.6.14",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -4810,20 +4985,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi 0.0.3",
- "libc",
- "redox_syscall 0.1.56",
- "smallvec 1.6.1",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.8.0"
@@ -4849,14 +5010,14 @@ dependencies = [
  "libc",
  "redox_syscall 0.2.10",
  "smallvec 1.6.1",
- "windows-sys",
+ "windows-sys 0.32.0",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.4"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
+checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
 
 [[package]]
 name = "pbkdf2"
@@ -4877,10 +5038,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "percent-encoding"
-version = "1.0.1"
+name = "peg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
+dependencies = [
+ "peg-macros",
+ "peg-runtime",
+]
+
+[[package]]
+name = "peg-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
+dependencies = [
+ "peg-runtime",
+ "proc-macro2 1.0.39",
+ "quote 1.0.18",
+]
+
+[[package]]
+name = "peg-runtime"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
 
 [[package]]
 name = "percent-encoding"
@@ -4956,6 +5138,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkcs8"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
+dependencies = [
+ "der",
+ "spki",
+ "zeroize",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.17"
@@ -5007,21 +5200,22 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
 dependencies = [
- "fixed-hash 0.7.0",
+ "fixed-hash",
  "impl-codec",
  "impl-rlp",
  "impl-serde",
  "scale-info",
- "uint 0.9.1",
+ "uint",
 ]
 
 [[package]]
 name = "primitives"
 version = "0.1.0"
 dependencies = [
+ "bitcoin_hashes",
  "byteorder 1.4.3",
- "rustc-hex 2.1.0",
- "uint 0.9.1",
+ "rustc-hex",
+ "uint",
 ]
 
 [[package]]
@@ -5200,16 +5394,22 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e"
 dependencies = [
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "quanta"
-version = "0.3.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7a1905379198075914bc93d32a5465c40474f90a078bb13439cb00c547bcc"
+checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8"
 dependencies = [
+ "crossbeam-utils 0.8.8",
  "libc",
+ "mach",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.10.2+wasi-snapshot-preview1",
+ "web-sys",
  "winapi",
 ]
 
@@ -5284,6 +5484,16 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
 [[package]]
 name = "rand"
 version = "0.3.23"
@@ -5505,12 +5715,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_xoshiro"
-version = "0.6.0"
+name = "raw-cpuid"
+version = "10.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+checksum = "2c49596760fce12ca21550ac21dc5a9617b2ea4b6e0aa7d8dab8ff2824fc2bba"
 dependencies = [
- "rand_core 0.6.3",
+ "bitflags",
 ]
 
 [[package]]
@@ -5519,7 +5729,7 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "autocfg 1.0.0",
+ "autocfg 1.1.0",
  "crossbeam-deque 0.8.1",
  "either",
  "rayon-core",
@@ -5642,7 +5852,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "hyper",
  "hyper-rustls",
  "ipnet",
@@ -5650,7 +5860,7 @@ dependencies = [
  "lazy_static",
  "log 0.4.14",
  "mime",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "pin-project-lite 0.2.9",
  "rustls 0.20.4",
  "rustls-pemfile 0.2.1",
@@ -5659,7 +5869,7 @@ dependencies = [
  "serde_urlencoded",
  "tokio",
  "tokio-rustls",
- "url 2.2.2",
+ "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -5716,22 +5926,12 @@ dependencies = [
 
 [[package]]
 name = "rlp"
-version = "0.3.0"
-source = "git+https://github.com/artemii235/parity-common#986aba04f5e11e855d08a41c40bf03b4ba2862b0"
-dependencies = [
- "byteorder 1.4.3",
- "ethereum-types 0.4.2",
- "rustc-hex 2.1.0",
-]
-
-[[package]]
-name = "rlp"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
  "bytes 1.1.0",
- "rustc-hex 2.1.0",
+ "rustc-hex",
 ]
 
 [[package]]
@@ -5771,9 +5971,10 @@ version = "0.1.0"
 dependencies = [
  "chain",
  "keys",
+ "lazy_static",
  "log 0.4.14",
  "primitives",
- "rustc-hex 2.1.0",
+ "rustc-hex",
  "script",
  "serde",
  "serde_derive",
@@ -5790,7 +5991,6 @@ dependencies = [
  "derive_more",
  "futures 0.3.15",
  "mm2_err_handle",
- "mm2_rpc",
  "ser_error",
  "ser_error_derive",
  "serde",
@@ -5853,12 +6053,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc-hex"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e"
-
 [[package]]
 name = "rustc-hex"
 version = "2.1.0"
@@ -5935,7 +6129,7 @@ checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
 [[package]]
 name = "rw-stream-sink"
 version = "0.3.0"
-source = "git+https://github.com/libp2p/rust-libp2p.git#ef2afcd41eac1459c0408a7a6eb599bfc2035938"
+source = "git+https://github.com/libp2p/rust-libp2p.git?tag=v0.45.1#802d00e645894d8895f2f9f665b921452d992b86"
 dependencies = [
  "futures 0.3.15",
  "pin-project 1.0.10",
@@ -5989,15 +6183,15 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
 [[package]]
 name = "scopeguard"
-version = "0.3.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
-name = "scopeguard"
-version = "1.1.0"
+name = "scratch"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "script"
@@ -6041,6 +6235,7 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
 dependencies = [
  "der",
  "generic-array 0.14.5",
+ "pkcs8",
  "subtle 2.4.0",
  "zeroize",
 ]
@@ -6052,14 +6247,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a"
 dependencies = [
  "rand 0.6.5",
- "secp256k1-sys",
+ "secp256k1-sys 0.4.2",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
+dependencies = [
+ "secp256k1-sys 0.5.2",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.4.0"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e4b6455ee49f5901c8985b88f98fb0a0e1d90a6661f5a03f4888bd987dad29"
+checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110"
 dependencies = [
  "cc",
 ]
@@ -6094,12 +6307,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
-[[package]]
-name = "send_wrapper"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0eddf2e8f50ced781f288c19f18621fa72a3779e3cb58dbf23b07469b0abeb4"
-
 [[package]]
 name = "send_wrapper"
 version = "0.4.0"
@@ -6296,6 +6503,16 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha3"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56"
+dependencies = [
+ "digest 0.10.3",
+ "keccak",
+]
+
 [[package]]
 name = "shared_ref_counter"
 version = "0.1.0"
@@ -6350,20 +6567,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "833011ca526bd88f16778d32c699d325a9ad302fa06381cd66f7be63351d3f6d"
 
 [[package]]
-name = "sized-chunks"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
-dependencies = [
- "bitmaps",
- "typenum",
-]
-
-[[package]]
-name = "slab"
-version = "0.3.0"
+name = "sketches-ddsketch"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
+checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee"
 
 [[package]]
 name = "slab"
@@ -6401,7 +6608,7 @@ dependencies = [
  "libc",
  "once_cell",
  "scoped-tls",
- "slab 0.4.2",
+ "slab",
  "socket2 0.3.19",
  "wepoll-sys-stjepang",
  "winapi",
@@ -6555,7 +6762,7 @@ dependencies = [
  "thiserror",
  "tiny-bip39",
  "uriparse",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -6569,7 +6776,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_yaml",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -6583,7 +6790,7 @@ dependencies = [
  "bs58",
  "clap",
  "indicatif",
- "jsonrpc-core 18.0.0",
+ "jsonrpc-core",
  "log 0.4.14",
  "rayon",
  "reqwest",
@@ -6603,7 +6810,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tungstenite",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -6738,7 +6945,7 @@ dependencies = [
  "solana-sdk",
  "solana-version",
  "tokio",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -6804,7 +7011,7 @@ dependencies = [
  "serde_bytes",
  "serde_derive",
  "sha2 0.9.9",
- "sha3",
+ "sha3 0.9.1",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -6963,7 +7170,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha2 0.9.9",
- "sha3",
+ "sha3 0.9.1",
  "solana-frozen-abi",
  "solana-frozen-abi-macro",
  "solana-logger",
@@ -7203,6 +7410,16 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spki"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
 [[package]]
 name = "spl-associated-token-account"
 version = "1.0.3"
@@ -7240,10 +7457,15 @@ dependencies = [
 name = "spv_validation"
 version = "0.1.0"
 dependencies = [
+ "async-trait",
  "chain",
+ "common",
+ "derive_more",
+ "keys",
+ "lazy_static",
  "primitives",
  "ripemd160",
- "rustc-hex 2.1.0",
+ "rustc-hex",
  "serde",
  "serde_json",
  "serialization",
@@ -7363,6 +7585,15 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
 
+[[package]]
+name = "subtle-encoding"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "symlink"
 version = "0.1.0"
@@ -7449,7 +7680,7 @@ dependencies = [
 [[package]]
 name = "tc_cli_client"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "log 0.4.14",
  "serde",
@@ -7461,7 +7692,7 @@ dependencies = [
 [[package]]
 name = "tc_coblox_bitcoincore"
 version = "0.5.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "hex 0.3.2",
  "hmac 0.7.1",
@@ -7474,7 +7705,7 @@ dependencies = [
 [[package]]
 name = "tc_core"
 version = "0.3.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "debug_stub_derive",
  "log 0.4.14",
@@ -7483,7 +7714,7 @@ dependencies = [
 [[package]]
 name = "tc_dynamodb_local"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "log 0.4.14",
  "tc_core",
@@ -7492,7 +7723,7 @@ dependencies = [
 [[package]]
 name = "tc_elasticmq"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "tc_core",
 ]
@@ -7500,7 +7731,7 @@ dependencies = [
 [[package]]
 name = "tc_generic"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "tc_core",
 ]
@@ -7508,7 +7739,7 @@ dependencies = [
 [[package]]
 name = "tc_parity_parity"
 version = "0.5.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "log 0.4.14",
  "tc_core",
@@ -7517,7 +7748,7 @@ dependencies = [
 [[package]]
 name = "tc_postgres"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "log 0.4.14",
  "tc_core",
@@ -7526,7 +7757,7 @@ dependencies = [
 [[package]]
 name = "tc_redis"
 version = "0.2.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "tc_core",
 ]
@@ -7534,7 +7765,7 @@ dependencies = [
 [[package]]
 name = "tc_trufflesuite_ganachecli"
 version = "0.4.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "tc_core",
 ]
@@ -7553,6 +7784,94 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "tendermint"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
+dependencies = [
+ "async-trait",
+ "bytes 1.1.0",
+ "ed25519",
+ "ed25519-dalek",
+ "flex-error",
+ "futures 0.3.15",
+ "k256",
+ "num-traits",
+ "once_cell",
+ "prost",
+ "prost-types",
+ "ripemd160",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "serde_repr",
+ "sha2 0.9.9",
+ "signature",
+ "subtle 2.4.0",
+ "subtle-encoding",
+ "tendermint-proto",
+ "time 0.3.11",
+ "zeroize",
+]
+
+[[package]]
+name = "tendermint-config"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
+dependencies = [
+ "flex-error",
+ "serde",
+ "serde_json",
+ "tendermint",
+ "toml",
+ "url",
+]
+
+[[package]]
+name = "tendermint-proto"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
+dependencies = [
+ "bytes 1.1.0",
+ "flex-error",
+ "num-derive",
+ "num-traits",
+ "prost",
+ "prost-types",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "time 0.3.11",
+]
+
+[[package]]
+name = "tendermint-rpc"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
+dependencies = [
+ "bytes 1.1.0",
+ "flex-error",
+ "getrandom 0.2.6",
+ "peg",
+ "pin-project 1.0.10",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "subtle-encoding",
+ "tendermint",
+ "tendermint-config",
+ "tendermint-proto",
+ "thiserror",
+ "time 0.3.11",
+ "url",
+ "uuid 0.8.2",
+ "walkdir",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.0"
@@ -7576,13 +7895,13 @@ dependencies = [
 name = "test_helpers"
 version = "0.1.0"
 dependencies = [
- "hex 0.4.2",
+ "hex 0.4.3",
 ]
 
 [[package]]
 name = "testcontainers"
 version = "0.7.0"
-source = "git+https://github.com/artemii235/testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
+source = "git+https://github.com/KomodoPlatform/mm2-testcontainers-rs.git#65e738093488f1b37185af0f1d3cf0ffd23e840d"
 dependencies = [
  "tc_cli_client",
  "tc_coblox_bitcoincore",
@@ -7656,11 +7975,22 @@ dependencies = [
  "libc",
  "standback",
  "stdweb",
- "time-macros",
+ "time-macros 0.1.1",
  "version_check",
  "winapi",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
+dependencies = [
+ "libc",
+ "num_threads",
+ "time-macros 0.2.4",
+]
+
 [[package]]
 name = "time-macros"
 version = "0.1.1"
@@ -7671,6 +8001,12 @@ dependencies = [
  "time-macros-impl",
 ]
 
+[[package]]
+name = "time-macros"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+
 [[package]]
 name = "time-macros-impl"
 version = "0.1.2"
@@ -7709,7 +8045,7 @@ version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f11c56c1b46016bb1129db9399f905385490f3e17907e4a8430e57f9a5b979c"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
 ]
 
 [[package]]
@@ -7718,7 +8054,7 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
 ]
 
 [[package]]
@@ -7738,22 +8074,22 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.18.2"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
+checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
+ "autocfg 1.1.0",
  "bytes 1.1.0",
  "libc",
  "memchr",
- "mio 0.8.2",
+ "mio 0.8.6",
  "num_cpus",
- "once_cell",
  "parking_lot 0.12.0",
  "pin-project-lite 0.2.9",
  "signal-hook-registry",
  "socket2 0.4.4",
  "tokio-macros",
- "winapi",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -7809,30 +8145,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-timer"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6131e780037787ff1b3f8aad9da83bca02438b72277850dd6ad0d455e0e20efc"
-dependencies = [
- "futures 0.1.29",
- "slab 0.3.0",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
-dependencies = [
- "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"
@@ -7872,10 +8184,10 @@ dependencies = [
  "futures-util",
  "h2",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "hyper",
  "hyper-timeout",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "pin-project 1.0.10",
  "prost",
  "prost-derive",
@@ -7883,7 +8195,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tokio-stream",
- "tokio-util 0.7.2",
+ "tokio-util",
  "tower",
  "tower-layer",
  "tower-service",
@@ -7907,9 +8219,9 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -7917,10 +8229,9 @@ dependencies = [
  "pin-project 1.0.10",
  "pin-project-lite 0.2.9",
  "rand 0.8.4",
- "slab 0.4.2",
+ "slab",
  "tokio",
- "tokio-stream",
- "tokio-util 0.6.7",
+ "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -7937,7 +8248,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "http 0.2.7",
- "http-body 0.4.4",
+ "http-body 0.4.5",
  "http-range-header",
  "pin-project-lite 0.2.9",
  "tower",
@@ -7953,9 +8264,9 @@ checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
 
 [[package]]
 name = "tower-service"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
@@ -8067,7 +8378,7 @@ dependencies = [
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 0.2.3",
+ "idna",
  "ipnet",
  "lazy_static",
  "log 0.4.14",
@@ -8076,7 +8387,7 @@ dependencies = [
  "thiserror",
  "tinyvec",
  "tokio",
- "url 2.2.2",
+ "url",
 ]
 
 [[package]]
@@ -8121,7 +8432,7 @@ dependencies = [
  "rustls 0.20.4",
  "sha-1",
  "thiserror",
- "url 2.2.2",
+ "url",
  "utf-8",
  "webpki 0.22.0",
  "webpki-roots",
@@ -8135,31 +8446,20 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "uint"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754ba11732b9161b94c41798e5197e5e75388d012f760c42adb5000353e98646"
-dependencies = [
- "byteorder 1.4.3",
- "crunchy 0.1.6",
- "rustc-hex 2.1.0",
-]
-
-[[package]]
-name = "uint"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f"
+checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
 dependencies = [
  "byteorder 1.4.3",
- "crunchy 0.2.2",
- "hex 0.4.2",
+ "crunchy",
+ "hex 0.4.3",
  "static_assertions",
 ]
 
 [[package]]
 name = "unexpected"
 version = "0.1.0"
-source = "git+https://github.com/artemii235/parity-ethereum.git#0a090f9b3efd7e24193265cf0e4109bf2369ad98"
+source = "git+https://github.com/KomodoPlatform/mm2-parity-ethereum.git#223da7972113a548531804510708f87b629a48fd"
 
 [[package]]
 name = "unicode-bidi"
@@ -8257,17 +8557,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
-]
-
 [[package]]
 name = "url"
 version = "2.2.2"
@@ -8275,9 +8564,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
 dependencies = [
  "form_urlencoded",
- "idna 0.2.3",
+ "idna",
  "matches",
- "percent-encoding 2.1.0",
+ "percent-encoding",
 ]
 
 [[package]]
@@ -8295,7 +8584,7 @@ dependencies = [
  "common",
  "crypto",
  "derive_more",
- "hex 0.4.2",
+ "hex 0.4.3",
  "keys",
  "mm2_err_handle",
  "primitives",
@@ -8314,6 +8603,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "uuid"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+
 [[package]]
 name = "value-bag"
 version = "1.0.0-alpha.8"
@@ -8485,15 +8780,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-timer"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c5e65a08699c9c4334ba136597ab22b85dccd4b65dd1e36ccf8f723a95b54"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
 dependencies = [
  "futures 0.3.15",
  "js-sys",
- "parking_lot 0.9.0",
+ "parking_lot 0.11.1",
  "pin-utils",
- "send_wrapper 0.2.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -8511,24 +8805,31 @@ dependencies = [
 
 [[package]]
 name = "web3"
-version = "0.6.0"
-source = "git+https://github.com/artemii235/rust-web3#9357249d31c258c5a7d47dfc51e9bb7d980056f1"
+version = "0.19.0"
+source = "git+https://github.com/KomodoPlatform/rust-web3?tag=v0.19.0#ec5e72a5c95e3935ea0c9ab77b501e3926686fa9"
 dependencies = [
- "arrayvec 0.4.12",
- "base64 0.10.1",
- "error-chain",
+ "arrayvec 0.7.1",
+ "derive_more",
  "ethabi",
- "ethereum-types 0.4.2",
- "futures 0.1.29",
- "jsonrpc-core 8.0.1",
+ "ethereum-types",
+ "futures 0.3.15",
+ "futures-timer",
+ "getrandom 0.2.6",
+ "hex 0.4.3",
+ "idna",
+ "js-sys",
+ "jsonrpc-core",
  "log 0.4.14",
- "parking_lot 0.7.1",
- "rustc-hex 1.0.0",
+ "parking_lot 0.12.0",
+ "pin-project 1.0.10",
+ "rand 0.8.4",
+ "rlp",
  "serde",
- "serde_derive",
+ "serde-wasm-bindgen",
  "serde_json",
- "tokio-timer",
- "url 1.7.2",
+ "tiny-keccak 2.0.2",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
 ]
 
 [[package]]
@@ -8622,43 +8923,124 @@ 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",
+ "windows_aarch64_msvc 0.32.0",
+ "windows_i686_gnu 0.32.0",
+ "windows_i686_msvc 0.32.0",
+ "windows_x86_64_gnu 0.32.0",
+ "windows_x86_64_msvc 0.32.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.1",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
 [[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_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
 [[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_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+
 [[package]]
 name = "winreg"
 version = "0.7.0"
@@ -8743,10 +9125,10 @@ dependencies = [
  "bs58",
  "ff 0.8.0",
  "group 0.8.0",
- "hex 0.4.2",
+ "hex 0.4.3",
  "jubjub",
  "nom",
- "percent-encoding 2.1.0",
+ "percent-encoding",
  "protobuf",
  "protobuf-codegen-pure",
  "rand_core 0.5.1",
@@ -8805,14 +9187,14 @@ dependencies = [
  "fpe",
  "funty 1.1.0",
  "group 0.8.0",
- "hex 0.4.2",
+ "hex 0.4.3",
  "jubjub",
  "lazy_static",
  "log 0.4.14",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "ripemd160",
- "secp256k1",
+ "secp256k1 0.20.3",
  "sha2 0.9.9",
  "subtle 2.4.0",
  "zcash_note_encryption",
@@ -8885,13 +9267,3 @@ dependencies = [
  "cc",
  "libc",
 ]
-
-[[patch.unused]]
-name = "backtrace"
-version = "0.3.32"
-source = "git+https://github.com/artemii235/backtrace-rs.git#6f9ac910252ef7833105080c9cb4d5948dcb74c2"
-
-[[patch.unused]]
-name = "backtrace-sys"
-version = "0.1.30"
-source = "git+https://github.com/artemii235/backtrace-rs.git#6f9ac910252ef7833105080c9cb4d5948dcb74c2"
diff --git a/Cargo.toml b/Cargo.toml
index 4e27bed80d..9c3c237abc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,18 +1,19 @@
 [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/enum_from",
     "mm2src/derives/ser_error",
     "mm2src/derives/ser_error_derive",
     "mm2src/floodsub",
     "mm2src/gossipsub",
+    "mm2src/mm2_gui_storage",
     "mm2src/hw_common",
+    "mm2src/mm2_bin_lib",
     "mm2src/mm2_bitcoin/crypto",
     "mm2src/mm2_bitcoin/chain",
     "mm2src/mm2_bitcoin/keys",
@@ -25,14 +26,17 @@ members = [
     "mm2src/mm2_core",
     "mm2src/mm2_db",
     "mm2src/mm2_err_handle",
-    "mm2src/mm2_test_helpers",
+    "mm2src/mm2_eth",
+    "mm2src/mm2_io",
     "mm2src/mm2_libp2p",
+    "mm2src/mm2_metamask",
+    "mm2src/mm2_metrics",
     "mm2src/mm2_main",
     "mm2src/mm2_net",
     "mm2src/mm2_number",
-    "mm2src/mm2_io",
     "mm2src/mm2_rpc",
     "mm2src/rpc_task",
+    "mm2src/mm2_test_helpers",
     "mm2src/trezor",
 ]
 
@@ -40,11 +44,11 @@ members = [
 resolver = "2"
 
 [profile.release]
-# Due to the "overrides" only affects our workspace crates, as intended.
-debug = true
+debug = 1
 debug-assertions = false
-# For better or worse, might affect the stack traces in our portion of the code.
-#opt-level = 1
+# For some reason, opt-level 3 started causing infinite Windows builds after Cosmos integration
+# TODO troubleshoot it
+opt-level = 2
 
 [profile.test]
 # required to avoid a long running process of librustcash additional chain validation that is enabled with debug assertions
@@ -54,11 +58,8 @@ debug-assertions = false
 # 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.
-# Consider removing once this issue is solved and fix applied to upstream repository
-# https://github.com/rust-lang/backtrace-rs/issues/227
-[patch.crates-io]
-backtrace = { git = "https://github.com/artemii235/backtrace-rs.git" }
-backtrace-sys = { git = "https://github.com/artemii235/backtrace-rs.git" }
+[profile.ci]
+inherits = "dev"
+# full debug info is not required
+debug = 1
+debug-assertions = false
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a5f8b65065..1fdc5226c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,6 +48,9 @@ RUN cd /mm2 && cargo fetch
 # Only needed when we're developing or changing something locally.
 #COPY . /mm2
 
+# Important for x86_64 builds
+ENV JEMALLOC_SYS_WITH_MALLOC_CONF="background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
+
 # Build MM1 and MM2.
 # Increased verbosity here allows us to see the MM1 CMake logs.
 RUN cd /mm2 &&\
diff --git a/Dockerfile.dev-release b/Dockerfile.dev-release
index 036c3c6195..48e3f47e72 100644
--- a/Dockerfile.dev-release
+++ b/Dockerfile.dev-release
@@ -1,5 +1,5 @@
 FROM debian:stable-slim
 WORKDIR /mm2
-COPY target/release/mm2 /usr/local/bin/mm2
+COPY target/ci/mm2 /usr/local/bin/mm2
 EXPOSE 7783
 CMD ["mm2"]
diff --git a/README.md b/README.md
index da88000275..da537c40f6 100755
--- a/README.md
+++ b/README.md
@@ -84,11 +84,17 @@ If you want to build from source, the following prerequisites are required:
 - [Download](https://github.com/protocolbuffers/protobuf/releases) or [compile](https://github.com/protocolbuffers/protobuf) `protoc 3.21.x+` and add it to your PATH env. It is also available via package managers depending on the OS.
 - Additional Rust Components
     ```
-    rustup install nightly-2022-02-01
-    rustup default nightly-2022-02-01
+    rustup install nightly-2022-10-29
+    rustup default nightly-2022-10-29
     rustup component add rustfmt-preview
     ```
-        
+
+**Note for x86_64 UNIX systems**:
+To have more efficient memory consumption please execute the following command before building mm2. (It's also good to have before launching mm2.)
+```sh
+export JEMALLOC_SYS_WITH_MALLOC_CONF="background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
+```
+
 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). 
diff --git a/azure-pipelines-android-job.yml b/azure-pipelines-android-job.yml
index 8b8f3ead86..817cc9582a 100644
--- a/azure-pipelines-android-job.yml
+++ b/azure-pipelines-android-job.yml
@@ -23,28 +23,36 @@ jobs:
           echo "##vso[task.setvariable variable=COMMIT_HASH]${TAG}"
         displayName: Setup ENV
       - bash: |
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_android_armv7_Release
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_android_armv7_CI
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
           cat MM_VERSION
           export PATH=$PATH:/home/azureagent/android-ndk/arch-ndk/x86_64/android-ndk/bin
-          CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo build --target=armv7-linux-androideabi --lib --release
+          CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang cargo rustc --target=armv7-linux-androideabi --lib --profile ci --crate-type=staticlib --package mm2_bin_lib
         displayName: 'Build armv7'
+        env:
+          MANUAL_MM_VERSION: true
       - bash: |
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_android_aarch64_Release
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_android_aarch64_CI
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
           cat MM_VERSION
           export PATH=$PATH:/home/azureagent/android-ndk/arch-ndk/x86_64/android-ndk/bin
-          CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo build --features native --target=aarch64-linux-android --lib --release
+          CC_aarch64_linux_android=aarch64-linux-android21-clang CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang cargo rustc --target=aarch64-linux-android --lib --profile ci --crate-type=staticlib --package mm2_bin_lib
         displayName: 'Build aarch64'
+        env:
+          MANUAL_MM_VERSION: true
       - bash: |
           rm -rf upload
           mkdir upload
-          zip upload/mm2-$(COMMIT_HASH)-android-armv7-Release target/armv7-linux-androideabi/release/libmm2.a -j
-          zip upload/mm2-$(COMMIT_HASH)-android-aarch64-Release target/aarch64-linux-android/release/libmm2.a -j
+          mv target/armv7-linux-androideabi/ci/libmm2lib.a upload/libmm2.a
+          zip upload/mm2-$(COMMIT_HASH)-android-armv7-CI upload/libmm2.a -j
+          rm upload/libmm2.a
+          mv target/aarch64-linux-android/ci/libmm2lib.a upload/libmm2.a
+          zip upload/mm2-$(COMMIT_HASH)-android-aarch64-CI upload/libmm2.a -j
+          rm upload/libmm2.a
         displayName: 'Prepare upload'
       - task: CopyFilesOverSSH@0
         inputs:
diff --git a/azure-pipelines-build-stage-job.yml b/azure-pipelines-build-stage-job.yml
index 2efa0c5b58..8cdcc82e9e 100644
--- a/azure-pipelines-build-stage-job.yml
+++ b/azure-pipelines-build-stage-job.yml
@@ -35,21 +35,22 @@ jobs:
       - bash: |
           rm -rf upload
           mkdir upload
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_CI
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
           cat MM_VERSION
           if [ $AGENT_OS = "Darwin" ]
           then
-            cargo build --bin mm2 --release --target x86_64-apple-darwin
+            cargo build --bin mm2 --profile ci --target x86_64-apple-darwin
           else
-            cargo build --bin mm2 --release
+            cargo build --bin mm2 --profile ci
           fi
-        displayName: 'Build MM2 Release'
+        displayName: 'Build MM2'
         condition: ne ( variables['Build.Reason'], 'PullRequest' )
         env:
           MANUAL_MM_VERSION: true
+          JEMALLOC_SYS_WITH_MALLOC_CONF: "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
       - task: Docker@2
         displayName: Build & Push container of dev branch
         condition: and( eq( variables['Agent.OS'], 'Linux' ), eq( variables['Build.SourceBranchName'], 'dev' ) )
@@ -79,9 +80,9 @@ jobs:
       - bash: |
           if [ $AGENT_OS = "Darwin" ]
           then
-            cargo test --all --target x86_64-apple-darwin -- --test-threads=16
+            cargo test --all --target x86_64-apple-darwin --profile ci -- --test-threads=16
           else
-            cargo test --all -- --test-threads=32
+            cargo test --all --profile ci -- --test-threads=32
           fi
         displayName: 'Test MM2'
         timeoutInMinutes: 22
@@ -104,17 +105,16 @@ jobs:
         # 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'
+          zip upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-CI target/ci/mm2 -j
+        displayName: 'Prepare CI build upload Linux'
         condition: and ( eq( variables['Agent.OS'], 'Linux' ), ne ( variables['Build.Reason'], 'PullRequest' ) )
       - bash: |
-          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'
+          zip upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-CI target/x86_64-apple-darwin/ci/mm2 -j
+        displayName: 'Prepare CI build upload MacOS'
         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'
+          7z a .\upload\mm2-$(COMMIT_HASH)-$(Agent.OS)-CI.zip .\target\ci\mm2.exe .\target\ci\*.dll "$Env:windir\system32\msvcr100.dll" "$Env:windir\system32\msvcp140.dll" "$Env:windir\system32\vcruntime140.dll"
+        displayName: 'Prepare CI build upload Windows'
         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
diff --git a/azure-pipelines-ios-job.yml b/azure-pipelines-ios-job.yml
index 60cfa8cf29..d513287742 100644
--- a/azure-pipelines-ios-job.yml
+++ b/azure-pipelines-ios-job.yml
@@ -23,17 +23,21 @@ jobs:
           echo "##vso[task.setvariable variable=COMMIT_HASH]${TAG}"
         displayName: Setup ENV
       - bash: |
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_ios_aarch64_Release
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_ios_aarch64_CI
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
           cat MM_VERSION
-          cargo build --target aarch64-apple-ios --lib --release
+          cargo rustc --target aarch64-apple-ios --lib --profile ci --package mm2_bin_lib --crate-type=staticlib
         displayName: 'Build iOS lib'
+        env:
+          MANUAL_MM_VERSION: true
       - bash: |
           rm -rf upload
           mkdir upload
-          zip upload/mm2-$(COMMIT_HASH)-ios-aarch64-Release target/aarch64-apple-ios/release/libmm2.a -j
+          mv target/aarch64-apple-ios/ci/libmm2lib.a upload/libmm2.a
+          zip upload/mm2-$(COMMIT_HASH)-ios-aarch64-CI upload/libmm2.a -j
+          rm upload/libmm2.a
         displayName: 'Prepare upload'
       - task: CopyFilesOverSSH@0
         inputs:
diff --git a/azure-pipelines-lint-stage-job.yml b/azure-pipelines-lint-stage-job.yml
index 3f2ab6f495..8f696eb8b2 100644
--- a/azure-pipelines-lint-stage-job.yml
+++ b/azure-pipelines-lint-stage-job.yml
@@ -32,12 +32,22 @@ jobs:
         env:
           MANUAL_MM_VERSION: true
       - bash: |
-          cargo clippy -- -D warnings
+          if [ $AGENT_OS = "Darwin" ]
+          then
+            cargo clippy --profile ci --target x86_64-apple-darwin -- -D warnings
+          else
+            cargo clippy --profile ci -- -D warnings
+          fi
         displayName: 'Check Clippy warnings'
         env:
           MANUAL_MM_VERSION: true
       - bash: |
-          cargo check --tests
+          if [ $AGENT_OS = "Darwin" ]
+          then
+            cargo check --tests --profile ci --target x86_64-apple-darwin
+          else
+            cargo check --tests --profile ci
+          fi
         displayName: 'Check Tests'
         env:
           MANUAL_MM_VERSION: true
diff --git a/azure-pipelines-release-stage-job.yml b/azure-pipelines-release-stage-job.yml
index 3ea90d3059..06ef60c34e 100644
--- a/azure-pipelines-release-stage-job.yml
+++ b/azure-pipelines-release-stage-job.yml
@@ -41,7 +41,7 @@ jobs:
           mkdir upload
         displayName: 'Recreate upload dir'
       - bash: |
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Debug
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Debug
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
@@ -67,6 +67,7 @@ jobs:
         condition: eq( variables['DEBUG_UPLOADED'], '' )
         env:
           MANUAL_MM_VERSION: true
+          JEMALLOC_SYS_WITH_MALLOC_CONF: "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
       - 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'
@@ -82,7 +83,7 @@ jobs:
         condition: and( eq( variables['Agent.OS'], 'Windows_NT' ), eq( variables['DEBUG_UPLOADED'], '' ) )
       - bash: |
           rm -f MM_VERSION
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          VERSION=$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
           if ! grep -q $VERSION MM_VERSION; then
             echo $VERSION > MM_VERSION
           fi
diff --git a/azure-pipelines-wasm-stage-job.yml b/azure-pipelines-wasm-stage-job.yml
index 65519832df..350b194eae 100644
--- a/azure-pipelines-wasm-stage-job.yml
+++ b/azure-pipelines-wasm-stage-job.yml
@@ -35,21 +35,21 @@ jobs:
       - bash: |
           rm -rf upload
           mkdir upload
-          VERSION=2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release
+          VERSION=$(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
+          CC=clang-8 wasm-pack build mm2src/mm2_bin_lib --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
+          CC=clang-8 cargo test --package mm2_main --target wasm32-unknown-unknown --release
         displayName: 'Test MM2 WASM'
         env:
-          WASM_BINDGEN_TEST_TIMEOUT: 120
+          WASM_BINDGEN_TEST_TIMEOUT: 180
           GECKODRIVER: '/home/azureagent/wasm/geckodriver'
           BOB_PASSPHRASE: $(${{ parameters.bob_passphrase }})
           ALICE_PASSPHRASE: $(${{ parameters.alice_passphrase }})
@@ -57,7 +57,7 @@ jobs:
         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
+          zip ../../upload/mm2-$(COMMIT_HASH)-$(Agent.OS)-Wasm-Release mm2lib_bg.wasm mm2lib.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
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6ec3792170..44e1a63d57 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,6 +22,16 @@ trigger:
 pr: # https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema%2Cparameter-schema#pr-trigger
   drafts: false
 
+# https://docs.microsoft.com/ru-ru/azure/devops/pipelines/process/scheduled-triggers?view=azure-devops&tabs=yaml#scheduled-triggers
+# Triggers clean checkout to compile from scratch, remove old builds artifacts, and free disk space on CI agents.
+# https://github.com/KomodoPlatform/atomicDEX-API/blob/957fd856fb74d462058a5ad47ec46d79e3bf1d83/azure-pipelines-build-stage-job.yml#L20
+schedules:
+  - cron: "0 0 * * *"
+    displayName: Scheduled clean midnight UTC build
+    branches:
+      include:
+        - dev
+
 stages:
   - stage: Lint
     displayName: Formatting, Clippy, and other checks
diff --git a/deny.toml b/deny.toml
index 6bb0b0f430..0120610616 100644
--- a/deny.toml
+++ b/deny.toml
@@ -48,20 +48,25 @@ 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
 # RUSTSEC-2022-0040 is related to owning-ref, which seems unmaintained. We need to find a way to get rid of it. https://github.com/KomodoPlatform/atomicDEX-API/issues/1429
-# RUSTSEC-2020-0159 is related to chrono, updated in dev
 # RUSTSEC-2022-0055 is axum/axum-core vulnerability, which seems to be related only to server-side, which we don't utilize.
 # RUSTSEC-2023-0001 is tokio Windows-specific bug in the code that we don't use
+# Unignore RUSTSEC-2022-0084 after updating libp2p
 ignore = [
-    "RUSTSEC-2021-0113",
     "RUSTSEC-2020-0071",
     "RUSTSEC-2022-0040",
-    "RUSTSEC-2020-0159",
-    "RUSTSEC-2022-0055",
-    "RUSTSEC-2023-0001",
-    #"RUSTSEC-0000-0000",
+	"RUSTSEC-2022-0041",
+    "RUSTSEC-2022-0070",
+    "RUSTSEC-2021-0145",
+    "RUSTSEC-2020-0056",
+    "RUSTSEC-2022-0080",
+    "RUSTSEC-2020-0036",
+    "RUSTSEC-2021-0139",
+    "RUSTSEC-2021-0059",
+    "RUSTSEC-2021-0060",
+    "RUSTSEC-2022-0090",
+    "RUSTSEC-2023-0018",
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories
@@ -183,6 +188,7 @@ deny = [
 # The goal is to reduce this list as much as possible
 skip = [
     { name = "aes", version = "*" },
+    { name = "adler", version = "*" },
     { name = "ahash", version = "*" },
     { name = "arrayvec", version = "*" },
     { name = "autocfg", version = "*" },
@@ -267,6 +273,8 @@ skip = [
     { name = "rustls-pemfile", version = "*" },
     { name = "scopeguard", version = "*" },
     { name = "sct", version = "*" },
+    { name = "secp256k1", version = "*" },
+    { name = "secp256k1-sys", version = "*" },
     { name = "semver", version = "*" },
     { name = "send_wrapper", version = "*" },
     { name = "sha2", version = "*" },
@@ -276,6 +284,7 @@ skip = [
     { name = "subtle", version = "*" },
     { name = "syn", version = "*" },
     { name = "time", version = "*" },
+    { name = "time-macros", version = "*" },
     { name = "tiny-keccak", version = "*" },
     { name = "tokio-util", version = "*" },
     { name = "trie-root", version = "*" },
@@ -283,6 +292,7 @@ skip = [
     { name = "unicode-xid", version = "*" },
     { name = "unsigned-varint", version = "*" },
     { name = "url", version = "*" },
+    { name = "uuid", version = "*" },
     { name = "wasi", version = "*" },
     { name = "webpki", version = "*" },
     { name = "wyz", version = "*" },
diff --git a/dev-logs/2023-feb/enhancements/.gitkeep b/dev-logs/2023-feb/enhancements/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dev-logs/2023-feb/features/.gitkeep b/dev-logs/2023-feb/features/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dev-logs/2023-feb/fixes/.gitkeep b/dev-logs/2023-feb/fixes/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dev-logs/2023-feb/fixes/fix_swap_time_difference_err_message b/dev-logs/2023-feb/fixes/fix_swap_time_difference_err_message
new file mode 100644
index 0000000000..91d0075a1a
--- /dev/null
+++ b/dev-logs/2023-feb/fixes/fix_swap_time_difference_err_message
@@ -0,0 +1,4 @@
+Changed the error message for failing swaps due to a time difference between maker and taker to a more informative one
+
+
+author: @shamardy <shamardy@gmail.com>
\ No newline at end of file
diff --git a/dev-logs/2023-feb/upgrades/.gitkeep b/dev-logs/2023-feb/upgrades/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dev-logs/2023-feb/upgrades/axum_core_upgrade_to_0_2_9 b/dev-logs/2023-feb/upgrades/axum_core_upgrade_to_0_2_9
new file mode 100644
index 0000000000..2dd6415bca
--- /dev/null
+++ b/dev-logs/2023-feb/upgrades/axum_core_upgrade_to_0_2_9
@@ -0,0 +1,6 @@
+axum-core upgraded to 0.2.9 because current version(0.2.4) considered as vulnerable
+
+further informations https://rustsec.org/advisories/RUSTSEC-2022-0055.html
+
+
+author: @ozkanonur <work@onurozkan.dev>
\ No newline at end of file
diff --git a/dev-logs/2023-feb/upgrades/bumpalo_upgrade_to_3_12_0 b/dev-logs/2023-feb/upgrades/bumpalo_upgrade_to_3_12_0
new file mode 100644
index 0000000000..fcb627621b
--- /dev/null
+++ b/dev-logs/2023-feb/upgrades/bumpalo_upgrade_to_3_12_0
@@ -0,0 +1,6 @@
+bumpalo upgraded to 3.12.0 because current version(3.4.0) considered as vulnerable
+
+further informations https://rustsec.org/advisories/RUSTSEC-2022-0078.html
+
+
+author: @ozkanonur <work@onurozkan.dev>
\ No newline at end of file
diff --git a/dev-logs/2023-feb/upgrades/libp2p_upgrade_to_0_45_1 b/dev-logs/2023-feb/upgrades/libp2p_upgrade_to_0_45_1
new file mode 100644
index 0000000000..60933a2681
--- /dev/null
+++ b/dev-logs/2023-feb/upgrades/libp2p_upgrade_to_0_45_1
@@ -0,0 +1,6 @@
+libp2p upgraded to 0.45.1 because current version(0.45.0) considered as vulnerable
+
+further informations https://rustsec.org/advisories/RUSTSEC-2022-0084.html
+
+
+author: @ozkanonur <work@onurozkan.dev>
\ No newline at end of file
diff --git a/dev-logs/2023-feb/upgrades/tokio_upgrade_to_1_25_0 b/dev-logs/2023-feb/upgrades/tokio_upgrade_to_1_25_0
new file mode 100644
index 0000000000..9aff385837
--- /dev/null
+++ b/dev-logs/2023-feb/upgrades/tokio_upgrade_to_1_25_0
@@ -0,0 +1,6 @@
+tokio upgraded to 1.25.0 because current version(1.18.2) considered as vulnerable
+
+further informations https://rustsec.org/advisories/RUSTSEC-2023-0001.html and https://rustsec.org/advisories/RUSTSEC-2023-0005.html
+
+
+author: @ozkanonur <work@onurozkan.dev>
\ No newline at end of file
diff --git a/docs/ANDROID.md b/docs/ANDROID.md
index e833d70d39..3a665493cf 100644
--- a/docs/ANDROID.md
+++ b/docs/ANDROID.md
@@ -53,16 +53,16 @@ by setting the NDK_HOME variable.
 
 #### armeabi-v7a
 
-    cross build --features native --target=armv7-linux-androideabi --release --lib
+    cross build --target=armv7-linux-androideabi --release --lib
 
 #### arm64-v8a
 
-    cross build --features native --target=aarch64-linux-android --release --lib
+    cross build --target=aarch64-linux-android --release --lib
 
 #### x86
 
-    cross build --features native --target=i686-linux-android --release --lib
+    cross build --target=i686-linux-android --release --lib
 
 #### x86_64
 
-    cross build --features native --target=x86_64-linux-android --release --lib
+    cross build --target=x86_64-linux-android --release --lib
diff --git a/docs/ANDROID_CROSS_ON_M1_MAC.md b/docs/ANDROID_CROSS_ON_M1_MAC.md
index 8ab0f24415..3d9321a49e 100644
--- a/docs/ANDROID_CROSS_ON_M1_MAC.md
+++ b/docs/ANDROID_CROSS_ON_M1_MAC.md
@@ -18,17 +18,17 @@ rustup target add x86_64-linux-android
    ```
    Build armv7-linux-androideabi target
    ```shell
-   CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang AR_armv7_linux_androideabi=llvm-ar CXX_armv7_linux_androideabi=armv7a-linux-androideabi21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo build --target=armv7-linux-androideabi --release --lib
+   CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang AR_armv7_linux_androideabi=llvm-ar CXX_armv7_linux_androideabi=armv7a-linux-androideabi21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo rustc --target=armv7-linux-androideabi --release --lib --crate-type=staticlib --package mm2_bin_lib
    ```
    Build aarch64-linux-android target
    ```shell
-   CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang CC_aarch64_linux_android=aarch64-linux-android21-clang AR_aarch64_linux_android=llvm-ar CXX_aarch64_linux_android=aarch64-linux-android21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo build --target=aarch64-linux-android --release --lib
+   CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang CC_aarch64_linux_android=aarch64-linux-android21-clang AR_aarch64_linux_android=llvm-ar CXX_aarch64_linux_android=aarch64-linux-android21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo rustc --target=aarch64-linux-android --release --lib --crate-type=staticlib --package mm2_bin_lib
    ```
    Build i686-linux-android target
    ```shell
-   CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android21-clang CC_i686_linux_android=i686-linux-android21-clang AR_i686_linux_android=llvm-ar CXX_i686_linux_android=i686-linux-android21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo build --target=i686-linux-android --release --lib
+   CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android21-clang CC_i686_linux_android=i686-linux-android21-clang AR_i686_linux_android=llvm-ar CXX_i686_linux_android=i686-linux-android21-clang++ ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo rustc --target=i686-linux-android --release --lib --crate-type=staticlib --package mm2_bin_lib
    ```
    Build x86_64-linux-android target
    ```shell
-   CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang CC_x86_64_linux_android=x86_64-linux-android21-clang CXX_x86_64_linux_android=x86_64-linux-android21-clang++ AR_x86_64_linux_android=llvm-ar ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo build --target=x86_64-linux-android --release --lib
+   CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang CC_x86_64_linux_android=x86_64-linux-android21-clang CXX_x86_64_linux_android=x86_64-linux-android21-clang++ AR_x86_64_linux_android=llvm-ar ANDROID_NDK_HOME="/opt/homebrew/share/android-ndk" cargo rustc --target=x86_64-linux-android --release --lib --crate-type=staticlib --package mm2_bin_lib
    ```
diff --git a/docs/DEV_ENVIRONMENT.md b/docs/DEV_ENVIRONMENT.md
index 990a502ea7..3c827d6fdc 100644
--- a/docs/DEV_ENVIRONMENT.md
+++ b/docs/DEV_ENVIRONMENT.md
@@ -46,7 +46,7 @@
 4. Set environment variables required to run WASM tests
    ```shell
    # wasm-bindgen specific variables
-   export WASM_BINDGEN_TEST_TIMEOUT=120
+   export WASM_BINDGEN_TEST_TIMEOUT=180
    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"
diff --git a/docs/WASM_BUILD.md b/docs/WASM_BUILD.md
index c2e5bd7bee..13d568dffc 100644
--- a/docs/WASM_BUILD.md
+++ b/docs/WASM_BUILD.md
@@ -19,24 +19,24 @@ To build WASM release binary run one of the following commands according to your
 
 - for Linux users:
    ```
-   wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/
+   wasm-pack build mm2src/mm2_bin_lib --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/
+   CC=/usr/local/opt/llvm/bin/clang AR=/usr/local/opt/llvm/bin/llvm-ar wasm-pack build mm2src/mm2_bin_lib --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/
+   CC=/opt/homebrew/opt/llvm/bin/clang AR=/opt/homebrew/opt/llvm/bin/llvm-ar wasm-pack build mm2src/mm2_bin_lib --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:
+If you want to disable optimizations to reduce the compilation time, run `wasm-pack build mm2src/mm2_bin_lib` with an additional `--dev` flag:
 ```
-wasm-pack build mm2src/mm2_main --target web --out-dir wasm_build/deps/pkg/ --dev
+wasm-pack build mm2src/mm2_bin_lib --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/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
index 8dd4474b98..1d77bb0001 100644
--- a/mm2src/coins/Cargo.toml
+++ b/mm2src/coins/Cargo.toml
@@ -5,6 +5,10 @@ edition = "2018"
 
 [features]
 zhtlc-native-tests = []
+# TODO
+# Remove this once the solana integration becomes stable/completed.
+disable-solana-tests = []
+default = ["disable-solana-tests"]
 
 [lib]
 name = "coins"
@@ -17,7 +21,6 @@ async-trait = "0.1.52"
 base64 = "0.10.0"
 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"
@@ -26,46 +29,46 @@ bytes = "0.4"
 cfg-if = "1.0"
 chain = { path = "../mm2_bitcoin/chain" }
 common = { path = "../common" }
+cosmrs = { version = "0.7", default-features = false }
 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" }
+enum_from = { path = "../derives/enum_from" }
+ethabi = { version = "17.0.0" }
+ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
+ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
+ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
 # Waiting for https://github.com/rust-lang/rust/issues/54725 to use on Stable.
 #enum_dispatch = "0.1"
 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"] }
+group = "0.8.0"
 gstuff = { version = "0.7", features = ["nightly"] }
 hex = "0.4.2"
 http = "0.2"
 itertools = { version = "0.10", features = ["use_std"] }
-jsonrpc-core = "8.0.1"
+jsonrpc-core = "18.0.0"
 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_metrics = { path = "../mm2_metrics" }
 mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number" }
-mocktopus = "0.7.0"
+mocktopus = "0.8.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" }
+rlp = { version = "0.5" }
 rmp-serde = "0.14.3"
 rpc = { path = "../mm2_bitcoin/rpc" }
 rpc_task = { path = "../rpc_task" }
@@ -75,17 +78,20 @@ 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"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 serialization = { path = "../mm2_bitcoin/serialization" }
 serialization_derive = { path = "../mm2_bitcoin/serialization_derive" }
 spv_validation = { path = "../mm2_bitcoin/spv_validation" }
 sha2 = "0.9"
 sha3 = "0.9"
 utxo_signer = { path = "utxo_signer" }
+# using the same version as cosmrs
+tendermint-rpc = { version = "=0.23.7", default-features = false }
 tiny-bip39 = "0.8.0"
+uuid = { version = "0.7", features = ["serde", "v4"] }
 # 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 }
+web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.19.0", default-features = false }
 zbase32 = "0.1.2"
 
 [target.'cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))'.dependencies]
@@ -98,6 +104,7 @@ spl-associated-token-account = "1"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { version = "0.3.27" }
 mm2_db = { path = "../mm2_db" }
+mm2_metamask = { path = "../mm2_metamask" }
 mm2_test_helpers = { path = "../mm2_test_helpers" }
 wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
 wasm-bindgen-futures = { version = "0.4.1" }
@@ -106,11 +113,21 @@ web-sys = { version = "0.3.55", features = ["console", "Headers", "Request", "Re
 
 [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" }
+bitcoin = "0.28.1"
+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.23", default-features = false, features = ["http1", "http2", "webpki-tokio"] }
+lightning = "0.0.110"
+lightning-background-processor = "0.0.110"
+lightning-invoice = { version = "0.18.0", features = ["serde"] }
+lightning-net-tokio = "0.0.110"
+lightning-rapid-gossip-sync = "0.0.110"
 rust-ini = { version = "0.13" }
 rustls = { version = "0.20", features = ["dangerous_configuration"] }
-tokio = { version = "1.7" }
+secp256k1v22 = { version = "0.22", package = "secp256k1" }
+tendermint-config = { version = "0.23.7", default-features = false }
+tokio = { version = "1.20" }
 tokio-rustls = { version = "0.23" }
 tonic = { version = "0.7", features = ["tls", "tls-webpki-roots", "compression"] }
 webpki-roots = { version = "0.22" }
diff --git a/mm2src/coins/coin_balance.rs b/mm2src/coins/coin_balance.rs
index da1b49eef2..8dca163419 100644
--- a/mm2src/coins/coin_balance.rs
+++ b/mm2src/coins/coin_balance.rs
@@ -1,25 +1,31 @@
 use crate::hd_pubkey::HDXPubExtractor;
-use crate::hd_wallet::{HDWalletCoinOps, NewAccountCreatingError};
+use crate::hd_wallet::{HDAccountOps, HDAddressId, HDWalletCoinOps, HDWalletOps, NewAccountCreatingError,
+                       NewAddressDerivingError};
 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 mm2_number::BigDecimal;
+#[cfg(test)] use mocktopus::macros::*;
+use std::collections::HashMap;
 use std::ops::Range;
+use std::{fmt, iter};
 
 pub type AddressIdRange = Range<u32>;
 
-#[derive(Display)]
 pub enum EnableCoinBalanceError {
+    NewAddressDerivingError(NewAddressDerivingError),
     NewAccountCreatingError(NewAccountCreatingError),
     BalanceError(BalanceError),
 }
 
+impl From<NewAddressDerivingError> for EnableCoinBalanceError {
+    fn from(e: NewAddressDerivingError) -> Self { EnableCoinBalanceError::NewAddressDerivingError(e) }
+}
+
 impl From<NewAccountCreatingError> for EnableCoinBalanceError {
     fn from(e: NewAccountCreatingError) -> Self { EnableCoinBalanceError::NewAccountCreatingError(e) }
 }
@@ -30,11 +36,32 @@ impl From<BalanceError> for EnableCoinBalanceError {
 
 #[derive(Clone, Debug, PartialEq, Serialize)]
 #[serde(tag = "wallet_type")]
-pub enum EnableCoinBalance {
+pub enum CoinBalanceReport {
     Iguana(IguanaWalletBalance),
     HD(HDWalletBalance),
 }
 
+impl CoinBalanceReport {
+    /// Returns a map where the key is address, and the value is the address's total balance [`CoinBalance::total`].
+    pub fn to_addresses_total_balances(&self) -> HashMap<String, BigDecimal> {
+        match self {
+            CoinBalanceReport::Iguana(IguanaWalletBalance {
+                ref address,
+                ref balance,
+            }) => iter::once((address.clone(), balance.get_total())).collect(),
+            CoinBalanceReport::HD(HDWalletBalance { ref accounts }) => accounts
+                .iter()
+                .flat_map(|account_balance| {
+                    account_balance
+                        .addresses
+                        .iter()
+                        .map(|addr_balance| (addr_balance.address.clone(), addr_balance.balance.get_total()))
+                })
+                .collect(),
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize)]
 pub struct IguanaWalletBalance {
     pub address: String,
@@ -78,15 +105,57 @@ impl Default for EnableCoinScanPolicy {
     fn default() -> Self { EnableCoinScanPolicy::ScanIfNewWallet }
 }
 
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct EnabledCoinBalanceParams {
+    #[serde(default)]
+    pub scan_policy: EnableCoinScanPolicy,
+    pub min_addresses_number: Option<u32>,
+}
+
+#[async_trait]
+pub trait CoinBalanceReportOps {
+    async fn coin_balance_report(&self) -> BalanceResult<CoinBalanceReport>;
+}
+
+#[async_trait]
+impl<Coin> CoinBalanceReportOps for Coin
+where
+    Coin: CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
+        + HDWalletBalanceOps
+        + MarketCoinOps
+        + Sync,
+    <Coin as CoinWithDerivationMethod>::Address: fmt::Display + Sync,
+{
+    async fn coin_balance_report(&self) -> BalanceResult<CoinBalanceReport> {
+        match self.derivation_method() {
+            DerivationMethod::SingleAddress(my_address) => self
+                .my_balance()
+                .compat()
+                .await
+                .map(|balance| {
+                    CoinBalanceReport::Iguana(IguanaWalletBalance {
+                        address: my_address.to_string(),
+                        balance,
+                    })
+                })
+                .mm_err(BalanceError::from),
+            DerivationMethod::HDWallet(hd_wallet) => self
+                .all_accounts_balances(hd_wallet)
+                .await
+                .map(|accounts| CoinBalanceReport::HD(HDWalletBalance { accounts })),
+        }
+    }
+}
+
 #[async_trait]
 pub trait EnableCoinBalanceOps {
     async fn enable_coin_balance<XPubExtractor>(
         &self,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
-    ) -> MmResult<EnableCoinBalance, EnableCoinBalanceError>
+        params: EnabledCoinBalanceParams,
+    ) -> MmResult<CoinBalanceReport, EnableCoinBalanceError>
     where
-        XPubExtractor: HDXPubExtractor + Sync;
+        XPubExtractor: HDXPubExtractor;
 }
 
 #[async_trait]
@@ -101,27 +170,27 @@ where
     async fn enable_coin_balance<XPubExtractor>(
         &self,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
-    ) -> MmResult<EnableCoinBalance, EnableCoinBalanceError>
+        params: EnabledCoinBalanceParams,
+    ) -> MmResult<CoinBalanceReport, EnableCoinBalanceError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         match self.derivation_method() {
-            DerivationMethod::Iguana(my_address) => self
+            DerivationMethod::SingleAddress(my_address) => self
                 .my_balance()
                 .compat()
                 .await
                 .map(|balance| {
-                    EnableCoinBalance::Iguana(IguanaWalletBalance {
+                    CoinBalanceReport::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)
+                .enable_hd_wallet(hd_wallet, xpub_extractor, params)
                 .await
-                .map(EnableCoinBalance::HD),
+                .map(CoinBalanceReport::HD),
         }
     }
 }
@@ -139,10 +208,10 @@ pub trait HDWalletBalanceOps: HDWalletCoinOps {
         &self,
         hd_wallet: &Self::HDWallet,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
+        params: EnabledCoinBalanceParams,
     ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
     where
-        XPubExtractor: HDXPubExtractor + Sync;
+        XPubExtractor: HDXPubExtractor;
 
     /// Scans for the new addresses of the specified `hd_account` using the given `address_scanner`.
     /// Returns balances of the new addresses.
@@ -154,6 +223,30 @@ pub trait HDWalletBalanceOps: HDWalletCoinOps {
         gap_limit: u32,
     ) -> BalanceResult<Vec<HDAddressBalance>>;
 
+    /// Requests balances of every activated HD account.
+    async fn all_accounts_balances(&self, hd_wallet: &Self::HDWallet) -> BalanceResult<Vec<HDAccountBalance>> {
+        let accounts = hd_wallet.get_accounts().await;
+
+        let mut result = Vec::with_capacity(accounts.len());
+        for (_account_id, hd_account) in accounts {
+            let addresses = self.all_known_addresses_balances(&hd_account).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,
+            };
+
+            result.push(account_balance);
+        }
+
+        Ok(result)
+    }
+
     /// 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>>;
 
@@ -168,18 +261,21 @@ pub trait HDWalletBalanceOps: HDWalletCoinOps {
         Self::Address: fmt::Display + Clone,
         Ids: Iterator<Item = u32> + Send,
     {
-        let (addresses, der_paths) = address_ids
+        let address_ids = address_ids.map(|address_id| HDAddressId { chain, address_id });
+
+        // Derive HD addresses and split addresses and their derivation paths into two collections.
+        let (addresses, der_paths): (Vec<_>, Vec<_>) = self
+            .derive_addresses(hd_account, address_ids)
+            .await?
             .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<_>>()?;
+            .map(
+                |HDAddress {
+                     address,
+                     derivation_path,
+                     ..
+                 }| (address, derivation_path),
+            )
+            .unzip();
 
         let balances = self
             .known_addresses_balances(addresses)
@@ -228,6 +324,7 @@ pub trait HDWalletBalanceOps: HDWalletCoinOps {
 }
 
 #[async_trait]
+#[cfg_attr(test, mockable)]
 pub trait HDAddressBalanceScanner: Sync {
     type Address;
 
@@ -249,9 +346,11 @@ pub mod common_impl {
         hd_account: &mut Coin::HDAccount,
         address_scanner: &Coin::HDAddressScanner,
         scan_new_addresses: bool,
+        min_addresses_number: Option<u32>,
     ) -> MmResult<HDAccountBalance, EnableCoinBalanceError>
     where
-        Coin: HDWalletBalanceOps + Sync,
+        Coin: HDWalletBalanceOps + MarketCoinOps + Sync,
+        Coin::Address: fmt::Display,
     {
         let gap_limit = hd_wallet.gap_limit();
         let mut addresses = coin.all_known_addresses_balances(hd_account).await?;
@@ -262,6 +361,10 @@ pub mod common_impl {
             );
         }
 
+        if let Some(min_addresses_number) = min_addresses_number {
+            gen_new_addresses(coin, hd_wallet, hd_account, &mut addresses, min_addresses_number).await?
+        }
+
         let total_balance = addresses.iter().fold(CoinBalance::default(), |total, addr_balance| {
             total + addr_balance.balance.clone()
         });
@@ -279,11 +382,12 @@ pub mod common_impl {
         coin: &Coin,
         hd_wallet: &Coin::HDWallet,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
+        params: EnabledCoinBalanceParams,
     ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
     where
         Coin: HDWalletBalanceOps + MarketCoinOps + Sync,
-        XPubExtractor: HDXPubExtractor + Sync,
+        Coin::Address: fmt::Display,
+        XPubExtractor: HDXPubExtractor,
     {
         let mut accounts = hd_wallet.get_accounts_mut().await;
         let address_scanner = coin.produce_hd_address_scanner().await?;
@@ -303,12 +407,19 @@ pub mod common_impl {
             // Create new HD account.
             let mut new_account = coin.create_new_account(hd_wallet, xpub_extractor).await?;
             let scan_new_addresses = matches!(
-                scan_policy,
+                params.scan_policy,
                 EnableCoinScanPolicy::ScanIfNewWallet | EnableCoinScanPolicy::Scan
             );
 
-            let account_balance =
-                enable_hd_account(coin, hd_wallet, &mut new_account, &address_scanner, scan_new_addresses).await?;
+            let account_balance = enable_hd_account(
+                coin,
+                hd_wallet,
+                &mut new_account,
+                &address_scanner,
+                scan_new_addresses,
+                params.min_addresses_number,
+            )
+            .await?;
             result.accounts.push(account_balance);
             return Ok(result);
         }
@@ -318,13 +429,85 @@ pub mod common_impl {
             accounts.len(),
             coin.ticker()
         );
-        let scan_new_addresses = matches!(scan_policy, EnableCoinScanPolicy::Scan);
+        let scan_new_addresses = matches!(params.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?;
+            let account_balance = enable_hd_account(
+                coin,
+                hd_wallet,
+                hd_account,
+                &address_scanner,
+                scan_new_addresses,
+                params.min_addresses_number,
+            )
+            .await?;
             result.accounts.push(account_balance);
         }
 
         Ok(result)
     }
+
+    /// Generate new address so that the total number of `result_addresses` addresses is at least `min_addresses_number`.
+    async fn gen_new_addresses<Coin>(
+        coin: &Coin,
+        hd_wallet: &Coin::HDWallet,
+        hd_account: &mut Coin::HDAccount,
+        result_addresses: &mut Vec<HDAddressBalance>,
+        min_addresses_number: u32,
+    ) -> MmResult<(), EnableCoinBalanceError>
+    where
+        Coin: HDWalletBalanceOps + MarketCoinOps + Sync,
+        Coin::Address: fmt::Display,
+    {
+        let max_addresses_number = hd_wallet.address_limit();
+        if min_addresses_number >= max_addresses_number {
+            return MmError::err(EnableCoinBalanceError::NewAddressDerivingError(
+                NewAddressDerivingError::AddressLimitReached { max_addresses_number },
+            ));
+        }
+
+        let min_addresses_number = min_addresses_number as usize;
+        let actual_addresses_number = result_addresses.len();
+        if actual_addresses_number >= min_addresses_number {
+            // There are more or equal to the `min_addresses_number` known addresses already.
+            return Ok(());
+        }
+
+        let to_generate = min_addresses_number - actual_addresses_number;
+        let chain = hd_wallet.default_receiver_chain();
+        let ticker = coin.ticker();
+        let account_id = hd_account.account_id();
+        info!("Generate '{to_generate}' addresses: ticker={ticker} account_id={account_id}, chain={chain:?}");
+
+        let mut new_addresses = Vec::with_capacity(to_generate);
+        let mut addresses_to_request = Vec::with_capacity(to_generate);
+        for _ in 0..to_generate {
+            let HDAddress {
+                address,
+                derivation_path,
+                ..
+            } = coin.generate_new_address(hd_wallet, hd_account, chain).await?;
+
+            new_addresses.push(HDAddressBalance {
+                address: address.to_string(),
+                derivation_path: RpcDerivationPath(derivation_path),
+                chain,
+                balance: CoinBalance::default(),
+            });
+            addresses_to_request.push(address);
+        }
+
+        let to_extend = coin
+            .known_addresses_balances(addresses_to_request)
+            .await?
+            .into_iter()
+            // The balances are guaranteed to be in the same order as they were requests.
+            .zip(new_addresses)
+            .map(|((_address, balance), mut address_info)| {
+                address_info.balance = balance;
+                address_info
+            });
+
+        result_addresses.extend(to_extend);
+        Ok(())
+    }
 }
diff --git a/mm2src/coins/coin_errors.rs b/mm2src/coins/coin_errors.rs
new file mode 100644
index 0000000000..a296f68adb
--- /dev/null
+++ b/mm2src/coins/coin_errors.rs
@@ -0,0 +1,96 @@
+use crate::{eth::Web3RpcError, my_tx_history_v2::MyTxHistoryErrorV2, utxo::rpc_clients::UtxoRpcError, DelegationError,
+            NumConversError, TxHistoryError, UnexpectedDerivationMethod, WithdrawError};
+use futures01::Future;
+use mm2_err_handle::prelude::MmError;
+use spv_validation::helpers_validation::SPVError;
+
+pub type ValidatePaymentFut<T> = Box<dyn Future<Item = T, Error = MmError<ValidatePaymentError>> + Send>;
+
+#[derive(Debug, Display)]
+pub enum ValidatePaymentError {
+    InternalError(String),
+    // Problem with deserializing the transaction, or one of the transaction parts is invalid.
+    TxDeserializationError(String),
+    InvalidParameter(String),
+    InvalidRpcResponse(String),
+    TxDoesNotExist(String),
+    SPVError(SPVError),
+    UnexpectedPaymentState(String),
+    Transport(String),
+    // Transaction has wrong properties, for example, it has been sent to a wrong address
+    WrongPaymentTx(String),
+}
+
+impl From<rlp::DecoderError> for ValidatePaymentError {
+    fn from(err: rlp::DecoderError) -> Self { Self::TxDeserializationError(err.to_string()) }
+}
+
+impl From<web3::Error> for ValidatePaymentError {
+    fn from(err: web3::Error) -> Self { Self::Transport(err.to_string()) }
+}
+
+impl From<NumConversError> for ValidatePaymentError {
+    fn from(err: NumConversError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<SPVError> for ValidatePaymentError {
+    fn from(err: SPVError) -> Self { Self::SPVError(err) }
+}
+
+impl From<serialization::Error> for ValidatePaymentError {
+    fn from(err: serialization::Error) -> Self { Self::TxDeserializationError(err.to_string()) }
+}
+
+impl From<UnexpectedDerivationMethod> for ValidatePaymentError {
+    fn from(err: UnexpectedDerivationMethod) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<UtxoRpcError> for ValidatePaymentError {
+    fn from(err: UtxoRpcError) -> Self {
+        match err {
+            UtxoRpcError::Transport(e) => Self::Transport(e.to_string()),
+            UtxoRpcError::Internal(e) => Self::InternalError(e),
+            _ => Self::InvalidRpcResponse(err.to_string()),
+        }
+    }
+}
+
+impl From<Web3RpcError> for ValidatePaymentError {
+    fn from(e: Web3RpcError) -> Self {
+        match e {
+            Web3RpcError::Transport(tr) => ValidatePaymentError::Transport(tr),
+            Web3RpcError::InvalidResponse(resp) => ValidatePaymentError::InvalidRpcResponse(resp),
+            Web3RpcError::Internal(internal) => ValidatePaymentError::InternalError(internal),
+        }
+    }
+}
+
+#[derive(Debug, Display)]
+pub enum MyAddressError {
+    UnexpectedDerivationMethod(String),
+    InternalError(String),
+}
+
+impl From<UnexpectedDerivationMethod> for MyAddressError {
+    fn from(err: UnexpectedDerivationMethod) -> Self { Self::UnexpectedDerivationMethod(err.to_string()) }
+}
+
+impl From<MyAddressError> for WithdrawError {
+    fn from(err: MyAddressError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<MyAddressError> for UtxoRpcError {
+    fn from(err: MyAddressError) -> Self { Self::Internal(err.to_string()) }
+}
+
+impl From<MyAddressError> for DelegationError {
+    fn from(err: MyAddressError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<MyAddressError> for TxHistoryError {
+    fn from(err: MyAddressError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<MyAddressError> for MyTxHistoryErrorV2 {
+    fn from(err: MyAddressError) -> Self { Self::Internal(err.to_string()) }
+}
diff --git a/mm2src/coins/eth.rs b/mm2src/coins/eth.rs
index 1a2f6dc78e..6d7ecc942d 100644
--- a/mm2src/coins/eth.rs
+++ b/mm2src/coins/eth.rs
@@ -20,26 +20,31 @@
 //
 //  Copyright © 2022 AtomicDEX. All rights reserved.
 //
+use super::eth::Action::{Call, Create};
 use async_trait::async_trait;
-use bitcrypto::{keccak256, sha256};
-use common::executor::Timer;
-use common::log::{error, info, warn};
-use common::{now_ms, small_rng, DEX_FEE_ADDR_RAW_PUBKEY};
+use bitcrypto::{keccak256, ripemd160, sha256};
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::custom_futures::timeout::FutureTimerExt;
+use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError, Timer};
+use common::log::{debug, error, info, warn};
+use common::number_type_casting::SafeTypeCastingNumbers;
+use common::{get_utc_timestamp, now_ms, small_rng, DEX_FEE_ADDR_RAW_PUBKEY};
 use crypto::privkey::key_pair_from_secret;
+use crypto::{CryptoCtx, CryptoCtxError, GlobalHDAccountArc, KeyPairPolicy};
 use derive_more::Display;
-use ethabi::{Contract, Token};
+use ethabi::{Contract, Function, Token};
 pub use ethcore_transaction::SignedTransaction as SignedEthTx;
 use ethcore_transaction::{Action, Transaction as UnSignedEthTx, UnverifiedTransaction};
 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 futures::future::{join_all, 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_net::transport::{slurp_url, GuiAuthValidation, GuiAuthValidationGenerator, SlurpError};
 use mm2_number::{BigDecimal, MmNumber};
 #[cfg(test)] use mocktopus::macros::*;
 use rand::seq::SliceRandom;
@@ -49,40 +54,61 @@ use serde_json::{self as json, Value as Json};
 use serialization::{CompactInteger, Serializable, Stream};
 use sha3::{Digest, Keccak256};
 use std::collections::HashMap;
+use std::convert::TryFrom;
 use std::ops::Deref;
-use std::path::PathBuf;
+#[cfg(not(target_arch = "wasm32"))] use std::path::PathBuf;
 use std::str::FromStr;
 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};
+                  TraceFilterBuilder, Transaction as Web3Transaction, TransactionId, U64};
 use web3::{self, Web3};
-use web3_transport::{EthFeeHistoryNamespace, Web3Transport};
-
-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};
+use web3_transport::{http_transport::HttpTransportNode, EthFeeHistoryNamespace, Web3Transport};
 
+cfg_wasm32! {
+    use crypto::MetamaskArc;
+    use ethereum_types::{H264, H520};
+    use mm2_metamask::MetamaskError;
+    use web3::types::TransactionRequest;
+}
+
+use super::{coin_conf, AsyncMutex, BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner,
+            CoinProtocol, CoinTransportMetrics, CoinsContext, FeeApproxStage, FoundSwapTxSpend, HistorySyncState,
+            IguanaPrivKey, MakerSwapTakerCoin, MarketCoinOps, MmCoin, MyAddressError, NegotiateSwapContractAddrErr,
+            NumConversError, NumConversResult, PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy,
+            PrivKeyPolicyNotAllowed, RawTransactionError, RawTransactionFut, RawTransactionRequest, RawTransactionRes,
+            RawTransactionResult, RefundError, RefundResult, RpcClientType, RpcTransportEventHandler,
+            RpcTransportEventHandlerShared, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureError, SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee,
+            TradePreimageError, TradePreimageFut, TradePreimageResult, TradePreimageValue, Transaction,
+            TransactionDetails, TransactionEnum, TransactionErr, TransactionFut, TxMarshalingErr,
+            UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr,
+            ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, VerificationError,
+            VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput,
+            WatcherValidateTakerFeeInput, WithdrawError, WithdrawFee, WithdrawFut, WithdrawRequest, WithdrawResult,
+            EARLY_CONFIRMATION_ERR_LOG, INVALID_CONTRACT_ADDRESS_ERR_LOG, INVALID_RECEIVER_ERR_LOG,
+            INVALID_SENDER_ERR_LOG};
 pub use rlp;
 
 #[cfg(test)] mod eth_tests;
 #[cfg(target_arch = "wasm32")] mod eth_wasm_tests;
 mod web3_transport;
 
+#[path = "eth/v2_activation.rs"] pub mod v2_activation;
+use v2_activation::build_address_and_priv_key_policy;
+
+mod nonce;
+use nonce::ParityNonce;
+
 /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol
 /// Dev chain (195.201.0.6:8565) contract address: 0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd
 /// Ropsten: https://ropsten.etherscan.io/address/0x7bc1bbdd6a0a722fc9bffc49c921b685ecb84b94
 /// ETH mainnet: https://etherscan.io/address/0x8500AFc0bc5214728082163326C2FF0C73f4a871
-const SWAP_CONTRACT_ABI: &str = r#"[{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_amount","type":"uint256"},{"name":"_secret","type":"bytes32"},{"name":"_tokenAddress","type":"address"},{"name":"_sender","type":"address"}],"name":"receiverSpend","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"","type":"bytes32"}],"name":"payments","outputs":[{"name":"paymentHash","type":"bytes20"},{"name":"lockTime","type":"uint64"},{"name":"state","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_receiver","type":"address"},{"name":"_secretHash","type":"bytes20"},{"name":"_lockTime","type":"uint64"}],"name":"ethPayment","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_amount","type":"uint256"},{"name":"_paymentHash","type":"bytes20"},{"name":"_tokenAddress","type":"address"},{"name":"_receiver","type":"address"}],"name":"senderRefund","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_id","type":"bytes32"},{"name":"_amount","type":"uint256"},{"name":"_tokenAddress","type":"address"},{"name":"_receiver","type":"address"},{"name":"_secretHash","type":"bytes20"},{"name":"_lockTime","type":"uint64"}],"name":"erc20Payment","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"id","type":"bytes32"}],"name":"PaymentSent","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"id","type":"bytes32"},{"indexed":false,"name":"secret","type":"bytes32"}],"name":"ReceiverSpent","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"id","type":"bytes32"}],"name":"SenderRefunded","type":"event"}]"#;
+const SWAP_CONTRACT_ABI: &str = include_str!("eth/swap_contract_abi.json");
 /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md
-const ERC20_ABI: &str = r#"[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]"#;
-
+const ERC20_ABI: &str = include_str!("eth/erc20_abi.json");
 /// Payment states from etomic swap smart contract: https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol#L5
 pub const PAYMENT_STATE_UNINITIALIZED: u8 = 0;
 pub const PAYMENT_STATE_SENT: u8 = 1;
@@ -95,8 +121,14 @@ const GAS_PRICE_PERCENT: u64 = 10;
 const BASE_BLOCK_FEE_DIFF_PCT: u64 = 13;
 const DEFAULT_LOGS_BLOCK_RANGE: u64 = 1000;
 
+const DEFAULT_REQUIRED_CONFIRMATIONS: u8 = 1;
+
+const ETH_DECIMALS: u8 = 18;
+
 /// Take into account that the dynamic fee may increase by 3% during the swap.
 const GAS_PRICE_APPROXIMATION_PERCENT_ON_START_SWAP: u64 = 3;
+/// Take into account that the dynamic fee may increase until the locktime is expired
+const GAS_PRICE_APPROXIMATION_PERCENT_ON_WATCHER_PREIMAGE: u64 = 3;
 /// Take into account that the dynamic fee may increase at each of the following stages:
 /// - it may increase by 2% until a swap is started;
 /// - it may increase by 3% during the swap.
@@ -107,6 +139,11 @@ const GAS_PRICE_APPROXIMATION_PERCENT_ON_ORDER_ISSUE: u64 = 5;
 /// - it may increase by 3% during the swap.
 const GAS_PRICE_APPROXIMATION_PERCENT_ON_TRADE_PREIMAGE: u64 = 7;
 
+const ETH_GAS: u64 = 150_000;
+
+/// Lifetime of generated signed message for gui-auth requests
+const GUI_AUTH_SIGNED_MESSAGE_LIFETIME_SEC: i64 = 90;
+
 lazy_static! {
     pub static ref SWAP_CONTRACT: Contract = Contract::load(SWAP_CONTRACT_ABI.as_bytes()).unwrap();
     pub static ref ERC20_CONTRACT: Contract = Contract::load(ERC20_ABI.as_bytes()).unwrap();
@@ -172,12 +209,13 @@ impl From<serde_json::Error> for Web3RpcError {
 impl From<web3::Error> for Web3RpcError {
     fn from(e: web3::Error) -> Self {
         let error_str = e.to_string();
-        match e.kind() {
-            web3::ErrorKind::InvalidResponse(_)
-            | web3::ErrorKind::Decoder(_)
-            | web3::ErrorKind::Msg(_)
-            | web3::ErrorKind::Rpc(_) => Web3RpcError::InvalidResponse(error_str),
-            web3::ErrorKind::Transport(_) | web3::ErrorKind::Io(_) => Web3RpcError::Transport(error_str),
+        match e {
+            web3::Error::InvalidResponse(_) | web3::Error::Decoder(_) | web3::Error::Rpc(_) => {
+                Web3RpcError::InvalidResponse(error_str)
+            },
+            web3::Error::Unreachable | web3::Error::Transport(_) | web3::Error::Io(_) => {
+                Web3RpcError::Transport(error_str)
+            },
             _ => Web3RpcError::Internal(error_str),
         }
     }
@@ -187,6 +225,15 @@ impl From<web3::Error> for RawTransactionError {
     fn from(e: web3::Error) -> Self { RawTransactionError::Transport(e.to_string()) }
 }
 
+impl From<Web3RpcError> for RawTransactionError {
+    fn from(e: Web3RpcError) -> Self {
+        match e {
+            Web3RpcError::Transport(tr) | Web3RpcError::InvalidResponse(tr) => RawTransactionError::Transport(tr),
+            Web3RpcError::Internal(internal) => RawTransactionError::InternalError(internal),
+        }
+    }
+}
+
 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.
@@ -195,6 +242,16 @@ impl From<ethabi::Error> for Web3RpcError {
     }
 }
 
+#[cfg(target_arch = "wasm32")]
+impl From<MetamaskError> for Web3RpcError {
+    fn from(e: MetamaskError) -> Self {
+        match e {
+            MetamaskError::Internal(internal) => Web3RpcError::Internal(internal),
+            other => Web3RpcError::Transport(other.to_string()),
+        }
+    }
+}
+
 impl From<ethabi::Error> for WithdrawError {
     fn from(e: ethabi::Error) -> Self {
         // Currently, we use the `ethabi` crate to work with a smart contract ABI known at compile time.
@@ -246,7 +303,16 @@ impl From<ethabi::Error> for BalanceError {
 }
 
 impl From<web3::Error> for BalanceError {
-    fn from(e: web3::Error) -> Self { BalanceError::Transport(e.to_string()) }
+    fn from(e: web3::Error) -> Self { BalanceError::from(Web3RpcError::from(e)) }
+}
+
+impl From<Web3RpcError> for BalanceError {
+    fn from(e: Web3RpcError) -> Self {
+        match e {
+            Web3RpcError::Transport(tr) | Web3RpcError::InvalidResponse(tr) => BalanceError::Transport(tr),
+            Web3RpcError::Internal(internal) => BalanceError::Internal(internal),
+        }
+    }
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -254,9 +320,9 @@ struct SavedTraces {
     /// ETH traces for my_address
     traces: Vec<Trace>,
     /// Earliest processed block
-    earliest_block: U256,
+    earliest_block: U64,
     /// Latest processed block
-    latest_block: U256,
+    latest_block: U64,
 }
 
 #[derive(Debug, Deserialize, Serialize)]
@@ -264,13 +330,13 @@ struct SavedErc20Events {
     /// ERC20 events for my_address
     events: Vec<Log>,
     /// Earliest processed block
-    earliest_block: U256,
+    earliest_block: U64,
     /// Latest processed block
-    latest_block: U256,
+    latest_block: U64,
 }
 
 #[derive(Debug, PartialEq, Eq)]
-enum EthCoinType {
+pub enum EthCoinType {
     /// Ethereum itself or it's forks: ETC/others
     Eth,
     /// ERC20 token with smart contract address
@@ -278,12 +344,78 @@ enum EthCoinType {
     Erc20 { platform: String, token_addr: Address },
 }
 
+/// An alternative to `crate::PrivKeyBuildPolicy`, typical only for ETH coin.
+pub enum EthPrivKeyBuildPolicy {
+    IguanaPrivKey(IguanaPrivKey),
+    GlobalHDAccount(GlobalHDAccountArc),
+    #[cfg(target_arch = "wasm32")]
+    Metamask(MetamaskArc),
+}
+
+impl EthPrivKeyBuildPolicy {
+    /// Detects the `EthPrivKeyBuildPolicy` with which the given `MmArc` is initialized.
+    pub fn detect_priv_key_policy(ctx: &MmArc) -> MmResult<EthPrivKeyBuildPolicy, CryptoCtxError> {
+        let crypto_ctx = CryptoCtx::from_ctx(ctx)?;
+
+        match crypto_ctx.key_pair_policy() {
+            KeyPairPolicy::Iguana => {
+                // Use an internal private key as the coin secret.
+                let priv_key = crypto_ctx.mm2_internal_privkey_secret();
+                Ok(EthPrivKeyBuildPolicy::IguanaPrivKey(priv_key))
+            },
+            KeyPairPolicy::GlobalHDAccount(global_hd) => Ok(EthPrivKeyBuildPolicy::GlobalHDAccount(global_hd.clone())),
+        }
+    }
+}
+
+impl TryFrom<PrivKeyBuildPolicy> for EthPrivKeyBuildPolicy {
+    type Error = PrivKeyPolicyNotAllowed;
+
+    /// Converts `PrivKeyBuildPolicy` to `EthPrivKeyBuildPolicy`
+    /// taking into account that  ETH doesn't support `Trezor` yet.
+    fn try_from(policy: PrivKeyBuildPolicy) -> Result<Self, Self::Error> {
+        match policy {
+            PrivKeyBuildPolicy::IguanaPrivKey(iguana) => Ok(EthPrivKeyBuildPolicy::IguanaPrivKey(iguana)),
+            PrivKeyBuildPolicy::GlobalHDAccount(global_hd) => Ok(EthPrivKeyBuildPolicy::GlobalHDAccount(global_hd)),
+            PrivKeyBuildPolicy::Trezor => Err(PrivKeyPolicyNotAllowed::HardwareWalletNotSupported),
+        }
+    }
+}
+
+/// An alternative to `crate::PrivKeyPolicy`, typical only for ETH coin.
+#[derive(Clone)]
+pub enum EthPrivKeyPolicy {
+    KeyPair(KeyPair),
+    #[cfg(target_arch = "wasm32")]
+    Metamask(EthMetamaskPolicy),
+}
+
+#[cfg(target_arch = "wasm32")]
+#[derive(Clone)]
+pub struct EthMetamaskPolicy {
+    pub(crate) public_key: H264,
+    pub(crate) public_key_uncompressed: H520,
+}
+
+impl From<KeyPair> for EthPrivKeyPolicy {
+    fn from(key_pair: KeyPair) -> Self { EthPrivKeyPolicy::KeyPair(key_pair) }
+}
+
+impl EthPrivKeyPolicy {
+    pub fn key_pair_or_err(&self) -> MmResult<&KeyPair, PrivKeyPolicyNotAllowed> {
+        match self {
+            EthPrivKeyPolicy::KeyPair(key_pair) => Ok(key_pair),
+            #[cfg(target_arch = "wasm32")]
+            EthPrivKeyPolicy::Metamask(_) => MmError::err(PrivKeyPolicyNotAllowed::HardwareWalletNotSupported),
+        }
+    }
+}
+
 /// pImpl idiom.
-#[derive(Debug)]
 pub struct EthCoinImpl {
     ticker: String,
     coin_type: EthCoinType,
-    key_pair: KeyPair,
+    priv_key_policy: EthPrivKeyPolicy,
     my_address: Address,
     sign_message_prefix: Option<String>,
     swap_contract_address: Address,
@@ -299,11 +431,15 @@ pub struct EthCoinImpl {
     required_confirmations: AtomicU64,
     /// Coin needs access to the context in order to reuse the logging and shutdown facilities.
     /// Using a weak reference by default in order to avoid circular references and leaks.
-    ctx: MmWeak,
+    pub ctx: MmWeak,
     chain_id: Option<u64>,
     /// the block range used for eth_getLogs
     logs_block_range: u64,
     nonce_lock: Arc<AsyncMutex<()>>,
+    erc20_tokens_infos: Arc<Mutex<HashMap<String, Erc20TokenInfo>>>,
+    /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// and on [`MmArc::stop`].
+    pub abortable_system: AbortableQueue,
 }
 
 #[derive(Clone, Debug)]
@@ -312,6 +448,12 @@ pub struct Web3Instance {
     is_parity: bool,
 }
 
+#[derive(Clone, Debug)]
+pub struct Erc20TokenInfo {
+    pub token_address: Address,
+    pub decimals: u8,
+}
+
 #[derive(Deserialize, Serialize)]
 #[serde(tag = "format")]
 pub enum EthAddressFormat {
@@ -338,7 +480,6 @@ async fn make_gas_station_request(url: &str) -> GasStationResult {
     Ok(result)
 }
 
-#[cfg_attr(test, mockable)]
 impl EthCoinImpl {
     /// Gets Transfer events from ERC20 smart contract `addr` between `from_block` and `to_block`
     fn erc20_transfer_events(
@@ -364,7 +505,13 @@ impl EthCoinImpl {
             filter = filter.limit(l);
         }
 
-        Box::new(self.web3.eth().logs(filter.build()).map_err(|e| ERRL!("{}", e)))
+        Box::new(
+            self.web3
+                .eth()
+                .logs(filter.build())
+                .compat()
+                .map_err(|e| ERRL!("{}", e)),
+        )
     }
 
     /// Gets ETH traces from ETH node between addresses in `from_block` and `to_block`
@@ -386,10 +533,16 @@ impl EthCoinImpl {
             filter = filter.count(l);
         }
 
-        Box::new(self.web3.trace().filter(filter.build()).map_err(|e| ERRL!("{}", e)))
+        Box::new(
+            self.web3
+                .trace()
+                .filter(filter.build())
+                .compat()
+                .map_err(|e| ERRL!("{}", e)),
+        )
     }
 
-    #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+    #[cfg(not(target_arch = "wasm32"))]
     fn eth_traces_path(&self, ctx: &MmArc) -> PathBuf {
         ctx.dbdir()
             .join("TRANSACTIONS")
@@ -433,7 +586,7 @@ impl EthCoinImpl {
         unreachable!()
     }
 
-    #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+    #[cfg(not(target_arch = "wasm32"))]
     fn erc20_events_path(&self, ctx: &MmArc) -> PathBuf {
         ctx.dbdir()
             .join("TRANSACTIONS")
@@ -485,29 +638,6 @@ impl EthCoinImpl {
         sha256(&input).to_vec()
     }
 
-    fn estimate_gas(&self, req: CallRequest) -> Box<dyn Future<Item = U256, Error = web3::Error> + Send> {
-        // always using None block number as old Geth version accept only single argument in this RPC
-        Box::new(self.web3.eth().estimate_gas(req, None))
-    }
-
-    /// Gets `ReceiverSpent` events from etomic swap smart contract since `from_block`
-    fn spend_events(
-        &self,
-        swap_contract_address: Address,
-        from_block: u64,
-        to_block: u64,
-    ) -> Box<dyn Future<Item = Vec<Log>, Error = String> + Send> {
-        let contract_event = try_fus!(SWAP_CONTRACT.event("ReceiverSpent"));
-        let filter = FilterBuilder::default()
-            .topics(Some(vec![contract_event.signature()]), None, None, None)
-            .from_block(BlockNumber::Number(from_block))
-            .to_block(BlockNumber::Number(to_block))
-            .address(vec![swap_contract_address])
-            .build();
-
-        Box::new(self.web3.eth().logs(filter).map_err(|e| ERRL!("{}", e)))
-    }
-
     /// Gets `SenderRefunded` events from etomic swap smart contract since `from_block`
     fn refund_events(
         &self,
@@ -518,18 +648,37 @@ impl EthCoinImpl {
         let contract_event = try_fus!(SWAP_CONTRACT.event("SenderRefunded"));
         let filter = FilterBuilder::default()
             .topics(Some(vec![contract_event.signature()]), None, None, None)
-            .from_block(BlockNumber::Number(from_block))
-            .to_block(BlockNumber::Number(to_block))
+            .from_block(BlockNumber::Number(from_block.into()))
+            .to_block(BlockNumber::Number(to_block.into()))
             .address(vec![swap_contract_address])
             .build();
 
-        Box::new(self.web3.eth().logs(filter).map_err(|e| ERRL!("{}", e)))
+        Box::new(self.web3.eth().logs(filter).compat().map_err(|e| ERRL!("{}", e)))
     }
 
     /// Try to parse address from string.
     pub fn address_from_str(&self, address: &str) -> Result<Address, String> {
         Ok(try_s!(valid_addr_from_str(address)))
     }
+
+    pub fn erc20_token_address(&self) -> Option<Address> {
+        match self.coin_type {
+            EthCoinType::Erc20 { token_addr, .. } => Some(token_addr),
+            EthCoinType::Eth => None,
+        }
+    }
+
+    pub fn add_erc_token_info(&self, ticker: String, info: Erc20TokenInfo) {
+        self.erc20_tokens_infos.lock().unwrap().insert(ticker, info);
+    }
+
+    /// # Warning
+    /// Be very careful using this function since it returns dereferenced clone
+    /// of value behind the MutexGuard and makes it non-thread-safe.
+    pub fn get_erc_tokens_infos(&self) -> HashMap<String, Erc20TokenInfo> {
+        let guard = self.erc20_tokens_infos.lock().unwrap();
+        (*guard).clone()
+    }
 }
 
 async fn get_raw_transaction_impl(coin: EthCoin, req: RawTransactionRequest) -> RawTransactionResult {
@@ -538,11 +687,19 @@ async fn get_raw_transaction_impl(coin: EthCoin, req: RawTransactionRequest) ->
         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))?;
+    get_tx_hex_by_hash_impl(coin, hash).await
+}
+
+async fn get_tx_hex_by_hash_impl(coin: EthCoin, tx_hash: H256) -> RawTransactionResult {
+    let web3_tx = coin
+        .web3
+        .eth()
+        .transaction(TransactionId::Hash(tx_hash))
+        .await?
+        .or_mm_err(|| RawTransactionError::HashNotExist(tx_hash.to_string()))?;
     let raw = signed_tx_from_web3_tx(web3_tx).map_to_mm(RawTransactionError::InternalError)?;
     Ok(RawTransactionRes {
-        tx_hex: BytesJson(rlp::encode(&raw)),
+        tx_hex: BytesJson(rlp::encode(&raw).to_vec()),
     })
 }
 
@@ -597,11 +754,12 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
                 value: Some(eth_value_for_estimate),
                 data: Some(data.clone().into()),
                 from: Some(coin.my_address),
-                to: call_addr,
+                to: Some(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),
+                ..CallRequest::default()
             };
             // TODO Note if the wallet's balance is insufficient to withdraw, then `estimate_gas` may fail with the `Exception` error.
             // TODO Ideally we should determine the case when we have the insufficient balance and return `WithdrawError::NotSufficientBalance`.
@@ -622,23 +780,70 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
         eth_value -= total_fee;
         wei_amount -= total_fee;
     };
-    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)?,
-        Either::Right(_) => return MmError::err(WithdrawError::Transport("Get address nonce timed out".to_owned())),
-    };
-    let tx = UnSignedEthTx {
-        nonce,
-        value: eth_value,
-        action: Action::Call(call_addr),
-        data,
-        gas,
-        gas_price,
+
+    let (tx_hash, tx_hex) = match coin.priv_key_policy {
+        EthPrivKeyPolicy::KeyPair(ref key_pair) => {
+            let _nonce_lock = coin.nonce_lock.lock().await;
+            let nonce = get_addr_nonce(coin.my_address, coin.web3_instances.clone())
+                .compat()
+                .timeout_secs(30.)
+                .await?
+                .map_to_mm(WithdrawError::Transport)?;
+
+            let tx = UnSignedEthTx {
+                nonce,
+                value: eth_value,
+                action: Action::Call(call_addr),
+                data,
+                gas,
+                gas_price,
+            };
+
+            let signed = tx.sign(key_pair.secret(), coin.chain_id);
+            let bytes = rlp::encode(&signed);
+
+            (signed.hash, BytesJson::from(bytes.to_vec()))
+        },
+        #[cfg(target_arch = "wasm32")]
+        EthPrivKeyPolicy::Metamask(_) => {
+            if !req.broadcast {
+                let error = "Set 'broadcast' to generate, sign and broadcast a transaction with MetaMask".to_string();
+                return MmError::err(WithdrawError::BroadcastExpected(error));
+            }
+
+            let tx_to_send = TransactionRequest {
+                from: coin.my_address,
+                to: Some(to_addr),
+                gas: Some(gas),
+                gas_price: Some(gas_price),
+                value: Some(eth_value),
+                data: Some(data.clone().into()),
+                nonce: None,
+                ..TransactionRequest::default()
+            };
+
+            // Wait for 10 seconds for the transaction to appear on the RPC node.
+            let wait_rpc_timeout = 10_000;
+            let check_every = 1.;
+
+            // Please note that this method may take a long time
+            // due to `wallet_switchEthereumChain` and `eth_sendTransaction` requests.
+            let tx_hash = coin.web3.eth().send_transaction(tx_to_send).await?;
+
+            let signed_tx = coin
+                .wait_for_tx_appears_on_rpc(tx_hash, wait_rpc_timeout, check_every)
+                .await?;
+            let tx_hex = signed_tx
+                .map(|tx| BytesJson::from(rlp::encode(&tx).to_vec()))
+                // Return an empty `tx_hex` if the transaction is still not appeared on the RPC node.
+                .unwrap_or_default();
+            (tx_hash, tx_hex)
+        },
     };
 
-    let signed = tx.sign(coin.key_pair.secret(), coin.chain_id);
-    let bytes = rlp::encode(&signed);
+    let tx_hash_bytes = BytesJson::from(tx_hash.0.to_vec());
+    let tx_hash_str = format!("{:02x}", tx_hash_bytes);
+
     let amount_decimal = u256_to_big_decimal(wei_amount, coin.decimals)?;
     let mut spent_by_me = amount_decimal.clone();
     let received_by_me = if to_addr == coin.my_address {
@@ -650,7 +855,7 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
     if coin.coin_type == EthCoinType::Eth {
         spent_by_me += &fee_details.total_fee;
     }
-    let my_address = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
+    let my_address = coin.my_address()?;
     Ok(TransactionDetails {
         to: vec![checksum_address(&format!("{:#02x}", to_addr))],
         from: vec![my_address],
@@ -658,8 +863,8 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
         my_balance_change: &received_by_me - &spent_by_me,
         spent_by_me,
         received_by_me,
-        tx_hex: bytes.into(),
-        tx_hash: format!("{:02x}", signed.tx_hash()),
+        tx_hex,
+        tx_hash: tx_hash_str,
         block_height: 0,
         fee_details: Some(fee_details.into()),
         coin: coin.ticker.clone(),
@@ -667,14 +872,15 @@ async fn withdraw_impl(coin: EthCoin, req: WithdrawRequest) -> WithdrawResult {
         timestamp: now_ms() / 1000,
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     })
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct EthCoin(Arc<EthCoinImpl>);
 impl Deref for EthCoin {
     type Target = EthCoinImpl;
-    fn deref(&self) -> &EthCoinImpl { &*self.0 }
+    fn deref(&self) -> &EthCoinImpl { &self.0 }
 }
 
 #[async_trait]
@@ -688,24 +894,16 @@ impl SwapOps for EthCoin {
         )
     }
 
-    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 {
-        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());
+    fn send_maker_payment(&self, maker_payment: SendMakerPaymentArgs) -> TransactionFut {
+        let taker_addr = try_tx_fus!(addr_from_raw_pubkey(maker_payment.other_pubkey));
+        let swap_contract_address = try_tx_fus!(maker_payment.swap_contract_address.try_to_address());
 
         Box::new(
             self.send_hash_time_locked_payment(
-                self.etomic_swap_id(time_lock, secret_hash),
-                try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
-                time_lock,
-                secret_hash,
+                self.etomic_swap_id(maker_payment.time_lock, maker_payment.secret_hash),
+                try_tx_fus!(wei_from_big_decimal(&maker_payment.amount, self.decimals)),
+                maker_payment.time_lock,
+                maker_payment.secret_hash,
                 taker_addr,
                 swap_contract_address,
             )
@@ -713,24 +911,16 @@ impl SwapOps for EthCoin {
         )
     }
 
-    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 {
-        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());
+    fn send_taker_payment(&self, taker_payment: SendTakerPaymentArgs) -> TransactionFut {
+        let maker_addr = try_tx_fus!(addr_from_raw_pubkey(taker_payment.other_pubkey));
+        let swap_contract_address = try_tx_fus!(taker_payment.swap_contract_address.try_to_address());
 
         Box::new(
             self.send_hash_time_locked_payment(
-                self.etomic_swap_id(time_lock, secret_hash),
-                try_tx_fus!(wei_from_big_decimal(&amount, self.decimals)),
-                time_lock,
-                secret_hash,
+                self.etomic_swap_id(taker_payment.time_lock, taker_payment.secret_hash),
+                try_tx_fus!(wei_from_big_decimal(&taker_payment.amount, self.decimals)),
+                taker_payment.time_lock,
+                taker_payment.secret_hash,
                 maker_addr,
                 swap_contract_address,
             )
@@ -740,113 +930,87 @@ impl SwapOps for EthCoin {
 
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_spends_payment_args.other_payment_tx));
         let signed = try_tx_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address(), signed);
+        let swap_contract_address =
+            try_tx_fus!(maker_spends_payment_args.swap_contract_address.try_to_address(), signed);
 
         Box::new(
-            self.spend_hash_time_locked_payment(signed, swap_contract_address, secret)
-                .map(TransactionEnum::from),
+            self.spend_hash_time_locked_payment(
+                signed,
+                maker_spends_payment_args.secret_hash,
+                swap_contract_address,
+                maker_spends_payment_args.secret,
+            )
+            .map(TransactionEnum::from),
         )
     }
 
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
-        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_spends_payment_args.other_payment_tx));
         let signed = try_tx_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(taker_spends_payment_args.swap_contract_address.try_to_address());
         Box::new(
-            self.spend_hash_time_locked_payment(signed, swap_contract_address, secret)
-                .map(TransactionEnum::from),
+            self.spend_hash_time_locked_payment(
+                signed,
+                taker_spends_payment_args.secret_hash,
+                swap_contract_address,
+                taker_spends_payment_args.secret,
+            )
+            .map(TransactionEnum::from),
         )
     }
 
-    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 {
-        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_refunds_payment_args.payment_tx));
         let signed = try_tx_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(taker_refunds_payment_args.swap_contract_address.try_to_address());
 
         Box::new(
-            self.refund_hash_time_locked_payment(swap_contract_address, signed)
+            self.refund_hash_time_locked_payment(swap_contract_address, signed, taker_refunds_payment_args.secret_hash)
                 .map(TransactionEnum::from),
         )
     }
 
-    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 {
-        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_refunds_payment_args.payment_tx));
         let signed = try_tx_fus!(SignedEthTx::new(tx));
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
+        let swap_contract_address = try_tx_fus!(maker_refunds_payment_args.swap_contract_address.try_to_address());
 
         Box::new(
-            self.refund_hash_time_locked_payment(swap_contract_address, signed)
+            self.refund_hash_time_locked_payment(swap_contract_address, signed, maker_refunds_payment_args.secret_hash)
                 .map(TransactionEnum::from),
         )
     }
 
     fn validate_fee(
         &self,
-        fee_tx: &TransactionEnum,
-        expected_sender: &[u8],
-        fee_addr: &[u8],
-        amount: &BigDecimal,
-        min_block_number: u64,
-        _uuid: &[u8],
+        validate_fee_args: ValidateFeeArgs<'_>,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let selfi = self.clone();
-        let tx = match fee_tx {
+        let tx = match validate_fee_args.fee_tx {
             TransactionEnum::SignedEthTx(t) => t.clone(),
             _ => panic!(),
         };
-        let sender_addr = try_fus!(addr_from_raw_pubkey(expected_sender));
-        let fee_addr = try_fus!(addr_from_raw_pubkey(fee_addr));
-        let amount = amount.clone();
+        let sender_addr = try_fus!(addr_from_raw_pubkey(validate_fee_args.expected_sender));
+        let fee_addr = try_fus!(addr_from_raw_pubkey(validate_fee_args.fee_addr));
+        let amount = validate_fee_args.amount.clone();
+        let min_block_number = validate_fee_args.min_block_number;
 
         let fut = async move {
             let expected_value = try_s!(wei_from_big_decimal(&amount, selfi.decimals));
-            let tx_from_rpc = try_s!(
-                selfi
-                    .web3
-                    .eth()
-                    .transaction(TransactionId::Hash(tx.hash))
-                    .compat()
-                    .await
-            );
+            let tx_from_rpc = try_s!(selfi.web3.eth().transaction(TransactionId::Hash(tx.hash)).await);
             let tx_from_rpc = match tx_from_rpc {
                 Some(t) => t,
                 None => return ERR!("Didn't find provided tx {:?} on ETH node", tx),
             };
 
-            if tx_from_rpc.from != sender_addr {
+            if tx_from_rpc.from != Some(sender_addr) {
                 return ERR!(
                     "Fee tx {:?} was sent from wrong address, expected {:?}",
                     tx_from_rpc,
@@ -894,7 +1058,7 @@ impl SwapOps for EthCoin {
                     }
 
                     let function = try_s!(ERC20_CONTRACT.function("transfer"));
-                    let decoded_input = try_s!(function.decode_input(&tx_from_rpc.input.0));
+                    let decoded_input = try_s!(decode_contract_call(function, &tx_from_rpc.input.0));
 
                     if decoded_input[0] != Token::Address(fee_addr) {
                         return ERR!(
@@ -920,8 +1084,11 @@ impl SwapOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    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());
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let swap_contract_address = try_f!(input
+            .swap_contract_address
+            .try_to_address()
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
         self.validate_payment(
             &input.payment_tx,
             input.time_lock,
@@ -932,8 +1099,11 @@ impl SwapOps for EthCoin {
         )
     }
 
-    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());
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let swap_contract_address = try_f!(input
+            .swap_contract_address
+            .try_to_address()
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
         self.validate_payment(
             &input.payment_tx,
             input.time_lock,
@@ -946,16 +1116,12 @@ impl SwapOps for EthCoin {
 
     fn check_if_my_payment_sent(
         &self,
-        time_lock: u32,
-        _other_pub: &[u8],
-        secret_hash: &[u8],
-        from_block: u64,
-        swap_contract_address: &Option<BytesJson>,
-        _swap_unique_data: &[u8],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> 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());
+        let id = self.etomic_swap_id(if_my_payment_sent_args.time_lock, if_my_payment_sent_args.secret_hash);
+        let swap_contract_address = try_fus!(if_my_payment_sent_args.swap_contract_address.try_to_address());
         let selfi = self.clone();
+        let from_block = if_my_payment_sent_args.search_from_block;
         let fut = async move {
             let status = try_s!(
                 selfi
@@ -994,7 +1160,6 @@ impl SwapOps for EthCoin {
                                 .web3
                                 .eth()
                                 .transaction(TransactionId::Hash(event.transaction_hash.unwrap()))
-                                .compat()
                                 .await
                         );
                         match transaction {
@@ -1019,8 +1184,13 @@ impl SwapOps for EthCoin {
         input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         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
+        self.search_for_swap_tx_spend(
+            input.tx,
+            swap_contract_address,
+            input.secret_hash,
+            input.search_from_block,
+        )
+        .await
     }
 
     async fn search_for_swap_tx_spend_other(
@@ -1028,14 +1198,36 @@ impl SwapOps for EthCoin {
         input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         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
+        self.search_for_swap_tx_spend(
+            input.tx,
+            swap_contract_address,
+            input.secret_hash,
+            input.search_from_block,
+        )
+        .await
     }
 
-    fn extract_secret(&self, _secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+    fn check_tx_signed_by_pub(&self, _tx: &[u8], _expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    async fn extract_secret(&self, _secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         let unverified: UnverifiedTransaction = try_s!(rlp::decode(spend_tx));
         let function = try_s!(SWAP_CONTRACT.function("receiverSpend"));
-        let tokens = try_s!(function.decode_input(&unverified.data));
+
+        // Validate contract call; expected to be receiverSpend.
+        // https://www.4byte.directory/signatures/?bytes4_signature=02ed292b.
+        let expected_signature = function.short_signature();
+        let actual_signature = &unverified.data[0..4];
+        if actual_signature != expected_signature {
+            return ERR!(
+                "Expected 'receiverSpend' contract call signature: {:?}, found {:?}",
+                expected_signature,
+                actual_signature
+            );
+        };
+
+        let tokens = try_s!(decode_contract_call(function, &unverified.data));
         if tokens.len() < 3 {
             return ERR!("Invalid arguments in 'receiverSpend' call: {:?}", tokens);
         }
@@ -1048,34 +1240,462 @@ impl SwapOps for EthCoin {
         }
     }
 
-    fn negotiate_swap_contract_addr(
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        match other_side_address {
+            Some(bytes) => {
+                if bytes.len() != 20 {
+                    return MmError::err(NegotiateSwapContractAddrErr::InvalidOtherAddrLen(bytes.into()));
+                }
+                let other_addr = Address::from_slice(bytes);
+
+                if other_addr == self.swap_contract_address {
+                    return Ok(Some(self.swap_contract_address.0.to_vec().into()));
+                }
+
+                if Some(other_addr) == self.fallback_swap_contract {
+                    return Ok(self.fallback_swap_contract.map(|addr| addr.0.to_vec().into()));
+                }
+                MmError::err(NegotiateSwapContractAddrErr::UnexpectedOtherAddr(bytes.into()))
+            },
+            None => self
+                .fallback_swap_contract
+                .map(|addr| Some(addr.0.to_vec().into()))
+                .ok_or_else(|| MmError::new(NegotiateSwapContractAddrErr::NoOtherAddrAndNoFallback)),
+        }
+    }
+
+    #[inline]
+    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> keys::KeyPair {
+        match self.priv_key_policy {
+            EthPrivKeyPolicy::KeyPair(ref key_pair) => {
+                key_pair_from_secret(key_pair.secret().as_bytes()).expect("valid key")
+            },
+            #[cfg(target_arch = "wasm32")]
+            EthPrivKeyPolicy::Metamask(_) => todo!(),
+        }
+    }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, _swap_unique_data: &[u8]) -> Vec<u8> {
+        match self.priv_key_policy {
+            EthPrivKeyPolicy::KeyPair(ref key_pair) => key_pair_from_secret(key_pair.secret().as_bytes())
+                .expect("valid key")
+                .public_slice()
+                .to_vec(),
+            #[cfg(target_arch = "wasm32")]
+            EthPrivKeyPolicy::Metamask(ref metamask_policy) => metamask_policy.public_key.as_bytes().to_vec(),
+        }
+    }
+
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        if let Err(e) = PublicKey::from_slice(raw_pubkey) {
+            return MmError::err(ValidateOtherPubKeyErr::InvalidPubKey(e.to_string()));
+        };
+        Ok(())
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn is_supported_by_watchers(&self) -> bool { true }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for EthCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for EthCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for EthCoin {
+    fn send_maker_payment_spend_preimage(&self, input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(input.preimage));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+
+        Box::new(
+            self.watcher_spend_hash_time_locked_payment(signed, input.secret_hash, input.secret, input.taker_pub)
+                .map(TransactionEnum::from),
+        )
+    }
+
+    fn create_maker_payment_spend_preimage(
+        &self,
+        maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(maker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let fut = async move { Ok(TransactionEnum::from(signed)) };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &self,
+        taker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(taker_payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+        let fut = async move { Ok(TransactionEnum::from(signed)) };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_taker_payment_refund_preimage(
+        &self,
+        watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        let tx: UnverifiedTransaction = try_tx_fus!(rlp::decode(watcher_refunds_payment_args.payment_tx));
+        let signed = try_tx_fus!(SignedEthTx::new(tx));
+
+        Box::new(
+            self.watcher_refunds_hash_time_locked_payment(
+                signed,
+                watcher_refunds_payment_args.secret_hash,
+                watcher_refunds_payment_args.other_pubkey,
+            )
+            .map(TransactionEnum::from),
+        )
+    }
+
+    fn watcher_validate_taker_fee(&self, validate_fee_args: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        let selfi = self.clone();
+        let sender_addr =
+            try_f!(addr_from_raw_pubkey(&validate_fee_args.sender_pubkey)
+                .map_to_mm(ValidatePaymentError::InvalidParameter));
+        let fee_addr =
+            try_f!(addr_from_raw_pubkey(&validate_fee_args.fee_addr).map_to_mm(ValidatePaymentError::InvalidParameter));
+        let min_block_number = validate_fee_args.min_block_number;
+        let taker_fee_hash = validate_fee_args.taker_fee_hash;
+
+        let fut = async move {
+            let tx_from_rpc = selfi
+                .web3
+                .eth()
+                .transaction(TransactionId::Hash(H256::from_slice(taker_fee_hash.as_slice())))
+                .await
+                .map_to_mm(|e| ValidatePaymentError::InvalidRpcResponse(e.to_string()))?;
+
+            let tx_from_rpc = tx_from_rpc.as_ref().ok_or_else(|| {
+                ValidatePaymentError::TxDoesNotExist(format!(
+                    "Didn't find provided tx {:?} on ETH node",
+                    H256::from_slice(taker_fee_hash.as_slice())
+                ))
+            })?;
+
+            if tx_from_rpc.from != Some(sender_addr) {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "{}: Fee tx {:?} was sent from wrong address, expected {:?}",
+                    INVALID_SENDER_ERR_LOG, tx_from_rpc, sender_addr
+                )));
+            }
+
+            if let Some(block_number) = tx_from_rpc.block_number {
+                if block_number <= min_block_number.into() {
+                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                        "{}: Fee tx {:?} confirmed before min_block {}",
+                        EARLY_CONFIRMATION_ERR_LOG, tx_from_rpc, min_block_number
+                    )));
+                }
+            }
+
+            //TODO: Validate if taker fee is old
+
+            match &selfi.coin_type {
+                EthCoinType::Eth => {
+                    if tx_from_rpc.to != Some(fee_addr) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "{}: Fee tx {:?} was sent to wrong address, expected {:?}",
+                            INVALID_RECEIVER_ERR_LOG, tx_from_rpc, fee_addr
+                        )));
+                    }
+                },
+                EthCoinType::Erc20 {
+                    platform: _,
+                    token_addr,
+                } => {
+                    if tx_from_rpc.to != Some(*token_addr) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "{}: ERC20 Fee tx {:?} called wrong smart contract, expected {:?}",
+                            INVALID_CONTRACT_ADDRESS_ERR_LOG, tx_from_rpc, token_addr
+                        )));
+                    }
+
+                    let function = ERC20_CONTRACT
+                        .function("transfer")
+                        .map_to_mm(|e| ValidatePaymentError::InternalError(e.to_string()))?;
+                    let decoded_input = function
+                        .decode_input(&tx_from_rpc.input.0)
+                        .map_to_mm(|e| ValidatePaymentError::TxDeserializationError(e.to_string()))?;
+                    let address_input = get_function_input_data(&decoded_input, function, 0)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if address_input != Token::Address(fee_addr) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "{}: ERC20 Fee tx was sent to wrong address {:?}, expected {:?}",
+                            INVALID_RECEIVER_ERR_LOG, address_input, fee_addr
+                        )));
+                    }
+                },
+            }
+
+            Ok(())
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn watcher_validate_taker_payment(&self, input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let unsigned: UnverifiedTransaction = try_f!(rlp::decode(&input.payment_tx));
+        let tx =
+            try_f!(SignedEthTx::new(unsigned)
+                .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string())));
+        let sender = try_f!(addr_from_raw_pubkey(&input.taker_pub).map_to_mm(ValidatePaymentError::InvalidParameter));
+        let receiver = try_f!(addr_from_raw_pubkey(&input.maker_pub).map_to_mm(ValidatePaymentError::InvalidParameter));
+
+        let selfi = self.clone();
+        let swap_id = selfi.etomic_swap_id(input.time_lock, &input.secret_hash);
+        let secret_hash = if input.secret_hash.len() == 32 {
+            ripemd160(&input.secret_hash).to_vec()
+        } else {
+            input.secret_hash.to_vec()
+        };
+        let expected_swap_contract_address = self.swap_contract_address;
+        let fallback_swap_contract = self.fallback_swap_contract;
+        let fut = async move {
+            let tx_from_rpc = selfi.web3.eth().transaction(TransactionId::Hash(tx.hash)).await?;
+
+            let tx_from_rpc = tx_from_rpc.as_ref().ok_or_else(|| {
+                ValidatePaymentError::TxDoesNotExist(format!("Didn't find provided tx {:?} on ETH node", tx))
+            })?;
+
+            if tx_from_rpc.from != Some(sender) {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "Payment tx {:?} was sent from wrong address, expected {:?}",
+                    tx_from_rpc, sender
+                )));
+            }
+
+            let swap_contract_address = tx_from_rpc.to.ok_or_else(|| {
+                ValidatePaymentError::TxDeserializationError(format!(
+                    "Swap contract address not found in payment Tx {tx_from_rpc:?}"
+                ))
+            })?;
+
+            if swap_contract_address != expected_swap_contract_address
+                && Some(swap_contract_address) != fallback_swap_contract
+            {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "Payment tx {tx_from_rpc:?} was sent to wrong address, expected either {expected_swap_contract_address:?} or the fallback {fallback_swap_contract:?}"
+                )));
+            }
+
+            let status = selfi
+                .payment_status(swap_contract_address, Token::FixedBytes(swap_id.clone()))
+                .compat()
+                .await
+                .map_to_mm(ValidatePaymentError::Transport)?;
+            if status != PAYMENT_STATE_SENT.into() {
+                return MmError::err(ValidatePaymentError::UnexpectedPaymentState(format!(
+                    "Payment state is not PAYMENT_STATE_SENT, got {}",
+                    status
+                )));
+            }
+
+            match &selfi.coin_type {
+                EthCoinType::Eth => {
+                    let function = SWAP_CONTRACT
+                        .function("ethPayment")
+                        .map_to_mm(|err| ValidatePaymentError::InternalError(err.to_string()))?;
+                    let decoded = function
+                        .decode_input(&tx_from_rpc.input.0)
+                        .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string()))?;
+
+                    let swap_id_input = get_function_input_data(&decoded, function, 0)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if swap_id_input != Token::FixedBytes(swap_id.clone()) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Invalid 'swap_id' {:?}, expected {:?}",
+                            decoded, swap_id
+                        )));
+                    }
+
+                    let receiver_input = get_function_input_data(&decoded, function, 1)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if receiver_input != Token::Address(receiver) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx receiver arg {:?} is invalid, expected {:?}",
+                            receiver_input,
+                            Token::Address(receiver)
+                        )));
+                    }
+
+                    let secret_hash_input = get_function_input_data(&decoded, function, 2)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if secret_hash_input != Token::FixedBytes(secret_hash.to_vec()) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx secret_hash arg {:?} is invalid, expected {:?}",
+                            secret_hash_input,
+                            Token::FixedBytes(secret_hash.to_vec()),
+                        )));
+                    }
+
+                    let time_lock_input = get_function_input_data(&decoded, function, 3)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if time_lock_input != Token::Uint(U256::from(input.time_lock)) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx time_lock arg {:?} is invalid, expected {:?}",
+                            time_lock_input,
+                            Token::Uint(U256::from(input.time_lock)),
+                        )));
+                    }
+                },
+                EthCoinType::Erc20 {
+                    platform: _,
+                    token_addr,
+                } => {
+                    let function = SWAP_CONTRACT
+                        .function("erc20Payment")
+                        .map_to_mm(|err| ValidatePaymentError::InternalError(err.to_string()))?;
+                    let decoded = function
+                        .decode_input(&tx_from_rpc.input.0)
+                        .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string()))?;
+
+                    let swap_id_input = get_function_input_data(&decoded, function, 0)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if swap_id_input != Token::FixedBytes(swap_id.clone()) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Invalid 'swap_id' {:?}, expected {:?}",
+                            decoded, swap_id
+                        )));
+                    }
+
+                    let token_addr_input = get_function_input_data(&decoded, function, 2)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if token_addr_input != Token::Address(*token_addr) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx token_addr arg {:?} is invalid, expected {:?}",
+                            token_addr_input,
+                            Token::Address(*token_addr)
+                        )));
+                    }
+
+                    let receiver_addr_input = get_function_input_data(&decoded, function, 3)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if receiver_addr_input != Token::Address(receiver) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx receiver arg {:?} is invalid, expected {:?}",
+                            receiver_addr_input,
+                            Token::Address(receiver),
+                        )));
+                    }
+
+                    let secret_hash_input = get_function_input_data(&decoded, function, 4)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if secret_hash_input != Token::FixedBytes(secret_hash.to_vec()) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx secret_hash arg {:?} is invalid, expected {:?}",
+                            secret_hash_input,
+                            Token::FixedBytes(secret_hash.to_vec()),
+                        )));
+                    }
+
+                    let time_lock_input = get_function_input_data(&decoded, function, 5)
+                        .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+                    if time_lock_input != Token::Uint(U256::from(input.time_lock)) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx time_lock arg {:?} is invalid, expected {:?}",
+                            time_lock_input,
+                            Token::Uint(U256::from(input.time_lock)),
+                        )));
+                    }
+                },
+            }
+
+            Ok(())
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
         &self,
-        other_side_address: Option<&[u8]>,
-    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
-        match other_side_address {
-            Some(bytes) => {
-                if bytes.len() != 20 {
-                    return MmError::err(NegotiateSwapContractAddrErr::InvalidOtherAddrLen(bytes.into()));
-                }
-                let other_addr = Address::from(bytes);
-                if other_addr == self.swap_contract_address {
-                    return Ok(Some(self.swap_contract_address.to_vec().into()));
-                }
-
-                if Some(other_addr) == self.fallback_swap_contract {
-                    return Ok(self.fallback_swap_contract.map(|addr| addr.to_vec().into()));
-                }
-                MmError::err(NegotiateSwapContractAddrErr::UnexpectedOtherAddr(bytes.into()))
-            },
-            None => self
-                .fallback_swap_contract
-                .map(|addr| Some(addr.to_vec().into()))
-                .ok_or_else(|| MmError::new(NegotiateSwapContractAddrErr::NoOtherAddrAndNoFallback)),
-        }
-    }
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        let unverified: UnverifiedTransaction = try_s!(rlp::decode(input.tx));
+        let tx = try_s!(SignedEthTx::new(unverified));
+        let swap_contract_address = match tx.action {
+            Call(address) => address,
+            Create => return Err(ERRL!("Invalid payment action: the payment action cannot be create")),
+        };
 
-    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> keys::KeyPair {
-        key_pair_from_secret(self.key_pair.secret()).expect("valid key")
+        self.search_for_swap_tx_spend(
+            input.tx,
+            swap_contract_address,
+            input.secret_hash,
+            input.search_from_block,
+        )
+        .await
     }
 }
 
@@ -1083,14 +1703,28 @@ impl SwapOps for EthCoin {
 impl MarketCoinOps for EthCoin {
     fn ticker(&self) -> &str { &self.ticker[..] }
 
-    fn my_address(&self) -> Result<String, String> { Ok(checksum_address(&format!("{:#02x}", self.my_address))) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> {
+        Ok(checksum_address(&format!("{:#02x}", self.my_address)))
+    }
 
-    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        match self.priv_key_policy {
+            EthPrivKeyPolicy::KeyPair(ref key_pair) => {
+                let uncompressed_without_prefix = hex::encode(key_pair.public());
+                Ok(format!("04{}", uncompressed_without_prefix))
+            },
+            #[cfg(target_arch = "wasm32")]
+            EthPrivKeyPolicy::Metamask(ref metamask_policy) => {
+                Ok(format!("{:02x}", metamask_policy.public_key_uncompressed))
+            },
+        }
+    }
 
     /// 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);
@@ -1102,7 +1736,7 @@ impl MarketCoinOps for EthCoin {
 
     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 privkey = &self.priv_key_policy.key_pair_or_err()?.secret();
         let signature = sign(privkey, &H256::from(message_hash))?;
         Ok(format!("0x{}", signature))
     }
@@ -1134,7 +1768,7 @@ impl MarketCoinOps for EthCoin {
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
         Box::new(
             self.eth_balance()
-                .and_then(move |result| Ok(u256_to_big_decimal(result, 18)?)),
+                .and_then(move |result| Ok(u256_to_big_decimal(result, ETH_DECIMALS)?)),
         )
     }
 
@@ -1154,6 +1788,7 @@ impl MarketCoinOps for EthCoin {
             self.web3
                 .eth()
                 .send_raw_transaction(bytes.into())
+                .compat()
                 .map(|res| format!("{:02x}", res))
                 .map_err(|e| ERRL!("{}", e)),
         )
@@ -1164,6 +1799,7 @@ impl MarketCoinOps for EthCoin {
             self.web3
                 .eth()
                 .send_raw_transaction(tx.into())
+                .compat()
                 .map(|res| format!("{:02x}", res))
                 .map_err(|e| ERRL!("{}", e)),
         )
@@ -1185,7 +1821,7 @@ impl MarketCoinOps for EthCoin {
         let unsigned: UnverifiedTransaction = try_fus!(rlp::decode(tx));
         let tx = try_fus!(SignedEthTx::new(unsigned));
 
-        let required_confirms = U256::from(confirmations);
+        let required_confirms = U64::from(confirmations);
         let selfi = self.clone();
         let fut = async move {
             loop {
@@ -1198,7 +1834,7 @@ impl MarketCoinOps for EthCoin {
                     );
                 }
 
-                let web3_receipt = match selfi.web3.eth().transaction_receipt(tx.hash()).compat().await {
+                let web3_receipt = match selfi.web3.eth().transaction_receipt(tx.hash()).await {
                     Ok(r) => r,
                     Err(e) => {
                         error!(
@@ -1223,7 +1859,7 @@ impl MarketCoinOps for EthCoin {
                     }
 
                     if let Some(confirmed_at) = receipt.block_number {
-                        let current_block = match selfi.web3.eth().block_number().compat().await {
+                        let current_block = match selfi.web3.eth().block_number().await {
                             Ok(b) => b,
                             Err(e) => {
                                 error!(
@@ -1248,12 +1884,14 @@ impl MarketCoinOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         tx_bytes: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         let unverified: UnverifiedTransaction = try_tx_fus!(rlp::decode(tx_bytes));
         let tx = try_tx_fus!(SignedEthTx::new(unverified));
@@ -1265,10 +1903,15 @@ impl MarketCoinOps for EthCoin {
         };
 
         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!(),
+        let decoded = try_tx_fus!(decode_contract_call(payment_func, &tx.data));
+        let id = match decoded.first() {
+            Some(Token::FixedBytes(bytes)) => bytes.clone(),
+            invalid_token => {
+                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                    "Expected Token::FixedBytes, got {:?}",
+                    invalid_token
+                ))))
+            },
         };
         let selfi = self.clone();
 
@@ -1300,22 +1943,16 @@ impl MarketCoinOps for EthCoin {
 
                 if let Some(event) = found {
                     if let Some(tx_hash) = event.transaction_hash {
-                        let transaction = match selfi
-                            .web3
-                            .eth()
-                            .transaction(TransactionId::Hash(tx_hash))
-                            .compat()
-                            .await
-                        {
+                        let transaction = match selfi.web3.eth().transaction(TransactionId::Hash(tx_hash)).await {
                             Ok(Some(t)) => t,
                             Ok(None) => {
                                 info!("Tx {} not found yet", tx_hash);
-                                Timer::sleep(5.).await;
+                                Timer::sleep(check_every).await;
                                 continue;
                             },
                             Err(e) => {
                                 error!("Get tx {} error: {}", tx_hash, e);
-                                Timer::sleep(5.).await;
+                                Timer::sleep(check_every).await;
                                 continue;
                             },
                         };
@@ -1338,8 +1975,10 @@ impl MarketCoinOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
-        Ok(try_s!(signed_eth_tx_from_bytes(bytes)).into())
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        signed_eth_tx_from_bytes(bytes)
+            .map(TransactionEnum::from)
+            .map_to_mm(TxMarshalingErr::InvalidInput)
     }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
@@ -1347,12 +1986,19 @@ impl MarketCoinOps for EthCoin {
             self.web3
                 .eth()
                 .block_number()
-                .map(|res| res.into())
+                .compat()
+                .map(|res| res.as_u64())
                 .map_err(|e| ERRL!("{}", e)),
         )
     }
 
-    fn display_priv_key(&self) -> Result<String, String> { Ok(format!("{:#02x}", self.key_pair.secret())) }
+    fn display_priv_key(&self) -> Result<String, String> {
+        match self.priv_key_policy {
+            EthPrivKeyPolicy::KeyPair(ref key_pair) => Ok(format!("{:#02x}", key_pair.secret())),
+            #[cfg(target_arch = "wasm32")]
+            EthPrivKeyPolicy::Metamask(_) => ERR!("'display_priv_key' doesn't support MetaMask"),
+        }
+    }
 
     fn min_tx_amount(&self) -> BigDecimal { BigDecimal::from(0) }
 
@@ -1376,9 +2022,10 @@ lazy_static! {
 
 type EthTxFut = Box<dyn Future<Item = SignedEthTx, Error = TransactionErr> + Send + 'static>;
 
-async fn sign_and_send_transaction_impl(
+async fn sign_and_send_transaction_with_keypair(
     ctx: MmArc,
-    coin: EthCoin,
+    coin: &EthCoin,
+    key_pair: &KeyPair,
     value: U256,
     action: Action,
     data: Vec<u8>,
@@ -1399,6 +2046,7 @@ async fn sign_and_send_transaction_impl(
     );
     status.status(tags!(), "get_gas_price…");
     let gas_price = try_tx_s!(coin.get_gas_price().compat().await);
+
     let tx = UnSignedEthTx {
         nonce,
         gas_price,
@@ -1407,43 +2055,71 @@ async fn sign_and_send_transaction_impl(
         value,
         data,
     };
-    let signed = tx.sign(coin.key_pair.secret(), coin.chain_id);
-    let bytes = web3::types::Bytes(rlp::encode(&signed).to_vec());
+
+    let signed = tx.sign(key_pair.secret(), coin.chain_id);
+    let bytes = Bytes(rlp::encode(&signed).to_vec());
     status.status(tags!(), "send_raw_transaction…");
 
     try_tx_s!(
         coin.web3
             .eth()
             .send_raw_transaction(bytes)
-            .map_err(|e| ERRL!("{}", e))
-            .compat()
-            .await,
+            .await
+            .map_err(|e| ERRL!("{}", e)),
         signed
     );
 
     status.status(tags!(), "get_addr_nonce…");
-    loop {
-        // Check every second till ETH nodes recognize that nonce is increased
-        // Parity has reliable "nextNonce" method that always returns correct nonce for address
-        // But we can't expect that all nodes will always be Parity.
-        // Some of ETH forks use Geth only so they don't have Parity nodes at all.
-        let new_nonce = match get_addr_nonce(coin.my_address, coin.web3_instances.clone())
-            .compat()
+    coin.wait_for_addr_nonce_increase(coin.my_address, nonce).await;
+    Ok(signed)
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn sign_and_send_transaction_with_metamask(
+    coin: EthCoin,
+    value: U256,
+    action: Action,
+    data: Vec<u8>,
+    gas: U256,
+) -> Result<SignedEthTx, TransactionErr> {
+    let to = match action {
+        Action::Create => None,
+        Action::Call(to) => Some(to),
+    };
+
+    let gas_price = try_tx_s!(coin.get_gas_price().compat().await);
+
+    let tx_to_send = TransactionRequest {
+        from: coin.my_address,
+        to,
+        gas: Some(gas),
+        gas_price: Some(gas_price),
+        value: Some(value),
+        data: Some(data.clone().into()),
+        nonce: None,
+        ..TransactionRequest::default()
+    };
+
+    // It's important to return the transaction hex for the swap,
+    // so wait up to 60 seconds for the transaction to appear on the RPC node.
+    let wait_rpc_timeout = 60_000;
+    let check_every = 1.;
+
+    // Please note that this method may take a long time
+    // due to `wallet_switchEthereumChain` and `eth_sendTransaction` requests.
+    let tx_hash = try_tx_s!(coin.web3.eth().send_transaction(tx_to_send).await);
+
+    let maybe_signed_tx = try_tx_s!(
+        coin.wait_for_tx_appears_on_rpc(tx_hash, wait_rpc_timeout, check_every)
             .await
-        {
-            Ok(n) => n,
-            Err(e) => {
-                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;
-            },
-        };
-        if new_nonce > nonce {
-            break;
-        };
-        Timer::sleep(1.).await;
+    );
+    match maybe_signed_tx {
+        Some(signed_tx) => Ok(signed_tx),
+        None => TX_PLAIN_ERR!(
+            "Waited too long until the transaction {:?} appear on the RPC node",
+            tx_hash
+        ),
     }
-    Ok(signed)
 }
 
 impl EthCoin {
@@ -1456,7 +2132,7 @@ impl EthCoin {
         // Artem Pikulin: by playing a bit with Parity mainnet node I've discovered that trace_filter API responds after reasonable time for 1000 blocks.
         // I've tried to increase the amount to 10000, but request times out somewhere near 2500000 block.
         // Also the Parity RPC server seem to get stuck while request in running (other requests performance is also lowered).
-        let delta = U256::from(1000);
+        let delta = U64::from(1000);
 
         let mut success_iteration = 0i32;
         loop {
@@ -1472,7 +2148,7 @@ impl EthCoin {
                 };
             }
 
-            let current_block = match self.web3.eth().block_number().compat().await {
+            let current_block = match self.web3.eth().block_number().await {
                 Ok(block) => block,
                 Err(e) => {
                     ctx.log.log(
@@ -1494,7 +2170,7 @@ impl EthCoin {
                 },
             };
             *self.history_sync_state.lock().unwrap() = HistorySyncState::InProgress(json!({
-                "blocks_left": u64::from(saved_traces.earliest_block),
+                "blocks_left": saved_traces.earliest_block.as_u64(),
             }));
 
             let mut existing_history = match self.load_history_from_file(ctx).compat().await {
@@ -1523,8 +2199,8 @@ impl EthCoin {
                     .eth_traces(
                         vec![self.my_address],
                         vec![],
-                        BlockNumber::Number(before_earliest.into()),
-                        BlockNumber::Number((saved_traces.earliest_block).into()),
+                        BlockNumber::Number(before_earliest),
+                        BlockNumber::Number(saved_traces.earliest_block),
                         None,
                     )
                     .compat()
@@ -1546,8 +2222,8 @@ impl EthCoin {
                     .eth_traces(
                         vec![],
                         vec![self.my_address],
-                        BlockNumber::Number(before_earliest.into()),
-                        BlockNumber::Number((saved_traces.earliest_block).into()),
+                        BlockNumber::Number(before_earliest),
+                        BlockNumber::Number(saved_traces.earliest_block),
                         None,
                     )
                     .compat()
@@ -1585,8 +2261,8 @@ impl EthCoin {
                     .eth_traces(
                         vec![self.my_address],
                         vec![],
-                        BlockNumber::Number((saved_traces.latest_block + 1).into()),
-                        BlockNumber::Number(current_block.into()),
+                        BlockNumber::Number(saved_traces.latest_block + 1),
+                        BlockNumber::Number(current_block),
                         None,
                     )
                     .compat()
@@ -1608,8 +2284,8 @@ impl EthCoin {
                     .eth_traces(
                         vec![],
                         vec![self.my_address],
-                        BlockNumber::Number((saved_traces.latest_block + 1).into()),
-                        BlockNumber::Number(current_block.into()),
+                        BlockNumber::Number(saved_traces.latest_block + 1),
+                        BlockNumber::Number(current_block),
                         None,
                     )
                     .compat()
@@ -1658,7 +2334,6 @@ impl EthCoin {
                     .web3
                     .eth()
                     .transaction(TransactionId::Hash(trace.transaction_hash.unwrap()))
-                    .compat()
                     .await
                 {
                     Ok(tx) => tx,
@@ -1693,7 +2368,6 @@ impl EthCoin {
                     .web3
                     .eth()
                     .transaction_receipt(trace.transaction_hash.unwrap())
-                    .compat()
                     .await
                 {
                     Ok(r) => r,
@@ -1715,14 +2389,18 @@ impl EthCoin {
                     EthCoinType::Erc20 { platform, .. } => platform.as_str(),
                 };
                 let fee_details: Option<EthTxFeeDetails> = match receipt {
-                    Some(r) => Some(
-                        EthTxFeeDetails::new(r.gas_used.unwrap_or_else(|| 0.into()), web3_tx.gas_price, fee_coin)
-                            .unwrap(),
-                    ),
+                    Some(r) => {
+                        let gas_used = r.gas_used.unwrap_or_default();
+                        let gas_price = web3_tx.gas_price.unwrap_or_default();
+                        // It's relatively safe to unwrap `EthTxFeeDetails::new` as it may fail
+                        // due to `u256_to_big_decimal` only.
+                        // Also TX history is not used by any GUI and has significant disadvantages.
+                        Some(EthTxFeeDetails::new(gas_used, gas_price, fee_coin).unwrap())
+                    },
                     None => None,
                 };
 
-                let total_amount: BigDecimal = u256_to_big_decimal(call_data.value, 18).unwrap();
+                let total_amount: BigDecimal = u256_to_big_decimal(call_data.value, ETH_DECIMALS).unwrap();
                 let mut received_by_me = 0.into();
                 let mut spent_by_me = 0.into();
 
@@ -1747,8 +2425,7 @@ impl EthCoin {
                 let block = match self
                     .web3
                     .eth()
-                    .block(BlockId::Number(BlockNumber::Number(trace.block_number)))
-                    .compat()
+                    .block(BlockId::Number(BlockNumber::Number(trace.block_number.into())))
                     .await
                 {
                     Ok(b) => b.unwrap(),
@@ -1772,12 +2449,13 @@ impl EthCoin {
                     coin: self.ticker.clone(),
                     fee_details: fee_details.map(|d| d.into()),
                     block_height: trace.block_number,
-                    tx_hash: format!("{:02x}", BytesJson(raw.hash.to_vec())),
-                    tx_hex: BytesJson(rlp::encode(&raw)),
+                    tx_hash: format!("{:02x}", BytesJson(raw.hash.as_bytes().to_vec())),
+                    tx_hex: BytesJson(rlp::encode(&raw).to_vec()),
                     internal_id,
-                    timestamp: block.timestamp.into(),
+                    timestamp: block.timestamp.into_or_max(),
                     kmd_rewards: None,
                     transaction_type: Default::default(),
+                    memo: None,
                 };
 
                 existing_history.push(details);
@@ -1813,7 +2491,7 @@ impl EthCoin {
     #[allow(clippy::cognitive_complexity)]
     #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
     async fn process_erc20_history(&self, token_addr: H160, ctx: &MmArc) {
-        let delta = U256::from(10000);
+        let delta = U64::from(10000);
 
         let mut success_iteration = 0i32;
         loop {
@@ -1829,7 +2507,7 @@ impl EthCoin {
                 };
             }
 
-            let current_block = match self.web3.eth().block_number().compat().await {
+            let current_block = match self.web3.eth().block_number().await {
                 Ok(block) => block,
                 Err(e) => {
                     ctx.log.log(
@@ -1851,7 +2529,7 @@ impl EthCoin {
                 },
             };
             *self.history_sync_state.lock().unwrap() = HistorySyncState::InProgress(json!({
-                "blocks_left": u64::from(saved_events.earliest_block),
+                "blocks_left": saved_events.earliest_block,
             }));
 
             // AP: AFAIK ETH RPC doesn't support conditional filters like `get this OR this` so we have
@@ -1869,8 +2547,8 @@ impl EthCoin {
                         token_addr,
                         Some(self.my_address),
                         None,
-                        BlockNumber::Number(before_earliest.into()),
-                        BlockNumber::Number((saved_events.earliest_block - 1).into()),
+                        BlockNumber::Number(before_earliest),
+                        BlockNumber::Number(saved_events.earliest_block - 1),
                         None,
                     )
                     .compat()
@@ -1893,8 +2571,8 @@ impl EthCoin {
                         token_addr,
                         None,
                         Some(self.my_address),
-                        BlockNumber::Number(before_earliest.into()),
-                        BlockNumber::Number((saved_events.earliest_block - 1).into()),
+                        BlockNumber::Number(before_earliest),
+                        BlockNumber::Number(saved_events.earliest_block - 1),
                         None,
                     )
                     .compat()
@@ -1932,8 +2610,8 @@ impl EthCoin {
                         token_addr,
                         Some(self.my_address),
                         None,
-                        BlockNumber::Number((saved_events.latest_block + 1).into()),
-                        BlockNumber::Number(current_block.into()),
+                        BlockNumber::Number(saved_events.latest_block + 1),
+                        BlockNumber::Number(current_block),
                         None,
                     )
                     .compat()
@@ -1956,8 +2634,8 @@ impl EthCoin {
                         token_addr,
                         None,
                         Some(self.my_address),
-                        BlockNumber::Number((saved_events.latest_block + 1).into()),
-                        BlockNumber::Number(current_block.into()),
+                        BlockNumber::Number(saved_events.latest_block + 1),
+                        BlockNumber::Number(current_block),
                         None,
                     )
                     .compat()
@@ -1991,7 +2669,7 @@ impl EthCoin {
                 .filter(|e| e.block_number.is_some() && e.transaction_hash.is_some() && !e.is_removed())
                 .map(|e| (e.transaction_hash.unwrap(), e))
                 .collect();
-            let mut all_events: Vec<_> = all_events.into_iter().map(|(_, log)| log).collect();
+            let mut all_events: Vec<_> = all_events.into_values().collect();
             all_events.sort_by(|a, b| b.block_number.unwrap().cmp(&a.block_number.unwrap()));
 
             for event in all_events {
@@ -2035,7 +2713,6 @@ impl EthCoin {
                     .web3
                     .eth()
                     .transaction(TransactionId::Hash(event.transaction_hash.unwrap()))
-                    .compat()
                     .await
                 {
                     Ok(tx) => tx,
@@ -2072,7 +2749,6 @@ impl EthCoin {
                     .web3
                     .eth()
                     .transaction_receipt(event.transaction_hash.unwrap())
-                    .compat()
                     .await
                 {
                     Ok(r) => r,
@@ -2094,18 +2770,21 @@ impl EthCoin {
                     EthCoinType::Erc20 { platform, .. } => platform.as_str(),
                 };
                 let fee_details = match receipt {
-                    Some(r) => Some(
-                        EthTxFeeDetails::new(r.gas_used.unwrap_or_else(|| 0.into()), web3_tx.gas_price, fee_coin)
-                            .unwrap(),
-                    ),
+                    Some(r) => {
+                        let gas_used = r.gas_used.unwrap_or_default();
+                        let gas_price = web3_tx.gas_price.unwrap_or_default();
+                        // It's relatively safe to unwrap `EthTxFeeDetails::new` as it may fail
+                        // due to `u256_to_big_decimal` only.
+                        // Also TX history is not used by any GUI and has significant disadvantages.
+                        Some(EthTxFeeDetails::new(gas_used, gas_price, fee_coin).unwrap())
+                    },
                     None => None,
                 };
                 let block_number = event.block_number.unwrap();
                 let block = match self
                     .web3
                     .eth()
-                    .block(BlockId::Number(BlockNumber::Number(block_number.into())))
-                    .compat()
+                    .block(BlockId::Number(BlockNumber::Number(block_number)))
                     .await
                 {
                     Ok(Some(b)) => b,
@@ -2137,13 +2816,14 @@ impl EthCoin {
                     from: vec![checksum_address(&format!("{:#02x}", from_addr))],
                     coin: self.ticker.clone(),
                     fee_details: fee_details.map(|d| d.into()),
-                    block_height: block_number.into(),
-                    tx_hash: format!("{:02x}", BytesJson(raw.hash.to_vec())),
-                    tx_hex: BytesJson(rlp::encode(&raw)),
+                    block_height: block_number.as_u64(),
+                    tx_hash: format!("{:02x}", BytesJson(raw.hash.as_bytes().to_vec())),
+                    tx_hex: BytesJson(rlp::encode(&raw).to_vec()),
                     internal_id: BytesJson(internal_id.to_vec()),
-                    timestamp: block.timestamp.into(),
+                    timestamp: block.timestamp.into_or_max(),
                     kmd_rewards: None,
                     transaction_type: Default::default(),
+                    memo: None,
                 };
 
                 existing_history.push(details);
@@ -2180,15 +2860,19 @@ impl EthCoin {
 impl EthCoin {
     fn sign_and_send_transaction(&self, value: U256, action: Action, data: Vec<u8>, gas: U256) -> EthTxFut {
         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(),
-            value,
-            action,
-            data,
-            gas,
-        ));
-        Box::new(fut.compat())
+        let coin = self.clone();
+        let fut = async move {
+            match coin.priv_key_policy {
+                EthPrivKeyPolicy::KeyPair(ref key_pair) => {
+                    sign_and_send_transaction_with_keypair(ctx, &coin, key_pair, value, action, data, gas).await
+                },
+                #[cfg(target_arch = "wasm32")]
+                EthPrivKeyPolicy::Metamask(_) => {
+                    sign_and_send_transaction_with_metamask(coin, value, action, data, gas).await
+                },
+            }
+        };
+        Box::new(fut.boxed().compat())
     }
 
     pub fn send_to_address(&self, address: Address, value: U256) -> EthTxFut {
@@ -2215,58 +2899,268 @@ impl EthCoin {
         receiver_addr: Address,
         swap_contract_address: Address,
     ) -> EthTxFut {
+        let secret_hash = if secret_hash.len() == 32 {
+            ripemd160(secret_hash).to_vec()
+        } else {
+            secret_hash.to_vec()
+        };
+
         match &self.coin_type {
             EthCoinType::Eth => {
                 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()),
+                    Token::FixedBytes(secret_hash),
                     Token::Uint(U256::from(time_lock))
                 ]));
-                self.sign_and_send_transaction(value, Action::Call(swap_contract_address), data, U256::from(150_000))
+                self.sign_and_send_transaction(value, Action::Call(swap_contract_address), data, U256::from(ETH_GAS))
+            },
+            EthCoinType::Erc20 {
+                platform: _,
+                token_addr,
+            } => {
+                let allowance_fut = self
+                    .allowance(swap_contract_address)
+                    .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)));
+
+                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),
+                    Token::Address(receiver_addr),
+                    Token::FixedBytes(secret_hash),
+                    Token::Uint(U256::from(time_lock))
+                ]));
+
+                let arc = self.clone();
+                Box::new(allowance_fut.and_then(move |allowed| -> EthTxFut {
+                    if allowed < value {
+                        Box::new(
+                            arc.approve(swap_contract_address, U256::max_value())
+                                .and_then(move |_approved| {
+                                    arc.sign_and_send_transaction(
+                                        0.into(),
+                                        Action::Call(swap_contract_address),
+                                        data,
+                                        U256::from(ETH_GAS),
+                                    )
+                                }),
+                        )
+                    } else {
+                        Box::new(arc.sign_and_send_transaction(
+                            0.into(),
+                            Action::Call(swap_contract_address),
+                            data,
+                            U256::from(ETH_GAS),
+                        ))
+                    }
+                }))
+            },
+        }
+    }
+
+    fn watcher_spend_hash_time_locked_payment(
+        &self,
+        payment: SignedEthTx,
+        _secret_hash: &[u8],
+        secret: &[u8],
+        taker_pub: &[u8],
+    ) -> EthTxFut {
+        let spend_func = try_tx_fus!(SWAP_CONTRACT.function("watcherSpend"));
+        let clone = self.clone();
+        let secret_vec = secret.to_vec();
+        let taker_addr = addr_from_raw_pubkey(taker_pub).unwrap();
+        let swap_contract_address = match payment.action {
+            Call(address) => address,
+            Create => {
+                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                    "Invalid payment action: the payment action cannot be create"
+                ))))
+            },
+        };
+
+        match self.coin_type {
+            EthCoinType::Eth => {
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let swap_id_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 0));
+
+                let state_f = self.payment_status(swap_contract_address, swap_id_input.clone());
+                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_tx_fus!(spend_func.encode_input(&[
+                                swap_id_input,
+                                Token::Uint(value),
+                                Token::FixedBytes(secret_vec.clone()),
+                                Token::Address(Address::default()),
+                                Token::Address(payment.sender()),
+                                Token::Address(taker_addr)
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(ETH_GAS),
+                            )
+                        }),
+                )
+            },
+            EthCoinType::Erc20 {
+                platform: _,
+                token_addr,
+            } => {
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
+
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let swap_id_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 0));
+                let amount_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 1));
+                let state_f = self.payment_status(swap_contract_address, swap_id_input.clone());
+
+                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(&[
+                                swap_id_input.clone(),
+                                amount_input,
+                                Token::FixedBytes(secret_vec.clone()),
+                                Token::Address(token_addr),
+                                Token::Address(payment.sender()),
+                                Token::Address(taker_addr)
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(ETH_GAS),
+                            )
+                        }),
+                )
+            },
+        }
+    }
+
+    fn watcher_refunds_hash_time_locked_payment(
+        &self,
+        payment: SignedEthTx,
+        _secret_hash: &[u8],
+        taker_pub: &[u8],
+    ) -> EthTxFut {
+        let refund_func = try_tx_fus!(SWAP_CONTRACT.function("watcherRefund"));
+        let clone = self.clone();
+        let taker_addr = addr_from_raw_pubkey(taker_pub).unwrap();
+        let swap_contract_address = match payment.action {
+            Call(address) => address,
+            Create => {
+                return Box::new(futures01::future::err(TransactionErr::Plain(ERRL!(
+                    "Invalid payment action: the payment action cannot be create"
+                ))))
+            },
+        };
+
+        match self.coin_type {
+            EthCoinType::Eth => {
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let swap_id_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 0));
+                let amount_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 1));
+                let hash_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 2));
+
+                let state_f = self.payment_status(swap_contract_address, swap_id_input.clone());
+                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_tx_fus!(refund_func.encode_input(&[
+                                swap_id_input.clone(),
+                                Token::Uint(value),
+                                hash_input.clone(),
+                                Token::Address(Address::default()),
+                                Token::Address(taker_addr),
+                                amount_input.clone(),
+                            ]));
+
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(ETH_GAS),
+                            )
+                        }),
+                )
             },
             EthCoinType::Erc20 {
                 platform: _,
                 token_addr,
             } => {
-                let allowance_fut = self
-                    .allowance(swap_contract_address)
-                    .map_err(|e| TransactionErr::Plain(ERRL!("{}", e)));
+                let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
+                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let swap_id_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 0));
+                let amount_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 1));
+                let token_addr_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 3));
+                let sender_input = try_tx_fus!(get_function_input_data(&decoded, payment_func, 4));
+                let state_f = self.payment_status(swap_contract_address, swap_id_input.clone());
+                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 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),
-                    Token::Address(receiver_addr),
-                    Token::FixedBytes(secret_hash.to_vec()),
-                    Token::Uint(U256::from(time_lock))
-                ]));
+                            let data = try_tx_fus!(refund_func.encode_input(&[
+                                swap_id_input.clone(),
+                                amount_input.clone(),
+                                sender_input.clone(),
+                                Token::Address(token_addr),
+                                Token::Address(taker_addr),
+                                token_addr_input.clone(),
+                            ]));
 
-                let arc = self.clone();
-                Box::new(allowance_fut.and_then(move |allowed| -> EthTxFut {
-                    if allowed < value {
-                        Box::new(
-                            arc.approve(swap_contract_address, U256::max_value())
-                                .and_then(move |_approved| {
-                                    arc.sign_and_send_transaction(
-                                        0.into(),
-                                        Action::Call(swap_contract_address),
-                                        data,
-                                        U256::from(150_000),
-                                    )
-                                }),
-                        )
-                    } else {
-                        Box::new(arc.sign_and_send_transaction(
-                            0.into(),
-                            Action::Call(swap_contract_address),
-                            data,
-                            U256::from(150_000),
-                        ))
-                    }
-                }))
+                            clone.sign_and_send_transaction(
+                                0.into(),
+                                Action::Call(swap_contract_address),
+                                data,
+                                U256::from(ETH_GAS),
+                            )
+                        }),
+                )
             },
         }
     }
@@ -2274,6 +3168,7 @@ impl EthCoin {
     fn spend_hash_time_locked_payment(
         &self,
         payment: SignedEthTx,
+        _secret_hash: &[u8],
         swap_contract_address: Address,
         secret: &[u8],
     ) -> EthTxFut {
@@ -2284,7 +3179,7 @@ impl EthCoin {
         match self.coin_type {
             EthCoinType::Eth => {
                 let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
-                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let decoded = try_tx_fus!(decode_contract_call(payment_func, &payment.data));
 
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
                 Box::new(
@@ -2312,7 +3207,7 @@ impl EthCoin {
                                 0.into(),
                                 Action::Call(swap_contract_address),
                                 data,
-                                U256::from(150_000),
+                                U256::from(ETH_GAS),
                             )
                         }),
                 )
@@ -2322,7 +3217,8 @@ impl EthCoin {
                 token_addr,
             } => {
                 let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
-                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+
+                let decoded = try_tx_fus!(decode_contract_call(payment_func, &payment.data));
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
 
                 Box::new(
@@ -2348,7 +3244,7 @@ impl EthCoin {
                                 0.into(),
                                 Action::Call(swap_contract_address),
                                 data,
-                                U256::from(150_000),
+                                U256::from(ETH_GAS),
                             )
                         }),
                 )
@@ -2356,14 +3252,19 @@ impl EthCoin {
         }
     }
 
-    fn refund_hash_time_locked_payment(&self, swap_contract_address: Address, payment: SignedEthTx) -> EthTxFut {
+    fn refund_hash_time_locked_payment(
+        &self,
+        swap_contract_address: Address,
+        payment: SignedEthTx,
+        _secret_hash: &[u8],
+    ) -> EthTxFut {
         let refund_func = try_tx_fus!(SWAP_CONTRACT.function("senderRefund"));
         let clone = self.clone();
 
         match self.coin_type {
             EthCoinType::Eth => {
                 let payment_func = try_tx_fus!(SWAP_CONTRACT.function("ethPayment"));
-                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let decoded = try_tx_fus!(decode_contract_call(payment_func, &payment.data));
 
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
                 Box::new(
@@ -2391,7 +3292,7 @@ impl EthCoin {
                                 0.into(),
                                 Action::Call(swap_contract_address),
                                 data,
-                                U256::from(150_000),
+                                U256::from(ETH_GAS),
                             )
                         }),
                 )
@@ -2401,7 +3302,7 @@ impl EthCoin {
                 token_addr,
             } => {
                 let payment_func = try_tx_fus!(SWAP_CONTRACT.function("erc20Payment"));
-                let decoded = try_tx_fus!(payment_func.decode_input(&payment.data));
+                let decoded = try_tx_fus!(decode_contract_call(payment_func, &payment.data));
                 let state_f = self.payment_status(swap_contract_address, decoded[0].clone());
                 Box::new(
                     state_f
@@ -2427,7 +3328,7 @@ impl EthCoin {
                                 0.into(),
                                 Action::Call(swap_contract_address),
                                 data,
-                                U256::from(150_000),
+                                U256::from(ETH_GAS),
                             )
                         }),
                 )
@@ -2443,13 +3344,12 @@ impl EthCoin {
                     .web3
                     .eth()
                     .balance(coin.my_address, Some(BlockNumber::Latest))
-                    .compat()
                     .await?),
                 EthCoinType::Erc20 { ref token_addr, .. } => {
                     let function = ERC20_CONTRACT.function("balanceOf")?;
                     let data = function.encode_input(&[Token::Address(coin.my_address)])?;
 
-                    let res = coin.call_request(*token_addr, None, Some(data.into())).compat().await?;
+                    let res = coin.call_request(*token_addr, None, Some(data.into())).await?;
                     let decoded = function.decode_output(&res.0)?;
                     match decoded[0] {
                         Token::Uint(number) => Ok(number),
@@ -2464,6 +3364,43 @@ impl EthCoin {
         Box::new(fut.boxed().compat())
     }
 
+    pub async fn get_tokens_balance_list(&self) -> Result<HashMap<String, CoinBalance>, MmError<BalanceError>> {
+        let coin = self.clone();
+        let mut token_balances = HashMap::new();
+        for (token_ticker, info) in self.get_erc_tokens_infos().iter() {
+            let balance_as_u256 = coin.get_token_balance_by_address(info.token_address).await?;
+            let balance_as_big_decimal = u256_to_big_decimal(balance_as_u256, info.decimals)?;
+            let balance = CoinBalance {
+                spendable: balance_as_big_decimal,
+                unspendable: BigDecimal::from(0),
+            };
+            token_balances.insert(token_ticker.clone(), balance);
+        }
+
+        Ok(token_balances)
+    }
+
+    async fn get_token_balance_by_address(&self, token_address: Address) -> Result<U256, MmError<BalanceError>> {
+        let coin = self.clone();
+        let function = ERC20_CONTRACT.function("balanceOf")?;
+        let data = function.encode_input(&[Token::Address(coin.my_address)])?;
+        let res = coin.call_request(token_address, None, Some(data.into())).await?;
+        let decoded = function.decode_output(&res.0)?;
+
+        match decoded[0] {
+            Token::Uint(number) => Ok(number),
+            _ => {
+                let error = format!("Expected U256 as balanceOf result but got {:?}", decoded);
+                MmError::err(BalanceError::InvalidResponse(error))
+            },
+        }
+    }
+
+    fn estimate_gas(&self, req: CallRequest) -> Box<dyn Future<Item = U256, Error = web3::Error> + Send> {
+        // always using None block number as old Geth version accept only single argument in this RPC
+        Box::new(self.web3.eth().estimate_gas(req, None).compat())
+    }
+
     /// Estimates how much gas is necessary to allow the contract call to complete.
     /// `contract_addr` can be a ERC20 token address or any other contract address.
     ///
@@ -2482,11 +3419,12 @@ impl EthCoin {
                 value: Some(eth_value),
                 data: Some(call_data),
                 from: Some(coin.my_address),
-                to: contract_addr,
+                to: Some(contract_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),
+                ..CallRequest::default()
             };
             coin.estimate_gas(estimate_gas_req).map_to_mm_fut(Web3RpcError::from)
         }))
@@ -2497,26 +3435,26 @@ impl EthCoin {
             self.web3
                 .eth()
                 .balance(self.my_address, Some(BlockNumber::Latest))
+                .compat()
                 .map_to_mm_fut(BalanceError::from),
         )
     }
 
-    fn call_request(
-        &self,
-        to: Address,
-        value: Option<U256>,
-        data: Option<Bytes>,
-    ) -> impl Future<Item = Bytes, Error = web3::Error> {
+    async fn call_request(&self, to: Address, value: Option<U256>, data: Option<Bytes>) -> Result<Bytes, web3::Error> {
         let request = CallRequest {
             from: Some(self.my_address),
-            to,
+            to: Some(to),
             gas: None,
             gas_price: None,
             value,
             data,
+            ..CallRequest::default()
         };
 
-        self.web3.eth().call(request, Some(BlockNumber::Latest))
+        self.web3
+            .eth()
+            .call(request, Some(BlockId::Number(BlockNumber::Latest)))
+            .await
     }
 
     fn allowance(&self, spender: Address) -> Web3RpcFut<U256> {
@@ -2530,7 +3468,7 @@ impl EthCoin {
                     let function = ERC20_CONTRACT.function("allowance")?;
                     let data = function.encode_input(&[Token::Address(coin.my_address), Token::Address(spender)])?;
 
-                    let res = coin.call_request(*token_addr, None, Some(data.into())).compat().await?;
+                    let res = coin.call_request(*token_addr, None, Some(data.into())).await?;
                     let decoded = function.decode_output(&res.0)?;
 
                     match decoded[0] {
@@ -2579,12 +3517,30 @@ impl EthCoin {
         let contract_event = try_fus!(SWAP_CONTRACT.event("PaymentSent"));
         let filter = FilterBuilder::default()
             .topics(Some(vec![contract_event.signature()]), None, None, None)
-            .from_block(BlockNumber::Number(from_block))
-            .to_block(BlockNumber::Number(to_block))
+            .from_block(BlockNumber::Number(from_block.into()))
+            .to_block(BlockNumber::Number(to_block.into()))
+            .address(vec![swap_contract_address])
+            .build();
+
+        Box::new(self.web3.eth().logs(filter).compat().map_err(|e| ERRL!("{}", e)))
+    }
+
+    /// Gets `ReceiverSpent` events from etomic swap smart contract since `from_block`
+    fn spend_events(
+        &self,
+        swap_contract_address: Address,
+        from_block: u64,
+        to_block: u64,
+    ) -> Box<dyn Future<Item = Vec<Log>, Error = String> + Send> {
+        let contract_event = try_fus!(SWAP_CONTRACT.event("ReceiverSpent"));
+        let filter = FilterBuilder::default()
+            .topics(Some(vec![contract_event.signature()]), None, None, None)
+            .from_block(BlockNumber::Number(from_block.into()))
+            .to_block(BlockNumber::Number(to_block.into()))
             .address(vec![swap_contract_address])
             .build();
 
-        Box::new(self.web3.eth().logs(filter).map_err(|e| ERRL!("{}", e)))
+        Box::new(self.web3.eth().logs(filter).compat().map_err(|e| ERRL!("{}", e)))
     }
 
     fn validate_payment(
@@ -2595,92 +3551,94 @@ impl EthCoin {
         secret_hash: &[u8],
         amount: BigDecimal,
         expected_swap_contract_address: Address,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let unsigned: UnverifiedTransaction = try_fus!(rlp::decode(payment_tx));
-        let tx = try_fus!(SignedEthTx::new(unsigned));
-        let sender = try_fus!(addr_from_raw_pubkey(sender_pub));
-        let expected_value = try_fus!(wei_from_big_decimal(&amount, self.decimals));
+    ) -> ValidatePaymentFut<()> {
+        let unsigned: UnverifiedTransaction = try_f!(rlp::decode(payment_tx));
+        let tx =
+            try_f!(SignedEthTx::new(unsigned)
+                .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string())));
+        let sender = try_f!(addr_from_raw_pubkey(sender_pub).map_to_mm(ValidatePaymentError::InvalidParameter));
+        let expected_value = try_f!(wei_from_big_decimal(&amount, self.decimals));
         let selfi = self.clone();
-        let secret_hash = secret_hash.to_vec();
+        let swap_id = selfi.etomic_swap_id(time_lock, secret_hash);
+        let secret_hash = if secret_hash.len() == 32 {
+            ripemd160(secret_hash).to_vec()
+        } else {
+            secret_hash.to_vec()
+        };
         let fut = async move {
-            let swap_id = selfi.etomic_swap_id(time_lock, &secret_hash);
-            let status = try_s!(
-                selfi
-                    .payment_status(expected_swap_contract_address, Token::FixedBytes(swap_id.clone()))
-                    .compat()
-                    .await
-            );
+            let status = selfi
+                .payment_status(expected_swap_contract_address, Token::FixedBytes(swap_id.clone()))
+                .compat()
+                .await
+                .map_to_mm(ValidatePaymentError::Transport)?;
             if status != PAYMENT_STATE_SENT.into() {
-                return ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
+                return MmError::err(ValidatePaymentError::UnexpectedPaymentState(format!(
+                    "Payment state is not PAYMENT_STATE_SENT, got {}",
+                    status
+                )));
             }
 
-            let tx_from_rpc = try_s!(
-                selfi
-                    .web3
-                    .eth()
-                    .transaction(TransactionId::Hash(tx.hash))
-                    .compat()
-                    .await
-            );
-            let tx_from_rpc = match tx_from_rpc {
-                Some(t) => t,
-                None => return ERR!("Didn't find provided tx {:?} on ETH node", tx),
-            };
+            let tx_from_rpc = selfi.web3.eth().transaction(TransactionId::Hash(tx.hash)).await?;
+            let tx_from_rpc = tx_from_rpc.as_ref().ok_or_else(|| {
+                ValidatePaymentError::TxDoesNotExist(format!("Didn't find provided tx {:?} on ETH node", tx.hash))
+            })?;
 
-            if tx_from_rpc.from != sender {
-                return ERR!(
+            if tx_from_rpc.from != Some(sender) {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                     "Payment tx {:?} was sent from wrong address, expected {:?}",
-                    tx_from_rpc,
-                    sender
-                );
+                    tx_from_rpc, sender
+                )));
             }
 
             match &selfi.coin_type {
                 EthCoinType::Eth => {
                     if tx_from_rpc.to != Some(expected_swap_contract_address) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx {:?} was sent to wrong address, expected {:?}",
-                            tx_from_rpc,
-                            expected_swap_contract_address
-                        );
+                            tx_from_rpc, expected_swap_contract_address,
+                        )));
                     }
 
                     if tx_from_rpc.value != expected_value {
-                        return ERR!(
-                            "Payment tx {:?} value is invalid, expected {:?}",
-                            tx_from_rpc,
-                            expected_value
-                        );
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Payment tx value arg {:?} is invalid, expected {:?}",
+                            tx_from_rpc, expected_value
+                        )));
                     }
-
-                    let function = try_s!(SWAP_CONTRACT.function("ethPayment"));
-                    let decoded = try_s!(function.decode_input(&tx_from_rpc.input.0));
+                    let function = SWAP_CONTRACT
+                        .function("ethPayment")
+                        .map_to_mm(|err| ValidatePaymentError::InternalError(err.to_string()))?;
+                    let decoded = decode_contract_call(function, &tx_from_rpc.input.0)
+                        .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string()))?;
                     if decoded[0] != Token::FixedBytes(swap_id.clone()) {
-                        return ERR!("Invalid 'swap_id' {:?}, expected {:?}", decoded, swap_id);
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Invalid 'swap_id' {:?}, expected {:?}",
+                            decoded, swap_id
+                        )));
                     }
 
                     if decoded[1] != Token::Address(selfi.my_address) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx receiver arg {:?} is invalid, expected {:?}",
                             decoded[1],
                             Token::Address(selfi.my_address)
-                        );
+                        )));
                     }
 
                     if decoded[2] != Token::FixedBytes(secret_hash.to_vec()) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx secret_hash arg {:?} is invalid, expected {:?}",
                             decoded[2],
-                            Token::FixedBytes(secret_hash.to_vec())
-                        );
+                            Token::FixedBytes(secret_hash.to_vec()),
+                        )));
                     }
 
                     if decoded[3] != Token::Uint(U256::from(time_lock)) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx time_lock arg {:?} is invalid, expected {:?}",
                             decoded[3],
-                            Token::Uint(U256::from(time_lock))
-                        );
+                            Token::Uint(U256::from(time_lock)),
+                        )));
                     }
                 },
                 EthCoinType::Erc20 {
@@ -2688,57 +3646,61 @@ impl EthCoin {
                     token_addr,
                 } => {
                     if tx_from_rpc.to != Some(expected_swap_contract_address) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx {:?} was sent to wrong address, expected {:?}",
-                            tx_from_rpc,
-                            expected_swap_contract_address
-                        );
+                            tx_from_rpc, expected_swap_contract_address,
+                        )));
                     }
-
-                    let function = try_s!(SWAP_CONTRACT.function("erc20Payment"));
-                    let decoded = try_s!(function.decode_input(&tx_from_rpc.input.0));
+                    let function = SWAP_CONTRACT
+                        .function("erc20Payment")
+                        .map_to_mm(|err| ValidatePaymentError::InternalError(err.to_string()))?;
+                    let decoded = decode_contract_call(function, &tx_from_rpc.input.0)
+                        .map_to_mm(|err| ValidatePaymentError::TxDeserializationError(err.to_string()))?;
                     if decoded[0] != Token::FixedBytes(swap_id.clone()) {
-                        return ERR!("Invalid 'swap_id' {:?}, expected {:?}", decoded, swap_id);
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Invalid 'swap_id' {:?}, expected {:?}",
+                            decoded, swap_id
+                        )));
                     }
 
                     if decoded[1] != Token::Uint(expected_value) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx value arg {:?} is invalid, expected {:?}",
                             decoded[1],
-                            Token::Uint(expected_value)
-                        );
+                            Token::Uint(expected_value),
+                        )));
                     }
 
                     if decoded[2] != Token::Address(*token_addr) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx token_addr arg {:?} is invalid, expected {:?}",
                             decoded[2],
                             Token::Address(*token_addr)
-                        );
+                        )));
                     }
 
                     if decoded[3] != Token::Address(selfi.my_address) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx receiver arg {:?} is invalid, expected {:?}",
                             decoded[3],
-                            Token::Address(selfi.my_address)
-                        );
+                            Token::Address(selfi.my_address),
+                        )));
                     }
 
                     if decoded[4] != Token::FixedBytes(secret_hash.to_vec()) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx secret_hash arg {:?} is invalid, expected {:?}",
                             decoded[4],
-                            Token::FixedBytes(secret_hash.to_vec())
-                        );
+                            Token::FixedBytes(secret_hash.to_vec()),
+                        )));
                     }
 
                     if decoded[5] != Token::Uint(U256::from(time_lock)) {
-                        return ERR!(
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                             "Payment tx time_lock arg {:?} is invalid, expected {:?}",
                             decoded[5],
-                            Token::Uint(U256::from(time_lock))
-                        );
+                            Token::Uint(U256::from(time_lock)),
+                        )));
                     }
                 },
             }
@@ -2757,23 +3719,26 @@ impl EthCoin {
 
         let data = try_fus!(function.encode_input(&[token]));
 
-        Box::new(
-            self.call_request(swap_contract_address, None, Some(data.into()))
-                .map_err(|e| ERRL!("{}", e))
-                .and_then(move |bytes| {
-                    let decoded_tokens = try_s!(function.decode_output(&bytes.0));
-                    match decoded_tokens[2] {
-                        Token::Uint(state) => Ok(state),
-                        _ => ERR!("Payment status must be uint, got {:?}", decoded_tokens[2]),
-                    }
-                }),
-        )
+        let coin = self.clone();
+        let fut = async move { coin.call_request(swap_contract_address, None, Some(data.into())).await };
+
+        Box::new(fut.boxed().compat().map_err(|e| ERRL!("{}", e)).and_then(move |bytes| {
+            let decoded_tokens = try_s!(function.decode_output(&bytes.0));
+            let state = decoded_tokens
+                .get(2)
+                .ok_or_else(|| ERRL!("Payment status must contain 'state' as the 2nd token"))?;
+            match state {
+                Token::Uint(state) => Ok(*state),
+                _ => ERR!("Payment status must be uint, got {:?}", state),
+            }
+        }))
     }
 
     async fn search_for_swap_tx_spend(
         &self,
         tx: &[u8],
         swap_contract_address: Address,
+        _secret_hash: &[u8],
         search_from_block: u64,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
         let unverified: UnverifiedTransaction = try_s!(rlp::decode(tx));
@@ -2785,10 +3750,10 @@ impl EthCoin {
         };
 
         let payment_func = try_s!(SWAP_CONTRACT.function(func_name));
-        let decoded = try_s!(payment_func.decode_input(&tx.data));
-        let id = match &decoded[0] {
-            Token::FixedBytes(bytes) => bytes.clone(),
-            _ => panic!(),
+        let decoded = try_s!(decode_contract_call(payment_func, &tx.data));
+        let id = match decoded.first() {
+            Some(Token::FixedBytes(bytes)) => bytes.clone(),
+            invalid_token => return ERR!("Expected Token::FixedBytes, got {:?}", invalid_token),
         };
 
         let mut current_block = try_s!(self.current_block().compat().await);
@@ -2811,16 +3776,13 @@ impl EthCoin {
             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)).compat().await) {
-                                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)).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)
@@ -2840,16 +3802,13 @@ impl EthCoin {
             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)).compat().await) {
-                                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)).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)
@@ -2889,7 +3848,7 @@ impl EthCoin {
                 None => None,
             };
 
-            let eth_gas_price = match coin.web3.eth().gas_price().compat().await {
+            let eth_gas_price = match coin.web3.eth().gas_price().await {
                 Ok(eth_gas) => Some(eth_gas),
                 Err(e) => {
                     error!("Error {} on eth_gasPrice request", e);
@@ -2900,7 +3859,6 @@ impl EthCoin {
             let fee_history_namespace: EthFeeHistoryNamespace<_> = coin.web3.api();
             let eth_fee_history_price = match fee_history_namespace
                 .eth_fee_history(U256::from(1u64), BlockNumber::Latest, &[])
-                .compat()
                 .await
             {
                 Ok(res) => res
@@ -2908,20 +3866,73 @@ impl EthCoin {
                     .first()
                     .map(|val| increase_by_percent_one_gwei(*val, BASE_BLOCK_FEE_DIFF_PCT)),
                 Err(e) => {
-                    error!("Error {} on eth_feeHistory request", e);
+                    debug!("Error {} on eth_feeHistory request", e);
                     None
                 },
             };
 
-            let all_prices = vec![gas_station_price, eth_gas_price, eth_fee_history_price];
-            all_prices
-                .into_iter()
+            // on editions < 2021 the compiler will resolve array.into_iter() as (&array).into_iter()
+            // https://doc.rust-lang.org/edition-guide/rust-2021/IntoIterator-for-arrays.html#details
+            IntoIterator::into_iter([gas_station_price, eth_gas_price, eth_fee_history_price])
                 .flatten()
                 .max()
                 .or_mm_err(|| Web3RpcError::Internal("All requests failed".into()))
         };
         Box::new(fut.boxed().compat())
     }
+
+    /// Checks every second till ETH nodes recognize that nonce is increased.
+    /// Parity has reliable "nextNonce" method that always returns correct nonce for address.
+    /// But we can't expect that all nodes will always be Parity.
+    /// Some of ETH forks use Geth only so they don't have Parity nodes at all.
+    ///
+    /// Please note that we just keep looping in case of a transport error hoping it will go away.
+    ///
+    /// # Warning
+    ///
+    /// The function is endless, we just keep looping in case of a transport error hoping it will go away.
+    async fn wait_for_addr_nonce_increase(&self, addr: Address, prev_nonce: U256) {
+        repeatable!(async {
+            match get_addr_nonce(addr, self.web3_instances.clone()).compat().await {
+                Ok(new_nonce) if new_nonce > prev_nonce => Ready(()),
+                Ok(_nonce) => Retry(()),
+                Err(e) => {
+                    error!("Error getting {} {} nonce: {}", self.ticker(), self.my_address, e);
+                    Retry(())
+                },
+            }
+        })
+        .until_ready()
+        .repeat_every_secs(1.)
+        .await
+        .ok();
+    }
+
+    /// Returns `None` if the transaction hasn't appeared on the RPC nodes at the specified time.
+    #[cfg(target_arch = "wasm32")]
+    async fn wait_for_tx_appears_on_rpc(
+        &self,
+        tx_hash: H256,
+        wait_rpc_timeout_ms: u64,
+        check_every: f64,
+    ) -> Web3RpcResult<Option<SignedEthTx>> {
+        let wait_until = now_ms() + wait_rpc_timeout_ms;
+        while now_ms() < wait_until {
+            let maybe_tx = self.web3.eth().transaction(TransactionId::Hash(tx_hash)).await?;
+            if let Some(tx) = maybe_tx {
+                let signed_tx = signed_tx_from_web3_tx(tx).map_to_mm(Web3RpcError::InvalidResponse)?;
+                return Ok(Some(signed_tx));
+            }
+
+            Timer::sleep(check_every).await;
+        }
+
+        let timeout_s = wait_rpc_timeout_ms / 1000;
+        warn!(
+            "Couldn't fetch the '{tx_hash:02x}' transaction hex as it hasn't appeared on the RPC node in {timeout_s}s"
+        );
+        Ok(None)
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
@@ -2937,12 +3948,14 @@ impl EthTxFeeDetails {
     fn new(gas: U256, gas_price: U256, coin: &str) -> NumConversResult<EthTxFeeDetails> {
         let total_fee = gas * gas_price;
         // Fees are always paid in ETH, can use 18 decimals by default
-        let total_fee = u256_to_big_decimal(total_fee, 18)?;
-        let gas_price = u256_to_big_decimal(gas_price, 18)?;
+        let total_fee = u256_to_big_decimal(total_fee, ETH_DECIMALS)?;
+        let gas_price = u256_to_big_decimal(gas_price, ETH_DECIMALS)?;
+
+        let gas_u64 = u64::try_from(gas).map_to_mm(|e| NumConversError::new(e.to_string()))?;
 
         Ok(EthTxFeeDetails {
             coin: coin.to_owned(),
-            gas: gas.into(),
+            gas: gas_u64,
             gas_price,
             total_fee,
         })
@@ -2953,10 +3966,28 @@ impl EthTxFeeDetails {
 impl MmCoin for EthCoin {
     fn is_asset_chain(&self) -> bool { false }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
+
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
         Box::new(get_raw_transaction_impl(self.clone(), req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        if tx_hash.len() != H256::len_bytes() {
+            let error = format!(
+                "TX hash should have exactly {} bytes, got {}",
+                H256::len_bytes(),
+                tx_hash.len(),
+            );
+            return Box::new(futures01::future::err(MmError::new(
+                RawTransactionError::InvalidHashError(error),
+            )));
+        }
+
+        let tx_hash = H256::from_slice(tx_hash.as_slice());
+        Box::new(get_tx_hex_by_hash_impl(self.clone(), tx_hash).boxed().compat())
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(Box::pin(withdraw_impl(self.clone(), req)).compat())
     }
@@ -3013,14 +4044,14 @@ impl MmCoin for EthCoin {
             self.get_gas_price()
                 .map_err(|e| e.to_string())
                 .and_then(move |gas_price| {
-                    let fee = gas_price * U256::from(150_000);
+                    let fee = gas_price * U256::from(ETH_GAS);
                     let fee_coin = match &coin.coin_type {
                         EthCoinType::Eth => &coin.ticker,
                         EthCoinType::Erc20 { platform, .. } => platform,
                     };
                     Ok(TradeFee {
                         coin: fee_coin.into(),
-                        amount: try_s!(u256_to_big_decimal(fee, 18)).into(),
+                        amount: try_s!(u256_to_big_decimal(fee, ETH_DECIMALS)).into(),
                         paid_from_trading_vol: false,
                     })
                 }),
@@ -3068,7 +4099,7 @@ impl MmCoin for EthCoin {
         };
 
         let total_fee = gas_limit * gas_price;
-        let amount = u256_to_big_decimal(total_fee, 18)?;
+        let amount = u256_to_big_decimal(total_fee, ETH_DECIMALS)?;
         let fee_coin = match &self.coin_type {
             EthCoinType::Eth => &self.ticker,
             EthCoinType::Erc20 { platform, .. } => platform,
@@ -3080,13 +4111,13 @@ impl MmCoin for EthCoin {
         })
     }
 
-    fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, 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 total_fee = gas_price * U256::from(150_000);
-            let amount = u256_to_big_decimal(total_fee, 18)?;
+            let total_fee = gas_price * U256::from(ETH_GAS);
+            let amount = u256_to_big_decimal(total_fee, ETH_DECIMALS)?;
             let fee_coin = match &coin.coin_type {
                 EthCoinType::Eth => &coin.ticker,
                 EthCoinType::Erc20 { platform, .. } => platform,
@@ -3125,18 +4156,19 @@ impl MmCoin for EthCoin {
             value: Some(eth_value),
             data: Some(data.clone().into()),
             from: Some(self.my_address),
-            to: *call_addr,
+            to: Some(*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),
+            ..CallRequest::default()
         };
 
         // 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)?;
+        let amount = u256_to_big_decimal(total_fee, ETH_DECIMALS)?;
         Ok(TradeFee {
             coin: fee_coin.into(),
             amount: amount.into(),
@@ -3161,11 +4193,23 @@ impl MmCoin for EthCoin {
         Some(BytesJson::from(self.swap_contract_address.0.as_ref()))
     }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> {
+        self.fallback_swap_contract.map(|a| BytesJson::from(a.0.as_ref()))
+    }
+
     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 }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.abortable_system) }
+
+    fn on_token_deactivated(&self, ticker: &str) {
+        if let Ok(tokens) = self.erc20_tokens_infos.lock().as_deref_mut() {
+            tokens.remove(ticker);
+        };
+    }
 }
 
 pub trait TryToAddress {
@@ -3173,7 +4217,24 @@ pub trait TryToAddress {
 }
 
 impl TryToAddress for BytesJson {
-    fn try_to_address(&self) -> Result<Address, String> { Ok(Address::from(self.0.as_slice())) }
+    fn try_to_address(&self) -> Result<Address, String> { self.0.try_to_address() }
+}
+
+impl TryToAddress for [u8] {
+    fn try_to_address(&self) -> Result<Address, String> { (&self).try_to_address() }
+}
+
+impl<'a> TryToAddress for &'a [u8] {
+    fn try_to_address(&self) -> Result<Address, String> {
+        if self.len() != Address::len_bytes() {
+            return ERR!(
+                "Cannot construct an Ethereum address from {} bytes slice",
+                Address::len_bytes()
+            );
+        }
+
+        Ok(Address::from_slice(self))
+    }
 }
 
 impl<T: TryToAddress> TryToAddress for Option<T> {
@@ -3185,9 +4246,55 @@ impl<T: TryToAddress> TryToAddress for Option<T> {
     }
 }
 
+pub trait GuiAuthMessages {
+    fn gui_auth_sign_message_hash(message: String) -> Option<[u8; 32]>;
+    fn generate_gui_auth_signed_validation(generator: GuiAuthValidationGenerator)
+        -> SignatureResult<GuiAuthValidation>;
+}
+
+impl GuiAuthMessages for EthCoin {
+    fn gui_auth_sign_message_hash(message: String) -> Option<[u8; 32]> {
+        let message_prefix = "atomicDEX Auth Ethereum Signed Message:\n";
+        let prefix_len = CompactInteger::from(message_prefix.len());
+
+        let mut stream = Stream::new();
+        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 generate_gui_auth_signed_validation(
+        generator: GuiAuthValidationGenerator,
+    ) -> SignatureResult<GuiAuthValidation> {
+        let timestamp_message = get_utc_timestamp() + GUI_AUTH_SIGNED_MESSAGE_LIFETIME_SEC;
+
+        let message_hash =
+            EthCoin::gui_auth_sign_message_hash(timestamp_message.to_string()).ok_or(SignatureError::PrefixNotFound)?;
+        let signature = sign(&generator.secret, &H256::from(message_hash))?;
+
+        Ok(GuiAuthValidation {
+            coin_ticker: generator.coin_ticker,
+            address: generator.address,
+            timestamp_message,
+            signature: format!("0x{}", signature),
+        })
+    }
+}
+
+fn get_function_input_data(decoded: &[Token], func: &Function, index: usize) -> Result<Token, String> {
+    decoded.get(index).cloned().ok_or(format!(
+        "Missing input in function {}: No input found at index {}",
+        func.name.clone(),
+        index
+    ))
+}
+
 pub fn addr_from_raw_pubkey(pubkey: &[u8]) -> Result<Address, String> {
     let pubkey = try_s!(PublicKey::from_slice(pubkey).map_err(|e| ERRL!("{:?}", e)));
-    let eth_public = Public::from(&pubkey.serialize_uncompressed()[1..65]);
+    let eth_public = Public::from_slice(&pubkey.serialize_uncompressed()[1..65]);
     Ok(public_to_address(&eth_public))
 }
 
@@ -3237,18 +4344,28 @@ pub fn wei_from_big_decimal(amount: &BigDecimal, decimals: u8) -> NumConversResu
 impl Transaction for SignedEthTx {
     fn tx_hex(&self) -> Vec<u8> { rlp::encode(self).to_vec() }
 
-    fn tx_hash(&self) -> BytesJson { self.hash.to_vec().into() }
+    fn tx_hash(&self) -> BytesJson { self.hash.0.to_vec().into() }
 }
 
 fn signed_tx_from_web3_tx(transaction: Web3Transaction) -> Result<SignedEthTx, String> {
+    let r = transaction.r.ok_or_else(|| ERRL!("'Transaction::r' is not set"))?;
+    let s = transaction.s.ok_or_else(|| ERRL!("'Transaction::s' is not set"))?;
+    let v = transaction
+        .v
+        .ok_or_else(|| ERRL!("'Transaction::v' is not set"))?
+        .as_u64();
+    let gas_price = transaction
+        .gas_price
+        .ok_or_else(|| ERRL!("'Transaction::gas_price' is not set"))?;
+
     let unverified = UnverifiedTransaction {
-        r: transaction.r,
-        s: transaction.s,
-        v: transaction.v.as_u64(),
+        r,
+        s,
+        v,
         hash: transaction.hash,
         unsigned: UnSignedEthTx {
             data: transaction.input.0,
-            gas_price: transaction.gas_price,
+            gas_price,
             gas: transaction.gas,
             value: transaction.value,
             nonce: transaction.nonce,
@@ -3273,7 +4390,7 @@ pub struct GasStationData {
 /// Using tagged representation to allow adding variants with coefficients, percentage, etc in the future.
 #[derive(Clone, Copy, Debug, Deserialize)]
 #[serde(tag = "policy", content = "additional_data")]
-enum GasStationPricePolicy {
+pub enum GasStationPricePolicy {
     /// Use mean between average and fast values, default and recommended to use on ETH mainnet due to
     /// gas price big spikes.
     MeanAverageFast,
@@ -3311,27 +4428,28 @@ async fn get_token_decimals(web3: &Web3<Web3Transport>, token_addr: Address) ->
     let data = try_s!(function.encode_input(&[]));
     let request = CallRequest {
         from: Some(Address::default()),
-        to: token_addr,
+        to: Some(token_addr),
         gas: None,
         gas_price: None,
         value: Some(0.into()),
         data: Some(data.into()),
+        ..CallRequest::default()
     };
 
-    let f = web3
+    let res = web3
         .eth()
-        .call(request, Some(BlockNumber::Latest))
-        .map_err(|e| ERRL!("{}", e));
-    let res = try_s!(f.compat().await);
+        .call(request, Some(BlockId::Number(BlockNumber::Latest)))
+        .map_err(|e| ERRL!("{}", e))
+        .await?;
     let tokens = try_s!(function.decode_output(&res.0));
-    let decimals: u64 = match tokens[0] {
-        Token::Uint(dec) => dec.into(),
+    let decimals = match tokens[0] {
+        Token::Uint(dec) => dec.as_u64(),
         _ => return ERR!("Invalid decimals type {:?}", tokens),
     };
     Ok(decimals as u8)
 }
 
-fn valid_addr_from_str(addr_str: &str) -> Result<Address, String> {
+pub fn valid_addr_from_str(addr_str: &str) -> Result<Address, String> {
     let addr = try_s!(addr_from_str(addr_str));
     if !is_valid_checksum_addr(addr_str) {
         return ERR!("Invalid address checksum");
@@ -3347,6 +4465,34 @@ pub fn addr_from_str(addr_str: &str) -> Result<Address, String> {
     Ok(try_s!(Address::from_str(&addr_str[2..])))
 }
 
+/// This function fixes a bug appeared on `ethabi` update:
+/// 1. `ethabi(6.1.0)::Function::decode_input` had
+/// ```rust
+/// decode(&self.input_param_types(), &data[4..])
+/// ```
+///
+/// 2. `ethabi(17.2.0)::Function::decode_input` has
+/// ```rust
+/// decode(&self.input_param_types(), data)
+/// ```
+pub fn decode_contract_call(function: &Function, contract_call_bytes: &[u8]) -> Result<Vec<Token>, ethabi::Error> {
+    if contract_call_bytes.len() < 4 {
+        return Err(ethabi::Error::Other(
+            "Contract call should contain at least 4 bytes known as a function signature".into(),
+        ));
+    }
+
+    let actual_signature = &contract_call_bytes[..4];
+    let expected_signature = &function.short_signature();
+    if actual_signature != expected_signature {
+        let error =
+            format!("Unexpected contract call signature: expected {expected_signature:?}, found {actual_signature:?}");
+        return Err(ethabi::Error::Other(error.into()));
+    }
+
+    function.decode_input(&contract_call_bytes[4..])
+}
+
 fn rpc_event_handlers_for_eth_transport(ctx: &MmArc, ticker: String) -> Vec<RpcTransportEventHandlerShared> {
     let metrics = ctx.metrics.weak();
     vec![CoinTransportMetrics::new(metrics, ticker, RpcClientType::Ethereum).into_shared()]
@@ -3360,9 +4506,12 @@ pub async fn eth_coin_from_conf_and_request(
     ticker: &str,
     conf: &Json,
     req: &Json,
-    priv_key: &[u8],
     protocol: CoinProtocol,
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> Result<EthCoin, String> {
+    // Convert `PrivKeyBuildPolicy` to `EthPrivKeyBuildPolicy` if it's possible.
+    let priv_key_policy = try_s!(EthPrivKeyBuildPolicy::try_from(priv_key_policy));
+
     let mut urls: Vec<String> = try_s!(json::from_value(req["urls"].clone()));
     if urls.is_empty() {
         return ERR!("Enable request for ETH coin must have at least 1 node URL");
@@ -3370,6 +4519,15 @@ pub async fn eth_coin_from_conf_and_request(
     let mut rng = small_rng();
     urls.as_mut_slice().shuffle(&mut rng);
 
+    let mut nodes = vec![];
+    for url in urls.iter() {
+        nodes.push(HttpTransportNode {
+            uri: try_s!(url.parse()),
+            gui_auth: false,
+        });
+    }
+    drop_mutability!(nodes);
+
     let swap_contract_address: Address = try_s!(json::from_value(req["swap_contract_address"].clone()));
     if swap_contract_address == Address::default() {
         return ERR!("swap_contract_address can't be zero address");
@@ -3382,21 +4540,17 @@ pub async fn eth_coin_from_conf_and_request(
         }
     }
 
-    let key_pair: KeyPair = try_s!(KeyPair::from_secret_slice(priv_key));
-    let my_address = key_pair.address();
+    let (my_address, key_pair) = try_s!(build_address_and_priv_key_policy(conf, priv_key_policy).await);
 
     let mut web3_instances = vec![];
     let event_handlers = rpc_event_handlers_for_eth_transport(ctx, ticker.to_string());
-    for url in urls.iter() {
-        let transport = try_s!(Web3Transport::with_event_handlers(
-            vec![url.clone()],
-            event_handlers.clone()
-        ));
+    for node in nodes.iter() {
+        let transport = Web3Transport::new_http(vec![node.clone()], event_handlers.clone());
         let web3 = Web3::new(transport);
-        let version = match web3.web3().client_version().compat().await {
+        let version = match web3.web3().client_version().await {
             Ok(v) => v,
             Err(e) => {
-                error!("Couldn't get client version for url {}: {}", url, e);
+                error!("Couldn't get client version for url {}: {}", node.uri, e);
                 continue;
             },
         };
@@ -3410,11 +4564,11 @@ pub async fn eth_coin_from_conf_and_request(
         return ERR!("Failed to get client version for all urls");
     }
 
-    let transport = try_s!(Web3Transport::with_event_handlers(urls, event_handlers));
+    let transport = Web3Transport::new_http(nodes, event_handlers);
     let web3 = Web3::new(transport);
 
     let (coin_type, decimals) = match protocol {
-        CoinProtocol::ETH => (EthCoinType::Eth, 18),
+        CoinProtocol::ETH => (EthCoinType::Eth, ETH_DECIMALS),
         CoinProtocol::ERC20 {
             platform,
             contract_address,
@@ -3432,7 +4586,11 @@ pub async fn eth_coin_from_conf_and_request(
     // param from request should override the config
     let required_confirmations = req["required_confirmations"]
         .as_u64()
-        .unwrap_or_else(|| conf["required_confirmations"].as_u64().unwrap_or(1))
+        .unwrap_or_else(|| {
+            conf["required_confirmations"]
+                .as_u64()
+                .unwrap_or(DEFAULT_REQUIRED_CONFIRMATIONS as u64)
+        })
         .into();
 
     if req["requires_notarization"].as_bool().is_some() {
@@ -3460,8 +4618,12 @@ pub async fn eth_coin_from_conf_and_request(
 
     let nonce_lock = map.entry(key_lock).or_insert_with(new_nonce_lock).clone();
 
+    // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+    // all spawned futures related to `ETH` coin will be aborted as well.
+    let abortable_system = try_s!(ctx.abortable_system.create_subsystem());
+
     let coin = EthCoinImpl {
-        key_pair,
+        priv_key_policy: key_pair,
         my_address,
         coin_type,
         sign_message_prefix,
@@ -3480,6 +4642,8 @@ pub async fn eth_coin_from_conf_and_request(
         chain_id: conf["chain_id"].as_u64(),
         logs_block_range: conf["logs_block_range"].as_u64().unwrap_or(DEFAULT_LOGS_BLOCK_RANGE),
         nonce_lock,
+        erc20_tokens_infos: Default::default(),
+        abortable_system,
     };
     Ok(EthCoin(Arc::new(coin)))
 }
@@ -3497,7 +4661,7 @@ fn checksum_address(addr: &str) -> String {
     let hash = hasher.finalize();
     let mut result: String = "0x".into();
     for (i, c) in addr.chars().enumerate() {
-        if c.is_digit(10) {
+        if c.is_ascii_digit() {
             result.push(c);
         } else {
             // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md#specification
@@ -3531,12 +4695,10 @@ fn get_addr_nonce(addr: Address, web3s: Vec<Web3Instance>) -> Box<dyn Future<Ite
                 .iter()
                 .map(|web3| {
                     if web3.is_parity {
-                        web3.web3.eth().parity_next_nonce(addr).compat()
+                        let parity: ParityNonce<_> = web3.web3.api();
+                        Either::Left(parity.parity_next_nonce(addr))
                     } else {
-                        web3.web3
-                            .eth()
-                            .transaction_count(addr, Some(BlockNumber::Pending))
-                            .compat()
+                        Either::Right(web3.web3.eth().transaction_count(addr, Some(BlockNumber::Pending)))
                     }
                 })
                 .collect();
@@ -3595,5 +4757,8 @@ fn increase_gas_price_by_stage(gas_price: U256, level: &FeeApproxStage) -> U256
         FeeApproxStage::TradePreimage => {
             increase_by_percent_one_gwei(gas_price, GAS_PRICE_APPROXIMATION_PERCENT_ON_TRADE_PREIMAGE)
         },
+        FeeApproxStage::WatcherPreimage => {
+            increase_by_percent_one_gwei(gas_price, GAS_PRICE_APPROXIMATION_PERCENT_ON_WATCHER_PREIMAGE)
+        },
     }
 }
diff --git a/mm2src/coins/eth/erc20_abi.json b/mm2src/coins/eth/erc20_abi.json
new file mode 100644
index 0000000000..b690fbd479
--- /dev/null
+++ b/mm2src/coins/eth/erc20_abi.json
@@ -0,0 +1,279 @@
+[
+  {
+    "constant":true,
+    "inputs":[
+
+    ],
+    "name":"name",
+    "outputs":[
+      {
+        "name":"",
+        "type":"string"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "constant":false,
+    "inputs":[
+      {
+        "name":"_spender",
+        "type":"address"
+      },
+      {
+        "name":"_value",
+        "type":"uint256"
+      }
+    ],
+    "name":"approve",
+    "outputs":[
+      {
+        "name":"",
+        "type":"bool"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"function"
+  },
+  {
+    "constant":true,
+    "inputs":[
+
+    ],
+    "name":"totalSupply",
+    "outputs":[
+      {
+        "name":"",
+        "type":"uint256"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "constant":false,
+    "inputs":[
+      {
+        "name":"_from",
+        "type":"address"
+      },
+      {
+        "name":"_to",
+        "type":"address"
+      },
+      {
+        "name":"_value",
+        "type":"uint256"
+      }
+    ],
+    "name":"transferFrom",
+    "outputs":[
+      {
+        "name":"",
+        "type":"bool"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"function"
+  },
+  {
+    "constant":true,
+    "inputs":[
+
+    ],
+    "name":"decimals",
+    "outputs":[
+      {
+        "name":"",
+        "type":"uint8"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "constant":false,
+    "inputs":[
+      {
+        "name":"_spender",
+        "type":"address"
+      },
+      {
+        "name":"_subtractedValue",
+        "type":"uint256"
+      }
+    ],
+    "name":"decreaseApproval",
+    "outputs":[
+      {
+        "name":"",
+        "type":"bool"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"function"
+  },
+  {
+    "constant":true,
+    "inputs":[
+      {
+        "name":"_owner",
+        "type":"address"
+      }
+    ],
+    "name":"balanceOf",
+    "outputs":[
+      {
+        "name":"balance",
+        "type":"uint256"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "constant":true,
+    "inputs":[
+
+    ],
+    "name":"symbol",
+    "outputs":[
+      {
+        "name":"",
+        "type":"string"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "constant":false,
+    "inputs":[
+      {
+        "name":"_to",
+        "type":"address"
+      },
+      {
+        "name":"_value",
+        "type":"uint256"
+      }
+    ],
+    "name":"transfer",
+    "outputs":[
+      {
+        "name":"",
+        "type":"bool"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"function"
+  },
+  {
+    "constant":false,
+    "inputs":[
+      {
+        "name":"_spender",
+        "type":"address"
+      },
+      {
+        "name":"_addedValue",
+        "type":"uint256"
+      }
+    ],
+    "name":"increaseApproval",
+    "outputs":[
+      {
+        "name":"",
+        "type":"bool"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"function"
+  },
+  {
+    "constant":true,
+    "inputs":[
+      {
+        "name":"_owner",
+        "type":"address"
+      },
+      {
+        "name":"_spender",
+        "type":"address"
+      }
+    ],
+    "name":"allowance",
+    "outputs":[
+      {
+        "name":"",
+        "type":"uint256"
+      }
+    ],
+    "payable":false,
+    "stateMutability":"view",
+    "type":"function"
+  },
+  {
+    "inputs":[
+
+    ],
+    "payable":false,
+    "stateMutability":"nonpayable",
+    "type":"constructor"
+  },
+  {
+    "anonymous":false,
+    "inputs":[
+      {
+        "indexed":true,
+        "name":"owner",
+        "type":"address"
+      },
+      {
+        "indexed":true,
+        "name":"spender",
+        "type":"address"
+      },
+      {
+        "indexed":false,
+        "name":"value",
+        "type":"uint256"
+      }
+    ],
+    "name":"Approval",
+    "type":"event"
+  },
+  {
+    "anonymous":false,
+    "inputs":[
+      {
+        "indexed":true,
+        "name":"from",
+        "type":"address"
+      },
+      {
+        "indexed":true,
+        "name":"to",
+        "type":"address"
+      },
+      {
+        "indexed":false,
+        "name":"value",
+        "type":"uint256"
+      }
+    ],
+    "name":"Transfer",
+    "type":"event"
+  }
+]
\ No newline at end of file
diff --git a/mm2src/coins/eth/eth_tests.rs b/mm2src/coins/eth/eth_tests.rs
index 5c205cddad..954080fdf3 100644
--- a/mm2src/coins/eth/eth_tests.rs
+++ b/mm2src/coins/eth/eth_tests.rs
@@ -1,6 +1,8 @@
 use super::*;
+use crate::IguanaPrivKey;
 use common::block_on;
 use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_test_helpers::for_tests::{ETH_MAINNET_NODE, ETH_MAINNET_SWAP_CONTRACT};
 use mocktopus::mocking::*;
 
 /// The gas price for the tests
@@ -12,6 +14,8 @@ const GAS_PRICE_APPROXIMATION_ON_ORDER_ISSUE: u64 = 52_500_000_000;
 // `GAS_PRICE` increased by 7%
 const GAS_PRICE_APPROXIMATION_ON_TRADE_PREIMAGE: u64 = 53_500_000_000;
 
+const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
+
 fn check_sum(addr: &str, expected: &str) {
     let actual = checksum_address(addr);
     assert_eq!(expected, actual);
@@ -26,7 +30,17 @@ fn eth_coin_for_test(
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(urls).unwrap();
+
+    let mut nodes = vec![];
+    for url in urls.iter() {
+        nodes.push(HttpTransportNode {
+            uri: url.parse().unwrap(),
+            gui_auth: false,
+        });
+    }
+    drop_mutability!(nodes);
+
+    let transport = Web3Transport::with_nodes(nodes);
     let web3 = Web3::new(transport);
     let conf = json!({
         "coins":[
@@ -49,8 +63,8 @@ fn eth_coin_for_test(
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract,
         ticker,
         web3_instances: vec![Web3Instance {
@@ -63,6 +77,8 @@ fn eth_coin_for_test(
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
     (ctx, eth_coin)
 }
@@ -202,19 +218,19 @@ fn send_and_refund_erc20_payment() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8545", false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let coin = EthCoin(Arc::new(EthCoinImpl {
         ticker: "ETH".into(),
         coin_type: EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: Address::from("0xc0eb7AeD740E1796992A08962c15661bDEB58003"),
+            token_addr: Address::from_str("0xc0eb7AeD740E1796992A08962c15661bDEB58003").unwrap(),
         },
         my_address: key_pair.address(),
         sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
-        key_pair,
-        swap_contract_address: Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
@@ -231,36 +247,36 @@ fn send_and_refund_erc20_payment() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
-
-    let payment = coin
-        .send_maker_payment(
-            (now_ms() / 1000) as u32 - 200,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &[1; 20],
-            "0.001".parse().unwrap(),
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
-
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: (now_ms() / 1000) as u32 - 200,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash: &[1; 20],
+        amount: "0.001".parse().unwrap(),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = coin.send_maker_payment(maker_payment_args).wait().unwrap();
     log!("{:?}", payment);
 
     block_on(Timer::sleep(60.));
 
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &payment.tx_hex(),
+        time_lock: (now_ms() / 1000) as u32 - 200,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash: &[1; 20],
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let refund = coin
-        .send_maker_refunds_payment(
-            &payment.tx_hex(),
-            (now_ms() / 1000) as u32 - 200,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &[1; 20],
-            &coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
-
     log!("{:?}", refund);
 }
 
@@ -272,7 +288,7 @@ fn send_and_refund_eth_payment() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8545", false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let coin = EthCoin(Arc::new(EthCoinImpl {
@@ -280,8 +296,8 @@ fn send_and_refund_eth_payment() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
@@ -298,33 +314,34 @@ fn send_and_refund_eth_payment() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
-
-    let payment = coin
-        .send_maker_payment(
-            (now_ms() / 1000) as u32 - 200,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &[1; 20],
-            "0.001".parse().unwrap(),
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let send_maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: (now_ms() / 1000) as u32 - 200,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash: &[1; 20],
+        amount: "0.001".parse().unwrap(),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = coin.send_maker_payment(send_maker_payment_args).wait().unwrap();
 
     log!("{:?}", payment);
 
     block_on(Timer::sleep(60.));
-
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &payment.tx_hex(),
+        time_lock: (now_ms() / 1000) as u32 - 200,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash: &[1; 20],
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let refund = coin
-        .send_maker_refunds_payment(
-            &payment.tx_hex(),
-            (now_ms() / 1000) as u32 - 200,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &[1; 20],
-            &coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
 
@@ -338,13 +355,11 @@ fn test_nonce_several_urls() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let infura_transport = Web3Transport::new(vec![
-        "https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()
-    ])
-    .unwrap();
-    let linkpool_transport = Web3Transport::new(vec!["https://ropsten-rpc.linkpool.io".into()]).unwrap();
+    let infura_transport =
+        Web3Transport::single_node("https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b", false);
+    let linkpool_transport = Web3Transport::single_node("https://ropsten-rpc.linkpool.io", false);
     // get nonce must succeed if some nodes are down at the moment for some reason
-    let failing_transport = Web3Transport::new(vec!["http://195.201.0.6:8989".into()]).unwrap();
+    let failing_transport = Web3Transport::single_node("http://195.201.0.6:8989", false);
 
     let web3_infura = Web3::new(infura_transport);
     let web3_linkpool = Web3::new(linkpool_transport);
@@ -356,8 +371,8 @@ fn test_nonce_several_urls() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![
             Web3Instance {
@@ -384,6 +399,8 @@ fn test_nonce_several_urls() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
 
     log!("My address {:?}", coin.my_address);
@@ -399,14 +416,14 @@ fn test_nonce_several_urls() {
 
 #[test]
 fn test_wait_for_payment_spend_timeout() {
-    EthCoinImpl::spend_events.mock_safe(|_, _, _, _| MockResult::Return(Box::new(futures01::future::ok(vec![]))));
+    EthCoin::spend_events.mock_safe(|_, _, _, _| MockResult::Return(Box::new(futures01::future::ok(vec![]))));
     EthCoin::current_block.mock_safe(|_| MockResult::Return(Box::new(futures01::future::ok(900))));
 
     let key_pair = KeyPair::from_secret_slice(
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8555".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8555", false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
 
@@ -419,8 +436,8 @@ fn test_wait_for_payment_spend_timeout() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         ticker: "ETH".into(),
         web3_instances: vec![Web3Instance {
@@ -433,6 +450,8 @@ fn test_wait_for_payment_spend_timeout() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     };
 
     let coin = EthCoin(Arc::new(coin));
@@ -453,7 +472,14 @@ fn test_wait_for_payment_spend_timeout() {
     ];
 
     assert!(coin
-        .wait_for_tx_spend(&tx_bytes, wait_until, from_block, &coin.swap_contract_address())
+        .wait_for_htlc_tx_spend(
+            &tx_bytes,
+            &[],
+            wait_until,
+            from_block,
+            &coin.swap_contract_address(),
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL
+        )
         .wait()
         .is_err());
 }
@@ -466,14 +492,11 @@ fn test_search_for_swap_tx_spend_was_spent() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec![
-        "https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()
-    ])
-    .unwrap();
+    let transport = Web3Transport::single_node(ETH_MAINNET_NODE, false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
 
-    let swap_contract_address = Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94");
+    let swap_contract_address = Address::from_str(ETH_MAINNET_SWAP_CONTRACT).unwrap();
     let coin = EthCoin(Arc::new(EthCoinImpl {
         coin_type: EthCoinType::Eth,
         decimals: 18,
@@ -483,13 +506,13 @@ fn test_search_for_swap_tx_spend_was_spent() {
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         my_address: key_pair.address(),
         sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
-        key_pair,
+        priv_key_policy: key_pair.into(),
         swap_contract_address,
         fallback_swap_contract: None,
         ticker: "ETH".into(),
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
-            is_parity: true,
+            is_parity: false,
         }],
         web3,
         ctx: ctx.weak(),
@@ -497,37 +520,40 @@ fn test_search_for_swap_tx_spend_was_spent() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
 
-    // raw transaction bytes of https://ropsten.etherscan.io/tx/0xb1c987e2ac79581bb8718267b5cb49a18274890494299239d1d0dfdb58d6d76a
+    // raw transaction bytes of https://etherscan.io/tx/0x2814718945e90fe4301e2a74eaaa46b4fdbdba1536e1d94e3b0bd665b2dd091d
     let payment_tx = [
-        248, 240, 52, 132, 119, 53, 148, 0, 131, 2, 73, 240, 148, 123, 193, 187, 221, 106, 10, 114, 47, 201, 191, 252,
-        73, 201, 33, 182, 133, 236, 184, 75, 148, 135, 71, 13, 228, 223, 130, 0, 0, 184, 132, 21, 44, 243, 175, 188,
-        96, 248, 252, 165, 132, 81, 30, 243, 34, 85, 165, 46, 224, 176, 90, 137, 30, 19, 123, 224, 67, 83, 53, 74, 57,
-        148, 140, 95, 45, 70, 147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 117, 244, 28, 175, 51, 95, 91, 184, 141, 201,
-        45, 116, 26, 102, 210, 119, 151, 124, 143, 52, 215, 128, 89, 116, 30, 25, 35, 128, 122, 186, 177, 228, 149,
-        250, 55, 53, 62, 196, 51, 72, 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, 93, 56, 62, 80, 28, 160, 65, 22, 195, 212, 184, 202, 226, 151, 224, 111,
-        174, 31, 160, 219, 39, 69, 137, 37, 8, 127, 177, 4, 104, 248, 27, 41, 245, 176, 131, 188, 215, 136, 160, 91,
-        134, 199, 67, 1, 58, 57, 103, 23, 215, 176, 64, 124, 1, 44, 88, 161, 200, 160, 64, 110, 13, 145, 127, 180, 27,
-        171, 131, 253, 90, 48, 147,
+        248, 241, 1, 133, 8, 158, 68, 19, 192, 131, 2, 73, 240, 148, 36, 171, 228, 199, 31, 198, 88, 201, 19, 19, 182,
+        85, 44, 212, 12, 216, 8, 179, 234, 128, 135, 29, 133, 195, 185, 99, 4, 0, 184, 132, 21, 44, 243, 175, 130, 126,
+        209, 71, 198, 107, 13, 87, 207, 36, 150, 22, 77, 57, 198, 35, 248, 38, 203, 5, 242, 55, 219, 79, 252, 124, 162,
+        67, 251, 160, 210, 247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 229, 230, 210, 113, 0, 71, 77, 52, 204, 15, 135,
+        238, 56, 119, 86, 57, 80, 25, 1, 156, 70, 83, 37, 132, 127, 196, 109, 164, 129, 132, 149, 187, 70, 120, 38, 83,
+        173, 7, 235, 127, 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, 99, 54, 210, 77, 38, 160, 254, 78, 202, 143, 121, 136, 202, 110, 251, 121, 110, 25,
+        124, 62, 205, 40, 168, 154, 212, 180, 118, 59, 28, 135, 255, 44, 20, 62, 49, 109, 170, 215, 160, 72, 251, 237,
+        69, 215, 60, 8, 59, 204, 150, 18, 163, 242, 159, 79, 115, 146, 19, 78, 61, 142, 91, 221, 195, 178, 80, 197,
+        162, 242, 179, 182, 235,
     ];
-    // raw transaction bytes of https://ropsten.etherscan.io/tx/0xcb7c14d3ff309996d582400369393b6fa42314c52245115d4a3f77f072c36da9
+
+    // raw transaction bytes of https://etherscan.io/tx/0xe9c2c8126e8b947eb3bbc6008ef9e3880e7c54f5bc5ccdc34ad412c4d271c76b
     let spend_tx = [
-        249, 1, 9, 37, 132, 119, 53, 148, 0, 131, 2, 73, 240, 148, 123, 193, 187, 221, 106, 10, 114, 47, 201, 191, 252,
-        73, 201, 33, 182, 133, 236, 184, 75, 148, 128, 184, 164, 2, 237, 41, 43, 188, 96, 248, 252, 165, 132, 81, 30,
-        243, 34, 85, 165, 46, 224, 176, 90, 137, 30, 19, 123, 224, 67, 83, 53, 74, 57, 148, 140, 95, 45, 70, 147, 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, 71, 13, 228, 223, 130, 0, 0, 168, 151, 11,
-        232, 224, 253, 63, 180, 26, 114, 23, 184, 27, 10, 161, 80, 178, 251, 73, 204, 80, 174, 97, 118, 149, 204, 186,
-        187, 243, 185, 19, 128, 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, 157, 73, 251, 238, 138, 245, 142, 240, 85, 44, 209, 63, 194, 242,
-        109, 242, 246, 6, 76, 176, 27, 160, 29, 157, 226, 23, 81, 174, 34, 82, 93, 182, 41, 248, 119, 42, 221, 214, 38,
-        243, 128, 2, 235, 208, 193, 192, 74, 208, 242, 26, 221, 83, 54, 74, 160, 111, 29, 92, 8, 75, 61, 97, 103, 199,
-        100, 189, 72, 74, 221, 144, 66, 170, 68, 121, 29, 105, 19, 194, 35, 245, 196, 131, 236, 29, 105, 101, 30,
+        249, 1, 10, 4, 133, 8, 154, 252, 216, 0, 131, 2, 73, 240, 148, 36, 171, 228, 199, 31, 198, 88, 201, 19, 19,
+        182, 85, 44, 212, 12, 216, 8, 179, 234, 128, 128, 184, 164, 2, 237, 41, 43, 130, 126, 209, 71, 198, 107, 13,
+        87, 207, 36, 150, 22, 77, 57, 198, 35, 248, 38, 203, 5, 242, 55, 219, 79, 252, 124, 162, 67, 251, 160, 210,
+        247, 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, 29, 133, 195, 185, 99, 4, 0,
+        50, 250, 104, 200, 70, 202, 119, 58, 239, 14, 250, 118, 21, 252, 240, 40, 50, 95, 151, 187, 141, 226, 240, 198,
+        32, 99, 37, 100, 241, 251, 122, 89, 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, 127, 82, 6, 91, 85, 191, 21, 5, 181, 176, 40, 104, 25,
+        86, 135, 213, 121, 230, 186, 218, 38, 160, 19, 239, 26, 4, 109, 84, 68, 160, 43, 178, 4, 249, 52, 209, 146, 13,
+        53, 179, 63, 117, 17, 184, 115, 83, 75, 59, 89, 18, 198, 47, 37, 101, 160, 85, 163, 23, 247, 219, 101, 69, 138,
+        8, 152, 81, 205, 76, 253, 225, 123, 167, 12, 147, 151, 215, 248, 198, 91, 254, 47, 99, 203, 102, 5, 212, 217,
     ];
     let spend_tx = FoundSwapTxSpend::Spent(signed_eth_tx_from_bytes(&spend_tx).unwrap().into());
 
-    let found_tx = block_on(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, &[0; 20], 15643279))
         .unwrap()
         .unwrap();
     assert_eq!(spend_tx, found_tx);
@@ -574,18 +600,15 @@ fn test_search_for_swap_tx_spend_was_refunded() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec![
-        "https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()
-    ])
-    .unwrap();
+    let transport = Web3Transport::single_node(ETH_MAINNET_NODE, false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
 
-    let swap_contract_address = Address::from("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94");
+    let swap_contract_address = Address::from_str(ETH_MAINNET_SWAP_CONTRACT).unwrap();
     let coin = EthCoin(Arc::new(EthCoinImpl {
         coin_type: EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: Address::from("0xc0eb7aed740e1796992a08962c15661bdeb58003"),
+            token_addr: Address::from_str("0x0D8775F648430679A709E98d2b0Cb6250d2887EF").unwrap(),
         },
         decimals: 18,
         gas_station_url: None,
@@ -594,13 +617,13 @@ fn test_search_for_swap_tx_spend_was_refunded() {
         history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
         my_address: key_pair.address(),
         sign_message_prefix: Some(String::from("Ethereum Signed Message:\n")),
-        key_pair,
+        priv_key_policy: key_pair.into(),
         swap_contract_address,
         fallback_swap_contract: None,
-        ticker: "ETH".into(),
+        ticker: "BAT".into(),
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
-            is_parity: true,
+            is_parity: false,
         }],
         web3,
         ctx: ctx.weak(),
@@ -608,38 +631,43 @@ fn test_search_for_swap_tx_spend_was_refunded() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
 
-    // raw transaction bytes of https://ropsten.etherscan.io/tx/0xe18bbca69dea9a4624e1f5b0b2021d5fe4c8daa03f36084a8ba011b08e5cd938
+    // raw transaction bytes of https://etherscan.io/tx/0x02c261dcb1c8615c029b9abc712712b80ef8c1ef20d2cbcdd9bde859e7913476
     let payment_tx = [
-        249, 1, 43, 130, 10, 96, 132, 149, 2, 249, 0, 131, 2, 73, 240, 148, 123, 193, 187, 221, 106, 10, 114, 47, 201,
-        191, 252, 73, 201, 33, 182, 133, 236, 184, 75, 148, 128, 184, 196, 155, 65, 91, 42, 192, 158, 192, 175, 210,
-        198, 159, 244, 116, 46, 255, 28, 236, 147, 240, 68, 91, 16, 19, 6, 59, 187, 149, 138, 179, 151, 121, 47, 14,
-        80, 251, 147, 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, 3, 141, 126, 164, 198,
-        128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 235, 122, 237, 116, 14, 23, 150, 153, 42, 8, 150, 44, 21, 102,
-        27, 222, 181, 128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 153, 121, 65, 221, 19, 70, 233, 35, 17, 24, 213,
-        104, 93, 134, 98, 148, 245, 158, 91, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 93,
-        23, 98, 207, 27, 160, 4, 198, 61, 242, 141, 248, 157, 72, 229, 2, 162, 163, 250, 159, 26, 66, 37, 42, 159, 35,
-        58, 94, 57, 121, 252, 166, 34, 25, 206, 193, 113, 198, 160, 68, 125, 142, 153, 210, 177, 60, 173, 67, 127, 138,
-        52, 112, 9, 49, 108, 109, 44, 177, 142, 9, 124, 10, 200, 37, 100, 52, 137, 196, 74, 67, 192,
+        249, 1, 42, 25, 133, 26, 13, 225, 144, 65, 131, 2, 73, 240, 148, 36, 171, 228, 199, 31, 198, 88, 201, 19, 19,
+        182, 85, 44, 212, 12, 216, 8, 179, 234, 128, 128, 184, 196, 155, 65, 91, 42, 22, 125, 52, 19, 176, 17, 106,
+        187, 142, 153, 244, 194, 212, 205, 57, 166, 77, 249, 188, 153, 80, 0, 108, 74, 232, 132, 82, 114, 88, 36, 125,
+        193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 240, 91, 89, 211, 178, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 135, 117, 246, 72, 67, 6, 121, 167, 9, 233, 141, 43, 12, 182, 37, 13, 40,
+        135, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 18, 103, 159, 197, 230, 51, 138, 82, 9, 138, 176, 149, 190,
+        225, 233, 161, 91, 198, 48, 186, 149, 40, 18, 123, 207, 245, 36, 103, 114, 54, 243, 115, 156, 239, 1, 51, 17,
+        244, 32, 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, 97, 150, 38, 250, 37, 160, 177, 67, 137, 53, 80, 200, 208, 22, 66, 120, 249, 77, 95, 165, 27,
+        167, 30, 61, 254, 250, 17, 46, 111, 83, 165, 117, 188, 180, 148, 99, 58, 7, 160, 12, 198, 11, 101, 228, 74,
+        229, 5, 50, 87, 185, 28, 16, 35, 182, 55, 163, 141, 135, 255, 195, 44, 130, 37, 145, 39, 90, 98, 131, 205, 110,
+        197,
     ];
-    // raw transaction bytes of https://ropsten.etherscan.io/tx/0x9a50ac4d1737f4f04b94177996da7fa942b09469de52cfdadce891cd85afc37c
+
+    // raw transaction bytes of https://etherscan.io/tx/0x3ce6a40d7ad41bd24055cf4cdd564d42d2f36095ec8b6180717b4f0a922a97f4
     let refund_tx = [
-        249, 1, 11, 130, 10, 97, 132, 149, 2, 249, 0, 131, 2, 73, 240, 148, 123, 193, 187, 221, 106, 10, 114, 47, 201,
-        191, 252, 73, 201, 33, 182, 133, 236, 184, 75, 148, 128, 184, 164, 70, 252, 2, 148, 192, 158, 192, 175, 210,
-        198, 159, 244, 116, 46, 255, 28, 236, 147, 240, 68, 91, 16, 19, 6, 59, 187, 149, 138, 179, 151, 121, 47, 14,
-        80, 251, 147, 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, 3, 141, 126, 164, 198,
-        128, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 235, 122, 237, 116, 14, 23, 150, 153, 42, 8, 150, 44, 21, 102, 27, 222, 181,
-        128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 216, 153, 121, 65, 221, 19, 70, 233, 35, 17, 24, 213, 104, 93, 134,
-        98, 148, 245, 158, 91, 28, 160, 127, 220, 190, 77, 221, 188, 140, 162, 198, 6, 127, 102, 222, 66, 38, 96, 10,
-        19, 27, 208, 119, 219, 60, 231, 2, 118, 91, 169, 99, 78, 209, 135, 160, 51, 115, 90, 189, 124, 172, 205, 134,
-        203, 159, 238, 40, 39, 99, 88, 48, 160, 189, 37, 60, 20, 117, 65, 238, 36, 98, 226, 48, 22, 235, 86, 183,
+        249, 1, 10, 26, 133, 25, 252, 245, 23, 130, 131, 2, 73, 240, 148, 36, 171, 228, 199, 31, 198, 88, 201, 19, 19,
+        182, 85, 44, 212, 12, 216, 8, 179, 234, 128, 128, 184, 164, 70, 252, 2, 148, 22, 125, 52, 19, 176, 17, 106,
+        187, 142, 153, 244, 194, 212, 205, 57, 166, 77, 249, 188, 153, 80, 0, 108, 74, 232, 132, 82, 114, 88, 36, 125,
+        193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 240, 91, 89, 211, 178, 0, 0,
+        186, 149, 40, 18, 123, 207, 245, 36, 103, 114, 54, 243, 115, 156, 239, 1, 51, 17, 244, 32, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 135, 117, 246, 72, 67, 6, 121, 167, 9, 233, 141, 43, 12,
+        182, 37, 13, 40, 135, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 18, 103, 159, 197, 230, 51, 138, 82, 9, 138,
+        176, 149, 190, 225, 233, 161, 91, 198, 48, 37, 160, 175, 56, 178, 83, 9, 93, 241, 61, 203, 189, 163, 249, 203,
+        143, 126, 176, 116, 113, 203, 21, 88, 19, 135, 218, 207, 185, 178, 234, 185, 244, 250, 183, 160, 17, 135, 205,
+        189, 131, 59, 111, 198, 16, 171, 98, 33, 59, 51, 31, 161, 162, 89, 71, 50, 160, 165, 114, 149, 47, 219, 82, 29,
+        183, 80, 80, 157,
     ];
     let refund_tx = FoundSwapTxSpend::Refunded(signed_eth_tx_from_bytes(&refund_tx).unwrap().into());
 
-    let found_tx = block_on(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, &[0; 20], 13638713))
         .unwrap()
         .unwrap();
     assert_eq!(refund_tx, found_tx);
@@ -662,7 +690,7 @@ fn test_withdraw_impl_manual_fee() {
         coin: "ETH".to_string(),
         max: false,
         fee: Some(WithdrawFee::EthGas {
-            gas: 150000,
+            gas: ETH_GAS,
             gas_price: 1.into(),
         }),
         memo: None,
@@ -674,7 +702,7 @@ fn test_withdraw_impl_manual_fee() {
         EthTxFeeDetails {
             coin: "ETH".into(),
             gas_price: "0.000000001".parse().unwrap(),
-            gas: 150000,
+            gas: ETH_GAS,
             total_fee: "0.00015".parse().unwrap(),
         }
         .into(),
@@ -687,7 +715,7 @@ fn test_withdraw_impl_fee_details() {
     let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: Address::from("0x2b294F029Fde858b2c62184e8390591755521d8E"),
+            token_addr: Address::from_str("0x2b294F029Fde858b2c62184e8390591755521d8E").unwrap(),
         },
         vec!["http://dummy.dummy".into()],
         None,
@@ -706,7 +734,7 @@ fn test_withdraw_impl_fee_details() {
         coin: "JST".to_string(),
         max: false,
         fee: Some(WithdrawFee::EthGas {
-            gas: 150000,
+            gas: ETH_GAS,
             gas_price: 1.into(),
         }),
         memo: None,
@@ -718,7 +746,7 @@ fn test_withdraw_impl_fee_details() {
         EthTxFeeDetails {
             coin: "ETH".into(),
             gas_price: "0.000000001".parse().unwrap(),
-            gas: 150000,
+            gas: ETH_GAS,
             total_fee: "0.00015".parse().unwrap(),
         }
         .into(),
@@ -737,14 +765,15 @@ fn test_nonce_lock() {
     let (ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://195.201.0.6:8565".into()], None);
     let mut futures = vec![];
     for _ in 0..5 {
-        futures.push(sign_and_send_transaction_impl(
-            ctx.clone(),
-            coin.clone(),
-            1000000000000u64.into(),
-            Action::Call(coin.my_address),
-            vec![],
-            21000.into(),
-        ));
+        futures.push(
+            coin.sign_and_send_transaction(
+                1000000000000u64.into(),
+                Action::Call(coin.my_address),
+                vec![],
+                21000.into(),
+            )
+            .compat(),
+        );
     }
     let results = block_on(join_all(futures));
     for result in results {
@@ -778,7 +807,7 @@ fn test_add_ten_pct_one_gwei() {
 fn get_sender_trade_preimage() {
     /// Trade fee for the ETH coin is `2 * 150_000 * gas_price` always.
     fn expected_fee(gas_price: u64) -> TradeFee {
-        let amount = u256_to_big_decimal((2 * 150_000 * gas_price).into(), 18).expect("!u256_to_big_decimal");
+        let amount = u256_to_big_decimal((2 * ETH_GAS * gas_price).into(), 18).expect("!u256_to_big_decimal");
         TradeFee {
             coin: "ETH".to_owned(),
             amount: amount.into(),
@@ -827,7 +856,7 @@ fn get_erc20_sender_trade_preimage() {
         .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(unsafe { ALLOWANCE.into() }))));
 
     EthCoin::get_gas_price.mock_safe(|_| MockResult::Return(Box::new(futures01::future::ok(GAS_PRICE.into()))));
-    EthCoinImpl::estimate_gas.mock_safe(|_, _| {
+    EthCoin::estimate_gas.mock_safe(|_, _| {
         unsafe { ESTIMATE_GAS_CALLED = true };
         MockResult::Return(Box::new(futures01::future::ok(APPROVE_GAS_LIMIT.into())))
     });
@@ -905,7 +934,7 @@ fn get_receiver_trade_preimage() {
     EthCoin::get_gas_price.mock_safe(|_| MockResult::Return(Box::new(futures01::future::ok(GAS_PRICE.into()))));
 
     let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://dummy.dummy".into()], None);
-    let amount = u256_to_big_decimal((150_000 * GAS_PRICE).into(), 18).expect("!u256_to_big_decimal");
+    let amount = u256_to_big_decimal((ETH_GAS * GAS_PRICE).into(), 18).expect("!u256_to_big_decimal");
     let expected_fee = TradeFee {
         coin: "ETH".to_owned(),
         amount: amount.into(),
@@ -913,7 +942,7 @@ fn get_receiver_trade_preimage() {
     };
 
     let actual = coin
-        .get_receiver_trade_fee(FeeApproxStage::WithoutApprox)
+        .get_receiver_trade_fee(Default::default(), FeeApproxStage::WithoutApprox)
         .wait()
         .expect("!get_sender_trade_fee");
     assert_eq!(actual, expected_fee);
@@ -925,7 +954,7 @@ fn test_get_fee_to_send_taker_fee() {
     const TRANSFER_GAS_LIMIT: u64 = 40_000;
 
     EthCoin::get_gas_price.mock_safe(|_| MockResult::Return(Box::new(futures01::future::ok(GAS_PRICE.into()))));
-    EthCoinImpl::estimate_gas
+    EthCoin::estimate_gas
         .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(TRANSFER_GAS_LIMIT.into()))));
 
     // fee to send taker fee is `TRANSFER_GAS_LIMIT * gas_price` always.
@@ -946,7 +975,7 @@ fn test_get_fee_to_send_taker_fee() {
     let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: Address::from("0xaD22f63404f7305e4713CcBd4F296f34770513f4"),
+            token_addr: Address::from_str("0xaD22f63404f7305e4713CcBd4F296f34770513f4").unwrap(),
         },
         vec!["http://dummy.dummy".into()],
         None,
@@ -971,9 +1000,9 @@ fn test_get_fee_to_send_taker_fee_insufficient_balance() {
     let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: Address::from("0xaD22f63404f7305e4713CcBd4F296f34770513f4"),
+            token_addr: Address::from_str("0xaD22f63404f7305e4713CcBd4F296f34770513f4").unwrap(),
         },
-        vec!["http://eth1.cipig.net:8555".into()],
+        vec![ETH_MAINNET_NODE.into()],
         None,
     );
     let dex_fee_amount = u256_to_big_decimal(DEX_FEE_AMOUNT.into(), 18).expect("!u256_to_big_decimal");
@@ -989,35 +1018,25 @@ 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!["https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()],
-        None,
-    );
+    let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec![ETH_MAINNET_NODE.into()], None);
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f
-    let tx = coin
-        .web3
-        .eth()
-        .transaction(TransactionId::Hash(
-            "0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f".into(),
-        ))
-        .wait()
-        .unwrap()
-        .unwrap();
+    let tx = block_on(coin.web3.eth().transaction(TransactionId::Hash(
+        H256::from_str("0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f").unwrap(),
+    )))
+    .unwrap()
+    .unwrap();
     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,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &tx,
+        expected_sender: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 0,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("was sent from wrong address"));
 }
 
@@ -1026,35 +1045,29 @@ fn validate_dex_fee_invalid_sender_erc() {
     let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: "0xa1d6df714f91debf4e0802a542e13067f31b8262".into(),
+            token_addr: Address::from_str("0xa1d6df714f91debf4e0802a542e13067f31b8262").unwrap(),
         },
-        vec!["http://eth1.cipig.net:8555".into()],
+        vec![ETH_MAINNET_NODE.into()],
         None,
     );
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600
-    let tx = coin
-        .web3
-        .eth()
-        .transaction(TransactionId::Hash(
-            "0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600".into(),
-        ))
-        .wait()
-        .unwrap()
-        .unwrap();
+    let tx = block_on(coin.web3.eth().transaction(TransactionId::Hash(
+        H256::from_str("0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600").unwrap(),
+    )))
+    .unwrap()
+    .unwrap();
     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,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &tx,
+        expected_sender: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 0,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("was sent from wrong address"));
 }
 
@@ -1062,44 +1075,34 @@ fn sender_compressed_pub(tx: &SignedEthTx) -> [u8; 33] {
     let tx_pubkey = tx.public.unwrap();
     let mut raw_pubkey = [0; 65];
     raw_pubkey[0] = 0x04;
-    raw_pubkey[1..].copy_from_slice(&tx_pubkey);
+    raw_pubkey[1..].copy_from_slice(tx_pubkey.as_bytes());
     let secp_public = PublicKey::from_slice(&raw_pubkey).unwrap();
     secp_public.serialize()
 }
 
 #[test]
 fn validate_dex_fee_eth_confirmed_before_min_block() {
-    let (_ctx, coin) = eth_coin_for_test(
-        EthCoinType::Eth,
-        vec!["https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b".into()],
-        None,
-    );
+    let (_ctx, coin) = eth_coin_for_test(EthCoinType::Eth, vec![ETH_MAINNET_NODE.into()], None);
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f
-    let tx = coin
-        .web3
-        .eth()
-        .transaction(TransactionId::Hash(
-            "0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f".into(),
-        ))
-        .wait()
-        .unwrap()
-        .unwrap();
+    let tx = block_on(coin.web3.eth().transaction(TransactionId::Hash(
+        H256::from_str("0x7e9ca16c85efd04ee5e31f2c1914b48f5606d6f9ce96ecce8c96d47d6857278f").unwrap(),
+    )))
+    .unwrap()
+    .unwrap();
     let tx = signed_tx_from_web3_tx(tx).unwrap();
     let compressed_public = sender_compressed_pub(&tx);
     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,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &tx,
+        expected_sender: &compressed_public,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 11784793,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
 }
 
@@ -1108,44 +1111,38 @@ fn validate_dex_fee_erc_confirmed_before_min_block() {
     let (_ctx, coin) = eth_coin_for_test(
         EthCoinType::Erc20 {
             platform: "ETH".to_string(),
-            token_addr: "0xa1d6df714f91debf4e0802a542e13067f31b8262".into(),
+            token_addr: Address::from_str("0xa1d6df714f91debf4e0802a542e13067f31b8262").unwrap(),
         },
-        vec!["http://eth1.cipig.net:8555".into()],
+        vec![ETH_MAINNET_NODE.into()],
         None,
     );
     // the real dex fee sent on mainnet
     // https://etherscan.io/tx/0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600
-    let tx = coin
-        .web3
-        .eth()
-        .transaction(TransactionId::Hash(
-            "0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600".into(),
-        ))
-        .wait()
-        .unwrap()
-        .unwrap();
+    let tx = block_on(coin.web3.eth().transaction(TransactionId::Hash(
+        H256::from_str("0xd6403b41c79f9c9e9c83c03d920ee1735e7854d85d94cef48d95dfeca95cd600").unwrap(),
+    )))
+    .unwrap()
+    .unwrap();
 
     let tx = signed_tx_from_web3_tx(tx).unwrap();
     let compressed_public = sender_compressed_pub(&tx);
     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,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &tx,
+        expected_sender: &compressed_public,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 11823975,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
 }
 
 #[test]
 fn test_negotiate_swap_contract_addr_no_fallback() {
-    let (_, coin) = eth_coin_for_test(EthCoinType::Eth, vec!["http://eth1.cipig.net:8555".into()], None);
+    let (_, coin) = eth_coin_for_test(EthCoinType::Eth, vec![ETH_MAINNET_NODE.into()], None);
 
     let input = None;
     let error = coin.negotiate_swap_contract_addr(input).unwrap_err().into_inner();
@@ -1172,17 +1169,13 @@ fn test_negotiate_swap_contract_addr_no_fallback() {
 
 #[test]
 fn test_negotiate_swap_contract_addr_has_fallback() {
-    let fallback = "0x8500AFc0bc5214728082163326C2FF0C73f4a871".into();
+    let fallback = Address::from_str("0x8500AFc0bc5214728082163326C2FF0C73f4a871").unwrap();
 
-    let (_, coin) = eth_coin_for_test(
-        EthCoinType::Eth,
-        vec!["http://eth1.cipig.net:8555".into()],
-        Some(fallback),
-    );
+    let (_, coin) = eth_coin_for_test(EthCoinType::Eth, vec![ETH_MAINNET_NODE.into()], Some(fallback));
 
     let input = None;
     let result = coin.negotiate_swap_contract_addr(input).unwrap();
-    assert_eq!(Some(fallback.to_vec().into()), result);
+    assert_eq!(Some(fallback.0.to_vec().into()), result);
 
     let slice: &[u8] = &[1; 1];
     let error = coin.negotiate_swap_contract_addr(Some(slice)).unwrap_err().into_inner();
@@ -1204,7 +1197,7 @@ fn test_negotiate_swap_contract_addr_has_fallback() {
 
     let slice: &[u8] = fallback.as_ref();
     let result = coin.negotiate_swap_contract_addr(Some(slice)).unwrap();
-    assert_eq!(Some(fallback.to_vec().into()), result);
+    assert_eq!(Some(fallback.0.to_vec().into()), result);
 }
 
 #[test]
@@ -1232,14 +1225,14 @@ fn polygon_check_if_my_payment_sent() {
         "swap_contract_address": "0x9130b257d37a52e52f21054c4da3450c72f595ce",
     });
 
-    let priv_key = [1; 32];
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(IguanaPrivKey::from([1; 32]));
     let coin = block_on(eth_coin_from_conf_and_request(
         &ctx,
         "MATIC",
         &conf,
         &request,
-        &priv_key,
         CoinProtocol::ETH,
+        priv_key_policy,
     ))
     .unwrap();
 
@@ -1247,15 +1240,18 @@ fn polygon_check_if_my_payment_sent() {
 
     let secret_hash = hex::decode("fc33114b389f0ee1212abf2867e99e89126f4860").unwrap();
     let swap_contract_address = "9130b257d37a52e52f21054c4da3450c72f595ce".into();
+    let if_my_payment_sent_args = CheckIfMyPaymentSentArgs {
+        time_lock: 1638764369,
+        other_pub: &[],
+        secret_hash: &secret_hash,
+        search_from_block: 22185109,
+        swap_contract_address: &Some(swap_contract_address),
+        swap_unique_data: &[],
+        amount: &BigDecimal::default(),
+        payment_instructions: &None,
+    };
     let my_payment = coin
-        .check_if_my_payment_sent(
-            1638764369,
-            &[],
-            &secret_hash,
-            22185109,
-            &Some(swap_contract_address),
-            &[],
-        )
+        .check_if_my_payment_sent(if_my_payment_sent_args)
         .wait()
         .unwrap()
         .unwrap();
@@ -1269,7 +1265,7 @@ fn test_message_hash() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8545", false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let coin = EthCoin(Arc::new(EthCoinImpl {
@@ -1277,8 +1273,8 @@ fn test_message_hash() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
@@ -1295,6 +1291,8 @@ fn test_message_hash() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
 
     let message_hash = coin.sign_message_hash("test").unwrap();
@@ -1310,7 +1308,8 @@ fn test_sign_verify_message() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8545".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8545", false);
+
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let coin = EthCoin(Arc::new(EthCoinImpl {
@@ -1318,8 +1317,8 @@ fn test_sign_verify_message() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
@@ -1336,6 +1335,8 @@ fn test_sign_verify_message() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
 
     let message = "test";
@@ -1347,3 +1348,137 @@ fn test_sign_verify_message() {
         .unwrap();
     assert!(is_valid);
 }
+
+#[test]
+fn test_eth_extract_secret() {
+    let key_pair = KeyPair::from_secret_slice(
+        &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
+    )
+    .unwrap();
+    let transport = Web3Transport::single_node("https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b", false);
+    let web3 = Web3::new(transport);
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+
+    let swap_contract_address = Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap();
+    let coin = EthCoin(Arc::new(EthCoinImpl {
+        coin_type: EthCoinType::Erc20 {
+            platform: "ETH".to_string(),
+            token_addr: Address::from_str("0xc0eb7aed740e1796992a08962c15661bdeb58003").unwrap(),
+        },
+        decimals: 18,
+        gas_station_url: None,
+        gas_station_decimals: ETH_GAS_STATION_DECIMALS,
+        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")),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address,
+        fallback_swap_contract: None,
+        ticker: "ETH".into(),
+        web3_instances: vec![Web3Instance {
+            web3: web3.clone(),
+            is_parity: true,
+        }],
+        web3,
+        ctx: ctx.weak(),
+        required_confirmations: 1.into(),
+        chain_id: None,
+        logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
+        nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
+    }));
+
+    // raw transaction bytes of https://ropsten.etherscan.io/tx/0xcb7c14d3ff309996d582400369393b6fa42314c52245115d4a3f77f072c36da9
+    let tx_bytes = &[
+        249, 1, 9, 37, 132, 119, 53, 148, 0, 131, 2, 73, 240, 148, 123, 193, 187, 221, 106, 10, 114, 47, 201, 191, 252,
+        73, 201, 33, 182, 133, 236, 184, 75, 148, 128, 184, 164, 2, 237, 41, 43, 188, 96, 248, 252, 165, 132, 81, 30,
+        243, 34, 85, 165, 46, 224, 176, 90, 137, 30, 19, 123, 224, 67, 83, 53, 74, 57, 148, 140, 95, 45, 70, 147, 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, 71, 13, 228, 223, 130, 0, 0, 168, 151, 11,
+        232, 224, 253, 63, 180, 26, 114, 23, 184, 27, 10, 161, 80, 178, 251, 73, 204, 80, 174, 97, 118, 149, 204, 186,
+        187, 243, 185, 19, 128, 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, 157, 73, 251, 238, 138, 245, 142, 240, 85, 44, 209, 63, 194, 242,
+        109, 242, 246, 6, 76, 176, 27, 160, 29, 157, 226, 23, 81, 174, 34, 82, 93, 182, 41, 248, 119, 42, 221, 214, 38,
+        243, 128, 2, 235, 208, 193, 192, 74, 208, 242, 26, 221, 83, 54, 74, 160, 111, 29, 92, 8, 75, 61, 97, 103, 199,
+        100, 189, 72, 74, 221, 144, 66, 170, 68, 121, 29, 105, 19, 194, 35, 245, 196, 131, 236, 29, 105, 101, 30,
+    ];
+
+    let secret = block_on(coin.extract_secret(&[0u8; 20], tx_bytes.as_slice()));
+    assert!(secret.is_ok());
+    let expect_secret = &[
+        168, 151, 11, 232, 224, 253, 63, 180, 26, 114, 23, 184, 27, 10, 161, 80, 178, 251, 73, 204, 80, 174, 97, 118,
+        149, 204, 186, 187, 243, 185, 19, 128,
+    ];
+    assert_eq!(expect_secret.as_slice(), &secret.unwrap());
+
+    // Test for unexpected contract signature
+    // raw transaction bytes of ethPayment contract https://etherscan
+    // .io/tx/0x0869be3e5d4456a29d488a533ad6c118620fef450f36778aecf31d356ff8b41f
+    let tx_bytes = [
+        248, 240, 3, 133, 1, 42, 5, 242, 0, 131, 2, 73, 240, 148, 133, 0, 175, 192, 188, 82, 20, 114, 128, 130, 22, 51,
+        38, 194, 255, 12, 115, 244, 168, 113, 135, 110, 205, 245, 24, 127, 34, 254, 184, 132, 21, 44, 243, 175, 73, 33,
+        143, 82, 117, 16, 110, 27, 133, 82, 200, 114, 233, 42, 140, 198, 35, 21, 201, 249, 187, 180, 20, 46, 148, 40,
+        9, 228, 193, 130, 71, 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 152, 41, 132, 9, 201, 73, 19, 94, 237, 137, 35,
+        61, 4, 194, 207, 239, 152, 75, 175, 245, 157, 174, 10, 214, 161, 207, 67, 70, 87, 246, 231, 212, 47, 216, 119,
+        68, 237, 197, 125, 141, 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, 93, 72, 125, 102, 28, 159, 180, 237, 198, 97, 87, 80, 82, 200, 104, 40, 245,
+        221, 7, 28, 122, 104, 91, 99, 1, 159, 140, 25, 131, 101, 74, 87, 50, 168, 146, 187, 90, 160, 51, 1, 123, 247,
+        6, 108, 165, 181, 188, 40, 56, 47, 211, 229, 221, 73, 5, 15, 89, 81, 117, 225, 216, 108, 98, 226, 119, 232, 94,
+        184, 42, 106,
+    ];
+    let secret = block_on(coin.extract_secret(&[0u8; 20], tx_bytes.as_slice()))
+        .err()
+        .unwrap();
+    assert!(secret.contains("Expected 'receiverSpend' contract call signature"));
+}
+
+#[test]
+fn test_eth_validate_valid_and_invalid_pubkey() {
+    let ctx = MmCtxBuilder::new().into_mm_arc();
+    let conf = json!({
+      "coin": "MATIC",
+      "name": "matic",
+      "fname": "Polygon",
+      "rpcport": 80,
+      "mm2": 1,
+      "chain_id": 137,
+      "avg_blocktime": 0.03,
+      "required_confirmations": 3,
+      "protocol": {
+        "type": "ETH"
+      }
+    });
+
+    let request = json!({
+        "method": "enable",
+        "coin": "MATIC",
+        "urls": ["https://polygon-mainnet.g.alchemy.com/v2/9YYl6iMLmXXLoflMPHnMTC4Dcm2L2tFH"],
+        "swap_contract_address": "0x9130b257d37a52e52f21054c4da3450c72f595ce",
+    });
+
+    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 priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(IguanaPrivKey::from(priv_key));
+    let coin = block_on(eth_coin_from_conf_and_request(
+        &ctx,
+        "MATIC",
+        &conf,
+        &request,
+        CoinProtocol::ETH,
+        priv_key_policy,
+    ))
+    .unwrap();
+    // Test expected to pass at this point as we're using a valid pubkey to validate against a valid pubkey
+    assert!(coin
+        .validate_other_pubkey(&[
+            3, 23, 183, 225, 206, 31, 159, 148, 195, 42, 67, 115, 146, 41, 248, 140, 11, 3, 51, 41, 111, 180, 110, 143,
+            114, 134, 88, 73, 198, 174, 52, 184, 78
+        ])
+        .is_ok());
+    // Test expected to fail at this point as we're using a valid pubkey to validate against an invalid pubkeys
+    assert!(coin.validate_other_pubkey(&[1u8; 20]).is_err());
+    assert!(coin.validate_other_pubkey(&[1u8; 8]).is_err());
+}
diff --git a/mm2src/coins/eth/eth_wasm_tests.rs b/mm2src/coins/eth/eth_wasm_tests.rs
index ca1f3f8362..f8e22335df 100644
--- a/mm2src/coins/eth/eth_wasm_tests.rs
+++ b/mm2src/coins/eth/eth_wasm_tests.rs
@@ -20,7 +20,7 @@ async fn test_send() {
         &hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap(),
     )
     .unwrap();
-    let transport = Web3Transport::new(vec!["http://195.201.0.6:8565".into()]).unwrap();
+    let transport = Web3Transport::single_node("http://195.201.0.6:8565", false);
     let web3 = Web3::new(transport);
     let ctx = MmCtxBuilder::new().into_mm_arc();
     let coin = EthCoin(Arc::new(EthCoinImpl {
@@ -28,8 +28,8 @@ async fn test_send() {
         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"),
+        priv_key_policy: key_pair.into(),
+        swap_contract_address: Address::from_str("0x7Bc1bBDD6A0a722fC9bffC49c921B685ECB84b94").unwrap(),
         fallback_swap_contract: None,
         web3_instances: vec![Web3Instance {
             web3: web3.clone(),
@@ -46,18 +46,20 @@ async fn test_send() {
         chain_id: None,
         logs_block_range: DEFAULT_LOGS_BLOCK_RANGE,
         nonce_lock: new_nonce_lock(),
+        erc20_tokens_infos: Default::default(),
+        abortable_system: AbortableQueue::default(),
     }));
-    let tx = coin
-        .send_maker_payment(
-            1000,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &[1; 20],
-            "0.001".parse().unwrap(),
-            &None,
-            &[],
-        )
-        .compat()
-        .await;
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: 1000,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash: &[1; 20],
+        amount: "0.001".parse().unwrap(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_maker_payment(maker_payment_args).compat().await;
     console::log_1(&format!("{:?}", tx).into());
 
     let block = coin.current_block().compat().await;
diff --git a/mm2src/coins/eth/nonce.rs b/mm2src/coins/eth/nonce.rs
new file mode 100644
index 0000000000..48a3d04f02
--- /dev/null
+++ b/mm2src/coins/eth/nonce.rs
@@ -0,0 +1,29 @@
+use web3::{api::Namespace,
+           helpers::{self, CallFuture},
+           types::{Address, U256},
+           Transport};
+
+/// `ParityNonce` namespace.
+#[derive(Debug, Clone)]
+pub(crate) struct ParityNonce<T> {
+    transport: T,
+}
+
+impl<T: Transport> Namespace<T> for ParityNonce<T> {
+    fn new(transport: T) -> Self
+    where
+        Self: Sized,
+    {
+        ParityNonce { transport }
+    }
+
+    fn transport(&self) -> &T { &self.transport }
+}
+
+impl<T: Transport> ParityNonce<T> {
+    /// Parity next nonce.
+    pub(crate) fn parity_next_nonce(&self, addr: Address) -> CallFuture<U256, T::Out> {
+        let addr = helpers::serialize(&addr);
+        CallFuture::new(self.transport.execute("parity_nextNonce", vec![addr]))
+    }
+}
diff --git a/mm2src/coins/eth/swap_contract_abi.json b/mm2src/coins/eth/swap_contract_abi.json
new file mode 100644
index 0000000000..7003d9a181
--- /dev/null
+++ b/mm2src/coins/eth/swap_contract_abi.json
@@ -0,0 +1,407 @@
+[
+  {
+		"inputs": [],
+		"stateMutability": "nonpayable",
+		"type": "constructor"
+	},
+	{
+		"anonymous": false,
+		"inputs": [
+			{
+				"indexed": false,
+				"internalType": "bytes32",
+				"name": "id",
+				"type": "bytes32"
+			}
+		],
+		"name": "PaymentSent",
+		"type": "event"
+	},
+	{
+		"anonymous": false,
+		"inputs": [
+			{
+				"indexed": false,
+				"internalType": "bytes32",
+				"name": "id",
+				"type": "bytes32"
+			},
+			{
+				"indexed": false,
+				"internalType": "bytes32",
+				"name": "secret",
+				"type": "bytes32"
+			}
+		],
+		"name": "ReceiverSpent",
+		"type": "event"
+	},
+	{
+		"anonymous": false,
+		"inputs": [
+			{
+				"indexed": false,
+				"internalType": "bytes32",
+				"name": "id",
+				"type": "bytes32"
+			}
+		],
+		"name": "SenderRefunded",
+		"type": "event"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes20",
+				"name": "_secretHash",
+				"type": "bytes20"
+			},
+			{
+				"internalType": "uint64",
+				"name": "_lockTime",
+				"type": "uint64"
+			}
+		],
+		"name": "erc20Payment",
+		"outputs": [],
+		"stateMutability": "payable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "_secretHash",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint64",
+				"name": "_lockTime",
+				"type": "uint64"
+			}
+		],
+		"name": "erc20PaymentSha256",
+		"outputs": [],
+		"stateMutability": "payable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes20",
+				"name": "_secretHash",
+				"type": "bytes20"
+			},
+			{
+				"internalType": "uint64",
+				"name": "_lockTime",
+				"type": "uint64"
+			}
+		],
+		"name": "ethPayment",
+		"outputs": [],
+		"stateMutability": "payable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "_secretHash",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint64",
+				"name": "_lockTime",
+				"type": "uint64"
+			}
+		],
+		"name": "ethPaymentSha256",
+		"outputs": [],
+		"stateMutability": "payable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"name": "payments",
+		"outputs": [
+			{
+				"internalType": "bytes20",
+				"name": "paymentHash",
+				"type": "bytes20"
+			},
+			{
+				"internalType": "uint64",
+				"name": "lockTime",
+				"type": "uint64"
+			},
+			{
+				"internalType": "enum EtomicSwap.PaymentState",
+				"name": "state",
+				"type": "uint8"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "_secret",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_sender",
+				"type": "address"
+			}
+		],
+		"name": "receiverSpend",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "",
+				"type": "bytes32"
+			}
+		],
+		"name": "secret_hash_algos",
+		"outputs": [
+			{
+				"internalType": "enum EtomicSwap.SecretHashAlgo",
+				"name": "",
+				"type": "uint8"
+			}
+		],
+		"stateMutability": "view",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes20",
+				"name": "_secretHash",
+				"type": "bytes20"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			}
+		],
+		"name": "senderRefund",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "_secretHash",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			}
+		],
+		"name": "senderRefundSha256",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes20",
+				"name": "_secretHash",
+				"type": "bytes20"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			}
+		],
+		"name": "watcherRefund",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"internalType": "bytes32",
+				"name": "_id",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_amount",
+				"type": "uint256"
+			},
+			{
+				"internalType": "bytes32",
+				"name": "_secret",
+				"type": "bytes32"
+			},
+			{
+				"internalType": "address",
+				"name": "_tokenAddress",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_sender",
+				"type": "address"
+			},
+			{
+				"internalType": "address",
+				"name": "_receiver",
+				"type": "address"
+			}
+		],
+		"name": "watcherSpend",
+		"outputs": [],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	}
+]
\ No newline at end of file
diff --git a/mm2src/coins/eth/v2_activation.rs b/mm2src/coins/eth/v2_activation.rs
new file mode 100644
index 0000000000..3395cbed70
--- /dev/null
+++ b/mm2src/coins/eth/v2_activation.rs
@@ -0,0 +1,501 @@
+use super::*;
+use common::executor::AbortedError;
+use crypto::{CryptoCtxError, StandardHDPathToCoin};
+use enum_from::EnumFromTrait;
+use mm2_err_handle::common_errors::WithInternal;
+#[cfg(target_arch = "wasm32")]
+use mm2_metamask::{from_metamask_error, MetamaskError, MetamaskRpcError, WithMetamaskRpcError};
+
+#[derive(Display, EnumFromTrait, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum EthActivationV2Error {
+    InvalidPayload(String),
+    InvalidSwapContractAddr(String),
+    InvalidFallbackSwapContract(String),
+    #[display(fmt = "Expected either 'chain_id' or 'rpc_chain_id' to be set")]
+    #[cfg(target_arch = "wasm32")]
+    ExpectedRpcChainId,
+    #[display(fmt = "Platform coin {} activation failed. {}", ticker, error)]
+    ActivationFailed {
+        ticker: String,
+        error: String,
+    },
+    CouldNotFetchBalance(String),
+    UnreachableNodes(String),
+    #[display(fmt = "Enable request for ETH coin must have at least 1 node")]
+    AtLeastOneNodeRequired,
+    #[display(fmt = "'derivation_path' field is not found in config")]
+    DerivationPathIsNotSet,
+    #[display(fmt = "Error deserializing 'derivation_path': {}", _0)]
+    ErrorDeserializingDerivationPath(String),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
+    #[cfg(target_arch = "wasm32")]
+    #[from_trait(WithMetamaskRpcError::metamask_rpc_error)]
+    #[display(fmt = "{}", _0)]
+    MetamaskError(MetamaskRpcError),
+    #[from_trait(WithInternal::internal)]
+    #[display(fmt = "Internal: {}", _0)]
+    InternalError(String),
+}
+
+impl From<MyAddressError> for EthActivationV2Error {
+    fn from(err: MyAddressError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+impl From<AbortedError> for EthActivationV2Error {
+    fn from(e: AbortedError) -> Self { EthActivationV2Error::InternalError(e.to_string()) }
+}
+
+impl From<CryptoCtxError> for EthActivationV2Error {
+    fn from(e: CryptoCtxError) -> Self { EthActivationV2Error::InternalError(e.to_string()) }
+}
+
+impl From<UnexpectedDerivationMethod> for EthActivationV2Error {
+    fn from(e: UnexpectedDerivationMethod) -> Self { EthActivationV2Error::InternalError(e.to_string()) }
+}
+
+#[cfg(target_arch = "wasm32")]
+impl From<MetamaskError> for EthActivationV2Error {
+    fn from(e: MetamaskError) -> Self { from_metamask_error(e) }
+}
+
+/// An alternative to `crate::PrivKeyActivationPolicy`, typical only for ETH coin.
+#[derive(Clone, Deserialize)]
+pub enum EthPrivKeyActivationPolicy {
+    ContextPrivKey,
+    #[cfg(target_arch = "wasm32")]
+    Metamask,
+}
+
+impl Default for EthPrivKeyActivationPolicy {
+    fn default() -> Self { EthPrivKeyActivationPolicy::ContextPrivKey }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum EthRpcMode {
+    Http,
+    #[cfg(target_arch = "wasm32")]
+    Metamask,
+}
+
+impl Default for EthRpcMode {
+    fn default() -> Self { EthRpcMode::Http }
+}
+
+#[derive(Clone, Deserialize)]
+pub struct EthActivationV2Request {
+    #[serde(default)]
+    pub nodes: Vec<EthNode>,
+    #[serde(default)]
+    pub rpc_mode: EthRpcMode,
+    pub swap_contract_address: Address,
+    pub fallback_swap_contract: Option<Address>,
+    pub gas_station_url: Option<String>,
+    pub gas_station_decimals: Option<u8>,
+    #[serde(default)]
+    pub gas_station_policy: GasStationPricePolicy,
+    pub mm2: Option<u8>,
+    pub required_confirmations: Option<u64>,
+    #[serde(default)]
+    pub priv_key_policy: EthPrivKeyActivationPolicy,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct EthNode {
+    pub url: String,
+    #[serde(default)]
+    pub gui_auth: bool,
+}
+
+#[derive(Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum Erc20TokenActivationError {
+    InternalError(String),
+    CouldNotFetchBalance(String),
+}
+
+impl From<AbortedError> for Erc20TokenActivationError {
+    fn from(e: AbortedError) -> Self { Erc20TokenActivationError::InternalError(e.to_string()) }
+}
+
+impl From<MyAddressError> for Erc20TokenActivationError {
+    fn from(err: MyAddressError) -> Self { Self::InternalError(err.to_string()) }
+}
+
+#[derive(Clone, Deserialize)]
+pub struct Erc20TokenActivationRequest {
+    pub required_confirmations: Option<u64>,
+}
+
+pub struct Erc20Protocol {
+    pub platform: String,
+    pub token_addr: Address,
+}
+
+#[cfg_attr(test, mockable)]
+impl EthCoin {
+    pub async fn initialize_erc20_token(
+        &self,
+        activation_params: Erc20TokenActivationRequest,
+        protocol: Erc20Protocol,
+        ticker: String,
+    ) -> MmResult<EthCoin, Erc20TokenActivationError> {
+        // TODO
+        // Check if ctx is required.
+        // Remove it to avoid circular references if possible
+        let ctx = MmArc::from_weak(&self.ctx)
+            .ok_or_else(|| String::from("No context"))
+            .map_err(Erc20TokenActivationError::InternalError)?;
+
+        let conf = coin_conf(&ctx, &ticker);
+
+        let decimals = match conf["decimals"].as_u64() {
+            None | Some(0) => get_token_decimals(&self.web3, protocol.token_addr)
+                .await
+                .map_err(Erc20TokenActivationError::InternalError)?,
+            Some(d) => d as u8,
+        };
+
+        let web3_instances: Vec<Web3Instance> = self
+            .web3_instances
+            .iter()
+            .map(|node| {
+                let mut transport = node.web3.transport().clone();
+                if let Some(auth) = transport.gui_auth_validation_generator_as_mut() {
+                    auth.coin_ticker = ticker.clone();
+                }
+                let web3 = Web3::new(transport);
+                Web3Instance {
+                    web3,
+                    is_parity: node.is_parity,
+                }
+            })
+            .collect();
+
+        let mut transport = self.web3.transport().clone();
+        if let Some(auth) = transport.gui_auth_validation_generator_as_mut() {
+            auth.coin_ticker = ticker.clone();
+        }
+        let web3 = Web3::new(transport);
+
+        let required_confirmations = activation_params
+            .required_confirmations
+            .unwrap_or_else(|| conf["required_confirmations"].as_u64().unwrap_or(1))
+            .into();
+
+        // Create an abortable system linked to the `MmCtx` so if the app is stopped on `MmArc::stop`,
+        // all spawned futures related to `ERC20` coin will be aborted as well.
+        let abortable_system = ctx.abortable_system.create_subsystem()?;
+
+        let token = EthCoinImpl {
+            priv_key_policy: self.priv_key_policy.clone(),
+            my_address: self.my_address,
+            coin_type: EthCoinType::Erc20 {
+                platform: protocol.platform,
+                token_addr: protocol.token_addr,
+            },
+            sign_message_prefix: self.sign_message_prefix.clone(),
+            swap_contract_address: self.swap_contract_address,
+            fallback_swap_contract: self.fallback_swap_contract,
+            decimals,
+            ticker,
+            gas_station_url: self.gas_station_url.clone(),
+            gas_station_decimals: self.gas_station_decimals,
+            gas_station_policy: self.gas_station_policy,
+            web3,
+            web3_instances,
+            history_sync_state: Mutex::new(self.history_sync_state.lock().unwrap().clone()),
+            ctx: self.ctx.clone(),
+            required_confirmations,
+            chain_id: self.chain_id,
+            logs_block_range: self.logs_block_range,
+            nonce_lock: self.nonce_lock.clone(),
+            erc20_tokens_infos: Default::default(),
+            abortable_system,
+        };
+
+        Ok(EthCoin(Arc::new(token)))
+    }
+}
+
+pub async fn eth_coin_from_conf_and_request_v2(
+    ctx: &MmArc,
+    ticker: &str,
+    conf: &Json,
+    req: EthActivationV2Request,
+    priv_key_policy: EthPrivKeyBuildPolicy,
+) -> MmResult<EthCoin, EthActivationV2Error> {
+    let ticker = ticker.to_string();
+
+    if req.swap_contract_address == Address::default() {
+        return Err(EthActivationV2Error::InvalidSwapContractAddr(
+            "swap_contract_address can't be zero address".to_string(),
+        )
+        .into());
+    }
+
+    if let Some(fallback) = req.fallback_swap_contract {
+        if fallback == Address::default() {
+            return Err(EthActivationV2Error::InvalidFallbackSwapContract(
+                "fallback_swap_contract can't be zero address".to_string(),
+            )
+            .into());
+        }
+    }
+
+    let (my_address, priv_key_policy) = build_address_and_priv_key_policy(conf, priv_key_policy).await?;
+    let my_address_str = checksum_address(&format!("{:02x}", my_address));
+
+    let chain_id = conf["chain_id"].as_u64();
+
+    let (web3, web3_instances) = match (req.rpc_mode, &priv_key_policy) {
+        (EthRpcMode::Http, EthPrivKeyPolicy::KeyPair(key_pair)) => {
+            build_http_transport(ctx, ticker.clone(), my_address_str, key_pair, &req.nodes).await?
+        },
+        #[cfg(target_arch = "wasm32")]
+        (EthRpcMode::Metamask, EthPrivKeyPolicy::Metamask(_)) => {
+            let chain_id = chain_id
+                .or_else(|| conf["rpc_chain_id"].as_u64())
+                .or_mm_err(|| EthActivationV2Error::ExpectedRpcChainId)?;
+            build_metamask_transport(ctx, ticker.clone(), chain_id).await?
+        },
+        #[cfg(target_arch = "wasm32")]
+        (_, _) => {
+            let error = r#"priv_key_policy="Metamask" and rpc_mode="Metamask" should be used both"#.to_string();
+            return MmError::err(EthActivationV2Error::ActivationFailed { ticker, error });
+        },
+    };
+
+    // param from request should override the config
+    let required_confirmations = req
+        .required_confirmations
+        .unwrap_or_else(|| {
+            conf["required_confirmations"]
+                .as_u64()
+                .unwrap_or(DEFAULT_REQUIRED_CONFIRMATIONS as u64)
+        })
+        .into();
+
+    let sign_message_prefix: Option<String> = json::from_value(conf["sign_message_prefix"].clone()).ok();
+
+    let mut map = NONCE_LOCK.lock().unwrap();
+    let nonce_lock = map.entry(ticker.clone()).or_insert_with(new_nonce_lock).clone();
+
+    // Create an abortable system linked to the `MmCtx` so if the app is stopped on `MmArc::stop`,
+    // all spawned futures related to `ETH` coin will be aborted as well.
+    let abortable_system = ctx.abortable_system.create_subsystem()?;
+
+    let coin = EthCoinImpl {
+        priv_key_policy,
+        my_address,
+        coin_type: EthCoinType::Eth,
+        sign_message_prefix,
+        swap_contract_address: req.swap_contract_address,
+        fallback_swap_contract: req.fallback_swap_contract,
+        decimals: ETH_DECIMALS,
+        ticker,
+        gas_station_url: req.gas_station_url,
+        gas_station_decimals: req.gas_station_decimals.unwrap_or(ETH_GAS_STATION_DECIMALS),
+        gas_station_policy: req.gas_station_policy,
+        web3,
+        web3_instances,
+        history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
+        ctx: ctx.weak(),
+        required_confirmations,
+        chain_id,
+        logs_block_range: conf["logs_block_range"].as_u64().unwrap_or(DEFAULT_LOGS_BLOCK_RANGE),
+        nonce_lock,
+        erc20_tokens_infos: Default::default(),
+        abortable_system,
+    };
+
+    Ok(EthCoin(Arc::new(coin)))
+}
+
+/// Processes the given `priv_key_policy` and generates corresponding `KeyPair`.
+/// This function expects either [`PrivKeyBuildPolicy::IguanaPrivKey`]
+/// or [`PrivKeyBuildPolicy::GlobalHDAccount`], otherwise returns `PrivKeyPolicyNotAllowed` error.
+pub(crate) async fn build_address_and_priv_key_policy(
+    conf: &Json,
+    priv_key_policy: EthPrivKeyBuildPolicy,
+) -> MmResult<(Address, EthPrivKeyPolicy), EthActivationV2Error> {
+    let raw_priv_key = match priv_key_policy {
+        EthPrivKeyBuildPolicy::IguanaPrivKey(iguana) => iguana,
+        EthPrivKeyBuildPolicy::GlobalHDAccount(global_hd_ctx) => {
+            // Consider storing `derivation_path` at `EthCoinImpl`.
+            let derivation_path: Option<StandardHDPathToCoin> = json::from_value(conf["derivation_path"].clone())
+                .map_to_mm(|e| EthActivationV2Error::ErrorDeserializingDerivationPath(e.to_string()))?;
+            let derivation_path = derivation_path.or_mm_err(|| EthActivationV2Error::DerivationPathIsNotSet)?;
+            global_hd_ctx
+                .derive_secp256k1_secret(&derivation_path)
+                .mm_err(|e| EthActivationV2Error::InternalError(e.to_string()))?
+        },
+        #[cfg(target_arch = "wasm32")]
+        EthPrivKeyBuildPolicy::Metamask(metamask_ctx) => {
+            let address = *metamask_ctx.check_active_eth_account().await?;
+            let public_key_uncompressed = metamask_ctx.eth_account_pubkey_uncompressed();
+            let public_key = compress_public_key(public_key_uncompressed)?;
+            return Ok((
+                address,
+                EthPrivKeyPolicy::Metamask(EthMetamaskPolicy {
+                    public_key,
+                    public_key_uncompressed,
+                }),
+            ));
+        },
+    };
+
+    let key_pair = KeyPair::from_secret_slice(raw_priv_key.as_slice())
+        .map_to_mm(|e| EthActivationV2Error::InternalError(e.to_string()))?;
+    let address = key_pair.address();
+    Ok((address, EthPrivKeyPolicy::KeyPair(key_pair)))
+}
+
+async fn build_http_transport(
+    ctx: &MmArc,
+    coin_ticker: String,
+    address: String,
+    key_pair: &KeyPair,
+    eth_nodes: &[EthNode],
+) -> MmResult<(Web3<Web3Transport>, Vec<Web3Instance>), EthActivationV2Error> {
+    if eth_nodes.is_empty() {
+        return MmError::err(EthActivationV2Error::AtLeastOneNodeRequired);
+    }
+
+    let mut http_nodes = vec![];
+    for node in eth_nodes {
+        let uri = node
+            .url
+            .parse()
+            .map_err(|_| EthActivationV2Error::InvalidPayload(format!("{} could not be parsed.", node.url)))?;
+
+        http_nodes.push(HttpTransportNode {
+            uri,
+            gui_auth: node.gui_auth,
+        });
+    }
+
+    let mut rng = small_rng();
+    http_nodes.as_mut_slice().shuffle(&mut rng);
+
+    drop_mutability!(http_nodes);
+
+    let mut web3_instances = Vec::with_capacity(http_nodes.len());
+    let event_handlers = rpc_event_handlers_for_eth_transport(ctx, coin_ticker.clone());
+    for node in http_nodes.iter() {
+        let transport = build_single_http_transport(
+            coin_ticker.clone(),
+            address.clone(),
+            key_pair,
+            vec![node.clone()],
+            event_handlers.clone(),
+        );
+
+        let web3 = Web3::new(transport);
+        let version = match web3.web3().client_version().await {
+            Ok(v) => v,
+            Err(e) => {
+                error!("Couldn't get client version for url {}: {}", node.uri, e);
+                continue;
+            },
+        };
+        web3_instances.push(Web3Instance {
+            web3,
+            is_parity: version.contains("Parity") || version.contains("parity"),
+        })
+    }
+
+    if web3_instances.is_empty() {
+        return Err(
+            EthActivationV2Error::UnreachableNodes("Failed to get client version for all nodes".to_string()).into(),
+        );
+    }
+
+    let transport = build_single_http_transport(coin_ticker, address, key_pair, http_nodes, event_handlers);
+    let web3 = Web3::new(transport);
+
+    Ok((web3, web3_instances))
+}
+
+fn build_single_http_transport(
+    coin_ticker: String,
+    address: String,
+    key_pair: &KeyPair,
+    nodes: Vec<HttpTransportNode>,
+    event_handlers: Vec<RpcTransportEventHandlerShared>,
+) -> Web3Transport {
+    use crate::eth::web3_transport::http_transport::HttpTransport;
+
+    let mut http_transport = HttpTransport::with_event_handlers(nodes, event_handlers);
+    http_transport.gui_auth_validation_generator = Some(GuiAuthValidationGenerator {
+        coin_ticker,
+        secret: key_pair.secret().clone(),
+        address,
+    });
+    Web3Transport::from(http_transport)
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn build_metamask_transport(
+    ctx: &MmArc,
+    coin_ticker: String,
+    chain_id: u64,
+) -> MmResult<(Web3<Web3Transport>, Vec<Web3Instance>), EthActivationV2Error> {
+    let event_handlers = rpc_event_handlers_for_eth_transport(ctx, coin_ticker.clone());
+
+    let eth_config = web3_transport::metamask_transport::MetamaskEthConfig { chain_id };
+    let web3 = Web3::new(Web3Transport::new_metamask(eth_config, event_handlers)?);
+
+    // Check if MetaMask supports the given `chain_id`.
+    // Please note that this request may take a long time.
+    check_metamask_supports_chain_id(coin_ticker, &web3, chain_id).await?;
+
+    // MetaMask doesn't use Parity nodes. So `MetamaskTransport` doesn't support `parity_nextNonce` RPC.
+    // An example of the `web3_clientVersion` RPC - `MetaMask/v10.22.1`.
+    let web3_instances = vec![Web3Instance {
+        web3: web3.clone(),
+        is_parity: false,
+    }];
+
+    Ok((web3, web3_instances))
+}
+
+/// This method is based on the fact that `MetamaskTransport` tries to switch the `ChainId`
+/// if the MetaMask is targeted to another ETH chain.
+#[cfg(target_arch = "wasm32")]
+async fn check_metamask_supports_chain_id(
+    ticker: String,
+    web3: &Web3<Web3Transport>,
+    expected_chain_id: u64,
+) -> MmResult<(), EthActivationV2Error> {
+    use jsonrpc_core::ErrorCode;
+
+    /// See the documentation:
+    /// https://docs.metamask.io/guide/rpc-api.html#wallet-switchethereumchain
+    const CHAIN_IS_NOT_REGISTERED_ERROR: ErrorCode = ErrorCode::ServerError(4902);
+
+    match web3.eth().chain_id().await {
+        Ok(chain_id) if chain_id == U256::from(expected_chain_id) => Ok(()),
+        // The RPC client should have returned ChainId with which it has been created on [`Web3Transport::new_metamask`].
+        Ok(unexpected_chain_id) => {
+            let error = format!("Expected '{expected_chain_id}' ChainId, found '{unexpected_chain_id}'");
+            MmError::err(EthActivationV2Error::InternalError(error))
+        },
+        Err(web3::Error::Rpc(rpc_err)) if rpc_err.code == CHAIN_IS_NOT_REGISTERED_ERROR => {
+            let error = format!("Ethereum chain_id({expected_chain_id}) is not supported");
+            MmError::err(EthActivationV2Error::ActivationFailed { ticker, error })
+        },
+        Err(other) => {
+            let error = other.to_string();
+            MmError::err(EthActivationV2Error::ActivationFailed { ticker, error })
+        },
+    }
+}
+
+#[cfg(target_arch = "wasm32")]
+fn compress_public_key(uncompressed: H520) -> MmResult<H264, EthActivationV2Error> {
+    let public_key = PublicKey::from_slice(uncompressed.as_bytes())
+        .map_to_mm(|e| EthActivationV2Error::InternalError(e.to_string()))?;
+    let compressed = public_key.serialize();
+    Ok(H264::from(compressed))
+}
diff --git a/mm2src/coins/eth/web3_transport.rs b/mm2src/coins/eth/web3_transport.rs
deleted file mode 100644
index 5b0b229a57..0000000000
--- a/mm2src/coins/eth/web3_transport.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use super::{RpcTransportEventHandler, RpcTransportEventHandlerShared};
-#[cfg(not(target_arch = "wasm32"))] use futures::FutureExt;
-use futures::TryFutureExt;
-use futures01::{Future, Poll};
-use jsonrpc_core::{Call, Response};
-use serde_json::Value as Json;
-#[cfg(not(target_arch = "wasm32"))] use std::ops::Deref;
-use std::sync::atomic::{AtomicUsize, Ordering};
-use std::sync::Arc;
-use web3::api::Namespace;
-use web3::error::{Error, ErrorKind};
-use web3::helpers::{self, build_request, to_result_from_output, to_string, CallFuture};
-use web3::types::{BlockNumber, U256};
-use web3::{RequestId, Transport};
-
-/// eth_feeHistory support is missing even in the latest rust-web3
-/// It's the custom namespace implementing it
-#[derive(Debug, Clone)]
-pub struct EthFeeHistoryNamespace<T> {
-    transport: T,
-}
-
-impl<T: Transport> Namespace<T> for EthFeeHistoryNamespace<T> {
-    fn new(transport: T) -> Self
-    where
-        Self: Sized,
-    {
-        Self { transport }
-    }
-
-    fn transport(&self) -> &T { &self.transport }
-}
-
-#[derive(Debug, Deserialize)]
-pub struct FeeHistoryResult {
-    #[serde(rename = "oldestBlock")]
-    pub oldest_block: U256,
-    #[serde(rename = "baseFeePerGas")]
-    pub base_fee_per_gas: Vec<U256>,
-}
-
-impl<T: Transport> EthFeeHistoryNamespace<T> {
-    pub fn eth_fee_history(
-        &self,
-        count: U256,
-        block: BlockNumber,
-        reward_percentiles: &[f64],
-    ) -> CallFuture<FeeHistoryResult, T::Out> {
-        let count = helpers::serialize(&count);
-        let block = helpers::serialize(&block);
-        let reward_percentiles = helpers::serialize(&reward_percentiles);
-        let params = vec![count, block, reward_percentiles];
-        CallFuture::new(self.transport.execute("eth_feeHistory", params))
-    }
-}
-
-/// 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, 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),
-        _ => Err(ErrorKind::InvalidResponse("Expected single, got batch.".into()).into()),
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Web3Transport {
-    id: Arc<AtomicUsize>,
-    uris: Vec<http::Uri>,
-    event_handlers: Vec<RpcTransportEventHandlerShared>,
-}
-
-impl Web3Transport {
-    #[allow(dead_code)]
-    pub fn new(urls: Vec<String>) -> Result<Self, String> {
-        let mut uris = vec![];
-        for url in urls.iter() {
-            uris.push(try_s!(url.parse()));
-        }
-        Ok(Web3Transport {
-            id: Arc::new(AtomicUsize::new(0)),
-            uris,
-            event_handlers: Default::default(),
-        })
-    }
-
-    pub fn with_event_handlers(
-        urls: Vec<String>,
-        event_handlers: Vec<RpcTransportEventHandlerShared>,
-    ) -> Result<Self, String> {
-        let mut uris = vec![];
-        for url in urls.iter() {
-            uris.push(try_s!(url.parse()));
-        }
-        Ok(Web3Transport {
-            id: Arc::new(AtomicUsize::new(0)),
-            uris,
-            event_handlers,
-        })
-    }
-}
-
-struct SendFuture<T>(T);
-
-impl<T: Future> Future for SendFuture<T> {
-    type Item = T::Item;
-
-    type Error = T::Error;
-
-    fn poll(&mut self) -> Poll<Self::Item, Self::Error> { self.0.poll() }
-}
-
-unsafe impl<T> Send for SendFuture<T> where T: Send {}
-unsafe impl<T> Sync for SendFuture<T> {}
-
-impl Transport for Web3Transport {
-    type Out = Box<dyn Future<Item = Json, Error = Error> + Send>;
-
-    fn prepare(&self, method: &str, params: Vec<Json>) -> (RequestId, Call) {
-        let id = self.id.fetch_add(1, Ordering::AcqRel);
-        let request = build_request(id, method, params);
-
-        (id, request)
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    fn send(&self, _id: RequestId, request: Call) -> Self::Out {
-        Box::new(
-            send_request(request, self.uris.clone(), self.event_handlers.clone())
-                .boxed()
-                .compat(),
-        )
-    }
-
-    #[cfg(target_arch = "wasm32")]
-    fn send(&self, _id: RequestId, request: Call) -> Self::Out {
-        let fut = send_request(request, self.uris.clone(), self.event_handlers.clone());
-        Box::new(SendFuture(Box::pin(fut).compat()))
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-async fn send_request(
-    request: Call,
-    uris: Vec<http::Uri>,
-    event_handlers: Vec<RpcTransportEventHandlerShared>,
-) -> Result<Json, Error> {
-    use common::executor::Timer;
-    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() {
-        let request = to_string(&request);
-        event_handlers.on_outgoing_request(request.as_bytes());
-
-        let mut req = http::Request::new(request.clone().into_bytes());
-        *req.method_mut() = http::Method::POST;
-        *req.uri_mut() = uri.clone();
-        req.headers_mut()
-            .insert(http::header::CONTENT_TYPE, HeaderValue::from_static("application/json"));
-        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)) => {
-                let error = ERRL!("Error requesting '{}': {}s timeout expired", uri, REQUEST_TIMEOUT_S);
-                warn!("{}", error);
-                errors.push(error);
-                continue;
-            },
-        };
-
-        let (status, _headers, body) = match res {
-            Ok(r) => r,
-            Err(err) => {
-                errors.push(err.to_string());
-                continue;
-            },
-        };
-
-        event_handlers.on_incoming_response(&body);
-
-        if !status.is_success() {
-            errors.push(ERRL!(
-                "Server '{}' response !200: {}, {}",
-                uri,
-                status,
-                binprint(&body, b'.')
-            ));
-            continue;
-        }
-
-        return single_response(body, &uri.to_string());
-    }
-    Err(request_failed_error(&request, &errors))
-}
-
-#[cfg(target_arch = "wasm32")]
-async fn send_request(
-    request: Call,
-    uris: Vec<http::Uri>,
-    event_handlers: Vec<RpcTransportEventHandlerShared>,
-) -> Result<Json, Error> {
-    let request_payload = to_string(&request);
-
-    let mut transport_errors = Vec::new();
-    for uri in uris {
-        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());
-            },
-            Err(e) => return Err(e),
-        }
-    }
-
-    Err(request_failed_error(&request, &transport_errors))
-}
-
-#[cfg(target_arch = "wasm32")]
-async fn send_request_once(
-    request_payload: String,
-    uri: &http::Uri,
-    event_handlers: &Vec<RpcTransportEventHandlerShared>,
-) -> Result<Json, Error> {
-    use mm2_net::wasm_http::FetchRequest;
-
-    macro_rules! try_or {
-        ($exp:expr, $errkind:ident) => {
-            match $exp {
-                Ok(x) => x,
-                Err(e) => return Err(Error::from(ErrorKind::$errkind(ERRL!("{:?}", e)))),
-            }
-        };
-    }
-
-    // account for outgoing traffic
-    event_handlers.on_outgoing_request(request_payload.as_bytes());
-
-    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
-        ))));
-    }
-
-    // account for incoming traffic
-    event_handlers.on_incoming_response(response_str.as_bytes());
-
-    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(
-            "Expected single, got batch.".to_owned(),
-        ))),
-    }
-}
-
-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/eth/web3_transport/http_transport.rs b/mm2src/coins/eth/web3_transport/http_transport.rs
new file mode 100644
index 0000000000..5272974310
--- /dev/null
+++ b/mm2src/coins/eth/web3_transport/http_transport.rs
@@ -0,0 +1,334 @@
+use crate::eth::{web3_transport::Web3SendOut, EthCoin, GuiAuthMessages, RpcTransportEventHandler,
+                 RpcTransportEventHandlerShared, Web3RpcError};
+use common::APPLICATION_JSON;
+use futures::lock::Mutex as AsyncMutex;
+use http::header::CONTENT_TYPE;
+use jsonrpc_core::{Call, Response};
+use mm2_net::transport::{GuiAuthValidation, GuiAuthValidationGenerator};
+use serde_json::Value as Json;
+#[cfg(not(target_arch = "wasm32"))] use std::ops::Deref;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use web3::error::{Error, TransportError};
+use web3::helpers::{build_request, to_result_from_output, to_string};
+use web3::{RequestId, Transport};
+
+#[derive(Serialize, Clone)]
+pub struct AuthPayload<'a> {
+    #[serde(flatten)]
+    pub request: &'a Call,
+    pub signed_message: GuiAuthValidation,
+}
+
+/// 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, rpc_url: &str) -> Result<Json, Error> {
+    let response =
+        serde_json::from_slice(&response).map_err(|e| Error::InvalidResponse(format!("{}: {}", rpc_url, e)))?;
+
+    match response {
+        Response::Single(output) => to_result_from_output(output),
+        _ => Err(Error::InvalidResponse("Expected single, got batch.".into())),
+    }
+}
+
+#[derive(Debug)]
+struct HttpTransportRpcClient(AsyncMutex<HttpTransportRpcClientImpl>);
+
+#[derive(Debug)]
+struct HttpTransportRpcClientImpl {
+    nodes: Vec<HttpTransportNode>,
+}
+
+#[derive(Clone, Debug)]
+pub struct HttpTransport {
+    id: Arc<AtomicUsize>,
+    client: Arc<HttpTransportRpcClient>,
+    event_handlers: Vec<RpcTransportEventHandlerShared>,
+    pub(crate) gui_auth_validation_generator: Option<GuiAuthValidationGenerator>,
+}
+
+#[derive(Clone, Debug)]
+pub struct HttpTransportNode {
+    pub(crate) uri: http::Uri,
+    pub(crate) gui_auth: bool,
+}
+
+impl HttpTransport {
+    #[cfg(test)]
+    #[inline]
+    pub fn new(nodes: Vec<HttpTransportNode>) -> Self {
+        let client_impl = HttpTransportRpcClientImpl { nodes };
+        HttpTransport {
+            id: Arc::new(AtomicUsize::new(0)),
+            client: Arc::new(HttpTransportRpcClient(AsyncMutex::new(client_impl))),
+            event_handlers: Default::default(),
+            gui_auth_validation_generator: None,
+        }
+    }
+
+    #[inline]
+    pub fn with_event_handlers(
+        nodes: Vec<HttpTransportNode>,
+        event_handlers: Vec<RpcTransportEventHandlerShared>,
+    ) -> Self {
+        let client_impl = HttpTransportRpcClientImpl { nodes };
+        HttpTransport {
+            id: Arc::new(AtomicUsize::new(0)),
+            client: Arc::new(HttpTransportRpcClient(AsyncMutex::new(client_impl))),
+            event_handlers,
+            gui_auth_validation_generator: None,
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn single_node(url: &'static str, gui_auth: bool) -> Self {
+        let nodes = vec![HttpTransportNode {
+            uri: url.parse().unwrap(),
+            gui_auth,
+        }];
+        let client_impl = HttpTransportRpcClientImpl { nodes };
+
+        HttpTransport {
+            id: Arc::new(AtomicUsize::new(0)),
+            client: Arc::new(HttpTransportRpcClient(AsyncMutex::new(client_impl))),
+            event_handlers: Default::default(),
+            gui_auth_validation_generator: None,
+        }
+    }
+}
+
+impl Transport for HttpTransport {
+    type Out = Web3SendOut;
+
+    fn prepare(&self, method: &str, params: Vec<Json>) -> (RequestId, Call) {
+        let id = self.id.fetch_add(1, Ordering::AcqRel);
+        let request = build_request(id, method, params);
+
+        (id, request)
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn send(&self, _id: RequestId, request: Call) -> Self::Out {
+        Box::pin(send_request(
+            request,
+            self.client.clone(),
+            self.event_handlers.clone(),
+            self.gui_auth_validation_generator.clone(),
+        ))
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    fn send(&self, _id: RequestId, request: Call) -> Self::Out {
+        Box::pin(send_request(
+            request,
+            self.client.clone(),
+            self.event_handlers.clone(),
+            self.gui_auth_validation_generator.clone(),
+        ))
+    }
+}
+
+/// Generates a signed message and inserts it into request
+/// payload if gui_auth is activated. Returns false on errors.
+fn handle_gui_auth_payload_if_activated(
+    gui_auth_validation_generator: &Option<GuiAuthValidationGenerator>,
+    node: &HttpTransportNode,
+    request: &Call,
+) -> Result<Option<String>, Web3RpcError> {
+    if !node.gui_auth {
+        return Ok(None);
+    }
+
+    let generator = match gui_auth_validation_generator.clone() {
+        Some(gen) => gen,
+        None => {
+            return Err(Web3RpcError::Internal(format!(
+                "GuiAuthValidationGenerator is not provided for {:?} node",
+                node
+            )));
+        },
+    };
+
+    let signed_message = match EthCoin::generate_gui_auth_signed_validation(generator) {
+        Ok(t) => t,
+        Err(e) => {
+            return Err(Web3RpcError::Internal(format!(
+                "GuiAuth signed message generation failed for {:?} node, error: {:?}",
+                node, e
+            )));
+        },
+    };
+
+    let auth_request = AuthPayload {
+        request,
+        signed_message,
+    };
+
+    Ok(Some(to_string(&auth_request)))
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+async fn send_request(
+    request: Call,
+    client: Arc<HttpTransportRpcClient>,
+    event_handlers: Vec<RpcTransportEventHandlerShared>,
+    gui_auth_validation_generator: Option<GuiAuthValidationGenerator>,
+) -> Result<Json, Error> {
+    use common::executor::Timer;
+    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();
+
+    let serialized_request = to_string(&request);
+
+    let mut client_impl = client.0.lock().await;
+
+    for (i, node) in client_impl.nodes.clone().iter().enumerate() {
+        let serialized_request =
+            match handle_gui_auth_payload_if_activated(&gui_auth_validation_generator, node, &request) {
+                Ok(Some(r)) => r,
+                Ok(None) => serialized_request.clone(),
+                Err(e) => {
+                    errors.push(e);
+                    continue;
+                },
+            };
+
+        event_handlers.on_outgoing_request(serialized_request.as_bytes());
+
+        let mut req = http::Request::new(serialized_request.clone().into_bytes());
+        *req.method_mut() = http::Method::POST;
+        *req.uri_mut() = node.uri.clone();
+        req.headers_mut()
+            .insert(CONTENT_TYPE, HeaderValue::from_static(APPLICATION_JSON));
+        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)) => {
+                let error = format!(
+                    "Error requesting '{}': {}s timeout expired",
+                    node.uri, REQUEST_TIMEOUT_S
+                );
+                warn!("{}", error);
+                errors.push(Web3RpcError::Transport(error));
+                continue;
+            },
+        };
+
+        let (status, _headers, body) = match res {
+            Ok(r) => r,
+            Err(err) => {
+                errors.push(Web3RpcError::Transport(err.to_string()));
+                continue;
+            },
+        };
+
+        event_handlers.on_incoming_response(&body);
+
+        if !status.is_success() {
+            errors.push(Web3RpcError::Transport(format!(
+                "Server '{:?}' response !200: {}, {}",
+                node,
+                status,
+                binprint(&body, b'.')
+            )));
+            continue;
+        }
+
+        client_impl.nodes.rotate_left(i);
+
+        return single_response(body, &node.uri.to_string());
+    }
+
+    Err(request_failed_error(&request, &errors))
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn send_request(
+    request: Call,
+    client: Arc<HttpTransportRpcClient>,
+    event_handlers: Vec<RpcTransportEventHandlerShared>,
+    gui_auth_validation_generator: Option<GuiAuthValidationGenerator>,
+) -> Result<Json, Error> {
+    let serialized_request = to_string(&request);
+
+    let mut transport_errors = Vec::new();
+    let mut client_impl = client.0.lock().await;
+
+    for (i, node) in client_impl.nodes.clone().iter().enumerate() {
+        let serialized_request =
+            match handle_gui_auth_payload_if_activated(&gui_auth_validation_generator, node, &request) {
+                Ok(Some(r)) => r,
+                Ok(None) => serialized_request.clone(),
+                Err(e) => {
+                    transport_errors.push(e);
+                    continue;
+                },
+            };
+
+        match send_request_once(serialized_request.clone(), &node.uri, &event_handlers).await {
+            Ok(response_json) => {
+                client_impl.nodes.rotate_left(i);
+                return Ok(response_json);
+            },
+            Err(Error::Transport(e)) => {
+                transport_errors.push(Web3RpcError::Transport(e.to_string()));
+            },
+            Err(e) => return Err(e),
+        }
+    }
+
+    Err(request_failed_error(&request, &transport_errors))
+}
+
+#[cfg(target_arch = "wasm32")]
+async fn send_request_once(
+    request_payload: String,
+    uri: &http::Uri,
+    event_handlers: &Vec<RpcTransportEventHandlerShared>,
+) -> Result<Json, Error> {
+    use http::header::ACCEPT;
+    use mm2_net::wasm_http::FetchRequest;
+
+    // account for outgoing traffic
+    event_handlers.on_outgoing_request(request_payload.as_bytes());
+
+    let (status_code, response_str) = FetchRequest::post(&uri.to_string())
+        .cors()
+        .body_utf8(request_payload)
+        .header(ACCEPT.as_str(), APPLICATION_JSON)
+        .header(CONTENT_TYPE.as_str(), APPLICATION_JSON)
+        .request_str()
+        .await
+        .map_err(|e| Error::Transport(TransportError::Message(ERRL!("{:?}", e))))?;
+
+    if !status_code.is_success() {
+        let err = ERRL!("!200: {}, {}", status_code, response_str);
+        return Err(Error::Transport(TransportError::Message(err)));
+    }
+
+    // account for incoming traffic
+    event_handlers.on_incoming_response(response_str.as_bytes());
+
+    let response: Response = serde_json::from_str(&response_str).map_err(|e| Error::InvalidResponse(e.to_string()))?;
+    match response {
+        Response::Single(output) => to_result_from_output(output),
+        Response::Batch(_) => Err(Error::InvalidResponse("Expected single, got batch.".to_owned())),
+    }
+}
+
+fn request_failed_error(request: &Call, errors: &[Web3RpcError]) -> Error {
+    let errors: String = errors.iter().map(|e| format!("{:?}; ", e)).collect();
+    let error = format!("request {:?} failed: {}", request, errors);
+    Error::Transport(TransportError::Message(error))
+}
diff --git a/mm2src/coins/eth/web3_transport/metamask_transport.rs b/mm2src/coins/eth/web3_transport/metamask_transport.rs
new file mode 100644
index 0000000000..5fe71d8dc2
--- /dev/null
+++ b/mm2src/coins/eth/web3_transport/metamask_transport.rs
@@ -0,0 +1,77 @@
+use crate::eth::web3_transport::Web3SendOut;
+use crate::RpcTransportEventHandlerShared;
+use jsonrpc_core::Call;
+use mm2_metamask::{detect_metamask_provider, Eip1193Provider, MetamaskResult, MetamaskSession};
+use serde_json::Value as Json;
+use std::fmt;
+use std::sync::Arc;
+use web3::{RequestId, Transport};
+
+pub(crate) struct MetamaskEthConfig {
+    /// The `ChainId` that the MetaMask wallet should be targeted on each RPC.
+    pub chain_id: u64,
+}
+
+#[derive(Clone)]
+pub(crate) struct MetamaskTransport {
+    inner: Arc<MetamaskTransportInner>,
+}
+
+struct MetamaskTransportInner {
+    eth_config: MetamaskEthConfig,
+    eip1193: Eip1193Provider,
+    // TODO use `event_handlers` properly.
+    _event_handlers: Vec<RpcTransportEventHandlerShared>,
+}
+
+impl MetamaskTransport {
+    pub fn detect(
+        eth_config: MetamaskEthConfig,
+        event_handlers: Vec<RpcTransportEventHandlerShared>,
+    ) -> MetamaskResult<MetamaskTransport> {
+        let eip1193 = detect_metamask_provider()?;
+        let inner = MetamaskTransportInner {
+            eth_config,
+            eip1193,
+            _event_handlers: event_handlers,
+        };
+        Ok(MetamaskTransport { inner: Arc::new(inner) })
+    }
+}
+
+impl Transport for MetamaskTransport {
+    type Out = Web3SendOut;
+
+    fn prepare(&self, method: &str, params: Vec<Json>) -> (RequestId, Call) {
+        self.inner.eip1193.prepare(method, params)
+    }
+
+    fn send(&self, id: RequestId, request: Call) -> Self::Out {
+        let selfi = self.clone();
+        let fut = async move { selfi.send_impl(id, request).await };
+        Box::pin(fut)
+    }
+}
+
+impl fmt::Debug for MetamaskTransport {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "MetamaskTransport") }
+}
+
+impl MetamaskTransport {
+    async fn send_impl(&self, id: RequestId, request: Call) -> Result<Json, web3::Error> {
+        // Hold the mutex guard until the request is finished.
+        let _rpc_lock = self.request_preparation().await?;
+        self.inner.eip1193.send(id, request).await
+    }
+
+    /// Ensures that the MetaMask wallet is targeted to [`EthConfig::chain_id`].
+    async fn request_preparation(&self) -> Result<MetamaskSession<'_>, web3::Error> {
+        // Lock the MetaMask session and keep it until the RPC is finished.
+        let metamask_session = MetamaskSession::lock(&self.inner.eip1193).await;
+        metamask_session
+            .wallet_switch_ethereum_chain(self.inner.eth_config.chain_id)
+            .await?;
+
+        Ok(metamask_session)
+    }
+}
diff --git a/mm2src/coins/eth/web3_transport/mod.rs b/mm2src/coins/eth/web3_transport/mod.rs
new file mode 100644
index 0000000000..f8b7d62fbd
--- /dev/null
+++ b/mm2src/coins/eth/web3_transport/mod.rs
@@ -0,0 +1,129 @@
+use crate::RpcTransportEventHandlerShared;
+use ethereum_types::U256;
+use futures::future::BoxFuture;
+use jsonrpc_core::Call;
+#[cfg(target_arch = "wasm32")] use mm2_metamask::MetamaskResult;
+use mm2_net::transport::GuiAuthValidationGenerator;
+use serde_json::Value as Json;
+use serde_json::Value;
+use web3::api::Namespace;
+use web3::helpers::{self, CallFuture};
+use web3::types::BlockNumber;
+use web3::{Error, RequestId, Transport};
+
+pub(crate) mod http_transport;
+#[cfg(target_arch = "wasm32")] pub(crate) mod metamask_transport;
+
+type Web3SendOut = BoxFuture<'static, Result<Json, Error>>;
+
+#[derive(Clone, Debug)]
+pub(crate) enum Web3Transport {
+    Http(http_transport::HttpTransport),
+    #[cfg(target_arch = "wasm32")]
+    Metamask(metamask_transport::MetamaskTransport),
+}
+
+impl Web3Transport {
+    pub fn new_http(
+        nodes: Vec<http_transport::HttpTransportNode>,
+        event_handlers: Vec<RpcTransportEventHandlerShared>,
+    ) -> Web3Transport {
+        http_transport::HttpTransport::with_event_handlers(nodes, event_handlers).into()
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub(crate) fn new_metamask(
+        eth_config: metamask_transport::MetamaskEthConfig,
+        event_handlers: Vec<RpcTransportEventHandlerShared>,
+    ) -> MetamaskResult<Web3Transport> {
+        Ok(metamask_transport::MetamaskTransport::detect(eth_config, event_handlers)?.into())
+    }
+
+    #[cfg(test)]
+    pub fn with_nodes(nodes: Vec<http_transport::HttpTransportNode>) -> Web3Transport {
+        http_transport::HttpTransport::new(nodes).into()
+    }
+
+    #[allow(dead_code)]
+    pub fn single_node(url: &'static str, gui_auth: bool) -> Self {
+        http_transport::HttpTransport::single_node(url, gui_auth).into()
+    }
+
+    pub fn gui_auth_validation_generator_as_mut(&mut self) -> Option<&mut GuiAuthValidationGenerator> {
+        match self {
+            Web3Transport::Http(http) => http.gui_auth_validation_generator.as_mut(),
+            #[cfg(target_arch = "wasm32")]
+            Web3Transport::Metamask(_) => None,
+        }
+    }
+}
+
+impl Transport for Web3Transport {
+    type Out = Web3SendOut;
+
+    fn prepare(&self, method: &str, params: Vec<Value>) -> (RequestId, Call) {
+        match self {
+            Web3Transport::Http(http) => http.prepare(method, params),
+            #[cfg(target_arch = "wasm32")]
+            Web3Transport::Metamask(metamask) => metamask.prepare(method, params),
+        }
+    }
+
+    fn send(&self, id: RequestId, request: Call) -> Self::Out {
+        match self {
+            Web3Transport::Http(http) => http.send(id, request),
+            #[cfg(target_arch = "wasm32")]
+            Web3Transport::Metamask(metamask) => metamask.send(id, request),
+        }
+    }
+}
+
+impl From<http_transport::HttpTransport> for Web3Transport {
+    fn from(http: http_transport::HttpTransport) -> Self { Web3Transport::Http(http) }
+}
+
+#[cfg(target_arch = "wasm32")]
+impl From<metamask_transport::MetamaskTransport> for Web3Transport {
+    fn from(metamask: metamask_transport::MetamaskTransport) -> Self { Web3Transport::Metamask(metamask) }
+}
+
+/// eth_feeHistory support is missing even in the latest rust-web3
+/// It's the custom namespace implementing it
+#[derive(Debug, Clone)]
+pub struct EthFeeHistoryNamespace<T> {
+    transport: T,
+}
+
+impl<T: Transport> Namespace<T> for EthFeeHistoryNamespace<T> {
+    fn new(transport: T) -> Self
+    where
+        Self: Sized,
+    {
+        Self { transport }
+    }
+
+    fn transport(&self) -> &T { &self.transport }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct FeeHistoryResult {
+    #[serde(rename = "oldestBlock")]
+    pub oldest_block: U256,
+    #[serde(rename = "baseFeePerGas")]
+    pub base_fee_per_gas: Vec<U256>,
+}
+
+impl<T: Transport> EthFeeHistoryNamespace<T> {
+    pub fn eth_fee_history(
+        &self,
+        count: U256,
+        block: BlockNumber,
+        reward_percentiles: &[f64],
+    ) -> CallFuture<FeeHistoryResult, T::Out> {
+        let count = helpers::serialize(&count);
+        let block = helpers::serialize(&block);
+        let reward_percentiles = helpers::serialize(&reward_percentiles);
+        let params = vec![count, block, reward_percentiles];
+        CallFuture::new(self.transport.execute("eth_feeHistory", params))
+    }
+}
diff --git a/mm2src/coins/for_tests/MORTY_HD_tx_history_fixtures.json b/mm2src/coins/for_tests/MORTY_HD_tx_history_fixtures.json
new file mode 100644
index 0000000000..1d35ebcfaa
--- /dev/null
+++ b/mm2src/coins/for_tests/MORTY_HD_tx_history_fixtures.json
@@ -0,0 +1,131 @@
+[
+  {
+    "tx_hex": "0400008085202f890189cb3d4e9d36a7c2c6bb1b76dcfc1ee7c9d3d83b364c50a3f3a791c5efb6f392030000006b483045022100a0b910ecbf5ed1c473507c3e1a5a06ad612c982d3204d2dc066bfbbeb39c5e400220559a82d151cbcdcb097786127f499863e0864662519a9caf758c929f1659bc34012102d09f2cb1693be9c0ea73bb48d45ce61805edd1c43590681b02f877206078a5b3ffffffff0400e1f505000000001976a914ab19b1f2bd2337a58c1b5d198468951ac42d796788ac00c2eb0b000000001976a914ab19b1f2bd2337a58c1b5d198468951ac42d796788aca01f791c000000001976a914ab19b1f2bd2337a58c1b5d198468951ac42d796788ac3091cce2e80000001976a91490a0d8ba62c339ade97a14e81b6f531de03fdbb288ac00000000000000000000000000000000000000",
+    "tx_hash": "6ca27dd058b939c98a33625b9f68eaeebca5a3058aec062647ca6fd7634bb339",
+    "from": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB"
+    ],
+    "to": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB",
+      "RQstQeTUEZLh6c3YWJDkeVTTQoZUsfvNCr"
+    ],
+    "total_amount": "10010.1518",
+    "spent_by_me": "0",
+    "received_by_me": "7.777",
+    "my_balance_change": "7.777",
+    "block_height": 1629306,
+    "timestamp": 1663619097,
+    "fee_details": {
+      "type": "Utxo",
+      "coin": "MORTY",
+      "amount": "0.0001"
+    },
+    "coin": "MORTY",
+    "internal_id": "6ca27dd058b939c98a33625b9f68eaeebca5a3058aec062647ca6fd7634bb339",
+    "transaction_type": "StandardTransfer",
+    "confirmations": 4
+  },
+  {
+    "tx_hex": "0400008085202f89011b8746195a7e80172d948e1eb7f2d6710bd2ecbe7750e653bb8d345b940da55b030000006a4730440220482c7a7762977ed3a8afcf751b7413d5ef978f604e550eb4fd35199e1f4d52400220486fb4f3831a7f512dba1271a4f793e7050ea123bcb4922e3848bb18c7cac4c4012102d09f2cb1693be9c0ea73bb48d45ce61805edd1c43590681b02f877206078a5b3ffffffff0400e1f505000000001976a914bd658bdd369c8bb98ac837071639819e5f8dd3cb88ac00c2eb0b000000001976a914bd658bdd369c8bb98ac837071639819e5f8dd3cb88aca01f791c000000001976a914bd658bdd369c8bb98ac837071639819e5f8dd3cb88acf037389ce90000001976a91490a0d8ba62c339ade97a14e81b6f531de03fdbb288ac00000000000000000000000000000000000000",
+    "tx_hash": "70c62f42d65f9d71a8fb7f4560057b80dc2ecd9e4990621323faf1de9a53ca97",
+    "from": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB"
+    ],
+    "to": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB",
+      "RSYdSLRYWuzBson2GDbWBa632q2PmFnCaH"
+    ],
+    "total_amount": "10041.2602",
+    "spent_by_me": "0",
+    "received_by_me": "7.777",
+    "my_balance_change": "7.777",
+    "block_height": 1617702,
+    "timestamp": 1662914954,
+    "fee_details": {
+      "type": "Utxo",
+      "coin": "MORTY",
+      "amount": "0.0001"
+    },
+    "coin": "MORTY",
+    "internal_id": "70c62f42d65f9d71a8fb7f4560057b80dc2ecd9e4990621323faf1de9a53ca97",
+    "transaction_type": "StandardTransfer",
+    "confirmations": 11603
+  },
+  {
+    "tx_hex": "0400008085202f890175fb4250e95dc0c89cd89a9487324aa8dd7a2f8fd8581fc90881567ca6be02bf000000006b483045022100be3e58c5d4dbe5ea35ab831d610b42bb1ae01fc0df1786f11cbe6969d8d45c6302207b8747b4012a6c4aefecf670eaf8d787445909ebd7775b85c77d723e9d6445a8012103f7f831c6fbe62b987e4b2f455e5b7f27375cf59b57eb3ffa9e122b2c9b395f6bffffffff0200e1f505000000001976a914c23136f831b15dd4522eb1c6eb4c5cd3abbfbe3b88aca8b66428000000001976a914bd658bdd369c8bb98ac837071639819e5f8dd3cb88ac00000000000000000000000000000000000000",
+    "tx_hash": "bd031dc681cdc63491fd71902c5960985127b04eb02211a1049bff0d0c8ebce3",
+    "from": [
+      "RPj9JXUVnewWwVpxZDeqGB25qVqz5qJzwP"
+    ],
+    "to": [
+      "RSYdSLRYWuzBson2GDbWBa632q2PmFnCaH",
+      "RSyz8EJaTzhkT6uZinAtHhFu5bfsvqcLqg"
+    ],
+    "total_amount": "7.77699",
+    "spent_by_me": "7.77699",
+    "received_by_me": "6.77689",
+    "my_balance_change": "-1.00010",
+    "block_height": 1499070,
+    "timestamp": 1655738171,
+    "fee_details": {
+      "type": "Utxo",
+      "coin": "MORTY",
+      "amount": "0.0001"
+    },
+    "coin": "MORTY",
+    "internal_id": "bd031dc681cdc63491fd71902c5960985127b04eb02211a1049bff0d0c8ebce3",
+    "transaction_type": "StandardTransfer",
+    "confirmations": 130235
+  },
+  {
+    "tx_hex": "0400008085202f89038dea273bcc9194a80b19ea1a8ca076d3d00c590b4571808f10f3eee5aa38c07d000000006b483045022100ff31b7c36145dc9fa06346fe38b75b81273b41b7d236b900322154ba136799bb02204ddd253eb93e95c9d24f8e36a8a5a42022c63d6edd81c453f24cbb5db785037d012102d6a78b71b10459bd0757a614ca1eef62f4a65514225d10e95df31ee9cb23ffd5ffffffff8dea273bcc9194a80b19ea1a8ca076d3d00c590b4571808f10f3eee5aa38c07d010000006a47304402202d3e0fd3ce7b4753725adc0175a050c919f93b564682ffd8d65974c15996b3560220211b8120acb3ad80dbdd9160f639884f0e15c0c5703c86c069b3abe85cb6c4fd012102d6a78b71b10459bd0757a614ca1eef62f4a65514225d10e95df31ee9cb23ffd5ffffffff8dea273bcc9194a80b19ea1a8ca076d3d00c590b4571808f10f3eee5aa38c07d020000006b483045022100c788b064db34e961479393bad19d8c5f7d437b02c64c3172381fbe2b7d104efd022027167b2e5a6f29a7567e43b39a3d5b8f50c20767162ec29328067a6fcbd87409012102d6a78b71b10459bd0757a614ca1eef62f4a65514225d10e95df31ee9cb23ffd5ffffffff01b8be5a2e000000001976a9149e7a424abb2f341d655ce6af1143409edef4d55588acbdb1d661000000000000000000000000000000",
+    "tx_hash": "bf02bea67c568108c91f58d88f2f7adda84a3287949ad89cc8c05de95042fb75",
+    "from": [
+      "RYM6yDMn8vdqtkYKLzY5dNe7p3T6YmMWvq"
+    ],
+    "to": [
+      "RPj9JXUVnewWwVpxZDeqGB25qVqz5qJzwP"
+    ],
+    "total_amount": "7.777",
+    "spent_by_me": "7.777",
+    "received_by_me": "7.77699",
+    "my_balance_change": "-0.00001",
+    "block_height": 1263905,
+    "timestamp": 1641460263,
+    "fee_details": {
+      "type": "Utxo",
+      "coin": "MORTY",
+      "amount": "0.00001"
+    },
+    "coin": "MORTY",
+    "internal_id": "bf02bea67c568108c91f58d88f2f7adda84a3287949ad89cc8c05de95042fb75",
+    "transaction_type": "StandardTransfer",
+    "confirmations": 365400
+  },
+  {
+    "tx_hex": "0400008085202f8901fe0ccc272929c811b20ab910f5478a99229a5304480b5897cf9507149a044c63030000006b483045022100c5b24fbd1ce11736760ebc0edccad6bde2dcbbff090528db4602a485a5ec645f02201340e5f818b9d7ab75e39abaacaa5d94c03fdb8e41698182eeff389a45c5ad15012102d09f2cb1693be9c0ea73bb48d45ce61805edd1c43590681b02f877206078a5b3ffffffff0400e1f505000000001976a914fd084ad97ae0313bba5717acedfba629b8bd426988ac00c2eb0b000000001976a914fd084ad97ae0313bba5717acedfba629b8bd426988aca01f791c000000001976a914fd084ad97ae0313bba5717acedfba629b8bd426988ac40053045260100001976a91490a0d8ba62c339ade97a14e81b6f531de03fdbb288ac00000000000000000000000000000000000000",
+    "tx_hash": "7dc038aae5eef3108f8071450b590cd0d376a08c1aea190ba89491cc3b27ea8d",
+    "from": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB"
+    ],
+    "to": [
+      "RNTv4xTLLm26p3SvsQCBy9qNK7s1RgGYSB",
+      "RYM6yDMn8vdqtkYKLzY5dNe7p3T6YmMWvq"
+    ],
+    "total_amount": "12646.5887",
+    "spent_by_me": "0",
+    "received_by_me": "7.777",
+    "my_balance_change": "7.777",
+    "block_height": 1263875,
+    "timestamp": 1641458818,
+    "fee_details": {
+      "type": "Utxo",
+      "coin": "MORTY",
+      "amount": "0.0001"
+    },
+    "coin": "MORTY",
+    "internal_id": "7dc038aae5eef3108f8071450b590cd0d376a08c1aea190ba89491cc3b27ea8d",
+    "transaction_type": "StandardTransfer",
+    "confirmations": 365430
+  }
+]
\ No newline at end of file
diff --git a/mm2src/coins/hd_confirm_address.rs b/mm2src/coins/hd_confirm_address.rs
new file mode 100644
index 0000000000..d6ee019855
--- /dev/null
+++ b/mm2src/coins/hd_confirm_address.rs
@@ -0,0 +1,184 @@
+use async_trait::async_trait;
+use bip32::DerivationPath;
+use crypto::hw_rpc_task::HwConnectStatuses;
+use crypto::trezor::trezor_rpc_task::{TrezorRequestStatuses, TrezorRpcTaskProcessor, TryIntoUserAction};
+use crypto::trezor::{ProcessTrezorResponse, TrezorError, TrezorProcessingError};
+use crypto::{CryptoCtx, CryptoCtxError, HardwareWalletArc, HwError, HwProcessingError};
+use enum_from::{EnumFromInner, EnumFromStringify};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle};
+
+const SHOW_ADDRESS_ON_DISPLAY: bool = true;
+
+#[derive(EnumFromInner, EnumFromStringify)]
+pub enum HDConfirmAddressError {
+    HwContextNotInitialized,
+    RpcTaskError(RpcTaskError),
+    #[from_inner]
+    HardwareWalletError(HwError),
+    InvalidAddress {
+        expected: String,
+        found: String,
+    },
+    #[from_stringify("CryptoCtxError")]
+    Internal(String),
+}
+
+impl From<TrezorError> for HDConfirmAddressError {
+    fn from(e: TrezorError) -> Self { HDConfirmAddressError::HardwareWalletError(HwError::from(e)) }
+}
+
+impl From<TrezorProcessingError<RpcTaskError>> for HDConfirmAddressError {
+    fn from(e: TrezorProcessingError<RpcTaskError>) -> Self {
+        match e {
+            TrezorProcessingError::TrezorError(trezor) => HDConfirmAddressError::from(HwError::from(trezor)),
+            TrezorProcessingError::ProcessorError(rpc) => HDConfirmAddressError::RpcTaskError(rpc),
+        }
+    }
+}
+
+impl From<HwProcessingError<RpcTaskError>> for HDConfirmAddressError {
+    fn from(e: HwProcessingError<RpcTaskError>) -> Self {
+        match e {
+            HwProcessingError::HwError(hw) => HDConfirmAddressError::from(hw),
+            HwProcessingError::ProcessorError(rpc) => HDConfirmAddressError::RpcTaskError(rpc),
+        }
+    }
+}
+
+/// An `InProgress` status constructor.
+pub trait ConfirmAddressStatus: Sized {
+    /// Returns an `InProgress` RPC status that will be used to ask the user
+    /// to confirm an `address` on his HW device.
+    fn confirm_addr_status(address: String) -> Self;
+}
+
+/// An address confirmation interface.
+#[async_trait]
+pub trait HDConfirmAddress: Sync {
+    /// Asks the user to confirm if the given `expected_address` is the same as on the HW display.
+    async fn confirm_utxo_address(
+        &self,
+        trezor_utxo_coin: String,
+        derivation_path: DerivationPath,
+        expected_address: String,
+    ) -> MmResult<(), HDConfirmAddressError>;
+}
+
+pub enum RpcTaskConfirmAddress<'task, Task: RpcTask> {
+    Trezor {
+        hw_ctx: HardwareWalletArc,
+        task_handle: &'task RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    },
+}
+
+#[async_trait]
+impl<'task, Task> HDConfirmAddress for RpcTaskConfirmAddress<'task, Task>
+where
+    Task: RpcTask,
+    Task::InProgressStatus: ConfirmAddressStatus,
+    Task::UserAction: TryIntoUserAction + Send,
+{
+    async fn confirm_utxo_address(
+        &self,
+        trezor_utxo_coin: String,
+        derivation_path: DerivationPath,
+        expected_address: String,
+    ) -> MmResult<(), HDConfirmAddressError> {
+        match self {
+            RpcTaskConfirmAddress::Trezor {
+                hw_ctx,
+                task_handle,
+                statuses,
+            } => {
+                Self::confirm_utxo_address_with_trezor(
+                    hw_ctx,
+                    task_handle,
+                    statuses,
+                    trezor_utxo_coin,
+                    derivation_path,
+                    expected_address,
+                )
+                .await
+            },
+        }
+    }
+}
+
+impl<'task, Task> RpcTaskConfirmAddress<'task, Task>
+where
+    Task: RpcTask,
+    Task::InProgressStatus: ConfirmAddressStatus,
+    Task::UserAction: TryIntoUserAction + Send,
+{
+    pub fn new(
+        ctx: &MmArc,
+        task_handle: &'task RpcTaskHandle<Task>,
+        statuses: HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+    ) -> MmResult<RpcTaskConfirmAddress<'task, Task>, HDConfirmAddressError> {
+        let crypto_ctx = CryptoCtx::from_ctx(ctx)?;
+        let hw_ctx = crypto_ctx
+            .hw_ctx()
+            .or_mm_err(|| HDConfirmAddressError::HwContextNotInitialized)?;
+        Ok(RpcTaskConfirmAddress::Trezor {
+            hw_ctx,
+            task_handle,
+            statuses,
+        })
+    }
+
+    async fn confirm_utxo_address_with_trezor(
+        hw_ctx: &HardwareWalletArc,
+        task_handle: &RpcTaskHandle<Task>,
+        connect_statuses: &HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
+        trezor_coin: String,
+        derivation_path: DerivationPath,
+        expected_address: String,
+    ) -> MmResult<(), HDConfirmAddressError> {
+        let mut trezor_session = hw_ctx.trezor().await?;
+
+        let confirm_statuses = TrezorRequestStatuses {
+            on_button_request: Task::InProgressStatus::confirm_addr_status(expected_address.clone()),
+            ..connect_statuses.to_trezor_request_statuses()
+        };
+
+        let pubkey_processor = TrezorRpcTaskProcessor::new(task_handle, confirm_statuses);
+        let address = trezor_session
+            .get_utxo_address(derivation_path, trezor_coin, SHOW_ADDRESS_ON_DISPLAY)
+            .await?
+            .process(&pubkey_processor)
+            .await?;
+
+        if address != expected_address {
+            return MmError::err(HDConfirmAddressError::InvalidAddress {
+                expected: expected_address,
+                found: address,
+            });
+        }
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod for_tests {
+    use super::*;
+    use mocktopus::macros::mockable;
+
+    #[derive(Default)]
+    pub struct MockableConfirmAddress;
+
+    #[async_trait]
+    #[mockable]
+    impl HDConfirmAddress for MockableConfirmAddress {
+        async fn confirm_utxo_address(
+            &self,
+            _trezor_utxo_coin: String,
+            _derivation_path: DerivationPath,
+            _expected_address: String,
+        ) -> MmResult<(), HDConfirmAddressError> {
+            unimplemented!()
+        }
+    }
+}
diff --git a/mm2src/coins/hd_pubkey.rs b/mm2src/coins/hd_pubkey.rs
index a90accbc69..9bb122bee1 100644
--- a/mm2src/coins/hd_pubkey.rs
+++ b/mm2src/coins/hd_pubkey.rs
@@ -1,15 +1,16 @@
-use crate::hd_wallet::{HDWalletRpcError, NewAccountCreatingError};
+use crate::hd_wallet::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 crypto::hw_rpc_task::HwConnectStatuses;
+use crypto::trezor::trezor_rpc_task::{TrezorRpcTaskProcessor, TryIntoUserAction};
+use crypto::trezor::utxo::IGNORE_XPUB_MAGIC;
+use crypto::trezor::{ProcessTrezorResponse, TrezorError, TrezorProcessingError};
+use crypto::{CryptoCtx, CryptoCtxError, DerivationPath, EcdsaCurve, HardwareWalletArc, HwError, HwProcessingError,
+             XPub, XPubConverter, XpubError};
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
 use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle};
-use std::convert::TryInto;
+
+const SHOW_PUBKEY_ON_DISPLAY: bool = false;
 
 #[derive(Clone)]
 pub enum HDExtractPubkeyError {
@@ -17,12 +18,12 @@ pub enum HDExtractPubkeyError {
     CoinDoesntSupportTrezor,
     RpcTaskError(RpcTaskError),
     HardwareWalletError(HwError),
-    InvalidXpub(Bip32Error),
+    InvalidXpub(String),
     Internal(String),
 }
 
-impl From<CryptoInitError> for HDExtractPubkeyError {
-    fn from(e: CryptoInitError) -> Self { HDExtractPubkeyError::Internal(e.to_string()) }
+impl From<CryptoCtxError> for HDExtractPubkeyError {
+    fn from(e: CryptoCtxError) -> Self { HDExtractPubkeyError::Internal(e.to_string()) }
 }
 
 impl From<TrezorError> for HDExtractPubkeyError {
@@ -51,6 +52,10 @@ impl From<HwProcessingError<RpcTaskError>> for HDExtractPubkeyError {
     }
 }
 
+impl From<XpubError> for HDExtractPubkeyError {
+    fn from(e: XpubError) -> Self { HDExtractPubkeyError::InvalidXpub(e.to_string()) }
+}
+
 impl From<HDExtractPubkeyError> for NewAccountCreatingError {
     fn from(e: HDExtractPubkeyError) -> Self {
         match e {
@@ -66,19 +71,6 @@ impl From<HDExtractPubkeyError> for NewAccountCreatingError {
     }
 }
 
-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;
@@ -89,14 +81,14 @@ pub trait ExtractExtendedPubkey {
         derivation_path: DerivationPath,
     ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
     where
-        XPubExtractor: HDXPubExtractor + Sync;
+        XPubExtractor: HDXPubExtractor;
 }
 
 #[async_trait]
-pub trait HDXPubExtractor {
+pub trait HDXPubExtractor: Sync {
     async fn extract_utxo_xpub(
         &self,
-        trezor_utxo_coin: TrezorUtxoCoin,
+        trezor_utxo_coin: String,
         derivation_path: DerivationPath,
     ) -> MmResult<XPub, HDExtractPubkeyError>;
 }
@@ -113,11 +105,11 @@ pub enum RpcTaskXPubExtractor<'task, Task: RpcTask> {
 impl<'task, Task> HDXPubExtractor for RpcTaskXPubExtractor<'task, Task>
 where
     Task: RpcTask,
-    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+    Task::UserAction: TryIntoUserAction + Send,
 {
     async fn extract_utxo_xpub(
         &self,
-        trezor_utxo_coin: TrezorUtxoCoin,
+        trezor_utxo_coin: String,
         derivation_path: DerivationPath,
     ) -> MmResult<XPub, HDExtractPubkeyError> {
         match self {
@@ -136,7 +128,7 @@ where
 impl<'task, Task> RpcTaskXPubExtractor<'task, Task>
 where
     Task: RpcTask,
-    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+    Task::UserAction: TryIntoUserAction + Send,
 {
     pub fn new(
         ctx: &MmArc,
@@ -167,20 +159,28 @@ where
         hw_ctx: &HardwareWalletArc,
         task_handle: &RpcTaskHandle<Task>,
         statuses: &HwConnectStatuses<Task::InProgressStatus, Task::AwaitingStatus>,
-        trezor_coin: TrezorUtxoCoin,
+        trezor_coin: String,
         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 mut trezor_session = hw_ctx.trezor().await?;
 
         let pubkey_processor = TrezorRpcTaskProcessor::new(task_handle, statuses.to_trezor_request_statuses());
-        trezor_session
-            .get_public_key(derivation_path, trezor_coin, EcdsaCurve::Secp256k1)
+        let xpub = trezor_session
+            .get_public_key(
+                derivation_path,
+                trezor_coin,
+                EcdsaCurve::Secp256k1,
+                SHOW_PUBKEY_ON_DISPLAY,
+                IGNORE_XPUB_MAGIC,
+            )
             .await?
             .process(&pubkey_processor)
-            .await
-            .mm_err(HDExtractPubkeyError::from)
+            .await?;
+
+        // Despite we pass `IGNORE_XPUB_MAGIC` to the [`TrezorSession::get_public_key`] method,
+        // Trezor sometimes returns pubkeys with magic prefixes like `dgub` prefix for DOGE coin.
+        // So we need to replace the magic prefix manually.
+        XPubConverter::replace_magic_prefix(xpub).mm_err(HDExtractPubkeyError::from)
     }
 }
 
@@ -196,7 +196,7 @@ where
 {
     async fn extract_utxo_xpub(
         &self,
-        trezor_utxo_coin: TrezorUtxoCoin,
+        trezor_utxo_coin: String,
         derivation_path: DerivationPath,
     ) -> MmResult<XPub, HDExtractPubkeyError> {
         self.0
diff --git a/mm2src/coins/hd_wallet.rs b/mm2src/coins/hd_wallet.rs
index cb365a01e5..6124393ef1 100644
--- a/mm2src/coins/hd_wallet.rs
+++ b/mm2src/coins/hd_wallet.rs
@@ -1,20 +1,16 @@
-use crate::coin_balance::HDAddressBalance;
+use crate::hd_confirm_address::{HDConfirmAddress, HDConfirmAddressError};
 use crate::hd_pubkey::HDXPubExtractor;
 use crate::hd_wallet_storage::HDWalletStorageError;
-use crate::{lp_coinfind_or_err, BalanceError, CoinFindError, CoinWithDerivationMethod, MmCoinEnum,
-            UnexpectedDerivationMethod, WithdrawError};
+use crate::{BalanceError, WithdrawError};
 use async_trait::async_trait;
-use common::HttpStatusCode;
-use crypto::{Bip32DerPathError, Bip32Error, Bip44Chain, Bip44DerPathError, Bip44DerivationPath, ChildNumber,
-             DerivationPath, HwError};
+use crypto::{Bip32DerPathError, Bip32Error, Bip44Chain, ChildNumber, DerivationPath, HwError, StandardHDPath,
+             StandardHDPathError};
 use derive_more::Display;
-use http::StatusCode;
-use mm2_core::mm_ctx::MmArc;
+use itertools::Itertools;
 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};
 
@@ -23,10 +19,25 @@ 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 type AddressDerivingResult<T> = MmResult<T, AddressDerivingError>;
+
+const DEFAULT_ADDRESS_LIMIT: u32 = ChildNumber::HARDENED_FLAG;
+const DEFAULT_ACCOUNT_LIMIT: u32 = ChildNumber::HARDENED_FLAG;
+const DEFAULT_RECEIVER_CHAIN: Bip44Chain = Bip44Chain::External;
+
+#[derive(Debug, Display)]
 pub enum AddressDerivingError {
+    #[display(fmt = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
+    InvalidBip44Chain {
+        chain: Bip44Chain,
+    },
     #[display(fmt = "BIP32 address deriving error: {}", _0)]
     Bip32Error(Bip32Error),
+    Internal(String),
+}
+
+impl From<InvalidBip44ChainError> for AddressDerivingError {
+    fn from(e: InvalidBip44ChainError) -> Self { AddressDerivingError::InvalidBip44Chain { chain: e.chain } }
 }
 
 impl From<Bip32Error> for AddressDerivingError {
@@ -34,22 +45,32 @@ impl From<Bip32Error> for AddressDerivingError {
 }
 
 impl From<AddressDerivingError> for BalanceError {
+    fn from(e: AddressDerivingError) -> Self { BalanceError::Internal(e.to_string()) }
+}
+
+impl From<AddressDerivingError> for WithdrawError {
     fn from(e: AddressDerivingError) -> Self {
         match e {
-            AddressDerivingError::Bip32Error(bip32) => BalanceError::Internal(bip32.to_string()),
+            AddressDerivingError::InvalidBip44Chain { .. } | AddressDerivingError::Bip32Error(_) => {
+                WithdrawError::UnexpectedFromAddress(e.to_string())
+            },
+            AddressDerivingError::Internal(internal) => WithdrawError::InternalError(internal),
         }
     }
 }
 
-impl From<AddressDerivingError> for WithdrawError {
-    fn from(e: AddressDerivingError) -> Self { WithdrawError::UnexpectedFromAddress(e.to_string()) }
-}
-
+#[derive(Display)]
 pub enum NewAddressDerivingError {
+    #[display(fmt = "Addresses limit reached. Max number of addresses: {}", max_addresses_number)]
     AddressLimitReached { max_addresses_number: u32 },
+    #[display(fmt = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
     InvalidBip44Chain { chain: Bip44Chain },
+    #[display(fmt = "BIP32 address deriving error: {}", _0)]
     Bip32Error(Bip32Error),
+    #[display(fmt = "Wallet storage error: {}", _0)]
     WalletStorageError(HDWalletStorageError),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
 }
 
 impl From<Bip32Error> for NewAddressDerivingError {
@@ -59,7 +80,9 @@ impl From<Bip32Error> for NewAddressDerivingError {
 impl From<AddressDerivingError> for NewAddressDerivingError {
     fn from(e: AddressDerivingError) -> Self {
         match e {
+            AddressDerivingError::InvalidBip44Chain { chain } => NewAddressDerivingError::InvalidBip44Chain { chain },
             AddressDerivingError::Bip32Error(bip32) => NewAddressDerivingError::Bip32Error(bip32),
+            AddressDerivingError::Internal(internal) => NewAddressDerivingError::Internal(internal),
         }
     }
 }
@@ -80,6 +103,31 @@ impl From<AccountUpdatingError> for NewAddressDerivingError {
     }
 }
 
+pub enum NewAddressDeriveConfirmError {
+    DeriveError(NewAddressDerivingError),
+    ConfirmError(HDConfirmAddressError),
+}
+
+impl From<HDConfirmAddressError> for NewAddressDeriveConfirmError {
+    fn from(e: HDConfirmAddressError) -> Self { NewAddressDeriveConfirmError::ConfirmError(e) }
+}
+
+impl From<NewAddressDerivingError> for NewAddressDeriveConfirmError {
+    fn from(e: NewAddressDerivingError) -> Self { NewAddressDeriveConfirmError::DeriveError(e) }
+}
+
+impl From<AccountUpdatingError> for NewAddressDeriveConfirmError {
+    fn from(e: AccountUpdatingError) -> Self {
+        NewAddressDeriveConfirmError::DeriveError(NewAddressDerivingError::from(e))
+    }
+}
+
+impl From<InvalidBip44ChainError> for NewAddressDeriveConfirmError {
+    fn from(e: InvalidBip44ChainError) -> Self {
+        NewAddressDeriveConfirmError::DeriveError(NewAddressDerivingError::from(e))
+    }
+}
+
 #[derive(Display)]
 pub enum NewAccountCreatingError {
     #[display(fmt = "Hardware Wallet context is not initialized")]
@@ -103,7 +151,9 @@ pub enum NewAccountCreatingError {
 }
 
 impl From<Bip32DerPathError> for NewAccountCreatingError {
-    fn from(e: Bip32DerPathError) -> Self { NewAccountCreatingError::Internal(Bip44DerPathError::from(e).to_string()) }
+    fn from(e: Bip32DerPathError) -> Self {
+        NewAccountCreatingError::Internal(StandardHDPathError::from(e).to_string())
+    }
 }
 
 impl From<HDWalletStorageError> for NewAccountCreatingError {
@@ -119,26 +169,6 @@ impl From<HDWalletStorageError> for NewAccountCreatingError {
     }
 }
 
-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)]
@@ -174,174 +204,23 @@ impl From<AccountUpdatingError> for BalanceError {
     }
 }
 
-#[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,
-        }
-    }
-}
-
+#[derive(Clone)]
 pub struct HDAddress<Address, Pubkey> {
     pub address: Address,
     pub pubkey: Pubkey,
     pub derivation_path: DerivationPath,
 }
 
-#[derive(Clone, Deserialize, Serialize)]
-pub struct HDAddressId {
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct HDAccountAddressId {
     pub account_id: u32,
     pub chain: Bip44Chain,
     pub address_id: u32,
 }
 
-impl From<Bip44DerivationPath> for HDAddressId {
-    fn from(der_path: Bip44DerivationPath) -> Self {
-        HDAddressId {
+impl From<StandardHDPath> for HDAccountAddressId {
+    fn from(der_path: StandardHDPath) -> Self {
+        HDAccountAddressId {
             account_id: der_path.account_id(),
             chain: der_path.chain(),
             address_id: der_path.address_id(),
@@ -349,6 +228,12 @@ impl From<Bip44DerivationPath> for HDAddressId {
     }
 }
 
+#[derive(Clone, Eq, Hash, PartialEq)]
+pub struct HDAddressId {
+    pub chain: Bip44Chain,
+    pub address_id: u32,
+}
+
 #[async_trait]
 pub trait HDWalletCoinOps {
     type Address: Send + Sync;
@@ -357,12 +242,41 @@ pub trait HDWalletCoinOps {
     type HDAccount: HDAccountOps;
 
     /// Derives an address from the given info.
-    fn derive_address(
+    async fn derive_address(
         &self,
         hd_account: &Self::HDAccount,
         chain: Bip44Chain,
         address_id: u32,
-    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError>;
+    ) -> AddressDerivingResult<HDAddress<Self::Address, Self::Pubkey>> {
+        self.derive_addresses(hd_account, std::iter::once(HDAddressId { chain, address_id }))
+            .await?
+            .into_iter()
+            .exactly_one()
+            // Unfortunately, we can't use [`MapToMmResult::map_to_mm`] due to unsatisfied trait bounds,
+            // and it's easier to use [`Result::map_err`] instead of adding more trait bounds to this method.
+            .map_err(|e| MmError::new(AddressDerivingError::Internal(e.to_string())))
+    }
+
+    /// Derives HD addresses from the given info.
+    async fn derive_addresses<Ids>(
+        &self,
+        hd_account: &Self::HDAccount,
+        address_ids: Ids,
+    ) -> AddressDerivingResult<Vec<HDAddress<Self::Address, Self::Pubkey>>>
+    where
+        Ids: Iterator<Item = HDAddressId> + Send;
+
+    async fn derive_known_addresses(
+        &self,
+        hd_account: &Self::HDAccount,
+        chain: Bip44Chain,
+    ) -> AddressDerivingResult<Vec<HDAddress<Self::Address, Self::Pubkey>>> {
+        let known_addresses_number = hd_account.known_addresses_number(chain)?;
+        let address_ids = (0..known_addresses_number)
+            .into_iter()
+            .map(|address_id| HDAddressId { chain, address_id });
+        self.derive_addresses(hd_account, address_ids).await
+    }
 
     /// Generates a new address and updates the corresponding number of used `hd_account` addresses.
     async fn generate_new_address(
@@ -371,22 +285,28 @@ pub trait HDWalletCoinOps {
         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)
+        let inner_impl::NewAddress {
+            address,
+            new_known_addresses_number,
+        } = inner_impl::generate_new_address_immutable(self, hd_wallet, hd_account, chain).await?;
+
+        self.set_known_addresses_number(hd_wallet, hd_account, chain, new_known_addresses_number)
             .await?;
-        Ok(new_address)
+        Ok(address)
     }
 
+    /// Generates a new address, requests the user to confirm if it's the same as on the HW device,
+    /// and then updates the corresponding number of used `hd_account` addresses.
+    async fn generate_and_confirm_new_address<ConfirmAddress>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
+        chain: Bip44Chain,
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, NewAddressDeriveConfirmError>
+    where
+        ConfirmAddress: HDConfirmAddress;
+
     /// 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>(
@@ -395,7 +315,7 @@ pub trait HDWalletCoinOps {
         xpub_extractor: &XPubExtractor,
     ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
     where
-        XPubExtractor: HDXPubExtractor + Sync;
+        XPubExtractor: HDXPubExtractor;
 
     async fn set_known_addresses_number(
         &self,
@@ -414,6 +334,15 @@ pub trait HDWalletOps: Send + Sync {
 
     fn gap_limit(&self) -> u32;
 
+    /// Returns limit on the number of addresses.
+    fn address_limit(&self) -> u32 { DEFAULT_ADDRESS_LIMIT }
+
+    /// Returns limit on the number of accounts.
+    fn account_limit(&self) -> u32 { DEFAULT_ACCOUNT_LIMIT }
+
+    /// Returns a BIP44 chain that is considered as default for receiver addresses.
+    fn default_receiver_chain(&self) -> Bip44Chain { DEFAULT_RECEIVER_CHAIN }
+
     fn get_accounts_mutex(&self) -> &HDAccountsMutex<Self::HDAccount>;
 
     /// Returns a copy of an account by the given `account_id` if it's activated.
@@ -441,6 +370,17 @@ pub trait HDWalletOps: Send + Sync {
 
     /// Returns a mutable reference to all activated accounts.
     async fn get_accounts_mut(&self) -> HDAccountsMut<'_, Self::HDAccount> { self.get_accounts_mutex().lock().await }
+
+    async fn remove_account_if_last(&self, account_id: u32) -> Option<Self::HDAccount> {
+        let mut x = self.get_accounts_mutex().lock().await;
+        // `BTreeMap::last_entry` is still unstable.
+        let (last_account_id, _) = x.iter().last()?;
+        if *last_account_id == account_id {
+            x.remove(&account_id)
+        } else {
+            None
+        }
+    }
 }
 
 pub trait HDAccountOps: Send + Sync {
@@ -461,89 +401,35 @@ pub trait HDAccountOps: Send + Sync {
     }
 }
 
-#[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(crate) mod inner_impl {
+    use super::*;
 
-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 struct NewAddress<Address, Pubkey> {
+        pub address: HDAddress<Address, Pubkey>,
+        pub new_known_addresses_number: u32,
     }
-}
-
-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>(
+    /// Generates a new address without updating a corresponding number of used `hd_account` addresses.
+    pub async fn generate_new_address_immutable<Coin>(
         coin: &Coin,
-        params: GetNewHDAddressParams,
-    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError>
+        hd_wallet: &Coin::HDWallet,
+        hd_account: &Coin::HDAccount,
+        chain: Bip44Chain,
+    ) -> MmResult<NewAddress<Coin::Address, Coin::Pubkey>, NewAddressDerivingError>
     where
-        Coin: HDWalletBalanceOps
-            + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
-            + MarketCoinOps
-            + Sync
-            + Send,
-        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+        Coin: HDWalletCoinOps + ?Sized + Sync,
     {
-        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 {
+        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;
+        let max_addresses_number = hd_wallet.address_limit();
+        if new_address_id >= max_addresses_number {
+            return MmError::err(NewAddressDerivingError::AddressLimitReached { max_addresses_number });
+        }
+        let address = coin.derive_address(hd_account, chain, new_address_id).await?;
+        Ok(NewAddress {
             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,
-            },
+            new_known_addresses_number: known_addresses_number + 1,
         })
     }
 }
diff --git a/mm2src/coins/hd_wallet_storage/mock_storage.rs b/mm2src/coins/hd_wallet_storage/mock_storage.rs
index 67e694ed44..2fbbc19f4c 100644
--- a/mm2src/coins/hd_wallet_storage/mock_storage.rs
+++ b/mm2src/coins/hd_wallet_storage/mock_storage.rs
@@ -1,12 +1,12 @@
 use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletId, HDWalletStorageInternalOps, HDWalletStorageResult};
 use async_trait::async_trait;
 use mm2_core::mm_ctx::MmArc;
-use mocktopus::macros::*;
+#[cfg(test)] use mocktopus::macros::*;
 
 pub struct HDWalletMockStorage;
 
 #[async_trait]
-#[mockable]
+#[cfg_attr(test, mockable)]
 impl HDWalletStorageInternalOps for HDWalletMockStorage {
     async fn init(_ctx: &MmArc) -> HDWalletStorageResult<Self>
     where
diff --git a/mm2src/coins/hd_wallet_storage/mod.rs b/mm2src/coins/hd_wallet_storage/mod.rs
index 95506f52fe..2c52cf3895 100644
--- a/mm2src/coins/hd_wallet_storage/mod.rs
+++ b/mm2src/coins/hd_wallet_storage/mod.rs
@@ -1,6 +1,6 @@
 use crate::hd_wallet::HDWalletCoinOps;
 use async_trait::async_trait;
-use crypto::{CryptoCtx, CryptoInitError, XPub};
+use crypto::{CryptoCtx, CryptoCtxError, XPub};
 use derive_more::Display;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
@@ -14,8 +14,9 @@ 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(any(test, target_arch = "wasm32"))] mod mock_storage;
+#[cfg(any(test, target_arch = "wasm32"))]
+pub use mock_storage::HDWalletMockStorage;
 
 cfg_wasm32! {
     use wasm_storage::HDWalletIndexedDbStorage as HDWalletStorageInstance;
@@ -48,8 +49,8 @@ pub enum HDWalletStorageError {
     Internal(String),
 }
 
-impl From<CryptoInitError> for HDWalletStorageError {
-    fn from(e: CryptoInitError) -> Self { HDWalletStorageError::Internal(e.to_string()) }
+impl From<CryptoCtxError> for HDWalletStorageError {
+    fn from(e: CryptoCtxError) -> Self { HDWalletStorageError::Internal(e.to_string()) }
 }
 
 impl HDWalletStorageError {
@@ -59,21 +60,15 @@ impl HDWalletStorageError {
 #[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 {
+    pub fn new(coin: String, hd_wallet_rmd160: &H160) -> HDWalletId {
         HDWalletId {
             coin,
-            mm2_rmd160: display_rmd160(mm2_rmd160),
             hd_wallet_rmd160: display_rmd160(hd_wallet_rmd160),
         }
     }
@@ -187,13 +182,8 @@ pub trait HDWalletCoinWithStorageOps: HDWalletCoinOps {
 /// 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,
 }
@@ -202,18 +192,16 @@ 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)]
+#[cfg(any(test, target_arch = "wasm32"))]
 impl Default for HDWalletCoinStorage {
     fn default() -> Self {
         HDWalletCoinStorage {
             coin: String::default(),
-            mm2_rmd160: H160::default(),
             hd_wallet_rmd160: H160::default(),
             inner: Box::new(HDWalletMockStorage),
         }
@@ -225,11 +213,10 @@ impl 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()
+            .hw_wallet_rmd160()
             .or_mm_err(|| HDWalletStorageError::HDWalletUnavailable)?;
         Ok(HDWalletCoinStorage {
             coin,
-            mm2_rmd160: *ctx.rmd160(),
             hd_wallet_rmd160,
             inner,
         })
@@ -239,21 +226,17 @@ impl HDWalletCoinStorage {
     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 fn wallet_id(&self) -> HDWalletId { HDWalletId::new(self.coin.clone(), &self.hd_wallet_rmd160) }
 
     pub async fn load_all_accounts(&self) -> HDWalletStorageResult<Vec<HDAccountStorageItem>> {
         let wallet_id = self.wallet_id();
@@ -320,31 +303,25 @@ mod tests {
     }
 
     async fn test_unique_wallets_impl() {
-        let rick_user0_device0_account0 = HDAccountStorageItem {
+        let rick_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 {
+        let rick_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 {
+        let rick_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 {
+        let morty_device0_account0 = HDAccountStorageItem {
             account_id: 0,
             account_xpub: "xpub6AHA9hZDN11k2ijHMeS5QqHx2KP9aMBRhTDqANMnwVtdyw2TDYRmF8PjpvwUFcL1Et8Hj59S3gTSMcUQ5gAqTz3Wd8EsMTmF3DChhqPQBnU".to_owned(),
             external_addresses_number: 7,
@@ -352,88 +329,68 @@ mod tests {
         };
 
         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())
+        let rick_device0_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device0_rmd160)
             .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())
+            .expect("!HDWalletCoinStorage::new");
+        let rick_device1_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device1_rmd160)
             .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())
+            .expect("!HDWalletCoinStorage::new");
+        let morty_device0_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "MORTY".to_owned(), device0_rmd160)
+            .await
+            .expect("!HDWalletCoinStorage::new");
+
+        rick_device0_db
+            .upload_new_account(rick_device0_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())
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK device=0 account=0");
+        rick_device0_db
+            .upload_new_account(rick_device0_account1.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())
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK device=0 account=1");
+        rick_device1_db
+            .upload_new_account(rick_device1_account0.clone())
             .await
-            .expect("!HDWalletCoinStorage::upload_new_account: MORTY user=0 device=0 account=0");
+            .expect("!HDWalletCoinStorage::upload_new_account: RICK device=1 account=0");
+        morty_device0_db
+            .upload_new_account(morty_device0_account0.clone())
+            .await
+            .expect("!HDWalletCoinStorage::upload_new_account: MORTY 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.
+        // Rows in the database must differ by only `coin`, `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()
+            rick_device0_account0.clone(),
+            rick_device0_account1.clone(),
+            rick_device1_account0.clone(),
+            morty_device0_account0.clone()
         ]);
 
-        let mut actual = rick_user0_device0_db
+        let mut actual = rick_device0_db
             .load_all_accounts()
             .await
-            .expect("HDWalletCoinStorage::load_all_accounts: RICK user=0 device=0");
+            .expect("HDWalletCoinStorage::load_all_accounts: RICK 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]);
+        assert_eq!(actual, vec![rick_device0_account0, rick_device0_account1]);
 
-        let actual = rick_user1_device0_db
+        let actual = rick_device1_db
             .load_all_accounts()
             .await
-            .expect("HDWalletCoinStorage::load_all_accounts: RICK user=1 device=0");
-        assert_eq!(actual, vec![rick_user1_device0_account0]);
+            .expect("HDWalletCoinStorage::load_all_accounts: RICK device=1");
+        assert_eq!(actual, vec![rick_device1_account0]);
 
-        let actual = morty_user0_device0_db
+        let actual = morty_device0_db
             .load_all_accounts()
             .await
-            .expect("HDWalletCoinStorage::load_all_accounts: MORTY user=0 device=0");
-        assert_eq!(actual, vec![morty_user0_device0_account0]);
+            .expect("HDWalletCoinStorage::load_all_accounts: MORTY device=0");
+        assert_eq!(actual, vec![morty_device0_account0]);
     }
 
     async fn test_delete_accounts_impl() {
@@ -463,18 +420,17 @@ mod tests {
         };
 
         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)
+        let wallet0_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device0_rmd160)
             .await
             .expect("!HDWalletCoinStorage::new");
-        let wallet1_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device1_rmd160)
+        let wallet1_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device1_rmd160)
             .await
             .expect("!HDWalletCoinStorage::new");
-        let wallet2_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), user_rmd160, device2_rmd160)
+        let wallet2_db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device2_rmd160)
             .await
             .expect("!HDWalletCoinStorage::new");
 
@@ -501,7 +457,7 @@ mod tests {
             .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.
+        // Rows in the database must differ by only `coin`, `hd_wallet_rmd160` and `account_id` values.
         let all_accounts: Vec<_> = get_all_storage_items(&ctx)
             .await
             .into_iter()
@@ -525,10 +481,9 @@ mod tests {
         };
 
         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)
+        let db = HDWalletCoinStorage::init_with_rmd160(&ctx, "RICK".to_owned(), device_rmd160)
             .await
             .expect("!HDWalletCoinStorage::new");
 
diff --git a/mm2src/coins/hd_wallet_storage/sqlite_storage.rs b/mm2src/coins/hd_wallet_storage/sqlite_storage.rs
index 8a061fddb5..38d1201120 100644
--- a/mm2src/coins/hd_wallet_storage/sqlite_storage.rs
+++ b/mm2src/coins/hd_wallet_storage/sqlite_storage.rs
@@ -2,8 +2,10 @@ use crate::hd_wallet_storage::{HDAccountStorageItem, HDWalletId, HDWalletStorage
                                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 db_common::owned_named_params;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Row, NO_PARAMS};
+use db_common::sqlite::{query_single_row_with_named_params, AsSqlNamedParams, OwnedSqlNamedParams, SqliteConnShared,
+                        SqliteConnWeak};
 use derive_more::Display;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
@@ -12,7 +14,6 @@ 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,
@@ -21,23 +22,20 @@ const CREATE_HD_ACCOUNT_TABLE: &str = "CREATE TABLE IF NOT EXISTS hd_account (
 );";
 
 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);";
+    (coin, hd_wallet_rmd160, account_id, account_xpub, external_addresses_number, internal_addresses_number)
+    VALUES (:coin, :hd_wallet_rmd160, :account_id, :account_xpub, :external_addresses_number, :internal_addresses_number);";
 
 const DELETE_ACCOUNTS_BY_WALLET_ID: &str =
-    "DELETE FROM hd_account WHERE coin=?1 AND mm2_rmd160=?2 AND hd_wallet_rmd160=?3;";
+    "DELETE FROM hd_account WHERE coin=:coin AND hd_wallet_rmd160=:hd_wallet_rmd160;";
 
 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;";
+    WHERE coin=:coin AND hd_wallet_rmd160=:hd_wallet_rmd160 AND account_id=:account_id;";
 
 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;
+    WHERE coin=:coin AND hd_wallet_rmd160=:hd_wallet_rmd160;";
 
 impl From<SqlError> for HDWalletStorageError {
     fn from(e: SqlError) -> Self {
@@ -69,32 +67,24 @@ impl TryFrom<&Row<'_>> for HDAccountStorageItem {
 }
 
 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);
+    fn to_sql_params_with_wallet_id(&self, wallet_id: HDWalletId) -> OwnedSqlNamedParams {
+        let mut params = wallet_id.to_sql_params();
+        params.extend(owned_named_params! {
+            ":account_id": self.account_id,
+            ":account_xpub": self.account_xpub.clone(),
+            ":external_addresses_number": self.external_addresses_number,
+            ":internal_addresses_number": self.internal_addresses_number,
+        });
         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());
+    fn to_sql_params(&self) -> OwnedSqlNamedParams {
+        owned_named_params! {
+            ":coin": self.coin.clone(),
+            ":hd_wallet_rmd160": self.hd_wallet_rmd160.clone(),
+        }
     }
 }
 
@@ -109,10 +99,9 @@ impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
     where
         Self: Sized,
     {
-        let shared = ctx
-            .sqlite_connection
-            .as_option()
-            .or_mm_err(|| HDWalletStorageError::Internal("'MmCtx::sqlite_connection' is not initialized".to_owned()))?;
+        let shared = ctx.shared_sqlite_conn.as_option().or_mm_err(|| {
+            HDWalletStorageError::Internal("'MmCtx::shared_sqlite_conn' is not initialized".to_owned())
+        })?;
         let storage = HDWalletSqliteStorage {
             conn: SqliteConnShared::downgrade(shared),
         };
@@ -124,13 +113,15 @@ impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
         let selfi = self.clone();
         async_blocking(move || {
             let conn_shared = selfi.get_shared_conn()?;
-            let conn = Self::lock_conn(&conn_shared)?;
+            let conn = Self::lock_conn_mutex(&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))?
+                .query_map_named(&params.as_sql_named_params(), |row: &Row<'_>| {
+                    HDAccountStorageItem::try_from(row)
+                })?
                 .collect::<Result<Vec<_>, _>>()?;
             Ok(rows)
         })
@@ -145,14 +136,16 @@ impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
         let selfi = self.clone();
         async_blocking(move || {
             let conn_shared = selfi.get_shared_conn()?;
-            let conn = Self::lock_conn(&conn_shared)?;
+            let conn = Self::lock_conn_mutex(&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<'_>| {
+            params.extend(owned_named_params! {
+                ":account_id": account_id,
+            });
+            query_single_row_with_named_params(&conn, SELECT_ACCOUNT, &params.as_sql_named_params(), |row: &Row<'_>| {
                 HDAccountStorageItem::try_from(row)
             })
-            .mm_err(HDWalletStorageError::from)
+            .map_to_mm(HDWalletStorageError::from)
         })
         .await
     }
@@ -195,10 +188,10 @@ impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
         let selfi = self.clone();
         async_blocking(move || {
             let conn_shared = selfi.get_shared_conn()?;
-            let conn = Self::lock_conn(&conn_shared)?;
+            let conn = Self::lock_conn_mutex(&conn_shared)?;
 
             let params = account.to_sql_params_with_wallet_id(wallet_id);
-            conn.execute(INSERT_ACCOUNT, params)
+            conn.execute_named(INSERT_ACCOUNT, &params.as_sql_named_params())
                 .map(|_| ())
                 .map_to_mm(HDWalletStorageError::from)
         })
@@ -209,10 +202,10 @@ impl HDWalletStorageInternalOps for HDWalletSqliteStorage {
         let selfi = self.clone();
         async_blocking(move || {
             let conn_shared = selfi.get_shared_conn()?;
-            let conn = Self::lock_conn(&conn_shared)?;
+            let conn = Self::lock_conn_mutex(&conn_shared)?;
 
             let params = wallet_id.to_sql_params();
-            conn.execute(DELETE_ACCOUNTS_BY_WALLET_ID, params)
+            conn.execute_named(DELETE_ACCOUNTS_BY_WALLET_ID, &params.as_sql_named_params())
                 .map(|_| ())
                 .map_to_mm(HDWalletStorageError::from)
         })
@@ -227,14 +220,14 @@ impl HDWalletSqliteStorage {
             .or_mm_err(|| HDWalletStorageError::Internal("'HDWalletSqliteStorage::conn' doesn't exist".to_owned()))
     }
 
-    fn lock_conn(conn: &SqliteConnShared) -> HDWalletStorageResult<MutexGuard<Connection>> {
+    fn lock_conn_mutex(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)?;
+        let conn = Self::lock_conn_mutex(&conn_shared)?;
         conn.execute(CREATE_HD_ACCOUNT_TABLE, NO_PARAMS)
             .map(|_| ())
             .map_to_mm(HDWalletStorageError::from)
@@ -248,20 +241,21 @@ impl HDWalletSqliteStorage {
         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
+            "UPDATE hd_account SET {updating_property}=:new_value WHERE coin=:coin AND hd_wallet_rmd160=:hd_wallet_rmd160 AND account_id=:account_id;",
         );
 
         let selfi = self.clone();
         async_blocking(move || {
             let conn_shared = selfi.get_shared_conn()?;
-            let conn = Self::lock_conn(&conn_shared)?;
+            let conn = Self::lock_conn_mutex(&conn_shared)?;
 
-            let mut params = vec![new_addresses_number.to_string()];
-            wallet_id.fill_sql_params(&mut params);
-            params.push(account_id.to_string());
+            let mut params = owned_named_params! {
+                ":new_value": new_addresses_number,
+                ":account_id": account_id,
+            };
+            params.extend(wallet_id.to_sql_params());
 
-            conn.execute(&sql, params)
+            conn.execute_named(&sql, &params.as_sql_named_params())
                 .map(|_| ())
                 .map_to_mm(HDWalletStorageError::from)
         })
@@ -277,29 +271,13 @@ enum UpdatingProperty {
     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 conn = ctx.shared_sqlite_conn();
     let mut statement = conn.prepare(SELECT_ALL_ACCOUNTS).unwrap();
     statement
         .query_map(NO_PARAMS, |row: &Row<'_>| HDAccountStorageItem::try_from(row))
diff --git a/mm2src/coins/hd_wallet_storage/wasm_storage.rs b/mm2src/coins/hd_wallet_storage/wasm_storage.rs
index fb9dbd2bbd..721a4b09a7 100644
--- a/mm2src/coins/hd_wallet_storage/wasm_storage.rs
+++ b/mm2src/coins/hd_wallet_storage/wasm_storage.rs
@@ -14,12 +14,10 @@ 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";
@@ -75,8 +73,8 @@ 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`,
+/// The table has the following individually non-unique indexes: `coin`, `hd_wallet_rmd160`, `account_id`,
+/// one non-unique multi-index `wallet_id` that consists of `coin`, `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)]
@@ -84,9 +82,6 @@ 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,
@@ -106,10 +101,10 @@ impl TableSignature for HDAccountTable {
         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_ID_INDEX, &["coin", "hd_wallet_rmd160"], false)?;
                 table.create_multi_index(
                     WALLET_ACCOUNT_ID_INDEX,
-                    &["coin", "mm2_rmd160", "hd_wallet_rmd160", "account_id"],
+                    &["coin", "hd_wallet_rmd160", "account_id"],
                     true,
                 )?;
             },
@@ -123,7 +118,6 @@ 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,
@@ -180,14 +174,13 @@ impl HDWalletStorageInternalOps for HDWalletIndexedDbStorage {
 
     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 locked_db = Self::lock_db_mutex(&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)
@@ -203,7 +196,7 @@ impl HDWalletStorageInternalOps for HDWalletIndexedDbStorage {
         account_id: u32,
     ) -> HDWalletStorageResult<Option<HDAccountStorageItem>> {
         let shared_db = self.get_shared_db()?;
-        let locked_db = Self::lock_db(&shared_db).await?;
+        let locked_db = Self::lock_db_mutex(&shared_db).await?;
 
         let transaction = locked_db.inner.transaction().await?;
         let table = transaction.table::<HDAccountTable>().await?;
@@ -245,7 +238,7 @@ impl HDWalletStorageInternalOps for HDWalletIndexedDbStorage {
         account: HDAccountStorageItem,
     ) -> HDWalletStorageResult<()> {
         let shared_db = self.get_shared_db()?;
-        let locked_db = Self::lock_db(&shared_db).await?;
+        let locked_db = Self::lock_db_mutex(&shared_db).await?;
 
         let transaction = locked_db.inner.transaction().await?;
         let table = transaction.table::<HDAccountTable>().await?;
@@ -260,14 +253,13 @@ impl HDWalletStorageInternalOps for HDWalletIndexedDbStorage {
 
     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 locked_db = Self::lock_db_mutex(&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(())
@@ -281,7 +273,7 @@ impl HDWalletIndexedDbStorage {
             .or_mm_err(|| HDWalletStorageError::Internal("'HDWalletIndexedDbStorage::db' doesn't exist".to_owned()))
     }
 
-    async fn lock_db(db: &SharedDb<HDWalletDb>) -> HDWalletStorageResult<HDWalletDbLocked<'_>> {
+    async fn lock_db_mutex(db: &SharedDb<HDWalletDb>) -> HDWalletStorageResult<HDWalletDbLocked<'_>> {
         db.get_or_initialize().await.mm_err(HDWalletStorageError::from)
     }
 
@@ -292,7 +284,6 @@ impl HDWalletIndexedDbStorage {
     ) -> 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
@@ -306,7 +297,7 @@ impl HDWalletIndexedDbStorage {
         F: FnOnce(&mut HDAccountTable),
     {
         let shared_db = self.get_shared_db()?;
-        let locked_db = Self::lock_db(&shared_db).await?;
+        let locked_db = Self::lock_db_mutex(&shared_db).await?;
 
         let transaction = locked_db.inner.transaction().await?;
         let table = transaction.table::<HDAccountTable>().await?;
diff --git a/mm2src/coins/lightning.rs b/mm2src/coins/lightning.rs
index 08e2acbb00..8a69514384 100644
--- a/mm2src/coins/lightning.rs
+++ b/mm2src/coins/lightning.rs
@@ -1,88 +1,95 @@
 pub mod ln_conf;
+pub(crate) mod ln_db;
 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};
+pub mod ln_events;
+mod ln_filesystem_persister;
+pub mod ln_p2p;
+pub mod ln_platform;
+pub(crate) mod ln_serialization;
+mod ln_sql;
+pub mod ln_storage;
+pub mod ln_utils;
+
+use crate::coin_errors::MyAddressError;
+use crate::lightning::ln_utils::{filter_channels, pay_invoice_with_max_total_cltv_expiry_delta, PaymentError};
 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 crate::utxo::utxo_common::{big_decimal_from_sat, big_decimal_from_sat_unsigned};
+use crate::utxo::{sat_from_big_decimal, utxo_common, BlockchainNetwork};
+use crate::{BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend,
+            HistorySyncState, MakerSwapTakerCoin, MarketCoinOps, MmCoin, NegotiateSwapContractAddrErr,
+            PaymentInstructions, PaymentInstructionsErr, RawTransactionError, RawTransactionFut,
+            RawTransactionRequest, RefundError, RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendSpendPaymentArgs, SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureError, SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee,
+            TradePreimageFut, TradePreimageResult, TradePreimageValue, Transaction, TransactionEnum, TransactionErr,
+            TransactionFut, TxMarshalingErr, UnexpectedDerivationMethod, UtxoStandardCoin, ValidateAddressResult,
+            ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
+            ValidatePaymentFut, ValidatePaymentInput, VerificationError, VerificationResult, WatcherOps,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput,
+            WithdrawError, WithdrawFut, WithdrawRequest};
 use async_trait::async_trait;
+use bitcoin::bech32::ToBase32;
 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 bitcrypto::{dhash256, ripemd160};
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::executor::{AbortableSystem, AbortedError, Timer};
+use common::log::{info, LogOnError, LogState};
+use common::{async_blocking, get_local_duration_since_epoch, log, now_ms, PagingOptionsEnum};
+use db_common::sqlite::rusqlite::Error as SqlError;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
-use keys::{hash::H256, AddressHashEnum, CompactSignature, KeyPair, Private, Public};
-use lightning::chain::channelmonitor::Balance;
+use keys::{hash::H256, CompactSignature, KeyPair, Private, Public};
 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::utils::DefaultRouter;
+use lightning_invoice::{payment, CreationError, InvoiceBuilder, SignOrCreationError};
 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_conf::{LightningCoinConf, PlatformCoinConfirmationTargets};
+use ln_db::{DBChannelDetails, HTLCStatus, LightningDB, PaymentInfo, PaymentType};
+use ln_errors::{EnableLightningError, EnableLightningResult};
 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 ln_filesystem_persister::LightningFilesystemPersister;
+use ln_p2p::PeerManager;
+use ln_platform::Platform;
+use ln_serialization::{ChannelDetailsForRPC, PublicKeyForRPC};
+use ln_sql::SqliteLightningDB;
+use ln_storage::{NetworkGraph, NodesAddressesMapShared, Scorer, TrustedNodesShared};
+use ln_utils::{ChainMonitor, ChannelManager, Router};
 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 script::TransactionInputSigner;
+use secp256k1v22::PublicKey;
+use serde::Deserialize;
 use serde_json::Value as Json;
-use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
+use std::convert::TryInto;
 use std::fmt;
 use std::net::SocketAddr;
 use std::str::FromStr;
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
+
+const WAIT_FOR_REFUND_INTERVAL: f64 = 60.;
+pub const DEFAULT_INVOICE_EXPIRY: u32 = 3600;
 
-type Router = DefaultRouter<Arc<NetworkGraph>, Arc<LogState>>;
-type InvoicePayer<E> = payment::InvoicePayer<Arc<ChannelManager>, Router, Arc<Mutex<Scorer>>, Arc<LogState>, E>;
+pub type InvoicePayer<E> = payment::InvoicePayer<Arc<ChannelManager>, Router, Arc<Scorer>, Arc<LogState>, E>;
 
 #[derive(Clone)]
 pub struct LightningCoin {
     pub platform: Arc<Platform>,
     pub conf: LightningCoinConf,
+    /// The lightning node background processor that takes care of tasks that need to happen periodically.
+    pub background_processor: Arc<BackgroundProcessor>,
     /// 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>,
@@ -93,25 +100,76 @@ pub struct LightningCoin {
     /// 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>,
+    pub persister: Arc<LightningFilesystemPersister>,
+    /// The lightning node db struct that takes care of reading/writing data from/to db.
+    pub db: SqliteLightningDB,
     /// 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,
+    /// The mutex storing the public keys of the nodes that our lightning node trusts to allow 0 confirmation
+    /// inbound channels from.
+    pub trusted_nodes: TrustedNodesShared,
+    /// The lightning node router that takes care of finding routes for payments.
+    // Todo: this should be removed once pay_invoice_with_max_total_cltv_expiry_delta similar functionality is implemented in rust-lightning
+    pub router: Arc<Router>,
+    /// The lightning node scorer that takes care of scoring routes. Given the uncertainty of channel liquidity balances,
+    /// the scorer stores the probabilities that a route is successful based on knowledge learned from successful and unsuccessful attempts.
+    // Todo: this should be removed once pay_invoice_with_max_total_cltv_expiry_delta similar functionality is implemented in rust-lightning
+    pub scorer: Arc<Scorer>,
 }
 
 impl fmt::Debug for LightningCoin {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "LightningCoin {{ conf: {:?} }}", self.conf) }
 }
 
+#[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 is_ready: Option<bool>,
+    pub is_usable: Option<bool>,
+    pub is_public: Option<bool>,
+}
+
+pub(crate) struct GetOpenChannelsResult {
+    pub channels: Vec<ChannelDetailsForRPC>,
+    pub skipped: usize,
+    pub total: usize,
+}
+
+impl Transaction for PaymentHash {
+    fn tx_hex(&self) -> Vec<u8> { self.0.to_vec() }
+
+    fn tx_hash(&self) -> BytesJson { self.0.to_vec().into() }
+}
+
 impl LightningCoin {
-    fn platform_coin(&self) -> &UtxoStandardCoin { &self.platform.coin }
+    pub fn platform_coin(&self) -> &UtxoStandardCoin { &self.platform.coin }
+
+    #[inline]
+    fn avg_blocktime(&self) -> u64 { self.platform.avg_blocktime }
 
     #[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()
+    pub(crate) async fn list_channels(&self) -> Vec<ChannelDetails> {
+        let channel_manager = self.channel_manager.clone();
+        async_blocking(move || channel_manager.list_channels()).await
+    }
+
+    async fn get_balance_msat(&self) -> (u64, u64) {
+        self.list_channels()
+            .await
             .iter()
             .fold((0, 0), |(spendable, unspendable), chan| {
                 if chan.is_usable {
@@ -125,11 +183,19 @@ impl LightningCoin {
             })
     }
 
-    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());
+    pub(crate) async fn get_channel_by_rpc_id(&self, rpc_id: u64) -> Option<ChannelDetails> {
+        self.list_channels()
+            .await
+            .into_iter()
+            .find(|chan| chan.user_channel_id == rpc_id)
+    }
+
+    pub(crate) async fn pay_invoice(
+        &self,
+        invoice: Invoice,
+        max_total_cltv_expiry_delta: Option<u32>,
+    ) -> Result<PaymentInfo, MmError<PaymentError>> {
+        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()),
         };
@@ -137,68 +203,166 @@ impl LightningCoin {
             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,
-        })
+        let amt_msat = invoice.amount_milli_satoshis().map(|a| a as i64);
+
+        let selfi = self.clone();
+        match max_total_cltv_expiry_delta {
+            Some(total_cltv) => {
+                async_blocking(move || {
+                    pay_invoice_with_max_total_cltv_expiry_delta(
+                        selfi.channel_manager,
+                        selfi.router,
+                        selfi.scorer,
+                        &invoice,
+                        total_cltv,
+                    )
+                })
+                .await?
+            },
+            None => async_blocking(move || selfi.invoice_payer.pay_invoice(&invoice)).await?,
+        };
+
+        let payment_info = PaymentInfo::new(payment_hash, payment_type, description, amt_msat);
+        self.db.add_payment_to_db(&payment_info).await?;
+        Ok(payment_info)
     }
 
-    fn keysend(
+    pub(crate) async fn keysend(
         &self,
         destination: PublicKey,
         amount_msat: u64,
         final_cltv_expiry_delta: u32,
-    ) -> SendPaymentResult<PaymentInfo> {
+    ) -> Result<PaymentInfo, MmError<PaymentError>> {
         if final_cltv_expiry_delta < MIN_FINAL_CLTV_EXPIRY {
-            return MmError::err(SendPaymentError::CLTVExpiryError(
-                final_cltv_expiry_delta,
-                MIN_FINAL_CLTV_EXPIRY,
-            ));
+            return MmError::err(PaymentError::CLTVExpiry(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 selfi = self.clone();
+        async_blocking(move || {
+            selfi
+                .invoice_payer
+                .pay_pubkey(destination, payment_preimage, amount_msat, final_cltv_expiry_delta)
+                .map_to_mm(|e| PaymentError::Keysend(format!("{:?}", e)))
+        })
+        .await?;
+
         let payment_hash = PaymentHash(Sha256::hash(&payment_preimage.0).into_inner());
         let payment_type = PaymentType::OutboundPayment { destination };
+        let payment_info = PaymentInfo::new(payment_hash, payment_type, "".into(), Some(amount_msat as i64));
+        self.db.add_payment_to_db(&payment_info).await?;
 
-        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,
-        })
+        Ok(payment_info)
     }
 
-    async fn get_open_channels_by_filter(
+    pub(crate) 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();
+    ) -> GetOpenChannelsResult {
+        fn apply_open_channel_filter(channel_details: &ChannelDetailsForRPC, filter: &OpenChannelsFilter) -> bool {
+            // Checking if channel_id is some and not equal
+            if filter.channel_id.is_some() && Some(&channel_details.channel_id) != filter.channel_id.as_ref() {
+                return false;
+            }
+
+            // Checking if counterparty_node_id is some and not equal
+            if filter.counterparty_node_id.is_some()
+                && Some(&channel_details.counterparty_node_id) != filter.counterparty_node_id.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if funding_tx is some and not equal
+            if filter.funding_tx.is_some() && channel_details.funding_tx != filter.funding_tx {
+                return false;
+            }
+
+            // Checking if from_funding_value_sats is some and more than funding_tx_value_sats
+            if filter.from_funding_value_sats.is_some()
+                && Some(&channel_details.funding_tx_value_sats) < filter.from_funding_value_sats.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if to_funding_value_sats is some and less than funding_tx_value_sats
+            if filter.to_funding_value_sats.is_some()
+                && Some(&channel_details.funding_tx_value_sats) > filter.to_funding_value_sats.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if is_outbound is some and not equal
+            if filter.is_outbound.is_some() && Some(&channel_details.is_outbound) != filter.is_outbound.as_ref() {
+                return false;
+            }
+
+            // Checking if from_balance_msat is some and more than balance_msat
+            if filter.from_balance_msat.is_some()
+                && Some(&channel_details.balance_msat) < filter.from_balance_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if to_balance_msat is some and less than balance_msat
+            if filter.to_balance_msat.is_some() && Some(&channel_details.balance_msat) > filter.to_balance_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if from_outbound_capacity_msat is some and more than outbound_capacity_msat
+            if filter.from_outbound_capacity_msat.is_some()
+                && Some(&channel_details.outbound_capacity_msat) < filter.from_outbound_capacity_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if to_outbound_capacity_msat is some and less than outbound_capacity_msat
+            if filter.to_outbound_capacity_msat.is_some()
+                && Some(&channel_details.outbound_capacity_msat) > filter.to_outbound_capacity_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if from_inbound_capacity_msat is some and more than outbound_capacity_msat
+            if filter.from_inbound_capacity_msat.is_some()
+                && Some(&channel_details.inbound_capacity_msat) < filter.from_inbound_capacity_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if to_inbound_capacity_msat is some and less than inbound_capacity_msat
+            if filter.to_inbound_capacity_msat.is_some()
+                && Some(&channel_details.inbound_capacity_msat) > filter.to_inbound_capacity_msat.as_ref()
+            {
+                return false;
+            }
+
+            // Checking if is_ready is some and not equal
+            if filter.is_ready.is_some() && Some(&channel_details.is_ready) != filter.is_ready.as_ref() {
+                return false;
+            }
+
+            // Checking if is_usable is some and not equal
+            if filter.is_usable.is_some() && Some(&channel_details.is_usable) != filter.is_usable.as_ref() {
+                return false;
+            }
+
+            // Checking if is_public is some and not equal
+            if filter.is_public.is_some() && Some(&channel_details.is_public) != filter.is_public.as_ref() {
+                return false;
+            }
+
+            // All checks pass
+            true
+        }
+
+        let mut total_open_channels: Vec<ChannelDetailsForRPC> =
+            self.list_channels().await.into_iter().map(From::from).collect();
 
         total_open_channels.sort_by(|a, b| a.rpc_channel_id.cmp(&b.rpc_channel_id));
+        drop_mutability!(total_open_channels);
 
         let open_channels_filtered = if let Some(ref f) = filter {
             total_open_channels
@@ -226,161 +390,612 @@ impl LightningCoin {
             open_channels_filtered[offset..].to_vec()
         };
 
-        Ok(GetOpenChannelsResult {
+        GetOpenChannelsResult {
             channels,
             skipped: offset,
             total,
-        })
+        }
+    }
+
+    async fn create_invoice_for_hash(
+        &self,
+        payment_hash: PaymentHash,
+        amt_msat: Option<u64>,
+        description: String,
+        min_final_cltv_expiry: u64,
+        invoice_expiry_delta_secs: u32,
+    ) -> Result<Invoice, MmError<SignOrCreationError<()>>> {
+        let open_channels_nodes = self.open_channels_nodes.lock().clone();
+        for (node_pubkey, node_addr) in open_channels_nodes {
+            ln_p2p::connect_to_ln_node(node_pubkey, node_addr, self.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
+                ));
+        }
+
+        // `create_inbound_payment` only returns an error if the amount is greater than the total bitcoin
+        // supply.
+        let payment_secret = self
+            .channel_manager
+            .create_inbound_payment_for_hash(payment_hash, amt_msat, invoice_expiry_delta_secs)
+            .map_to_mm(|()| SignOrCreationError::CreationError(CreationError::InvalidAmount))?;
+        let our_node_pubkey = self.channel_manager.get_our_node_id();
+        // Todo: Check if it's better to use UTC instead of local time for invoice generations
+        let duration = get_local_duration_since_epoch().expect("for the foreseeable future this shouldn't happen");
+
+        let mut invoice = InvoiceBuilder::new(self.platform.network.clone().into())
+            .description(description)
+            .duration_since_epoch(duration)
+            .payee_pub_key(our_node_pubkey)
+            .payment_hash(Hash::from_inner(payment_hash.0))
+            .payment_secret(payment_secret)
+            .basic_mpp()
+            // Todo: This should be validated by the other side, right now this is not validated by rust-lightning and the PaymentReceived event doesn't include the final cltv of the payment for us to validate it
+            // Todo: This needs a PR opened to rust-lightning, I already contacted them about it and there is an issue opened for it https://github.com/lightningdevkit/rust-lightning/issues/1850
+            .min_final_cltv_expiry(min_final_cltv_expiry)
+            .expiry_time(core::time::Duration::from_secs(invoice_expiry_delta_secs.into()));
+        if let Some(amt) = amt_msat {
+            invoice = invoice.amount_milli_satoshis(amt);
+        }
+
+        let route_hints = filter_channels(self.channel_manager.list_usable_channels(), amt_msat);
+        for hint in route_hints {
+            invoice = invoice.private_route(hint);
+        }
+
+        let raw_invoice = match invoice.build_raw() {
+            Ok(inv) => inv,
+            Err(e) => return MmError::err(SignOrCreationError::CreationError(e)),
+        };
+        let hrp_str = raw_invoice.hrp.to_string();
+        let hrp_bytes = hrp_str.as_bytes();
+        let data_without_signature = raw_invoice.data.to_base32();
+        let signed_raw_invoice = raw_invoice.sign(|_| {
+            self.keys_manager
+                .sign_invoice(hrp_bytes, &data_without_signature, Recipient::Node)
+        });
+        match signed_raw_invoice {
+            Ok(inv) => Ok(Invoice::from_signed(inv).map_err(|_| SignOrCreationError::SignError(()))?),
+            Err(e) => MmError::err(SignOrCreationError::SignError(e)),
+        }
+    }
+
+    fn estimate_blocks_from_duration(&self, duration: u64) -> u64 { duration / self.avg_blocktime() }
+
+    async fn swap_payment_instructions(
+        &self,
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+        expires_in: u64,
+        min_final_cltv_expiry: u64,
+    ) -> Result<Vec<u8>, MmError<PaymentInstructionsErr>> {
+        // lightning decimals should be 11 in config since the smallest divisible unit in lightning coin is msat
+        let amt_msat = sat_from_big_decimal(amount, self.decimals())?;
+        let payment_hash =
+            payment_hash_from_slice(secret_hash).map_to_mm(|e| PaymentInstructionsErr::InternalError(e.to_string()))?;
+        // note: No description is provided in the invoice to reduce the payload
+        let invoice = self
+            .create_invoice_for_hash(
+                payment_hash,
+                Some(amt_msat),
+                "".into(),
+                min_final_cltv_expiry,
+                expires_in.try_into().expect("expires_in shouldn't exceed u32::MAX"),
+            )
+            .await
+            .map_err(|e| PaymentInstructionsErr::LightningInvoiceErr(e.to_string()))?;
+        Ok(invoice.to_string().into_bytes())
+    }
+
+    fn validate_swap_instructions(
+        &self,
+        instructions: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        min_final_cltv_expiry: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        let invoice = Invoice::from_str(&String::from_utf8_lossy(instructions))?;
+        if invoice.payment_hash().as_inner() != secret_hash
+            && ripemd160(invoice.payment_hash().as_inner()).as_slice() != secret_hash
+        {
+            return MmError::err(ValidateInstructionsErr::ValidateLightningInvoiceErr(
+                "Invalid invoice payment hash!".into(),
+            ));
+        }
+
+        let invoice_amount = invoice
+            .amount_milli_satoshis()
+            .or_mm_err(|| ValidateInstructionsErr::ValidateLightningInvoiceErr("No invoice amount!".into()))?;
+        if big_decimal_from_sat(invoice_amount as i64, self.decimals()) != amount {
+            return MmError::err(ValidateInstructionsErr::ValidateLightningInvoiceErr(
+                "Invalid invoice amount!".into(),
+            ));
+        }
+
+        if invoice.min_final_cltv_expiry() != min_final_cltv_expiry {
+            return MmError::err(ValidateInstructionsErr::ValidateLightningInvoiceErr(
+                "Invalid invoice min_final_cltv_expiry!".into(),
+            ));
+        }
+
+        Ok(PaymentInstructions::Lightning(invoice))
+    }
+
+    fn spend_swap_payment(&self, spend_payment_args: SendSpendPaymentArgs<'_>) -> TransactionFut {
+        let payment_hash = try_tx_fus!(payment_hash_from_slice(spend_payment_args.other_payment_tx));
+        let mut preimage = [b' '; 32];
+        preimage.copy_from_slice(spend_payment_args.secret);
+
+        let coin = self.clone();
+        let fut = async move {
+            let payment_preimage = PaymentPreimage(preimage);
+            coin.channel_manager.claim_funds(payment_preimage);
+            coin.db
+                .update_payment_preimage_in_db(payment_hash, payment_preimage)
+                .await
+                .error_log_with_msg(&format!(
+                    "Unable to update payment {} information in DB with preimage: {}!",
+                    hex::encode(payment_hash.0),
+                    hex::encode(preimage)
+                ));
+            Ok(TransactionEnum::LightningPayment(payment_hash))
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn validate_swap_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let payment_hash = try_f!(payment_hash_from_slice(&input.payment_tx)
+            .map_to_mm(|e| ValidatePaymentError::TxDeserializationError(e.to_string())));
+        let payment_hex = hex::encode(payment_hash.0);
+
+        let amt_msat = try_f!(sat_from_big_decimal(&input.amount, self.decimals()));
+
+        let coin = self.clone();
+        let fut = async move {
+            match coin.db.get_payment_from_db(payment_hash).await {
+                Ok(Some(payment)) => {
+                    let amount_received = payment.amt_msat;
+                    // Note: locktime doesn't need to be validated since min_final_cltv_expiry should be validated in rust-lightning after fixing the below issue
+                    // https://github.com/lightningdevkit/rust-lightning/issues/1850
+                    // Also, PaymentReceived won't be fired if amount_received < the amount requested in the invoice, this check is probably not needed.
+                    // But keeping it just in case any changes happen in rust-lightning
+                    if amount_received != Some(amt_msat as i64) {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "Provided payment {} amount {:?} doesn't match required amount {}",
+                            payment_hex, amount_received, amt_msat
+                        )));
+                    }
+                    Ok(())
+                },
+                Ok(None) => MmError::err(ValidatePaymentError::UnexpectedPaymentState(format!(
+                    "Payment {} is not in the database when it should be!",
+                    payment_hex
+                ))),
+                Err(e) => MmError::err(ValidatePaymentError::InternalError(format!(
+                    "Unable to retrieve payment {} from the database error: {}",
+                    payment_hex, e
+                ))),
+            }
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn on_swap_refund(&self, payment: &[u8]) -> RefundResult<()> {
+        let payment_hash = payment_hash_from_slice(payment).map_err(|e| RefundError::DecodeErr(e.to_string()))?;
+        // Free the htlc to allow for this inbound liquidity to be used for other inbound payments
+        self.channel_manager.fail_htlc_backwards(&payment_hash);
+        self.db
+            .update_payment_status_in_db(payment_hash, &HTLCStatus::Failed)
+            .await
+            .map_to_mm(|e| RefundError::DbError(e.to_string()))
     }
 }
 
 #[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!() }
+    // Todo: This uses dummy data for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
+    fn send_taker_fee(&self, _fee_addr: &[u8], _amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
+        let fut = async move { Ok(TransactionEnum::LightningPayment(PaymentHash([1; 32]))) };
+        Box::new(fut.boxed().compat())
+    }
 
-    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_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs<'_>) -> TransactionFut {
+        let PaymentInstructions::Lightning(invoice) = try_tx_fus!(maker_payment_args
+            .payment_instructions
+            .clone()
+            .ok_or("payment_instructions can't be None"));
+        let coin = self.clone();
+        let fut = async move {
+            // No need for max_total_cltv_expiry_delta for lightning maker payment since the maker is the side that reveals the secret/preimage
+            let payment = try_tx_s!(coin.pay_invoice(invoice, None).await);
+            Ok(payment.payment_hash.into())
+        };
+        Box::new(fut.boxed().compat())
     }
 
-    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_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs<'_>) -> TransactionFut {
+        let PaymentInstructions::Lightning(invoice) = try_tx_fus!(taker_payment_args
+            .payment_instructions
+            .clone()
+            .ok_or("payment_instructions can't be None"));
+        let max_total_cltv_expiry_delta = self
+            .estimate_blocks_from_duration(taker_payment_args.time_lock_duration)
+            .try_into()
+            .expect("max_total_cltv_expiry_delta shouldn't exceed u32::MAX");
+        let coin = self.clone();
+        let fut = async move {
+            // Todo: The path/s used is already logged when PaymentPathSuccessful/PaymentPathFailed events are fired, it might be better to save it to the DB and retrieve it with the payment info.
+            let payment = try_tx_s!(coin.pay_invoice(invoice, Some(max_total_cltv_expiry_delta)).await);
+            Ok(payment.payment_hash.into())
+        };
+        Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs<'_>,
     ) -> TransactionFut {
-        unimplemented!()
+        self.spend_swap_payment(maker_spends_payment_args)
     }
 
+    #[inline]
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs<'_>,
     ) -> TransactionFut {
-        unimplemented!()
+        self.spend_swap_payment(taker_spends_payment_args)
     }
 
     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],
+        _taker_refunds_payment_args: SendTakerRefundsPaymentArgs<'_>,
     ) -> TransactionFut {
-        unimplemented!()
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to refund lightning HTLC".into(),
+        )))
     }
 
     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],
+        _maker_refunds_payment_args: SendMakerRefundsPaymentArgs<'_>,
     ) -> TransactionFut {
-        unimplemented!()
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to refund lightning HTLC".into(),
+        )))
     }
 
+    // Todo: This validates the dummy fee for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
     fn validate_fee(
         &self,
-        _fee_tx: &TransactionEnum,
-        _expected_sender: &[u8],
-        _fee_addr: &[u8],
-        _amount: &BigDecimal,
-        _min_block_number: u64,
-        _uuid: &[u8],
+        _validate_fee_args: ValidateFeeArgs<'_>,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
+        Box::new(futures01::future::ok(()))
     }
 
-    fn validate_maker_payment(
-        &self,
-        _input: ValidatePaymentInput,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.validate_swap_payment(input)
     }
 
-    fn validate_taker_payment(
-        &self,
-        _input: ValidatePaymentInput,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.validate_swap_payment(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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs<'_>,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
-        unimplemented!()
+        let PaymentInstructions::Lightning(invoice) = try_f!(if_my_payment_sent_args
+            .payment_instructions
+            .clone()
+            .ok_or("payment_instructions can't be None"));
+        let payment_hash = PaymentHash((invoice.payment_hash()).into_inner());
+        let payment_hex = hex::encode(payment_hash.0);
+        let coin = self.clone();
+        let fut = async move {
+            match coin.db.get_payment_from_db(payment_hash).await {
+                Ok(maybe_payment) => Ok(maybe_payment.map(|p| p.payment_hash.into())),
+                Err(e) => ERR!(
+                    "Unable to check if payment {} is in db or not error: {}",
+                    payment_hex,
+                    e
+                ),
+            }
+        };
+        Box::new(fut.boxed().compat())
     }
 
+    // Todo: need to also check on-chain spending
     async fn search_for_swap_tx_spend_my(
         &self,
-        _: SearchForSwapTxSpendInput<'_>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        unimplemented!()
+        let payment_hash = payment_hash_from_slice(input.tx).map_err(|e| e.to_string())?;
+        let payment_hex = hex::encode(payment_hash.0);
+        match self.db.get_payment_from_db(payment_hash).await {
+            Ok(Some(payment)) => {
+                if !payment.is_outbound() {
+                    return ERR!("Payment {} should be an outbound payment!", payment_hex);
+                }
+                match payment.status {
+                    HTLCStatus::Pending => Ok(None),
+                    HTLCStatus::Succeeded => Ok(Some(FoundSwapTxSpend::Spent(TransactionEnum::LightningPayment(
+                        payment_hash,
+                    )))),
+                    HTLCStatus::Received => {
+                        ERR!(
+                            "Payment {} has an invalid status of {} in the db",
+                            payment_hex,
+                            payment.status
+                        )
+                    },
+                    HTLCStatus::Failed => Ok(Some(FoundSwapTxSpend::Refunded(TransactionEnum::LightningPayment(
+                        payment_hash,
+                    )))),
+                }
+            },
+            Ok(None) => ERR!("Payment {} is not in the database when it should be!", payment_hex),
+            Err(e) => ERR!(
+                "Unable to retrieve payment {} from the database error: {}",
+                payment_hex,
+                e
+            ),
+        }
     }
 
+    // Todo: need to also check on-chain spending
     async fn search_for_swap_tx_spend_other(
         &self,
-        _: SearchForSwapTxSpendInput<'_>,
+        input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String> {
-        unimplemented!()
+        let payment_hash = payment_hash_from_slice(input.tx).map_err(|e| e.to_string())?;
+        let payment_hex = hex::encode(payment_hash.0);
+        match self.db.get_payment_from_db(payment_hash).await {
+            Ok(Some(payment)) => {
+                if payment.is_outbound() {
+                    return ERR!("Payment {} should be an inbound payment!", payment_hex);
+                }
+                match payment.status {
+                    HTLCStatus::Pending | HTLCStatus::Received => Ok(None),
+                    HTLCStatus::Succeeded => Ok(Some(FoundSwapTxSpend::Spent(TransactionEnum::LightningPayment(
+                        payment_hash,
+                    )))),
+                    HTLCStatus::Failed => Ok(Some(FoundSwapTxSpend::Refunded(TransactionEnum::LightningPayment(
+                        payment_hash,
+                    )))),
+                }
+            },
+            Ok(None) => ERR!("Payment {} is not in the database when it should be!", payment_hex),
+            Err(e) => ERR!(
+                "Unable to retrieve payment {} from the database error: {}",
+                payment_hex,
+                e
+            ),
+        }
+    }
+
+    fn check_tx_signed_by_pub(&self, _tx: &[u8], _expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
     }
 
-    fn extract_secret(&self, _secret_hash: &[u8], _spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+    async fn extract_secret(&self, _secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+        let payment_hash = payment_hash_from_slice(spend_tx).map_err(|e| e.to_string())?;
+        let payment_hex = hex::encode(payment_hash.0);
+
+        match self.db.get_payment_from_db(payment_hash).await {
+            Ok(Some(payment)) => match payment.preimage {
+                Some(preimage) => Ok(preimage.0.to_vec()),
+                None => ERR!("Preimage for payment {} should be found on the database", payment_hex),
+            },
+            Ok(None) => ERR!("Payment {} is not in the database when it should be!", payment_hex),
+            Err(e) => ERR!(
+                "Unable to retrieve payment {} from the database error: {}",
+                payment_hex,
+                e
+            ),
+        }
+    }
+
+    fn is_auto_refundable(&self) -> bool { true }
+
+    async fn wait_for_htlc_refund(&self, tx: &[u8], locktime: u64) -> RefundResult<()> {
+        let payment_hash = payment_hash_from_slice(tx).map_err(|e| RefundError::DecodeErr(e.to_string()))?;
+        let payment_hex = hex::encode(payment_hash.0);
+        repeatable!(async {
+            match self.db.get_payment_from_db(payment_hash).await {
+                Ok(Some(payment)) => match payment.status {
+                    HTLCStatus::Failed => Ready(Ok(())),
+                    HTLCStatus::Pending => Retry(()),
+                    _ => Ready(MmError::err(RefundError::Internal(ERRL!(
+                        "Payment {} has an invalid status of {} in the db",
+                        payment_hex,
+                        payment.status
+                    )))),
+                },
+                Ok(None) => Ready(MmError::err(RefundError::Internal(ERRL!(
+                    "Payment {} is not in the database when it should be!",
+                    payment_hex
+                )))),
+                Err(e) => Ready(MmError::err(RefundError::DbError(ERRL!(
+                    "Error getting payment {} from db: {}",
+                    payment_hex,
+                    e
+                )))),
+            }
+        })
+        .repeat_every_secs(WAIT_FOR_REFUND_INTERVAL)
+        .until_s(locktime)
+        .await
+        .map_err(|e| RefundError::Timeout(format!("{:?}", e)))?
+    }
 
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
-        unimplemented!()
+        Ok(None)
+    }
+
+    // Todo: This can be changed if private swaps were to be implemented for lightning
+    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)
+    }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, _swap_unique_data: &[u8]) -> Vec<u8> {
+        self.channel_manager.get_our_node_id().serialize().to_vec()
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
     }
 
-    fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { unimplemented!() }
+    async fn maker_payment_instructions(
+        &self,
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+        maker_lock_duration: u64,
+        expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        let min_final_cltv_expiry = self.estimate_blocks_from_duration(maker_lock_duration);
+        self.swap_payment_instructions(secret_hash, amount, expires_in, min_final_cltv_expiry)
+            .await
+            .map(Some)
+    }
+
+    #[inline]
+    async fn taker_payment_instructions(
+        &self,
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+        expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        self.swap_payment_instructions(secret_hash, amount, expires_in, MIN_FINAL_CLTV_EXPIRY as u64)
+            .await
+            .map(Some)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        instructions: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        let min_final_cltv_expiry = self.estimate_blocks_from_duration(maker_lock_duration);
+        self.validate_swap_instructions(instructions, secret_hash, amount, min_final_cltv_expiry)
+    }
+
+    #[inline]
+    fn validate_taker_payment_instructions(
+        &self,
+        instructions: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        self.validate_swap_instructions(instructions, secret_hash, amount, MIN_FINAL_CLTV_EXPIRY as u64)
+    }
+
+    fn maker_locktime_multiplier(&self) -> f64 { 1.5 }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for LightningCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, maker_payment: &[u8]) -> RefundResult<()> {
+        self.on_swap_refund(maker_payment).await
+    }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for LightningCoin {
+    async fn on_maker_payment_refund_start(&self, taker_payment: &[u8]) -> RefundResult<()> {
+        self.on_swap_refund(taker_payment).await
+    }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[derive(Debug, Display)]
+pub enum PaymentHashFromSliceErr {
+    #[display(fmt = "Invalid data length of {}", _0)]
+    InvalidLength(usize),
+}
+
+fn payment_hash_from_slice(data: &[u8]) -> Result<PaymentHash, PaymentHashFromSliceErr> {
+    let len = data.len();
+    if len != 32 {
+        return Err(PaymentHashFromSliceErr::InvalidLength(len));
+    }
+    let mut hash = [b' '; 32];
+    hash.copy_from_slice(data);
+    Ok(PaymentHash(hash))
+}
+
+#[async_trait]
+impl WatcherOps for LightningCoin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        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 my_address(&self) -> MmResult<String, MyAddressError> { Ok(self.my_node_id()) }
 
-    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { Ok(self.my_node_id()) }
 
     fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
         let mut _message_prefix = self.conf.sign_message_prefix.clone()?;
@@ -401,7 +1016,7 @@ impl MarketCoinOps for LightningCoin {
             checksum_type: ChecksumType::DSHA256,
         };
         let signature = private.sign_compact(&H256::from(message_hash))?;
-        Ok(zbase32::encode_full_bytes(&*signature))
+        Ok(zbase32::encode_full_bytes(&signature))
     }
 
     fn verify_message(&self, signature: &str, message: &str, pubkey: &str) -> VerificationResult<bool> {
@@ -416,14 +1031,19 @@ impl MarketCoinOps for LightningCoin {
         Ok(recovered_pubkey.to_string() == pubkey)
     }
 
+    // Todo: max_inbound_in_flight_htlc_percent should be taken in consideration too for max allowed amount, this can be considered the spendable balance,
+    // Todo: but it's better to refactor the CoinBalance struct to add more info. We can make it 100% in the config for now until this is implemented.
     fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let coin = self.clone();
         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),
+        let fut = async move {
+            let (spendable_msat, unspendable_msat) = coin.get_balance_msat().await;
+            Ok(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))
+        Box::new(fut.boxed().compat())
     }
 
     fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
@@ -450,31 +1070,132 @@ impl MarketCoinOps for LightningCoin {
         ))
     }
 
-    // Todo: Implement this when implementing swaps for lightning as it's is used mainly for swaps
+    // Todo: Add waiting for confirmations logic for the case of if the channel is closed and the htlc can be claimed on-chain
     fn wait_for_confirmations(
         &self,
-        _tx: &[u8],
+        tx: &[u8],
         _confirmations: u64,
         _requires_nota: bool,
-        _wait_until: u64,
-        _check_every: u64,
+        wait_until: u64,
+        check_every: u64,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
+        let payment_hash = try_f!(payment_hash_from_slice(tx).map_err(|e| e.to_string()));
+        let payment_hex = hex::encode(payment_hash.0);
+
+        let coin = self.clone();
+        let fut = async move {
+            loop {
+                if now_ms() / 1000 > wait_until {
+                    return ERR!(
+                        "Waited too long until {} for payment {} to be received",
+                        wait_until,
+                        payment_hex
+                    );
+                }
+
+                match coin.db.get_payment_from_db(payment_hash).await {
+                    Ok(Some(payment)) => {
+                        match payment.payment_type {
+                            PaymentType::OutboundPayment { .. } => match payment.status {
+                                HTLCStatus::Pending | HTLCStatus::Succeeded => return Ok(()),
+                                HTLCStatus::Received => {
+                                    return ERR!(
+                                        "Payment {} has an invalid status of {} in the db",
+                                        payment_hex,
+                                        payment.status
+                                    )
+                                },
+                                // Todo: PaymentFailed event is fired after 5 retries, maybe timeout should be used instead.
+                                // Todo: Still this doesn't prevent failure if there are no routes
+                                // Todo: JIT channels/routing can be used to solve this issue https://github.com/lightningdevkit/rust-lightning/pull/1835 but it requires some trust.
+                                HTLCStatus::Failed => return ERR!("Lightning swap payment {} failed", payment_hex),
+                            },
+                            PaymentType::InboundPayment => match payment.status {
+                                HTLCStatus::Received | HTLCStatus::Succeeded => return Ok(()),
+                                HTLCStatus::Pending => info!("Payment {} not received yet!", payment_hex),
+                                HTLCStatus::Failed => return ERR!("Lightning swap payment {} failed", payment_hex),
+                            },
+                        }
+                    },
+                    Ok(None) => info!("Payment {} not received yet!", payment_hex),
+                    Err(e) => return ERR!("Error getting payment {} from db: {}", payment_hex, e),
+                }
+
+                // note: When sleeping for only 1 second the test_send_payment_and_swaps unit test took 20 seconds to complete instead of 37 seconds when WAIT_CONFIRM_INTERVAL (15 seconds) is used
+                // Todo: In next sprints, should add a mutex for lightning swap payments to avoid overloading the shared db connection with requests when the sleep time is reduced and multiple swaps are ran together
+                // Todo: The aim is to make lightning swap payments as fast as possible. Running swap payments statuses should be loaded from db on restarts in this case.
+                Timer::sleep(check_every as f64).await;
+            }
+        };
+        Box::new(fut.boxed().compat())
     }
 
-    // Todo: Implement this when implementing swaps for lightning as it's is used mainly for swaps
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
-        _transaction: &[u8],
-        _wait_until: u64,
+        transaction: &[u8],
+        _secret_hash: &[u8],
+        wait_until: u64,
         _from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        _check_every: f64,
     ) -> TransactionFut {
-        unimplemented!()
+        let payment_hash = try_tx_fus!(payment_hash_from_slice(transaction));
+        let payment_hex = hex::encode(payment_hash.0);
+
+        let coin = self.clone();
+        let fut = async move {
+            loop {
+                if now_ms() / 1000 > wait_until {
+                    return Err(TransactionErr::Plain(ERRL!(
+                        "Waited too long until {} for payment {} to be spent",
+                        wait_until,
+                        payment_hex
+                    )));
+                }
+
+                match coin.db.get_payment_from_db(payment_hash).await {
+                    Ok(Some(payment)) => match payment.status {
+                        HTLCStatus::Pending => (),
+                        HTLCStatus::Received => {
+                            return Err(TransactionErr::Plain(ERRL!(
+                                "Payment {} has an invalid status of {} in the db",
+                                payment_hex,
+                                payment.status
+                            )))
+                        },
+                        HTLCStatus::Succeeded => return Ok(TransactionEnum::LightningPayment(payment_hash)),
+                        HTLCStatus::Failed => {
+                            return Err(TransactionErr::Plain(ERRL!(
+                                "Lightning swap payment {} failed",
+                                payment_hex
+                            )))
+                        },
+                    },
+                    Ok(None) => return Err(TransactionErr::Plain(ERRL!("Payment {} not found in DB", payment_hex))),
+                    Err(e) => {
+                        return Err(TransactionErr::Plain(ERRL!(
+                            "Error getting payment {} from db: {}",
+                            payment_hex,
+                            e
+                        )))
+                    },
+                }
+
+                // note: When sleeping for only 1 second the test_send_payment_and_swaps unit test took 20 seconds to complete instead of 37 seconds when sleeping for 10 seconds
+                // Todo: In next sprints, should add a mutex for lightning swap payments to avoid overloading the shared db connection with requests when the sleep time is reduced and multiple swaps are ran together.
+                // Todo: The aim is to make lightning swap payments as fast as possible, more sleep time can be allowed for maker payment since it waits for the secret to be revealed on another chain first.
+                // Todo: Running swap payments statuses should be loaded from db on restarts in this case.
+                Timer::sleep(10.).await;
+            }
+        };
+        Box::new(fut.boxed().compat())
     }
 
-    // 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 tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        Ok(TransactionEnum::LightningPayment(
+            payment_hash_from_slice(bytes).map_to_mm(|e| TxMarshalingErr::InvalidInput(e.to_string()))?,
+        ))
+    }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { Box::new(futures01::future::ok(0)) }
 
@@ -483,22 +1204,39 @@ impl MarketCoinOps for LightningCoin {
             .keys_manager
             .get_node_secret(Recipient::Node)
             .map_err(|_| "Unsupported recipient".to_string())?
+            .display_secret()
             .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: min_tx_amount should depend on inbound_htlc_minimum_msat of the channel/s the payment will be sent through, 1 satoshi is used for for now (1000 of the base unit of lightning which is msat)
+    fn min_tx_amount(&self) -> BigDecimal { big_decimal_from_sat(1000, self.decimals()) }
 
-    // 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!() }
+    // Todo: Equals to min_tx_amount for now (1 satoshi), should change this later
+    fn min_trading_vol(&self) -> MmNumber { self.min_tx_amount().into() }
 }
 
 #[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 spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.platform.abortable_system) }
+
+    fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut {
+        let fut = async move {
+            MmError::err(RawTransactionError::InternalError(
+                "get_raw_transaction method is not supported for lightning, please use get_payment_details method instead.".into(),
+            ))
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn get_tx_hex_by_hash(&self, _tx_hash: Vec<u8>) -> RawTransactionFut {
+        let fut = async move {
+            MmError::err(RawTransactionError::InternalError(
+                "get_tx_hex_by_hash method is not supported for lightning.".into(),
+            ))
+        };
+        Box::new(fut.boxed().compat())
     }
 
     fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut {
@@ -538,25 +1276,39 @@ impl MmCoin for LightningCoin {
     // 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
+    // Todo: This uses dummy data for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
     async fn get_sender_trade_fee(
         &self,
         _value: TradePreimageValue,
         _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
-        unimplemented!()
+        Ok(TradeFee {
+            coin: self.ticker().to_owned(),
+            amount: Default::default(),
+            paid_from_trading_vol: false,
+        })
     }
 
-    // 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: This uses dummy data for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        Box::new(futures01::future::ok(TradeFee {
+            coin: self.ticker().to_owned(),
+            amount: Default::default(),
+            paid_from_trading_vol: false,
+        }))
+    }
 
-    // Todo: Implement this when implementing swaps for lightning as it's is used only for swaps
+    // Todo: This uses dummy data for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
     async fn get_fee_to_send_taker_fee(
         &self,
         _dex_fee_amount: BigDecimal,
         _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
-        unimplemented!()
+        Ok(TradeFee {
+            coin: self.ticker().to_owned(),
+            amount: Default::default(),
+            paid_from_trading_vol: false,
+        })
     }
 
     // Lightning payments are either pending, successful or failed. Once a payment succeeds there is no need to for confirmations
@@ -571,1015 +1323,17 @@ impl MmCoin for LightningCoin {
 
     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?;
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { None }
 
-    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)))?;
-    }
+    fn mature_confirmations(&self) -> Option<u32> { None }
 
-    Ok(format!("Initiated closing of channel: {:?}", req.channel_id))
-}
+    // Todo: This uses default data for now for the sake of swap P.O.C., this should be implemented probably when implementing order matching if it's needed
+    fn coin_protocol_info(&self) -> Vec<u8> { Vec::new() }
 
-/// 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,
-    },
-}
+    // Todo: This uses default data for now for the sake of swap P.O.C., this should be implemented probably when implementing order matching if it's needed
+    fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { true }
 
-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,
-}
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.platform.abortable_system) }
 
-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)
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
diff --git a/mm2src/coins/lightning/ln_conf.rs b/mm2src/coins/lightning/ln_conf.rs
index f69a9bca10..dd58946969 100644
--- a/mm2src/coins/lightning/ln_conf.rs
+++ b/mm2src/coins/lightning/ln_conf.rs
@@ -2,26 +2,20 @@ 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,
+pub struct PlatformCoinConfirmationTargets {
+    pub background: u32,
+    pub normal: u32,
+    pub high_priority: u32,
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct PlatformCoinConfirmations {
-    pub background: DefaultFeesAndConfirmations,
-    pub normal: DefaultFeesAndConfirmations,
-    pub high_priority: DefaultFeesAndConfirmations,
-}
-
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct LightningProtocolConf {
     pub platform_coin_ticker: String,
     pub network: BlockchainNetwork,
-    pub confirmations: PlatformCoinConfirmations,
+    pub confirmation_targets: PlatformCoinConfirmationTargets,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct ChannelOptions {
     /// Amount (in millionths of a satoshi) charged per satoshi for payments forwarded outbound
     /// over the channel.
@@ -30,11 +24,6 @@ pub struct ChannelOptions {
     /// 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>,
@@ -44,7 +33,7 @@ pub struct ChannelOptions {
 }
 
 impl ChannelOptions {
-    pub fn update(&mut self, options: ChannelOptions) {
+    pub fn update_according_to(&mut self, options: ChannelOptions) {
         if let Some(fee) = options.proportional_fee_in_millionths_sats {
             self.proportional_fee_in_millionths_sats = Some(fee);
         }
@@ -57,14 +46,6 @@ impl ChannelOptions {
             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);
         }
@@ -91,14 +72,6 @@ impl From<ChannelOptions> for ChannelConfig {
             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;
         }
@@ -112,7 +85,7 @@ impl From<ChannelOptions> for ChannelConfig {
 }
 
 #[derive(Clone, Debug, Deserialize)]
-pub struct OurChannelsConfig {
+pub struct OurChannelsConfigs {
     /// 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
@@ -124,10 +97,55 @@ pub struct OurChannelsConfig {
     /// 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>,
+    /// If set, we attempt to negotiate the `scid_privacy` (referred to as `scid_alias` in the
+    /// BOLTs) option for outbound private channels. This provides better privacy by not including
+    /// our real on-chain channel UTXO in each invoice and requiring that our counterparty only
+    /// relay HTLCs to us using the channel's SCID alias.
+    pub negotiate_scid_privacy: Option<bool>,
+    /// Sets the percentage of the channel value we will cap the total value of outstanding inbound
+    /// HTLCs to.
+    pub max_inbound_in_flight_htlc_percent: Option<u8>,
+    /// 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>,
+}
+
+impl OurChannelsConfigs {
+    pub fn update_according_to(&mut self, config: OurChannelsConfigs) {
+        if let Some(confs) = config.inbound_channels_confirmations {
+            self.inbound_channels_confirmations = Some(confs);
+        }
+
+        if let Some(delay) = config.counterparty_locktime {
+            self.counterparty_locktime = Some(delay);
+        }
+
+        if let Some(min) = config.our_htlc_minimum_msat {
+            self.our_htlc_minimum_msat = Some(min);
+        }
+
+        if let Some(scid_privacy) = config.negotiate_scid_privacy {
+            self.negotiate_scid_privacy = Some(scid_privacy);
+        }
+
+        if let Some(max_inbound_htlc) = config.max_inbound_in_flight_htlc_percent {
+            self.max_inbound_in_flight_htlc_percent = Some(max_inbound_htlc);
+        }
+
+        if let Some(announce) = config.announced_channel {
+            self.announced_channel = Some(announce);
+        }
+
+        if let Some(commit) = config.commit_upfront_shutdown_pubkey {
+            self.commit_upfront_shutdown_pubkey = Some(commit);
+        }
+    }
 }
 
-impl From<OurChannelsConfig> for ChannelHandshakeConfig {
-    fn from(config: OurChannelsConfig) -> Self {
+impl From<OurChannelsConfigs> for ChannelHandshakeConfig {
+    fn from(config: OurChannelsConfigs) -> Self {
         let mut channel_handshake_config = ChannelHandshakeConfig::default();
 
         if let Some(confs) = config.inbound_channels_confirmations {
@@ -142,6 +160,22 @@ impl From<OurChannelsConfig> for ChannelHandshakeConfig {
             channel_handshake_config.our_htlc_minimum_msat = min;
         }
 
+        if let Some(scid_privacy) = config.negotiate_scid_privacy {
+            channel_handshake_config.negotiate_scid_privacy = scid_privacy;
+        }
+
+        if let Some(max_inbound_htlc) = config.max_inbound_in_flight_htlc_percent {
+            channel_handshake_config.max_inbound_htlc_value_in_flight_percent_of_channel = max_inbound_htlc;
+        }
+
+        if let Some(announce) = config.announced_channel {
+            channel_handshake_config.announced_channel = announce;
+        }
+
+        if let Some(commit) = config.commit_upfront_shutdown_pubkey {
+            channel_handshake_config.commit_upfront_shutdown_pubkey = commit;
+        }
+
         channel_handshake_config
     }
 }
@@ -150,6 +184,8 @@ impl From<OurChannelsConfig> for ChannelHandshakeConfig {
 pub struct CounterpartyLimits {
     /// Minimum allowed satoshis when an inbound channel is funded.
     pub min_funding_sats: Option<u64>,
+    /// Maximum allowed satoshis when an inbound channel is funded.
+    pub max_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>,
@@ -169,6 +205,9 @@ pub struct CounterpartyLimits {
     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>,
+    /// When set an outbound channel can be used straight away without waiting for any on-chain confirmations.
+    /// https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelHandshakeLimits.html#structfield.trust_own_funding_0conf
+    pub allow_outbound_0conf: Option<bool>,
 }
 
 impl From<CounterpartyLimits> for ChannelHandshakeLimits {
@@ -179,6 +218,10 @@ impl From<CounterpartyLimits> for ChannelHandshakeLimits {
             channel_handshake_limits.min_funding_satoshis = sats;
         }
 
+        if let Some(sats) = limits.max_funding_sats {
+            channel_handshake_limits.max_funding_satoshis = sats;
+        }
+
         if let Some(msat) = limits.max_htlc_minimum_msat {
             channel_handshake_limits.max_htlc_minimum_msat = msat;
         }
@@ -199,6 +242,10 @@ impl From<CounterpartyLimits> for ChannelHandshakeLimits {
             channel_handshake_limits.max_minimum_depth = confs;
         }
 
+        if let Some(is_0conf) = limits.allow_outbound_0conf {
+            channel_handshake_limits.trust_own_funding_0conf = is_0conf;
+        }
+
         if let Some(pref) = limits.force_announced_channel_preference {
             channel_handshake_limits.force_announced_channel_preference = pref;
         }
@@ -219,7 +266,7 @@ pub struct LightningCoinConf {
     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 our_channels_configs: Option<OurChannelsConfigs>,
     pub counterparty_channel_config_limits: Option<CounterpartyLimits>,
     pub sign_message_prefix: Option<String>,
 }
@@ -227,14 +274,14 @@ pub struct LightningCoinConf {
 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(config) = conf.our_channels_configs {
+            user_config.channel_handshake_config = config.into();
         }
         if let Some(limits) = conf.counterparty_channel_config_limits {
-            user_config.peer_channel_config_limits = limits.into();
+            user_config.channel_handshake_limits = limits.into();
         }
         if let Some(options) = conf.channel_options {
-            user_config.channel_options = options.into();
+            user_config.channel_config = options.into();
         }
         if let Some(accept_forwards) = conf.accept_forwards_to_priv_channels {
             user_config.accept_forwards_to_priv_channels = accept_forwards;
diff --git a/mm2src/coins/lightning_persister/src/storage.rs b/mm2src/coins/lightning/ln_db.rs
similarity index 63%
rename from mm2src/coins/lightning_persister/src/storage.rs
rename to mm2src/coins/lightning/ln_db.rs
index c0b9ac7e9d..8ad4455a24 100644
--- a/mm2src/coins/lightning_persister/src/storage.rs
+++ b/mm2src/coins/lightning/ln_db.rs
@@ -1,53 +1,21 @@
 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 lightning::ln::{PaymentHash, PaymentPreimage};
+use secp256k1v22::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 struct DBChannelDetails {
+    pub rpc_id: i64,
     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>,
+    pub funding_value: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub closing_tx: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -57,16 +25,16 @@ pub struct SqlChannelDetails {
     #[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 funding_generated_in_block: Option<i64>,
     pub is_outbound: bool,
     pub is_public: bool,
     pub is_closed: bool,
-    pub created_at: u64,
+    pub created_at: i64,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub closed_at: Option<u64>,
+    pub closed_at: Option<i64>,
 }
 
-impl SqlChannelDetails {
+impl DBChannelDetails {
     #[inline]
     pub fn new(
         rpc_id: u64,
@@ -75,8 +43,8 @@ impl SqlChannelDetails {
         is_outbound: bool,
         is_public: bool,
     ) -> Self {
-        SqlChannelDetails {
-            rpc_id,
+        DBChannelDetails {
+            rpc_id: rpc_id as i64,
             channel_id: hex::encode(channel_id),
             counterparty_node_id: counterparty_node_id.to_string(),
             funding_tx: None,
@@ -89,7 +57,7 @@ impl SqlChannelDetails {
             is_outbound,
             is_public,
             is_closed: false,
-            created_at: now_ms() / 1000,
+            created_at: (now_ms() / 1000) as i64,
             closed_at: None,
         }
     }
@@ -112,8 +80,8 @@ 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 from_funding_value: Option<i64>,
+    pub to_funding_value: Option<i64>,
     pub closing_tx: Option<String>,
     pub closure_reason: Option<String>,
     pub claiming_tx: Option<String>,
@@ -124,7 +92,7 @@ pub struct ClosedChannelsFilter {
 }
 
 pub struct GetClosedChannelsResult {
-    pub channels: Vec<SqlChannelDetails>,
+    pub channels: Vec<DBChannelDetails>,
     pub skipped: usize,
     pub total: usize,
 }
@@ -133,6 +101,7 @@ pub struct GetClosedChannelsResult {
 #[serde(rename_all = "lowercase")]
 pub enum HTLCStatus {
     Pending,
+    Received,
     Succeeded,
     Failed,
 }
@@ -143,6 +112,7 @@ impl FromStr for HTLCStatus {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "Pending" => Ok(HTLCStatus::Pending),
+            "Received" => Ok(HTLCStatus::Received),
             "Succeeded" => Ok(HTLCStatus::Succeeded),
             "Failed" => Ok(HTLCStatus::Failed),
             _ => Err(FromSqlError::InvalidType),
@@ -162,25 +132,61 @@ pub struct PaymentInfo {
     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 amt_msat: Option<i64>,
+    pub fee_paid_msat: Option<i64>,
     pub status: HTLCStatus,
-    pub created_at: u64,
-    pub last_updated: u64,
+    pub created_at: i64,
+    pub last_updated: i64,
+}
+
+impl PaymentInfo {
+    #[inline]
+    pub fn new(
+        payment_hash: PaymentHash,
+        payment_type: PaymentType,
+        description: String,
+        amt_msat: Option<i64>,
+    ) -> PaymentInfo {
+        PaymentInfo {
+            payment_hash,
+            payment_type,
+            description,
+            preimage: None,
+            amt_msat,
+            fee_paid_msat: None,
+            status: HTLCStatus::Pending,
+            created_at: (now_ms() / 1000) as i64,
+            last_updated: (now_ms() / 1000) as i64,
+        }
+    }
+
+    #[inline]
+    pub fn with_preimage(mut self, preimage: PaymentPreimage) -> Self {
+        self.preimage = Some(preimage);
+        self
+    }
+
+    #[inline]
+    pub fn with_status(mut self, status: HTLCStatus) -> Self {
+        self.status = status;
+        self
+    }
+
+    pub(crate) fn is_outbound(&self) -> bool { matches!(self.payment_type, PaymentType::OutboundPayment { .. }) }
 }
 
 #[derive(Clone)]
-pub struct PaymentsFilter {
-    pub payment_type: Option<PaymentType>,
+pub struct DBPaymentsFilter {
+    pub is_outbound: Option<bool>,
+    pub destination: Option<String>,
     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 status: Option<String>,
+    pub from_amount_msat: Option<i64>,
+    pub to_amount_msat: Option<i64>,
+    pub from_fee_paid_msat: Option<i64>,
+    pub to_fee_paid_msat: Option<i64>,
+    pub from_timestamp: Option<i64>,
+    pub to_timestamp: Option<i64>,
 }
 
 pub struct GetPaymentsResult {
@@ -190,7 +196,7 @@ pub struct GetPaymentsResult {
 }
 
 #[async_trait]
-pub trait DbStorage {
+pub trait LightningDB {
     type Error;
 
     /// Initializes tables in DB.
@@ -204,35 +210,37 @@ pub trait DbStorage {
 
     /// 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>;
+    async fn add_channel_to_db(&self, details: &DBChannelDetails) -> 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,
+        rpc_id: i64,
         funding_tx: String,
-        funding_value: u64,
-        funding_generated_in_block: u64,
+        funding_value: i64,
+        funding_generated_in_block: i64,
     ) -> 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>;
+    async fn update_funding_tx_block_height(&self, funding_tx: String, block_height: i64) -> 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,
+        rpc_id: i64,
         closure_reason: String,
-        close_at: u64,
+        close_at: i64,
     ) -> 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>;
+    /// Gets the list of closed channels records in the DB that have funding tx hashes saved with no closing
+    /// tx hashes 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<DBChannelDetails>, 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>;
+    async fn add_closing_tx_to_db(&self, rpc_id: i64, 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.
@@ -244,7 +252,7 @@ pub trait DbStorage {
     ) -> 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>;
+    async fn get_channel_from_db(&self, rpc_id: u64) -> Result<Option<DBChannelDetails>, 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
@@ -256,8 +264,33 @@ pub trait DbStorage {
         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>;
+    /// Inserts a new payment record in the DB.
+    async fn add_payment_to_db(&self, info: &PaymentInfo) -> Result<(), Self::Error>;
+
+    /// Updates a payment's preimage in DB by the payment's hash.
+    async fn update_payment_preimage_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+    ) -> Result<(), Self::Error>;
+
+    /// Updates a payment's status in DB by the payment's hash.
+    async fn update_payment_status_in_db(&self, hash: PaymentHash, status: &HTLCStatus) -> Result<(), Self::Error>;
+
+    /// Updates a payment's status to received in DB by the payment's hash. Also, adds the payment preimage to the db.
+    async fn update_payment_to_received_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+    ) -> Result<(), Self::Error>;
+
+    /// Updates a sent payment status to succeeded in DB by the payment's hash. Also, adds the payment preimage and the amount of fees paid to the db.
+    async fn update_payment_to_sent_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+        fee_paid_msat: Option<u64>,
+    ) -> 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>;
@@ -267,7 +300,7 @@ pub trait DbStorage {
     /// 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>,
+        filter: Option<DBPaymentsFilter>,
         paging: PagingOptionsEnum<PaymentHash>,
         limit: usize,
     ) -> Result<GetPaymentsResult, Self::Error>;
diff --git a/mm2src/coins/lightning/ln_errors.rs b/mm2src/coins/lightning/ln_errors.rs
index 72b581f647..5b349fd43a 100644
--- a/mm2src/coins/lightning/ln_errors.rs
+++ b/mm2src/coins/lightning/ln_errors.rs
@@ -1,31 +1,18 @@
 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 crate::PrivKeyPolicyNotAllowed;
+use common::executor::AbortedError;
 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;
+use rpc_task::RpcTaskError;
+use std::num::TryFromIntError;
 
 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)]
+#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum EnableLightningError {
     #[display(fmt = "Invalid request: {}", _0)]
@@ -40,30 +27,37 @@ pub enum EnableLightningError {
     InvalidAddress(String),
     #[display(fmt = "Invalid path: {}", _0)]
     InvalidPath(String),
+    #[display(fmt = "Private key policy is not allowed: {}", _0)]
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     #[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),
+    #[display(fmt = "Rpc task error: {}", _0)]
+    RpcTaskError(String),
     ConnectToNodeError(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
 }
 
 impl HttpStatusCode for EnableLightningError {
     fn status_code(&self) -> StatusCode {
         match self {
-            EnableLightningError::InvalidRequest(_) | EnableLightningError::RpcError(_) => StatusCode::BAD_REQUEST,
+            EnableLightningError::InvalidRequest(_)
+            | EnableLightningError::RpcError(_)
+            | EnableLightningError::PrivKeyPolicyNotAllowed(_) => 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,
+            | EnableLightningError::DbError(_)
+            | EnableLightningError::RpcTaskError(_)
+            | EnableLightningError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }
@@ -76,424 +70,23 @@ 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 From<UtxoRpcError> for EnableLightningError {
+    fn from(e: UtxoRpcError) -> Self { EnableLightningError::RpcError(e.to_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<PrivKeyPolicyNotAllowed> for EnableLightningError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { EnableLightningError::PrivKeyPolicyNotAllowed(e) }
 }
 
-impl From<CoinFindError> for ListChannelsError {
-    fn from(e: CoinFindError) -> Self {
-        match e {
-            CoinFindError::NoSuchCoin { coin } => ListChannelsError::NoSuchCoin(coin),
-        }
-    }
+impl From<RpcTaskError> for EnableLightningError {
+    fn from(e: RpcTaskError) -> Self { EnableLightningError::RpcTaskError(e.to_string()) }
 }
 
-impl From<SqlError> for ListChannelsError {
-    fn from(err: SqlError) -> ListChannelsError { ListChannelsError::DbError(err.to_string()) }
+impl From<AbortedError> for EnableLightningError {
+    fn from(e: AbortedError) -> Self { EnableLightningError::Internal(e.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)]
+#[derive(Display, PartialEq)]
 pub enum SaveChannelClosingError {
     #[display(fmt = "DB error: {}", _0)]
     DbError(String),
@@ -507,55 +100,14 @@ pub enum SaveChannelClosingError {
     FundingTxParseError(String),
     #[display(fmt = "Error while waiting for the funding transaction to be spent: {}", _0)]
     WaitForFundingTxSpendError(String),
+    #[display(fmt = "Error while converting types: {}", _0)]
+    ConversionError(TryFromIntError),
 }
 
 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) }
+impl From<TryFromIntError> for SaveChannelClosingError {
+    fn from(err: TryFromIntError) -> SaveChannelClosingError { SaveChannelClosingError::ConversionError(err) }
 }
diff --git a/mm2src/coins/lightning/ln_events.rs b/mm2src/coins/lightning/ln_events.rs
index 3f898e4fa3..351191e1c0 100644
--- a/mm2src/coins/lightning/ln_events.rs
+++ b/mm2src/coins/lightning/ln_events.rs
@@ -1,28 +1,37 @@
 use super::*;
+use crate::lightning::ln_db::{DBChannelDetails, HTLCStatus, LightningDB, PaymentType};
 use crate::lightning::ln_errors::{SaveChannelClosingError, SaveChannelClosingResult};
+use crate::lightning::ln_sql::SqliteLightningDB;
 use bitcoin::blockdata::script::Script;
 use bitcoin::blockdata::transaction::Transaction;
-use common::executor::{spawn, Timer};
+use bitcoin::consensus::encode::serialize_hex;
+use common::executor::{AbortSettings, SpawnAbortable, SpawnFuture, Timer};
 use common::log::{error, info};
 use common::now_ms;
 use core::time::Duration;
-use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
+use futures::compat::Future01CompatExt;
+use lightning::chain::chaininterface::{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 secp256k1v22::Secp256k1;
+use std::convert::{TryFrom, TryInto};
 use std::sync::Arc;
 use utxo_signer::with_key_pair::sign_tx;
 
 const TRY_LOOP_INTERVAL: f64 = 60.;
+/// 1 second.
+const CRITICAL_FUTURE_TIMEOUT: f64 = 1.0;
+pub const SUCCESSFUL_CLAIM_LOG: &str = "Successfully claimed payment";
+pub const SUCCESSFUL_SEND_LOG: &str = "Successfully sent payment";
 
 pub struct LightningEventHandler {
     platform: Arc<Platform>,
     channel_manager: Arc<ChannelManager>,
     keys_manager: Arc<KeysManager>,
-    persister: Arc<LightningPersister>,
+    db: SqliteLightningDB,
+    trusted_nodes: TrustedNodesShared,
 }
 
 impl EventHandler for LightningEventHandler {
@@ -33,18 +42,20 @@ impl EventHandler for LightningEventHandler {
                 channel_value_satoshis,
                 output_script,
                 user_channel_id,
+                counterparty_node_id,
             } => self.handle_funding_generation_ready(
                 *temporary_channel_id,
                 *channel_value_satoshis,
                 output_script,
                 *user_channel_id,
+                counterparty_node_id,
             ),
 
             Event::PaymentReceived {
                 payment_hash,
-                amt,
+                amount_msat,
                 purpose,
-            } => self.handle_payment_received(*payment_hash, *amt, purpose),
+            } => self.handle_payment_received(*payment_hash, *amount_msat, purpose.clone()),
 
             Event::PaymentSent {
                 payment_preimage,
@@ -53,16 +64,20 @@ impl EventHandler for LightningEventHandler {
                 ..
             } => self.handle_payment_sent(*payment_preimage, *payment_hash, *fee_paid_msat),
 
+            Event::PaymentClaimed { payment_hash, amount_msat, .. } => self.handle_payment_claimed(*payment_hash, *amount_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),
+            Event::SpendableOutputs { outputs } => self.handle_spendable_outputs(outputs.clone()),
 
             // 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?: {}",
+            Event::PaymentForwarded { fee_earned_msat, claim_from_onchain_tx,  prev_channel_id, next_channel_id} => info!(
+                "Received a fee of {} milli-satoshis for a successfully forwarded payment from {} to {} through our {} lightning node. Was the forwarded HTLC claimed by our counterparty via an on-chain transaction?: {}",
                 fee_earned_msat.unwrap_or_default(),
+                prev_channel_id.map(hex::encode).unwrap_or_else(|| "unknown".into()),
+                next_channel_id.map(hex::encode).unwrap_or_else(|| "unknown".into()),
                 self.platform.coin.ticker(),
                 claim_from_onchain_tx,
             ),
@@ -81,6 +96,7 @@ impl EventHandler for LightningEventHandler {
             ),
 
             // Handling updating channel penalties after successfully routing a payment along a path is done by the InvoicePayer.
+            // Todo: Maybe add information to db about why a payment succeeded using this event
             Event::PaymentPathSuccessful {
                 payment_id,
                 payment_hash,
@@ -93,7 +109,8 @@ impl EventHandler for LightningEventHandler {
             ),
 
             // 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. 
+            // Also abandoning or retrying a payment is handled by the InvoicePayer.
+            // Todo: Add information to db about why a payment failed using this event
             Event::PaymentPathFailed {
                 payment_hash,
                 rejected_by_dest,
@@ -114,35 +131,74 @@ impl EventHandler for LightningEventHandler {
                 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.
-                }
-            },
+            } => self.handle_open_channel_request(*temporary_channel_id, *counterparty_node_id, *funding_satoshis, *push_msat),
+
+            // Just log an error for now, but this event can be used along PaymentForwarded for a new RPC that shows stats about how a node
+            // forward payments over it's outbound channels which can be useful for a user that wants to run a forwarding node for some profits.
+            Event::HTLCHandlingFailed {
+                prev_channel_id, failed_next_destination
+            } => error!(
+                "Failed to handle htlc from {} to {:?}",
+                hex::encode(prev_channel_id),
+                failed_next_destination,
+            ),
+
+            // ProbeSuccessful and ProbeFailed are events in response to a send_probe function call which sends a payment that probes a given route for liquidity.
+            // send_probe is not used for now but may be used in order matching in the future to check if a swap can happen or not.
+            Event::ProbeSuccessful { .. } => (),
+            Event::ProbeFailed { .. } => (),
         }
     }
 }
 
+pub async fn init_abortable_events(platform: Arc<Platform>, db: SqliteLightningDB) -> EnableLightningResult<()> {
+    let closed_channels_without_closing_tx = db.get_closed_channels_with_no_closing_tx().await?;
+    for channel_details in closed_channels_without_closing_tx {
+        let platform_c = platform.clone();
+        let db = db.clone();
+        let user_channel_id = channel_details.rpc_id;
+        platform.spawner().spawn(async move {
+            if let Ok(closing_tx_hash) = platform_c
+                .get_channel_closing_tx(channel_details)
+                .await
+                .error_log_passthrough()
+            {
+                if let Err(e) = db.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(())
+}
+
+#[derive(Display)]
+pub enum SignFundingTransactionError {
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+    #[display(fmt = "Error converting transaction: {}", _0)]
+    ConvertTxErr(String),
+    #[display(fmt = "Error signing transaction: {}", _0)]
+    TxSignFailed(String),
+}
+
 // 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> {
+) -> Result<Transaction, SignFundingTransactionError> {
     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!(
+                SignFundingTransactionError::Internal(format!(
                     "Unsigned funding tx not found for internal channel id: {}",
                     user_channel_id
                 ))
@@ -151,8 +207,16 @@ fn sign_funding_transaction(
     };
     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 my_address = coin
+        .as_ref()
+        .derivation_method
+        .single_addr_or_err()
+        .map_err(|e| SignFundingTransactionError::Internal(e.to_string()))?;
+    let key_pair = coin
+        .as_ref()
+        .priv_key_policy
+        .key_pair_or_err()
+        .map_err(|e| SignFundingTransactionError::Internal(e.to_string()))?;
 
     let prev_script = Builder::build_p2pkh(&my_address.hash);
     let signed = sign_tx(
@@ -161,45 +225,62 @@ fn sign_funding_transaction(
         prev_script,
         SignatureVersion::WitnessV0,
         coin.as_ref().conf.fork_id,
-    )?;
+    )
+    .map_err(|e| SignFundingTransactionError::TxSignFailed(e.to_string()))?;
 
-    Transaction::try_from(signed).map_to_mm(|e| OpenChannelError::ConvertTxErr(e.to_string()))
+    Transaction::try_from(signed).map_err(|e| SignFundingTransactionError::ConvertTxErr(e.to_string()))
 }
 
 async fn save_channel_closing_details(
-    persister: Arc<LightningPersister>,
+    db: SqliteLightningDB,
     platform: Arc<Platform>,
     user_channel_id: u64,
     reason: String,
 ) -> SaveChannelClosingResult<()> {
-    persister
-        .update_channel_to_closed(user_channel_id, reason, now_ms() / 1000)
+    db.update_channel_to_closed(user_channel_id as i64, reason, (now_ms() / 1000) as i64)
         .await?;
 
-    let channel_details = persister
+    let channel_details = db
         .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?;
+    db.add_closing_tx_to_db(user_channel_id as i64, closing_tx_hash).await?;
 
     Ok(())
 }
 
+async fn add_claiming_tx_to_db_loop(
+    db: SqliteLightningDB,
+    closing_txid: String,
+    claiming_txid: String,
+    claimed_balance: f64,
+) {
+    while let Err(e) = db
+        .add_claiming_tx_to_db(closing_txid.clone(), claiming_txid.clone(), claimed_balance)
+        .await
+    {
+        error!("error {}", e);
+        Timer::sleep(TRY_LOOP_INTERVAL).await;
+    }
+}
+
 impl LightningEventHandler {
     pub fn new(
         platform: Arc<Platform>,
         channel_manager: Arc<ChannelManager>,
         keys_manager: Arc<KeysManager>,
-        persister: Arc<LightningPersister>,
+        db: SqliteLightningDB,
+        trusted_nodes: TrustedNodesShared,
     ) -> Self {
         LightningEventHandler {
             platform,
             channel_manager,
             keys_manager,
-            persister,
+            db,
+            trusted_nodes,
         }
     }
 
@@ -209,10 +290,11 @@ impl LightningEventHandler {
         channel_value_satoshis: u64,
         output_script: &Script,
         user_channel_id: u64,
+        counterparty_node_id: &PublicKey,
     ) {
         info!(
-            "Handling FundingGenerationReady event for internal channel id: {}",
-            user_channel_id
+            "Handling FundingGenerationReady event for internal channel id: {} with: {}",
+            user_channel_id, counterparty_node_id
         );
         let funding_tx = match sign_funding_transaction(user_channel_id, output_script, self.platform.clone()) {
             Ok(tx) => tx,
@@ -227,92 +309,124 @@ impl LightningEventHandler {
         };
         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)
+        if let Err(e) =
+            self.channel_manager
+                .funding_transaction_generated(&temporary_channel_id, counterparty_node_id, funding_tx)
         {
             error!("{:?}", e);
             return;
         }
         let platform = self.platform.clone();
-        let persister = self.persister.clone();
-        spawn(async move {
+        let db = self.db.clone();
+
+        let fut = 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();
-        });
+            db.add_funding_tx_to_db(
+                user_channel_id as i64,
+                funding_txid.to_string(),
+                channel_value_satoshis as i64,
+                best_block_height as i64,
+            )
+            .await
+            .error_log();
+        };
+
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
     }
 
-    fn handle_payment_received(&self, payment_hash: PaymentHash, amt: u64, purpose: &PaymentPurpose) {
+    fn handle_payment_received(&self, payment_hash: PaymentHash, received_amount: u64, purpose: PaymentPurpose) {
         info!(
-            "Handling PaymentReceived event for payment_hash: {}",
-            hex::encode(payment_hash.0)
+            "Handling PaymentReceived event for payment_hash: {} with amount {}",
+            hex::encode(payment_hash.0),
+            received_amount
         );
-        let (payment_preimage, payment_secret) = match purpose {
-            PaymentPurpose::InvoicePayment {
-                payment_preimage,
-                payment_secret,
-            } => match payment_preimage {
-                Some(preimage) => (*preimage, Some(*payment_secret)),
-                None => return,
+        let db = self.db.clone();
+        let payment_preimage = match purpose {
+            PaymentPurpose::InvoicePayment { payment_preimage, .. } => match payment_preimage {
+                Some(preimage) => {
+                    let fut = async move {
+                        db.update_payment_to_received_in_db(payment_hash, preimage)
+                            .await
+                            .error_log_with_msg("Unable to update received payment info in DB!");
+                    };
+                    let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+                    self.platform.spawner().spawn_with_settings(fut, settings);
+                    preimage
+                },
+                // This is a swap related payment since we don't have the preimage yet
+                None => {
+                    let amt_msat = Some(
+                        received_amount
+                            .try_into()
+                            .expect("received_amount shouldn't exceed i64::MAX"),
+                    );
+                    let payment_info = PaymentInfo::new(
+                        payment_hash,
+                        PaymentType::InboundPayment,
+                        "Swap Payment".into(),
+                        amt_msat,
+                    )
+                    .with_status(HTLCStatus::Received);
+                    let fut = async move {
+                        db.add_payment_to_db(&payment_info)
+                            .await
+                            .error_log_with_msg("Unable to add payment information to DB!");
+                    };
+
+                    let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+                    self.platform.spawner().spawn_with_settings(fut, settings);
+
+                    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)
+            PaymentPurpose::SpontaneousPayment(preimage) => {
+                let amt_msat = Some(
+                    received_amount
+                        .try_into()
+                        .expect("received_amount shouldn't exceed i64::MAX"),
                 );
-                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,
+                let payment_info =
+                    PaymentInfo::new(payment_hash, PaymentType::InboundPayment, "keysend".into(), amt_msat)
+                        .with_preimage(preimage)
+                        .with_status(HTLCStatus::Received);
+                let fut = async move {
+                    db.add_payment_to_db(&payment_info)
+                        .await
+                        .error_log_with_msg("Unable to add payment information to DB!");
                 };
-                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);
-                    }
-                });
+
+                let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+                self.platform.spawner().spawn_with_settings(fut, settings);
+                preimage
             },
-        }
+        };
+        self.channel_manager.claim_funds(payment_preimage);
+    }
+
+    fn handle_payment_claimed(&self, payment_hash: PaymentHash, amount_msat: u64) {
+        info!(
+            "Received an amount of {} millisatoshis for payment hash {}",
+            amount_msat,
+            hex::encode(payment_hash.0)
+        );
+        let db = self.db.clone();
+        let fut = async move {
+            match db
+                .update_payment_status_in_db(payment_hash, &HTLCStatus::Succeeded)
+                .await
+            {
+                Ok(_) => info!(
+                    "{} of {} millisatoshis with payment hash {}",
+                    SUCCESSFUL_CLAIM_LOG,
+                    amount_msat,
+                    hex::encode(payment_hash.0),
+                ),
+                Err(e) => error!("Unable to update payment status in DB error: {}", e),
+            }
+        };
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
     }
 
     fn handle_payment_sent(
@@ -325,28 +439,22 @@ impl LightningEventHandler {
             "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)
+        let db = self.db.clone();
+        let fut = async move {
+            match db
+                .update_payment_to_sent_in_db(payment_hash, payment_preimage, fee_paid_msat)
                 .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(),
+                Ok(_) => info!(
+                    "{} with payment hash {}",
+                    SUCCESSFUL_SEND_LOG,
                     hex::encode(payment_hash.0)
-                );
+                ),
+                Err(e) => error!("Unable to update sent payment info in DB error: {}", e),
             }
-        });
+        };
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
     }
 
     fn handle_channel_closed(&self, channel_id: [u8; 32], user_channel_id: u64, reason: String) {
@@ -355,21 +463,23 @@ impl LightningEventHandler {
             hex::encode(channel_id),
             reason
         );
-        let persister = self.persister.clone();
+        let db = self.db.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 {
+
+        let fut = async move {
+            if let Err(e) = save_channel_closing_details(db, platform, user_channel_id, reason).await {
+                // This is the case when a channel is closed before funding is broadcasted due to the counterparty disconnecting or other incompatibility issue.
+                if e != SaveChannelClosingError::FundingTxNull.into() {
                     error!(
                         "Unable to update channel {} closing details in DB: {}",
                         user_channel_id, e
                     );
                 }
-            });
-        }
+            }
+        };
+
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
     }
 
     fn handle_payment_failed(&self, payment_hash: PaymentHash) {
@@ -377,105 +487,207 @@ impl LightningEventHandler {
             "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)
+        let db = self.db.clone();
+        let fut = async move {
+            db.update_payment_status_in_db(payment_hash, &HTLCStatus::Failed)
                 .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);
-                }
-            }
-        });
+                .error_log_with_msg("Unable to update payment status in DB!");
+        };
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
     }
 
     fn handle_pending_htlcs_forwards(&self, time_forwardable: Duration) {
         info!("Handling PendingHTLCsForwardable event!");
-        let min_wait_time = time_forwardable.as_millis() as u32;
+        let min_wait_time = time_forwardable.as_millis() as u64;
         let channel_manager = self.channel_manager.clone();
-        spawn(async move {
+        self.platform.spawner().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]) {
+    fn handle_spendable_outputs(&self, outputs: Vec<SpendableOutputDescriptor>) {
         info!("Handling SpendableOutputs event!");
-        let platform_coin = &self.platform.coin;
+        if outputs.is_empty() {
+            error!("Received SpendableOutputs event with no outputs!");
+            return;
+        }
+
         // 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,
+        let my_address = match self.platform.coin.as_ref().derivation_method.single_addr_or_err() {
+            Ok(addr) => addr.clone(),
             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 platform = self.platform.clone();
+        let db = self.db.clone();
+        let keys_manager = self.keys_manager.clone();
+
+        let fut = async move {
+            let change_destination_script = Builder::build_witness_script(&my_address.hash).to_bytes().take().into();
+            let feerate_sat_per_1000_weight = platform.get_est_sat_per_1000_weight(ConfirmationTarget::Normal);
+            let output_descriptors = outputs.iter().collect::<Vec<_>>();
+            let claiming_tx = match 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_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
+
+            let claiming_txid = claiming_tx.txid();
+            let tx_hex = serialize_hex(&claiming_tx);
+
+            if let Err(e) = platform.coin.send_raw_tx(&tx_hex).compat().await {
+                // TODO: broadcast transaction through p2p network in this case, we have to check that the transactions is confirmed on-chain after this.
+                error!(
+                    "Broadcasting of the claiming transaction {} failed: {}",
+                    claiming_txid, e
                 );
+                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 = claiming_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)
+                    },
+                };
 
-            self.platform.broadcast_transaction(&spending_tx);
-        }
+                // This doesn't need to be respawned on restart unlike add_closing_tx_to_db since Event::SpendableOutputs will be re-fired on restart
+                // if the spending_tx is not broadcasted.
+                add_claiming_tx_to_db_loop(
+                    db.clone(),
+                    closing_txid,
+                    claiming_txid.to_string(),
+                    (claimed_balance as f64) - claiming_tx_fee_per_channel,
+                )
+                .await;
+            }
+        };
+
+        let settings = AbortSettings::default().critical_timout_s(CRITICAL_FUTURE_TIMEOUT);
+        self.platform.spawner().spawn_with_settings(fut, settings);
+    }
+
+    fn handle_open_channel_request(
+        &self,
+        temporary_channel_id: [u8; 32],
+        counterparty_node_id: PublicKey,
+        funding_satoshis: u64,
+        push_msat: u64,
+    ) {
+        info!(
+            "Handling OpenChannelRequest from node: {} with funding value: {} and starting balance: {}",
+            counterparty_node_id, funding_satoshis, push_msat,
+        );
+
+        let db = self.db.clone();
+        let trusted_nodes = self.trusted_nodes.clone();
+        let channel_manager = self.channel_manager.clone();
+        let platform = self.platform.clone();
+        let fut = async move {
+            if let Ok(last_channel_rpc_id) = db.get_last_channel_rpc_id().await.error_log_passthrough() {
+                let user_channel_id = last_channel_rpc_id as u64 + 1;
+
+                let trusted_nodes = trusted_nodes.lock().clone();
+                let accepted_inbound_channel_with_0conf = trusted_nodes.contains(&counterparty_node_id)
+                    && channel_manager
+                        .accept_inbound_channel_from_trusted_peer_0conf(
+                            &temporary_channel_id,
+                            &counterparty_node_id,
+                            user_channel_id,
+                        )
+                        .is_ok();
+
+                if accepted_inbound_channel_with_0conf
+                    || channel_manager
+                        .accept_inbound_channel(&temporary_channel_id, &counterparty_node_id, user_channel_id)
+                        .is_ok()
+                {
+                    let is_public = match channel_manager
+                        .list_channels()
+                        .into_iter()
+                        .find(|chan| chan.user_channel_id == user_channel_id)
+                    {
+                        Some(details) => details.is_public,
+                        None => {
+                            error!(
+                                "Inbound channel {} details should be found by list_channels!",
+                                user_channel_id
+                            );
+                            return;
+                        },
+                    };
+
+                    let pending_channel_details = DBChannelDetails::new(
+                        user_channel_id,
+                        temporary_channel_id,
+                        counterparty_node_id,
+                        false,
+                        is_public,
+                    );
+                    if let Err(e) = db.add_channel_to_db(&pending_channel_details).await {
+                        error!("Unable to add new inbound channel {} to db: {}", user_channel_id, e);
+                    }
+
+                    while let Some(details) = channel_manager
+                        .list_channels()
+                        .into_iter()
+                        .find(|chan| chan.user_channel_id == user_channel_id)
+                    {
+                        if let Some(funding_tx) = details.funding_txo {
+                            let best_block_height = platform.best_block_height();
+                            db.add_funding_tx_to_db(
+                                user_channel_id as i64,
+                                funding_tx.txid.to_string(),
+                                funding_satoshis as i64,
+                                best_block_height as i64,
+                            )
+                            .await
+                            .error_log();
+                            break;
+                        }
+
+                        Timer::sleep(TRY_LOOP_INTERVAL).await;
+                    }
+                }
+            }
+        };
+
+        self.platform.spawner().spawn(fut);
     }
 }
diff --git a/mm2src/coins/lightning/ln_filesystem_persister.rs b/mm2src/coins/lightning/ln_filesystem_persister.rs
new file mode 100644
index 0000000000..49ecb111b3
--- /dev/null
+++ b/mm2src/coins/lightning/ln_filesystem_persister.rs
@@ -0,0 +1,400 @@
+use crate::lightning::ln_storage::{LightningStorage, NetworkGraph, NodesAddressesMap, NodesAddressesMapShared, Scorer,
+                                   TrustedNodesShared};
+use async_trait::async_trait;
+use bitcoin::blockdata::constants::genesis_block;
+use bitcoin::{BlockHash, Network, Txid};
+use bitcoin_hashes::hex::FromHex;
+use common::async_blocking;
+use common::log::LogState;
+use lightning::chain::channelmonitor::ChannelMonitor;
+use lightning::chain::keysinterface::{KeysInterface, Sign};
+use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
+use lightning::util::persist::KVStorePersister;
+use lightning::util::ser::{ReadableArgs, Writeable};
+use mm2_io::fs::{check_dir_operations, invalid_data_err, read_json, write_json};
+use secp256k1v22::PublicKey;
+use std::collections::{HashMap, HashSet};
+use std::fs;
+use std::io::{BufReader, BufWriter, Cursor};
+use std::net::SocketAddr;
+use std::ops::Deref;
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+
+#[cfg(target_family = "unix")] use std::os::unix::io::AsRawFd;
+
+#[cfg(target_family = "windows")]
+use {std::ffi::OsStr, std::os::windows::ffi::OsStrExt};
+
+const USE_TMP_FILE: bool = true;
+
+pub struct LightningFilesystemPersister {
+    main_path: PathBuf,
+    backup_path: Option<PathBuf>,
+}
+
+impl LightningFilesystemPersister {
+    /// Initialize a new LightningPersister and set the path to the individual channels'
+    /// files.
+    #[inline]
+    pub fn new(main_path: PathBuf, backup_path: Option<PathBuf>) -> Self { Self { main_path, backup_path } }
+
+    /// Get the directory which was provided when this persister was initialized.
+    #[inline]
+    pub fn main_path(&self) -> PathBuf { self.main_path.clone() }
+
+    /// Get the backup directory which was provided when this persister was initialized.
+    #[inline]
+    pub fn backup_path(&self) -> Option<PathBuf> { self.backup_path.clone() }
+
+    pub fn nodes_addresses_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("channel_nodes_data");
+        path
+    }
+
+    pub fn nodes_addresses_backup_path(&self) -> Option<PathBuf> {
+        self.backup_path().map(|mut backup_path| {
+            backup_path.push("channel_nodes_data");
+            backup_path
+        })
+    }
+
+    pub fn network_graph_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("network_graph");
+        path
+    }
+
+    pub fn scorer_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("scorer");
+        path
+    }
+
+    pub fn trusted_nodes_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("trusted_nodes");
+        path
+    }
+
+    pub fn manager_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("manager");
+        path
+    }
+
+    pub fn monitors_path(&self) -> PathBuf {
+        let mut path = self.main_path();
+        path.push("monitors");
+        path
+    }
+
+    pub fn monitors_backup_path(&self) -> Option<PathBuf> {
+        self.backup_path().map(|mut backup_path| {
+            backup_path.push("monitors");
+            backup_path
+        })
+    }
+
+    /// 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.monitors_path();
+        if !path.exists() {
+            return Ok(Vec::new());
+        }
+        let mut res = Vec::new();
+        for file_option in fs::read_dir(path)? {
+            let file = file_option?;
+            let owned_file_name = file.file_name();
+            let filename = owned_file_name.to_str().ok_or_else(|| {
+                invalid_data_err("Invalid ChannelMonitor file name", format!("{:?}", owned_file_name))
+            })?;
+            if filename == "checkval" {
+                continue;
+            }
+            if !filename.is_ascii() || filename.len() < 65 {
+                return Err(invalid_data_err("Invalid ChannelMonitor file name", filename));
+            }
+            if filename.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.split_at(64).0)
+                .map_err(|e| invalid_data_err("Invalid tx ID in filename error", e))?;
+
+            let index = filename
+                .split_at(65)
+                .1
+                .parse::<u16>()
+                .map_err(|e| invalid_data_err("Invalid tx index in filename error", e))?;
+
+            let contents = fs::read(file.path())?;
+            let mut buffer = Cursor::new(&contents);
+            let (blockhash, channel_monitor) = <(BlockHash, ChannelMonitor<Signer>)>::read(&mut buffer, &*keys_manager)
+                .map_err(|e| invalid_data_err("Failed to deserialize ChannelMonito", e))?;
+
+            if channel_monitor.get_funding_txo().0.txid != txid || channel_monitor.get_funding_txo().0.index != index {
+                return Err(invalid_data_err(
+                    "ChannelMonitor was stored in the wrong file",
+                    filename,
+                ));
+            }
+
+            res.push((blockhash, channel_monitor));
+        }
+        Ok(res)
+    }
+}
+
+impl KVStorePersister for LightningFilesystemPersister {
+    fn persist<W: Writeable>(&self, key: &str, object: &W) -> std::io::Result<()> {
+        let mut dest_file = self.main_path();
+        dest_file.push(key);
+        drop_mutability!(dest_file);
+        write_to_file(dest_file, object)?;
+
+        if !matches!(key, "network_graph" | "scorer") {
+            if let Some(mut dest_file) = self.backup_path() {
+                dest_file.push(key);
+                drop_mutability!(dest_file);
+                write_to_file(dest_file, object)?;
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(target_family = "windows")]
+macro_rules! call {
+    ($e: expr) => {
+        if $e != 0 {
+            return Ok(());
+        } else {
+            return Err(std::io::Error::last_os_error());
+        }
+    };
+}
+
+#[cfg(target_family = "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()
+}
+
+fn write_to_file<W: Writeable>(dest_file: PathBuf, data: &W) -> std::io::Result<()> {
+    let mut tmp_file = dest_file.clone();
+    tmp_file.set_extension("tmp");
+    drop_mutability!(tmp_file);
+
+    // 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)
+    {
+        // Note that going by rust-lang/rust@d602a6b, on MacOS it is only safe to use
+        // rust stdlib 1.36 or higher.
+        let mut buf = BufWriter::new(fs::File::create(&tmp_file)?);
+        data.write(&mut buf)?;
+        buf.into_inner()?.sync_all()?;
+    }
+    // Fsync the parent directory on Unix.
+    #[cfg(target_family = "unix")]
+    {
+        let parent_directory = dest_file.parent().unwrap();
+        fs::rename(&tmp_file, &dest_file)?;
+        let dir_file = fs::OpenOptions::new().read(true).open(parent_directory)?;
+        unsafe {
+            libc::fsync(dir_file.as_raw_fd());
+        }
+    }
+    #[cfg(target_family = "windows")]
+    {
+        if dest_file.exists() {
+            unsafe {
+                winapi::um::winbase::ReplaceFileW(
+                    path_to_windows_str(dest_file).as_ptr(),
+                    path_to_windows_str(tmp_file).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(tmp_file).as_ptr(),
+                    path_to_windows_str(dest_file).as_ptr(),
+                    winapi::um::winbase::MOVEFILE_WRITE_THROUGH | winapi::um::winbase::MOVEFILE_REPLACE_EXISTING,
+                )
+            });
+        }
+    }
+    Ok(())
+}
+
+#[async_trait]
+impl LightningStorage for LightningFilesystemPersister {
+    type Error = std::io::Error;
+
+    async fn init_fs(&self) -> Result<(), Self::Error> {
+        let path = self.monitors_path();
+        let backup_path = self.monitors_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.parent().unwrap())?;
+            }
+            check_dir_operations(&path)?;
+            check_dir_operations(path.parent().unwrap())
+        })
+        .await
+    }
+
+    async fn is_fs_initialized(&self) -> Result<bool, Self::Error> {
+        let dir_path = self.monitors_path();
+        let backup_dir_path = self.monitors_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::Other,
+                    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::Other,
+                    "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());
+        }
+
+        let nodes_addresses: HashMap<String, SocketAddr> = read_json(&path)
+            .await
+            .map_err(|e| invalid_data_err("Error", e))?
+            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?;
+
+        nodes_addresses
+            .iter()
+            .map(|(pubkey_str, addr)| {
+                let pubkey = PublicKey::from_str(pubkey_str).map_err(|e| invalid_data_err("Error", e))?;
+                Ok((pubkey, *addr))
+            })
+            .collect()
+    }
+
+    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();
+
+        let nodes_addresses: HashMap<String, SocketAddr> = nodes_addresses
+            .lock()
+            .iter()
+            .map(|(pubkey, addr)| (pubkey.to_string(), *addr))
+            .collect();
+
+        write_json(&nodes_addresses, &path, USE_TMP_FILE)
+            .await
+            .map_err(|e| invalid_data_err("Error", e))?;
+
+        if let Some(path) = backup_path {
+            write_json(&nodes_addresses, &path, USE_TMP_FILE)
+                .await
+                .map_err(|e| invalid_data_err("Error", e))?;
+        }
+
+        Ok(())
+    }
+
+    async fn get_network_graph(&self, network: Network, logger: Arc<LogState>) -> Result<NetworkGraph, Self::Error> {
+        let path = self.network_graph_path();
+        if !path.exists() {
+            return Ok(NetworkGraph::new(genesis_block(network).header.block_hash(), logger));
+        }
+        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), logger).map_err(|e| invalid_data_err("Error", e))
+        })
+        .await
+    }
+
+    async fn get_scorer(&self, network_graph: Arc<NetworkGraph>, logger: Arc<LogState>) -> Result<Scorer, Self::Error> {
+        let path = self.scorer_path();
+        if !path.exists() {
+            return Ok(Mutex::new(ProbabilisticScorer::new(
+                ProbabilisticScoringParameters::default(),
+                network_graph,
+                logger,
+            )));
+        }
+        async_blocking(move || {
+            let file = fs::File::open(path)?;
+            let scorer = ProbabilisticScorer::read(
+                &mut BufReader::new(file),
+                (ProbabilisticScoringParameters::default(), network_graph, logger),
+            )
+            .map_err(|e| invalid_data_err("Error", e))?;
+            Ok(Mutex::new(scorer))
+        })
+        .await
+    }
+
+    async fn get_trusted_nodes(&self) -> Result<HashSet<PublicKey>, Self::Error> {
+        let path = self.trusted_nodes_path();
+        if !path.exists() {
+            return Ok(HashSet::new());
+        }
+
+        let trusted_nodes: HashSet<String> = read_json(&path)
+            .await
+            .map_err(|e| invalid_data_err("Error", e))?
+            .ok_or_else(|| std::io::Error::from(std::io::ErrorKind::NotFound))?;
+
+        trusted_nodes
+            .iter()
+            .map(|pubkey_str| {
+                let pubkey = PublicKey::from_str(pubkey_str).map_err(|e| invalid_data_err("Error", e))?;
+                Ok(pubkey)
+            })
+            .collect()
+    }
+
+    async fn save_trusted_nodes(&self, trusted_nodes: TrustedNodesShared) -> Result<(), Self::Error> {
+        let path = self.trusted_nodes_path();
+        let trusted_nodes: HashSet<String> = trusted_nodes.lock().iter().map(|pubkey| pubkey.to_string()).collect();
+        write_json(&trusted_nodes, &path, USE_TMP_FILE)
+            .await
+            .map_err(|e| invalid_data_err("Error", e))
+    }
+}
diff --git a/mm2src/coins/lightning/ln_p2p.rs b/mm2src/coins/lightning/ln_p2p.rs
index 00bd5cdd5b..c93c017f06 100644
--- a/mm2src/coins/lightning/ln_p2p.rs
+++ b/mm2src/coins/lightning/ln_p2p.rs
@@ -1,23 +1,22 @@
 use super::*;
-use common::executor::{spawn, Timer};
+use common::executor::{spawn_abortable, SpawnFuture, 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::routing::gossip;
 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 secp256k1v22::{PublicKey, 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 NetworkGossip = gossip::P2PGossipSync<Arc<NetworkGraph>, Arc<dyn Access + Send + Sync>, Arc<LogState>>;
 
 pub type PeerManager =
     SimpleArcPeerManager<SocketDescriptor, ChainMonitor, Platform, Platform, dyn Access + Send + Sync, LogState>;
@@ -30,12 +29,22 @@ pub enum ConnectToNodeRes {
     ConnectedSuccessfully { pubkey: PublicKey, node_addr: SocketAddr },
 }
 
-pub async fn connect_to_node(
+#[derive(Display)]
+pub enum ConnectionError {
+    #[display(fmt = "Handshake error: {}", _0)]
+    HandshakeErr(String),
+    #[display(fmt = "Timeout error: {}", _0)]
+    TimeOut(String),
+}
+
+pub async fn connect_to_ln_node(
     pubkey: PublicKey,
     node_addr: SocketAddr,
     peer_manager: Arc<PeerManager>,
-) -> ConnectToNodeResult<ConnectToNodeRes> {
-    if peer_manager.get_peer_node_ids().contains(&pubkey) {
+) -> Result<ConnectToNodeRes, ConnectionError> {
+    let peer_manager_ref = peer_manager.clone();
+    let peer_node_ids = async_blocking(move || peer_manager_ref.get_peer_node_ids()).await;
+    if peer_node_ids.contains(&pubkey) {
         return Ok(ConnectToNodeRes::AlreadyConnected { pubkey, node_addr });
     }
 
@@ -43,7 +52,7 @@ pub async fn connect_to_node(
         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!(
+                return Err(ConnectionError::TimeOut(format!(
                     "Failed to connect to node: {}",
                     pubkey
                 )))
@@ -54,7 +63,7 @@ pub async fn connect_to_node(
         // Make sure the connection is still established.
         match futures::poll!(&mut connection_closed_future) {
             std::task::Poll::Ready(_) => {
-                return MmError::err(ConnectToNodeError::ConnectionError(format!(
+                return Err(ConnectionError::HandshakeErr(format!(
                     "Node {} disconnected before finishing the handshake",
                     pubkey
                 )));
@@ -62,7 +71,9 @@ pub async fn connect_to_node(
             std::task::Poll::Pending => {},
         }
 
-        if peer_manager.get_peer_node_ids().contains(&pubkey) {
+        let peer_manager = peer_manager.clone();
+        let peer_node_ids = async_blocking(move || peer_manager.get_peer_node_ids()).await;
+        if peer_node_ids.contains(&pubkey) {
             break;
         }
 
@@ -73,12 +84,12 @@ pub async fn connect_to_node(
     Ok(ConnectToNodeRes::ConnectedSuccessfully { pubkey, node_addr })
 }
 
-pub async fn connect_to_nodes_loop(open_channels_nodes: NodesAddressesMapShared, peer_manager: Arc<PeerManager>) {
+pub async fn connect_to_ln_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 {
+            match connect_to_ln_node(pubkey, node_addr, peer_manager.clone()).await {
                 Ok(res) => {
                     if let ConnectToNodeRes::ConnectedSuccessfully { .. } = res {
                         log::info!("{}", res.to_string());
@@ -133,13 +144,18 @@ pub async fn ln_node_announcement_loop(
                 continue;
             },
         };
-        channel_manager.broadcast_node_announcement(node_color, node_name, addresses);
+        let channel_manager = channel_manager.clone();
+        async_blocking(move || channel_manager.broadcast_node_announcement(node_color, node_name, addresses)).await;
 
         Timer::sleep(BROADCAST_NODE_ANNOUNCEMENT_INTERVAL as f64).await;
     }
 }
 
 async fn ln_p2p_loop(peer_manager: Arc<PeerManager>, listener: TcpListener) {
+    // This container consists of abort handlers of the spawned inbound connections.
+    // They will be dropped once `LightningCoin` is dropped because `ln_p2p_loop` is spawned
+    // via [`Platform::abortable_system`].
+    let mut spawned = Vec::new();
     loop {
         let peer_mgr = peer_manager.clone();
         let tcp_stream = match listener.accept().await {
@@ -153,18 +169,19 @@ async fn ln_p2p_loop(peer_manager: Arc<PeerManager>, listener: TcpListener) {
             },
         };
         if let Ok(stream) = tcp_stream.into_std() {
-            spawn(async move {
+            spawned.push(spawn_abortable(async move {
                 lightning_net_tokio::setup_inbound(peer_mgr.clone(), stream).await;
-            });
+            }));
         };
     }
 }
 
 pub async fn init_peer_manager(
     ctx: MmArc,
+    platform: &Arc<Platform>,
     listening_port: u16,
     channel_manager: Arc<ChannelManager>,
-    network_gossip: Arc<NetworkGossip>,
+    gossip_sync: Arc<NetworkGossip>,
     node_secret: SecretKey,
     logger: Arc<LogState>,
 ) -> EnableLightningResult<Arc<PeerManager>> {
@@ -181,7 +198,7 @@ pub async fn init_peer_manager(
     rand::thread_rng().fill_bytes(&mut ephemeral_bytes);
     let lightning_msg_handler = MessageHandler {
         chan_handler: channel_manager,
-        route_handler: network_gossip,
+        route_handler: gossip_sync,
     };
 
     // IgnoringMessageHandler is used as custom message types (experimental and application-specific messages) is not needed
@@ -194,7 +211,6 @@ pub async fn init_peer_manager(
     ));
 
     // Initialize p2p networking
-    spawn(ln_p2p_loop(peer_manager.clone(), listener));
-
+    platform.spawner().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
index dfc3f24554..3444b4cb69 100644
--- a/mm2src/coins/lightning/ln_platform.rs
+++ b/mm2src/coins/lightning/ln_platform.rs
@@ -1,86 +1,39 @@
 use super::*;
-use crate::lightning::ln_errors::{FindWatchedOutputSpendError, GetHeaderError, GetTxError, SaveChannelClosingError,
-                                  SaveChannelClosingResult};
-use crate::utxo::rpc_clients::{electrum_script_hash, BestBlock as RpcBestBlock, BlockHashOrHeight,
+use crate::lightning::ln_errors::{SaveChannelClosingError, SaveChannelClosingResult};
+use crate::utxo::rpc_clients::{BestBlock as RpcBestBlock, BlockHashOrHeight, ConfirmedTransactionInfo,
                                ElectrumBlockHeader, ElectrumClient, ElectrumNonce, EstimateFeeMethod,
-                               UtxoRpcClientEnum, UtxoRpcError};
-use crate::utxo::utxo_common;
+                               UtxoRpcClientEnum, UtxoRpcResult};
+use crate::utxo::spv::SimplePaymentVerification;
 use crate::utxo::utxo_standard::UtxoStandardCoin;
-use crate::{MarketCoinOps, MmCoin};
+use crate::utxo::GetConfirmedTxError;
+use crate::{CoinFutSpawner, 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::executor::{abortable_queue::AbortableQueue, AbortableSystem, SpawnFuture, Timer};
 use common::log::{debug, error, info};
 use futures::compat::Future01CompatExt;
+use futures::future::join_all;
 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};
+use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use spv_validation::spv_proof::TRY_SPV_PROOF_INTERVAL;
+use std::convert::{TryFrom, TryInto};
+use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering, Ordering};
 
 const CHECK_FOR_NEW_BEST_BLOCK_INTERVAL: f64 = 60.;
-const MIN_ALLOWED_FEE_PER_1000_WEIGHT: u32 = 253;
 const TRY_LOOP_INTERVAL: f64 = 60.;
+const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 10.;
 
 #[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,
-    }))
-}
+#[inline]
+pub fn h256_from_txid(txid: Txid) -> H256 { H256::from(txid.as_hash().into_inner()) }
 
 pub async fn get_best_header(best_header_listener: &ElectrumClient) -> EnableLightningResult<ElectrumBlockHeader> {
     best_header_listener
@@ -91,8 +44,8 @@ pub async fn get_best_header(best_header_listener: &ElectrumClient) -> EnableLig
 }
 
 pub async fn update_best_block(
-    chain_monitor: &ChainMonitor,
-    channel_manager: &ChannelManager,
+    chain_monitor: Arc<ChainMonitor>,
+    channel_manager: Arc<ChannelManager>,
     best_header: ElectrumBlockHeader,
 ) {
     {
@@ -104,20 +57,8 @@ pub async fn update_best_block(
                         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;
-                    },
-                };
+                let prev_blockhash = sha256d::Hash::from_inner(h.prev_block_hash.0);
+                let merkle_root = sha256d::Hash::from_inner(h.merkle_root.0);
                 (
                     BlockHeader {
                         version: h.version as i32,
@@ -141,14 +82,14 @@ pub async fn update_best_block(
                 (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);
+        async_blocking(move || channel_manager.best_block_updated(&new_best_header, new_best_height)).await;
+        async_blocking(move || chain_monitor.best_block_updated(&new_best_header, new_best_height)).await;
     }
 }
 
 pub async fn ln_best_block_update_loop(
     platform: Arc<Platform>,
-    persister: Arc<LightningPersister>,
+    db: SqliteLightningDB,
     chain_monitor: Arc<ChainMonitor>,
     channel_manager: Arc<ChannelManager>,
     best_header_listener: ElectrumClient,
@@ -156,57 +97,81 @@ pub async fn ln_best_block_update_loop(
 ) {
     let mut current_best_block = best_block;
     loop {
+        // Transactions confirmations check can be done at every CHECK_FOR_NEW_BEST_BLOCK_INTERVAL instead of at every new block
+        // in case a transaction confirmation fails due to electrums being down. This way there will be no need to wait for a new
+        // block to confirm such transaction and causing delays.
+        platform
+            .process_txs_confirmations(
+                &best_header_listener,
+                &db,
+                Arc::clone(&chain_monitor),
+                Arc::clone(&channel_manager),
+            )
+            .await;
         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)
+                .process_txs_unconfirmations(Arc::clone(&chain_monitor), Arc::clone(&channel_manager))
                 .await;
             current_best_block = best_header.clone().into();
-            update_best_block(&chain_monitor, &channel_manager, best_header).await;
+            update_best_block(Arc::clone(&chain_monitor), Arc::clone(&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,
+async fn get_funding_tx_bytes_loop(rpc_client: &UtxoRpcClientEnum, tx_hash: H256Json) -> BytesJson {
+    loop {
+        match rpc_client.get_transaction_bytes(&tx_hash).compat().await {
+            Ok(res) => break res,
+            Err(e) => {
+                error!("error {}", e);
+                Timer::sleep(TRY_LOOP_INTERVAL).await;
+                continue;
+            },
         }
     }
 }
 
+pub struct LatestFees {
+    background: AtomicU64,
+    normal: AtomicU64,
+    high_priority: AtomicU64,
+}
+
+impl LatestFees {
+    #[inline]
+    fn set_background_fees(&self, fee: u64) { self.background.store(fee, Ordering::Release); }
+
+    #[inline]
+    fn set_normal_fees(&self, fee: u64) { self.normal.store(fee, Ordering::Release); }
+
+    #[inline]
+    fn set_high_priority_fees(&self, fee: u64) { self.high_priority.store(fee, Ordering::Release); }
+}
+
 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 average time in seconds needed to mine a new block for the blockchain network.
+    pub avg_blocktime: u64,
     /// 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,
+    /// Number of blocks for every Confirmation target. This is used in the FeeEstimator.
+    pub confirmations_targets: PlatformCoinConfirmationTargets,
+    /// Latest fees are used when the call for estimate_fee_sat fails.
+    pub latest_fees: LatestFees,
     /// This cache stores the transactions that the LN node has interest in.
-    pub registered_txs: PaMutex<HashMap<Txid, HashSet<Script>>>,
+    pub registered_txs: PaMutex<HashSet<Txid>>,
     /// 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>>,
+    /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation.
+    /// and on [`MmArc::stop`].
+    pub abortable_system: AbortableQueue,
 }
 
 impl Platform {
@@ -214,36 +179,100 @@ impl Platform {
     pub fn new(
         coin: UtxoStandardCoin,
         network: BlockchainNetwork,
-        default_fees_and_confirmations: PlatformCoinConfirmations,
-    ) -> Self {
-        Platform {
+        confirmations_targets: PlatformCoinConfirmationTargets,
+    ) -> EnableLightningResult<Self> {
+        // This should never return an error since it's validated that avg_blocktime is in platform coin config in a previous step of lightning activation.
+        // But an error is returned here just in case.
+        let avg_blocktime = coin
+            .as_ref()
+            .conf
+            .avg_blocktime
+            .ok_or_else(|| EnableLightningError::Internal("`avg_blocktime` can't be None!".into()))?;
+
+        // Create an abortable system linked to the base `coin` so if the base coin is disabled,
+        // all spawned futures related to `LightCoin` will be aborted as well.
+        let abortable_system = coin.as_ref().abortable_system.create_subsystem()?;
+
+        Ok(Platform {
             coin,
             network,
+            avg_blocktime,
             best_block_height: AtomicU64::new(0),
-            default_fees_and_confirmations,
-            registered_txs: PaMutex::new(HashMap::new()),
+            confirmations_targets,
+            latest_fees: LatestFees {
+                background: AtomicU64::new(0),
+                normal: AtomicU64::new(0),
+                high_priority: AtomicU64::new(0),
+            },
+            registered_txs: PaMutex::new(HashSet::new()),
             registered_outputs: PaMutex::new(Vec::new()),
             unsigned_funding_txs: PaMutex::new(HashMap::new()),
-        }
+            abortable_system,
+        })
     }
 
     #[inline]
     fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
 
+    pub fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
+
+    pub async fn set_latest_fees(&self) -> UtxoRpcResult<()> {
+        let platform_coin = &self.coin;
+        let conf = &platform_coin.as_ref().conf;
+
+        let latest_background_fees = 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,
+                self.confirmations_targets.background,
+            )
+            .compat()
+            .await?;
+        self.latest_fees.set_background_fees(latest_background_fees);
+
+        let latest_normal_fees = 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,
+                self.confirmations_targets.normal,
+            )
+            .compat()
+            .await?;
+        self.latest_fees.set_normal_fees(latest_normal_fees);
+
+        let latest_high_priority_fees = 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,
+                self.confirmations_targets.high_priority,
+            )
+            .compat()
+            .await?;
+        self.latest_fees.set_high_priority_fees(latest_high_priority_fees);
+
+        Ok(())
+    }
+
     #[inline]
     pub fn update_best_block_height(&self, new_height: u64) {
-        self.best_block_height.store(new_height, AtomicOrdering::Relaxed);
+        self.best_block_height.store(new_height, AtomicOrdering::Release);
     }
 
     #[inline]
-    pub fn best_block_height(&self) -> u64 { self.best_block_height.load(AtomicOrdering::Relaxed) }
+    pub fn best_block_height(&self) -> u64 { self.best_block_height.load(AtomicOrdering::Acquire) }
 
-    pub fn add_tx(&self, txid: Txid, script_pubkey: Script) {
+    pub fn add_tx(&self, txid: Txid) {
         let mut registered_txs = self.registered_txs.lock();
-        registered_txs
-            .entry(txid)
-            .or_insert_with(HashSet::new)
-            .insert(script_pubkey);
+        registered_txs.insert(txid);
     }
 
     pub fn add_output(&self, output: WatchedOutput) {
@@ -251,43 +280,24 @@ impl Platform {
         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)
+    async fn process_tx_for_unconfirmation<T>(&self, txid: Txid, monitor: Arc<T>)
     where
-        T: Confirm,
+        T: Confirm + Send + Sync + 'static,
     {
-        match self.get_tx_if_onchain(txid).await {
+        let rpc_txid = h256_json_from_txid(txid);
+        match self.rpc_client().get_tx_if_onchain(&rpc_txid).await {
             Ok(Some(_)) => {},
             Ok(None) => {
                 info!(
                     "Transaction {} is not found on chain. The transaction will be re-broadcasted.",
                     txid,
                 );
-                monitor.transaction_unconfirmed(&txid);
+                let monitor = monitor.clone();
+                async_blocking(move || monitor.transaction_unconfirmed(&txid)).await;
+                // If a transaction is unconfirmed due to a block reorganization; LDK will rebroadcast it.
+                // In this case, this transaction needs to be added again to the registered transactions
+                // to start watching for it on the chain again.
+                self.add_tx(txid);
             },
             Err(e) => error!(
                 "Error while trying to check if the transaction {} is discarded or not :{:?}",
@@ -296,64 +306,79 @@ impl Platform {
         }
     }
 
-    pub async fn process_txs_unconfirmations(&self, chain_monitor: &ChainMonitor, channel_manager: &ChannelManager) {
+    pub async fn process_txs_unconfirmations(
+        &self,
+        chain_monitor: Arc<ChainMonitor>,
+        channel_manager: Arc<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;
+            self.process_tx_for_unconfirmation(txid, Arc::clone(&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;
+            self.process_tx_for_unconfirmation(txid, Arc::clone(&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);
-                            }
-                        }
-                    }
+
+        let on_chain_txs_futs = registered_txs
+            .into_iter()
+            .map(|txid| async move {
+                let rpc_txid = h256_json_from_txid(txid);
+                self.rpc_client().get_tx_if_onchain(&rpc_txid).await
+            })
+            .collect::<Vec<_>>();
+        let on_chain_txs = join_all(on_chain_txs_futs)
+            .await
+            .into_iter()
+            .filter_map(|maybe_tx| match maybe_tx {
+                Ok(maybe_tx) => maybe_tx,
+                Err(e) => {
+                    error!(
+                        "Error while trying to figure if transaction is on-chain or not: {:?}",
+                        e
+                    );
+                    None
+                },
+            });
+
+        let is_spv_enabled = self.coin.as_ref().conf.spv_conf.is_some();
+        let confirmed_transactions_futs = on_chain_txs
+            .map(|transaction| async move {
+                if is_spv_enabled {
+                    client
+                        // TODO: Should log the spv error if height > 0
+                        .validate_spv_proof(&transaction, (now_ms() / 1000) + TRY_SPV_PROOF_INTERVAL)
+                        .await
+                        .map_err(GetConfirmedTxError::SPVError)
+                } else {
+                    client.get_confirmed_tx_info_from_rpc(&transaction).await
                 }
-            }
-        }
-        confirmed_registered_txs
+            })
+            .collect::<Vec<_>>();
+        join_all(confirmed_transactions_futs)
+            .await
+            .into_iter()
+            .filter_map(|confirmed_transaction| match confirmed_transaction {
+                Ok(confirmed_tx) => {
+                    let txid = Txid::from_hash(confirmed_tx.tx.hash().reversed().to_sha256d());
+                    self.registered_txs.lock().remove(&txid);
+                    Some(confirmed_tx)
+                },
+                Err(e) => {
+                    error!("Error verifying transaction: {:?}", e);
+                    None
+                },
+            })
+            .collect()
     }
 
     async fn append_spent_registered_output_txs(
@@ -361,49 +386,85 @@ impl Platform {
         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
+
+        let spent_outputs_info_fut = registered_outputs
+            .into_iter()
+            .map(|output| async move {
+                self.rpc_client()
+                    .find_output_spend(
+                        h256_from_txid(output.outpoint.txid),
+                        output.script_pubkey.as_ref(),
+                        output.outpoint.index.into(),
+                        BlockHashOrHeight::Hash(Default::default()),
                     )
-                    .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);
+                    .compat()
+                    .await
+            })
+            .collect::<Vec<_>>();
+        let mut spent_outputs_info = join_all(spent_outputs_info_fut)
+            .await
+            .into_iter()
+            .filter_map(|maybe_spent| match maybe_spent {
+                Ok(maybe_spent) => maybe_spent,
+                Err(e) => {
+                    error!("Error while trying to figure if output is spent or not: {:?}", e);
+                    None
+                },
+            })
+            .collect::<Vec<_>>();
+        spent_outputs_info.retain(|output| {
+            !transactions_to_confirm
+                .iter()
+                .any(|info| info.tx.hash() == output.spending_tx.hash())
+        });
+
+        let is_spv_enabled = self.coin.as_ref().conf.spv_conf.is_some();
+        let confirmed_transactions_futs = spent_outputs_info
+            .into_iter()
+            .map(|output| async move {
+                if is_spv_enabled {
+                    client
+                        // TODO: Should log the spv error if height > 0
+                        .validate_spv_proof(&output.spending_tx, (now_ms() / 1000) + TRY_SPV_PROOF_INTERVAL)
+                        .await
+                        .map_err(GetConfirmedTxError::SPVError)
+                } else {
+                    client.get_confirmed_tx_info_from_rpc(&output.spending_tx).await
                 }
-                outputs_to_remove.push(output);
-            }
-        }
-        self.registered_outputs
-            .lock()
-            .retain(|output| !outputs_to_remove.contains(output));
+            })
+            .collect::<Vec<_>>();
+        let mut confirmed_transaction_info = join_all(confirmed_transactions_futs)
+            .await
+            .into_iter()
+            .filter_map(|confirmed_transaction| match confirmed_transaction {
+                Ok(confirmed_tx) => {
+                    self.registered_outputs.lock().retain(|output| {
+                        !confirmed_tx
+                            .tx
+                            .clone()
+                            .inputs
+                            .into_iter()
+                            .any(|txin| txin.previous_output.hash == h256_from_txid(output.outpoint.txid))
+                    });
+                    Some(confirmed_tx)
+                },
+                Err(e) => {
+                    error!("Error verifying transaction: {:?}", e);
+                    None
+                },
+            })
+            .collect();
+
+        transactions_to_confirm.append(&mut confirmed_transaction_info);
     }
 
     pub async fn process_txs_confirmations(
         &self,
         client: &ElectrumClient,
-        persister: &LightningPersister,
-        chain_monitor: &ChainMonitor,
-        channel_manager: &ChannelManager,
+        db: &SqliteLightningDB,
+        chain_monitor: Arc<ChainMonitor>,
+        channel_manager: Arc<ChannelManager>,
     ) {
         let mut transactions_to_confirm = self.get_confirmed_registered_txs(client).await;
         self.append_spent_registered_output_txs(&mut transactions_to_confirm, client)
@@ -412,36 +473,45 @@ impl Platform {
         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
+            let best_block_height = self.best_block_height() as i64;
+            if let Err(e) = db
                 .update_funding_tx_block_height(
-                    confirmed_transaction_info.transaction.txid().to_string(),
+                    confirmed_transaction_info.tx.hash().reversed().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,
-            );
+            let channel_manager = channel_manager.clone();
+            let confirmed_transaction_info_cloned = confirmed_transaction_info.clone();
+            async_blocking(move || {
+                channel_manager.transactions_confirmed(
+                    &confirmed_transaction_info_cloned.header.clone().into(),
+                    &[(
+                        confirmed_transaction_info_cloned.index as usize,
+                        &confirmed_transaction_info_cloned.tx.clone().into(),
+                    )],
+                    confirmed_transaction_info_cloned.height as u32,
+                )
+            })
+            .await;
+            let chain_monitor = chain_monitor.clone();
+            async_blocking(move || {
+                chain_monitor.transactions_confirmed(
+                    &confirmed_transaction_info.header.into(),
+                    &[(
+                        confirmed_transaction_info.index as usize,
+                        &confirmed_transaction_info.tx.into(),
+                    )],
+                    confirmed_transaction_info.height as u32,
+                )
+            })
+            .await;
         }
     }
 
-    pub async fn get_channel_closing_tx(&self, channel_details: SqlChannelDetails) -> SaveChannelClosingResult<String> {
+    pub async fn get_channel_closing_tx(&self, channel_details: DBChannelDetails) -> SaveChannelClosingResult<String> {
         let from_block = channel_details
             .funding_generated_in_block
             .ok_or_else(|| MmError::new(SaveChannelClosingError::BlockHeightNull))?;
@@ -453,18 +523,18 @@ impl Platform {
         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 funding_tx_bytes = get_funding_tx_bytes_loop(self.rpc_client(), tx_hash).await;
 
         let closing_tx = self
             .coin
-            .wait_for_tx_spend(
+            // TODO add fn with old wait_for_tx_spend name
+            .wait_for_htlc_tx_spend(
                 &funding_tx_bytes.into_vec(),
+                &[],
                 (now_ms() / 1000) + 3600,
-                from_block,
+                from_block.try_into()?,
                 &None,
+                TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
             )
             .compat()
             .await
@@ -481,17 +551,17 @@ impl FeeEstimator for Platform {
     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 latest_fees = match confirmation_target {
+            ConfirmationTarget::Background => self.latest_fees.background.load(Ordering::Acquire),
+            ConfirmationTarget::Normal => self.latest_fees.normal.load(Ordering::Acquire),
+            ConfirmationTarget::HighPriority => self.latest_fees.high_priority.load(Ordering::Acquire),
         };
 
         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,
+            ConfirmationTarget::Background => self.confirmations_targets.background,
+            ConfirmationTarget::Normal => self.confirmations_targets.normal,
+            ConfirmationTarget::HighPriority => self.confirmations_targets.high_priority,
         };
         let fee_per_kb = tokio::task::block_in_place(move || {
             self.rpc_client()
@@ -504,11 +574,21 @@ impl FeeEstimator for Platform {
                     n_blocks,
                 )
                 .wait()
-                .unwrap_or(default_fee)
+                .unwrap_or(latest_fees)
         });
+
+        // Set default fee to last known fee for the corresponding confirmation target
+        match confirmation_target {
+            ConfirmationTarget::Background => self.latest_fees.set_background_fees(fee_per_kb),
+            ConfirmationTarget::Normal => self.latest_fees.set_normal_fees(fee_per_kb),
+            ConfirmationTarget::HighPriority => self.latest_fees.set_high_priority_fees(fee_per_kb),
+        };
+
         // 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)
+        // This has changed in rust-lightning v0.0.110 as LDK currently wraps get_est_sat_per_1000_weight to ensure that the value returned is
+        // no smaller than 253. https://github.com/lightningdevkit/rust-lightning/pull/1552
+        (fee_per_kb as f64 / 4.0).ceil() as u32
     }
 }
 
@@ -517,25 +597,28 @@ impl BroadcasterInterface for Platform {
         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 {
+        let fut = async move {
             match fut.compat().await {
                 Ok(id) => info!("Transaction broadcasted successfully: {:?} ", id),
+                // TODO: broadcast transaction through p2p network in case of error
                 Err(e) => error!("Broadcast transaction {} failed: {}", txid, e),
             }
-        });
+        };
+
+        self.spawner().spawn(fut);
     }
 }
 
 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()); }
+    fn register_tx(&self, txid: &Txid, _script_pubkey: &Script) { self.add_tx(*txid); }
 
     // 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,
@@ -545,29 +628,20 @@ impl Filter for Platform {
         // 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
-            )
-        });
+        let output_spend_fut = self.rpc_client().find_output_spend(
+            h256_from_txid(output.outpoint.txid),
+            output.script_pubkey.as_ref(),
+            output.outpoint.index.into(),
+            BlockHashOrHeight::Hash(block_hash),
+        );
+        let maybe_output_spend_res =
+            tokio::task::block_in_place(move || output_spend_fut.wait()).error_log_passthrough();
 
-        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;
-                },
-            };
+        if let Ok(Some(spent_output_info)) = maybe_output_spend_res {
+            match Transaction::try_from(spent_output_info.spending_tx) {
+                Ok(spending_tx) => return Some((spent_output_info.input_index, spending_tx)),
+                Err(e) => error!("Can't convert transaction error: {}", e.to_string()),
+            }
         }
 
         None
diff --git a/mm2src/coins/lightning/ln_serialization.rs b/mm2src/coins/lightning/ln_serialization.rs
index 82f0a700c7..511522c328 100644
--- a/mm2src/coins/lightning/ln_serialization.rs
+++ b/mm2src/coins/lightning/ln_serialization.rs
@@ -1,51 +1,14 @@
-use lightning_invoice::Invoice;
-use secp256k1::PublicKey;
+use crate::lightning::ln_db::{DBPaymentsFilter, HTLCStatus, PaymentInfo, PaymentType};
+use crate::lightning::ln_platform::h256_json_from_txid;
+use crate::H256Json;
+use lightning::chain::channelmonitor::Balance;
+use lightning::ln::channelmanager::ChannelDetails;
+use secp256k1v22::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 {
@@ -136,26 +99,233 @@ impl<'de> de::Deserialize<'de> for PublicKeyForRPC {
     }
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json as json;
+#[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 is_ready: bool,
+    // Channel is confirmed and channel_ready 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,
+}
 
-    #[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);
+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,
+            is_ready: details.is_channel_ready,
+            is_usable: details.is_usable,
+            is_public: details.is_public,
+        }
     }
+}
 
-    #[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);
+#[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<i64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    fee_paid_msat: Option<i64>,
+    status: HTLCStatus,
+    created_at: i64,
+    last_updated: i64,
+}
+
+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(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 DBPaymentsFilter {
+    fn from(filter: PaymentsFilterForRPC) -> Self {
+        let (is_outbound, destination) = if let Some(payment_type) = filter.payment_type {
+            match payment_type {
+                PaymentTypeForRPC::OutboundPayment { destination } => (Some(true), Some(destination.0.to_string())),
+                PaymentTypeForRPC::InboundPayment => (Some(false), None),
+            }
+        } else {
+            (None, None)
+        };
+        DBPaymentsFilter {
+            is_outbound,
+            destination,
+            description: filter.description,
+            status: filter.status.map(|s| s.to_string()),
+            from_amount_msat: filter.from_amount_msat.map(|a| a as i64),
+            to_amount_msat: filter.to_amount_msat.map(|a| a as i64),
+            from_fee_paid_msat: filter.from_fee_paid_msat.map(|f| f as i64),
+            to_fee_paid_msat: filter.to_fee_paid_msat.map(|f| f as i64),
+            from_timestamp: filter.from_timestamp.map(|f| f as i64),
+            to_timestamp: filter.to_timestamp.map(|f| f as i64),
+        }
     }
+}
+
+/// 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,
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json as json;
 
     #[test]
     fn test_node_address_serialize() {
diff --git a/mm2src/coins/lightning/ln_sql.rs b/mm2src/coins/lightning/ln_sql.rs
new file mode 100644
index 0000000000..b9ac1e2129
--- /dev/null
+++ b/mm2src/coins/lightning/ln_sql.rs
@@ -0,0 +1,1607 @@
+use crate::lightning::ln_db::{ChannelType, ChannelVisibility, ClosedChannelsFilter, DBChannelDetails,
+                              DBPaymentsFilter, GetClosedChannelsResult, GetPaymentsResult, HTLCStatus, LightningDB,
+                              PaymentInfo, PaymentType};
+use async_trait::async_trait;
+use common::{async_blocking, PagingOptionsEnum};
+use db_common::owned_named_params;
+use db_common::sqlite::rusqlite::{params, 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, AsSqlNamedParams,
+                        OwnedSqlNamedParams, SqlNamedParams, SqliteConnShared, CHECK_TABLE_EXISTS_SQL};
+use gstuff::now_ms;
+use lightning::ln::{PaymentHash, PaymentPreimage};
+use secp256k1v22::PublicKey;
+use std::convert::TryInto;
+use std::str::FromStr;
+
+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),
+            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,
+    channel_detail: &DBChannelDetails,
+) -> Result<(String, OwnedSqlNamedParams), SqlError> {
+    let table_name = channels_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let rpc_id = channel_detail.rpc_id;
+    let created_at = channel_detail.created_at;
+
+    let sql = format!(
+        "INSERT INTO {} (
+            rpc_id,
+            channel_id,
+            counterparty_node_id,
+            is_outbound,
+            is_public,
+            is_closed,
+            created_at
+        ) VALUES (
+            :rpc_id, :channel_id, :counterparty_node_id, :is_outbound, :is_public, :is_closed, :created_at
+        )",
+        table_name
+    );
+
+    let params = owned_named_params! {
+        ":rpc_id": rpc_id,
+        ":channel_id": channel_detail.channel_id.clone(),
+        ":counterparty_node_id": channel_detail.counterparty_node_id.clone(),
+        ":is_outbound": channel_detail.is_outbound,
+        ":is_public": channel_detail.is_public,
+        ":is_closed": channel_detail.is_closed,
+        ":created_at": created_at,
+    };
+    Ok((sql, params))
+}
+
+fn insert_payment_sql(for_coin: &str, payment_info: &PaymentInfo) -> Result<(String, OwnedSqlNamedParams), SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let payment_hash = hex::encode(payment_info.payment_hash.0);
+    let (is_outbound, destination) = match payment_info.payment_type {
+        PaymentType::OutboundPayment { destination } => (true, Some(destination.to_string())),
+        PaymentType::InboundPayment => (false, None),
+    };
+    let preimage = payment_info.preimage.map(|p| hex::encode(p.0));
+    let status = payment_info.status.to_string();
+
+    let sql = format!(
+        "INSERT INTO {} (
+            payment_hash,
+            destination,
+            description,
+            preimage,
+            amount_msat,
+            fee_paid_msat,
+            is_outbound,
+            status,
+            created_at,
+            last_updated
+        ) VALUES (
+            :payment_hash, :destination, :description, :preimage, :amount_msat, :fee_paid_msat, :is_outbound, :status, :created_at, :last_updated
+        )",
+        table_name
+    );
+
+    let params = owned_named_params! {
+        ":payment_hash": payment_hash,
+        ":destination": destination,
+        ":description": payment_info.description.clone(),
+        ":preimage": preimage,
+        ":amount_msat": payment_info.amt_msat,
+        ":fee_paid_msat": payment_info.fee_paid_msat,
+        ":is_outbound": is_outbound,
+        ":status": status,
+        ":created_at": payment_info.created_at,
+        ":last_updated": payment_info.last_updated,
+    };
+    Ok((sql, params))
+}
+
+fn update_payment_preimage_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            preimage = ?1,
+            last_updated = ?2
+        WHERE
+            payment_hash = ?3;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_payment_status_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            status = ?1,
+            last_updated = ?2
+        WHERE
+            payment_hash = ?3;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_received_payment_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            preimage = ?1,
+            status = ?2,
+            last_updated = ?3
+        WHERE
+            payment_hash = ?4;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn update_sent_payment_sql(for_coin: &str) -> Result<String, SqlError> {
+    let table_name = payments_history_table(for_coin);
+    validate_table_name(&table_name)?;
+
+    let sql = format!(
+        "UPDATE {} SET
+            preimage = ?1,
+            fee_paid_msat = ?2,
+            status = ?3,
+            last_updated = ?4
+        WHERE
+            payment_hash = ?5;",
+        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,
+            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<DBChannelDetails, SqlError> {
+    let channel_details = DBChannelDetails {
+        rpc_id: row.get(0)?,
+        channel_id: row.get(1)?,
+        counterparty_node_id: row.get(2)?,
+        funding_tx: row.get(3)?,
+        funding_value: row.get(4)?,
+        funding_generated_in_block: row.get(5)?,
+        closing_tx: row.get(6)?,
+        closure_reason: row.get(7)?,
+        claiming_tx: row.get(8)?,
+        claimed_balance: row.get(9)?,
+        is_outbound: row.get(10)?,
+        is_public: row.get(11)?,
+        is_closed: row.get(12)?,
+        created_at: row.get(13)?,
+        closed_at: row.get(14)?,
+    };
+    Ok(channel_details)
+}
+
+fn payment_info_from_row(row: &Row<'_>) -> Result<PaymentInfo, SqlError> {
+    let is_outbound = row.get::<_, bool>(7)?;
+    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),
+        amt_msat: row.get(4)?,
+        fee_paid_msat: row.get(5)?,
+        status: HTLCStatus::from_str(&row.get::<_, String>(6)?)?,
+        created_at: row.get(8)?,
+        last_updated: row.get(9)?,
+    };
+    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<'a>(
+    builder: &mut SqlBuilder,
+    params: &mut SqlNamedParams<'a>,
+    filter: &'a 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));
+    }
+
+    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));
+    }
+
+    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));
+    }
+
+    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));
+    }
+
+    if let Some(channel_type) = &filter.channel_type {
+        let is_outbound = match channel_type {
+            ChannelType::Outbound => &true,
+            ChannelType::Inbound => &false,
+        };
+
+        builder.and_where("is_outbound = :is_outbound");
+        params.push((":is_outbound", is_outbound));
+    }
+
+    if let Some(channel_visibility) = &filter.channel_visibility {
+        let is_public = match channel_visibility {
+            ChannelVisibility::Public => &true,
+            ChannelVisibility::Private => &false,
+        };
+
+        builder.and_where("is_public = :is_public");
+        params.push((":is_public", is_public));
+    }
+}
+
+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("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<'a>(
+    builder: &mut SqlBuilder,
+    params: &mut SqlNamedParams<'a>,
+    filter: &'a DBPaymentsFilter,
+) {
+    if let Some(dest) = &filter.destination {
+        builder.and_where("destination = :dest");
+        params.push((":dest", dest));
+    }
+
+    if let Some(outbound) = &filter.is_outbound {
+        builder.and_where("is_outbound = :is_outbound");
+        params.push((":is_outbound", outbound));
+    }
+
+    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));
+    }
+
+    if let Some(from_amount) = &filter.from_amount_msat {
+        builder.and_where("amount_msat >= :from_amount");
+        params.push((":from_amount", from_amount));
+    }
+
+    if let Some(to_amount) = &filter.to_amount_msat {
+        builder.and_where("amount_msat <= :to_amount");
+        params.push((":to_amount", to_amount));
+    }
+
+    if let Some(from_fee) = &filter.from_fee_paid_msat {
+        builder.and_where("fee_paid_msat >= :from_fee");
+        params.push((":from_fee", from_fee));
+    }
+
+    if let Some(to_fee) = &filter.to_fee_paid_msat {
+        builder.and_where("fee_paid_msat <= :to_fee");
+        params.push((":to_fee", to_fee));
+    }
+
+    if let Some(from_time) = &filter.from_timestamp {
+        builder.and_where("created_at >= :from_time");
+        params.push((":from_time", from_time));
+    }
+
+    if let Some(to_time) = &filter.to_timestamp {
+        builder.and_where("created_at <= :to_time");
+        params.push((":to_time", to_time));
+    }
+}
+
+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)
+}
+
+#[derive(Clone)]
+pub struct SqliteLightningDB {
+    db_ticker: String,
+    sqlite_connection: SqliteConnShared,
+}
+
+impl SqliteLightningDB {
+    pub fn new(ticker: String, sqlite_connection: SqliteConnShared) -> Self {
+        Self {
+            db_ticker: ticker.replace('-', "_"),
+            sqlite_connection,
+        }
+    }
+}
+
+#[async_trait]
+impl LightningDB for SqliteLightningDB {
+    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.db_ticker.as_str())?;
+        let sql_payments_history = create_payments_history_table_sql(self.db_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.db_ticker.as_str());
+        validate_table_name(&channels_history_table)?;
+        let payments_history_table = payments_history_table(self.db_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.db_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: &DBChannelDetails) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let (sql, params) = insert_channel_sql(&for_coin, details)?;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            conn.execute_named(&sql, &params.as_sql_named_params())?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn add_funding_tx_to_db(
+        &self,
+        rpc_id: i64,
+        funding_tx: String,
+        funding_value: i64,
+        funding_generated_in_block: i64,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(funding_tx, funding_value, funding_generated_in_block, rpc_id);
+            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: i64) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(block_height, funding_tx);
+            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: i64,
+        closure_reason: String,
+        closed_at: i64,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let is_closed = true;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(closure_reason, is_closed, closed_at, rpc_id);
+            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<DBChannelDetails>, Self::Error> {
+        let mut builder = get_channels_builder_preimage(self.db_ticker.as_str())?;
+        builder.and_where("funding_tx IS NOT NULL");
+        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: i64, closing_tx: String) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(closing_tx, rpc_id);
+            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.db_ticker.clone();
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(claiming_tx, claimed_balance, closing_tx);
+            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<DBChannelDetails>, Self::Error> {
+        let params = [rpc_id.to_string()];
+        let sql = select_channel_by_rpc_id_sql(self.db_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.db_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);
+            }
+            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_slice(), channel_details_from_row)?
+                .collect::<Result<_, _>>()?;
+            let result = GetClosedChannelsResult {
+                channels,
+                skipped: offset,
+                total,
+            };
+            Ok(result)
+        })
+        .await
+    }
+
+    async fn add_payment_to_db(&self, info: &PaymentInfo) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let (sql, params) = insert_payment_sql(&for_coin, info)?;
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let conn = sqlite_connection.lock().unwrap();
+            conn.execute_named(&sql, &params.as_sql_named_params())?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_payment_preimage_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let preimage = hex::encode(preimage.0);
+        let last_updated = (now_ms() / 1000) as i64;
+        let payment_hash = hex::encode(hash.0);
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(preimage, last_updated, payment_hash);
+            sql_transaction.execute(&update_payment_preimage_sql(&for_coin)?, params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_payment_status_in_db(&self, hash: PaymentHash, status: &HTLCStatus) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let status = status.to_string();
+        let last_updated = (now_ms() / 1000) as i64;
+        let payment_hash = hex::encode(hash.0);
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(status, last_updated, payment_hash);
+            sql_transaction.execute(&update_payment_status_sql(&for_coin)?, params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_payment_to_received_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let preimage = hex::encode(preimage.0);
+        let status = HTLCStatus::Received.to_string();
+        let last_updated = (now_ms() / 1000) as i64;
+        let payment_hash = hex::encode(hash.0);
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(preimage, status, last_updated, payment_hash);
+            sql_transaction.execute(&update_received_payment_sql(&for_coin)?, params)?;
+            sql_transaction.commit()?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn update_payment_to_sent_in_db(
+        &self,
+        hash: PaymentHash,
+        preimage: PaymentPreimage,
+        fee_paid_msat: Option<u64>,
+    ) -> Result<(), Self::Error> {
+        let for_coin = self.db_ticker.clone();
+        let preimage = hex::encode(preimage.0);
+        let fee_paid_msat = fee_paid_msat.map(|f| f as i64);
+        let status = HTLCStatus::Succeeded.to_string();
+        let last_updated = (now_ms() / 1000) as i64;
+        let payment_hash = hex::encode(hash.0);
+
+        let sqlite_connection = self.sqlite_connection.clone();
+        async_blocking(move || {
+            let mut conn = sqlite_connection.lock().unwrap();
+            let sql_transaction = conn.transaction()?;
+            let params = params!(preimage, fee_paid_msat, status, last_updated, payment_hash);
+            sql_transaction.execute(&update_sent_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.db_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<DBPaymentsFilter>,
+        paging: PagingOptionsEnum<PaymentHash>,
+        limit: usize,
+    ) -> Result<GetPaymentsResult, Self::Error> {
+        let mut sql_builder = get_payments_builder_preimage(self.db_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::*;
+    use crate::lightning::ln_db::DBChannelDetails;
+    use common::{block_on, now_ms};
+    use db_common::sqlite::rusqlite::Connection;
+    use rand::distributions::Alphanumeric;
+    use rand::{Rng, RngCore};
+    use secp256k1v22::{Secp256k1, SecretKey};
+    use std::num::NonZeroUsize;
+    use std::sync::{Arc, Mutex};
+
+    fn generate_random_channels(num: u64) -> Vec<DBChannelDetails> {
+        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 = DBChannelDetails {
+                rpc_id: (i + 1) as i64,
+                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::<i64>()),
+                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::<i64>()),
+                is_outbound: rng.gen::<bool>(),
+                is_public: rng.gen::<bool>(),
+                is_closed: rand::random(),
+                created_at: rng.gen::<i64>(),
+                closed_at: Some(rng.gen::<i64>()),
+            };
+            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 rng.gen::<bool>() {
+                rng.fill_bytes(&mut bytes);
+                let secret = SecretKey::from_slice(&bytes).unwrap();
+                PaymentType::OutboundPayment {
+                    destination: PublicKey::from_secret_key(&s, &secret),
+                }
+            } else {
+                PaymentType::InboundPayment
+            };
+            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))
+                },
+                amt_msat: Some(rng.gen::<i64>()),
+                fee_paid_msat: Some(rng.gen::<i64>()),
+                status,
+                created_at: rng.gen::<i64>(),
+                last_updated: rng.gen::<i64>(),
+            };
+            payments.push(info);
+        }
+        payments
+    }
+
+    #[test]
+    fn test_init_sql_collection() {
+        let db = SqliteLightningDB::new(
+            "init_sql_collection".into(),
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+        let initialized = block_on(db.is_db_initialized()).unwrap();
+        assert!(!initialized);
+
+        block_on(db.init_db()).unwrap();
+        // repetitive init must not fail
+        block_on(db.init_db()).unwrap();
+
+        let initialized = block_on(db.is_db_initialized()).unwrap();
+        assert!(initialized);
+    }
+
+    #[test]
+    fn test_add_get_channel_sql() {
+        let db = SqliteLightningDB::new(
+            "add_get_channel".into(),
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(db.init_db()).unwrap();
+
+        let last_channel_rpc_id = block_on(db.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 0);
+
+        let channel = block_on(db.get_channel_from_db(1)).unwrap();
+        assert!(channel.is_none());
+
+        let mut expected_channel_details = DBChannelDetails::new(
+            1,
+            [0; 32],
+            PublicKey::from_str("038863cf8ab91046230f561cd5b386cbff8309fa02e3f0c3ed161a3aeb64a643b9").unwrap(),
+            true,
+            true,
+        );
+        block_on(db.add_channel_to_db(&expected_channel_details)).unwrap();
+        let last_channel_rpc_id = block_on(db.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 1);
+
+        let actual_channel_details = block_on(db.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(db.add_channel_to_db(&expected_channel_details)).unwrap_err();
+        assert_eq!(last_channel_rpc_id, 1);
+
+        expected_channel_details.rpc_id = 2;
+        block_on(db.add_channel_to_db(&expected_channel_details)).unwrap();
+        let last_channel_rpc_id = block_on(db.get_last_channel_rpc_id()).unwrap();
+        assert_eq!(last_channel_rpc_id, 2);
+
+        block_on(db.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(db.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        block_on(db.update_funding_tx_block_height(
+            "9cdafd6d42dcbdc06b0b5bce1866deb82630581285bbfb56870577300c0a8c6e".into(),
+            50001,
+        ))
+        .unwrap();
+        expected_channel_details.funding_generated_in_block = Some(50001);
+
+        let actual_channel_details = block_on(db.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        let current_time = (now_ms() / 1000) as i64;
+        block_on(db.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(db.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        let closed_channels =
+            block_on(db.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(db.update_channel_to_closed(
+            1,
+            "the channel was cooperatively closed".into(),
+            (now_ms() / 1000) as i64,
+        ))
+        .unwrap();
+        let closed_channels =
+            block_on(db.get_closed_channels_by_filter(None, PagingOptionsEnum::default(), 10)).unwrap();
+        assert_eq!(closed_channels.channels.len(), 2);
+
+        let actual_channels = block_on(db.get_closed_channels_with_no_closing_tx()).unwrap();
+        assert_eq!(actual_channels.len(), 1);
+
+        block_on(db.add_closing_tx_to_db(
+            2,
+            "5557df9ad2c9b3c57a4df8b4a7da0b7a6f4e923b4a01daa98bf9e5a3b33e9c8f".into(),
+        ))
+        .unwrap();
+        expected_channel_details.closing_tx =
+            Some("5557df9ad2c9b3c57a4df8b4a7da0b7a6f4e923b4a01daa98bf9e5a3b33e9c8f".into());
+
+        let actual_channels = block_on(db.get_closed_channels_with_no_closing_tx()).unwrap();
+        assert!(actual_channels.is_empty());
+
+        let actual_channel_details = block_on(db.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+
+        block_on(db.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(db.get_channel_from_db(2)).unwrap().unwrap();
+        assert_eq!(expected_channel_details, actual_channel_details);
+    }
+
+    #[test]
+    fn test_add_get_payment_sql() {
+        let db = SqliteLightningDB::new(
+            "add_get_payment".into(),
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(db.init_db()).unwrap();
+
+        let payment = block_on(db.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])),
+            amt_msat: Some(2000),
+            fee_paid_msat: Some(100),
+            status: HTLCStatus::Failed,
+            created_at: (now_ms() / 1000) as i64,
+            last_updated: (now_ms() / 1000) as i64,
+        };
+        block_on(db.add_payment_to_db(&expected_payment_info)).unwrap();
+
+        let actual_payment_info = block_on(db.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.amt_msat = None;
+        expected_payment_info.status = HTLCStatus::Succeeded;
+        expected_payment_info.last_updated = (now_ms() / 1000) as i64;
+        block_on(db.add_payment_to_db(&expected_payment_info)).unwrap();
+
+        let actual_payment_info = block_on(db.get_payment_from_db(PaymentHash([1; 32]))).unwrap().unwrap();
+        assert_eq!(expected_payment_info, actual_payment_info);
+
+        // Test update_payment_preimage_in_db
+        let new_preimage = PaymentPreimage([4; 32]);
+        block_on(db.update_payment_preimage_in_db(PaymentHash([1; 32]), new_preimage)).unwrap();
+        let preimage_after_update = block_on(db.get_payment_from_db(PaymentHash([1; 32])))
+            .unwrap()
+            .unwrap()
+            .preimage
+            .unwrap();
+        assert_eq!(new_preimage, preimage_after_update);
+
+        // Test update_payment_status_in_db
+        let new_status = HTLCStatus::Failed;
+        block_on(db.update_payment_status_in_db(PaymentHash([1; 32]), &new_status)).unwrap();
+        let status_after_update = block_on(db.get_payment_from_db(PaymentHash([1; 32])))
+            .unwrap()
+            .unwrap()
+            .status;
+        assert_eq!(new_status, status_after_update);
+
+        // Test update_payment_to_received_in_db
+        let expected_preimage = PaymentPreimage([5; 32]);
+        block_on(db.update_payment_to_received_in_db(PaymentHash([1; 32]), expected_preimage)).unwrap();
+        let payment_after_update = block_on(db.get_payment_from_db(PaymentHash([1; 32]))).unwrap().unwrap();
+        assert_eq!(payment_after_update.status, HTLCStatus::Received);
+        assert_eq!(payment_after_update.preimage.unwrap(), expected_preimage);
+
+        // Test update_payment_to_sent_in_db
+        let expected_preimage = PaymentPreimage([7; 32]);
+        let expected_fee_paid_msat = Some(1000);
+        block_on(db.update_payment_to_sent_in_db(PaymentHash([1; 32]), expected_preimage, expected_fee_paid_msat))
+            .unwrap();
+        let payment_after_update = block_on(db.get_payment_from_db(PaymentHash([1; 32]))).unwrap().unwrap();
+        assert_eq!(payment_after_update.status, HTLCStatus::Succeeded);
+        assert_eq!(payment_after_update.preimage.unwrap(), expected_preimage);
+        assert_eq!(
+            payment_after_update.fee_paid_msat.map(|f| f as u64),
+            expected_fee_paid_msat
+        );
+    }
+
+    #[test]
+    fn test_get_payments_by_filter() {
+        let db = SqliteLightningDB::new(
+            "test_get_payments_by_filter".into(),
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(db.init_db()).unwrap();
+
+        let mut payments = generate_random_payments(100);
+
+        for payment in &payments {
+            block_on(db.add_payment_to_db(payment)).unwrap();
+        }
+
+        let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+        let limit = 4;
+
+        let result = block_on(db.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(db.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(db.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 = DBPaymentsFilter {
+            is_outbound: Some(false),
+            destination: None,
+            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(db.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.to_string());
+        let result = block_on(db.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.is_outbound = None;
+        filter.destination = None;
+        filter.status = None;
+        filter.description = Some(substr.to_string());
+        let result = block_on(db.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 db = SqliteLightningDB::new(
+            "test_get_channels_by_filter".into(),
+            Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        );
+
+        block_on(db.init_db()).unwrap();
+
+        let channels = generate_random_channels(100);
+
+        for channel in channels {
+            block_on(db.add_channel_to_db(&channel)).unwrap();
+            block_on(db.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(db.update_channel_to_closed(channel.rpc_id, channel.closure_reason.unwrap(), 1655806080)).unwrap();
+            block_on(db.add_closing_tx_to_db(channel.rpc_id, channel.closing_tx.clone().unwrap())).unwrap();
+            block_on(db.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(db.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(db.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(db.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(db.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(db.get_closed_channels_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_channels_vec: Vec<DBChannelDetails> = 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(db.get_closed_channels_by_filter(Some(filter.clone()), paging.clone(), limit)).unwrap();
+        let expected_channels_vec: Vec<DBChannelDetails> = 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(db.get_closed_channels_by_filter(Some(filter), paging, limit)).unwrap();
+        let expected_channels_vec: Vec<DBChannelDetails> = 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/ln_storage.rs b/mm2src/coins/lightning/ln_storage.rs
new file mode 100644
index 0000000000..610720bc3f
--- /dev/null
+++ b/mm2src/coins/lightning/ln_storage.rs
@@ -0,0 +1,39 @@
+use async_trait::async_trait;
+use bitcoin::Network;
+use common::log::LogState;
+use lightning::routing::gossip;
+use lightning::routing::scoring::ProbabilisticScorer;
+use parking_lot::Mutex as PaMutex;
+use secp256k1v22::PublicKey;
+use std::collections::{HashMap, HashSet};
+use std::net::SocketAddr;
+use std::sync::{Arc, Mutex};
+
+pub type NodesAddressesMap = HashMap<PublicKey, SocketAddr>;
+pub type NodesAddressesMapShared = Arc<PaMutex<NodesAddressesMap>>;
+pub type TrustedNodesShared = Arc<PaMutex<HashSet<PublicKey>>>;
+
+pub type NetworkGraph = gossip::NetworkGraph<Arc<LogState>>;
+pub type Scorer = Mutex<ProbabilisticScorer<Arc<NetworkGraph>, Arc<LogState>>>;
+
+#[async_trait]
+pub trait LightningStorage {
+    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<NodesAddressesMap, Self::Error>;
+
+    async fn save_nodes_addresses(&self, nodes_addresses: NodesAddressesMapShared) -> Result<(), Self::Error>;
+
+    async fn get_network_graph(&self, network: Network, logger: Arc<LogState>) -> Result<NetworkGraph, Self::Error>;
+
+    async fn get_scorer(&self, network_graph: Arc<NetworkGraph>, logger: Arc<LogState>) -> Result<Scorer, Self::Error>;
+
+    async fn get_trusted_nodes(&self) -> Result<HashSet<PublicKey>, Self::Error>;
+
+    async fn save_trusted_nodes(&self, trusted_nodes: TrustedNodesShared) -> Result<(), Self::Error>;
+}
diff --git a/mm2src/coins/lightning/ln_utils.rs b/mm2src/coins/lightning/ln_utils.rs
index 05e4fd4f63..eeb7e04203 100644
--- a/mm2src/coins/lightning/ln_utils.rs
+++ b/mm2src/coins/lightning/ln_utils.rs
@@ -1,28 +1,30 @@
 use super::*;
+use crate::lightning::ln_db::LightningDB;
 use crate::lightning::ln_platform::{get_best_header, ln_best_block_update_loop, update_best_block};
+use crate::lightning::ln_sql::SqliteLightningDB;
+use crate::lightning::ln_storage::{LightningStorage, NodesAddressesMap};
 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::executor::SpawnFuture;
 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::ln::channelmanager::{ChainParameters, ChannelManagerReadArgs, PaymentId, PaymentSendFailure,
+                                    SimpleArcChannelManager};
+use lightning::routing::gossip::RoutingFees;
+use lightning::routing::router::{PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
 use lightning::util::config::UserConfig;
+use lightning::util::errors::APIError;
 use lightning::util::ser::ReadableArgs;
-use lightning_persister::storage::{DbStorage, FileSystemStorage, NodesAddressesMap, Scorer};
-use lightning_persister::LightningPersister;
+use lightning_invoice::payment::{Payer, PaymentError as InvoicePaymentError, Router as RouterTrait};
 use mm2_core::mm_ctx::MmArc;
+use std::collections::hash_map::Entry;
 use std::fs::File;
 use std::path::PathBuf;
-use std::sync::{Arc, Mutex};
-use std::time::SystemTime;
+use std::sync::Arc;
 
-const NETWORK_GRAPH_PERSIST_INTERVAL: u64 = 600;
-const SCORER_PERSIST_INTERVAL: u64 = 600;
+pub const PAYMENT_RETRY_ATTEMPTS: usize = 5;
 
 pub type ChainMonitor = chainmonitor::ChainMonitor<
     InMemorySigner,
@@ -30,10 +32,11 @@ pub type ChainMonitor = chainmonitor::ChainMonitor<
     Arc<Platform>,
     Arc<Platform>,
     Arc<LogState>,
-    Arc<LightningPersister>,
+    Arc<LightningFilesystemPersister>,
 >;
 
 pub type ChannelManager = SimpleArcChannelManager<ChainMonitor, Platform, Platform, LogState>;
+pub type Router = DefaultRouter<Arc<NetworkGraph>, Arc<LogState>>;
 
 #[inline]
 fn ln_data_dir(ctx: &MmArc, ticker: &str) -> PathBuf { ctx.dbdir().join("LIGHTNING").join(ticker) }
@@ -42,7 +45,7 @@ fn ln_data_dir(ctx: &MmArc, ticker: &str) -> PathBuf { ctx.dbdir().join("LIGHTNI
 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(hex::encode(ctx.rmd160().as_slice()))
             .join("LIGHTNING")
             .join(ticker)
     })
@@ -50,62 +53,50 @@ fn ln_data_backup_dir(ctx: &MmArc, path: Option<String>, ticker: &str) -> Option
 
 pub async fn init_persister(
     ctx: &MmArc,
-    platform: Arc<Platform>,
     ticker: String,
     backup_path: Option<String>,
-) -> EnableLightningResult<Arc<LightningPersister>> {
+) -> EnableLightningResult<Arc<LightningFilesystemPersister>> {
     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,
+    let persister = Arc::new(LightningFilesystemPersister::new(ln_data_dir, ln_data_backup_dir));
+
+    let is_initialized = persister.is_fs_initialized().await?;
+    if !is_initialized {
+        persister.init_fs().await?;
+    }
+
+    Ok(persister)
+}
+
+pub async fn init_db(ctx: &MmArc, ticker: String) -> EnableLightningResult<SqliteLightningDB> {
+    let db = SqliteLightningDB::new(
+        ticker,
         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
-                    );
-                }
-            }
-        });
+    if !db.is_db_initialized().await? {
+        db.init_db().await?;
     }
 
-    Ok(persister)
+    Ok(db)
 }
 
-pub fn init_keys_manager(ctx: &MmArc) -> EnableLightningResult<Arc<KeysManager>> {
+pub fn init_keys_manager(platform: &Platform) -> 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()))?;
+    // TODO validate that this is right
+    let seed: [u8; 32] = platform
+        .coin
+        .as_ref()
+        .priv_key_policy
+        .key_pair_or_err()?
+        .private()
+        .secret
+        .into();
+    let cur = get_local_duration_since_epoch().map_to_mm(|e| EnableLightningError::SystemTimeError(e.to_string()))?;
 
     Ok(Arc::new(KeysManager::new(&seed, cur.as_secs(), cur.subsec_nanos())))
 }
@@ -113,7 +104,8 @@ pub fn init_keys_manager(ctx: &MmArc) -> EnableLightningResult<Arc<KeysManager>>
 pub async fn init_channel_manager(
     platform: Arc<Platform>,
     logger: Arc<LogState>,
-    persister: Arc<LightningPersister>,
+    persister: Arc<LightningFilesystemPersister>,
+    db: SqliteLightningDB,
     keys_manager: Arc<KeysManager>,
     user_config: UserConfig,
 ) -> EnableLightningResult<(Arc<ChainMonitor>, Arc<ChannelManager>)> {
@@ -134,12 +126,19 @@ pub async fn init_channel_manager(
     ));
 
     // 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()))?;
+    let channels_persister = persister.clone();
+    let channels_keys_manager = keys_manager.clone();
+    let mut channelmonitors = async_blocking(move || {
+        channels_persister
+            .read_channelmonitors(channels_keys_manager)
+            .map_to_mm(|e| EnableLightningError::IOError(e.to_string()))
+    })
+    .await?;
 
     // This is used for Electrum only to prepare for chain synchronization
     for (_, chan_mon) in channelmonitors.iter() {
+        // Although there is a mutex lock inside the load_outputs_to_watch fn
+        // it shouldn't be held by anything yet, so async_blocking is not needed.
         chan_mon.load_outputs_to_watch(&platform);
     }
 
@@ -155,110 +154,97 @@ pub async fn init_channel_manager(
     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 best_block_hash = BlockHash::from_hash(sha256d::Hash::from_inner(best_block.hash.0));
+
+    let channel_manager = if persister.manager_path().exists() {
+        let chain_monitor_for_args = chain_monitor.clone();
+
+        let (channel_manager_blockhash, channel_manager, channelmonitors) = async_blocking(move || {
+            let mut manager_file = 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(),
+                chain_monitor_for_args,
                 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);
+            <(BlockHash, Arc<ChannelManager>)>::read(&mut manager_file, read_args)
+                .map(|(h, c)| (h, c, channelmonitors))
+                .map_to_mm(|e| EnableLightningError::IOError(e.to_string()))
+        })
+        .await?;
 
-    // Sync ChannelMonitors and ChannelManager to chain tip if the node is restarting and has open channels
-    if channel_manager_blockhash != best_block_hash {
+        // Sync ChannelMonitors and ChannelManager to chain tip if the node is restarting and has open channels
         platform
-            .process_txs_unconfirmations(&chain_monitor, &channel_manager)
+            .process_txs_confirmations(
+                &rpc_client,
+                &db,
+                Arc::clone(&chain_monitor),
+                Arc::clone(&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;
-    }
+        if channel_manager_blockhash != best_block_hash {
+            platform
+                .process_txs_unconfirmations(Arc::clone(&chain_monitor), Arc::clone(&channel_manager))
+                .await;
+            update_best_block(Arc::clone(&chain_monitor), Arc::clone(&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)))?;
-    }
+        // Give ChannelMonitors to ChainMonitor
+        for (_, channel_monitor) in channelmonitors.into_iter() {
+            let funding_outpoint = channel_monitor.get_funding_txo().0;
+            let chain_monitor = chain_monitor.clone();
+            async_blocking(move || {
+                chain_monitor
+                    .watch_channel(funding_outpoint, channel_monitor)
+                    .map_to_mm(|e| EnableLightningError::IOError(format!("{:?}", e)))
+            })
+            .await?;
+        }
+        channel_manager
+    } 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),
+        };
+        Arc::new(ChannelManager::new(
+            fee_estimator.clone(),
+            chain_monitor.clone(),
+            broadcaster.clone(),
+            logger.clone(),
+            keys_manager.clone(),
+            user_config,
+            chain_params,
+        ))
+    };
 
     // 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(),
+    platform.spawner().spawn(ln_best_block_update_loop(
+        platform.clone(),
+        db,
         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>,
+    persister: Arc<LightningFilesystemPersister>,
     channel_manager: Arc<ChannelManager>,
 ) -> EnableLightningResult<NodesAddressesMap> {
-    let channels = channel_manager.list_channels();
+    let channels = async_blocking(move || channel_manager.list_channels()).await;
     let mut nodes_addresses = persister.get_nodes_addresses().await?;
     nodes_addresses.retain(|pubkey, _node_addr| {
         channels
@@ -268,3 +254,273 @@ pub async fn get_open_channels_nodes_addresses(
     });
     Ok(nodes_addresses)
 }
+
+// Todo: Make this public in rust-lightning by opening a PR there instead of importing it here
+/// Filters the `channels` for an invoice, and returns the corresponding `RouteHint`s to include
+/// in the invoice.
+///
+/// The filtering is based on the following criteria:
+/// * Only one channel per counterparty node
+/// * Always select the channel with the highest inbound capacity per counterparty node
+/// * Filter out channels with a lower inbound capacity than `min_inbound_capacity_msat`, if any
+/// channel with a higher or equal inbound capacity than `min_inbound_capacity_msat` exists
+/// * If any public channel exists, the returned `RouteHint`s will be empty, and the sender will
+/// need to find the path by looking at the public channels instead
+pub(crate) fn filter_channels(channels: Vec<ChannelDetails>, min_inbound_capacity_msat: Option<u64>) -> Vec<RouteHint> {
+    let mut filtered_channels: HashMap<PublicKey, &ChannelDetails> = HashMap::new();
+    let min_inbound_capacity = min_inbound_capacity_msat.unwrap_or(0);
+    let mut min_capacity_channel_exists = false;
+
+    for channel in channels.iter() {
+        if channel.get_inbound_payment_scid().is_none() || channel.counterparty.forwarding_info.is_none() {
+            continue;
+        }
+
+        // Todo: if all public channels have inbound_capacity_msat less than min_inbound_capacity we need to give the user the option to reveal his/her private channels to the swap counterparty in this case or not
+        // Todo: the problem with revealing the private channels in the swap message (invoice) is that it can be used by malicious nodes to probe for private channels so maybe there should be a
+        // Todo: requirement that the other party has the amount required to be sent in the swap first (do we have a way to check if the other side of the swap has the balance required for the swap on-chain or not)
+        if channel.is_public {
+            // If any public channel exists, return no hints and let the sender
+            // look at the public channels instead.
+            return vec![];
+        }
+
+        if channel.inbound_capacity_msat >= min_inbound_capacity {
+            min_capacity_channel_exists = true;
+        };
+        match filtered_channels.entry(channel.counterparty.node_id) {
+            Entry::Occupied(entry) if channel.inbound_capacity_msat < entry.get().inbound_capacity_msat => continue,
+            Entry::Occupied(mut entry) => entry.insert(channel),
+            Entry::Vacant(entry) => entry.insert(channel),
+        };
+    }
+
+    let route_hint_from_channel = |channel: &ChannelDetails| {
+        // It's safe to unwrap here since all filtered_channels have forwarding_info
+        let forwarding_info = channel.counterparty.forwarding_info.as_ref().unwrap();
+        RouteHint(vec![RouteHintHop {
+            src_node_id: channel.counterparty.node_id,
+            // It's safe to unwrap here since all filtered_channels have inbound_payment_scid
+            short_channel_id: channel.get_inbound_payment_scid().unwrap(),
+            fees: RoutingFees {
+                base_msat: forwarding_info.fee_base_msat,
+                proportional_millionths: forwarding_info.fee_proportional_millionths,
+            },
+            cltv_expiry_delta: forwarding_info.cltv_expiry_delta,
+            htlc_minimum_msat: channel.inbound_htlc_minimum_msat,
+            htlc_maximum_msat: channel.inbound_htlc_maximum_msat,
+        }])
+    };
+    // If all channels are private, return the route hint for the highest inbound capacity channel
+    // per counterparty node. If channels with an higher inbound capacity than the
+    // min_inbound_capacity exists, filter out the channels with a lower capacity than that.
+    filtered_channels
+        .into_iter()
+        .filter(|(_counterparty_id, channel)| {
+            !min_capacity_channel_exists || channel.inbound_capacity_msat >= min_inbound_capacity
+        })
+        .map(|(_counterparty_id, channel)| route_hint_from_channel(channel))
+        .collect::<Vec<RouteHint>>()
+}
+
+#[derive(Debug, Display)]
+pub enum PaymentError {
+    #[display(fmt = "Final cltv expiry delta {} is below the required minimum of {}", _0, _1)]
+    CLTVExpiry(u32, u32),
+    #[display(fmt = "Error paying invoice: {}", _0)]
+    Invoice(String),
+    #[display(fmt = "Keysend error: {}", _0)]
+    Keysend(String),
+    #[display(fmt = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl From<SqlError> for PaymentError {
+    fn from(err: SqlError) -> PaymentError { PaymentError::DbError(err.to_string()) }
+}
+
+impl From<InvoicePaymentError> for PaymentError {
+    fn from(err: InvoicePaymentError) -> PaymentError { PaymentError::Invoice(format!("{:?}", err)) }
+}
+
+// Todo: This is imported from rust-lightning and modified by me, will need to open a PR there with this modification and update the dependency to remove this code and the code it depends on.
+pub(crate) fn pay_invoice_with_max_total_cltv_expiry_delta(
+    channel_manager: Arc<ChannelManager>,
+    router: Arc<Router>,
+    scorer: Arc<Scorer>,
+    invoice: &Invoice,
+    max_total_cltv_expiry_delta: u32,
+) -> Result<PaymentId, PaymentError> {
+    let final_value_msat = invoice
+        .amount_milli_satoshis()
+        .ok_or(InvoicePaymentError::Invoice("amount missing"))?;
+    let expiry_time = (invoice.duration_since_epoch() + invoice.expiry_time()).as_secs();
+
+    let mut payment_params = PaymentParameters::from_node_id(invoice.recover_payee_pub_key())
+        .with_expiry_time(expiry_time)
+        .with_route_hints(invoice.route_hints())
+        .with_max_total_cltv_expiry_delta(max_total_cltv_expiry_delta);
+    if let Some(features) = invoice.features() {
+        payment_params = payment_params.with_features(features.clone());
+    }
+    drop_mutability!(payment_params);
+    let route_params = RouteParameters {
+        payment_params,
+        final_value_msat,
+        final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
+    };
+
+    pay_internal(
+        channel_manager,
+        router,
+        scorer,
+        &route_params,
+        invoice,
+        &mut 0,
+        &mut Vec::new(),
+    )
+}
+
+fn pay_internal(
+    channel_manager: Arc<ChannelManager>,
+    router: Arc<Router>,
+    scorer: Arc<Scorer>,
+    params: &RouteParameters,
+    invoice: &Invoice,
+    attempts: &mut usize,
+    errors: &mut Vec<APIError>,
+) -> Result<PaymentId, PaymentError> {
+    let payer = channel_manager.node_id();
+    let first_hops = channel_manager.first_hops();
+    let payment_hash = PaymentHash((*invoice.payment_hash()).into_inner());
+    // Todo: Routes should be checked before order matching also, this might require routing hints to be shared when matching orders. Just-in-time channels can solve this issue as well.
+    let route = router
+        .find_route(
+            &payer,
+            params,
+            &payment_hash,
+            Some(&first_hops.iter().collect::<Vec<_>>()),
+            &scorer.lock().unwrap(),
+        )
+        .map_err(InvoicePaymentError::Routing)?;
+
+    let payment_secret = Some(*invoice.payment_secret());
+    match channel_manager.send_payment(&route, payment_hash, &payment_secret) {
+        Ok(payment_id) => Ok(payment_id),
+        Err(e) => match e {
+            PaymentSendFailure::ParameterError(_) => Err(e),
+            PaymentSendFailure::PathParameterError(_) => Err(e),
+            PaymentSendFailure::AllFailedRetrySafe(err) => {
+                if *attempts > PAYMENT_RETRY_ATTEMPTS {
+                    Err(PaymentSendFailure::AllFailedRetrySafe(errors.to_vec()))
+                } else {
+                    *attempts += 1;
+                    errors.extend(err);
+                    Ok(pay_internal(
+                        channel_manager,
+                        router,
+                        scorer,
+                        params,
+                        invoice,
+                        attempts,
+                        errors,
+                    )?)
+                }
+            },
+            PaymentSendFailure::PartialFailure {
+                failed_paths_retry,
+                payment_id,
+                ..
+            } => {
+                if let Some(retry_data) = failed_paths_retry {
+                    // Some paths were sent, even if we failed to send the full MPP value our
+                    // recipient may misbehave and claim the funds, at which point we have to
+                    // consider the payment sent, so return `Ok()` here, ignoring any retry
+                    // errors.
+                    let _ = retry_payment(
+                        channel_manager,
+                        router,
+                        scorer,
+                        payment_id,
+                        payment_hash,
+                        &retry_data,
+                        &mut 0,
+                        errors,
+                    );
+                    Ok(payment_id)
+                } else {
+                    // This may happen if we send a payment and some paths fail, but
+                    // only due to a temporary monitor failure or the like, implying
+                    // they're really in-flight, but we haven't sent the initial
+                    // HTLC-Add messages yet.
+                    Ok(payment_id)
+                }
+            },
+        },
+    }
+    .map_err(|e| InvoicePaymentError::Sending(e).into())
+}
+
+#[allow(clippy::too_many_arguments)]
+fn retry_payment(
+    channel_manager: Arc<ChannelManager>,
+    router: Arc<Router>,
+    scorer: Arc<Scorer>,
+    payment_id: PaymentId,
+    payment_hash: PaymentHash,
+    params: &RouteParameters,
+    attempts: &mut usize,
+    errors: &mut Vec<APIError>,
+) -> Result<(), PaymentError> {
+    let payer = channel_manager.node_id();
+    let first_hops = channel_manager.first_hops();
+    let route = router
+        .find_route(
+            &payer,
+            params,
+            &payment_hash,
+            Some(&first_hops.iter().collect::<Vec<_>>()),
+            &scorer.lock().unwrap(),
+        )
+        .map_err(InvoicePaymentError::Routing)?;
+
+    match channel_manager.retry_payment(&route, payment_id) {
+        Ok(()) => Ok(()),
+        Err(PaymentSendFailure::AllFailedRetrySafe(err)) => {
+            if *attempts > PAYMENT_RETRY_ATTEMPTS {
+                let e = PaymentSendFailure::AllFailedRetrySafe(errors.to_vec());
+                Err(InvoicePaymentError::Sending(e).into())
+            } else {
+                *attempts += 1;
+                errors.extend(err);
+                retry_payment(
+                    channel_manager,
+                    router,
+                    scorer,
+                    payment_id,
+                    payment_hash,
+                    params,
+                    attempts,
+                    errors,
+                )
+            }
+        },
+        Err(PaymentSendFailure::PartialFailure { failed_paths_retry, .. }) => {
+            if let Some(retry) = failed_paths_retry {
+                // Always return Ok for the same reason as noted in pay_internal.
+                let _ = retry_payment(
+                    channel_manager,
+                    router,
+                    scorer,
+                    payment_id,
+                    payment_hash,
+                    &retry,
+                    attempts,
+                    errors,
+                );
+            }
+            Ok(())
+        },
+        Err(e) => Err(InvoicePaymentError::Sending(e).into()),
+    }
+}
diff --git a/mm2src/coins/lightning_background_processor/Cargo.toml b/mm2src/coins/lightning_background_processor/Cargo.toml
deleted file mode 100644
index 5710dcfc2c..0000000000
--- a/mm2src/coins/lightning_background_processor/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[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
deleted file mode 100644
index 4ca2fe9ad4..0000000000
--- a/mm2src/coins/lightning_background_processor/src/lib.rs
+++ /dev/null
@@ -1,950 +0,0 @@
-//! 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
deleted file mode 100644
index 32b5d7eb1d..0000000000
--- a/mm2src/coins/lightning_persister/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[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
deleted file mode 100644
index 303205c26f..0000000000
--- a/mm2src/coins/lightning_persister/src/lib.rs
+++ /dev/null
@@ -1,2097 +0,0 @@
-//! 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/util.rs b/mm2src/coins/lightning_persister/src/util.rs
deleted file mode 100644
index ac5bc99de5..0000000000
--- a/mm2src/coins/lightning_persister/src/util.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-#[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 7ba7775128..265b3e69ea 100644
--- a/mm2src/coins/lp_coins.rs
+++ b/mm2src/coins/lp_coins.rs
@@ -24,20 +24,27 @@
 #![feature(async_closure)]
 #![feature(hash_raw_entry)]
 #![feature(stmt_expr_attributes)]
+#![feature(result_flattening)]
 
 #[macro_use] extern crate common;
 #[macro_use] extern crate gstuff;
 #[macro_use] extern crate lazy_static;
+#[macro_use] extern crate mm2_metrics;
 #[macro_use] extern crate serde_derive;
 #[macro_use] extern crate serde_json;
 #[macro_use] extern crate ser_error_derive;
 
 use async_trait::async_trait;
 use base58::FromBase58Error;
-use common::mm_metrics::MetricsWeak;
+use common::custom_futures::timeout::TimeoutError;
+use common::executor::{abortable_queue::{AbortableQueue, WeakSpawner},
+                       AbortSettings, AbortedError, SpawnAbortable, SpawnFuture};
+use common::log::LogOnError;
 use common::{calc_total_pages, now_ms, ten, HttpStatusCode};
-use crypto::{Bip32Error, CryptoCtx, DerivationPath};
+use crypto::{Bip32Error, CryptoCtx, CryptoCtxError, DerivationPath, GlobalHDAccountArc, HwRpcError, KeyPairPolicy,
+             Secp256k1Secret, WithHwRpcError};
 use derive_more::Display;
+use enum_from::{EnumFromStringify, EnumFromTrait};
 use futures::compat::Future01CompatExt;
 use futures::lock::Mutex as AsyncMutex;
 use futures::{FutureExt, TryFutureExt};
@@ -46,17 +53,20 @@ use http::{Response, StatusCode};
 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 mm2_metrics::MetricsWeak;
+use mm2_number::{bigdecimal::{BigDecimal, ParseBigDecimalError, Zero},
+                 MmNumber};
+use parking_lot::Mutex as PaMutex;
 use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
-use serde::{Deserialize, Deserializer, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::{self as json, Value as Json};
 use std::cmp::Ordering;
 use std::collections::hash_map::{HashMap, RawEntryMut};
+use std::collections::HashSet;
 use std::fmt;
+use std::future::Future as Future03;
 use std::num::NonZeroUsize;
 use std::ops::{Add, Deref};
-use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -64,19 +74,21 @@ use utxo_signer::with_key_pair::UtxoSignWithKeyPairError;
 
 cfg_native! {
     use crate::lightning::LightningCoin;
-    use crate::lightning::ln_conf::PlatformCoinConfirmations;
+    use crate::lightning::ln_conf::PlatformCoinConfirmationTargets;
+    use ::lightning::ln::PaymentHash as LightningPayment;
     use async_std::fs;
     use futures::AsyncWriteExt;
+    use lightning_invoice::{Invoice, ParseOrSemanticError};
     use std::io;
+    use std::path::PathBuf;
     use zcash_primitives::transaction::Transaction as ZTransaction;
     use z_coin::ZcoinProtocolInfo;
 }
 
 cfg_wasm32! {
-    use mm2_db::indexed_db::{ConstructibleDb, DbLocked, SharedDb};
     use hd_wallet_storage::HDWalletDb;
+    use mm2_db::indexed_db::{ConstructibleDb, DbLocked, SharedDb};
     use tx_history_storage::wasm::{clear_tx_history, load_tx_history, save_tx_history, TxHistoryDb};
-
     pub type TxHistoryDbLocked<'a> = DbLocked<'a, TxHistoryDb>;
 }
 
@@ -94,7 +106,7 @@ macro_rules! try_f {
     ($e: expr) => {
         match $e {
             Ok(ok) => ok,
-            Err(e) => return Box::new(futures01::future::err(e)),
+            Err(e) => return Box::new(futures01::future::err(e.into())),
         }
     };
 }
@@ -178,57 +190,50 @@ macro_rules! ok_or_continue_after_sleep {
     };
 }
 
-#[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;
-                },
-            }
-        }
-    };
-}
+pub mod coin_balance;
 
-#[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_errors;
+use coin_errors::{MyAddressError, ValidatePaymentError, ValidatePaymentFut};
 
-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 hd_confirm_address;
 pub mod hd_pubkey;
+
 pub mod hd_wallet;
+use hd_wallet::{HDAccountAddressId, HDAddress};
+
 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_with_policy, Qrc20ActivationParams, Qrc20Coin, Qrc20FeeDetails};
+
 pub mod rpc_command;
+use rpc_command::{get_new_address::{GetNewAddressTaskManager, GetNewAddressTaskManagerShared},
+                  init_account_balance::{AccountBalanceTaskManager, AccountBalanceTaskManagerShared},
+                  init_create_account::{CreateAccountTaskManager, CreateAccountTaskManagerShared},
+                  init_scan_for_new_addresses::{ScanAddressesTaskManager, ScanAddressesTaskManagerShared},
+                  init_withdraw::{WithdrawTaskManager, WithdrawTaskManagerShared}};
+
+pub mod tendermint;
+use tendermint::{CosmosTransaction, CustomTendermintMsgType, TendermintCoin, TendermintFeeDetails,
+                 TendermintProtocolInfo, TendermintToken, TendermintTokenProtocolInfo};
+
 #[doc(hidden)]
 #[allow(unused_variables)]
 pub mod test_coin;
-pub mod tx_history_storage;
 pub use test_coin::TestCoin;
 
+pub mod tx_history_storage;
+
 #[doc(hidden)]
 #[allow(unused_variables)]
 #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
@@ -236,31 +241,24 @@ pub mod solana;
 #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
 pub use solana::spl::SplToken;
 #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
-pub use solana::{solana_coin_from_conf_and_params, SolanaActivationParams, SolanaCoin, SolanaFeeDetails};
+pub use solana::{SolanaActivationParams, SolanaCoin, SolanaFeeDetails};
 
 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::bch::{bch_coin_with_policy, BchActivationRequest, BchCoin};
+use utxo::qtum::{self, qtum_coin_with_policy, Qrc20AddressError, QtumCoin, QtumDelegationOps, QtumDelegationRequest,
+                 QtumStakingInfosDetails, ScriptHashTypeNotSupported};
 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::utxo_standard::{utxo_standard_coin_with_policy, UtxoStandardCoin};
 use utxo::UtxoActivationParams;
 use utxo::{BlockchainNetwork, GenerateTxError, UtxoFeeDetails, UtxoTx};
+
+#[cfg(not(target_arch = "wasm32"))] pub mod z_coin;
 #[cfg(not(target_arch = "wasm32"))] use z_coin::ZCoin;
 
+pub type TransactionFut = Box<dyn Future<Item = TransactionEnum, Error = TransactionErr> + Send>;
 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>;
@@ -279,6 +277,23 @@ 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>;
+pub type RefundResult<T> = Result<T, MmError<RefundError>>;
+pub type SendMakerPaymentArgs<'a> = SendSwapPaymentArgs<'a>;
+pub type SendTakerPaymentArgs<'a> = SendSwapPaymentArgs<'a>;
+pub type SendMakerSpendsTakerPaymentArgs<'a> = SendSpendPaymentArgs<'a>;
+pub type SendTakerSpendsMakerPaymentArgs<'a> = SendSpendPaymentArgs<'a>;
+pub type SendTakerRefundsPaymentArgs<'a> = SendRefundPaymentArgs<'a>;
+pub type SendMakerRefundsPaymentArgs<'a> = SendRefundPaymentArgs<'a>;
+pub type SendWatcherRefundsPaymentArgs<'a> = SendRefundPaymentArgs<'a>;
+
+pub type IguanaPrivKey = Secp256k1Secret;
+
+// Constants for logs used in tests
+pub const INVALID_SENDER_ERR_LOG: &str = "Invalid sender";
+pub const EARLY_CONFIRMATION_ERR_LOG: &str = "Early confirmation";
+pub const OLD_TRANSACTION_ERR_LOG: &str = "Old transaction";
+pub const INVALID_RECEIVER_ERR_LOG: &str = "Invalid receiver";
+pub const INVALID_CONTRACT_ADDRESS_ERR_LOG: &str = "Invalid contract address";
 
 #[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
@@ -346,18 +361,27 @@ pub enum TxHistoryError {
     InternalError(String),
 }
 
-#[derive(Debug, Display)]
-pub enum PrivKeyNotAllowed {
+#[derive(Clone, Debug, Display)]
+pub enum PrivKeyPolicyNotAllowed {
     #[display(fmt = "Hardware Wallet is not supported")]
     HardwareWalletNotSupported,
 }
 
-#[derive(Debug, Display, PartialEq, Serialize)]
+impl Serialize for PrivKeyPolicyNotAllowed {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+#[derive(Clone, Debug, Display, PartialEq, Serialize)]
 pub enum UnexpectedDerivationMethod {
-    #[display(fmt = "Iguana private key is unavailable")]
-    IguanaPrivKeyUnavailable,
-    #[display(fmt = "HD wallet is unavailable")]
-    HDWalletUnavailable,
+    #[display(fmt = "Expected 'SingleAddress' derivation method")]
+    ExpectedSingleAddress,
+    #[display(fmt = "Expected 'HDWallet' derivationMethod")]
+    ExpectedHDWallet,
 }
 
 pub trait Transaction: fmt::Debug + 'static {
@@ -373,11 +397,25 @@ pub enum TransactionEnum {
     SignedEthTx(SignedEthTx),
     #[cfg(not(target_arch = "wasm32"))]
     ZTransaction(ZTransaction),
+    CosmosTransaction(CosmosTransaction),
+    #[cfg(not(target_arch = "wasm32"))]
+    LightningPayment(LightningPayment),
 }
+
 ifrom!(TransactionEnum, UtxoTx);
 ifrom!(TransactionEnum, SignedEthTx);
 #[cfg(not(target_arch = "wasm32"))]
 ifrom!(TransactionEnum, ZTransaction);
+#[cfg(not(target_arch = "wasm32"))]
+ifrom!(TransactionEnum, LightningPayment);
+
+impl TransactionEnum {
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn supports_tx_helper(&self) -> bool { !matches!(self, TransactionEnum::LightningPayment(_)) }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn supports_tx_helper(&self) -> bool { true }
+}
 
 // NB: When stable and groked by IDEs, `enum_dispatch` can be used instead of `Deref` to speed things up.
 impl Deref for TransactionEnum {
@@ -388,10 +426,23 @@ impl Deref for TransactionEnum {
             TransactionEnum::SignedEthTx(ref t) => t,
             #[cfg(not(target_arch = "wasm32"))]
             TransactionEnum::ZTransaction(ref t) => t,
+            TransactionEnum::CosmosTransaction(ref t) => t,
+            #[cfg(not(target_arch = "wasm32"))]
+            TransactionEnum::LightningPayment(ref p) => p,
         }
     }
 }
 
+/// Error type for handling tx serialization/deserialization operations.
+#[derive(Debug, Clone)]
+pub enum TxMarshalingErr {
+    InvalidInput(String),
+    /// For cases where serialized and deserialized values doesn't verify each other.
+    CrossCheckFailed(String),
+    NotSupported(String),
+    Internal(String),
+}
+
 #[derive(Debug, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum TransactionErr {
@@ -421,8 +472,6 @@ impl TransactionErr {
     }
 }
 
-pub type TransactionFut = Box<dyn Future<Item = TransactionEnum, Error = TransactionErr> + Send>;
-
 #[derive(Debug, PartialEq)]
 pub enum FoundSwapTxSpend {
     Spent(TransactionEnum),
@@ -444,9 +493,37 @@ pub enum NegotiateSwapContractAddrErr {
     NoOtherAddrAndNoFallback,
 }
 
+#[derive(Debug, Display, Eq, PartialEq)]
+pub enum ValidateOtherPubKeyErr {
+    #[display(fmt = "InvalidPubKey: {:?}", _0)]
+    InvalidPubKey(String),
+}
+
+#[derive(Clone, Debug)]
+pub struct WatcherValidateTakerFeeInput {
+    pub taker_fee_hash: Vec<u8>,
+    pub sender_pubkey: Vec<u8>,
+    pub min_block_number: u64,
+    pub fee_addr: Vec<u8>,
+    pub lock_duration: u64,
+}
+
+#[derive(Clone, Debug)]
+pub struct WatcherValidatePaymentInput {
+    pub payment_tx: Vec<u8>,
+    pub taker_payment_refund_preimage: Vec<u8>,
+    pub time_lock: u32,
+    pub taker_pub: Vec<u8>,
+    pub maker_pub: Vec<u8>,
+    pub secret_hash: Vec<u8>,
+    pub try_spv_proof_until: u64,
+    pub confirmations: u64,
+}
+
 #[derive(Clone, Debug)]
 pub struct ValidatePaymentInput {
     pub payment_tx: Vec<u8>,
+    pub time_lock_duration: u64,
     pub time_lock: u32,
     pub other_pub: Vec<u8>,
     pub secret_hash: Vec<u8>,
@@ -457,6 +534,24 @@ pub struct ValidatePaymentInput {
     pub unique_swap_data: Vec<u8>,
 }
 
+#[derive(Clone, Debug)]
+pub struct WatcherSearchForSwapTxSpendInput<'a> {
+    pub time_lock: u32,
+    pub taker_pub: &'a [u8],
+    pub maker_pub: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub tx: &'a [u8],
+    pub search_from_block: u64,
+}
+
+#[derive(Clone, Debug)]
+pub struct SendMakerPaymentSpendPreimageInput<'a> {
+    pub preimage: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub secret: &'a [u8],
+    pub taker_pub: &'a [u8],
+}
+
 pub struct SearchForSwapTxSpendInput<'a> {
     pub time_lock: u32,
     pub other_pub: &'a [u8],
@@ -467,93 +562,143 @@ pub struct SearchForSwapTxSpendInput<'a> {
     pub swap_unique_data: &'a [u8],
 }
 
+#[derive(Clone, Debug)]
+pub struct SendSwapPaymentArgs<'a> {
+    pub time_lock_duration: u64,
+    pub time_lock: u32,
+    /// This is either:
+    /// * Taker's pubkey if this structure is used in [`SwapOps::send_maker_payment`].
+    /// * Maker's pubkey if this structure is used in [`SwapOps::send_taker_payment`].
+    pub other_pubkey: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub amount: BigDecimal,
+    pub swap_contract_address: &'a Option<BytesJson>,
+    pub swap_unique_data: &'a [u8],
+    pub payment_instructions: &'a Option<PaymentInstructions>,
+}
+
+#[derive(Clone, Debug)]
+pub struct SendSpendPaymentArgs<'a> {
+    /// This is either:
+    /// * Taker's payment tx if this structure is used in [`SwapOps::send_maker_spends_taker_payment`].
+    /// * Maker's payment tx if this structure is used in [`SwapOps::send_taker_spends_maker_payment`].
+    pub other_payment_tx: &'a [u8],
+    pub time_lock: u32,
+    /// This is either:
+    /// * Taker's pubkey if this structure is used in [`SwapOps::send_maker_spends_taker_payment`].
+    /// * Maker's pubkey if this structure is used in [`SwapOps::send_taker_spends_maker_payment`].
+    pub other_pubkey: &'a [u8],
+    pub secret: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub swap_contract_address: &'a Option<BytesJson>,
+    pub swap_unique_data: &'a [u8],
+}
+
+#[derive(Clone, Debug)]
+pub struct SendRefundPaymentArgs<'a> {
+    pub payment_tx: &'a [u8],
+    pub time_lock: u32,
+    /// This is either:
+    /// * Taker's pubkey if this structure is used in [`SwapOps::send_maker_refunds_payment`].
+    /// * Maker's pubkey if this structure is used in [`SwapOps::send_taker_refunds_payment`].
+    pub other_pubkey: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub swap_contract_address: &'a Option<BytesJson>,
+    pub swap_unique_data: &'a [u8],
+}
+
+#[derive(Clone, Debug)]
+pub struct CheckIfMyPaymentSentArgs<'a> {
+    pub time_lock: u32,
+    pub other_pub: &'a [u8],
+    pub secret_hash: &'a [u8],
+    pub search_from_block: u64,
+    pub swap_contract_address: &'a Option<BytesJson>,
+    pub swap_unique_data: &'a [u8],
+    pub amount: &'a BigDecimal,
+    pub payment_instructions: &'a Option<PaymentInstructions>,
+}
+
+#[derive(Clone, Debug)]
+pub struct ValidateFeeArgs<'a> {
+    pub fee_tx: &'a TransactionEnum,
+    pub expected_sender: &'a [u8],
+    pub fee_addr: &'a [u8],
+    pub amount: &'a BigDecimal,
+    pub min_block_number: u64,
+    pub uuid: &'a [u8],
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum PaymentInstructions {
+    #[cfg(not(target_arch = "wasm32"))]
+    Lightning(Invoice),
+}
+
+#[derive(Display)]
+pub enum PaymentInstructionsErr {
+    LightningInvoiceErr(String),
+    InternalError(String),
+}
+
+impl From<NumConversError> for PaymentInstructionsErr {
+    fn from(e: NumConversError) -> Self { PaymentInstructionsErr::InternalError(e.to_string()) }
+}
+
+#[derive(Display)]
+pub enum ValidateInstructionsErr {
+    ValidateLightningInvoiceErr(String),
+    UnsupportedCoin(String),
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<ParseOrSemanticError> for ValidateInstructionsErr {
+    fn from(e: ParseOrSemanticError) -> Self { ValidateInstructionsErr::ValidateLightningInvoiceErr(e.to_string()) }
+}
+
+#[derive(Display)]
+pub enum RefundError {
+    DecodeErr(String),
+    DbError(String),
+    Timeout(String),
+    Internal(String),
+}
+
 /// 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, uuid: &[u8]) -> TransactionFut;
 
-    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;
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs<'_>) -> TransactionFut;
 
-    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;
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs<'_>) -> TransactionFut;
 
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs<'_>,
     ) -> TransactionFut;
 
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs<'_>,
     ) -> TransactionFut;
 
-    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;
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs<'_>)
+        -> TransactionFut;
 
-    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;
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs<'_>)
+        -> TransactionFut;
 
-    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>;
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs<'_>)
+        -> Box<dyn Future<Item = (), Error = String> + Send>;
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send>;
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()>;
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send>;
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()>;
 
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs<'_>,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send>;
 
     async fn search_for_swap_tx_spend_my(
@@ -566,7 +711,9 @@ pub trait SwapOps {
         input: SearchForSwapTxSpendInput<'_>,
     ) -> Result<Option<FoundSwapTxSpend>, String>;
 
-    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String>;
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String>;
+
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>>;
 
     /// Whether the refund transaction can be sent now
     /// For example: there are no additional conditions for ETH, but for some UTXO coins we should wait for
@@ -581,12 +728,117 @@ pub trait SwapOps {
         Box::new(futures01::future::ok(result))
     }
 
+    /// Whether the swap payment is refunded automatically or not when the locktime expires, or the other side fails the HTLC.
+    fn is_auto_refundable(&self) -> bool;
+
+    /// Waits for an htlc to be refunded automatically.
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()>;
+
     fn negotiate_swap_contract_addr(
         &self,
         other_side_address: Option<&[u8]>,
     ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>>;
 
+    /// Consider using [`SwapOps::derive_htlc_pubkey`] if you need the public key only.
+    /// Some coins may not have a private key.
     fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair;
+
+    /// Derives an HTLC key-pair and returns a public key corresponding to that key.
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8>;
+
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr>;
+
+    /// Instructions from the taker on how the maker should send his payment.
+    async fn maker_payment_instructions(
+        &self,
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+        maker_lock_duration: u64,
+        expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>>;
+
+    /// Instructions from the maker on how the taker should send his payment.
+    async fn taker_payment_instructions(
+        &self,
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+        expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>>;
+
+    fn validate_maker_payment_instructions(
+        &self,
+        instructions: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>>;
+
+    fn validate_taker_payment_instructions(
+        &self,
+        instructions: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>>;
+
+    fn is_supported_by_watchers(&self) -> bool { false }
+
+    fn maker_locktime_multiplier(&self) -> f64 { 2.0 }
+}
+
+/// Operations on maker coin from taker swap side
+#[async_trait]
+pub trait TakerSwapMakerCoin {
+    /// Performs an action on Maker coin payment just before the Taker Swap payment refund begins
+    async fn on_taker_payment_refund_start(&self, maker_payment: &[u8]) -> RefundResult<()>;
+    /// Performs an action on Maker coin payment after the Taker Swap payment is refunded successfully
+    async fn on_taker_payment_refund_success(&self, maker_payment: &[u8]) -> RefundResult<()>;
+}
+
+/// Operations on taker coin from maker swap side
+#[async_trait]
+pub trait MakerSwapTakerCoin {
+    /// Performs an action on Taker coin payment just before the Maker Swap payment refund begins
+    async fn on_maker_payment_refund_start(&self, taker_payment: &[u8]) -> RefundResult<()>;
+    /// Performs an action on Taker coin payment after the Maker Swap payment is refunded successfully
+    async fn on_maker_payment_refund_success(&self, taker_payment: &[u8]) -> RefundResult<()>;
+}
+
+#[async_trait]
+pub trait WatcherOps {
+    fn send_maker_payment_spend_preimage(&self, input: SendMakerPaymentSpendPreimageInput) -> TransactionFut;
+
+    fn send_taker_payment_refund_preimage(
+        &self,
+        watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut;
+
+    fn create_taker_payment_refund_preimage(
+        &self,
+        _taker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut;
+
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut;
+
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()>;
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()>;
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String>;
 }
 
 /// Operations that coins have independently from the MarketMaker.
@@ -594,7 +846,7 @@ pub trait SwapOps {
 pub trait MarketCoinOps {
     fn ticker(&self) -> &str;
 
-    fn my_address(&self) -> Result<String, String>;
+    fn my_address(&self) -> MmResult<String, MyAddressError>;
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>>;
 
@@ -622,6 +874,7 @@ 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
@@ -639,15 +892,17 @@ pub trait MarketCoinOps {
         check_every: u64,
     ) -> Box<dyn Future<Item = (), Error = String> + Send>;
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut;
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String>;
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>>;
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send>;
 
@@ -662,7 +917,7 @@ pub trait MarketCoinOps {
     fn is_privacy(&self) -> bool { false }
 }
 
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Deserialize, PartialEq)]
 #[serde(tag = "type")]
 pub enum WithdrawFee {
     UtxoFixed {
@@ -715,7 +970,7 @@ pub trait GetWithdrawSenderAddress {
 #[serde(untagged)]
 pub enum WithdrawFrom {
     // AccountId { account_id: u32 },
-    AddressId(HDAddressId),
+    AddressId(HDAccountAddressId),
     /// 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.
@@ -724,7 +979,7 @@ pub enum WithdrawFrom {
     },
 }
 
-#[derive(Deserialize)]
+#[derive(Clone, Deserialize)]
 pub struct WithdrawRequest {
     coin: String,
     from: Option<WithdrawFrom>,
@@ -735,6 +990,10 @@ pub struct WithdrawRequest {
     max: bool,
     fee: Option<WithdrawFee>,
     memo: Option<String>,
+    /// Currently, this flag is used by ETH/ERC20 coins activated with MetaMask **only**.
+    #[cfg(target_arch = "wasm32")]
+    #[serde(default)]
+    broadcast: bool,
 }
 
 #[derive(Debug, Deserialize)]
@@ -776,26 +1035,6 @@ pub struct VerificationRequest {
 }
 
 impl WithdrawRequest {
-    pub fn new(
-        coin: String,
-        from: Option<WithdrawFrom>,
-        to: String,
-        amount: BigDecimal,
-        max: bool,
-        fee: Option<WithdrawFee>,
-        memo: Option<String>,
-    ) -> WithdrawRequest {
-        WithdrawRequest {
-            coin,
-            from,
-            to,
-            amount,
-            max,
-            fee,
-            memo,
-        }
-    }
-
     pub fn new_max(coin: String, to: String) -> WithdrawRequest {
         WithdrawRequest {
             coin,
@@ -805,6 +1044,8 @@ impl WithdrawRequest {
             max: true,
             fee: None,
             memo: None,
+            #[cfg(target_arch = "wasm32")]
+            broadcast: false,
         }
     }
 }
@@ -843,6 +1084,7 @@ pub enum TxFeeDetails {
     Eth(EthTxFeeDetails),
     Qrc20(Qrc20FeeDetails),
     Slp(SlpFeeDetails),
+    Tendermint(TendermintFeeDetails),
     #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
     Solana(SolanaFeeDetails),
 }
@@ -861,6 +1103,7 @@ impl<'de> Deserialize<'de> for TxFeeDetails {
             Qrc20(Qrc20FeeDetails),
             #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
             Solana(SolanaFeeDetails),
+            Tendermint(TendermintFeeDetails),
         }
 
         match Deserialize::deserialize(deserializer)? {
@@ -869,6 +1112,7 @@ impl<'de> Deserialize<'de> for TxFeeDetails {
             TxFeeDetailsUnTagged::Qrc20(f) => Ok(TxFeeDetails::Qrc20(f)),
             #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
             TxFeeDetailsUnTagged::Solana(f) => Ok(TxFeeDetails::Solana(f)),
+            TxFeeDetailsUnTagged::Tendermint(f) => Ok(TxFeeDetails::Tendermint(f)),
         }
     }
 }
@@ -890,6 +1134,10 @@ impl From<SolanaFeeDetails> for TxFeeDetails {
     fn from(solana_details: SolanaFeeDetails) -> Self { TxFeeDetails::Solana(solana_details) }
 }
 
+impl From<TendermintFeeDetails> for TxFeeDetails {
+    fn from(tendermint_details: TendermintFeeDetails) -> Self { TxFeeDetails::Tendermint(tendermint_details) }
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct KmdRewardsDetails {
     amount: BigDecimal,
@@ -905,16 +1153,18 @@ impl KmdRewardsDetails {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Default, Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum TransactionType {
     StakingDelegation,
     RemoveDelegation,
+    #[default]
     StandardTransfer,
     TokenTransfer(BytesJson),
-}
-
-impl Default for TransactionType {
-    fn default() -> Self { TransactionType::StandardTransfer }
+    FeeForTokenTx,
+    CustomTendermintMsg {
+        msg_type: CustomTendermintMsgType,
+        token_id: Option<BytesJson>,
+    },
 }
 
 /// Transaction details
@@ -954,6 +1204,7 @@ pub struct TransactionDetails {
     /// Type of transactions, default is StandardTransfer
     #[serde(default)]
     transaction_type: TransactionType,
+    memo: Option<String>,
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -1038,6 +1289,8 @@ pub enum FeeApproxStage {
     WithoutApprox,
     /// Increase the trade fee slightly.
     StartSwap,
+    /// Increase the trade fee slightly
+    WatcherPreimage,
     /// Increase the trade fee significantly.
     OrderIssue,
     /// Increase the trade fee largely.
@@ -1160,7 +1413,7 @@ impl NumConversError {
     pub fn description(&self) -> &str { &self.0 }
 }
 
-#[derive(Debug, Display, PartialEq)]
+#[derive(Clone, Debug, Display, PartialEq, Serialize)]
 pub enum BalanceError {
     #[display(fmt = "Transport: {}", _0)]
     Transport(String),
@@ -1348,8 +1601,8 @@ impl From<UtxoSignWithKeyPairError> for DelegationError {
     }
 }
 
-impl From<PrivKeyNotAllowed> for DelegationError {
-    fn from(e: PrivKeyNotAllowed) -> Self { DelegationError::DelegationOpsNotSupported { reason: e.to_string() } }
+impl From<PrivKeyPolicyNotAllowed> for DelegationError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { DelegationError::DelegationOpsNotSupported { reason: e.to_string() } }
 }
 
 impl From<UnexpectedDerivationMethod> for DelegationError {
@@ -1414,23 +1667,9 @@ impl DelegationError {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Display, Serialize, SerializeErrorType, PartialEq)]
+#[derive(Clone, Debug, Display, EnumFromStringify, EnumFromTrait, 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
@@ -1447,6 +1686,17 @@ pub enum WithdrawError {
         available: BigDecimal,
         required: BigDecimal,
     },
+    #[display(
+        fmt = "Not enough {} to afford fee. Available {}, required at least {}",
+        coin,
+        available,
+        required
+    )]
+    NotSufficientPlatformBalanceForFee {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+    },
     #[display(fmt = "Balance is zero")]
     ZeroBalanceToWithdrawMax,
     #[display(fmt = "The amount {} is too small, required at least {}", amount, threshold)]
@@ -1459,18 +1709,25 @@ pub enum WithdrawError {
     InvalidMemo(String),
     #[display(fmt = "No such coin {}", coin)]
     NoSuchCoin { coin: String },
+    #[from_trait(WithTimeout::timeout)]
     #[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 = "RPC 'task' is awaiting '{}' user action", expected)]
+    UnexpectedUserAction { expected: String },
+    #[from_trait(WithHwRpcError::hw_rpc_error)]
+    HwError(HwRpcError),
+    #[cfg(target_arch = "wasm32")]
+    BroadcastExpected(String),
     #[display(fmt = "Transport error: {}", _0)]
     Transport(String),
+    #[from_trait(WithInternal::internal)]
+    #[from_stringify("NumConversError", "UnexpectedDerivationMethod", "PrivKeyPolicyNotAllowed")]
     #[display(fmt = "Internal error: {}", _0)]
     InternalError(String),
 }
@@ -1481,8 +1738,8 @@ impl HttpStatusCode for WithdrawError {
             WithdrawError::NoSuchCoin { .. } => StatusCode::NOT_FOUND,
             WithdrawError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
             WithdrawError::CoinDoesntSupportInitWithdraw { .. }
-            | WithdrawError::UnexpectedUserAction { .. }
             | WithdrawError::NotSufficientBalance { .. }
+            | WithdrawError::NotSufficientPlatformBalanceForFee { .. }
             | WithdrawError::ZeroBalanceToWithdrawMax
             | WithdrawError::AmountTooLow { .. }
             | WithdrawError::InvalidAddress(_)
@@ -1490,21 +1747,16 @@ impl HttpStatusCode for WithdrawError {
             | WithdrawError::InvalidMemo(_)
             | 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,
+            | WithdrawError::UnknownAccount { .. }
+            | WithdrawError::UnexpectedUserAction { .. } => StatusCode::BAD_REQUEST,
+            WithdrawError::HwError(_) => StatusCode::GONE,
+            #[cfg(target_arch = "wasm32")]
+            WithdrawError::BroadcastExpected(_) => StatusCode::BAD_REQUEST,
+            WithdrawError::Transport(_) | WithdrawError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }
 
-impl From<NumConversError> for WithdrawError {
-    fn from(e: NumConversError) -> Self { WithdrawError::InternalError(e.to_string()) }
-}
-
 impl From<BalanceError> for WithdrawError {
     fn from(e: BalanceError) -> Self {
         match e {
@@ -1531,12 +1783,8 @@ impl From<UtxoSignWithKeyPairError> for WithdrawError {
     }
 }
 
-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 From<TimeoutError> for WithdrawError {
+    fn from(e: TimeoutError) -> Self { WithdrawError::Timeout(e.duration) }
 }
 
 impl WithdrawError {
@@ -1583,11 +1831,12 @@ impl WithdrawError {
     }
 }
 
-#[derive(Serialize, Display, Debug, SerializeErrorType)]
+#[derive(Serialize, Display, Debug, EnumFromStringify, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum SignatureError {
     #[display(fmt = "Invalid request: {}", _0)]
     InvalidRequest(String),
+    #[from_stringify("CoinFindError", "ethkey::Error", "keys::Error", "PrivKeyPolicyNotAllowed")]
     #[display(fmt = "Internal error: {}", _0)]
     InternalError(String),
     #[display(fmt = "Coin is not found: {}", _0)]
@@ -1607,22 +1856,6 @@ impl HttpStatusCode for SignatureError {
     }
 }
 
-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 {
@@ -1688,7 +1921,9 @@ impl From<CoinFindError> for VerificationError {
 
 /// 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 {
+pub trait MmCoin:
+    SwapOps + TakerSwapMakerCoin + MakerSwapTakerCoin + WatcherOps + MarketCoinOps + 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);
     // coin statistics that we might want to share with UI;
@@ -1703,10 +1938,19 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
         coin_conf["wallet_only"].as_bool().unwrap_or(false)
     }
 
+    /// Returns a spawner pinned to the coin.
+    ///
+    /// # Note
+    ///
+    /// `CoinFutSpawner` doesn't prevent the spawned futures from being aborted.
+    fn spawner(&self) -> CoinFutSpawner;
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut;
 
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut;
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut;
+
     /// Maximum number of digits after decimal point used to denominate integer coin units (satoshis, wei, etc.)
     fn decimals(&self) -> u8;
 
@@ -1719,6 +1963,7 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     fn process_history_loop(&self, ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send>;
 
     /// Path to tx history file
+    #[cfg(not(target_arch = "wasm32"))]
     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:
@@ -1729,6 +1974,18 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
             .join(format!("{}_{}.json", self.ticker(), my_address))
     }
 
+    /// Path to tx history migration file
+    #[cfg(not(target_arch = "wasm32"))]
+    fn tx_migration_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!("{}_{}_migration", 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>> {
@@ -1739,6 +1996,14 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
         save_history_to_file_impl(self, ctx, history)
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
+    fn get_tx_history_migration(&self, ctx: &MmArc) -> TxHistoryFut<u64> { get_tx_history_migration_impl(self, ctx) }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    fn update_migration_file(&self, ctx: &MmArc, migration_number: u64) -> TxHistoryFut<()> {
+        update_migration_file_impl(self, ctx, migration_number)
+    }
+
     /// Transaction history background sync status
     fn history_sync_status(&self) -> HistorySyncState;
 
@@ -1753,7 +2018,7 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     ) -> 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>;
+    fn get_receiver_trade_fee(&self, send_amount: BigDecimal, 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.
     async fn get_fee_to_send_taker_fee(
@@ -1777,6 +2042,9 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
     /// Get swap contract address if the coin uses it in Atomic Swaps.
     fn swap_contract_address(&self) -> Option<BytesJson>;
 
+    /// Get fallback swap contract address if the coin uses it in Atomic Swaps.
+    fn fallback_swap_contract(&self) -> Option<BytesJson>;
+
     /// The minimum number of confirmations at which a transaction is considered mature.
     fn mature_confirmations(&self) -> Option<u32>;
 
@@ -1785,9 +2053,52 @@ pub trait MmCoin: SwapOps + MarketCoinOps + fmt::Debug + Send + Sync + 'static {
 
     /// Check if serialized coin protocol info is supported by current version.
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool;
+
+    /// Abort all coin related futures on coin deactivation.
+    fn on_disabled(&self) -> Result<(), AbortedError>;
+
+    /// For Handling the removal/deactivation of token on platform coin deactivation.
+    fn on_token_deactivated(&self, _ticker: &str);
 }
 
-#[derive(Clone, Debug)]
+/// The coin futures spawner. It's used to spawn futures that can be aborted immediately or after a timeout
+/// on the the coin deactivation.
+///
+/// # Note
+///
+/// `CoinFutSpawner` doesn't prevent the spawned futures from being aborted.
+#[derive(Clone)]
+pub struct CoinFutSpawner {
+    inner: WeakSpawner,
+}
+
+impl CoinFutSpawner {
+    pub fn new(system: &AbortableQueue) -> CoinFutSpawner {
+        CoinFutSpawner {
+            inner: system.weak_spawner(),
+        }
+    }
+}
+
+impl SpawnFuture for CoinFutSpawner {
+    fn spawn<F>(&self, f: F)
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        self.inner.spawn(f)
+    }
+}
+
+impl SpawnAbortable for CoinFutSpawner {
+    fn spawn_with_settings<F>(&self, fut: F, settings: AbortSettings)
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        self.inner.spawn_with_settings(fut, settings)
+    }
+}
+
+#[derive(Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum MmCoinEnum {
     UtxoCoin(UtxoStandardCoin),
@@ -1798,6 +2109,8 @@ pub enum MmCoinEnum {
     ZCoin(ZCoin),
     Bch(BchCoin),
     SlpToken(SlpToken),
+    Tendermint(TendermintCoin),
+    TendermintToken(TendermintToken),
     #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
     SolanaCoin(SolanaCoin),
     #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
@@ -1845,6 +2158,14 @@ impl From<SlpToken> for MmCoinEnum {
     fn from(c: SlpToken) -> MmCoinEnum { MmCoinEnum::SlpToken(c) }
 }
 
+impl From<TendermintCoin> for MmCoinEnum {
+    fn from(c: TendermintCoin) -> Self { MmCoinEnum::Tendermint(c) }
+}
+
+impl From<TendermintToken> for MmCoinEnum {
+    fn from(c: TendermintToken) -> Self { MmCoinEnum::TendermintToken(c) }
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 impl From<LightningCoin> for MmCoinEnum {
     fn from(c: LightningCoin) -> MmCoinEnum { MmCoinEnum::LightningCoin(c) }
@@ -1866,6 +2187,8 @@ impl Deref for MmCoinEnum {
             MmCoinEnum::EthCoin(ref c) => c,
             MmCoinEnum::Bch(ref c) => c,
             MmCoinEnum::SlpToken(ref c) => c,
+            MmCoinEnum::Tendermint(ref c) => c,
+            MmCoinEnum::TendermintToken(ref c) => c,
             #[cfg(not(target_arch = "wasm32"))]
             MmCoinEnum::LightningCoin(ref c) => c,
             #[cfg(not(target_arch = "wasm32"))]
@@ -1904,20 +2227,18 @@ pub struct CoinsContext {
     /// Similar to `LP_coins`.
     coins: AsyncMutex<HashMap<String, MmCoinEnum>>,
     balance_update_handlers: AsyncMutex<Vec<Box<dyn BalanceTradeFeeUpdatedHandler + Send + Sync>>>,
-    withdraw_task_manager: WithdrawTaskManagerShared,
+    account_balance_task_manager: AccountBalanceTaskManagerShared,
     create_account_manager: CreateAccountTaskManagerShared,
+    get_new_address_manager: GetNewAddressTaskManagerShared,
+    platform_coin_tokens: PaMutex<HashMap<String, HashSet<String>>>,
     scan_addresses_manager: ScanAddressesTaskManagerShared,
+    withdraw_task_manager: WithdrawTaskManagerShared,
     #[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,
@@ -1928,52 +2249,126 @@ impl CoinsContext {
     pub fn from_ctx(ctx: &MmArc) -> Result<Arc<CoinsContext>, String> {
         Ok(try_s!(from_ctx(&ctx.coins_ctx, move || {
             Ok(CoinsContext {
+                platform_coin_tokens: PaMutex::new(HashMap::new()),
                 coins: AsyncMutex::new(HashMap::new()),
                 balance_update_handlers: AsyncMutex::new(vec![]),
-                withdraw_task_manager: WithdrawTaskManager::new_shared(),
+                account_balance_task_manager: AccountBalanceTaskManager::new_shared(),
                 create_account_manager: CreateAccountTaskManager::new_shared(),
+                get_new_address_manager: GetNewAddressTaskManager::new_shared(),
                 scan_addresses_manager: ScanAddressesTaskManager::new_shared(),
+                withdraw_task_manager: WithdrawTaskManager::new_shared(),
                 #[cfg(target_arch = "wasm32")]
-                tx_history_db: ConstructibleDb::new_shared(ctx),
+                tx_history_db: ConstructibleDb::new(ctx).into_shared(),
                 #[cfg(target_arch = "wasm32")]
-                hd_wallet_db: ConstructibleDb::new_shared(ctx),
+                hd_wallet_db: ConstructibleDb::new_shared_db(ctx).into_shared(),
             })
         })))
     }
 
-    pub async fn add_coin(&self, coin: MmCoinEnum) -> Result<(), MmError<CoinIsAlreadyActivatedErr>> {
+    pub async fn add_token(&self, coin: MmCoinEnum) -> Result<(), MmError<RegisterCoinError>> {
         let mut coins = self.coins.lock().await;
         if coins.contains_key(coin.ticker()) {
-            return MmError::err(CoinIsAlreadyActivatedErr {
-                ticker: coin.ticker().into(),
+            return MmError::err(RegisterCoinError::CoinIsInitializedAlready {
+                coin: coin.ticker().into(),
             });
         }
+        let ticker = coin.ticker();
+
+        let mut platform_coin_tokens = self.platform_coin_tokens.lock();
+        // Here, we try to add a token to platform_coin_tokens if the token belongs to a platform coin.
+        if let Some(platform) = platform_coin_tokens.get_mut(coin.platform_ticker()) {
+            platform.insert(ticker.to_owned());
+        }
 
-        coins.insert(coin.ticker().into(), coin);
+        coins.insert(ticker.into(), coin);
         Ok(())
     }
 
+    /// Adds a Layer 2 coin that depends on a standalone platform.
+    /// The process of adding l2 coins is identical to that of adding tokens.
+    pub async fn add_l2(&self, coin: MmCoinEnum) -> Result<(), MmError<RegisterCoinError>> {
+        self.add_token(coin).await
+    }
+
     pub async fn add_platform_with_tokens(
         &self,
         platform: MmCoinEnum,
         tokens: Vec<MmCoinEnum>,
     ) -> Result<(), MmError<PlatformIsAlreadyActivatedErr>> {
         let mut coins = self.coins.lock().await;
+        let mut platform_coin_tokens = self.platform_coin_tokens.lock();
+
         if coins.contains_key(platform.ticker()) {
             return MmError::err(PlatformIsAlreadyActivatedErr {
                 ticker: platform.ticker().into(),
             });
         }
 
-        coins.insert(platform.ticker().into(), platform);
+        let platform_ticker = platform.ticker().to_string();
+        coins.insert(platform_ticker.clone(), platform);
 
         // Tokens can't be activated without platform coin so we can safely insert them without checking prior existence
+        let mut token_tickers = Vec::with_capacity(tokens.len());
+        // TODO
+        // Handling for these case:
+        // USDT was activated via enable RPC
+        // We try to activate ETH coin and USDT token via enable_eth_with_tokens
         for token in tokens {
+            token_tickers.push(token.ticker().to_string());
             coins.insert(token.ticker().into(), token);
         }
+
+        platform_coin_tokens
+            .entry(platform_ticker)
+            .or_default()
+            .extend(token_tickers);
         Ok(())
     }
 
+    /// If `ticker` is a platform coin, returns tokens dependent on it.
+    pub async fn get_dependent_tokens(&self, ticker: &str) -> HashSet<String> {
+        let coins = self.platform_coin_tokens.lock();
+        coins.get(ticker).cloned().unwrap_or_default()
+    }
+
+    pub async fn remove_coin(&self, coin: MmCoinEnum) {
+        let ticker = coin.ticker();
+        let platform_ticker = coin.platform_ticker();
+        let mut coins_storage = self.coins.lock().await;
+        let mut platform_tokens_storage = self.platform_coin_tokens.lock();
+
+        // Check if ticker is a platform coin and remove from it platform's token list
+        if ticker == platform_ticker {
+            if let Some(tokens_to_remove) = platform_tokens_storage.remove(ticker) {
+                tokens_to_remove.iter().for_each(|token| {
+                    if let Some(token) = coins_storage.remove(token) {
+                        // Abort all token related futures on token deactivation
+                        token
+                            .on_disabled()
+                            .error_log_with_msg(&format!("Error aborting coin({ticker}) futures"));
+                    }
+                });
+            };
+        } else {
+            if let Some(tokens) = platform_tokens_storage.get_mut(platform_ticker) {
+                tokens.remove(ticker);
+            }
+            if let Some(platform_coin) = coins_storage.get(platform_ticker) {
+                platform_coin.on_token_deactivated(ticker);
+            }
+        };
+
+        //  Remove coin from coin list
+        coins_storage
+            .remove(ticker)
+            .ok_or(format!("{} is disabled already", ticker))
+            .error_log();
+
+        // Abort all coin related futures on coin deactivation
+        coin.on_disabled()
+            .error_log_with_msg(&format!("Error aborting coin({ticker}) futures"));
+    }
+
     #[cfg(target_arch = "wasm32")]
     async fn tx_history_db(&self) -> TxHistoryResult<TxHistoryDbLocked<'_>> {
         Ok(self.tx_history_db.get_or_initialize().await?)
@@ -1983,18 +2378,12 @@ impl CoinsContext {
 /// This enum is used in coin activation requests.
 #[derive(Copy, Clone, Debug, Deserialize, Serialize)]
 pub enum PrivKeyActivationPolicy {
-    IguanaPrivKey,
+    ContextPrivKey,
     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 }
+impl Default for PrivKeyActivationPolicy {
+    fn default() -> Self { PrivKeyActivationPolicy::ContextPrivKey }
 }
 
 #[derive(Debug)]
@@ -2011,59 +2400,69 @@ impl<T> PrivKeyPolicy<T> {
         }
     }
 
-    pub fn key_pair_or_err(&self) -> Result<&T, MmError<PrivKeyNotAllowed>> {
+    pub fn key_pair_or_err(&self) -> Result<&T, MmError<PrivKeyPolicyNotAllowed>> {
         self.key_pair()
-            .or_mm_err(|| PrivKeyNotAllowed::HardwareWalletNotSupported)
+            .or_mm_err(|| PrivKeyPolicyNotAllowed::HardwareWalletNotSupported)
     }
 }
 
 #[derive(Clone)]
-pub enum PrivKeyBuildPolicy<'a> {
-    IguanaPrivKey(&'a [u8]),
+pub enum PrivKeyBuildPolicy {
+    IguanaPrivKey(IguanaPrivKey),
+    GlobalHDAccount(GlobalHDAccountArc),
     Trezor,
 }
 
-impl<'a> PrivKeyBuildPolicy<'a> {
-    pub fn iguana_priv_key(crypto_ctx: &'a CryptoCtx) -> Self {
-        PrivKeyBuildPolicy::IguanaPrivKey(crypto_ctx.iguana_ctx().secp256k1_privkey_bytes())
+impl PrivKeyBuildPolicy {
+    /// Detects the `PrivKeyBuildPolicy` with which the given `MmArc` is initialized.
+    pub fn detect_priv_key_policy(ctx: &MmArc) -> MmResult<PrivKeyBuildPolicy, CryptoCtxError> {
+        let crypto_ctx = CryptoCtx::from_ctx(ctx)?;
+
+        match crypto_ctx.key_pair_policy() {
+            // Use an internal private key as the coin secret.
+            KeyPairPolicy::Iguana => Ok(PrivKeyBuildPolicy::IguanaPrivKey(
+                crypto_ctx.mm2_internal_privkey_secret(),
+            )),
+            KeyPairPolicy::GlobalHDAccount(global_hd) => Ok(PrivKeyBuildPolicy::GlobalHDAccount(global_hd.clone())),
+        }
     }
 }
 
 #[derive(Debug)]
 pub enum DerivationMethod<Address, HDWallet> {
-    Iguana(Address),
+    SingleAddress(Address),
     HDWallet(HDWallet),
 }
 
 impl<Address, HDWallet> DerivationMethod<Address, HDWallet> {
-    pub fn iguana(&self) -> Option<&Address> {
+    pub fn single_addr(&self) -> Option<&Address> {
         match self {
-            DerivationMethod::Iguana(my_address) => Some(my_address),
+            DerivationMethod::SingleAddress(my_address) => Some(my_address),
             DerivationMethod::HDWallet(_) => None,
         }
     }
 
-    pub fn iguana_or_err(&self) -> MmResult<&Address, UnexpectedDerivationMethod> {
-        self.iguana()
-            .or_mm_err(|| UnexpectedDerivationMethod::IguanaPrivKeyUnavailable)
+    pub fn single_addr_or_err(&self) -> MmResult<&Address, UnexpectedDerivationMethod> {
+        self.single_addr()
+            .or_mm_err(|| UnexpectedDerivationMethod::ExpectedSingleAddress)
     }
 
     pub fn hd_wallet(&self) -> Option<&HDWallet> {
         match self {
-            DerivationMethod::Iguana(_) => None,
+            DerivationMethod::SingleAddress(_) => 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)
+            .or_mm_err(|| UnexpectedDerivationMethod::ExpectedHDWallet)
     }
 
     /// # Panic
     ///
     /// Panic if the address mode is [`DerivationMethod::HDWallet`].
-    pub fn unwrap_iguana(&self) -> &Address { self.iguana_or_err().unwrap() }
+    pub fn unwrap_single_addr(&self) -> &Address { self.single_addr_or_err().unwrap() }
 }
 
 #[async_trait]
@@ -2102,11 +2501,13 @@ pub enum CoinProtocol {
     BCH {
         slp_prefix: String,
     },
+    TENDERMINT(TendermintProtocolInfo),
+    TENDERMINTTOKEN(TendermintTokenProtocolInfo),
     #[cfg(not(target_arch = "wasm32"))]
     LIGHTNING {
         platform: String,
         network: BlockchainNetwork,
-        confirmations: PlatformCoinConfirmations,
+        confirmation_targets: PlatformCoinConfirmationTargets,
     },
     #[cfg(not(target_arch = "wasm32"))]
     SOLANA,
@@ -2131,6 +2532,8 @@ pub trait RpcTransportEventHandler {
     fn on_incoming_response(&self, data: &[u8]);
 
     fn on_connected(&self, address: String) -> Result<(), String>;
+
+    fn on_disconnected(&self, address: String) -> Result<(), String>;
 }
 
 impl fmt::Debug for dyn RpcTransportEventHandler + Send + Sync {
@@ -2145,6 +2548,8 @@ impl RpcTransportEventHandler for RpcTransportEventHandlerShared {
     fn on_incoming_response(&self, data: &[u8]) { self.as_ref().on_incoming_response(data) }
 
     fn on_connected(&self, address: String) -> Result<(), String> { self.as_ref().on_connected(address) }
+
+    fn on_disconnected(&self, address: String) -> Result<(), String> { self.as_ref().on_disconnected(address) }
 }
 
 impl<T: RpcTransportEventHandler> RpcTransportEventHandler for Vec<T> {
@@ -2171,6 +2576,13 @@ impl<T: RpcTransportEventHandler> RpcTransportEventHandler for Vec<T> {
         }
         Ok(())
     }
+
+    fn on_disconnected(&self, address: String) -> Result<(), String> {
+        for handler in self {
+            try_s!(handler.on_disconnected(address.clone()))
+        }
+        Ok(())
+    }
 }
 
 pub enum RpcClientType {
@@ -2216,16 +2628,16 @@ impl RpcTransportEventHandler for CoinTransportMetrics {
 
     fn on_outgoing_request(&self, data: &[u8]) {
         mm_counter!(self.metrics, "rpc_client.traffic.out", data.len() as u64,
-            "coin" => self.ticker.clone(), "client" => self.client.clone());
+            "coin" => self.ticker.to_owned(), "client" => self.client.to_owned());
         mm_counter!(self.metrics, "rpc_client.request.count", 1,
-            "coin" => self.ticker.clone(), "client" => self.client.clone());
+            "coin" => self.ticker.to_owned(), "client" => self.client.to_owned());
     }
 
     fn on_incoming_response(&self, data: &[u8]) {
         mm_counter!(self.metrics, "rpc_client.traffic.in", data.len() as u64,
-            "coin" => self.ticker.clone(), "client" => self.client.clone());
+            "coin" => self.ticker.to_owned(), "client" => self.client.to_owned());
         mm_counter!(self.metrics, "rpc_client.response.count", 1,
-            "coin" => self.ticker.clone(), "client" => self.client.clone());
+            "coin" => self.ticker.to_owned(), "client" => self.client.to_owned());
     }
 
     fn on_connected(&self, _address: String) -> Result<(), String> {
@@ -2233,6 +2645,12 @@ impl RpcTransportEventHandler for CoinTransportMetrics {
         // Now just return the Ok
         Ok(())
     }
+
+    fn on_disconnected(&self, _address: String) -> Result<(), String> {
+        // Handle disconnected endpoint if necessary.
+        // Now just return the Ok
+        Ok(())
+    }
 }
 
 #[async_trait]
@@ -2299,10 +2717,9 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
             "assuming that coin is not supported"
         ));
     }
-    let secret = try_s!(CryptoCtx::from_ctx(ctx))
-        .iguana_ctx()
-        .secp256k1_privkey_bytes()
-        .to_vec();
+
+    // The legacy electrum/enable RPCs don't support Hardware Wallet policy.
+    let priv_key_policy = try_s!(PrivKeyBuildPolicy::detect_priv_key_policy(ctx));
 
     if coins_en["protocol"].is_null() {
         return ERR!(
@@ -2314,14 +2731,14 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
     let coin: MmCoinEnum = match &protocol {
         CoinProtocol::UTXO => {
             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()
+            try_s!(utxo_standard_coin_with_policy(ctx, ticker, &coins_en, &params, priv_key_policy).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()
+            try_s!(qtum_coin_with_policy(ctx, ticker, &coins_en, &params, priv_key_policy).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, protocol, priv_key_policy).await).into()
         },
         CoinProtocol::QRC20 {
             platform,
@@ -2331,8 +2748,16 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
             let contract_address = try_s!(qtum::contract_addr_from_str(contract_address));
 
             try_s!(
-                qrc20_coin_from_conf_and_params(ctx, ticker, platform, &coins_en, &params, &secret, contract_address)
-                    .await
+                qrc20_coin_with_policy(
+                    ctx,
+                    ticker,
+                    platform,
+                    &coins_en,
+                    &params,
+                    priv_key_policy,
+                    contract_address
+                )
+                .await
             )
             .into()
         },
@@ -2340,7 +2765,7 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
             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);
+            let bch = try_s!(bch_coin_with_policy(ctx, ticker, &coins_en, params, prefix, priv_key_policy).await);
             bch.into()
         },
         CoinProtocol::SLPTOKEN {
@@ -2357,9 +2782,17 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
             };
 
             let confs = required_confirmations.unwrap_or(platform_coin.required_confirmations());
-            let token = SlpToken::new(*decimals, ticker.into(), (*token_id).into(), platform_coin, confs);
+            let token = try_s!(SlpToken::new(
+                *decimals,
+                ticker.into(),
+                (*token_id).into(),
+                platform_coin,
+                confs
+            ));
             token.into()
         },
+        CoinProtocol::TENDERMINT { .. } => return ERR!("TENDERMINT protocol is not supported by lp_coininit"),
+        CoinProtocol::TENDERMINTTOKEN(_) => return ERR!("TENDERMINTTOKEN protocol is not supported by lp_coininit"),
         #[cfg(not(target_arch = "wasm32"))]
         CoinProtocol::ZHTLC { .. } => return ERR!("ZHTLC protocol is not supported by lp_coininit"),
         #[cfg(not(target_arch = "wasm32"))]
@@ -2376,9 +2809,13 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
 
     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);
+
+    let tx_history = req["tx_history"].as_bool().unwrap_or(false);
+    if tx_history {
+        try_s!(lp_spawn_tx_history(ctx.clone(), coin.clone()).map_to_mm(RegisterCoinError::Internal));
+    }
     Ok(coin)
 }
 
@@ -2393,7 +2830,6 @@ pub enum RegisterCoinError {
 
 pub struct RegisterCoinParams {
     pub ticker: String,
-    pub tx_history: bool,
 }
 
 pub async fn lp_register_coin(
@@ -2401,7 +2837,7 @@ pub async fn lp_register_coin(
     coin: MmCoinEnum,
     params: RegisterCoinParams,
 ) -> Result<(), MmError<RegisterCoinError>> {
-    let RegisterCoinParams { ticker, tx_history } = params;
+    let RegisterCoinParams { ticker } = 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
@@ -2415,26 +2851,22 @@ pub async fn lp_register_coin(
         },
         RawEntryMut::Vacant(ve) => ve.insert(ticker.clone(), coin.clone()),
     };
-    if tx_history {
-        lp_spawn_tx_history(ctx.clone(), coin).map_to_mm(RegisterCoinError::Internal)?;
-    }
-    Ok(())
-}
 
-#[cfg(not(target_arch = "wasm32"))]
-fn lp_spawn_tx_history(ctx: MmArc, coin: MmCoinEnum) -> Result<(), String> {
-    try_s!(std::thread::Builder::new()
-        .name(format!("tx_history_{}", coin.ticker()))
-        .spawn(move || coin.process_history_loop(ctx).wait()));
+    if coin.ticker() == coin.platform_ticker() {
+        let mut platform_coin_tokens = cctx.platform_coin_tokens.lock();
+        platform_coin_tokens
+            .entry(coin.ticker().to_string())
+            .or_insert_with(HashSet::new);
+    }
     Ok(())
 }
 
-#[cfg(target_arch = "wasm32")]
 fn lp_spawn_tx_history(ctx: MmArc, coin: MmCoinEnum) -> Result<(), String> {
+    let spawner = coin.spawner();
     let fut = async move {
         let _res = coin.process_history_loop(ctx).compat().await;
     };
-    common::executor::spawn_local(fut);
+    spawner.spawn(fut);
     Ok(())
 }
 
@@ -2620,7 +3052,7 @@ pub async fn send_raw_transaction(ctx: MmArc, req: Json) -> Result<Response<Vec<
     Ok(try_s!(Response::builder().body(body)))
 }
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, PartialEq, Serialize)]
 #[serde(tag = "state", content = "additional_info")]
 pub enum HistorySyncState {
     NotEnabled,
@@ -2747,15 +3179,6 @@ pub async fn get_enabled_coins(ctx: MmArc) -> Result<Response<Vec<u8>>, String>
     Ok(try_s!(Response::builder().body(res)))
 }
 
-pub async fn disable_coin(ctx: &MmArc, ticker: &str) -> Result<(), String> {
-    let coins_ctx = try_s!(CoinsContext::from_ctx(ctx));
-    let mut coins = coins_ctx.coins.lock().await;
-    match coins.remove(ticker) {
-        Some(_) => Ok(()),
-        None => ERR!("{} is disabled already", ticker),
-    }
-}
-
 #[derive(Deserialize)]
 pub struct ConfirmationsReq {
     coin: String,
@@ -2921,6 +3344,25 @@ pub fn address_by_coin_conf_and_pubkey_str(
                 _ => ERR!("Platform protocol {:?} is not BCH", platform_protocol),
             }
         },
+        CoinProtocol::TENDERMINT(protocol) => tendermint::account_id_from_pubkey_hex(&protocol.account_prefix, pubkey)
+            .map(|id| id.to_string())
+            .map_err(|e| e.to_string()),
+        CoinProtocol::TENDERMINTTOKEN(proto) => {
+            let platform_conf = coin_conf(ctx, &proto.platform);
+            if platform_conf.is_null() {
+                return ERR!("platform {} conf is null", proto.platform);
+            }
+            // TODO is there any way to make it better without duplicating the prefix in the IBC conf?
+            let platform_protocol: CoinProtocol = try_s!(json::from_value(platform_conf["protocol"].clone()));
+            match platform_protocol {
+                CoinProtocol::TENDERMINT(platform) => {
+                    tendermint::account_id_from_pubkey_hex(&platform.account_prefix, pubkey)
+                        .map(|id| id.to_string())
+                        .map_err(|e| e.to_string())
+                },
+                _ => ERR!("Platform protocol {:?} is not TENDERMINT", platform_protocol),
+            }
+        },
         #[cfg(not(target_arch = "wasm32"))]
         CoinProtocol::LIGHTNING { .. } => {
             ERR!("address_by_coin_conf_and_pubkey_str is not implemented for lightning protocol yet!")
@@ -2941,7 +3383,7 @@ where
 {
     let ctx = ctx.clone();
     let ticker = coin.ticker().to_owned();
-    let my_address = try_f!(coin.my_address().map_to_mm(TxHistoryError::InternalError));
+    let my_address = try_f!(coin.my_address());
 
     let fut = async move {
         let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
@@ -3015,9 +3457,9 @@ where
 {
     let ctx = ctx.clone();
     let ticker = coin.ticker().to_owned();
-    let my_address = try_f!(coin.my_address().map_to_mm(TxHistoryError::InternalError));
+    let my_address = try_f!(coin.my_address());
 
-    history.sort_unstable_by(compare_transactions);
+    history.sort_unstable_by(compare_transaction_details);
 
     let fut = async move {
         let coins_ctx = CoinsContext::from_ctx(&ctx).unwrap();
@@ -3028,6 +3470,61 @@ where
     Box::new(fut.boxed().compat())
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+fn get_tx_history_migration_impl<T>(coin: &T, ctx: &MmArc) -> TxHistoryFut<u64>
+where
+    T: MmCoin + MarketCoinOps + ?Sized,
+{
+    let migration_path = coin.tx_migration_path(ctx);
+
+    let fut = async move {
+        let current_migration = match fs::read(&migration_path).await {
+            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,
+        };
+
+        Ok(current_migration)
+    };
+
+    Box::new(fut.boxed().compat())
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn update_migration_file_impl<T>(coin: &T, ctx: &MmArc, migration_number: u64) -> TxHistoryFut<()>
+where
+    T: MmCoin + MarketCoinOps + ?Sized,
+{
+    let migration_path = coin.tx_migration_path(ctx);
+    let tmp_file = format!("{}.tmp", migration_path.display());
+
+    let fut = async move {
+        let fs_fut = async {
+            let mut file = fs::File::create(&tmp_file).await?;
+            file.write_all(&migration_number.to_le_bytes()).await?;
+            file.flush().await?;
+            fs::rename(&tmp_file, migration_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())
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 fn save_history_to_file_impl<T>(coin: &T, ctx: &MmArc, mut history: Vec<TransactionDetails>) -> TxHistoryFut<()>
 where
@@ -3036,7 +3533,7 @@ where
     let history_path = coin.tx_history_path(ctx);
     let tmp_file = format!("{}.tmp", history_path.display());
 
-    history.sort_unstable_by(compare_transactions);
+    history.sort_unstable_by(compare_transaction_details);
 
     let fut = async move {
         let content = json::to_vec(&history).map_to_mm(|e| TxHistoryError::ErrorSerializing(e.to_string()))?;
@@ -3059,10 +3556,28 @@ where
     Box::new(fut.boxed().compat())
 }
 
-fn compare_transactions(a: &TransactionDetails, b: &TransactionDetails) -> Ordering {
+pub(crate) fn compare_transaction_details(a: &TransactionDetails, b: &TransactionDetails) -> Ordering {
+    let a = TxIdHeight::new(a.block_height, a.internal_id.deref());
+    let b = TxIdHeight::new(b.block_height, b.internal_id.deref());
+    compare_transactions(a, b)
+}
+
+pub(crate) struct TxIdHeight<Id> {
+    block_height: u64,
+    tx_id: Id,
+}
+
+impl<Id> TxIdHeight<Id> {
+    pub(crate) fn new(block_height: u64, tx_id: Id) -> TxIdHeight<Id> { TxIdHeight { block_height, tx_id } }
+}
+
+pub(crate) fn compare_transactions<Id>(a: TxIdHeight<Id>, b: TxIdHeight<Id>) -> Ordering
+where
+    Id: Ord,
+{
     // 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)
+        a.tx_id.cmp(&b.tx_id)
     } else if a.block_height == 0 {
         Ordering::Less
     } else if b.block_height == 0 {
@@ -3071,3 +3586,13 @@ fn compare_transactions(a: &TransactionDetails, b: &TransactionDetails) -> Order
         b.block_height.cmp(&a.block_height)
     }
 }
+
+/// Use trait in the case, when we have to send requests to rpc client.
+#[async_trait]
+pub trait RpcCommonOps {
+    type RpcClient;
+    type Error;
+
+    /// Returns an alive RPC client or returns an error if no RPC endpoint is currently available.
+    async fn get_live_client(&self) -> Result<Self::RpcClient, Self::Error>;
+}
diff --git a/mm2src/coins/my_tx_history_v2.rs b/mm2src/coins/my_tx_history_v2.rs
index c297264ab2..971ab7b19e 100644
--- a/mm2src/coins/my_tx_history_v2.rs
+++ b/mm2src/coins/my_tx_history_v2.rs
@@ -1,15 +1,21 @@
-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 crate::hd_wallet::{AddressDerivingError, InvalidBip44ChainError};
+use crate::tendermint::{TENDERMINT_ASSET_PROTOCOL_TYPE, TENDERMINT_COIN_PROTOCOL_TYPE};
+use crate::tx_history_storage::{CreateTxHistoryStorageError, FilteringAddresses, GetTxHistoryFilters,
+                                TxHistoryStorageBuilder, WalletId};
+use crate::utxo::utxo_common::big_decimal_from_sat_unsigned;
+use crate::{coin_conf, lp_coinfind_or_err, BlockHeightAndTime, CoinFindError, HDAccountAddressId, 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 crypto::StandardHDPath;
 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 num_traits::ToPrimitive;
 use rpc::v1::types::{Bytes as BytesJson, ToTxHash};
 use std::collections::HashSet;
 
@@ -66,13 +72,21 @@ pub trait TxHistoryStorage: Send + Sync + 'static {
         internal_id: &BytesJson,
     ) -> Result<Option<TransactionDetails>, MmError<Self::Error>>;
 
+    /// Gets the highest block_height from the selected wallet's history
+    async fn get_highest_block_height(&self, wallet_id: &WalletId) -> Result<Option<u32>, 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>>;
+    async fn history_contains_unconfirmed_txes(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> 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,
+        for_addresses: FilteringAddresses,
     ) -> Result<Vec<TransactionDetails>, MmError<Self::Error>>;
 
     /// Updates transaction in the selected wallet's history
@@ -86,7 +100,11 @@ pub trait TxHistoryStorage: Send + Sync + 'static {
     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>>;
+    async fn unique_tx_hashes_num_in_history(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> Result<usize, MmError<Self::Error>>;
 
     /// Adds the given `tx_hex` transaction to the selected wallet's cache.
     async fn add_tx_to_cache(
@@ -203,8 +221,18 @@ impl<'a, Addr: Clone + DisplayAddress + Eq + std::hash::Hash, Tx: Transaction> T
                 bytes_for_hash.extend_from_slice(&token_id.0);
                 sha256(&bytes_for_hash).to_vec().into()
             },
+            TransactionType::CustomTendermintMsg { token_id, .. } => {
+                if let Some(token_id) = 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()
+                } else {
+                    tx_hash.clone()
+                }
+            },
             TransactionType::StakingDelegation
             | TransactionType::RemoveDelegation
+            | TransactionType::FeeForTokenTx
             | TransactionType::StandardTransfer => tx_hash.clone(),
         };
 
@@ -224,17 +252,34 @@ impl<'a, Addr: Clone + DisplayAddress + Eq + std::hash::Hash, Tx: Transaction> T
             internal_id,
             kmd_rewards: None,
             transaction_type: self.transaction_type,
+            memo: None,
         }
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
+pub enum MyTxHistoryTarget {
+    Iguana,
+    AccountId { account_id: u32 },
+    AddressId(HDAccountAddressId),
+    AddressDerivationPath(StandardHDPath),
+}
+
+impl Default for MyTxHistoryTarget {
+    fn default() -> Self { MyTxHistoryTarget::Iguana }
+}
+
+#[derive(Clone, Deserialize)]
 pub struct MyTxHistoryRequestV2<T> {
-    coin: String,
+    pub(crate) coin: String,
     #[serde(default = "ten")]
     pub(crate) limit: usize,
     #[serde(default)]
     pub(crate) paging_options: PagingOptionsEnum<T>,
+    #[serde(default)]
+    pub(crate) target: MyTxHistoryTarget,
 }
 
 #[derive(Serialize)]
@@ -247,6 +292,7 @@ pub struct MyTxHistoryDetails {
 #[derive(Serialize)]
 pub struct MyTxHistoryResponseV2<Tx, Id> {
     pub(crate) coin: String,
+    pub(crate) target: MyTxHistoryTarget,
     pub(crate) current_block: u64,
     pub(crate) transactions: Vec<Tx>,
     pub(crate) sync_status: HistorySyncState,
@@ -261,6 +307,7 @@ pub struct MyTxHistoryResponseV2<Tx, Id> {
 #[serde(tag = "error_type", content = "error_data")]
 pub enum MyTxHistoryErrorV2 {
     CoinIsNotActive(String),
+    InvalidTarget(String),
     StorageIsNotInitialized(String),
     StorageError(String),
     RpcError(String),
@@ -268,15 +315,21 @@ pub enum MyTxHistoryErrorV2 {
     Internal(String),
 }
 
+impl MyTxHistoryErrorV2 {
+    pub fn with_expected_target(actual: MyTxHistoryTarget, expected: &str) -> MyTxHistoryErrorV2 {
+        MyTxHistoryErrorV2::InvalidTarget(format!("Expected {:?} target, found: {:?}", expected, actual))
+    }
+}
+
 impl HttpStatusCode for MyTxHistoryErrorV2 {
     fn status_code(&self) -> StatusCode {
         match self {
-            MyTxHistoryErrorV2::CoinIsNotActive(_) => StatusCode::PRECONDITION_REQUIRED,
+            MyTxHistoryErrorV2::CoinIsNotActive(_) => StatusCode::NOT_FOUND,
             MyTxHistoryErrorV2::StorageIsNotInitialized(_)
             | MyTxHistoryErrorV2::StorageError(_)
             | MyTxHistoryErrorV2::RpcError(_)
             | MyTxHistoryErrorV2::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
-            MyTxHistoryErrorV2::NotSupportedFor(_) => StatusCode::BAD_REQUEST,
+            MyTxHistoryErrorV2::NotSupportedFor(_) | MyTxHistoryErrorV2::InvalidTarget(_) => StatusCode::BAD_REQUEST,
         }
     }
 }
@@ -304,10 +357,28 @@ impl From<UtxoRpcError> for MyTxHistoryErrorV2 {
     fn from(err: UtxoRpcError) -> Self { MyTxHistoryErrorV2::RpcError(err.to_string()) }
 }
 
+impl From<AddressDerivingError> for MyTxHistoryErrorV2 {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::InvalidBip44Chain { .. } => MyTxHistoryErrorV2::InvalidTarget(e.to_string()),
+            AddressDerivingError::Bip32Error(_) => MyTxHistoryErrorV2::Internal(e.to_string()),
+            AddressDerivingError::Internal(internal) => MyTxHistoryErrorV2::Internal(internal),
+        }
+    }
+}
+
+impl From<InvalidBip44ChainError> for MyTxHistoryErrorV2 {
+    fn from(e: InvalidBip44ChainError) -> Self { MyTxHistoryErrorV2::InvalidTarget(e.to_string()) }
+}
+
+#[async_trait]
 pub trait CoinWithTxHistoryV2 {
     fn history_wallet_id(&self) -> WalletId;
 
-    fn get_tx_history_filters(&self) -> GetTxHistoryFilters;
+    async fn get_tx_history_filters(
+        &self,
+        target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2>;
 }
 
 /// According to the [comment](https://github.com/KomodoPlatform/atomicDEX-API/pull/1285#discussion_r888410390),
@@ -319,6 +390,10 @@ pub async fn my_tx_history_v2_rpc(
     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,
+        MmCoinEnum::UtxoCoin(utxo) => my_tx_history_v2_impl(ctx, &utxo, request).await,
+        MmCoinEnum::QtumCoin(qtum) => my_tx_history_v2_impl(ctx, &qtum, request).await,
+        MmCoinEnum::Tendermint(tendermint) => my_tx_history_v2_impl(ctx, &tendermint, request).await,
+        MmCoinEnum::TendermintToken(tendermint_token) => my_tx_history_v2_impl(ctx, &tendermint_token, request).await,
         other => MmError::err(MyTxHistoryErrorV2::NotSupportedFor(other.ticker().to_owned())),
     }
 }
@@ -345,11 +420,15 @@ where
         .await
         .map_to_mm(MyTxHistoryErrorV2::RpcError)?;
 
-    let filters = coin.get_tx_history_filters();
+    let filters = coin.get_tx_history_filters(request.target.clone()).await?;
     let history = tx_history_storage
         .get_history(&wallet_id, filters, request.paging_options.clone(), request.limit)
         .await?;
 
+    let coin_conf = coin_conf(&ctx, coin.ticker());
+    let protocol_type = coin_conf["protocol"]["type"].as_str().unwrap_or_default();
+    let decimals = coin.decimals();
+
     let transactions = history
         .transactions
         .into_iter()
@@ -358,6 +437,59 @@ where
             if details.coin != request.coin {
                 details.coin = request.coin.clone();
             }
+
+            // TODO
+            // !! temporary solution !!
+            // for tendermint, tx_history_v2 implementation doesn't include amount parsing logic.
+            // therefore, re-mapping is required
+            match protocol_type {
+                TENDERMINT_COIN_PROTOCOL_TYPE | TENDERMINT_ASSET_PROTOCOL_TYPE => {
+                    // TODO
+                    // see this https://github.com/KomodoPlatform/atomicDEX-API/pull/1526#discussion_r1037001780
+                    if let Some(TxFeeDetails::Utxo(fee)) = &mut details.fee_details {
+                        let mapped_fee = crate::tendermint::TendermintFeeDetails {
+                            // We make sure this is filled in `tendermint_tx_history_v2`
+                            coin: fee.coin.as_ref().expect("can't be empty").to_owned(),
+                            amount: fee.amount.clone(),
+                            gas_limit: crate::tendermint::GAS_LIMIT_DEFAULT,
+                            // ignored anyway
+                            uamount: 0,
+                        };
+                        details.fee_details = Some(TxFeeDetails::Tendermint(mapped_fee));
+                    }
+
+                    match &details.transaction_type {
+                        // Amount mappings are by-passed when `TransactionType` is `FeeForTokenTx`
+                        TransactionType::FeeForTokenTx => {},
+                        _ => {
+                            // In order to use error result instead of panicking, we should do an extra iteration above this map.
+                            // Because all the values are inserted by u64 convertion in tx_history_v2 implementation, using `panic`
+                            // shouldn't harm.
+
+                            let u_total_amount = details.total_amount.to_u64().unwrap_or_else(|| {
+                                panic!("Parsing '{}' into u64 should not fail", details.total_amount)
+                            });
+                            details.total_amount = big_decimal_from_sat_unsigned(u_total_amount, decimals);
+
+                            let u_spent_by_me = details.spent_by_me.to_u64().unwrap_or_else(|| {
+                                panic!("Parsing '{}' into u64 should not fail", details.spent_by_me)
+                            });
+                            details.spent_by_me = big_decimal_from_sat_unsigned(u_spent_by_me, decimals);
+
+                            let u_received_by_me = details.received_by_me.to_u64().unwrap_or_else(|| {
+                                panic!("Parsing '{}' into u64 should not fail", details.received_by_me)
+                            });
+                            details.received_by_me = big_decimal_from_sat_unsigned(u_received_by_me, decimals);
+
+                            // Because this can be negative values, no need to read and parse
+                            // this since it's always 0 from tx_history_v2 implementation.
+                            details.my_balance_change = &details.received_by_me - &details.spent_by_me;
+                        },
+                    }
+                },
+                _ => {},
+            };
+
             let confirmations = if details.block_height == 0 || details.block_height > current_block {
                 0
             } else {
@@ -369,6 +501,7 @@ where
 
     Ok(MyTxHistoryResponseV2 {
         coin: request.coin,
+        target: request.target,
         current_block,
         transactions,
         sync_status: coin.history_sync_status(),
@@ -390,3 +523,19 @@ pub async fn z_coin_tx_history_rpc(
         other => MmError::err(MyTxHistoryErrorV2::NotSupportedFor(other.ticker().to_owned())),
     }
 }
+
+#[cfg(test)]
+pub(crate) mod for_tests {
+    use super::{CoinWithTxHistoryV2, TxHistoryStorage};
+    use crate::tx_history_storage::TxHistoryStorageBuilder;
+    use common::block_on;
+    use mm2_core::mm_ctx::MmArc;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+
+    pub 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)
+    }
+}
diff --git a/mm2src/coins/qrc20.rs b/mm2src/coins/qrc20.rs
index 4378cf44f4..cddbfaf6d5 100644
--- a/mm2src/coins/qrc20.rs
+++ b/mm2src/coins/qrc20.rs
@@ -1,3 +1,4 @@
+use crate::coin_errors::{MyAddressError, ValidatePaymentError};
 use crate::eth::{self, u256_to_big_decimal, wei_from_big_decimal, TryToAddress};
 use crate::qrc20::rpc_clients::{LogEntry, Qrc20ElectrumOps, Qrc20NativeOps, Qrc20RpcOps, TopicFilter, TxReceipt,
                                 ViewContractCallType};
@@ -6,23 +7,32 @@ use crate::utxo::rpc_clients::{ElectrumClient, NativeClient, UnspentInfo, UtxoRp
                                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,
+use crate::utxo::utxo_builder::{UtxoCoinBuildError, UtxoCoinBuildResult, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
+                                UtxoFieldsWithGlobalHDBuilder, UtxoFieldsWithHardwareWalletBuilder,
+                                UtxoFieldsWithIguanaSecretBuilder};
+use crate::utxo::utxo_common::{self, big_decimal_from_sat, check_all_utxo_inputs_signed_by_pub, UtxoTxBuilder};
+use crate::utxo::{qtum, ActualTxFee, AdditionalTxData, AddrFromStrError, 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, PrivKeyNotAllowed, RawTransactionFut, RawTransactionRequest,
-            SearchForSwapTxSpendInput, SignatureResult, SwapOps, TradeFee, TradePreimageError, TradePreimageFut,
+use crate::{BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner, FeeApproxStage,
+            FoundSwapTxSpend, HistorySyncState, IguanaPrivKey, MakerSwapTakerCoin, MarketCoinOps, MmCoin,
+            NegotiateSwapContractAddrErr, PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy,
+            PrivKeyPolicyNotAllowed, RawTransactionFut, RawTransactionRequest, RefundError, RefundResult,
+            SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs,
+            SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee, TradePreimageError, TradePreimageFut,
             TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum, TransactionErr,
-            TransactionFut, TransactionType, UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput,
-            VerificationResult, WithdrawError, WithdrawFee, WithdrawFut, WithdrawRequest, WithdrawResult};
+            TransactionFut, TransactionType, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
+            ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentFut,
+            ValidatePaymentInput, VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawError, WithdrawFee, WithdrawFut,
+            WithdrawRequest, WithdrawResult};
 use async_trait::async_trait;
 use bitcrypto::{dhash160, sha256};
 use chain::TransactionOutput;
-use common::executor::Timer;
+use common::executor::{AbortableSystem, AbortedError, Timer};
 use common::jsonrpc_client::{JsonRpcClient, JsonRpcRequest, RpcRes};
 use common::log::{error, warn};
 use common::now_ms;
@@ -75,7 +85,7 @@ pub type Qrc20AbiResult<T> = Result<T, MmError<Qrc20AbiError>>;
 pub enum Qrc20GenTxError {
     ErrorGeneratingUtxoTx(GenerateTxError),
     ErrorSigningTx(UtxoSignWithKeyPairError),
-    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     UnexpectedDerivationMethod(UnexpectedDerivationMethod),
 }
 
@@ -87,8 +97,8 @@ 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<PrivKeyPolicyNotAllowed> for Qrc20GenTxError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { Qrc20GenTxError::PrivKeyPolicyNotAllowed(e) }
 }
 
 impl From<UnexpectedDerivationMethod> for Qrc20GenTxError {
@@ -106,7 +116,7 @@ impl Qrc20GenTxError {
                 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::PrivKeyPolicyNotAllowed(priv_err) => WithdrawError::InternalError(priv_err.to_string()),
             Qrc20GenTxError::UnexpectedDerivationMethod(addr_err) => WithdrawError::InternalError(addr_err.to_string()),
         }
     }
@@ -151,7 +161,7 @@ struct Qrc20CoinBuilder<'a> {
     ticker: &'a str,
     conf: &'a Json,
     activation_params: &'a Qrc20ActivationParams,
-    priv_key: &'a [u8],
+    priv_key_policy: PrivKeyBuildPolicy,
     platform: String,
     token_contract_address: H160,
 }
@@ -162,7 +172,7 @@ impl<'a> Qrc20CoinBuilder<'a> {
         ticker: &'a str,
         conf: &'a Json,
         activation_params: &'a Qrc20ActivationParams,
-        priv_key: &'a [u8],
+        priv_key_policy: PrivKeyBuildPolicy,
         platform: String,
         token_contract_address: H160,
     ) -> Qrc20CoinBuilder<'a> {
@@ -171,7 +181,7 @@ impl<'a> Qrc20CoinBuilder<'a> {
             ticker,
             conf,
             activation_params,
-            priv_key,
+            priv_key_policy,
             platform,
             token_contract_address,
         }
@@ -253,18 +263,33 @@ impl<'a> UtxoCoinBuilderCommonOps for Qrc20CoinBuilder<'a> {
     }
 }
 
-#[async_trait]
-impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for Qrc20CoinBuilder<'a> {}
+impl<'a> UtxoFieldsWithIguanaSecretBuilder for Qrc20CoinBuilder<'a> {}
+
+impl<'a> UtxoFieldsWithGlobalHDBuilder for Qrc20CoinBuilder<'a> {}
+
+/// Although, `Qrc20Coin` doesn't support [`PrivKeyBuildPolicy::Trezor`] yet,
+/// `UtxoCoinBuilder` trait requires `UtxoFieldsWithHardwareWalletBuilder` to be implemented.
+impl<'a> UtxoFieldsWithHardwareWalletBuilder for Qrc20CoinBuilder<'a> {}
 
 #[async_trait]
-impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for Qrc20CoinBuilder<'a> {
+impl<'a> UtxoCoinBuilder for Qrc20CoinBuilder<'a> {
     type ResultCoin = Qrc20Coin;
     type Error = UtxoCoinBuildError;
 
-    fn priv_key(&self) -> &[u8] { self.priv_key }
+    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_with_iguana_priv_key(self.priv_key()).await?;
+        let utxo = match self.priv_key_policy() {
+            PrivKeyBuildPolicy::IguanaPrivKey(priv_key) => self.build_utxo_fields_with_iguana_secret(priv_key).await?,
+            PrivKeyBuildPolicy::GlobalHDAccount(global_hd_ctx) => {
+                self.build_utxo_fields_with_global_hd(global_hd_ctx).await?
+            },
+            PrivKeyBuildPolicy::Trezor => {
+                let priv_key_err = PrivKeyPolicyNotAllowed::HardwareWalletNotSupported;
+                return MmError::err(UtxoCoinBuildError::PrivKeyPolicyNotAllowed(priv_key_err));
+            },
+        };
+
         let inner = Qrc20CoinFields {
             utxo,
             platform: self.platform,
@@ -276,13 +301,13 @@ impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for Qrc20CoinBuilder<'a> {
     }
 }
 
-pub async fn qrc20_coin_from_conf_and_params(
+pub async fn qrc20_coin_with_policy(
     ctx: &MmArc,
     ticker: &str,
     platform: &str,
     conf: &Json,
     params: &Qrc20ActivationParams,
-    priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
     contract_address: H160,
 ) -> Result<Qrc20Coin, String> {
     let builder = Qrc20CoinBuilder::new(
@@ -290,14 +315,26 @@ pub async fn qrc20_coin_from_conf_and_params(
         ticker,
         conf,
         params,
-        priv_key,
+        priv_key_policy,
         platform.to_owned(),
         contract_address,
     );
     Ok(try_s!(builder.build().await))
 }
 
-#[derive(Debug)]
+pub async fn qrc20_coin_with_priv_key(
+    ctx: &MmArc,
+    ticker: &str,
+    platform: &str,
+    conf: &Json,
+    params: &Qrc20ActivationParams,
+    priv_key: IguanaPrivKey,
+    contract_address: H160,
+) -> Result<Qrc20Coin, String> {
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    qrc20_coin_with_policy(ctx, ticker, platform, conf, params, priv_key_policy, contract_address).await
+}
+
 pub struct Qrc20CoinFields {
     pub utxo: UtxoCoinFields,
     pub platform: String,
@@ -306,12 +343,12 @@ pub struct Qrc20CoinFields {
     pub fallback_swap_contract: Option<H160>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Qrc20Coin(Arc<Qrc20CoinFields>);
 
 impl Deref for Qrc20Coin {
     type Target = Qrc20CoinFields;
-    fn deref(&self) -> &Qrc20CoinFields { &*self.0 }
+    fn deref(&self) -> &Qrc20CoinFields { &self.0 }
 }
 
 impl AsRef<UtxoCoinFields> for Qrc20Coin {
@@ -418,6 +455,10 @@ impl From<ethabi::Error> for Qrc20AbiError {
     fn from(e: ethabi::Error) -> Qrc20AbiError { Qrc20AbiError::AbiError(e.to_string()) }
 }
 
+impl From<Qrc20AbiError> for ValidatePaymentError {
+    fn from(e: Qrc20AbiError) -> ValidatePaymentError { ValidatePaymentError::TxDeserializationError(e.to_string()) }
+}
+
 impl From<Qrc20AbiError> for GenerateTxError {
     fn from(e: Qrc20AbiError) -> Self { GenerateTxError::Internal(e.to_string()) }
 }
@@ -476,7 +517,7 @@ impl Qrc20Coin {
         &self,
         contract_outputs: Vec<ContractCallOutput>,
     ) -> Result<GenerateQrc20TxResult, MmError<Qrc20GenTxError>> {
-        let my_address = self.utxo.derivation_method.iguana_or_err()?;
+        let my_address = self.utxo.derivation_method.single_addr_or_err()?;
         let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
 
         let mut gas_fee = 0;
@@ -493,7 +534,7 @@ impl Qrc20Coin {
             .build()
             .await?;
 
-        let my_address = self.utxo.derivation_method.iguana_or_err()?;
+        let my_address = self.utxo.derivation_method.single_addr_or_err()?;
         let key_pair = self.utxo.priv_key_policy.key_pair_or_err()?;
 
         let prev_script = ScriptBuilder::build_p2pkh(&my_address.hash);
@@ -524,7 +565,8 @@ impl Qrc20Coin {
         let params = function.encode_input(&[Token::Address(to_addr), Token::Uint(amount)])?;
 
         let script_pubkey =
-            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, &self.contract_address)?.to_bytes();
+            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, self.contract_address.as_bytes())?
+                .to_bytes();
 
         Ok(ContractCallOutput {
             value: OUTPUT_QTUM_AMOUNT,
@@ -608,8 +650,8 @@ impl GetUtxoListOps for Qrc20Coin {
 #[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
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size, stage).await
     }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<UtxoAddress>, String> {
@@ -622,7 +664,7 @@ impl UtxoCommonOps for Qrc20Coin {
         utxo_common::my_public_key(self.as_ref())
     }
 
-    fn address_from_str(&self, address: &str) -> Result<UtxoAddress, String> {
+    fn address_from_str(&self, address: &str) -> MmResult<UtxoAddress, AddrFromStrError> {
         utxo_common::checked_address_from_str(self, address)
     }
 
@@ -723,20 +765,13 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        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_tx_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
-        let secret_hash = Vec::from(secret_hash);
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
+        let time_lock = maker_payment_args.time_lock;
+        let taker_addr = try_tx_fus!(self.contract_address_from_raw_pubkey(maker_payment_args.other_pubkey));
+        let id = qrc20_swap_id(time_lock, maker_payment_args.secret_hash);
+        let value = try_tx_fus!(wei_from_big_decimal(&maker_payment_args.amount, self.utxo.decimals));
+        let secret_hash = Vec::from(maker_payment_args.secret_hash);
+        let swap_contract_address = try_tx_fus!(maker_payment_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -747,20 +782,14 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        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_tx_fus!(wei_from_big_decimal(&amount, self.utxo.decimals));
-        let secret_hash = Vec::from(secret_hash);
-        let swap_contract_address = try_tx_fus!(swap_contract_address.try_to_address());
+    #[inline]
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
+        let time_lock = taker_payment_args.time_lock;
+        let maker_addr = try_tx_fus!(self.contract_address_from_raw_pubkey(taker_payment_args.other_pubkey));
+        let id = qrc20_swap_id(time_lock, taker_payment_args.secret_hash);
+        let value = try_tx_fus!(wei_from_big_decimal(&taker_payment_args.amount, self.utxo.decimals));
+        let secret_hash = Vec::from(taker_payment_args.secret_hash);
+        let swap_contract_address = try_tx_fus!(taker_payment_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -771,18 +800,15 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
-        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 payment_tx: UtxoTx =
+            try_tx_fus!(deserialize(maker_spends_payment_args.other_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(maker_spends_payment_args.swap_contract_address.try_to_address());
+        let secret = maker_spends_payment_args.secret.to_vec();
 
         let selfi = self.clone();
         let fut = async move {
@@ -793,18 +819,15 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
-        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_tx_fus!(swap_contract_address.try_to_address());
+        let payment_tx: UtxoTx =
+            try_tx_fus!(deserialize(taker_spends_payment_args.other_payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let secret = taker_spends_payment_args.secret.to_vec();
+        let swap_contract_address = try_tx_fus!(taker_spends_payment_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -815,17 +838,11 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        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());
+    #[inline]
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
+        let payment_tx: UtxoTx =
+            try_tx_fus!(deserialize(taker_refunds_payment_args.payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(taker_refunds_payment_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -836,17 +853,11 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        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());
+    #[inline]
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
+        let payment_tx: UtxoTx =
+            try_tx_fus!(deserialize(maker_refunds_payment_args.payment_tx).map_err(|e| ERRL!("{:?}", e)));
+        let swap_contract_address = try_tx_fus!(maker_refunds_payment_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -857,25 +868,26 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     fn validate_fee(
         &self,
-        fee_tx: &TransactionEnum,
-        expected_sender: &[u8],
-        fee_addr: &[u8],
-        amount: &BigDecimal,
-        min_block_number: u64,
-        _uuid: &[u8],
+        validate_fee_args: ValidateFeeArgs<'_>,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let fee_tx = validate_fee_args.fee_tx;
+        let min_block_number = validate_fee_args.min_block_number;
         let fee_tx = match fee_tx {
             TransactionEnum::UtxoTx(tx) => tx,
             _ => panic!("Unexpected TransactionEnum"),
         };
         let fee_tx_hash = fee_tx.hash().reversed().into();
-        if !try_fus!(check_all_inputs_signed_by_pub(fee_tx, expected_sender)) {
+        if !try_fus!(check_all_utxo_inputs_signed_by_pub(
+            fee_tx,
+            validate_fee_args.expected_sender
+        )) {
             return Box::new(futures01::future::err(ERRL!("The dex fee was sent from wrong address")));
         }
-        let fee_addr = try_fus!(self.contract_address_from_raw_pubkey(fee_addr));
-        let expected_value = try_fus!(wei_from_big_decimal(amount, self.utxo.decimals));
+        let fee_addr = try_fus!(self.contract_address_from_raw_pubkey(validate_fee_args.fee_addr));
+        let expected_value = try_fus!(wei_from_big_decimal(validate_fee_args.amount, self.utxo.decimals));
 
         let selfi = self.clone();
         let fut = async move {
@@ -886,10 +898,16 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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());
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let payment_tx: UtxoTx = try_f!(deserialize(input.payment_tx.as_slice()));
+        let sender = try_f!(self
+            .contract_address_from_raw_pubkey(&input.other_pub)
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
+        let swap_contract_address = try_f!(input
+            .swap_contract_address
+            .try_to_address()
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
 
         let selfi = self.clone();
         let fut = async move {
@@ -907,10 +925,16 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    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));
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        let swap_contract_address = try_f!(input
+            .swap_contract_address
+            .try_to_address()
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
+        let payment_tx: UtxoTx = try_f!(deserialize(input.payment_tx.as_slice()));
+        let sender = try_f!(self
+            .contract_address_from_raw_pubkey(&input.other_pub)
+            .map_to_mm(ValidatePaymentError::InvalidParameter));
 
         let selfi = self.clone();
         let fut = async move {
@@ -928,17 +952,14 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs<'_>,
     ) -> 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());
+        let search_from_block = if_my_payment_sent_args.search_from_block;
+        let swap_id = qrc20_swap_id(if_my_payment_sent_args.time_lock, if_my_payment_sent_args.secret_hash);
+        let swap_contract_address = try_fus!(if_my_payment_sent_args.swap_contract_address.try_to_address());
 
         let selfi = self.clone();
         let fut = async move {
@@ -949,6 +970,7 @@ impl SwapOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -969,10 +991,24 @@ impl SwapOps for Qrc20Coin {
             .await
     }
 
-    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+    #[inline]
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        utxo_common::check_all_inputs_signed_by_pub(tx, expected_pub)
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         self.extract_secret_impl(secret_hash, spend_tx)
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
     fn negotiate_swap_contract_addr(
         &self,
         other_side_address: Option<&[u8]>,
@@ -982,19 +1018,19 @@ impl SwapOps for Qrc20Coin {
                 if bytes.len() != 20 {
                     return MmError::err(NegotiateSwapContractAddrErr::InvalidOtherAddrLen(bytes.into()));
                 }
-                let other_addr = H160::from(bytes);
+                let other_addr = H160::from_slice(bytes);
                 if other_addr == self.swap_contract_address {
-                    return Ok(Some(self.swap_contract_address.to_vec().into()));
+                    return Ok(Some(self.swap_contract_address.0.to_vec().into()));
                 }
 
                 if Some(other_addr) == self.fallback_swap_contract {
-                    return Ok(self.fallback_swap_contract.map(|addr| addr.to_vec().into()));
+                    return Ok(self.fallback_swap_contract.map(|addr| addr.0.to_vec().into()));
                 }
                 MmError::err(NegotiateSwapContractAddrErr::UnexpectedOtherAddr(bytes.into()))
             },
             None => self
                 .fallback_swap_contract
-                .map(|addr| Some(addr.to_vec().into()))
+                .map(|addr| Some(addr.0.to_vec().into()))
                 .ok_or_else(|| MmError::new(NegotiateSwapContractAddrErr::NoOtherAddrAndNoFallback)),
         }
     }
@@ -1002,12 +1038,125 @@ impl SwapOps for Qrc20Coin {
     fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
         utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
     }
+
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        utxo_common::derive_htlc_pubkey(self, swap_unique_data)
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for Qrc20Coin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for Qrc20Coin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for Qrc20Coin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
 }
 
 impl MarketCoinOps for Qrc20Coin {
     fn ticker(&self) -> &str { &self.utxo.conf.ticker }
 
-    fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { utxo_common::my_address(self) }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
         let pubkey = utxo_common::my_public_key(self.as_ref())?;
@@ -1092,26 +1241,28 @@ impl MarketCoinOps for Qrc20Coin {
         Box::new(fut.boxed().compat())
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         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)
+                .wait_for_tx_spend_impl(tx, wait_until, from_block, check_every)
                 .map_err(TransactionErr::Plain)
                 .await
         };
         Box::new(fut.boxed().compat())
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
         utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
     }
 
@@ -1133,6 +1284,8 @@ impl MarketCoinOps for Qrc20Coin {
 impl MmCoin for Qrc20Coin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo) }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.as_ref().abortable_system) }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(qrc20_withdraw(self.clone(), req).boxed().compat())
     }
@@ -1141,6 +1294,10 @@ impl MmCoin for Qrc20Coin {
         Box::new(utxo_common::get_raw_transaction(&self.utxo, req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(utxo_common::get_tx_hex_by_hash(&self.utxo, tx_hash).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> {
@@ -1222,7 +1379,7 @@ impl MmCoin for Qrc20Coin {
         })
     }
 
-    fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         let selfi = self.clone();
         let fut = async move {
             // pass the dummy params
@@ -1287,6 +1444,10 @@ impl MmCoin for Qrc20Coin {
         Some(BytesJson::from(self.swap_contract_address.0.as_ref()))
     }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> {
+        self.fallback_swap_contract.map(|a| BytesJson::from(a.0.as_ref()))
+    }
+
     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) }
@@ -1294,6 +1455,10 @@ impl MmCoin for Qrc20Coin {
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
         utxo_common::is_coin_protocol_supported(self, info)
     }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.as_ref().abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
 
 pub fn qrc20_swap_id(time_lock: u32, secret_hash: &[u8]) -> Vec<u8> {
@@ -1376,7 +1541,7 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
         .await
         .mm_err(|gen_tx_error| gen_tx_error.into_withdraw_error(coin.platform.clone(), coin.utxo.decimals))?;
 
-    let my_address = coin.utxo.derivation_method.iguana_or_err()?;
+    let my_address = coin.utxo.derivation_method.single_addr_or_err()?;
     let received_by_me = if to_addr == *my_address {
         qrc20_amount.clone()
     } else {
@@ -1385,7 +1550,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_string = coin.my_address().map_to_mm(WithdrawError::InternalError)?;
+    let my_address_string = coin.my_address()?;
     let to_address = to_addr.display_address().map_to_mm(WithdrawError::InternalError)?;
 
     let fee_details = Qrc20FeeDetails {
@@ -1412,6 +1577,7 @@ async fn qrc20_withdraw(coin: Qrc20Coin, req: WithdrawRequest) -> WithdrawResult
         timestamp: now_ms() / 1000,
         kmd_rewards: None,
         transaction_type: TransactionType::StandardTransfer,
+        memo: None,
     })
 }
 
diff --git a/mm2src/coins/qrc20/history.rs b/mm2src/coins/qrc20/history.rs
index 967ba82ba4..0e61ce0a79 100644
--- a/mm2src/coins/qrc20/history.rs
+++ b/mm2src/coins/qrc20/history.rs
@@ -3,8 +3,8 @@ use crate::utxo::{RequestTxHistoryResult, UtxoFeeDetails};
 use crate::{CoinsContext, TxFeeDetails, TxHistoryResult};
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use common::jsonrpc_client::JsonRpcErrorType;
-use common::mm_metrics::MetricsArc;
 use itertools::Itertools;
+use mm2_metrics::MetricsArc;
 use script_pubkey::{extract_contract_call_from_script, extract_gas_from_script, ExtractGasEnum};
 use std::collections::HashMap;
 use std::io::Cursor;
@@ -224,7 +224,7 @@ impl Qrc20Coin {
         receipt: TxReceipt,
         miner_fee: BigDecimal,
     ) -> Result<TxTransferMap, String> {
-        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err());
+        let my_address = try_s!(self.utxo.derivation_method.single_addr_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!(
@@ -352,7 +352,8 @@ impl Qrc20Coin {
                         },
                         JsonRpcErrorType::InvalidRequest(err)
                         | JsonRpcErrorType::Transport(err)
-                        | JsonRpcErrorType::Parse(_, err) => {
+                        | JsonRpcErrorType::Parse(_, err)
+                        | JsonRpcErrorType::Internal(err) => {
                             return RequestTxHistoryResult::Retry {
                                 error: ERRL!("Error {} on blockchain_contract_event_get_history", err),
                             };
@@ -620,7 +621,7 @@ impl TransferHistoryBuilder {
                     .coin
                     .utxo
                     .derivation_method
-                    .iguana_or_err()
+                    .single_addr_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()))?
@@ -813,7 +814,7 @@ fn is_transfer_event_log(log: &LogEntry) -> bool {
 mod tests {
     use super::*;
     use common::block_on;
-    use common::mm_metrics::{MetricType, MetricsJson, MetricsOps};
+    use mm2_metrics::{MetricType, MetricsJson, MetricsOps};
     use mm2_test_helpers::for_tests::find_metrics_in_json;
     use qrc20_tests::qrc20_coin_for_test;
 
@@ -839,8 +840,8 @@ mod tests {
             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);
-        ctx.metrics.init().unwrap();
+        let (ctx, coin) = qrc20_coin_for_test(priv_key, None);
+        ctx.metrics.init();
 
         let tx_hash: H256Json = hex::decode("85ede12ccc12fb1709c4d9e403e96c0c394b0916f2f6098d41d8dfa00013fcdb")
             .unwrap()
@@ -871,8 +872,8 @@ mod tests {
             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);
-        ctx.metrics.init().unwrap();
+        let (ctx, coin) = qrc20_coin_for_test(priv_key, None);
+        ctx.metrics.init();
 
         let tx_hash: H256Json = hex::decode("85ede12ccc12fb1709c4d9e403e96c0c394b0916f2f6098d41d8dfa00013fcdb")
             .unwrap()
@@ -913,8 +914,8 @@ mod tests {
             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);
-        ctx.metrics.init().unwrap();
+        let (ctx, coin) = qrc20_coin_for_test(priv_key, None);
+        ctx.metrics.init();
 
         let tx_hash: H256Json = hex::decode("85ede12ccc12fb1709c4d9e403e96c0c394b0916f2f6098d41d8dfa00013fcdb")
             .unwrap()
@@ -955,7 +956,7 @@ mod tests {
             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 (ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
         let tx_hash: H256Json = hex::decode("35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac")
             .unwrap()
@@ -980,7 +981,7 @@ mod tests {
             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 (ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
         let tx_hash: H256Json = hex::decode("85ede12ccc12fb1709c4d9e403e96c0c394b0916f2f6098d41d8dfa00013fcdb")
             .unwrap()
@@ -1005,10 +1006,10 @@ mod tests {
             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 (ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
         let metrics = MetricsArc::new();
-        metrics.init().unwrap();
+        metrics.init();
 
         let tx_hash_invalid: H256Json = hex::decode("0000000000000000000000000000000000000000000000000000000000000000")
             .unwrap()
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
index 8fa226ee15..12f606cb26 100644
--- a/mm2src/coins/qrc20/qrc20_tests.rs
+++ b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -3,6 +3,7 @@ use crate::utxo::rpc_clients::UnspentInfo;
 use crate::TxFeeDetails;
 use chain::OutPoint;
 use common::{block_on, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::Secp256k1Secret;
 use itertools::Itertools;
 use mm2_core::mm_ctx::MmCtxBuilder;
 use mm2_number::bigdecimal::Zero;
@@ -14,8 +15,9 @@ 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;
 const SWAP_PAYMENT_GAS_FEE: i64 = (QRC20_PAYMENT_GAS_LIMIT * QRC20_GAS_PRICE_DEFAULT) as i64;
+const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
 
-pub fn qrc20_coin_for_test(priv_key: &[u8], fallback_swap: Option<&str>) -> (MmArc, Qrc20Coin) {
+pub fn qrc20_coin_for_test(priv_key: [u8; 32], fallback_swap: Option<&str>) -> (MmArc, Qrc20Coin) {
     let conf = json!({
         "coin":"QRC20",
         "decimals": 8,
@@ -33,17 +35,17 @@ pub fn qrc20_coin_for_test(priv_key: &[u8], fallback_swap: Option<&str>) -> (MmA
         "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
         "fallback_swap_contract": fallback_swap,
     });
-    let contract_address = "0xd362e096e873eb7907e205fadc6175c6fec7bc44".into();
+    let contract_address = H160::from_str("0xd362e096e873eb7907e205fadc6175c6fec7bc44").unwrap();
     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(
+    let coin = block_on(qrc20_coin_with_priv_key(
         &ctx,
         "QRC20",
         "QTUM",
         &conf,
         &params,
-        priv_key,
+        Secp256k1Secret::from(priv_key),
         contract_address,
     ))
     .unwrap();
@@ -61,13 +63,13 @@ fn test_withdraw_to_p2sh_address_should_fail() {
         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 (_, 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(),
+        hash: coin.as_ref().derivation_method.unwrap_single_addr().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
-        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_single_addr().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Standard,
     };
@@ -106,7 +108,7 @@ fn test_withdraw_impl_fee_details() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     let withdraw_req = WithdrawRequest {
         amount: 10.into(),
@@ -144,10 +146,10 @@ fn test_validate_maker_payment() {
         24, 181, 194, 193, 18, 152, 142, 168, 71, 73, 70, 244, 9, 101, 92, 168, 243, 61, 132, 48, 25, 39, 103, 92, 29,
         17, 11, 29, 113, 235, 48, 70,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     assert_eq!(
-        *coin.utxo.derivation_method.unwrap_iguana(),
+        *coin.utxo.derivation_method.unwrap_single_addr(),
         "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into()
     );
 
@@ -159,6 +161,7 @@ fn test_validate_maker_payment() {
 
     let mut input = ValidatePaymentInput {
         payment_tx,
+        time_lock_duration: 0,
         time_lock: 1601367157,
         other_pub: correct_maker_pub.clone(),
         secret_hash: vec![1; 20],
@@ -172,29 +175,66 @@ fn test_validate_maker_payment() {
     coin.validate_maker_payment(input.clone()).wait().unwrap();
 
     input.other_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
-    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    let error = coin
+        .validate_maker_payment(input.clone())
+        .wait()
+        .unwrap_err()
+        .into_inner();
     log!("error: {:?}", error);
-    assert!(
-        error.contains("Payment tx was sent from wrong address, expected 0x783cf0be521101942da509846ea476e683aad832")
-    );
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => assert!(err.contains("Payment tx 0x9e032d4b0090a11dc40fe6c47601499a35d55fbb was sent from wrong address, expected 0x783cf0be521101942da509846ea476e683aad832")),
+        _ => panic!("Expected `WrongPaymentTx` wrong address, found {:?}", error),
+    }
     input.other_pub = correct_maker_pub;
 
     input.amount = BigDecimal::from_str("0.3").unwrap();
-    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    let error = coin
+        .validate_maker_payment(input.clone())
+        .wait()
+        .unwrap_err()
+        .into_inner();
     log!("error: {:?}", error);
-    assert!(error.contains("Unexpected 'erc20Payment' contract call bytes"));
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains("Unexpected 'erc20Payment' contract call bytes"))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` unexpected contract call bytes, found {:?}",
+            error
+        ),
+    }
     input.amount = correct_amount;
 
     input.secret_hash = vec![2; 20];
-    let error = coin.validate_maker_payment(input.clone()).wait().unwrap_err();
+    let error = coin
+        .validate_maker_payment(input.clone())
+        .wait()
+        .unwrap_err()
+        .into_inner();
     log!("error: {:?}", error);
-    assert!(error.contains("Payment state is not PAYMENT_STATE_SENT, got 0"));
+    match error {
+        ValidatePaymentError::UnexpectedPaymentState(err) => {
+            assert!(err.contains("Payment state is not PAYMENT_STATE_SENT, got 0"))
+        },
+        _ => panic!(
+            "Expected `UnexpectedPaymentState` state not PAYMENT_STATE_SENT, found {:?}",
+            error
+        ),
+    }
     input.secret_hash = vec![1; 20];
 
     input.time_lock = 123;
-    let error = coin.validate_maker_payment(input).wait().unwrap_err();
+    let error = coin.validate_maker_payment(input).wait().unwrap_err().into_inner();
     log!("error: {:?}", error);
-    assert!(error.contains("Payment state is not PAYMENT_STATE_SENT, got 0"));
+    match error {
+        ValidatePaymentError::UnexpectedPaymentState(err) => {
+            assert!(err.contains("Payment state is not PAYMENT_STATE_SENT, got 0"))
+        },
+        _ => panic!(
+            "Expected `UnexpectedPaymentState` state not PAYMENT_STATE_SENT, found {:?}",
+            error
+        ),
+    }
 }
 
 #[test]
@@ -204,10 +244,10 @@ fn test_wait_for_confirmations_excepted() {
         24, 181, 194, 193, 18, 152, 142, 168, 71, 73, 70, 244, 9, 101, 92, 168, 243, 61, 132, 48, 25, 39, 103, 92, 29,
         17, 11, 29, 113, 235, 48, 70,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     assert_eq!(
-        *coin.utxo.derivation_method.unwrap_iguana(),
+        *coin.utxo.derivation_method.unwrap_single_addr(),
         "qUX9FGHubczidVjWPCUWuwCUJWpkAtGCgf".into()
     );
 
@@ -251,7 +291,7 @@ fn test_send_taker_fee() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     let amount = BigDecimal::from_str("0.01").unwrap();
     let tx = coin
@@ -265,14 +305,14 @@ fn test_send_taker_fee() {
     log!("Fee tx {:?}", tx_hash);
 
     let result = coin
-        .validate_fee(
-            &tx,
-            coin.my_public_key().unwrap(),
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            &amount,
-            0,
-            &[],
-        )
+        .validate_fee(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: coin.my_public_key().unwrap(),
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .wait();
     assert_eq!(result, Ok(()));
 }
@@ -284,7 +324,7 @@ fn test_validate_fee() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     // QRC20 transfer tx "f97d3a43dbea0993f1b7a6a299377d4ee164c84935a1eb7d835f70c9429e6a1d"
     let tx = TransactionEnum::UtxoTx("010000000160fd74b5714172f285db2b36f0b391cd6883e7291441631c8b18f165b0a4635d020000006a47304402205d409e141111adbc4f185ae856997730de935ac30a0d2b1ccb5a6c4903db8171022024fc59bbcfdbba283556d7eeee4832167301dc8e8ad9739b7865f67b9676b226012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff020000000000000000625403a08601012844a9059cbb000000000000000000000000ca1e04745e8ca0c60d8c5881531d51bec470743f00000000000000000000000000000000000000000000000000000000000f424014d362e096e873eb7907e205fadc6175c6fec7bc44c200ada205000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acfe967d5f".into());
@@ -293,13 +333,27 @@ 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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &sender_pub,
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &sender_pub,
+            fee_addr: &fee_addr_dif,
+            amount: &amount,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .wait()
         .err()
         .expect("Expected an error");
@@ -307,7 +361,14 @@ fn test_validate_fee() {
     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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .wait()
         .err()
         .expect("Expected an error");
@@ -315,7 +376,14 @@ fn test_validate_fee() {
     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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &sender_pub,
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount,
+            min_block_number: 2000000,
+            uuid: &[],
+        })
         .wait()
         .err()
         .expect("Expected an error");
@@ -324,7 +392,14 @@ fn test_validate_fee() {
 
     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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &sender_pub,
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount_dif,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .wait()
         .err()
         .expect("Expected an error");
@@ -335,7 +410,14 @@ fn test_validate_fee() {
     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(ValidateFeeArgs {
+            fee_tx: &tx,
+            expected_sender: &sender_pub,
+            fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+            amount: &amount,
+            min_block_number: 0,
+            uuid: &[],
+        })
         .wait()
         .err()
         .expect("Expected an error");
@@ -350,7 +432,7 @@ fn test_wait_for_tx_spend_malicious() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     // f94d79f89e9ec785db40bb8bb8dca9bc01b7761429618d4c843bbebbc31836b7
     // the transaction has two outputs:
@@ -363,7 +445,14 @@ fn test_wait_for_tx_spend_malicious() {
     let wait_until = (now_ms() / 1000) + 1;
     let from_block = 696245;
     let found = coin
-        .wait_for_tx_spend(&payment_tx, wait_until, from_block, &coin.swap_contract_address())
+        .wait_for_htlc_tx_spend(
+            &payment_tx,
+            &[],
+            wait_until,
+            from_block,
+            &coin.swap_contract_address(),
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+        )
         .wait()
         .unwrap();
 
@@ -382,14 +471,14 @@ fn test_extract_secret() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     let expected_secret = &[1; 32];
     let secret_hash = &*dhash160(expected_secret);
 
     // taker spent maker payment - d3f5dab4d54c14b3d7ed8c7f5c8cc7f47ccf45ce589fdc7cd5140a3c1c3df6e1
     let tx_hex = hex::decode("01000000033f56ecafafc8602fde083ba868d1192d6649b8433e42e1a2d79ba007ea4f7abb010000006b48304502210093404e90e40d22730013035d31c404c875646dcf2fad9aa298348558b6d65ba60220297d045eac5617c1a3eddb71d4bca9772841afa3c4c9d6c68d8d2d42ee6de3950121022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1affffffff9cac7fe90d597922a1d92e05306c2215628e7ea6d5b855bfb4289c2944f4c73a030000006b483045022100b987da58c2c0c40ce5b6ef2a59e8124ed4ef7a8b3e60c7fb631139280019bc93022069649bcde6fe4dd5df9462a1fcae40598488d6af8c324cd083f5c08afd9568be0121022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1affffffff70b9870f2b0c65d220a839acecebf80f5b44c3ca4c982fa2fdc5552c037f5610010000006a473044022071b34dd3ebb72d29ca24f3fa0fc96571c815668d3b185dd45cc46a7222b6843f02206c39c030e618d411d4124f7b3e7ca1dd5436775bd8083a85712d123d933a51300121022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1affffffff020000000000000000c35403a0860101284ca402ed292b806a1835a1b514ad643f2acdb5c8db6b6a9714accff3275ea0d79a3f23be8fd00000000000000000000000000000000000000000000000000000000001312d000101010101010101010101010101010101010101010101010101010101010101000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc440000000000000000000000009e032d4b0090a11dc40fe6c47601499a35d55fbb14ba8b71f3544b93e2f681f996da519a98ace0107ac2c02288d4010000001976a914783cf0be521101942da509846ea476e683aad83288ac0f047f5f").unwrap();
-    let secret = coin.extract_secret(secret_hash, &tx_hex).unwrap();
+    let secret = block_on(coin.extract_secret(secret_hash, &tx_hex)).unwrap();
 
     assert_eq!(secret, expected_secret);
 }
@@ -401,7 +490,7 @@ fn test_extract_secret_malicious() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     // f94d79f89e9ec785db40bb8bb8dca9bc01b7761429618d4c843bbebbc31836b7
     // the transaction has two outputs:
@@ -410,7 +499,7 @@ fn test_extract_secret_malicious() {
     let spend_tx = hex::decode("01000000022bc8299981ec0cea664cdf9df4f8306396a02e2067d6ac2d3770b34646d2bc2a010000006b483045022100eb13ef2d99ac1cd9984045c2365654b115dd8a7815b7fbf8e2a257f0b93d1592022060d648e73118c843e97f75fafc94e5ff6da70ec8ba36ae255f8c96e2626af6260121022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1affffffffd92a0a10ac6d144b36033916f67ae79889f40f35096629a5cd87be1a08f40ee7010000006b48304502210080cdad5c4770dfbeb760e215494c63cc30da843b8505e75e7bf9e8dad18568000220234c0b11c41bfbcdd50046c69059976aedabe17657fe43d809af71e9635678e20121022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1affffffff030000000000000000c35403a0860101284ca402ed292b8620ad3b72361a5aeba5dffd333fb64750089d935a1ec974d6a91ef4f24ff6ba0000000000000000000000000000000000000000000000000000000001312d000202020202020202020202020202020202020202020202020202020202020202000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc440000000000000000000000009e032d4b0090a11dc40fe6c47601499a35d55fbb14ba8b71f3544b93e2f681f996da519a98ace0107ac20000000000000000c35403a0860101284ca402ed292b8620ad3b72361a5aeba5dffd333fb64750089d935a1ec974d6a91ef4f24ff6ba0000000000000000000000000000000000000000000000000000000001312d000101010101010101010101010101010101010101010101010101010101010101000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc440000000000000000000000009e032d4b0090a11dc40fe6c47601499a35d55fbb14ba8b71f3544b93e2f681f996da519a98ace0107ac2b8ea82d3010000001976a914783cf0be521101942da509846ea476e683aad83288ac735d855f").unwrap();
     let expected_secret = &[1; 32];
     let secret_hash = &*dhash160(expected_secret);
-    let actual = coin.extract_secret(secret_hash, &spend_tx);
+    let actual = block_on(coin.extract_secret(secret_hash, &spend_tx));
     assert_eq!(actual, Ok(expected_secret.to_vec()));
 }
 
@@ -421,7 +510,7 @@ fn test_generate_token_transfer_script_pubkey() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     let gas_limit = 2_500_000;
     let gas_price = 40;
@@ -470,7 +559,7 @@ fn test_transfer_details_by_hash() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     let tx_hash_bytes = hex::decode("85ede12ccc12fb1709c4d9e403e96c0c394b0916f2f6098d41d8dfa00013fcdb").unwrap();
     let tx_hash: H256Json = tx_hash_bytes.as_slice().into();
     let tx_hex:BytesJson = hex::decode("0100000001426d27fde82e12e1ce84e73ca41e2a30420f4c94aaa37b30d4c5b8b4f762c042040000006a473044022032665891693ee732571cefaa6d322ec5114c78259f2adbe03a0d7e6b65fbf40d022035c9319ca41e5423e09a8a613ac749a20b8f5ad6ba4ad6bb60e4a020b085d009012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff050000000000000000625403a08601012844095ea7b30000000000000000000000001549128bbfb33b997949b4105b6a6371c998e212000000000000000000000000000000000000000000000000000000000000000014d362e096e873eb7907e205fadc6175c6fec7bc44c20000000000000000625403a08601012844095ea7b30000000000000000000000001549128bbfb33b997949b4105b6a6371c998e21200000000000000000000000000000000000000000000000000000000000927c014d362e096e873eb7907e205fadc6175c6fec7bc44c20000000000000000835403a0860101284c640c565ae300000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc440000000000000000000000000000000000000000000000000000000000000000141549128bbfb33b997949b4105b6a6371c998e212c20000000000000000835403a0860101284c640c565ae300000000000000000000000000000000000000000000000000000000000493e0000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc440000000000000000000000000000000000000000000000000000000000000001141549128bbfb33b997949b4105b6a6371c998e212c231754b04000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acf7cd8b5f").unwrap().into();
@@ -511,6 +600,7 @@ fn test_transfer_details_by_hash() {
         .into(),
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     };
     assert_eq!(actual, expected);
 
@@ -535,6 +625,7 @@ fn test_transfer_details_by_hash() {
         .into(),
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     };
     assert_eq!(actual, expected);
 
@@ -559,6 +650,7 @@ fn test_transfer_details_by_hash() {
         .into(),
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     };
     assert_eq!(actual, expected);
 
@@ -583,6 +675,7 @@ fn test_transfer_details_by_hash() {
         .into(),
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     };
     assert_eq!(actual, expected);
 
@@ -607,6 +700,7 @@ fn test_transfer_details_by_hash() {
         .into(),
         kmd_rewards: None,
         transaction_type: Default::default(),
+        memo: None,
     };
     assert_eq!(actual, expected);
     assert!(it.next().is_none());
@@ -619,7 +713,7 @@ fn test_get_trade_fee() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
 
@@ -646,7 +740,7 @@ fn test_sender_trade_preimage_zero_allowance() {
         222, 243, 64, 156, 9, 153, 78, 253, 85, 119, 62, 117, 230, 140, 75, 69, 171, 21, 243, 19, 119, 29, 97, 174, 63,
         231, 153, 202, 20, 238, 120, 64,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
 
@@ -682,7 +776,7 @@ fn test_sender_trade_preimage_with_allowance() {
         32, 192, 195, 65, 165, 53, 21, 68, 180, 241, 67, 147, 54, 54, 41, 117, 174, 253, 139, 155, 56, 101, 69, 39, 32,
         143, 221, 19, 47, 74, 175, 100,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
 
@@ -753,17 +847,17 @@ fn test_get_sender_trade_fee_preimage_for_correct_ticker() {
         "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     });
 
-    let contract_address = "0xd362e096e873eb7907e205fadc6175c6fec7bc44".into();
+    let contract_address = H160::from_str("0xd362e096e873eb7907e205fadc6175c6fec7bc44").unwrap();
     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(
+    let coin = block_on(qrc20_coin_with_priv_key(
         &ctx,
         "QRC20",
         "tQTUM",
         &conf,
         &params,
-        &priv_key,
+        Secp256k1Secret::from(priv_key),
         contract_address,
     ))
     .unwrap();
@@ -790,12 +884,12 @@ fn test_receiver_trade_preimage() {
         32, 192, 195, 65, 165, 53, 21, 68, 180, 241, 67, 147, 54, 54, 41, 117, 174, 253, 139, 155, 56, 101, 69, 39, 32,
         143, 221, 19, 47, 74, 175, 100,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
 
     let actual = coin
-        .get_receiver_trade_fee(FeeApproxStage::WithoutApprox)
+        .get_receiver_trade_fee(Default::default(), FeeApproxStage::WithoutApprox)
         .wait()
         .expect("!get_receiver_trade_fee");
     // only one contract call should be included into the expected trade fee
@@ -817,7 +911,7 @@ fn test_taker_fee_tx_fee() {
         32, 192, 195, 65, 165, 53, 21, 68, 180, 241, 67, 147, 54, 54, 41, 117, 174, 253, 139, 155, 56, 101, 69, 39, 32,
         143, 221, 19, 47, 74, 175, 100,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
     // check if the coin's tx fee is expected
     check_tx_fee(&coin, ActualTxFee::FixedPerKb(EXPECTED_TX_FEE as u64));
     let expected_balance = CoinBalance {
@@ -861,17 +955,17 @@ fn test_coin_from_conf_without_decimals() {
         "swap_contract_address": "0xba8b71f3544b93e2f681f996da519a98ace0107a",
     });
     // 0459c999c3edf05e73c83f3fbae9f0f020919f91 has 12 decimals instead of standard 8
-    let contract_address = "0x0459c999c3edf05e73c83f3fbae9f0f020919f91".into();
+    let contract_address = H160::from_str("0x0459c999c3edf05e73c83f3fbae9f0f020919f91").unwrap();
     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(
+    let coin = block_on(qrc20_coin_with_priv_key(
         &ctx,
         "QRC20",
         "QTUM",
         &conf,
         &params,
-        &priv_key,
+        Secp256k1Secret::from(priv_key),
         contract_address,
     ))
     .unwrap();
@@ -929,7 +1023,7 @@ fn test_validate_maker_payment_malicious() {
         24, 181, 194, 193, 18, 152, 142, 168, 71, 73, 70, 244, 9, 101, 92, 168, 243, 61, 132, 48, 25, 39, 103, 92, 29,
         17, 11, 29, 113, 235, 48, 70,
     ];
-    let (_ctx, coin) = qrc20_coin_for_test(&priv_key, None);
+    let (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     // Malicious tx 81540dc6abe59cf1e301a97a7e1c9b66d5f475da916faa3f0ef7ea896c0b3e5a
     let payment_tx = hex::decode("01000000010144e2b8b5e6da0666faf1db95075653ef49e2acaa8924e1ec595f6b89a6f715050000006a4730440220415adec5e24148db8e9654a6beda4b1af8aded596ab1cd8667af32187853e8f5022007a91d44ee13046194aafc07ca46ec44f770e75b41187acaa4e38e17d4eccb5d012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff030000000000000000625403a08601012844095ea7b300000000000000000000000085a4df739bbb2d247746bea611d5d365204725830000000000000000000000000000000000000000000000000000000005f5e10014d362e096e873eb7907e205fadc6175c6fec7bc44c20000000000000000e35403a0860101284cc49b415b2a0a1a8b4af2762154115ced87e2424b3cb940c0181cc3c850523702f1ec298fef0000000000000000000000000000000000000000000000000000000005f5e100000000000000000000000000d362e096e873eb7907e205fadc6175c6fec7bc44000000000000000000000000783cf0be521101942da509846ea476e683aad8324b6b2e5444c2639cc0fb7bcea5afba3f3cdce239000000000000000000000000000000000000000000000000000000000000000000000000000000005fa0fffb1485a4df739bbb2d247746bea611d5d36520472583c208535c01000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acc700a15f").unwrap();
@@ -940,6 +1034,7 @@ fn test_validate_maker_payment_malicious() {
 
     let input = ValidatePaymentInput {
         payment_tx,
+        time_lock_duration: 0,
         time_lock: 1604386811,
         secret_hash,
         amount,
@@ -953,14 +1048,20 @@ fn test_validate_maker_payment_malicious() {
         .validate_maker_payment(input)
         .wait()
         .err()
-        .expect("'erc20Payment' was called from another swap contract, expected an error");
+        .expect("'erc20Payment' was called from another swap contract, expected an error")
+        .into_inner();
     log!("error: {}", error);
-    assert!(error.contains("Unexpected amount 1000 in 'Transfer' event, expected 100000000"));
+    match error {
+        ValidatePaymentError::TxDeserializationError(err) => {
+            assert!(err.contains("Unexpected amount 1000 in 'Transfer' event, expected 100000000"))
+        },
+        _ => panic!("Expected `TxDeserializationError` unexpected amount, found {:?}", error),
+    }
 }
 
 #[test]
 fn test_negotiate_swap_contract_addr_no_fallback() {
-    let (_, coin) = qrc20_coin_for_test(&[1; 32], None);
+    let (_, coin) = qrc20_coin_for_test([1; 32], None);
 
     let input = None;
     let error = coin.negotiate_swap_contract_addr(input).unwrap_err().into_inner();
@@ -990,11 +1091,11 @@ fn test_negotiate_swap_contract_addr_has_fallback() {
     let fallback = "0x8500AFc0bc5214728082163326C2FF0C73f4a871";
     let fallback_addr = qtum::contract_addr_from_str(fallback).unwrap();
 
-    let (_, coin) = qrc20_coin_for_test(&[1; 32], Some(fallback));
+    let (_, coin) = qrc20_coin_for_test([1; 32], Some(fallback));
 
     let input = None;
     let result = coin.negotiate_swap_contract_addr(input).unwrap();
-    assert_eq!(Some(fallback_addr.to_vec().into()), result);
+    assert_eq!(Some(fallback_addr.0.to_vec().into()), result);
 
     let slice: &[u8] = &[1; 1];
     let error = coin.negotiate_swap_contract_addr(Some(slice)).unwrap_err().into_inner();
@@ -1016,7 +1117,7 @@ fn test_negotiate_swap_contract_addr_has_fallback() {
 
     let slice: &[u8] = fallback_addr.as_ref();
     let result = coin.negotiate_swap_contract_addr(Some(slice)).unwrap();
-    assert_eq!(Some(fallback_addr.to_vec().into()), result);
+    assert_eq!(Some(fallback_addr.0.to_vec().into()), result);
 }
 
 #[test]
@@ -1025,7 +1126,7 @@ fn test_send_contract_calls_recoverable_tx() {
         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 (_ctx, coin) = qrc20_coin_for_test(priv_key, None);
 
     let tx = TransactionEnum::UtxoTx("010000000160fd74b5714172f285db2b36f0b391cd6883e7291441631c8b18f165b0a4635d020000006a47304402205d409e141111adbc4f185ae856997730de935ac30a0d2b1ccb5a6c4903db8171022024fc59bbcfdbba283556d7eeee4832167301dc8e8ad9739b7865f67b9676b226012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff020000000000000000625403a08601012844a9059cbb000000000000000000000000ca1e04745e8ca0c60d8c5881531d51bec470743f00000000000000000000000000000000000000000000000000000000000f424014d362e096e873eb7907e205fadc6175c6fec7bc44c200ada205000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acfe967d5f".into());
 
diff --git a/mm2src/coins/qrc20/script_pubkey.rs b/mm2src/coins/qrc20/script_pubkey.rs
index 2cbb4bba9e..08abad3024 100644
--- a/mm2src/coins/qrc20/script_pubkey.rs
+++ b/mm2src/coins/qrc20/script_pubkey.rs
@@ -104,7 +104,7 @@ pub fn extract_contract_addr_from_script(script: &Script) -> Result<H160, String
         _ => return ERR!("Unexpected instruction's opcode {}", instruction.opcode),
     }
 
-    Ok(instruction.data.ok_or(ERRL!("An empty contract call data"))?.into())
+    instruction.data.try_to_address()
 }
 
 /// Serialize the `number` similar to BigEndian but in QRC20 specific format.
diff --git a/mm2src/coins/qrc20/swap.rs b/mm2src/coins/qrc20/swap.rs
index 098ddd8ab9..39803f4046 100644
--- a/mm2src/coins/qrc20/swap.rs
+++ b/mm2src/coins/qrc20/swap.rs
@@ -1,5 +1,7 @@
 use super::history::TransferHistoryBuilder;
 use super::*;
+use crate::eth::decode_contract_call;
+use bitcrypto::ripemd160;
 use script_pubkey::{extract_contract_addr_from_script, extract_contract_call_from_script, is_contract_call};
 
 /// `erc20Payment` call details consist of values obtained from [`TransactionOutput::script_pubkey`] and [`TxReceipt::logs`].
@@ -38,6 +40,12 @@ impl Qrc20Coin {
         receiver_addr: H160,
         swap_contract_address: H160,
     ) -> Result<TransactionEnum, TransactionErr> {
+        let secret_hash = if secret_hash.len() == 32 {
+            ripemd160(&secret_hash).to_vec()
+        } else {
+            secret_hash
+        };
+
         let balance = try_tx_s!(self.my_spendable_balance().compat().await);
         let balance = try_tx_s!(wei_from_big_decimal(&balance, self.utxo.decimals));
 
@@ -113,46 +121,54 @@ impl Qrc20Coin {
         secret_hash: Vec<u8>,
         amount: BigDecimal,
         expected_swap_contract_address: H160,
-    ) -> Result<(), String> {
+    ) -> Result<(), MmError<ValidatePaymentError>> {
         let expected_swap_id = qrc20_swap_id(time_lock, &secret_hash);
-        let status = try_s!(
-            self.payment_status(&expected_swap_contract_address, expected_swap_id.clone())
-                .await
-        );
+        let status = self
+            .payment_status(&expected_swap_contract_address, expected_swap_id.clone())
+            .await?;
         if status != eth::PAYMENT_STATE_SENT.into() {
-            return ERR!("Payment state is not PAYMENT_STATE_SENT, got {}", status);
+            return MmError::err(ValidatePaymentError::UnexpectedPaymentState(format!(
+                "Payment state is not PAYMENT_STATE_SENT, got {}",
+                status
+            )));
         }
 
         let expected_call_bytes = {
-            let expected_value = try_s!(wei_from_big_decimal(&amount, self.utxo.decimals));
-            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(
+            let expected_value = wei_from_big_decimal(&amount, self.utxo.decimals)?;
+            let my_address = self.utxo.derivation_method.single_addr_or_err()?.clone();
+            let expected_receiver = qtum::contract_addr_from_utxo_addr(my_address)
+                .mm_err(|err| ValidatePaymentError::InternalError(err.to_string()))?;
+            self.erc20_payment_call_bytes(
                 expected_swap_id,
                 expected_value,
                 time_lock,
                 &secret_hash,
-                expected_receiver
-            ))
+                expected_receiver,
+            )?
         };
-
-        let erc20_payment = try_s!(self.erc20_payment_details_from_tx(&payment_tx).await);
+        let erc20_payment = self
+            .erc20_payment_details_from_tx(&payment_tx)
+            .await
+            .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
         if erc20_payment.contract_call_bytes != expected_call_bytes {
-            return ERR!(
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
                 "Unexpected 'erc20Payment' contract call bytes: {:?}",
                 erc20_payment.contract_call_bytes
-            );
+            )));
         }
 
         if sender != erc20_payment.sender {
-            return ERR!("Payment tx was sent from wrong address, expected {:?}", sender);
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                "Payment tx {:?} was sent from wrong address, expected {:?}",
+                erc20_payment.sender, sender
+            )));
         }
 
         if expected_swap_contract_address != erc20_payment.swap_contract_address {
-            return ERR!(
-                "Payment tx was sent to wrong address, expected {:?}",
-                expected_swap_contract_address
-            );
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                "Payment tx receiver arg {:?} is invalid, expected {:?}",
+                erc20_payment.swap_contract_address, expected_swap_contract_address,
+            )));
         }
 
         Ok(())
@@ -247,7 +263,7 @@ impl Qrc20Coin {
         }
 
         // Else try to find a 'senderRefund' contract call.
-        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err()).clone();
+        let my_address = try_s!(self.utxo.derivation_method.single_addr_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| {
@@ -271,7 +287,7 @@ impl Qrc20Coin {
             return Ok(None);
         };
 
-        let my_address = try_s!(self.utxo.derivation_method.iguana_or_err()).clone();
+        let my_address = try_s!(self.utxo.derivation_method.single_addr_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
@@ -282,6 +298,12 @@ impl Qrc20Coin {
     }
 
     pub fn extract_secret_impl(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+        let secret_hash = if secret_hash.len() == 32 {
+            ripemd160(secret_hash)
+        } else {
+            chain::hash::H160::from(secret_hash)
+        };
+
         let spend_tx: UtxoTx = try_s!(deserialize(spend_tx).map_err(|e| ERRL!("{:?}", e)));
         let spend_tx_hash: H256Json = spend_tx.hash().reversed().into();
         for output in spend_tx.outputs {
@@ -296,7 +318,7 @@ impl Qrc20Coin {
                     },
                 };
 
-            let actual_secret_hash = &*dhash160(&secret);
+            let actual_secret_hash = dhash160(&secret);
             if actual_secret_hash != secret_hash {
                 warn!(
                     "invalid 'dhash160(secret)' {:?}, expected {:?}",
@@ -316,6 +338,7 @@ impl Qrc20Coin {
         tx: UtxoTx,
         wait_until: u64,
         from_block: u64,
+        check_every: f64,
     ) -> Result<TransactionEnum, String> {
         let Erc20PaymentDetails {
             swap_id,
@@ -339,7 +362,7 @@ impl Qrc20Coin {
             if now_ms() / 1000 > wait_until {
                 return ERR!("Waited too long until {} for {:?} to be spent ", wait_until, tx);
             }
-            Timer::sleep(10.).await;
+            Timer::sleep(check_every).await;
         }
     }
 
@@ -436,7 +459,7 @@ impl Qrc20Coin {
         let my_address = self
             .utxo
             .derivation_method
-            .iguana_or_err()
+            .single_addr_or_err()
             .mm_err(|e| UtxoRpcError::Internal(e.to_string()))?;
         let tokens = self
             .utxo
@@ -466,26 +489,28 @@ impl Qrc20Coin {
 
     /// Get payment status by `swap_id`.
     /// Do not use self swap_contract_address, because it could be updated during restart.
-    async fn payment_status(&self, swap_contract_address: &H160, swap_id: Vec<u8>) -> Result<U256, String> {
-        let decoded = try_s!(
-            self.utxo
-                .rpc_client
-                .rpc_contract_call(ViewContractCallType::Payments, swap_contract_address, &[
-                    Token::FixedBytes(swap_id)
-                ])
-                .compat()
-                .await
-        );
+    async fn payment_status(&self, swap_contract_address: &H160, swap_id: Vec<u8>) -> MmResult<U256, UtxoRpcError> {
+        let decoded = self
+            .utxo
+            .rpc_client
+            .rpc_contract_call(ViewContractCallType::Payments, swap_contract_address, &[
+                Token::FixedBytes(swap_id),
+            ])
+            .compat()
+            .await?;
         if decoded.len() < 3 {
-            return ERR!(
+            return MmError::err(UtxoRpcError::InvalidResponse(format!(
                 "Expected at least 3 tokens in \"payments\" call, found {}",
                 decoded.len()
-            );
+            )));
         }
 
         match decoded[2] {
             Token::Uint(state) => Ok(state),
-            _ => ERR!("Payment status must be uint, got {:?}", decoded[2]),
+            _ => MmError::err(UtxoRpcError::InvalidResponse(format!(
+                "Payment status must be uint, got {:?}",
+                decoded[2]
+            ))),
         }
     }
 
@@ -497,7 +522,8 @@ impl Qrc20Coin {
         let gas_limit = QRC20_GAS_LIMIT_DEFAULT;
         let gas_price = QRC20_GAS_PRICE_DEFAULT;
         let script_pubkey =
-            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, &self.contract_address)?.to_bytes();
+            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, self.contract_address.as_bytes())?
+                .to_bytes();
 
         Ok(ContractCallOutput {
             value: OUTPUT_QTUM_AMOUNT,
@@ -525,7 +551,7 @@ impl Qrc20Coin {
             &params, // params of the function
             gas_limit,
             gas_price,
-            swap_contract_address, // address of the contract which function will be called
+            swap_contract_address.as_bytes(), // address of the contract which function will be called
         )?
         .to_bytes();
 
@@ -580,7 +606,7 @@ impl Qrc20Coin {
             &params, // params of the function
             gas_limit,
             gas_price,
-            swap_contract_address, // address of the contract which function will be called
+            swap_contract_address.as_bytes(), // address of the contract which function will be called
         )?
         .to_bytes();
 
@@ -616,7 +642,7 @@ impl Qrc20Coin {
             &params, // params of the function
             gas_limit,
             gas_price,
-            swap_contract_address, // address of the contract which function will be called
+            swap_contract_address.as_bytes(), // address of the contract which function will be called
         )?
         .to_bytes();
 
@@ -655,7 +681,7 @@ impl Qrc20Coin {
             try_s!(check_if_contract_call_completed(&receipt));
 
             let function = try_s!(eth::SWAP_CONTRACT.function("erc20Payment"));
-            let decoded = try_s!(function.decode_input(&contract_call_bytes));
+            let decoded = try_s!(decode_contract_call(function, &contract_call_bytes));
 
             let mut decoded = decoded.into_iter();
 
@@ -844,7 +870,7 @@ fn transfer_call_details_from_script_pubkey(script_pubkey: &Script) -> Result<(H
     }
 
     let function = try_s!(eth::ERC20_CONTRACT.function("transfer"));
-    let decoded = try_s!(function.decode_input(&contract_call_bytes));
+    let decoded = try_s!(decode_contract_call(function, &contract_call_bytes));
     let mut decoded = decoded.into_iter();
 
     let receiver = match decoded.next() {
@@ -876,7 +902,7 @@ pub fn receiver_spend_call_details_from_script_pubkey(script_pubkey: &Script) ->
     }
 
     let function = try_s!(eth::SWAP_CONTRACT.function("receiverSpend"));
-    let decoded = try_s!(function.decode_input(&contract_call_bytes));
+    let decoded = try_s!(decode_contract_call(function, &contract_call_bytes));
     let mut decoded = decoded.into_iter();
 
     let swap_id = match decoded.next() {
@@ -923,6 +949,12 @@ fn find_receiver_spend_with_swap_id_and_secret_hash(
     expected_swap_id: &[u8],
     expected_secret_hash: &[u8],
 ) -> Option<usize> {
+    let expected_secret_hash = if expected_secret_hash.len() == 32 {
+        ripemd160(expected_secret_hash)
+    } else {
+        chain::hash::H160::from(expected_secret_hash)
+    };
+
     for (output_idx, output) in tx.outputs.iter().enumerate() {
         let script_pubkey: Script = output.script_pubkey.clone().into();
         let ReceiverSpendDetails { swap_id, secret, .. } =
@@ -938,7 +970,7 @@ fn find_receiver_spend_with_swap_id_and_secret_hash(
             continue;
         }
 
-        let secret_hash = &*dhash160(&secret);
+        let secret_hash = dhash160(&secret);
         if secret_hash != expected_secret_hash {
             warn!(
                 "invalid 'dhash160(secret)' {:?}, expected {:?}",
@@ -988,7 +1020,7 @@ fn find_swap_contract_call_with_swap_id(
         }
 
         let function = call_type.as_function();
-        let decoded = match function.decode_input(&contract_call_bytes) {
+        let decoded = match decode_contract_call(function, &contract_call_bytes) {
             Ok(d) => d,
             Err(e) => {
                 error!("{}", e);
diff --git a/mm2src/coins/rpc_command/get_current_mtp.rs b/mm2src/coins/rpc_command/get_current_mtp.rs
new file mode 100644
index 0000000000..24b4f563b9
--- /dev/null
+++ b/mm2src/coins/rpc_command/get_current_mtp.rs
@@ -0,0 +1,72 @@
+use common::{HttpStatusCode, StatusCode};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::MmError;
+
+use crate::{lp_coinfind_or_err,
+            utxo::{rpc_clients::UtxoRpcError, UtxoCommonOps},
+            CoinFindError, MmCoinEnum};
+
+pub type GetCurrentMtpRpcResult<T> = Result<T, MmError<GetCurrentMtpError>>;
+
+#[derive(Deserialize)]
+pub struct GetCurrentMtpRequest {
+    coin: String,
+}
+
+#[derive(Serialize)]
+pub struct GetCurrentMtpResponse {
+    mtp: u32,
+}
+
+#[derive(Serialize, Display, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetCurrentMtpError {
+    NoSuchCoin(String),
+    #[display(fmt = "Requested coin: {}; is not supported for this action.", _0)]
+    NotSupportedCoin(String),
+    RpcError(String),
+}
+
+impl HttpStatusCode for GetCurrentMtpError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetCurrentMtpError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+            GetCurrentMtpError::NotSupportedCoin(_) => StatusCode::BAD_REQUEST,
+            GetCurrentMtpError::RpcError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<UtxoRpcError> for GetCurrentMtpError {
+    fn from(err: UtxoRpcError) -> Self { Self::RpcError(err.to_string()) }
+}
+
+impl From<CoinFindError> for GetCurrentMtpError {
+    fn from(err: CoinFindError) -> Self { Self::NoSuchCoin(err.to_string()) }
+}
+
+pub async fn get_current_mtp_rpc(
+    ctx: MmArc,
+    req: GetCurrentMtpRequest,
+) -> GetCurrentMtpRpcResult<GetCurrentMtpResponse> {
+    match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::UtxoCoin(utxo) => Ok(GetCurrentMtpResponse {
+            mtp: utxo.get_current_mtp().await?,
+        }),
+        MmCoinEnum::QtumCoin(qtum) => Ok(GetCurrentMtpResponse {
+            mtp: qtum.get_current_mtp().await?,
+        }),
+        MmCoinEnum::Qrc20Coin(qrc) => Ok(GetCurrentMtpResponse {
+            mtp: qrc.get_current_mtp().await?,
+        }),
+        #[cfg(not(target_arch = "wasm32"))]
+        MmCoinEnum::ZCoin(zcoin) => Ok(GetCurrentMtpResponse {
+            mtp: zcoin.get_current_mtp().await?,
+        }),
+        MmCoinEnum::Bch(bch) => Ok(GetCurrentMtpResponse {
+            mtp: bch.get_current_mtp().await?,
+        }),
+        _ => Err(MmError::new(GetCurrentMtpError::NotSupportedCoin(req.coin))),
+    }
+}
diff --git a/mm2src/coins/rpc_command/get_enabled_coins.rs b/mm2src/coins/rpc_command/get_enabled_coins.rs
new file mode 100644
index 0000000000..9390dd0fe5
--- /dev/null
+++ b/mm2src/coins/rpc_command/get_enabled_coins.rs
@@ -0,0 +1,48 @@
+use crate::CoinsContext;
+use common::HttpStatusCode;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::MmResult;
+use mm2_err_handle::prelude::*;
+
+#[derive(Serialize, Display, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetEnabledCoinsError {
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl HttpStatusCode for GetEnabledCoinsError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetEnabledCoinsError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct GetEnabledCoinsRequest;
+
+#[derive(Serialize)]
+pub struct GetEnabledCoinsResponse {
+    coins: Vec<EnabledCoin>,
+}
+
+#[derive(Serialize)]
+pub struct EnabledCoin {
+    ticker: String,
+}
+
+pub async fn get_enabled_coins(
+    ctx: MmArc,
+    _req: GetEnabledCoinsRequest,
+) -> MmResult<GetEnabledCoinsResponse, GetEnabledCoinsError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(GetEnabledCoinsError::Internal)?;
+    let coins_map = coins_ctx.coins.lock().await;
+
+    let coins = coins_map
+        .iter()
+        .map(|(ticker, _coin)| EnabledCoin { ticker: ticker.clone() })
+        .collect();
+    Ok(GetEnabledCoinsResponse { coins })
+}
diff --git a/mm2src/coins/rpc_command/get_new_address.rs b/mm2src/coins/rpc_command/get_new_address.rs
new file mode 100644
index 0000000000..54263226e6
--- /dev/null
+++ b/mm2src/coins/rpc_command/get_new_address.rs
@@ -0,0 +1,517 @@
+use crate::coin_balance::HDAddressBalance;
+use crate::hd_confirm_address::{ConfirmAddressStatus, HDConfirmAddress, HDConfirmAddressError, RpcTaskConfirmAddress};
+use crate::hd_wallet::{AddressDerivingError, InvalidBip44ChainError, NewAddressDeriveConfirmError,
+                       NewAddressDerivingError};
+use crate::{lp_coinfind_or_err, BalanceError, CoinFindError, CoinsContext, MmCoinEnum, UnexpectedDerivationMethod};
+use async_trait::async_trait;
+use common::{HttpStatusCode, SuccessResponse};
+use crypto::hw_rpc_task::{HwConnectStatuses, HwRpcTaskAwaitingStatus, HwRpcTaskUserAction, HwRpcTaskUserActionRequest};
+use crypto::{from_hw_error, Bip44Chain, HwError, HwRpcError, WithHwRpcError};
+use derive_more::Display;
+use enum_from::EnumFromTrait;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest, RpcTaskUserActionError};
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use std::time::Duration;
+
+pub type GetNewAddressUserAction = HwRpcTaskUserAction;
+pub type GetNewAddressAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type GetNewAddressTaskManager = RpcTaskManager<InitGetNewAddressTask>;
+pub type GetNewAddressTaskManagerShared = RpcTaskManagerShared<InitGetNewAddressTask>;
+pub type GetNewAddressTaskHandle = RpcTaskHandle<InitGetNewAddressTask>;
+pub type GetNewAddressRpcTaskStatus = RpcTaskStatus<
+    GetNewAddressResponse,
+    GetNewAddressRpcError,
+    GetNewAddressInProgressStatus,
+    GetNewAddressAwaitingStatus,
+>;
+
+#[derive(Clone, Debug, Display, EnumFromTrait, PartialEq, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetNewAddressRpcError {
+    #[display(fmt = "Hardware Wallet context is not initialized")]
+    HwContextNotInitialized,
+    #[display(fmt = "No such coin {coin}")]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "RPC 'task' is awaiting '{expected}' user action")]
+    UnexpectedUserAction { expected: String },
+    #[display(fmt = "Coin is expected to be activated with the HD wallet derivation method")]
+    CoinIsActivatedNotWithHDWallet,
+    #[display(fmt = "HD account '{account_id}' is not activated")]
+    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 = "Addresses limit reached. Max number of addresses: {max_addresses_number}")]
+    AddressLimitReached { max_addresses_number: u32 },
+    #[display(fmt = "Empty addresses limit reached. Gap limit: {gap_limit}")]
+    EmptyAddressesLimitReached { gap_limit: u32 },
+    #[display(fmt = "Electrum/Native RPC invalid response: {_0}")]
+    RpcInvalidResponse(String),
+    #[display(fmt = "HD wallet storage error: {_0}")]
+    WalletStorageError(String),
+    #[from_trait(WithTimeout::timeout)]
+    #[display(fmt = "RPC timed out {_0:?}")]
+    Timeout(Duration),
+    #[from_trait(WithHwRpcError::hw_rpc_error)]
+    HwError(HwRpcError),
+    #[display(fmt = "Transport: {_0}")]
+    Transport(String),
+    #[from_trait(WithInternal::internal)]
+    #[display(fmt = "Internal: {_0}")]
+    Internal(String),
+}
+
+impl From<BalanceError> for GetNewAddressRpcError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(transport) => GetNewAddressRpcError::Transport(transport),
+            BalanceError::InvalidResponse(rpc) => GetNewAddressRpcError::RpcInvalidResponse(rpc),
+            BalanceError::UnexpectedDerivationMethod(der_path) => GetNewAddressRpcError::from(der_path),
+            BalanceError::WalletStorageError(internal) | BalanceError::Internal(internal) => {
+                GetNewAddressRpcError::Internal(internal)
+            },
+        }
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for GetNewAddressRpcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        match e {
+            UnexpectedDerivationMethod::ExpectedHDWallet => GetNewAddressRpcError::CoinIsActivatedNotWithHDWallet,
+            unexpected_error => GetNewAddressRpcError::Internal(unexpected_error.to_string()),
+        }
+    }
+}
+
+impl From<CoinFindError> for GetNewAddressRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => GetNewAddressRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<InvalidBip44ChainError> for GetNewAddressRpcError {
+    fn from(e: InvalidBip44ChainError) -> Self { GetNewAddressRpcError::InvalidBip44Chain { chain: e.chain } }
+}
+
+impl From<NewAddressDerivingError> for GetNewAddressRpcError {
+    fn from(e: NewAddressDerivingError) -> Self {
+        match e {
+            NewAddressDerivingError::AddressLimitReached { max_addresses_number } => {
+                GetNewAddressRpcError::AddressLimitReached { max_addresses_number }
+            },
+            NewAddressDerivingError::InvalidBip44Chain { chain } => GetNewAddressRpcError::InvalidBip44Chain { chain },
+            NewAddressDerivingError::Bip32Error(bip32) => GetNewAddressRpcError::Internal(bip32.to_string()),
+            NewAddressDerivingError::WalletStorageError(storage) => {
+                GetNewAddressRpcError::WalletStorageError(storage.to_string())
+            },
+            NewAddressDerivingError::Internal(internal) => GetNewAddressRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<AddressDerivingError> for GetNewAddressRpcError {
+    fn from(e: AddressDerivingError) -> Self {
+        match e {
+            AddressDerivingError::InvalidBip44Chain { chain } => GetNewAddressRpcError::InvalidBip44Chain { chain },
+            AddressDerivingError::Bip32Error(bip32) => GetNewAddressRpcError::ErrorDerivingAddress(bip32.to_string()),
+            AddressDerivingError::Internal(internal) => GetNewAddressRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<NewAddressDeriveConfirmError> for GetNewAddressRpcError {
+    fn from(e: NewAddressDeriveConfirmError) -> Self {
+        match e {
+            NewAddressDeriveConfirmError::DeriveError(derive) => GetNewAddressRpcError::from(derive),
+            NewAddressDeriveConfirmError::ConfirmError(confirm) => GetNewAddressRpcError::from(confirm),
+        }
+    }
+}
+
+impl From<HDConfirmAddressError> for GetNewAddressRpcError {
+    fn from(e: HDConfirmAddressError) -> Self {
+        match e {
+            HDConfirmAddressError::HwContextNotInitialized => GetNewAddressRpcError::HwContextNotInitialized,
+            HDConfirmAddressError::RpcTaskError(rpc) => GetNewAddressRpcError::from(rpc),
+            HDConfirmAddressError::HardwareWalletError(hw) => GetNewAddressRpcError::from(hw),
+            HDConfirmAddressError::InvalidAddress { expected, found } => GetNewAddressRpcError::Internal(format!(
+                "Confirmation address mismatched: expected '{expected}, found '{found}''"
+            )),
+            HDConfirmAddressError::Internal(internal) => GetNewAddressRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<HwError> for GetNewAddressRpcError {
+    fn from(e: HwError) -> Self { from_hw_error(e) }
+}
+
+impl From<RpcTaskError> for GetNewAddressRpcError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Cancelled => GetNewAddressRpcError::Internal("Cancelled".to_owned()),
+            RpcTaskError::Timeout(timeout) => GetNewAddressRpcError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                GetNewAddressRpcError::Internal(error)
+            },
+            RpcTaskError::UnexpectedUserAction { expected } => GetNewAddressRpcError::UnexpectedUserAction { expected },
+            RpcTaskError::Internal(internal) => GetNewAddressRpcError::Internal(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for GetNewAddressRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetNewAddressRpcError::HwContextNotInitialized
+            | GetNewAddressRpcError::NoSuchCoin { .. }
+            | GetNewAddressRpcError::UnexpectedUserAction { .. }
+            | GetNewAddressRpcError::CoinIsActivatedNotWithHDWallet
+            | GetNewAddressRpcError::UnknownAccount { .. }
+            | GetNewAddressRpcError::InvalidBip44Chain { .. }
+            | GetNewAddressRpcError::ErrorDerivingAddress(_)
+            | GetNewAddressRpcError::AddressLimitReached { .. }
+            | GetNewAddressRpcError::EmptyAddressesLimitReached { .. } => StatusCode::BAD_REQUEST,
+            GetNewAddressRpcError::Transport(_)
+            | GetNewAddressRpcError::RpcInvalidResponse(_)
+            | GetNewAddressRpcError::WalletStorageError(_)
+            | GetNewAddressRpcError::HwError(_)
+            | GetNewAddressRpcError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            GetNewAddressRpcError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct GetNewAddressRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: GetNewAddressParams,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct GetNewAddressParams {
+    pub(crate) account_id: u32,
+    pub(crate) chain: Option<Bip44Chain>,
+    // The max number of empty addresses in a row.
+    // If there are more or equal to the `gap_limit` last empty addresses in a row,
+    // we'll not allow to generate new address.
+    pub(crate) gap_limit: Option<u32>,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct GetNewAddressResponse {
+    new_address: HDAddressBalance,
+}
+
+#[derive(Clone, Serialize)]
+pub enum GetNewAddressInProgressStatus {
+    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,
+    FollowHwDeviceInstructions,
+    ConfirmAddress {
+        expected_address: String,
+    },
+}
+
+impl ConfirmAddressStatus for GetNewAddressInProgressStatus {
+    fn confirm_addr_status(expected_address: String) -> Self {
+        GetNewAddressInProgressStatus::ConfirmAddress { expected_address }
+    }
+}
+
+#[async_trait]
+pub trait GetNewAddressRpcOps {
+    /// Generates a new address.
+    /// TODO remove once GUI integrates `task::get_new_address::init`.
+    async fn get_new_address_rpc_without_conf(
+        &self,
+        params: GetNewAddressParams,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>;
+
+    /// Generates and asks the user to confirm a new address.
+    async fn get_new_address_rpc<ConfirmAddress>(
+        &self,
+        params: GetNewAddressParams,
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+    where
+        ConfirmAddress: HDConfirmAddress;
+}
+
+pub struct InitGetNewAddressTask {
+    ctx: MmArc,
+    coin: MmCoinEnum,
+    req: GetNewAddressRequest,
+}
+
+impl RpcTaskTypes for InitGetNewAddressTask {
+    type Item = GetNewAddressResponse;
+    type Error = GetNewAddressRpcError;
+    type InProgressStatus = GetNewAddressInProgressStatus;
+    type AwaitingStatus = GetNewAddressAwaitingStatus;
+    type UserAction = GetNewAddressUserAction;
+}
+
+#[async_trait]
+impl RpcTask for InitGetNewAddressTask {
+    fn initial_status(&self) -> Self::InProgressStatus { GetNewAddressInProgressStatus::Preparing }
+
+    // Do nothing if the task has been cancelled.
+    async fn cancel(self) {}
+
+    async fn run(&mut self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>> {
+        async fn get_new_address_helper<Coin>(
+            ctx: &MmArc,
+            coin: &Coin,
+            params: GetNewAddressParams,
+            task_handle: &GetNewAddressTaskHandle,
+        ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+        where
+            Coin: GetNewAddressRpcOps + Send + Sync,
+        {
+            let hw_statuses = HwConnectStatuses {
+                on_connect: GetNewAddressInProgressStatus::WaitingForTrezorToConnect,
+                on_connected: GetNewAddressInProgressStatus::Preparing,
+                on_connection_failed: GetNewAddressInProgressStatus::Finishing,
+                on_button_request: GetNewAddressInProgressStatus::FollowHwDeviceInstructions,
+                on_pin_request: GetNewAddressAwaitingStatus::EnterTrezorPin,
+                on_passphrase_request: GetNewAddressAwaitingStatus::EnterTrezorPassphrase,
+                on_ready: GetNewAddressInProgressStatus::RequestingAccountBalance,
+            };
+            let confirm_address: RpcTaskConfirmAddress<'_, InitGetNewAddressTask> =
+                RpcTaskConfirmAddress::new(ctx, task_handle, hw_statuses)?;
+            coin.get_new_address_rpc(params, &confirm_address).await
+        }
+
+        match self.coin {
+            MmCoinEnum::UtxoCoin(ref utxo) => {
+                get_new_address_helper(&self.ctx, utxo, self.req.params.clone(), task_handle).await
+            },
+            MmCoinEnum::QtumCoin(ref qtum) => {
+                get_new_address_helper(&self.ctx, qtum, self.req.params.clone(), task_handle).await
+            },
+            _ => MmError::err(GetNewAddressRpcError::CoinIsActivatedNotWithHDWallet),
+        }
+    }
+}
+
+/// Generates a new address.
+/// TODO remove once GUI integrates `task::get_new_address::init`.
+pub async fn get_new_address(
+    ctx: MmArc,
+    req: GetNewAddressRequest,
+) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    match coin {
+        MmCoinEnum::UtxoCoin(utxo) => utxo.get_new_address_rpc_without_conf(req.params).await,
+        MmCoinEnum::QtumCoin(qtum) => qtum.get_new_address_rpc_without_conf(req.params).await,
+        _ => MmError::err(GetNewAddressRpcError::CoinIsActivatedNotWithHDWallet),
+    }
+}
+
+/// Generates a new address.
+/// TODO remove once GUI integrates `task::get_new_address::init`.
+pub async fn init_get_new_address(
+    ctx: MmArc,
+    req: GetNewAddressRequest,
+) -> MmResult<InitRpcTaskResponse, GetNewAddressRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(GetNewAddressRpcError::Internal)?;
+    let spawner = coin.spawner();
+    let task = InitGetNewAddressTask { ctx, coin, req };
+    let task_id = GetNewAddressTaskManager::spawn_rpc_task(&coins_ctx.get_new_address_manager, &spawner, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn init_get_new_address_status(
+    ctx: MmArc,
+    req: RpcTaskStatusRequest,
+) -> MmResult<GetNewAddressRpcTaskStatus, RpcTaskStatusError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .get_new_address_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_get_new_address_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
+        .get_new_address_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 async fn cancel_get_new_address(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .get_new_address_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
+pub(crate) mod common_impl {
+    use super::*;
+    use crate::coin_balance::{HDAddressBalanceScanner, HDWalletBalanceOps};
+    use crate::hd_wallet::{HDAccountOps, HDWalletCoinOps, HDWalletOps};
+    use crate::{CoinWithDerivationMethod, HDAddress};
+    use crypto::RpcDerivationPath;
+    use std::fmt;
+    use std::ops::DerefMut;
+
+    /// TODO remove once GUI integrates `task::get_new_address::init`.
+    pub async fn get_new_address_rpc_without_conf<Coin>(
+        coin: &Coin,
+        params: GetNewAddressParams,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+    where
+        Coin:
+            HDWalletBalanceOps + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + Sync + Send,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+    {
+        let hd_wallet = coin.derivation_method().hd_wallet_or_err()?;
+
+        let account_id = params.account_id;
+        let mut hd_account = hd_wallet
+            .get_account_mut(account_id)
+            .await
+            .or_mm_err(|| GetNewAddressRpcError::UnknownAccount { account_id })?;
+
+        let chain = params.chain.unwrap_or_else(|| hd_wallet.default_receiver_chain());
+        let gap_limit = params.gap_limit.unwrap_or_else(|| hd_wallet.gap_limit());
+
+        // Check if we can generate new address.
+        check_if_can_get_new_address(coin, hd_wallet, &hd_account, chain, gap_limit).await?;
+
+        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(GetNewAddressResponse {
+            new_address: HDAddressBalance {
+                address: address.to_string(),
+                derivation_path: RpcDerivationPath(derivation_path),
+                chain,
+                balance,
+            },
+        })
+    }
+
+    pub async fn get_new_address_rpc<'a, Coin, ConfirmAddress>(
+        coin: &Coin,
+        params: GetNewAddressParams,
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+    where
+        ConfirmAddress: HDConfirmAddress,
+        Coin:
+            HDWalletBalanceOps + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + Send + Sync,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+    {
+        let hd_wallet = coin.derivation_method().hd_wallet_or_err()?;
+
+        let account_id = params.account_id;
+        let mut hd_account = hd_wallet
+            .get_account_mut(account_id)
+            .await
+            .or_mm_err(|| GetNewAddressRpcError::UnknownAccount { account_id })?;
+
+        let chain = params.chain.unwrap_or_else(|| hd_wallet.default_receiver_chain());
+        let gap_limit = params.gap_limit.unwrap_or_else(|| hd_wallet.gap_limit());
+
+        // Check if we can generate new address.
+        check_if_can_get_new_address(coin, hd_wallet, &hd_account, chain, gap_limit).await?;
+
+        let HDAddress {
+            address,
+            derivation_path,
+            ..
+        } = coin
+            .generate_and_confirm_new_address(hd_wallet, &mut hd_account, chain, confirm_address)
+            .await?;
+
+        let balance = coin.known_address_balance(&address).await?;
+        Ok(GetNewAddressResponse {
+            new_address: HDAddressBalance {
+                address: address.to_string(),
+                derivation_path: RpcDerivationPath(derivation_path),
+                chain,
+                balance,
+            },
+        })
+    }
+
+    async fn check_if_can_get_new_address<Coin>(
+        coin: &Coin,
+        hd_wallet: &Coin::HDWallet,
+        hd_account: &Coin::HDAccount,
+        chain: Bip44Chain,
+        gap_limit: u32,
+    ) -> MmResult<(), GetNewAddressRpcError>
+    where
+        Coin: HDWalletBalanceOps + Sync,
+        <Coin as HDWalletCoinOps>::Address: fmt::Display,
+    {
+        let known_addresses_number = hd_account.known_addresses_number(chain)?;
+        if known_addresses_number == 0 || gap_limit > known_addresses_number {
+            return Ok(());
+        }
+
+        let max_addresses_number = hd_wallet.address_limit();
+        if known_addresses_number >= max_addresses_number {
+            return MmError::err(GetNewAddressRpcError::AddressLimitReached { max_addresses_number });
+        }
+
+        let address_scanner = coin.produce_hd_address_scanner().await?;
+
+        // Address IDs start from 0, so the `last_known_address_id = known_addresses_number - 1`.
+        // At this point we are sure that `known_addresses_number > 0`.
+        let last_address_id = known_addresses_number - 1;
+
+        for address_id in (0..=last_address_id).rev() {
+            let HDAddress { address, .. } = coin.derive_address(hd_account, chain, address_id).await?;
+            if address_scanner.is_address_used(&address).await? {
+                return Ok(());
+            }
+
+            let empty_addresses_number = last_address_id - address_id + 1;
+            if empty_addresses_number >= gap_limit {
+                // We already have `gap_limit` empty addresses.
+                return MmError::err(GetNewAddressRpcError::EmptyAddressesLimitReached { gap_limit });
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs b/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs
index 851d2b42d8..e929692285 100644
--- a/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs
+++ b/mm2src/coins/rpc_command/hd_account_balance_rpc_error.rs
@@ -60,7 +60,7 @@ impl From<CoinFindError> for HDAccountBalanceRpcError {
 impl From<UnexpectedDerivationMethod> for HDAccountBalanceRpcError {
     fn from(e: UnexpectedDerivationMethod) -> Self {
         match e {
-            UnexpectedDerivationMethod::HDWalletUnavailable => HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet,
+            UnexpectedDerivationMethod::ExpectedHDWallet => HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet,
             unexpected_error => HDAccountBalanceRpcError::Internal(unexpected_error.to_string()),
         }
     }
@@ -72,8 +72,7 @@ impl From<BalanceError> for HDAccountBalanceRpcError {
             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),
+            BalanceError::WalletStorageError(e) | BalanceError::Internal(e) => HDAccountBalanceRpcError::Internal(e),
         }
     }
 }
@@ -85,9 +84,11 @@ impl From<InvalidBip44ChainError> for HDAccountBalanceRpcError {
 impl From<AddressDerivingError> for HDAccountBalanceRpcError {
     fn from(e: AddressDerivingError) -> Self {
         match e {
+            AddressDerivingError::InvalidBip44Chain { chain } => HDAccountBalanceRpcError::InvalidBip44Chain { chain },
             AddressDerivingError::Bip32Error(bip32) => {
                 HDAccountBalanceRpcError::ErrorDerivingAddress(bip32.to_string())
             },
+            AddressDerivingError::Internal(internal) => HDAccountBalanceRpcError::Internal(internal),
         }
     }
 }
@@ -95,11 +96,12 @@ impl From<AddressDerivingError> for HDAccountBalanceRpcError {
 impl From<RpcTaskError> for HDAccountBalanceRpcError {
     fn from(e: RpcTaskError) -> Self {
         match e {
-            RpcTaskError::Canceled => HDAccountBalanceRpcError::Internal("Canceled".to_owned()),
+            RpcTaskError::Cancelled => HDAccountBalanceRpcError::Internal("Cancelled".to_owned()),
             RpcTaskError::Timeout(timeout) => HDAccountBalanceRpcError::Timeout(timeout),
-            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
-                HDAccountBalanceRpcError::Internal(e.to_string())
-            },
+            RpcTaskError::NoSuchTask(_)
+            // `UnexpectedTaskStatus` and `UnexpectedUserAction` are not expected at the balance request.
+            | RpcTaskError::UnexpectedTaskStatus { .. }
+            | RpcTaskError::UnexpectedUserAction { .. } => HDAccountBalanceRpcError::Internal(e.to_string()),
             RpcTaskError::Internal(internal) => HDAccountBalanceRpcError::Internal(internal),
         }
     }
diff --git a/mm2src/coins/rpc_command/init_account_balance.rs b/mm2src/coins/rpc_command/init_account_balance.rs
new file mode 100644
index 0000000000..3317acea67
--- /dev/null
+++ b/mm2src/coins/rpc_command/init_account_balance.rs
@@ -0,0 +1,155 @@
+use crate::coin_balance::HDAccountBalance;
+use crate::rpc_command::hd_account_balance_rpc_error::HDAccountBalanceRpcError;
+use crate::{lp_coinfind_or_err, CoinsContext, MmCoinEnum};
+use async_trait::async_trait;
+use common::{SerdeInfallible, SuccessResponse};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest};
+use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+
+pub type AccountBalanceUserAction = SerdeInfallible;
+pub type AccountBalanceAwaitingStatus = SerdeInfallible;
+pub type AccountBalanceTaskManager = RpcTaskManager<InitAccountBalanceTask>;
+pub type AccountBalanceTaskManagerShared = RpcTaskManagerShared<InitAccountBalanceTask>;
+pub type InitAccountBalanceTaskHandle = RpcTaskHandle<InitAccountBalanceTask>;
+pub type AccountBalanceRpcTaskStatus = RpcTaskStatus<
+    HDAccountBalance,
+    HDAccountBalanceRpcError,
+    AccountBalanceInProgressStatus,
+    AccountBalanceAwaitingStatus,
+>;
+
+#[derive(Clone, Serialize)]
+pub enum AccountBalanceInProgressStatus {
+    RequestingAccountBalance,
+}
+
+#[derive(Deserialize)]
+pub struct InitAccountBalanceRequest {
+    coin: String,
+    #[serde(flatten)]
+    params: InitAccountBalanceParams,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct InitAccountBalanceParams {
+    account_index: u32,
+}
+
+#[async_trait]
+pub trait InitAccountBalanceRpcOps {
+    async fn init_account_balance_rpc(
+        &self,
+        params: InitAccountBalanceParams,
+    ) -> MmResult<HDAccountBalance, HDAccountBalanceRpcError>;
+}
+
+pub struct InitAccountBalanceTask {
+    coin: MmCoinEnum,
+    req: InitAccountBalanceRequest,
+}
+
+impl RpcTaskTypes for InitAccountBalanceTask {
+    type Item = HDAccountBalance;
+    type Error = HDAccountBalanceRpcError;
+    type InProgressStatus = AccountBalanceInProgressStatus;
+    type AwaitingStatus = AccountBalanceAwaitingStatus;
+    type UserAction = AccountBalanceUserAction;
+}
+
+#[async_trait]
+impl RpcTask for InitAccountBalanceTask {
+    fn initial_status(&self) -> Self::InProgressStatus { AccountBalanceInProgressStatus::RequestingAccountBalance }
+
+    // Do nothing if the task has been cancelled.
+    async fn cancel(self) {}
+
+    async fn run(&mut self, _task_handle: &InitAccountBalanceTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        match self.coin {
+            MmCoinEnum::UtxoCoin(ref utxo) => utxo.init_account_balance_rpc(self.req.params.clone()).await,
+            MmCoinEnum::QtumCoin(ref qtum) => qtum.init_account_balance_rpc(self.req.params.clone()).await,
+            _ => MmError::err(HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet),
+        }
+    }
+}
+
+pub async fn init_account_balance(
+    ctx: MmArc,
+    req: InitAccountBalanceRequest,
+) -> MmResult<InitRpcTaskResponse, HDAccountBalanceRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let spawner = coin.spawner();
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(HDAccountBalanceRpcError::Internal)?;
+    let task = InitAccountBalanceTask { coin, req };
+    let task_id = AccountBalanceTaskManager::spawn_rpc_task(&coins_ctx.account_balance_task_manager, &spawner, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn init_account_balance_status(
+    ctx: MmArc,
+    req: RpcTaskStatusRequest,
+) -> MmResult<AccountBalanceRpcTaskStatus, RpcTaskStatusError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = coins_ctx
+        .account_balance_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 cancel_account_balance(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .account_balance_task_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
+pub mod common_impl {
+    use super::*;
+    use crate::coin_balance::HDWalletBalanceOps;
+    use crate::hd_wallet::{HDAccountOps, HDWalletCoinOps, HDWalletOps};
+    use crate::{CoinBalance, CoinWithDerivationMethod};
+    use crypto::RpcDerivationPath;
+    use std::fmt;
+
+    pub async fn init_account_balance_rpc<Coin>(
+        coin: &Coin,
+        params: InitAccountBalanceParams,
+    ) -> MmResult<HDAccountBalance, 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 addresses = coin.all_known_addresses_balances(&hd_account).await?;
+        let total_balance = addresses
+            .iter()
+            .fold(CoinBalance::default(), |total_balance, address_balance| {
+                total_balance + address_balance.balance.clone()
+            });
+
+        Ok(HDAccountBalance {
+            account_index: account_id,
+            derivation_path: RpcDerivationPath(hd_account.account_derivation_path()),
+            total_balance,
+            addresses,
+        })
+    }
+}
diff --git a/mm2src/coins/rpc_command/init_create_account.rs b/mm2src/coins/rpc_command/init_create_account.rs
index 89667aa649..82f99587b6 100644
--- a/mm2src/coins/rpc_command/init_create_account.rs
+++ b/mm2src/coins/rpc_command/init_create_account.rs
@@ -1,15 +1,23 @@
 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 crate::hd_pubkey::{HDExtractPubkeyError, HDXPubExtractor, RpcTaskXPubExtractor};
+use crate::hd_wallet::NewAccountCreatingError;
+use crate::{lp_coinfind_or_err, BalanceError, CoinBalance, CoinFindError, CoinWithDerivationMethod, CoinsContext,
+            MmCoinEnum, UnexpectedDerivationMethod};
 use async_trait::async_trait;
-use common::{true_f, SuccessResponse};
+use common::{true_f, HttpStatusCode, SuccessResponse};
 use crypto::hw_rpc_task::{HwConnectStatuses, HwRpcTaskAwaitingStatus, HwRpcTaskUserAction, HwRpcTaskUserActionRequest};
-use crypto::RpcDerivationPath;
+use crypto::{from_hw_error, Bip44Chain, HwError, HwRpcError, RpcDerivationPath, WithHwRpcError};
+use derive_more::Display;
+use enum_from::EnumFromTrait;
+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, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use parking_lot::Mutex as PaMutex;
+use rpc_task::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest, RpcTaskUserActionError};
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use std::sync::Arc;
+use std::time::Duration;
 
 pub type CreateAccountUserAction = HwRpcTaskUserAction;
 pub type CreateAccountAwaitingStatus = HwRpcTaskAwaitingStatus;
@@ -17,10 +25,136 @@ pub type CreateAccountTaskManager = RpcTaskManager<InitCreateAccountTask>;
 pub type CreateAccountTaskManagerShared = RpcTaskManagerShared<InitCreateAccountTask>;
 pub type CreateAccountTaskHandle = RpcTaskHandle<InitCreateAccountTask>;
 pub type CreateAccountRpcTaskStatus =
-    RpcTaskStatus<HDAccountBalance, HDWalletRpcError, CreateAccountInProgressStatus, CreateAccountAwaitingStatus>;
+    RpcTaskStatus<HDAccountBalance, CreateAccountRpcError, CreateAccountInProgressStatus, CreateAccountAwaitingStatus>;
 
 type CreateAccountXPubExtractor<'task> = RpcTaskXPubExtractor<'task, InitCreateAccountTask>;
 
+#[derive(Clone, Debug, Display, EnumFromTrait, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum CreateAccountRpcError {
+    #[display(fmt = "Hardware Wallet context is not initialized")]
+    HwContextNotInitialized,
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "RPC 'task' is awaiting '{}' user action", expected)]
+    UnexpectedUserAction { expected: String },
+    #[from_trait(WithTimeout::timeout)]
+    #[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 = "Coin doesn't support the given BIP44 chain: {:?}", chain)]
+    InvalidBip44Chain { chain: Bip44Chain },
+    #[display(fmt = "Accounts limit reached. Max number of accounts: {}", max_accounts_number)]
+    AccountLimitReached { max_accounts_number: u32 },
+    #[display(fmt = "Electrum/Native RPC invalid response: {}", _0)]
+    RpcInvalidResponse(String),
+    #[display(fmt = "HD wallet storage error: {}", _0)]
+    WalletStorageError(String),
+    #[from_trait(WithHwRpcError::hw_rpc_error)]
+    #[display(fmt = "{}", _0)]
+    HwError(HwRpcError),
+    #[display(fmt = "Transport: {}", _0)]
+    Transport(String),
+    #[from_trait(WithInternal::internal)]
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+}
+
+impl From<CoinFindError> for CreateAccountRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => CreateAccountRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<UnexpectedDerivationMethod> for CreateAccountRpcError {
+    fn from(e: UnexpectedDerivationMethod) -> Self {
+        match e {
+            UnexpectedDerivationMethod::ExpectedHDWallet => CreateAccountRpcError::CoinIsActivatedNotWithHDWallet,
+            unexpected_error => CreateAccountRpcError::Internal(unexpected_error.to_string()),
+        }
+    }
+}
+
+impl From<NewAccountCreatingError> for CreateAccountRpcError {
+    fn from(e: NewAccountCreatingError) -> Self {
+        match e {
+            NewAccountCreatingError::HwContextNotInitialized => CreateAccountRpcError::HwContextNotInitialized,
+            NewAccountCreatingError::HDWalletUnavailable => CreateAccountRpcError::CoinIsActivatedNotWithHDWallet,
+            NewAccountCreatingError::CoinDoesntSupportTrezor => {
+                CreateAccountRpcError::Internal("Coin must support Trezor at this point".to_string())
+            },
+            NewAccountCreatingError::RpcTaskError(rpc) => CreateAccountRpcError::from(rpc),
+            NewAccountCreatingError::HardwareWalletError(hw) => CreateAccountRpcError::from(hw),
+            NewAccountCreatingError::AccountLimitReached { max_accounts_number } => {
+                CreateAccountRpcError::AccountLimitReached { max_accounts_number }
+            },
+            NewAccountCreatingError::ErrorSavingAccountToStorage(e) => {
+                let error = format!("Error uploading HD account info to the storage: {}", e);
+                CreateAccountRpcError::WalletStorageError(error)
+            },
+            NewAccountCreatingError::Internal(internal) => CreateAccountRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<BalanceError> for CreateAccountRpcError {
+    fn from(e: BalanceError) -> Self {
+        match e {
+            BalanceError::Transport(transport) => CreateAccountRpcError::Transport(transport),
+            BalanceError::InvalidResponse(rpc) => CreateAccountRpcError::RpcInvalidResponse(rpc),
+            BalanceError::UnexpectedDerivationMethod(der_path) => CreateAccountRpcError::from(der_path),
+            BalanceError::WalletStorageError(internal) | BalanceError::Internal(internal) => {
+                CreateAccountRpcError::Internal(internal)
+            },
+        }
+    }
+}
+
+impl From<HDExtractPubkeyError> for CreateAccountRpcError {
+    fn from(e: HDExtractPubkeyError) -> Self { CreateAccountRpcError::from(NewAccountCreatingError::from(e)) }
+}
+
+impl From<RpcTaskError> for CreateAccountRpcError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Cancelled => CreateAccountRpcError::Internal("Cancelled".to_owned()),
+            RpcTaskError::Timeout(timeout) => CreateAccountRpcError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                CreateAccountRpcError::Internal(error)
+            },
+            RpcTaskError::UnexpectedUserAction { expected } => CreateAccountRpcError::UnexpectedUserAction { expected },
+            RpcTaskError::Internal(internal) => CreateAccountRpcError::Internal(internal),
+        }
+    }
+}
+
+impl From<HwError> for CreateAccountRpcError {
+    fn from(e: HwError) -> Self { from_hw_error(e) }
+}
+
+impl HttpStatusCode for CreateAccountRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            CreateAccountRpcError::HwContextNotInitialized
+            | CreateAccountRpcError::NoSuchCoin { .. }
+            | CreateAccountRpcError::UnexpectedUserAction { .. }
+            | CreateAccountRpcError::CoinIsActivatedNotWithHDWallet
+            | CreateAccountRpcError::InvalidBip44Chain { .. }
+            | CreateAccountRpcError::AccountLimitReached { .. } => StatusCode::BAD_REQUEST,
+            CreateAccountRpcError::HwError(_) => StatusCode::GONE,
+            CreateAccountRpcError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+            CreateAccountRpcError::Transport(_)
+            | CreateAccountRpcError::RpcInvalidResponse(_)
+            | CreateAccountRpcError::WalletStorageError(_)
+            | CreateAccountRpcError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
 #[derive(Deserialize)]
 pub struct CreateNewAccountRequest {
     coin: String,
@@ -28,10 +162,12 @@ pub struct CreateNewAccountRequest {
     params: CreateNewAccountParams,
 }
 
-#[derive(Deserialize)]
+#[derive(Clone, Deserialize)]
 pub struct CreateNewAccountParams {
     #[serde(default = "true_f")]
     scan: bool,
+    // The max number of empty addresses in a row.
+    // If transactions were sent to an address outside the `gap_limit`, they will not be identified.
     gap_limit: Option<u32>,
 }
 
@@ -43,29 +179,48 @@ pub enum CreateAccountInProgressStatus {
     /// 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,
+    FollowHwDeviceInstructions,
+}
+
+#[derive(Default)]
+struct StateData {
+    account_id: Option<u32>,
+}
+
+#[derive(Clone, Default)]
+pub struct CreateAccountState(Arc<PaMutex<StateData>>);
+
+impl CreateAccountState {
+    pub fn on_account_created(&self, account_id: u32) { self.0.lock().account_id = Some(account_id); }
+
+    pub fn create_account_id(&self) -> Option<u32> { self.0.lock().account_id }
 }
 
 #[async_trait]
-pub trait InitCreateHDAccountRpcOps {
+pub trait InitCreateAccountRpcOps {
     async fn init_create_account_rpc<XPubExtractor>(
         &self,
         params: CreateNewAccountParams,
+        state: CreateAccountState,
         xpub_extractor: &XPubExtractor,
-    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    ) -> MmResult<HDAccountBalance, CreateAccountRpcError>
     where
-        XPubExtractor: HDXPubExtractor + Sync;
+        XPubExtractor: HDXPubExtractor;
+
+    async fn revert_creating_account(&self, account_id: u32);
 }
 
 pub struct InitCreateAccountTask {
     ctx: MmArc,
     coin: MmCoinEnum,
     req: CreateNewAccountRequest,
+    /// The state of the account creation. It's used to revert changes if the task has been cancelled.
+    task_state: CreateAccountState,
 }
 
 impl RpcTaskTypes for InitCreateAccountTask {
     type Item = HDAccountBalance;
-    type Error = HDWalletRpcError;
+    type Error = CreateAccountRpcError;
     type InProgressStatus = CreateAccountInProgressStatus;
     type AwaitingStatus = CreateAccountAwaitingStatus;
     type UserAction = CreateAccountUserAction;
@@ -75,36 +230,63 @@ impl RpcTaskTypes for InitCreateAccountTask {
 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 cancel(self) {
+        if let Some(account_id) = self.task_state.create_account_id() {
+            // We created the account already, so need to revert the changes.
+            match self.coin {
+                MmCoinEnum::UtxoCoin(utxo) => utxo.revert_creating_account(account_id).await,
+                MmCoinEnum::QtumCoin(qtum) => qtum.revert_creating_account(account_id).await,
+                _ => (),
+            }
+        };
+    }
+
+    async fn run(&mut self, task_handle: &CreateAccountTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
         async fn create_new_account_helper<Coin>(
             ctx: &MmArc,
-            coin: Coin,
+            coin: &Coin,
             params: CreateNewAccountParams,
+            state: CreateAccountState,
             task_handle: &CreateAccountTaskHandle,
-        ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+        ) -> MmResult<HDAccountBalance, CreateAccountRpcError>
         where
-            Coin: InitCreateHDAccountRpcOps + Send + Sync,
+            Coin: InitCreateAccountRpcOps + 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_button_request: CreateAccountInProgressStatus::FollowHwDeviceInstructions,
+                on_pin_request: CreateAccountAwaitingStatus::EnterTrezorPin,
+                on_passphrase_request: CreateAccountAwaitingStatus::EnterTrezorPassphrase,
                 on_ready: CreateAccountInProgressStatus::RequestingAccountBalance,
             };
             let xpub_extractor = CreateAccountXPubExtractor::new(ctx, task_handle, hw_statuses)?;
-            coin.init_create_account_rpc(params, &xpub_extractor).await
+            coin.init_create_account_rpc(params, state, &xpub_extractor).await
         }
 
         match self.coin {
-            MmCoinEnum::UtxoCoin(utxo) => {
-                create_new_account_helper(&self.ctx, utxo, self.req.params, task_handle).await
+            MmCoinEnum::UtxoCoin(ref utxo) => {
+                create_new_account_helper(
+                    &self.ctx,
+                    utxo,
+                    self.req.params.clone(),
+                    self.task_state.clone(),
+                    task_handle,
+                )
+                .await
             },
-            MmCoinEnum::QtumCoin(qtum) => {
-                create_new_account_helper(&self.ctx, qtum, self.req.params, task_handle).await
+            MmCoinEnum::QtumCoin(ref qtum) => {
+                create_new_account_helper(
+                    &self.ctx,
+                    qtum,
+                    self.req.params.clone(),
+                    self.task_state.clone(),
+                    task_handle,
+                )
+                .await
             },
-            _ => MmError::err(HDWalletRpcError::CoinIsActivatedNotWithHDWallet),
+            _ => MmError::err(CreateAccountRpcError::CoinIsActivatedNotWithHDWallet),
         }
     }
 }
@@ -112,11 +294,17 @@ impl RpcTask for InitCreateAccountTask {
 pub async fn init_create_new_account(
     ctx: MmArc,
     req: CreateNewAccountRequest,
-) -> MmResult<InitRpcTaskResponse, HDWalletRpcError> {
+) -> MmResult<InitRpcTaskResponse, CreateAccountRpcError> {
     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)?;
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CreateAccountRpcError::Internal)?;
+    let spawner = coin.spawner();
+    let task = InitCreateAccountTask {
+        ctx,
+        coin,
+        req,
+        task_state: CreateAccountState::default(),
+    };
+    let task_id = CreateAccountTaskManager::spawn_rpc_task(&coins_ctx.create_account_manager, &spawner, task)?;
     Ok(InitRpcTaskResponse { task_id })
 }
 
@@ -147,34 +335,47 @@ pub async fn init_create_new_account_user_action(
     Ok(SuccessResponse::new())
 }
 
+pub async fn cancel_create_new_account(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .create_account_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    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,
+        state: CreateAccountState,
         xpub_extractor: &XPubExtractor,
-    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    ) -> MmResult<HDAccountBalance, CreateAccountRpcError>
     where
-        Coin: HDWalletBalanceOps
-            + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
-            + Send
-            + Sync
-            + MarketCoinOps,
-        XPubExtractor: HDXPubExtractor + Sync,
+        Coin:
+            HDWalletBalanceOps + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + Send + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         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();
 
+        // Change the task state.
+        state.on_account_created(account_index);
+
         let addresses = if params.scan {
             let gap_limit = params.gap_limit.unwrap_or_else(|| hd_wallet.gap_limit());
+            let address_scanner = coin.produce_hd_address_scanner().await?;
             coin.scan_for_new_addresses(hd_wallet, &mut new_account, &address_scanner, gap_limit)
                 .await?
         } else {
@@ -194,4 +395,13 @@ pub(crate) mod common_impl {
             addresses,
         })
     }
+
+    pub async fn revert_creating_account<Coin>(coin: &Coin, account_id: u32)
+    where
+        Coin: HDWalletBalanceOps + CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet> + Sync,
+    {
+        if let Some(hd_wallet) = coin.derivation_method().hd_wallet() {
+            hd_wallet.remove_account_if_last(account_id).await;
+        }
+    }
 }
diff --git a/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs b/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs
index e2400e8b4a..e90d44eecc 100644
--- a/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs
+++ b/mm2src/coins/rpc_command/init_scan_for_new_addresses.rs
@@ -2,12 +2,16 @@ 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 common::{SerdeInfallible, SuccessResponse};
 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::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest};
 use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
 
+pub type ScanAddressesUserAction = SerdeInfallible;
+pub type ScanAddressesAwaitingStatus = SerdeInfallible;
 pub type ScanAddressesTaskManager = RpcTaskManager<InitScanAddressesTask>;
 pub type ScanAddressesTaskManagerShared = RpcTaskManagerShared<InitScanAddressesTask>;
 pub type ScanAddressesTaskHandle = RpcTaskHandle<InitScanAddressesTask>;
@@ -32,9 +36,11 @@ pub struct ScanAddressesRequest {
     params: ScanAddressesParams,
 }
 
-#[derive(Deserialize)]
+#[derive(Clone, Deserialize)]
 pub struct ScanAddressesParams {
     pub account_index: u32,
+    // The max number of empty addresses in a row.
+    // If transactions were sent to an address outside the `gap_limit`, they will not be identified.
     pub gap_limit: Option<u32>,
 }
 
@@ -43,16 +49,6 @@ 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(
@@ -79,10 +75,13 @@ 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>> {
+    // Do nothing if the task has been cancelled.
+    async fn cancel(self) {}
+
+    async fn run(&mut 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,
+            MmCoinEnum::UtxoCoin(ref utxo) => utxo.init_scan_for_new_addresses_rpc(self.req.params.clone()).await,
+            MmCoinEnum::QtumCoin(ref qtum) => qtum.init_scan_for_new_addresses_rpc(self.req.params.clone()).await,
             _ => MmError::err(HDAccountBalanceRpcError::CoinIsActivatedNotWithHDWallet),
         }
     }
@@ -93,9 +92,10 @@ pub async fn init_scan_for_new_addresses(
     req: ScanAddressesRequest,
 ) -> MmResult<InitRpcTaskResponse, HDAccountBalanceRpcError> {
     let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let spawner = coin.spawner();
     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)?;
+    let task_id = ScanAddressesTaskManager::spawn_rpc_task(&coins_ctx.scan_addresses_manager, &spawner, task)?;
     Ok(InitRpcTaskResponse { task_id })
 }
 
@@ -113,6 +113,19 @@ pub async fn init_scan_for_new_addresses_status(
         .or_mm_err(|| RpcTaskStatusError::NoSuchTask(req.task_id))
 }
 
+pub async fn cancel_scan_for_new_addresses(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .scan_addresses_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
 pub mod common_impl {
     use super::*;
     use crate::coin_balance::HDWalletBalanceOps;
diff --git a/mm2src/coins/rpc_command/init_withdraw.rs b/mm2src/coins/rpc_command/init_withdraw.rs
index dd3d22ca63..c9ba606250 100644
--- a/mm2src/coins/rpc_command/init_withdraw.rs
+++ b/mm2src/coins/rpc_command/init_withdraw.rs
@@ -5,7 +5,8 @@ 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::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest, RpcTaskUserActionError};
 use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatusAlias, RpcTaskTypes};
 
 pub type WithdrawAwaitingStatus = HwRpcTaskAwaitingStatus;
@@ -23,6 +24,7 @@ pub type WithdrawInitResult<T> = Result<T, MmError<WithdrawError>>;
 
 #[async_trait]
 pub trait CoinWithdrawInit {
+    #[allow(clippy::result_large_err)]
     fn init_withdraw(
         ctx: MmArc,
         req: WithdrawRequest,
@@ -32,13 +34,14 @@ pub trait CoinWithdrawInit {
 
 pub async fn init_withdraw(ctx: MmArc, request: WithdrawRequest) -> WithdrawInitResult<InitWithdrawResponse> {
     let coin = lp_coinfind_or_err(&ctx, &request.coin).await?;
+    let spawner = coin.spawner();
     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)?;
+    let task_id = WithdrawTaskManager::spawn_rpc_task(&coins_ctx.withdraw_task_manager, &spawner, task)?;
     Ok(InitWithdrawResponse { task_id })
 }
 
@@ -65,7 +68,7 @@ pub enum WithdrawInProgressStatus {
     /// 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,
+    FollowHwDeviceInstructions,
     WaitingForUserToConfirmSigning,
 }
 
@@ -82,6 +85,16 @@ pub async fn withdraw_user_action(
     Ok(SuccessResponse::new())
 }
 
+pub async fn cancel_withdraw(ctx: MmArc, req: CancelRpcTaskRequest) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = CoinsContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .withdraw_task_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
 #[async_trait]
 pub trait InitWithdrawCoin {
     async fn init_withdraw(
@@ -110,14 +123,17 @@ impl RpcTaskTypes for WithdrawTask {
 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>> {
+    // Do nothing if the task has been cancelled.
+    async fn cancel(self) {}
+
+    async fn run(&mut self, task_handle: &WithdrawTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        let ctx = self.ctx.clone();
+        let request = self.request.clone();
         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,
+            MmCoinEnum::UtxoCoin(ref standard_utxo) => standard_utxo.init_withdraw(ctx, request, task_handle).await,
+            MmCoinEnum::QtumCoin(ref qtum) => qtum.init_withdraw(ctx, request, task_handle).await,
             #[cfg(not(target_arch = "wasm32"))]
-            MmCoinEnum::ZCoin(ref z) => z.init_withdraw(self.ctx, self.request, task_handle).await,
+            MmCoinEnum::ZCoin(ref z) => z.init_withdraw(ctx, request, task_handle).await,
             _ => MmError::err(WithdrawError::CoinDoesntSupportInitWithdraw {
                 coin: self.coin.ticker().to_owned(),
             }),
diff --git a/mm2src/coins/rpc_command/lightning/close_channel.rs b/mm2src/coins/rpc_command/lightning/close_channel.rs
new file mode 100644
index 0000000000..a3fa05644c
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/close_channel.rs
@@ -0,0 +1,83 @@
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::{async_blocking, HttpStatusCode};
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type CloseChannelResult<T> = Result<T, MmError<CloseChannelError>>;
+
+#[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 = "No such channel with rpc_channel_id {}", _0)]
+    NoSuchChannel(u64),
+    #[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::NoSuchChannel(_) | CloseChannelError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+            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(Deserialize)]
+pub struct CloseChannelReq {
+    pub coin: String,
+    pub rpc_channel_id: u64,
+    #[serde(default)]
+    pub force_close: bool,
+}
+
+pub async fn close_channel(ctx: MmArc, req: CloseChannelReq) -> CloseChannelResult<String> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(CloseChannelError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    let channel_details = ln_coin
+        .get_channel_by_rpc_id(req.rpc_channel_id)
+        .await
+        .ok_or(CloseChannelError::NoSuchChannel(req.rpc_channel_id))?;
+    let channel_id = channel_details.channel_id;
+    let counterparty_node_id = channel_details.counterparty.node_id;
+
+    if req.force_close {
+        async_blocking(move || {
+            ln_coin
+                .channel_manager
+                .force_close_broadcasting_latest_txn(&channel_id, &counterparty_node_id)
+                .map_to_mm(|e| CloseChannelError::CloseChannelError(format!("{:?}", e)))
+        })
+        .await?;
+    } else {
+        async_blocking(move || {
+            ln_coin
+                .channel_manager
+                .close_channel(&channel_id, &counterparty_node_id)
+                .map_to_mm(|e| CloseChannelError::CloseChannelError(format!("{:?}", e)))
+        })
+        .await?;
+    }
+
+    Ok(format!(
+        "Initiated closing of channel with rpc_channel_id: {}",
+        req.rpc_channel_id
+    ))
+}
diff --git a/mm2src/coins/rpc_command/lightning/connect_to_node.rs b/mm2src/coins/rpc_command/lightning/connect_to_node.rs
new file mode 100644
index 0000000000..79ba0f1889
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/connect_to_node.rs
@@ -0,0 +1,93 @@
+use crate::lightning::ln_errors::EnableLightningError;
+use crate::lightning::ln_p2p::{connect_to_ln_node, ConnectToNodeRes, ConnectionError};
+use crate::lightning::ln_serialization::NodeAddress;
+use crate::lightning::ln_storage::LightningStorage;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::HttpStatusCode;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use std::collections::hash_map::Entry;
+
+type ConnectToNodeResult<T> = Result<T, MmError<ConnectToNodeError>>;
+
+#[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::NOT_FOUND,
+        }
+    }
+}
+
+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()) }
+}
+
+impl From<ConnectionError> for ConnectToNodeError {
+    fn from(err: ConnectionError) -> ConnectToNodeError { ConnectToNodeError::ConnectionError(err.to_string()) }
+}
+
+#[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_node(ctx: MmArc, req: ConnectToNodeRequest) -> ConnectToNodeResult<String> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(ConnectToNodeError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    let node_pubkey = req.node_address.pubkey;
+    let node_addr = req.node_address.addr;
+    let res = connect_to_ln_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_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())
+}
diff --git a/mm2src/coins/rpc_command/lightning/generate_invoice.rs b/mm2src/coins/rpc_command/lightning/generate_invoice.rs
new file mode 100644
index 0000000000..94740793eb
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/generate_invoice.rs
@@ -0,0 +1,126 @@
+use crate::lightning::ln_db::{LightningDB, PaymentInfo, PaymentType};
+use crate::lightning::ln_p2p::connect_to_ln_node;
+use crate::lightning::DEFAULT_INVOICE_EXPIRY;
+use crate::{lp_coinfind_or_err, CoinFindError, H256Json, MmCoinEnum};
+use bitcoin_hashes::Hash;
+use common::log::LogOnError;
+use common::{async_blocking, HttpStatusCode};
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use lightning::ln::PaymentHash;
+use lightning_invoice::utils::create_invoice_from_channelmanager;
+use lightning_invoice::{Invoice, SignOrCreationError};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type GenerateInvoiceResult<T> = Result<T, MmError<GenerateInvoiceError>>;
+
+#[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::NOT_FOUND,
+            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(Deserialize)]
+pub struct GenerateInvoiceRequest {
+    pub coin: String,
+    pub amount_in_msat: Option<u64>,
+    pub description: String,
+    pub expiry: Option<u32>,
+}
+
+#[derive(Serialize)]
+pub struct GenerateInvoiceResponse {
+    payment_hash: H256Json,
+    invoice: Invoice,
+}
+
+/// 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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(GenerateInvoiceError::UnsupportedCoin(e.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_ln_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 channel_manager = ln_coin.channel_manager.clone();
+    let keys_manager = ln_coin.keys_manager.clone();
+    let amount_in_msat = req.amount_in_msat;
+    let description = req.description.clone();
+    let expiry = req.expiry.unwrap_or(DEFAULT_INVOICE_EXPIRY);
+    let invoice = async_blocking(move || {
+        create_invoice_from_channelmanager(
+            &channel_manager,
+            keys_manager,
+            network,
+            amount_in_msat,
+            description,
+            expiry,
+        )
+    })
+    .await?;
+
+    let payment_hash = invoice.payment_hash().into_inner();
+    let payment_info = PaymentInfo::new(
+        PaymentHash(payment_hash),
+        PaymentType::InboundPayment,
+        req.description,
+        req.amount_in_msat.map(|a| a as i64),
+    );
+    // Note: Although the preimage can be recreated from the keymanager and the invoice secret, the payment info is added to db at invoice generation stage
+    // to save the description. Although it's not ideal to keep track of invoices before they are paid since they may never be paid, but this is the only way
+    // to have the invoice description saved in the db.
+    ln_coin.db.add_payment_to_db(&payment_info).await?;
+
+    Ok(GenerateInvoiceResponse {
+        payment_hash: payment_hash.into(),
+        invoice,
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/get_channel_details.rs b/mm2src/coins/rpc_command/lightning/get_channel_details.rs
new file mode 100644
index 0000000000..f6c18ae633
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/get_channel_details.rs
@@ -0,0 +1,81 @@
+use crate::lightning::ln_db::{DBChannelDetails, LightningDB};
+use crate::lightning::ln_serialization::ChannelDetailsForRPC;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::HttpStatusCode;
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type GetChannelDetailsResult<T> = Result<T, MmError<GetChannelDetailsError>>;
+
+#[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(_) | 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(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(DBChannelDetails),
+}
+
+pub async fn get_channel_details(
+    ctx: MmArc,
+    req: GetChannelDetailsRequest,
+) -> GetChannelDetailsResult<GetChannelDetailsResponse> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(GetChannelDetailsError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    let channel_details = match ln_coin.get_channel_by_rpc_id(req.rpc_channel_id).await {
+        Some(details) => GetChannelDetailsResponse::Open(details.into()),
+        None => GetChannelDetailsResponse::Closed(
+            ln_coin
+                .db
+                .get_channel_from_db(req.rpc_channel_id)
+                .await?
+                .ok_or(GetChannelDetailsError::NoSuchChannel(req.rpc_channel_id))?,
+        ),
+    };
+
+    Ok(channel_details)
+}
diff --git a/mm2src/coins/rpc_command/lightning/get_claimable_balances.rs b/mm2src/coins/rpc_command/lightning/get_claimable_balances.rs
new file mode 100644
index 0000000000..5d1b84dad1
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/get_claimable_balances.rs
@@ -0,0 +1,67 @@
+use crate::lightning::ln_serialization::ClaimableBalance;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::{async_blocking, HttpStatusCode};
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type ClaimableBalancesResult<T> = Result<T, MmError<ClaimableBalancesError>>;
+
+#[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::NOT_FOUND,
+        }
+    }
+}
+
+impl From<CoinFindError> for ClaimableBalancesError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => ClaimableBalancesError::NoSuchCoin(coin),
+        }
+    }
+}
+
+#[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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(ClaimableBalancesError::UnsupportedCoin(e.ticker().to_string())),
+    };
+    let ignored_channels = if req.include_open_channels_balances {
+        Vec::new()
+    } else {
+        ln_coin.list_channels().await
+    };
+    let claimable_balances = async_blocking(move || {
+        ln_coin
+            .chain_monitor
+            .get_claimable_balances(&ignored_channels.iter().collect::<Vec<_>>()[..])
+            .into_iter()
+            .map(From::from)
+            .collect()
+    })
+    .await;
+
+    Ok(claimable_balances)
+}
diff --git a/mm2src/coins/rpc_command/lightning/get_payment_details.rs b/mm2src/coins/rpc_command/lightning/get_payment_details.rs
new file mode 100644
index 0000000000..0e7a4868c2
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/get_payment_details.rs
@@ -0,0 +1,76 @@
+use crate::lightning::ln_db::LightningDB;
+use crate::lightning::ln_serialization::PaymentInfoForRPC;
+use crate::{lp_coinfind_or_err, CoinFindError, H256Json, MmCoinEnum};
+use common::HttpStatusCode;
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use lightning::ln::PaymentHash;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type GetPaymentDetailsResult<T> = Result<T, MmError<GetPaymentDetailsError>>;
+
+#[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::NOT_FOUND,
+            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(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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(GetPaymentDetailsError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    if let Some(payment_info) = ln_coin.db.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))
+}
diff --git a/mm2src/coins/rpc_command/lightning/list_channels.rs b/mm2src/coins/rpc_command/lightning/list_channels.rs
new file mode 100644
index 0000000000..a96106a99f
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/list_channels.rs
@@ -0,0 +1,130 @@
+use crate::lightning::ln_db::{ClosedChannelsFilter, DBChannelDetails, LightningDB};
+use crate::lightning::ln_serialization::ChannelDetailsForRPC;
+use crate::lightning::OpenChannelsFilter;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::{calc_total_pages, ten, HttpStatusCode, PagingOptionsEnum};
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type ListChannelsResult<T> = Result<T, MmError<ListChannelsError>>;
+
+#[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::NOT_FOUND,
+            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(Deserialize)]
+pub struct ListOpenChannelsRequest {
+    pub coin: String,
+    pub filter: Option<OpenChannelsFilter>,
+    #[serde(default = "ten")]
+    limit: usize,
+    #[serde(default)]
+    paging_options: PagingOptionsEnum<u64>,
+}
+
+#[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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(ListChannelsError::UnsupportedCoin(e.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<DBChannelDetails>,
+    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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(ListChannelsError::UnsupportedCoin(e.ticker().to_string())),
+    };
+    let closed_channels_res = ln_coin
+        .db
+        .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,
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/list_payments_by_filter.rs b/mm2src/coins/rpc_command/lightning/list_payments_by_filter.rs
new file mode 100644
index 0000000000..0a6d0d3308
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/list_payments_by_filter.rs
@@ -0,0 +1,88 @@
+use crate::lightning::ln_db::LightningDB;
+use crate::lightning::ln_serialization::{PaymentInfoForRPC, PaymentsFilterForRPC};
+use crate::{lp_coinfind_or_err, CoinFindError, H256Json, MmCoinEnum};
+use common::{calc_total_pages, ten, HttpStatusCode, PagingOptionsEnum};
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use lightning::ln::PaymentHash;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type ListPaymentsResult<T> = Result<T, MmError<ListPaymentsError>>;
+
+#[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::NOT_FOUND,
+            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(Deserialize)]
+pub struct ListPaymentsReq {
+    pub coin: String,
+    pub filter: Option<PaymentsFilterForRPC>,
+    #[serde(default = "ten")]
+    limit: usize,
+    #[serde(default)]
+    paging_options: PagingOptionsEnum<H256Json>,
+}
+
+#[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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(ListPaymentsError::UnsupportedCoin(e.ticker().to_string())),
+    };
+    let get_payments_res = ln_coin
+        .db
+        .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,
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/mod.rs b/mm2src/coins/rpc_command/lightning/mod.rs
new file mode 100644
index 0000000000..73aa00bd08
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/mod.rs
@@ -0,0 +1,33 @@
+mod close_channel;
+mod connect_to_node;
+mod generate_invoice;
+mod get_channel_details;
+mod get_claimable_balances;
+mod get_payment_details;
+mod list_channels;
+mod list_payments_by_filter;
+mod open_channel;
+mod send_payment;
+mod trusted_nodes;
+mod update_channel;
+
+pub mod channels {
+    pub use super::close_channel::*;
+    pub use super::get_channel_details::*;
+    pub use super::get_claimable_balances::*;
+    pub use super::list_channels::*;
+    pub use super::open_channel::*;
+    pub use super::update_channel::*;
+}
+
+pub mod nodes {
+    pub use super::connect_to_node::*;
+    pub use super::trusted_nodes::*;
+}
+
+pub mod payments {
+    pub use super::generate_invoice::*;
+    pub use super::get_payment_details::*;
+    pub use super::list_payments_by_filter::*;
+    pub use super::send_payment::*;
+}
diff --git a/mm2src/coins/rpc_command/lightning/open_channel.rs b/mm2src/coins/rpc_command/lightning/open_channel.rs
new file mode 100644
index 0000000000..9d131b1b48
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/open_channel.rs
@@ -0,0 +1,237 @@
+use crate::lightning::ln_conf::{ChannelOptions, OurChannelsConfigs};
+use crate::lightning::ln_db::{DBChannelDetails, LightningDB};
+use crate::lightning::ln_p2p::{connect_to_ln_node, ConnectionError};
+use crate::lightning::ln_serialization::NodeAddress;
+use crate::lightning::ln_storage::LightningStorage;
+use crate::utxo::utxo_common::UtxoTxBuilder;
+use crate::utxo::{sat_from_big_decimal, FeePolicy, GetUtxoListOps, UtxoTxGenerationOps};
+use crate::{lp_coinfind_or_err, BalanceError, CoinFindError, GenerateTxError, MmCoinEnum, NumConversError,
+            UnexpectedDerivationMethod, UtxoRpcError};
+use chain::TransactionOutput;
+use common::log::error;
+use common::{async_blocking, HttpStatusCode};
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use keys::AddressHashEnum;
+use lightning::util::config::UserConfig;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use script::Builder;
+
+type OpenChannelResult<T> = Result<T, MmError<OpenChannelError>>;
+
+#[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),
+}
+
+impl HttpStatusCode for OpenChannelError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            OpenChannelError::UnsupportedCoin(_) | OpenChannelError::RpcError(_) => StatusCode::BAD_REQUEST,
+            OpenChannelError::FailureToOpenChannel(_, _)
+            | OpenChannelError::ConnectToNodeError(_)
+            | OpenChannelError::InternalError(_)
+            | OpenChannelError::GenerateTxErr(_)
+            | OpenChannelError::IOError(_)
+            | OpenChannelError::DbError(_)
+            | OpenChannelError::InvalidPath(_)
+            | OpenChannelError::BalanceError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            OpenChannelError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+        }
+    }
+}
+
+impl From<ConnectionError> for OpenChannelError {
+    fn from(err: ConnectionError) -> 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<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(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 channel_configs: Option<OurChannelsConfigs>,
+}
+
+#[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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(OpenChannelError::UnsupportedCoin(e.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_ln_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.single_addr_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_according_to(options),
+            None => conf.channel_options = Some(options),
+        }
+    }
+    if let Some(configs) = req.channel_configs {
+        match conf.our_channels_configs.as_mut() {
+            Some(o) => o.update_according_to(configs),
+            None => conf.our_channels_configs = Some(configs),
+        }
+    }
+    drop_mutability!(conf);
+    let user_config: UserConfig = conf.into();
+
+    let rpc_channel_id = ln_coin.db.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 = DBChannelDetails::new(
+        rpc_channel_id,
+        temp_channel_id,
+        node_pubkey,
+        true,
+        user_config.channel_handshake_config.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?;
+
+    if let Err(e) = ln_coin.db.add_channel_to_db(&pending_channel_details).await {
+        error!("Unable to add new outbound channel {} to db: {}", rpc_channel_id, e);
+    }
+
+    Ok(OpenChannelResponse {
+        rpc_channel_id,
+        node_address: req.node_address,
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/send_payment.rs b/mm2src/coins/rpc_command/lightning/send_payment.rs
new file mode 100644
index 0000000000..3efde180d4
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/send_payment.rs
@@ -0,0 +1,113 @@
+use crate::lightning::ln_p2p::connect_to_ln_node;
+use crate::lightning::ln_serialization::PublicKeyForRPC;
+use crate::lightning::ln_utils::PaymentError;
+use crate::{lp_coinfind_or_err, CoinFindError, H256Json, MmCoinEnum};
+use common::log::LogOnError;
+use common::HttpStatusCode;
+use db_common::sqlite::rusqlite::Error as SqlError;
+use http::StatusCode;
+use lightning_invoice::Invoice;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type SendPaymentResult<T> = Result<T, MmError<SendPaymentError>>;
+
+#[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 = "DB error {}", _0)]
+    DbError(String),
+}
+
+impl HttpStatusCode for SendPaymentError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            SendPaymentError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            SendPaymentError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+            SendPaymentError::PaymentError(_) | SendPaymentError::NoRouteFound(_) | 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()) }
+}
+
+impl From<PaymentError> for SendPaymentError {
+    fn from(err: PaymentError) -> SendPaymentError { SendPaymentError::PaymentError(err.to_string()) }
+}
+
+#[derive(Clone, Debug, Deserialize, PartialEq)]
+#[serde(tag = "type")]
+pub enum Payment {
+    #[serde(rename = "invoice")]
+    Invoice { invoice: Invoice },
+    #[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 ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(SendPaymentError::UnsupportedCoin(e.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_ln_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, None).await?,
+        Payment::Keysend {
+            destination,
+            amount_in_msat,
+            expiry,
+        } => ln_coin.keysend(destination.into(), amount_in_msat, expiry).await?,
+    };
+
+    Ok(SendPaymentResponse {
+        payment_hash: payment_info.payment_hash.0.into(),
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/trusted_nodes.rs b/mm2src/coins/rpc_command/lightning/trusted_nodes.rs
new file mode 100644
index 0000000000..6f0f2fd36e
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/trusted_nodes.rs
@@ -0,0 +1,120 @@
+use crate::lightning::ln_serialization::PublicKeyForRPC;
+use crate::lightning::ln_storage::LightningStorage;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::HttpStatusCode;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type TrustedNodeResult<T> = Result<T, MmError<TrustedNodeError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum TrustedNodeError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "I/O error {}", _0)]
+    IOError(String),
+}
+
+impl HttpStatusCode for TrustedNodeError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            TrustedNodeError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            TrustedNodeError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+            TrustedNodeError::IOError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for TrustedNodeError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => TrustedNodeError::NoSuchCoin(coin),
+        }
+    }
+}
+
+impl From<std::io::Error> for TrustedNodeError {
+    fn from(err: std::io::Error) -> TrustedNodeError { TrustedNodeError::IOError(err.to_string()) }
+}
+
+#[derive(Deserialize)]
+pub struct AddTrustedNodeReq {
+    pub coin: String,
+    pub node_id: PublicKeyForRPC,
+}
+
+#[derive(Serialize)]
+pub struct AddTrustedNodeResponse {
+    pub added_node: PublicKeyForRPC,
+}
+
+pub async fn add_trusted_node(ctx: MmArc, req: AddTrustedNodeReq) -> TrustedNodeResult<AddTrustedNodeResponse> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(TrustedNodeError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    if ln_coin.trusted_nodes.lock().insert(req.node_id.clone().into()) {
+        ln_coin.persister.save_trusted_nodes(ln_coin.trusted_nodes).await?;
+    }
+
+    Ok(AddTrustedNodeResponse {
+        added_node: req.node_id,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct RemoveTrustedNodeReq {
+    pub coin: String,
+    pub node_id: PublicKeyForRPC,
+}
+
+#[derive(Serialize)]
+pub struct RemoveTrustedNodeResponse {
+    pub removed_node: PublicKeyForRPC,
+}
+
+pub async fn remove_trusted_node(
+    ctx: MmArc,
+    req: RemoveTrustedNodeReq,
+) -> TrustedNodeResult<RemoveTrustedNodeResponse> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(TrustedNodeError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    if ln_coin.trusted_nodes.lock().remove(&req.node_id.clone().into()) {
+        ln_coin.persister.save_trusted_nodes(ln_coin.trusted_nodes).await?;
+    }
+
+    Ok(RemoveTrustedNodeResponse {
+        removed_node: req.node_id,
+    })
+}
+
+#[derive(Deserialize)]
+pub struct ListTrustedNodesReq {
+    pub coin: String,
+}
+
+#[derive(Serialize)]
+pub struct ListTrustedNodesResponse {
+    trusted_nodes: Vec<PublicKeyForRPC>,
+}
+
+pub async fn list_trusted_nodes(ctx: MmArc, req: ListTrustedNodesReq) -> TrustedNodeResult<ListTrustedNodesResponse> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(TrustedNodeError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    let trusted_nodes = ln_coin.trusted_nodes.lock().clone();
+
+    Ok(ListTrustedNodesResponse {
+        trusted_nodes: trusted_nodes.into_iter().map(PublicKeyForRPC).collect(),
+    })
+}
diff --git a/mm2src/coins/rpc_command/lightning/update_channel.rs b/mm2src/coins/rpc_command/lightning/update_channel.rs
new file mode 100644
index 0000000000..a108659ea0
--- /dev/null
+++ b/mm2src/coins/rpc_command/lightning/update_channel.rs
@@ -0,0 +1,83 @@
+use crate::lightning::ln_conf::ChannelOptions;
+use crate::{lp_coinfind_or_err, CoinFindError, MmCoinEnum};
+use common::{async_blocking, HttpStatusCode};
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+
+type UpdateChannelResult<T> = Result<T, MmError<UpdateChannelError>>;
+
+#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum UpdateChannelError {
+    #[display(fmt = "Lightning network is not supported for {}", _0)]
+    UnsupportedCoin(String),
+    #[display(fmt = "No such coin {}", _0)]
+    NoSuchCoin(String),
+    #[display(fmt = "No such channel with rpc_channel_id {}", _0)]
+    NoSuchChannel(u64),
+    #[display(fmt = "Failure to channel {}: {}", _0, _1)]
+    FailureToUpdateChannel(u64, String),
+}
+
+impl HttpStatusCode for UpdateChannelError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            UpdateChannelError::UnsupportedCoin(_) => StatusCode::BAD_REQUEST,
+            UpdateChannelError::NoSuchChannel(_) | UpdateChannelError::NoSuchCoin(_) => StatusCode::NOT_FOUND,
+            UpdateChannelError::FailureToUpdateChannel(_, _) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for UpdateChannelError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => UpdateChannelError::NoSuchCoin(coin),
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct UpdateChannelReq {
+    pub coin: String,
+    pub rpc_channel_id: u64,
+    pub channel_options: ChannelOptions,
+}
+
+#[derive(Serialize)]
+pub struct UpdateChannelResponse {
+    channel_options: ChannelOptions,
+}
+
+/// Updates configuration for an open channel.
+pub async fn update_channel(ctx: MmArc, req: UpdateChannelReq) -> UpdateChannelResult<UpdateChannelResponse> {
+    let ln_coin = match lp_coinfind_or_err(&ctx, &req.coin).await? {
+        MmCoinEnum::LightningCoin(c) => c,
+        e => return MmError::err(UpdateChannelError::UnsupportedCoin(e.ticker().to_string())),
+    };
+
+    let channel_details = ln_coin
+        .get_channel_by_rpc_id(req.rpc_channel_id)
+        .await
+        .ok_or(UpdateChannelError::NoSuchChannel(req.rpc_channel_id))?;
+
+    async_blocking(move || {
+        let mut channel_options = ln_coin
+            .conf
+            .channel_options
+            .unwrap_or_else(|| req.channel_options.clone());
+        if channel_options != req.channel_options {
+            channel_options.update_according_to(req.channel_options.clone());
+        }
+        drop_mutability!(channel_options);
+        let channel_ids = &[channel_details.channel_id];
+        let counterparty_node_id = channel_details.counterparty.node_id;
+        ln_coin
+            .channel_manager
+            .update_channel_config(&counterparty_node_id, channel_ids, &channel_options.clone().into())
+            .map_to_mm(|e| UpdateChannelError::FailureToUpdateChannel(req.rpc_channel_id, format!("{:?}", e)))?;
+        Ok(UpdateChannelResponse { channel_options })
+    })
+    .await
+}
diff --git a/mm2src/coins/rpc_command/mod.rs b/mm2src/coins/rpc_command/mod.rs
index 7a98d3fc2e..945cea77fe 100644
--- a/mm2src/coins/rpc_command/mod.rs
+++ b/mm2src/coins/rpc_command/mod.rs
@@ -1,5 +1,10 @@
 pub mod account_balance;
+pub mod get_current_mtp;
+pub mod get_enabled_coins;
+pub mod get_new_address;
 pub mod hd_account_balance_rpc_error;
+pub mod init_account_balance;
 pub mod init_create_account;
 pub mod init_scan_for_new_addresses;
 pub mod init_withdraw;
+#[cfg(not(target_arch = "wasm32"))] pub mod lightning;
diff --git a/mm2src/coins/solana.rs b/mm2src/coins/solana.rs
index 6bf3c7049c..cd92a1c30f 100644
--- a/mm2src/coins/solana.rs
+++ b/mm2src/coins/solana.rs
@@ -1,15 +1,25 @@
-use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum};
+use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum, WatcherOps};
+use crate::coin_errors::MyAddressError;
 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,
+use crate::{BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend,
+            MakerSwapTakerCoin, NegotiateSwapContractAddrErr, PaymentInstructions, PaymentInstructionsErr,
+            PrivKeyBuildPolicy, PrivKeyPolicyNotAllowed, RawTransactionFut, RawTransactionRequest, RefundError,
+            RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs,
+            SignatureResult, TakerSwapMakerCoin, TradePreimageFut, TradePreimageResult, TradePreimageValue,
+            TransactionDetails, TransactionFut, TransactionType, TxMarshalingErr, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr,
+            ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, VerificationResult,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput,
             WithdrawError, WithdrawFut, WithdrawRequest, WithdrawResult};
 use async_trait::async_trait;
 use base58::ToBase58;
 use bincode::{deserialize, serialize};
+use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError};
 use common::{async_blocking, now_ms};
+use crypto::StandardHDPathToCoin;
 use derive_more::Display;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
@@ -31,17 +41,18 @@ use solana_sdk::{pubkey::Pubkey,
 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};
+use std::{convert::TryFrom, fmt::Debug, 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;
+
+#[cfg(all(test, not(feature = "disable-solana-tests")))]
+mod solana_common_tests;
+#[cfg(all(test, not(feature = "disable-solana-tests")))]
+mod solana_tests;
+#[cfg(all(test, not(feature = "disable-solana-tests")))]
+mod spl_tests;
 
 pub const SOLANA_DEFAULT_DECIMALS: u64 = 9;
 pub const LAMPORTS_DUMMY_AMOUNT: u64 = 10;
@@ -163,19 +174,35 @@ fn generate_keypair_from_slice(priv_key: &[u8]) -> Result<Keypair, MmError<KeyPa
         .map_to_mm(|e| KeyPairCreationError::KeyPairFromSeed(e.to_string()))
 }
 
-pub async fn solana_coin_from_conf_and_params(
+pub async fn solana_coin_with_policy(
+    ctx: &MmArc,
     ticker: &str,
     conf: &Json,
     params: SolanaActivationParams,
-    priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> 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 priv_key = match priv_key_policy {
+        PrivKeyBuildPolicy::IguanaPrivKey(priv_key) => priv_key,
+        PrivKeyBuildPolicy::GlobalHDAccount(global_hd) => {
+            let derivation_path: StandardHDPathToCoin = try_s!(json::from_value(conf["derivation_path"].clone()));
+            try_s!(global_hd.derive_secp256k1_secret(&derivation_path))
+        },
+        PrivKeyBuildPolicy::Trezor => return ERR!("{}", PrivKeyPolicyNotAllowed::HardwareWalletNotSupported),
+    };
+
+    let key_pair = try_s!(generate_keypair_from_slice(priv_key.as_slice()));
     let my_address = key_pair.pubkey().to_string();
     let spl_tokens_infos = Arc::new(Mutex::new(HashMap::new()));
+
+    // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+    // all spawned futures related to `SolanaCoin` will be aborted as well.
+    let abortable_system: AbortableQueue = try_s!(ctx.abortable_system.create_subsystem());
+
     let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
         my_address,
         key_pair,
@@ -183,6 +210,7 @@ pub async fn solana_coin_from_conf_and_params(
         client,
         decimals,
         spl_tokens_infos,
+        abortable_system,
     }));
     Ok(solana_coin)
 }
@@ -195,17 +223,16 @@ pub struct SolanaCoinImpl {
     decimals: u8,
     my_address: String,
     spl_tokens_infos: Arc<Mutex<HashMap<String, SplTokenInfo>>>,
+    /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// and on [`MmArc::stop`].
+    pub abortable_system: AbortableQueue,
 }
 
-impl Debug for SolanaCoinImpl {
-    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&*self.ticker) }
-}
-
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct SolanaCoin(Arc<SolanaCoinImpl>);
 impl Deref for SolanaCoin {
     type Target = SolanaCoinImpl;
-    fn deref(&self) -> &SolanaCoinImpl { &*self.0 }
+    fn deref(&self) -> &SolanaCoinImpl { &self.0 }
 }
 
 #[async_trait]
@@ -265,11 +292,12 @@ async fn withdraw_base_coin_impl(coin: SolanaCoin, req: WithdrawRequest) -> With
         internal_id: vec![].into(),
         kmd_rewards: None,
         transaction_type: TransactionType::StandardTransfer,
+        memo: None,
     })
 }
 
 async fn withdraw_impl(coin: SolanaCoin, req: WithdrawRequest) -> WithdrawResult {
-    let validate_address_result = coin.validate_address(&*req.to);
+    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()),
@@ -315,14 +343,14 @@ impl SolanaCoin {
             });
         }
         let actual_token_pubkey =
-            Pubkey::from_str(&*token_accounts[0].pubkey).map_err(|e| BalanceError::Internal(format!("{:?}", e)))?;
+            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()))?;
+            BigDecimal::from_str(&amount.ui_amount_string).map_to_mm(|e| BalanceError::Internal(e.to_string()))?;
         Ok(CoinBalance {
             spendable: balance,
             unspendable: Default::default(),
@@ -343,6 +371,9 @@ impl SolanaCoin {
         self.spl_tokens_infos.lock().unwrap().insert(ticker, info);
     }
 
+    /// WARNING
+    /// Be very careful using this function since it returns dereferenced clone
+    /// of value behind the MutexGuard and makes it non-thread-safe.
     pub fn get_spl_tokens_infos(&self) -> HashMap<String, SplTokenInfo> {
         let guard = self.spl_tokens_infos.lock().unwrap();
         (*guard).clone()
@@ -352,7 +383,7 @@ impl SolanaCoin {
 impl MarketCoinOps for SolanaCoin {
     fn ticker(&self) -> &str { &self.ticker }
 
-    fn my_address(&self) -> Result<String, String> { Ok(self.my_address.clone()) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { Ok(self.my_address.clone()) }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
 
@@ -423,17 +454,23 @@ impl MarketCoinOps for SolanaCoin {
         unimplemented!()
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         _transaction: &[u8],
+        _secret_hash: &[u8],
         _wait_until: u64,
         _from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        _check_every: f64,
     ) -> TransactionFut {
         unimplemented!()
     }
 
-    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        MmError::err(TxMarshalingErr::NotSupported(
+            "tx_enum_from_bytes is not supported for Solana yet.".to_string(),
+        ))
+    }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
         let coin = self.clone();
@@ -448,111 +485,47 @@ impl MarketCoinOps for SolanaCoin {
     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_maker_payment(&self, _maker_payment_args: SendMakerPaymentArgs) -> 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_taker_payment(&self, _taker_payment_args: SendTakerPaymentArgs) -> 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],
+        _maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> 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],
+        _taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> 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 {
+    fn send_taker_refunds_payment(&self, _taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> 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 {
+    fn send_maker_refunds_payment(&self, _maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> 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> {
+    fn validate_fee(&self, _validate_fee_args: ValidateFeeArgs) -> 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_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> { unimplemented!() }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
-    }
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> { 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],
+        _if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         unimplemented!()
     }
@@ -571,7 +544,19 @@ impl SwapOps for SolanaCoin {
         unimplemented!()
     }
 
-    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
 
     fn negotiate_swap_contract_addr(
         &self,
@@ -580,20 +565,135 @@ impl SwapOps for SolanaCoin {
         unimplemented!()
     }
 
+    #[inline]
     fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+    }
+
+    fn validate_other_pubkey(&self, _raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> { unimplemented!() }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for SolanaCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for SolanaCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for SolanaCoin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
 }
 
-#[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 spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
+
     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 get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut { unimplemented!() }
+
     fn decimals(&self) -> u8 { self.decimals }
 
     fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { unimplemented!() }
@@ -636,18 +736,20 @@ impl MmCoin for SolanaCoin {
 
     async fn get_sender_trade_fee(
         &self,
-        value: TradePreimageValue,
-        stage: FeeApproxStage,
+        _value: TradePreimageValue,
+        _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        unimplemented!()
+    }
 
     async fn get_fee_to_send_taker_fee(
         &self,
-        dex_fee_amount: BigDecimal,
-        stage: FeeApproxStage,
+        _dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
@@ -662,9 +764,15 @@ impl MmCoin for SolanaCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { unimplemented!() }
 
+    fn fallback_swap_contract(&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 }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
diff --git a/mm2src/coins/solana/solana_common_tests.rs b/mm2src/coins/solana/solana_common_tests.rs
index 9f5eebddf7..6a332a462b 100644
--- a/mm2src/coins/solana/solana_common_tests.rs
+++ b/mm2src/coins/solana/solana_common_tests.rs
@@ -1,5 +1,5 @@
 use super::*;
-use crate::solana::spl::{SplToken, SplTokenConf};
+use crate::solana::spl::{SplToken, SplTokenFields};
 use bip39::Language;
 use crypto::privkey::key_pair_from_seed;
 use ed25519_dalek_bip32::{DerivationPath, ExtendedSecretKey};
@@ -60,10 +60,11 @@ pub fn spl_coin_for_test(
     token_contract_address: Pubkey,
 ) -> SplToken {
     let spl_coin = SplToken {
-        conf: Arc::new(SplTokenConf {
+        conf: Arc::new(SplTokenFields {
             decimals,
             ticker,
             token_contract_address,
+            abortable_system: AbortableQueue::default(),
         }),
         platform_coin: solana_coin,
     };
@@ -85,6 +86,7 @@ pub fn solana_coin_for_test(seed: String, net_type: SolanaNet) -> (MmArc, Solana
     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 spawner = AbortableQueue::default();
 
     let solana_coin = SolanaCoin(Arc::new(SolanaCoinImpl {
         decimals,
@@ -93,6 +95,7 @@ pub fn solana_coin_for_test(seed: String, net_type: SolanaNet) -> (MmArc, Solana
         ticker,
         client,
         spl_tokens_infos,
+        abortable_system: spawner,
     }));
     (ctx, solana_coin)
 }
diff --git a/mm2src/coins/solana/solana_decode_tx_helpers.rs b/mm2src/coins/solana/solana_decode_tx_helpers.rs
index 1f089de2df..2ac0876809 100644
--- a/mm2src/coins/solana/solana_decode_tx_helpers.rs
+++ b/mm2src/coins/solana/solana_decode_tx_helpers.rs
@@ -69,6 +69,7 @@ impl SolanaConfirmedTransaction {
                     internal_id: Default::default(),
                     kmd_rewards: None,
                     transaction_type: TransactionType::StandardTransfer,
+                    memo: None,
                 };
                 transactions.push(tx);
             }
diff --git a/mm2src/coins/solana/solana_tests.rs b/mm2src/coins/solana/solana_tests.rs
index 62f49f8173..5004d05dd8 100644
--- a/mm2src/coins/solana/solana_tests.rs
+++ b/mm2src/coins/solana/solana_tests.rs
@@ -28,6 +28,7 @@ fn solana_keypair_from_secp() {
 }
 
 // Research tests
+// TODO remove `ignore` attribute once the test is stable.
 #[test]
 #[ignore]
 #[cfg(not(target_arch = "wasm32"))]
@@ -35,13 +36,13 @@ 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(),
+            "hood vacant left trim hard mushroom device flavor ask better arrest again".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");
+        assert_eq!(public_address, "4rmosKwMH7zeaXGbej1PFybZBUyuUNQLf8RfyzCcYvkx");
+        assert_eq!(priv_key, "CZtxt17aTfDrJrzwBWdVqcmFwVVptW8EX7RRnth9tT3M");
         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);
diff --git a/mm2src/coins/solana/spl.rs b/mm2src/coins/solana/spl.rs
index 8447d10b28..05b4e76566 100644
--- a/mm2src/coins/solana/spl.rs
+++ b/mm2src/coins/solana/spl.rs
@@ -1,13 +1,22 @@
-use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum};
+use super::{CoinBalance, HistorySyncState, MarketCoinOps, MmCoin, SwapOps, TradeFee, TransactionEnum, WatcherOps};
+use crate::coin_errors::MyAddressError;
 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 crate::{BalanceFut, CheckIfMyPaymentSentArgs, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend,
+            MakerSwapTakerCoin, NegotiateSwapContractAddrErr, PaymentInstructions, PaymentInstructionsErr,
+            RawTransactionFut, RawTransactionRequest, RefundError, RefundResult, SearchForSwapTxSpendInput,
+            SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs,
+            SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs, SendTakerRefundsPaymentArgs,
+            SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs, SignatureResult, SolanaCoin,
+            TakerSwapMakerCoin, TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails,
+            TransactionFut, TransactionType, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
+            ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
+            ValidatePaymentFut, ValidatePaymentInput, VerificationResult, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawError, WithdrawFut, WithdrawRequest,
+            WithdrawResult};
 use async_trait::async_trait;
 use bincode::serialize;
+use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError};
 use common::{async_blocking, now_ms};
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
@@ -30,13 +39,18 @@ use std::{convert::TryFrom,
 #[derive(Debug)]
 pub enum SplTokenCreationError {
     InvalidPubkey(String),
+    Internal(String),
 }
 
-#[derive(Debug)]
-pub struct SplTokenConf {
+impl From<AbortedError> for SplTokenCreationError {
+    fn from(e: AbortedError) -> Self { SplTokenCreationError::Internal(e.to_string()) }
+}
+
+pub struct SplTokenFields {
     pub decimals: u8,
     pub ticker: String,
     pub token_contract_address: Pubkey,
+    pub abortable_system: AbortableQueue,
 }
 
 #[derive(Clone, Debug)]
@@ -54,12 +68,12 @@ pub struct SplProtocolConf {
 
 #[derive(Clone)]
 pub struct SplToken {
-    pub conf: Arc<SplTokenConf>,
+    pub conf: Arc<SplTokenFields>,
     pub platform_coin: SolanaCoin,
 }
 
 impl Debug for SplToken {
-    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&*self.conf.ticker) }
+    fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { f.write_str(&self.conf.ticker) }
 }
 
 impl SplToken {
@@ -68,13 +82,19 @@ impl SplToken {
         ticker: String,
         token_address: String,
         platform_coin: SolanaCoin,
-    ) -> Result<SplToken, MmError<SplTokenCreationError>> {
+    ) -> MmResult<SplToken, 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 {
+
+        // Create an abortable system linked to the `platform_coin` so if the platform coin is disabled,
+        // all spawned futures related to `SplToken` will be aborted as well.
+        let abortable_system = platform_coin.abortable_system.create_subsystem()?;
+
+        let conf = Arc::new(SplTokenFields {
             decimals,
             ticker,
             token_contract_address,
+            abortable_system,
         });
         Ok(SplToken { conf, platform_coin })
     }
@@ -149,11 +169,12 @@ async fn withdraw_spl_token_impl(coin: SplToken, req: WithdrawRequest) -> Withdr
         internal_id: vec![].into(),
         kmd_rewards: None,
         transaction_type: TransactionType::StandardTransfer,
+        memo: None,
     })
 }
 
 async fn withdraw_impl(coin: SplToken, req: WithdrawRequest) -> WithdrawResult {
-    let validate_address_result = coin.validate_address(&*req.to);
+    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()),
@@ -193,7 +214,7 @@ impl SplToken {
         if token_accounts.is_empty() {
             return MmError::err(AccountError::NotFundedError("account_not_funded".to_string()));
         }
-        Ok(Pubkey::from_str(&*token_accounts[0].pubkey)?)
+        Ok(Pubkey::from_str(&token_accounts[0].pubkey)?)
     }
 
     fn my_balance_impl(&self) -> BalanceFut<CoinBalance> {
@@ -213,7 +234,7 @@ impl SplToken {
 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 my_address(&self) -> MmResult<String, MyAddressError> { Ok(self.platform_coin.my_address.clone()) }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
 
@@ -257,17 +278,23 @@ impl MarketCoinOps for SplToken {
         unimplemented!()
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         _transaction: &[u8],
+        _secret_hash: &[u8],
         _wait_until: u64,
         _from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         unimplemented!()
     }
 
-    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        MmError::err(TxMarshalingErr::NotSupported(
+            "tx_enum_from_bytes is not supported for Spl yet.".to_string(),
+        ))
+    }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { self.platform_coin.current_block() }
 
@@ -278,111 +305,47 @@ impl MarketCoinOps for SplToken {
     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_maker_payment(&self, _maker_payment_args: SendMakerPaymentArgs) -> 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_taker_payment(&self, _taker_payment_args: SendTakerPaymentArgs) -> 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],
+        _maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> 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],
+        _taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> 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 {
+    fn send_taker_refunds_payment(&self, _taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> 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 {
+    fn send_maker_refunds_payment(&self, _maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> 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> {
+    fn validate_fee(&self, _validate_fee_args: ValidateFeeArgs) -> 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_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> { unimplemented!() }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
-    }
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> { 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],
+        _if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         unimplemented!()
     }
@@ -401,7 +364,19 @@ impl SwapOps for SplToken {
         unimplemented!()
     }
 
-    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
 
     fn negotiate_swap_contract_addr(
         &self,
@@ -410,20 +385,135 @@ impl SwapOps for SplToken {
         unimplemented!()
     }
 
+    #[inline]
     fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { todo!() }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+    }
+
+    fn validate_other_pubkey(&self, _raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> { unimplemented!() }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for SplToken {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for SplToken {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for SplToken {
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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 create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
 }
 
-#[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 spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.conf.abortable_system) }
+
     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 get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut { unimplemented!() }
+
     fn decimals(&self) -> u8 { self.conf.decimals }
 
     fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> { unimplemented!() }
@@ -445,7 +535,9 @@ impl MmCoin for SplToken {
         unimplemented!()
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        unimplemented!()
+    }
 
     async fn get_fee_to_send_taker_fee(
         &self,
@@ -465,9 +557,15 @@ impl MmCoin for SplToken {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { unimplemented!() }
 
+    fn fallback_swap_contract(&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 }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { self.conf.abortable_system.abort_all() }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
diff --git a/mm2src/coins/solana/spl_tests.rs b/mm2src/coins/solana/spl_tests.rs
index c1c45de5c6..22af85ef5c 100644
--- a/mm2src/coins/solana/spl_tests.rs
+++ b/mm2src/coins/solana/spl_tests.rs
@@ -89,6 +89,7 @@ fn spl_my_balance() {
     assert_eq!(res.spendable, BigDecimal::from(0));
 }
 
+// Stop ignoring when Solana is released
 #[test]
 #[ignore]
 #[cfg(not(target_arch = "wasm32"))]
diff --git a/mm2src/coins/tendermint/iris/htlc.rs b/mm2src/coins/tendermint/iris/htlc.rs
new file mode 100644
index 0000000000..226c1794fc
--- /dev/null
+++ b/mm2src/coins/tendermint/iris/htlc.rs
@@ -0,0 +1,176 @@
+// IRIS HTLC implementation in Rust on top of Cosmos SDK(cosmrs) for AtomicDEX.
+//
+// This module includes HTLC creating & claiming representation structstures
+// and their trait implementations.
+//
+// ** Acquiring testnet assets **
+//
+// Since there is no sdk exists for Rust on Iris Network, we should
+// either implement some of the Iris Network funcionality on Rust or
+// simply use their unit tests.
+//
+// Because we had limited time for the HTLC implementation, for now
+// we can use their unit tests in order to acquire IBC assets.
+// For that, clone https://github.com/ozkanonur/irishub-sdk-js repository and check
+// dummy.test.ts file(change the asset, amount, target address if needed)
+// and then run the following commands:
+// - yarn
+// - npm run test
+//
+// If the sender address doesn't have enough nyan tokens to complete unit tests,
+// check this page https://www.irisnet.org/docs/get-started/testnet.html#faucet
+
+use super::htlc_proto::{ClaimHtlcProtoRep, CreateHtlcProtoRep};
+
+use crate::tendermint::type_urls::{CLAIM_HTLC_TYPE_URL, CREATE_HTLC_TYPE_URL};
+use cosmrs::{tx::{Msg, MsgProto},
+             AccountId, Coin, ErrorReport};
+use std::convert::TryFrom;
+
+// https://github.com/irisnet/irismod/blob/043e058cd6e17f4f96d32f17bfd20b67debfab0b/proto/htlc/htlc.proto#L36
+pub const HTLC_STATE_OPEN: i32 = 0;
+pub const HTLC_STATE_COMPLETED: i32 = 1;
+pub const HTLC_STATE_REFUNDED: i32 = 2;
+
+#[allow(dead_code)]
+pub(crate) struct IrisHtlc {
+    /// Generated HTLC's ID.
+    pub(crate) id: String,
+
+    /// Message payload to be sent
+    pub(crate) msg_payload: cosmrs::Any,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub(crate) struct MsgCreateHtlc {
+    /// Sender's address.
+    pub(crate) to: AccountId,
+
+    /// Recipient's address.
+    pub(crate) sender: AccountId,
+
+    /// The claim receiving address on the other chain.
+    pub(crate) receiver_on_other_chain: String,
+
+    /// The counterparty creator address on the other chain.
+    pub(crate) sender_on_other_chain: String,
+
+    /// Amount to send.
+    pub(crate) amount: Vec<Coin>,
+
+    /// The sha256 hash generated from secret and timestamp.
+    pub(crate) hash_lock: String,
+
+    /// The number of blocks to wait before the asset may be returned to.
+    pub(crate) time_lock: u64,
+
+    /// The timestamp in seconds for generating hash lock if provided.
+    pub(crate) timestamp: u64,
+
+    /// Whether it is an HTLT transaction.
+    pub(crate) transfer: bool,
+}
+
+impl Msg for MsgCreateHtlc {
+    type Proto = CreateHtlcProtoRep;
+}
+
+impl TryFrom<CreateHtlcProtoRep> for MsgCreateHtlc {
+    type Error = ErrorReport;
+
+    fn try_from(proto: CreateHtlcProtoRep) -> Result<MsgCreateHtlc, Self::Error> { MsgCreateHtlc::try_from(&proto) }
+}
+
+impl TryFrom<&CreateHtlcProtoRep> for MsgCreateHtlc {
+    type Error = ErrorReport;
+
+    fn try_from(proto: &CreateHtlcProtoRep) -> Result<MsgCreateHtlc, Self::Error> {
+        Ok(MsgCreateHtlc {
+            sender: proto.sender.parse()?,
+            to: proto.to.parse()?,
+            amount: proto.amount.iter().map(TryFrom::try_from).collect::<Result<_, _>>()?,
+            receiver_on_other_chain: proto.receiver_on_other_chain.clone(),
+            sender_on_other_chain: proto.sender_on_other_chain.clone(),
+            hash_lock: proto.hash_lock.clone(),
+            timestamp: proto.timestamp,
+            time_lock: proto.time_lock,
+            transfer: proto.transfer,
+        })
+    }
+}
+
+impl From<MsgCreateHtlc> for CreateHtlcProtoRep {
+    fn from(coin: MsgCreateHtlc) -> CreateHtlcProtoRep { CreateHtlcProtoRep::from(&coin) }
+}
+
+impl From<&MsgCreateHtlc> for CreateHtlcProtoRep {
+    fn from(msg: &MsgCreateHtlc) -> CreateHtlcProtoRep {
+        CreateHtlcProtoRep {
+            sender: msg.sender.to_string(),
+            to: msg.to.to_string(),
+            amount: msg.amount.iter().map(Into::into).collect(),
+            receiver_on_other_chain: msg.receiver_on_other_chain.clone(),
+            sender_on_other_chain: msg.sender_on_other_chain.clone(),
+            hash_lock: msg.hash_lock.clone(),
+            timestamp: msg.timestamp,
+            time_lock: msg.time_lock,
+            transfer: msg.transfer,
+        }
+    }
+}
+
+impl MsgProto for CreateHtlcProtoRep {
+    const TYPE_URL: &'static str = CREATE_HTLC_TYPE_URL;
+}
+
+#[derive(Clone)]
+pub(crate) struct MsgClaimHtlc {
+    /// Sender's address.
+    pub(crate) sender: AccountId,
+
+    /// Generated HTLC ID
+    pub(crate) id: String,
+
+    /// Secret that has been used for generating hash_lock
+    pub(crate) secret: String,
+}
+
+impl Msg for MsgClaimHtlc {
+    type Proto = ClaimHtlcProtoRep;
+}
+
+impl TryFrom<ClaimHtlcProtoRep> for MsgClaimHtlc {
+    type Error = ErrorReport;
+
+    fn try_from(proto: ClaimHtlcProtoRep) -> Result<MsgClaimHtlc, Self::Error> { MsgClaimHtlc::try_from(&proto) }
+}
+
+impl TryFrom<&ClaimHtlcProtoRep> for MsgClaimHtlc {
+    type Error = ErrorReport;
+
+    fn try_from(proto: &ClaimHtlcProtoRep) -> Result<MsgClaimHtlc, Self::Error> {
+        Ok(MsgClaimHtlc {
+            sender: proto.sender.parse()?,
+            id: proto.id.clone(),
+            secret: proto.secret.clone(),
+        })
+    }
+}
+
+impl From<MsgClaimHtlc> for ClaimHtlcProtoRep {
+    fn from(coin: MsgClaimHtlc) -> ClaimHtlcProtoRep { ClaimHtlcProtoRep::from(&coin) }
+}
+
+impl From<&MsgClaimHtlc> for ClaimHtlcProtoRep {
+    fn from(msg: &MsgClaimHtlc) -> ClaimHtlcProtoRep {
+        ClaimHtlcProtoRep {
+            sender: msg.sender.to_string(),
+            id: msg.id.clone(),
+            secret: msg.secret.clone(),
+        }
+    }
+}
+
+impl MsgProto for ClaimHtlcProtoRep {
+    const TYPE_URL: &'static str = CLAIM_HTLC_TYPE_URL;
+}
diff --git a/mm2src/coins/tendermint/iris/htlc_proto.rs b/mm2src/coins/tendermint/iris/htlc_proto.rs
new file mode 100644
index 0000000000..7bf9b5281b
--- /dev/null
+++ b/mm2src/coins/tendermint/iris/htlc_proto.rs
@@ -0,0 +1,81 @@
+#[derive(prost::Message)]
+pub(crate) struct CreateHtlcProtoRep {
+    #[prost(string, tag = "1")]
+    pub(crate) sender: prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub(crate) to: prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub(crate) receiver_on_other_chain: prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub(crate) sender_on_other_chain: prost::alloc::string::String,
+    #[prost(message, repeated, tag = "5")]
+    pub(crate) amount: prost::alloc::vec::Vec<cosmrs::proto::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "6")]
+    pub(crate) hash_lock: prost::alloc::string::String,
+    #[prost(uint64, tag = "7")]
+    pub(crate) timestamp: u64,
+    #[prost(uint64, tag = "8")]
+    pub(crate) time_lock: u64,
+    #[prost(bool, tag = "9")]
+    pub(crate) transfer: bool,
+}
+
+#[derive(prost::Message)]
+pub(crate) struct ClaimHtlcProtoRep {
+    #[prost(string, tag = "1")]
+    pub(crate) sender: prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub(crate) id: prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub(crate) secret: prost::alloc::string::String,
+}
+
+#[derive(prost::Message)]
+pub(crate) struct QueryHtlcRequestProto {
+    #[prost(string, tag = "1")]
+    pub(crate) id: prost::alloc::string::String,
+}
+
+#[derive(prost::Enumeration, Debug)]
+#[repr(i32)]
+pub enum HtlcState {
+    Open = 0,
+    Completed = 1,
+    Refunded = 2,
+}
+
+#[derive(prost::Message)]
+pub struct HtlcProto {
+    #[prost(string, tag = "1")]
+    pub(crate) id: prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub(crate) sender: prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub(crate) to: prost::alloc::string::String,
+    #[prost(string, tag = "4")]
+    pub(crate) receiver_on_other_chain: prost::alloc::string::String,
+    #[prost(string, tag = "5")]
+    pub(crate) sender_on_other_chain: prost::alloc::string::String,
+    #[prost(message, repeated, tag = "6")]
+    pub(crate) amount: prost::alloc::vec::Vec<cosmrs::proto::cosmos::base::v1beta1::Coin>,
+    #[prost(string, tag = "7")]
+    pub(crate) hash_lock: prost::alloc::string::String,
+    #[prost(string, tag = "8")]
+    pub(crate) secret: prost::alloc::string::String,
+    #[prost(uint64, tag = "9")]
+    pub(crate) timestamp: u64,
+    #[prost(uint64, tag = "10")]
+    pub(crate) expiration_height: u64,
+    #[prost(enumeration = "HtlcState", tag = "11")]
+    pub(crate) state: i32,
+    #[prost(uint64, tag = "12")]
+    pub(crate) closed_block: u64,
+    #[prost(bool, tag = "13")]
+    pub(crate) transfer: bool,
+}
+
+#[derive(prost::Message)]
+pub(crate) struct QueryHtlcResponseProto {
+    #[prost(message, tag = "1")]
+    pub(crate) htlc: Option<HtlcProto>,
+}
diff --git a/mm2src/coins/tendermint/iris/mod.rs b/mm2src/coins/tendermint/iris/mod.rs
new file mode 100644
index 0000000000..00c493c504
--- /dev/null
+++ b/mm2src/coins/tendermint/iris/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod htlc;
+pub(crate) mod htlc_proto;
diff --git a/mm2src/coins/tendermint/mod.rs b/mm2src/coins/tendermint/mod.rs
new file mode 100644
index 0000000000..6e904c4567
--- /dev/null
+++ b/mm2src/coins/tendermint/mod.rs
@@ -0,0 +1,30 @@
+// Module implementing Tendermint (Cosmos) integration
+// Useful resources
+// https://docs.cosmos.network/
+
+mod iris;
+mod rpc;
+mod tendermint_coin;
+mod tendermint_token;
+pub mod tendermint_tx_history_v2;
+
+pub use tendermint_coin::*;
+pub use tendermint_token::*;
+
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum CustomTendermintMsgType {
+    /// Create HTLC as sender
+    SendHtlcAmount,
+    /// Claim HTLC as reciever
+    ClaimHtlcAmount,
+    /// Claim HTLC for reciever
+    SignClaimHtlc,
+}
+
+pub(crate) const TENDERMINT_COIN_PROTOCOL_TYPE: &str = "TENDERMINT";
+pub(crate) const TENDERMINT_ASSET_PROTOCOL_TYPE: &str = "TENDERMINTTOKEN";
+
+pub(crate) mod type_urls {
+    pub(crate) const CREATE_HTLC_TYPE_URL: &str = "/irismod.htlc.MsgCreateHTLC";
+    pub(crate) const CLAIM_HTLC_TYPE_URL: &str = "/irismod.htlc.MsgClaimHTLC";
+}
diff --git a/mm2src/coins/tendermint/rpc/mod.rs b/mm2src/coins/tendermint/rpc/mod.rs
new file mode 100644
index 0000000000..bd34834ce9
--- /dev/null
+++ b/mm2src/coins/tendermint/rpc/mod.rs
@@ -0,0 +1,23 @@
+#[cfg(not(target_arch = "wasm32"))] mod tendermint_native_rpc;
+#[cfg(not(target_arch = "wasm32"))]
+pub use tendermint_native_rpc::*;
+
+#[cfg(target_arch = "wasm32")] mod tendermint_wasm_rpc;
+#[cfg(target_arch = "wasm32")] pub use tendermint_wasm_rpc::*;
+
+pub(crate) const TX_SUCCESS_CODE: u32 = 0;
+
+#[repr(u8)]
+pub enum TendermintResultOrder {
+    Ascending = 1,
+    Descending,
+}
+
+impl From<TendermintResultOrder> for Order {
+    fn from(order: TendermintResultOrder) -> Self {
+        match order {
+            TendermintResultOrder::Ascending => Self::Ascending,
+            TendermintResultOrder::Descending => Self::Descending,
+        }
+    }
+}
diff --git a/mm2src/coins/tendermint/rpc/tendermint_native_rpc.rs b/mm2src/coins/tendermint/rpc/tendermint_native_rpc.rs
new file mode 100644
index 0000000000..dde181b3e3
--- /dev/null
+++ b/mm2src/coins/tendermint/rpc/tendermint_native_rpc.rs
@@ -0,0 +1,497 @@
+use async_trait::async_trait;
+use core::convert::{TryFrom, TryInto};
+use core::str::FromStr;
+pub use cosmrs::tendermint::abci::Path as AbciPath;
+use cosmrs::tendermint::abci::{self, Transaction};
+use cosmrs::tendermint::block::Height;
+use cosmrs::tendermint::evidence::Evidence;
+use cosmrs::tendermint::Genesis;
+use serde::{de::DeserializeOwned, Serialize};
+use std::fmt;
+use std::time::Duration;
+use tendermint_config::net;
+use tendermint_rpc::endpoint::validators::DEFAULT_VALIDATORS_PER_PAGE;
+use tendermint_rpc::endpoint::*;
+pub use tendermint_rpc::endpoint::{abci_query::Request as AbciRequest, health::Request as HealthRequest,
+                                   tx_search::Request as TxSearchRequest};
+use tendermint_rpc::Paging;
+pub use tendermint_rpc::{query::Query as TendermintQuery, Error, Order, Scheme, SimpleRequest, Url};
+use tokio::time;
+
+/// Provides lightweight access to the Tendermint RPC. It gives access to all
+/// endpoints with the exception of the event subscription-related ones.
+///
+/// To access event subscription capabilities, use a client that implements the
+/// [`SubscriptionClient`] trait.
+///
+/// [`SubscriptionClient`]: trait.SubscriptionClient.html
+#[async_trait]
+pub trait Client {
+    /// `/abci_info`: get information about the ABCI application.
+    async fn abci_info(&self) -> Result<abci_info::AbciInfo, Error> {
+        Ok(self.perform(abci_info::Request).await?.response)
+    }
+
+    /// `/abci_query`: query the ABCI application
+    async fn abci_query<V>(
+        &self,
+        path: Option<abci::Path>,
+        data: V,
+        height: Option<Height>,
+        prove: bool,
+    ) -> Result<abci_query::AbciQuery, Error>
+    where
+        V: Into<Vec<u8>> + Send,
+    {
+        Ok(self
+            .perform(abci_query::Request::new(path, data, height, prove))
+            .await?
+            .response)
+    }
+
+    /// `/block`: get block at a given height.
+    async fn block<H>(&self, height: H) -> Result<block::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        self.perform(block::Request::new(height.into())).await
+    }
+
+    /// `/block`: get the latest block.
+    async fn latest_block(&self) -> Result<block::Response, Error> { self.perform(block::Request::default()).await }
+
+    /// `/block_results`: get ABCI results for a block at a particular height.
+    async fn block_results<H>(&self, height: H) -> Result<block_results::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        self.perform(block_results::Request::new(height.into())).await
+    }
+
+    /// `/block_results`: get ABCI results for the latest block.
+    async fn latest_block_results(&self) -> Result<block_results::Response, Error> {
+        self.perform(block_results::Request::default()).await
+    }
+
+    /// `/block_search`: search for blocks by BeginBlock and EndBlock events.
+    async fn block_search(
+        &self,
+        query: TendermintQuery,
+        page: u32,
+        per_page: u8,
+        order: Order,
+    ) -> Result<block_search::Response, Error> {
+        self.perform(block_search::Request::new(query, page, per_page, order))
+            .await
+    }
+
+    /// `/blockchain`: get block headers for `min` <= `height` <= `max`.
+    ///
+    /// Block headers are returned in descending order (highest first).
+    ///
+    /// Returns at most 20 items.
+    async fn blockchain<H>(&self, min: H, max: H) -> Result<blockchain::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        // TODO(tarcieri): return errors for invalid params before making request?
+        self.perform(blockchain::Request::new(min.into(), max.into())).await
+    }
+
+    /// `/broadcast_tx_async`: broadcast a transaction, returning immediately.
+    async fn broadcast_tx_async(&self, tx: Transaction) -> Result<broadcast::tx_async::Response, Error> {
+        self.perform(broadcast::tx_async::Request::new(tx)).await
+    }
+
+    /// `/broadcast_tx_sync`: broadcast a transaction, returning the response
+    /// from `CheckTx`.
+    async fn broadcast_tx_sync(&self, tx: Transaction) -> Result<broadcast::tx_sync::Response, Error> {
+        self.perform(broadcast::tx_sync::Request::new(tx)).await
+    }
+
+    /// `/broadcast_tx_commit`: broadcast a transaction, returning the response
+    /// from `DeliverTx`.
+    async fn broadcast_tx_commit(&self, tx: Transaction) -> Result<broadcast::tx_commit::Response, Error> {
+        self.perform(broadcast::tx_commit::Request::new(tx)).await
+    }
+
+    /// `/commit`: get block commit at a given height.
+    async fn commit<H>(&self, height: H) -> Result<commit::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        self.perform(commit::Request::new(height.into())).await
+    }
+
+    /// `/consensus_params`: get current consensus parameters at the specified
+    /// height.
+    async fn consensus_params<H>(&self, height: H) -> Result<consensus_params::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        self.perform(consensus_params::Request::new(Some(height.into()))).await
+    }
+
+    /// `/consensus_state`: get current consensus state
+    async fn consensus_state(&self) -> Result<consensus_state::Response, Error> {
+        self.perform(consensus_state::Request::new()).await
+    }
+
+    // TODO(thane): Simplify once validators endpoint removes pagination.
+    /// `/validators`: get validators a given height.
+    async fn validators<H>(&self, height: H, paging: Paging) -> Result<validators::Response, Error>
+    where
+        H: Into<Height> + Send,
+    {
+        let height = height.into();
+        match paging {
+            Paging::Default => self.perform(validators::Request::new(Some(height), None, None)).await,
+            Paging::Specific { page_number, per_page } => {
+                self.perform(validators::Request::new(
+                    Some(height),
+                    Some(page_number),
+                    Some(per_page),
+                ))
+                .await
+            },
+            Paging::All => {
+                let mut page_num = 1_usize;
+                let mut validators = Vec::new();
+                let per_page = DEFAULT_VALIDATORS_PER_PAGE.into();
+                loop {
+                    let response = self
+                        .perform(validators::Request::new(
+                            Some(height),
+                            Some(page_num.into()),
+                            Some(per_page),
+                        ))
+                        .await?;
+                    validators.extend(response.validators);
+                    if validators.len() as i32 == response.total {
+                        return Ok(validators::Response::new(
+                            response.block_height,
+                            validators,
+                            response.total,
+                        ));
+                    }
+                    page_num += 1;
+                }
+            },
+        }
+    }
+
+    /// `/consensus_params`: get the latest consensus parameters.
+    async fn latest_consensus_params(&self) -> Result<consensus_params::Response, Error> {
+        self.perform(consensus_params::Request::new(None)).await
+    }
+
+    /// `/commit`: get the latest block commit
+    async fn latest_commit(&self) -> Result<commit::Response, Error> { self.perform(commit::Request::default()).await }
+
+    /// `/health`: get node health.
+    ///
+    /// Returns empty result (200 OK) on success, no response in case of an error.
+    async fn health(&self) -> Result<(), Error> {
+        self.perform(health::Request).await?;
+        Ok(())
+    }
+
+    /// `/genesis`: get genesis file.
+    async fn genesis<AppState>(&self) -> Result<Genesis<AppState>, Error>
+    where
+        AppState: fmt::Debug + Serialize + DeserializeOwned + Send,
+    {
+        Ok(self.perform(genesis::Request::default()).await?.genesis)
+    }
+
+    /// `/net_info`: obtain information about P2P and other network connections.
+    async fn net_info(&self) -> Result<net_info::Response, Error> { self.perform(net_info::Request).await }
+
+    /// `/status`: get Tendermint status including node info, pubkey, latest
+    /// block hash, app hash, block height and time.
+    async fn status(&self) -> Result<status::Response, Error> { self.perform(status::Request).await }
+
+    /// `/broadcast_evidence`: broadcast an evidence.
+    async fn broadcast_evidence(&self, e: Evidence) -> Result<evidence::Response, Error> {
+        self.perform(evidence::Request::new(e)).await
+    }
+
+    /// `/tx`: find transaction by hash.
+    async fn tx(&self, hash: abci::transaction::Hash, prove: bool) -> Result<tx::Response, Error> {
+        self.perform(tx::Request::new(hash, prove)).await
+    }
+
+    /// `/tx_search`: search for transactions with their results.
+    async fn tx_search(
+        &self,
+        query: TendermintQuery,
+        prove: bool,
+        page: u32,
+        per_page: u8,
+        order: Order,
+    ) -> Result<tx_search::Response, Error> {
+        self.perform(tx_search::Request::new(query, prove, page, per_page, order))
+            .await
+    }
+
+    /// Poll the `/health` endpoint until it returns a successful result or
+    /// the given `timeout` has elapsed.
+    async fn wait_until_healthy<T>(&self, timeout: T) -> Result<(), Error>
+    where
+        T: Into<Duration> + Send,
+    {
+        let timeout = timeout.into();
+        let poll_interval = Duration::from_millis(200);
+        let mut attempts_remaining = timeout.as_millis() / poll_interval.as_millis();
+
+        while self.health().await.is_err() {
+            if attempts_remaining == 0 {
+                return Err(Error::timeout(timeout));
+            }
+
+            attempts_remaining -= 1;
+            time::sleep(poll_interval).await;
+        }
+
+        Ok(())
+    }
+
+    /// Perform a request against the RPC endpoint
+    async fn perform<R>(&self, request: R) -> Result<R::Response, Error>
+    where
+        R: SimpleRequest;
+}
+
+/// A JSON-RPC/HTTP Tendermint RPC client (implements [`crate::Client`]).
+///
+/// Supports both HTTP and HTTPS connections to Tendermint RPC endpoints, and
+/// allows for the use of HTTP proxies (see [`HttpClient::new_with_proxy`] for
+/// details).
+///
+/// Does not provide [`crate::event::Event`] subscription facilities (see
+/// [`crate::WebSocketClient`] for a client that does).
+///
+/// ## Examples
+///
+/// ```rust,ignore
+/// use tendermint_rpc::{HttpClient, Client};
+///
+/// #[tokio::main]
+/// async fn main() {
+///     let client = HttpClient::new("http://127.0.0.1:26657")
+///         .unwrap();
+///
+///     let abci_info = client.abci_info()
+///         .await
+///         .unwrap();
+///
+///     println!("Got ABCI info: {:?}", abci_info);
+/// }
+/// ```
+#[derive(Debug, Clone)]
+pub struct HttpClient {
+    inner: sealed::HttpClient,
+}
+
+impl HttpClient {
+    /// Construct a new Tendermint RPC HTTP/S client connecting to the given
+    /// URL.
+    pub fn new<U>(url: U) -> Result<Self, Error>
+    where
+        U: TryInto<HttpClientUrl, Error = Error>,
+    {
+        let url = url.try_into()?;
+        Ok(Self {
+            inner: if url.0.is_secure() {
+                sealed::HttpClient::new_https(url.try_into()?)
+            } else {
+                sealed::HttpClient::new_http(url.try_into()?)
+            },
+        })
+    }
+}
+
+#[async_trait]
+impl Client for HttpClient {
+    async fn perform<R>(&self, request: R) -> Result<R::Response, Error>
+    where
+        R: SimpleRequest,
+    {
+        self.inner.perform(request).await
+    }
+}
+
+/// A URL limited to use with HTTP clients.
+///
+/// Facilitates useful type conversions and inferences.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct HttpClientUrl(Url);
+
+impl TryFrom<Url> for HttpClientUrl {
+    type Error = Error;
+
+    fn try_from(value: Url) -> Result<Self, Error> {
+        match value.scheme() {
+            Scheme::Http | Scheme::Https => Ok(Self(value)),
+            _ => Err(Error::invalid_url(value)),
+        }
+    }
+}
+
+impl FromStr for HttpClientUrl {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Error> {
+        let url: Url = s.parse()?;
+        url.try_into()
+    }
+}
+
+impl TryFrom<&str> for HttpClientUrl {
+    type Error = Error;
+
+    fn try_from(value: &str) -> Result<Self, Error> { value.parse() }
+}
+
+impl TryFrom<net::Address> for HttpClientUrl {
+    type Error = Error;
+
+    fn try_from(value: net::Address) -> Result<Self, Error> {
+        match value {
+            net::Address::Tcp { peer_id: _, host, port } => format!("http://{}:{}", host, port).parse(),
+            net::Address::Unix { .. } => Err(Error::invalid_network_address()),
+        }
+    }
+}
+
+impl From<HttpClientUrl> for Url {
+    fn from(url: HttpClientUrl) -> Self { url.0 }
+}
+
+impl TryFrom<HttpClientUrl> for hyper::Uri {
+    type Error = Error;
+
+    fn try_from(value: HttpClientUrl) -> Result<Self, Error> {
+        value
+            .0
+            .to_string()
+            .parse()
+            .map_err(|e: http::uri::InvalidUri| Error::parse(e.to_string()))
+    }
+}
+
+mod sealed {
+    use common::log::debug;
+    use hyper::body::Buf;
+    use hyper::client::connect::Connect;
+    use hyper::client::HttpConnector;
+    use hyper::{header, Uri};
+    use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
+    use std::io::Read;
+    use tendermint_rpc::{Error, Response, SimpleRequest};
+
+    fn https_connector() -> HttpsConnector<HttpConnector> {
+        HttpsConnectorBuilder::new()
+            .with_webpki_roots()
+            .https_or_http()
+            .enable_http1()
+            .enable_http2()
+            .build()
+    }
+
+    /// A wrapper for a `hyper`-based client, generic over the connector type.
+    #[derive(Debug, Clone)]
+    pub struct HyperClient<C> {
+        uri: Uri,
+        inner: hyper::Client<C>,
+    }
+
+    impl<C> HyperClient<C> {
+        pub fn new(uri: Uri, inner: hyper::Client<C>) -> Self { Self { uri, inner } }
+    }
+
+    impl<C> HyperClient<C>
+    where
+        C: Connect + Clone + Send + Sync + 'static,
+    {
+        pub async fn perform<R>(&self, request: R) -> Result<R::Response, Error>
+        where
+            R: SimpleRequest,
+        {
+            let request = self.build_request(request)?;
+            let response = self
+                .inner
+                .request(request)
+                .await
+                .map_err(|e| Error::client_internal(e.to_string()))?;
+            let response_body = response_to_string(response).await?;
+            debug!("Incoming response: {}", response_body);
+            R::Response::from_string(&response_body)
+        }
+    }
+
+    impl<C> HyperClient<C> {
+        /// Build a request using the given Tendermint RPC request.
+        pub fn build_request<R: SimpleRequest>(&self, request: R) -> Result<hyper::Request<hyper::Body>, Error> {
+            let request_body = request.into_json();
+
+            let mut request = hyper::Request::builder()
+                .method("POST")
+                .uri(&self.uri)
+                .body(hyper::Body::from(request_body.into_bytes()))
+                .map_err(|e| Error::client_internal(e.to_string()))?;
+
+            {
+                let headers = request.headers_mut();
+                headers.insert(header::CONTENT_TYPE, "application/json".parse().unwrap());
+                headers.insert(
+                    header::USER_AGENT,
+                    format!("tendermint.rs/{}", env!("CARGO_PKG_VERSION")).parse().unwrap(),
+                );
+            }
+
+            Ok(request)
+        }
+    }
+
+    /// We offer several variations of `hyper`-based client.
+    ///
+    /// Here we erase the type signature of the underlying `hyper`-based
+    /// client, allowing the higher-level HTTP client to operate via HTTP or
+    /// HTTPS, and with or without a proxy.
+    #[derive(Debug, Clone)]
+    pub enum HttpClient {
+        Http(HyperClient<HttpConnector>),
+        Https(HyperClient<HttpsConnector<HttpConnector>>),
+    }
+
+    impl HttpClient {
+        pub fn new_http(uri: Uri) -> Self { Self::Http(HyperClient::new(uri, hyper::Client::new())) }
+
+        pub fn new_https(uri: Uri) -> Self {
+            Self::Https(HyperClient::new(uri, hyper::Client::builder().build(https_connector())))
+        }
+
+        pub async fn perform<R>(&self, request: R) -> Result<R::Response, Error>
+        where
+            R: SimpleRequest,
+        {
+            match self {
+                HttpClient::Http(c) => c.perform(request).await,
+                HttpClient::Https(c) => c.perform(request).await,
+            }
+        }
+    }
+
+    async fn response_to_string(response: hyper::Response<hyper::Body>) -> Result<String, Error> {
+        let mut response_body = String::new();
+        hyper::body::aggregate(response.into_body())
+            .await
+            .map_err(|e| Error::client_internal(e.to_string()))?
+            .reader()
+            .read_to_string(&mut response_body)
+            .map_err(Error::io)?;
+
+        Ok(response_body)
+    }
+}
diff --git a/mm2src/coins/tendermint/rpc/tendermint_wasm_rpc.rs b/mm2src/coins/tendermint/rpc/tendermint_wasm_rpc.rs
new file mode 100644
index 0000000000..036815a25f
--- /dev/null
+++ b/mm2src/coins/tendermint/rpc/tendermint_wasm_rpc.rs
@@ -0,0 +1,123 @@
+use common::APPLICATION_JSON;
+pub use cosmrs::tendermint::abci::Path as AbciPath;
+use cosmrs::tendermint::abci::Transaction;
+use cosmrs::tendermint::block::Height;
+use derive_more::Display;
+use http::header::{ACCEPT, CONTENT_TYPE};
+use http::uri::InvalidUri;
+use http::{StatusCode, Uri};
+use mm2_net::transport::SlurpError;
+use mm2_net::wasm_http::FetchRequest;
+use std::str::FromStr;
+use tendermint_rpc::endpoint::{abci_info, broadcast};
+pub use tendermint_rpc::endpoint::{abci_query::{AbciQuery, Request as AbciRequest},
+                                   health::Request as HealthRequest,
+                                   tx_search::Request as TxSearchRequest};
+use tendermint_rpc::error::Error as TendermintRpcError;
+pub use tendermint_rpc::query::Query as TendermintQuery;
+use tendermint_rpc::request::SimpleRequest;
+pub use tendermint_rpc::Order;
+use tendermint_rpc::Response;
+
+#[derive(Debug, Clone)]
+pub struct HttpClient {
+    uri: String,
+}
+
+#[derive(Debug, Display)]
+pub(crate) enum HttpClientInitError {
+    InvalidUri(InvalidUri),
+}
+
+impl From<InvalidUri> for HttpClientInitError {
+    fn from(err: InvalidUri) -> Self { HttpClientInitError::InvalidUri(err) }
+}
+
+#[derive(Debug, Display)]
+pub enum PerformError {
+    TendermintRpc(TendermintRpcError),
+    Slurp(SlurpError),
+    #[display(fmt = "Request failed with status code {}, response {}", status_code, response)]
+    StatusCode {
+        status_code: StatusCode,
+        response: String,
+    },
+}
+
+impl From<SlurpError> for PerformError {
+    fn from(err: SlurpError) -> Self { PerformError::Slurp(err) }
+}
+
+impl From<TendermintRpcError> for PerformError {
+    fn from(err: TendermintRpcError) -> Self { PerformError::TendermintRpc(err) }
+}
+
+impl HttpClient {
+    pub(crate) fn new(url: &str) -> Result<Self, HttpClientInitError> {
+        Uri::from_str(url)?;
+        Ok(HttpClient { uri: url.to_owned() })
+    }
+
+    pub(crate) async fn perform<R>(&self, request: R) -> Result<R::Response, PerformError>
+    where
+        R: SimpleRequest,
+    {
+        let request_str = request.into_json();
+        let (status_code, response_str) = FetchRequest::post(&self.uri)
+            .cors()
+            .body_utf8(request_str)
+            .header(ACCEPT.as_str(), APPLICATION_JSON)
+            .header(CONTENT_TYPE.as_str(), APPLICATION_JSON)
+            .request_str()
+            .await
+            .map_err(|e| e.into_inner())?;
+        if !status_code.is_success() {
+            return Err(PerformError::StatusCode {
+                status_code,
+                response: response_str,
+            });
+        }
+        Ok(R::Response::from_string(response_str)?)
+    }
+
+    /// `/abci_info`: get information about the ABCI application.
+    pub async fn abci_info(&self) -> Result<abci_info::AbciInfo, PerformError> {
+        Ok(self.perform(abci_info::Request).await?.response)
+    }
+
+    /// `/abci_query`: query the ABCI application
+    pub async fn abci_query<V>(
+        &self,
+        path: Option<AbciPath>,
+        data: V,
+        height: Option<Height>,
+        prove: bool,
+    ) -> Result<AbciQuery, PerformError>
+    where
+        V: Into<Vec<u8>> + Send,
+    {
+        Ok(self
+            .perform(AbciRequest::new(path, data, height, prove))
+            .await?
+            .response)
+    }
+
+    /// `/broadcast_tx_commit`: broadcast a transaction, returning the response
+    /// from `DeliverTx`.
+    pub async fn broadcast_tx_commit(&self, tx: Transaction) -> Result<broadcast::tx_commit::Response, PerformError> {
+        self.perform(broadcast::tx_commit::Request::new(tx)).await
+    }
+}
+
+mod tests {
+    use super::*;
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_get_abci_info() {
+        let client = HttpClient::new("https://rpc.sentry-02.theta-testnet.polypore.xyz").unwrap();
+        client.abci_info().await.unwrap();
+    }
+}
diff --git a/mm2src/coins/tendermint/tendermint_coin.rs b/mm2src/coins/tendermint/tendermint_coin.rs
new file mode 100644
index 0000000000..cb70b0b8fb
--- /dev/null
+++ b/mm2src/coins/tendermint/tendermint_coin.rs
@@ -0,0 +1,3109 @@
+use super::iris::htlc::{IrisHtlc, MsgClaimHtlc, MsgCreateHtlc, HTLC_STATE_COMPLETED, HTLC_STATE_OPEN,
+                        HTLC_STATE_REFUNDED};
+use super::iris::htlc_proto::{CreateHtlcProtoRep, QueryHtlcRequestProto, QueryHtlcResponseProto};
+use super::rpc::*;
+use crate::coin_errors::{MyAddressError, ValidatePaymentError};
+use crate::utxo::sat_from_big_decimal;
+use crate::utxo::utxo_common::big_decimal_from_sat;
+use crate::{big_decimal_from_sat_unsigned, BalanceError, BalanceFut, BigDecimal, CheckIfMyPaymentSentArgs,
+            CoinBalance, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MakerSwapTakerCoin,
+            MarketCoinOps, MmCoin, NegotiateSwapContractAddrErr, PaymentInstructions, PaymentInstructionsErr,
+            PrivKeyBuildPolicy, PrivKeyPolicyNotAllowed, RawTransactionError, RawTransactionFut,
+            RawTransactionRequest, RawTransactionRes, RefundError, RefundResult, RpcCommonOps,
+            SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs,
+            SignatureError, SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee, TradePreimageError,
+            TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum,
+            TransactionErr, TransactionFut, TransactionType, TxFeeDetails, TxMarshalingErr,
+            UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr,
+            ValidateOtherPubKeyErr, ValidatePaymentFut, ValidatePaymentInput, VerificationError, VerificationResult,
+            WatcherOps, WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput,
+            WithdrawError, WithdrawFut, WithdrawRequest};
+use async_std::prelude::FutureExt as AsyncStdFutureExt;
+use async_trait::async_trait;
+use bitcrypto::{dhash160, sha256};
+use common::executor::{abortable_queue::AbortableQueue, AbortableSystem};
+use common::executor::{AbortedError, Timer};
+use common::log::{debug, warn};
+use common::{get_utc_timestamp, now_ms, Future01CompatExt, DEX_FEE_ADDR_PUBKEY};
+use cosmrs::bank::MsgSend;
+use cosmrs::crypto::secp256k1::SigningKey;
+use cosmrs::proto::cosmos::auth::v1beta1::{BaseAccount, QueryAccountRequest, QueryAccountResponse};
+use cosmrs::proto::cosmos::bank::v1beta1::{MsgSend as MsgSendProto, QueryBalanceRequest, QueryBalanceResponse};
+use cosmrs::proto::cosmos::base::tendermint::v1beta1::{GetBlockByHeightRequest, GetBlockByHeightResponse,
+                                                       GetLatestBlockRequest, GetLatestBlockResponse};
+use cosmrs::proto::cosmos::base::v1beta1::Coin as CoinProto;
+use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, GetTxsEventRequest, GetTxsEventResponse,
+                                         SimulateRequest, SimulateResponse, Tx, TxBody, TxRaw};
+use cosmrs::tendermint::block::Height;
+use cosmrs::tendermint::chain::Id as ChainId;
+use cosmrs::tendermint::PublicKey;
+use cosmrs::tx::{self, Fee, Msg, Raw, SignDoc, SignerInfo};
+use cosmrs::{AccountId, Any, Coin, Denom, ErrorReport};
+use crypto::{privkey::key_pair_from_secret, Secp256k1Secret, StandardHDPathToCoin};
+use derive_more::Display;
+use futures::lock::Mutex as AsyncMutex;
+use futures::{FutureExt, TryFutureExt};
+use futures01::Future;
+use hex::FromHexError;
+use itertools::Itertools;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::MmNumber;
+use parking_lot::Mutex as PaMutex;
+use primitives::hash::H256;
+use prost::{DecodeError, Message};
+use rand::{thread_rng, Rng};
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::{self as json, Value as Json};
+use std::collections::HashMap;
+use std::convert::TryFrom;
+use std::ops::Deref;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
+use std::time::Duration;
+use uuid::Uuid;
+
+// ABCI Request Paths
+const ABCI_GET_LATEST_BLOCK_PATH: &str = "/cosmos.base.tendermint.v1beta1.Service/GetLatestBlock";
+const ABCI_GET_BLOCK_BY_HEIGHT_PATH: &str = "/cosmos.base.tendermint.v1beta1.Service/GetBlockByHeight";
+const ABCI_SIMULATE_TX_PATH: &str = "/cosmos.tx.v1beta1.Service/Simulate";
+const ABCI_QUERY_ACCOUNT_PATH: &str = "/cosmos.auth.v1beta1.Query/Account";
+const ABCI_QUERY_BALANCE_PATH: &str = "/cosmos.bank.v1beta1.Query/Balance";
+const ABCI_GET_TX_PATH: &str = "/cosmos.tx.v1beta1.Service/GetTx";
+const ABCI_QUERY_HTLC_PATH: &str = "/irismod.htlc.Query/HTLC";
+const ABCI_GET_TXS_EVENT_PATH: &str = "/cosmos.tx.v1beta1.Service/GetTxsEvent";
+
+pub(crate) const MIN_TX_SATOSHIS: i64 = 1;
+
+// ABCI Request Defaults
+const ABCI_REQUEST_HEIGHT: Option<Height> = None;
+const ABCI_REQUEST_PROVE: bool = false;
+
+/// 0.25 is good average gas price on atom and iris
+const DEFAULT_GAS_PRICE: f64 = 0.25;
+pub(super) const TIMEOUT_HEIGHT_DELTA: u64 = 100;
+pub const GAS_LIMIT_DEFAULT: u64 = 100_000;
+pub(crate) const TX_DEFAULT_MEMO: &str = "";
+
+// https://github.com/irisnet/irismod/blob/5016c1be6fdbcffc319943f33713f4a057622f0a/modules/htlc/types/validation.go#L19-L22
+const MAX_TIME_LOCK: i64 = 34560;
+const MIN_TIME_LOCK: i64 = 50;
+
+#[async_trait]
+pub trait TendermintCommons {
+    fn platform_denom(&self) -> String;
+
+    fn set_history_sync_state(&self, new_state: HistorySyncState);
+
+    async fn get_block_timestamp(&self, block: i64) -> MmResult<Option<u64>, TendermintCoinRpcError>;
+
+    async fn all_balances(&self) -> MmResult<AllBalancesResult, TendermintCoinRpcError>;
+
+    async fn rpc_client(&self) -> MmResult<HttpClient, TendermintCoinRpcError>;
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct TendermintFeeDetails {
+    pub coin: String,
+    pub amount: BigDecimal,
+    #[serde(skip)]
+    pub uamount: u64,
+    pub gas_limit: u64,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct TendermintProtocolInfo {
+    decimals: u8,
+    denom: String,
+    pub account_prefix: String,
+    chain_id: String,
+    gas_price: Option<f64>,
+}
+
+#[derive(Clone)]
+pub struct ActivatedTokenInfo {
+    pub(crate) decimals: u8,
+    pub(crate) denom: Denom,
+}
+
+pub struct TendermintConf {
+    avg_blocktime: u8,
+    /// 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`.
+    derivation_path: Option<StandardHDPathToCoin>,
+}
+
+impl TendermintConf {
+    pub fn try_from_json(ticker: &str, conf: &Json) -> MmResult<Self, TendermintInitError> {
+        let avg_blocktime = conf.get("avg_blocktime").or_mm_err(|| TendermintInitError {
+            ticker: ticker.to_string(),
+            kind: TendermintInitErrorKind::AvgBlockTimeMissing,
+        })?;
+
+        let avg_blocktime = avg_blocktime.as_i64().or_mm_err(|| TendermintInitError {
+            ticker: ticker.to_string(),
+            kind: TendermintInitErrorKind::AvgBlockTimeInvalid,
+        })?;
+
+        let avg_blocktime = u8::try_from(avg_blocktime).map_to_mm(|_| TendermintInitError {
+            ticker: ticker.to_string(),
+            kind: TendermintInitErrorKind::AvgBlockTimeInvalid,
+        })?;
+
+        let derivation_path = json::from_value(conf["derivation_path"].clone()).map_to_mm(|e| TendermintInitError {
+            ticker: ticker.to_string(),
+            kind: TendermintInitErrorKind::ErrorDeserializingDerivationPath(e.to_string()),
+        })?;
+
+        Ok(TendermintConf {
+            avg_blocktime,
+            derivation_path,
+        })
+    }
+}
+
+struct TendermintRpcClient(AsyncMutex<TendermintRpcClientImpl>);
+
+struct TendermintRpcClientImpl {
+    rpc_clients: Vec<HttpClient>,
+}
+
+#[async_trait]
+impl RpcCommonOps for TendermintCoin {
+    type RpcClient = HttpClient;
+    type Error = TendermintCoinRpcError;
+
+    async fn get_live_client(&self) -> Result<Self::RpcClient, Self::Error> {
+        let mut client_impl = self.client.0.lock().await;
+        // try to find first live client
+        for (i, client) in client_impl.rpc_clients.clone().into_iter().enumerate() {
+            match client.perform(HealthRequest).timeout(Duration::from_secs(15)).await {
+                Ok(Ok(_)) => {
+                    // Bring the live client to the front of rpc_clients
+                    client_impl.rpc_clients.rotate_left(i);
+                    return Ok(client);
+                },
+                Ok(Err(rpc_error)) => {
+                    debug!("Could not perform healthcheck on: {:?}. Error: {}", &client, rpc_error);
+                },
+                Err(timeout_error) => {
+                    debug!("Healthcheck timeout exceed on: {:?}. Error: {}", &client, timeout_error);
+                },
+            };
+        }
+        return Err(TendermintCoinRpcError::RpcClientError(
+            "All the current rpc nodes are unavailable.".to_string(),
+        ));
+    }
+}
+
+pub struct TendermintCoinImpl {
+    ticker: String,
+    /// As seconds
+    avg_blocktime: u8,
+    /// My address
+    pub account_id: AccountId,
+    pub(super) account_prefix: String,
+    priv_key: Vec<u8>,
+    pub(crate) decimals: u8,
+    pub(super) denom: Denom,
+    chain_id: ChainId,
+    gas_price: Option<f64>,
+    pub(super) sequence_lock: AsyncMutex<()>,
+    pub(crate) tokens_info: PaMutex<HashMap<String, ActivatedTokenInfo>>,
+    /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// or on [`MmArc::stop`].
+    pub(super) abortable_system: AbortableQueue,
+    pub(crate) history_sync_state: Mutex<HistorySyncState>,
+    client: TendermintRpcClient,
+}
+
+#[derive(Clone)]
+pub struct TendermintCoin(Arc<TendermintCoinImpl>);
+
+impl Deref for TendermintCoin {
+    type Target = TendermintCoinImpl;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+#[derive(Debug)]
+pub struct TendermintInitError {
+    pub ticker: String,
+    pub kind: TendermintInitErrorKind,
+}
+
+#[derive(Display, Debug)]
+pub enum TendermintInitErrorKind {
+    Internal(String),
+    InvalidPrivKey(String),
+    CouldNotGenerateAccountId(String),
+    EmptyRpcUrls,
+    RpcClientInitError(String),
+    InvalidChainId(String),
+    InvalidDenom(String),
+    #[display(fmt = "'derivation_path' field is not found in config")]
+    DerivationPathIsNotSet,
+    #[display(fmt = "Error deserializing 'derivation_path': {}", _0)]
+    ErrorDeserializingDerivationPath(String),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
+    RpcError(String),
+    #[display(fmt = "avg_blocktime is missing in coin configuration")]
+    AvgBlockTimeMissing,
+    #[display(fmt = "avg_blocktime must be in-between '0' and '255'.")]
+    AvgBlockTimeInvalid,
+}
+
+#[derive(Display, Debug)]
+pub enum TendermintCoinRpcError {
+    Prost(DecodeError),
+    InvalidResponse(String),
+    PerformError(String),
+    RpcClientError(String),
+}
+
+impl From<DecodeError> for TendermintCoinRpcError {
+    fn from(err: DecodeError) -> Self { TendermintCoinRpcError::Prost(err) }
+}
+
+impl From<TendermintCoinRpcError> for WithdrawError {
+    fn from(err: TendermintCoinRpcError) -> Self { WithdrawError::Transport(err.to_string()) }
+}
+
+impl From<TendermintCoinRpcError> for BalanceError {
+    fn from(err: TendermintCoinRpcError) -> Self {
+        match err {
+            TendermintCoinRpcError::InvalidResponse(e) => BalanceError::InvalidResponse(e),
+            TendermintCoinRpcError::Prost(e) => BalanceError::InvalidResponse(e.to_string()),
+            TendermintCoinRpcError::PerformError(e) => BalanceError::Transport(e),
+            TendermintCoinRpcError::RpcClientError(e) => BalanceError::Transport(e),
+        }
+    }
+}
+
+impl From<TendermintCoinRpcError> for ValidatePaymentError {
+    fn from(err: TendermintCoinRpcError) -> Self {
+        match err {
+            TendermintCoinRpcError::InvalidResponse(e) => ValidatePaymentError::InvalidRpcResponse(e),
+            TendermintCoinRpcError::Prost(e) => ValidatePaymentError::InvalidRpcResponse(e.to_string()),
+            TendermintCoinRpcError::PerformError(e) => ValidatePaymentError::Transport(e),
+            TendermintCoinRpcError::RpcClientError(e) => ValidatePaymentError::Transport(e),
+        }
+    }
+}
+
+impl From<TendermintCoinRpcError> for TradePreimageError {
+    fn from(err: TendermintCoinRpcError) -> Self { TradePreimageError::Transport(err.to_string()) }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<tendermint_rpc::Error> for TendermintCoinRpcError {
+    fn from(err: tendermint_rpc::Error) -> Self { TendermintCoinRpcError::PerformError(err.to_string()) }
+}
+
+#[cfg(target_arch = "wasm32")]
+impl From<PerformError> for TendermintCoinRpcError {
+    fn from(err: PerformError) -> Self { TendermintCoinRpcError::PerformError(err.to_string()) }
+}
+
+impl From<TendermintCoinRpcError> for RawTransactionError {
+    fn from(err: TendermintCoinRpcError) -> Self { RawTransactionError::Transport(err.to_string()) }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct CosmosTransaction {
+    pub data: cosmrs::proto::cosmos::tx::v1beta1::TxRaw,
+}
+
+impl crate::Transaction for CosmosTransaction {
+    fn tx_hex(&self) -> Vec<u8> { self.data.encode_to_vec() }
+
+    fn tx_hash(&self) -> BytesJson {
+        let bytes = self.data.encode_to_vec();
+        let hash = sha256(&bytes);
+        hash.to_vec().into()
+    }
+}
+
+fn account_id_from_privkey(priv_key: &[u8], prefix: &str) -> MmResult<AccountId, TendermintInitErrorKind> {
+    let signing_key =
+        SigningKey::from_bytes(priv_key).map_to_mm(|e| TendermintInitErrorKind::InvalidPrivKey(e.to_string()))?;
+
+    signing_key
+        .public_key()
+        .account_id(prefix)
+        .map_to_mm(|e| TendermintInitErrorKind::CouldNotGenerateAccountId(e.to_string()))
+}
+
+#[derive(Display, Debug)]
+pub enum AccountIdFromPubkeyHexErr {
+    InvalidHexString(FromHexError),
+    CouldNotCreateAccountId(ErrorReport),
+}
+
+impl From<FromHexError> for AccountIdFromPubkeyHexErr {
+    fn from(err: FromHexError) -> Self { AccountIdFromPubkeyHexErr::InvalidHexString(err) }
+}
+
+impl From<ErrorReport> for AccountIdFromPubkeyHexErr {
+    fn from(err: ErrorReport) -> Self { AccountIdFromPubkeyHexErr::CouldNotCreateAccountId(err) }
+}
+
+pub fn account_id_from_pubkey_hex(prefix: &str, pubkey: &str) -> MmResult<AccountId, AccountIdFromPubkeyHexErr> {
+    let pubkey_bytes = hex::decode(pubkey)?;
+    let pubkey_hash = dhash160(&pubkey_bytes);
+    Ok(AccountId::new(prefix, pubkey_hash.as_slice())?)
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct AllBalancesResult {
+    pub platform_balance: BigDecimal,
+    pub tokens_balances: HashMap<String, BigDecimal>,
+}
+
+#[derive(Debug, Display)]
+enum SearchForSwapTxSpendErr {
+    Cosmrs(ErrorReport),
+    Rpc(TendermintCoinRpcError),
+    TxMessagesEmpty,
+    ClaimHtlcTxNotFound,
+    UnexpectedHtlcState(i32),
+    Proto(DecodeError),
+}
+
+impl From<ErrorReport> for SearchForSwapTxSpendErr {
+    fn from(e: ErrorReport) -> Self { SearchForSwapTxSpendErr::Cosmrs(e) }
+}
+
+impl From<TendermintCoinRpcError> for SearchForSwapTxSpendErr {
+    fn from(e: TendermintCoinRpcError) -> Self { SearchForSwapTxSpendErr::Rpc(e) }
+}
+
+impl From<DecodeError> for SearchForSwapTxSpendErr {
+    fn from(e: DecodeError) -> Self { SearchForSwapTxSpendErr::Proto(e) }
+}
+
+#[async_trait]
+impl TendermintCommons for TendermintCoin {
+    fn platform_denom(&self) -> String { self.denom.to_string() }
+
+    fn set_history_sync_state(&self, new_state: HistorySyncState) {
+        *self.history_sync_state.lock().unwrap() = new_state;
+    }
+
+    async fn get_block_timestamp(&self, block: i64) -> MmResult<Option<u64>, TendermintCoinRpcError> {
+        let block_response = self.get_block_by_height(block).await?;
+        let block_header = some_or_return_ok_none!(some_or_return_ok_none!(block_response.block).header);
+        let timestamp = some_or_return_ok_none!(block_header.time);
+
+        Ok(u64::try_from(timestamp.seconds).ok())
+    }
+
+    async fn all_balances(&self) -> MmResult<AllBalancesResult, TendermintCoinRpcError> {
+        let platform_balance_denom = self.balance_for_denom(self.denom.to_string()).await?;
+        let platform_balance = big_decimal_from_sat_unsigned(platform_balance_denom, self.decimals);
+        let ibc_assets_info = self.tokens_info.lock().clone();
+
+        let mut result = AllBalancesResult {
+            platform_balance,
+            tokens_balances: HashMap::new(),
+        };
+        for (ticker, info) in ibc_assets_info {
+            let balance_denom = self.balance_for_denom(info.denom.to_string()).await?;
+            let balance_decimal = big_decimal_from_sat_unsigned(balance_denom, info.decimals);
+            result.tokens_balances.insert(ticker, balance_decimal);
+        }
+
+        Ok(result)
+    }
+
+    #[inline(always)]
+    async fn rpc_client(&self) -> MmResult<HttpClient, TendermintCoinRpcError> {
+        self.get_live_client().await.map_to_mm(|e| e)
+    }
+}
+
+impl TendermintCoin {
+    pub async fn init(
+        ctx: &MmArc,
+        ticker: String,
+        conf: TendermintConf,
+        protocol_info: TendermintProtocolInfo,
+        rpc_urls: Vec<String>,
+        tx_history: bool,
+        priv_key_policy: PrivKeyBuildPolicy,
+    ) -> MmResult<Self, TendermintInitError> {
+        if rpc_urls.is_empty() {
+            return MmError::err(TendermintInitError {
+                ticker,
+                kind: TendermintInitErrorKind::EmptyRpcUrls,
+            });
+        }
+
+        let priv_key = secret_from_priv_key_policy(&conf, &ticker, priv_key_policy)?;
+
+        let account_id =
+            account_id_from_privkey(priv_key.as_slice(), &protocol_info.account_prefix).mm_err(|kind| {
+                TendermintInitError {
+                    ticker: ticker.clone(),
+                    kind,
+                }
+            })?;
+
+        let rpc_clients = clients_from_urls(rpc_urls.as_ref()).mm_err(|kind| TendermintInitError {
+            ticker: ticker.clone(),
+            kind,
+        })?;
+
+        let client_impl = TendermintRpcClientImpl { rpc_clients };
+
+        let chain_id = ChainId::try_from(protocol_info.chain_id).map_to_mm(|e| TendermintInitError {
+            ticker: ticker.clone(),
+            kind: TendermintInitErrorKind::InvalidChainId(e.to_string()),
+        })?;
+
+        let denom = Denom::from_str(&protocol_info.denom).map_to_mm(|e| TendermintInitError {
+            ticker: ticker.clone(),
+            kind: TendermintInitErrorKind::InvalidDenom(e.to_string()),
+        })?;
+
+        let history_sync_state = if tx_history {
+            HistorySyncState::NotStarted
+        } else {
+            HistorySyncState::NotEnabled
+        };
+
+        // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+        // all spawned futures related to `TendermintCoin` will be aborted as well.
+        let abortable_system = ctx
+            .abortable_system
+            .create_subsystem()
+            .map_to_mm(|e| TendermintInitError {
+                ticker: ticker.clone(),
+                kind: TendermintInitErrorKind::Internal(e.to_string()),
+            })?;
+
+        Ok(TendermintCoin(Arc::new(TendermintCoinImpl {
+            ticker,
+            account_id,
+            account_prefix: protocol_info.account_prefix,
+            priv_key: priv_key.to_vec(),
+            decimals: protocol_info.decimals,
+            denom,
+            chain_id,
+            gas_price: protocol_info.gas_price,
+            avg_blocktime: conf.avg_blocktime,
+            sequence_lock: AsyncMutex::new(()),
+            tokens_info: PaMutex::new(HashMap::new()),
+            abortable_system,
+            history_sync_state: Mutex::new(history_sync_state),
+            client: TendermintRpcClient(AsyncMutex::new(client_impl)),
+        })))
+    }
+
+    #[inline(always)]
+    fn gas_price(&self) -> f64 { self.gas_price.unwrap_or(DEFAULT_GAS_PRICE) }
+
+    #[allow(unused)]
+    async fn get_latest_block(&self) -> MmResult<GetLatestBlockResponse, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_GET_LATEST_BLOCK_PATH).expect("valid path");
+
+        let request = GetLatestBlockRequest {};
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let response = self.rpc_client().await?.perform(request).await?;
+
+        Ok(GetLatestBlockResponse::decode(response.response.value.as_slice())?)
+    }
+
+    #[allow(unused)]
+    async fn get_block_by_height(&self, height: i64) -> MmResult<GetBlockByHeightResponse, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_GET_BLOCK_BY_HEIGHT_PATH).expect("valid path");
+
+        let request = GetBlockByHeightRequest { height };
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let response = self.rpc_client().await?.perform(request).await?;
+
+        Ok(GetBlockByHeightResponse::decode(response.response.value.as_slice())?)
+    }
+
+    // We must simulate the tx on rpc nodes in order to calculate network fee.
+    // Right now cosmos doesn't expose any of gas price and fee informations directly.
+    // Therefore, we can call SimulateRequest or CheckTx(doesn't work with using Abci interface) to get used gas or fee itself.
+    pub(super) fn gen_simulated_tx(
+        &self,
+        account_info: BaseAccount,
+        tx_payload: Any,
+        timeout_height: u64,
+        memo: String,
+    ) -> cosmrs::Result<Vec<u8>> {
+        let fee_amount = Coin {
+            denom: self.denom.clone(),
+            amount: 0_u64.into(),
+        };
+
+        let fee = Fee::from_amount_and_gas(fee_amount, GAS_LIMIT_DEFAULT);
+
+        let signkey = SigningKey::from_bytes(&self.priv_key)?;
+        let tx_body = tx::Body::new(vec![tx_payload], memo, timeout_height as u32);
+        let auth_info = SignerInfo::single_direct(Some(signkey.public_key()), account_info.sequence).auth_info(fee);
+        let sign_doc = SignDoc::new(&tx_body, &auth_info, &self.chain_id, account_info.account_number)?;
+        sign_doc.sign(&signkey)?.to_bytes()
+    }
+
+    /// This is converted from irismod and cosmos-sdk source codes written in golang.
+    /// Refs:
+    ///  - Main algorithm: https://github.com/irisnet/irismod/blob/main/modules/htlc/types/htlc.go#L157
+    ///  - Coins string building https://github.com/cosmos/cosmos-sdk/blob/main/types/coin.go#L210-L225
+    fn calculate_htlc_id(
+        &self,
+        from_address: &AccountId,
+        to_address: &AccountId,
+        amount: Vec<Coin>,
+        secret_hash: &[u8],
+    ) -> String {
+        // Needs to be sorted if cointains multiple coins
+        // let mut amount = amount;
+        // amount.sort();
+
+        let coins_string = amount
+            .iter()
+            .map(|t| format!("{}{}", t.amount, t.denom))
+            .collect::<Vec<String>>()
+            .join(",");
+
+        let mut htlc_id = vec![];
+        htlc_id.extend_from_slice(secret_hash);
+        htlc_id.extend_from_slice(&from_address.to_bytes());
+        htlc_id.extend_from_slice(&to_address.to_bytes());
+        htlc_id.extend_from_slice(coins_string.as_bytes());
+        sha256(&htlc_id).to_string().to_uppercase()
+    }
+
+    #[allow(deprecated)]
+    pub(super) async fn calculate_fee(
+        &self,
+        base_denom: Denom,
+        tx_bytes: Vec<u8>,
+    ) -> MmResult<Fee, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_SIMULATE_TX_PATH).expect("valid path");
+        let request = SimulateRequest { tx_bytes, tx: None };
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let raw_response = self.rpc_client().await?.perform(request).await?;
+        let response = SimulateResponse::decode(raw_response.response.value.as_slice())?;
+
+        let gas = response.gas_info.as_ref().ok_or_else(|| {
+            TendermintCoinRpcError::InvalidResponse(format!(
+                "Could not read gas_info. Invalid Response: {:?}",
+                raw_response
+            ))
+        })?;
+
+        let amount = ((gas.gas_used as f64 * 1.5) * self.gas_price()).ceil();
+
+        let fee_amount = Coin {
+            denom: base_denom,
+            amount: (amount as u64).into(),
+        };
+
+        Ok(Fee::from_amount_and_gas(fee_amount, GAS_LIMIT_DEFAULT))
+    }
+
+    #[allow(deprecated)]
+    pub(super) async fn calculate_fee_amount_as_u64(&self, tx_bytes: Vec<u8>) -> MmResult<u64, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_SIMULATE_TX_PATH).expect("valid path");
+        let request = SimulateRequest { tx_bytes, tx: None };
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let raw_response = self.rpc_client().await?.perform(request).await?;
+        let response = SimulateResponse::decode(raw_response.response.value.as_slice())?;
+
+        let gas = response.gas_info.as_ref().ok_or_else(|| {
+            TendermintCoinRpcError::InvalidResponse(format!(
+                "Could not read gas_info. Invalid Response: {:?}",
+                raw_response
+            ))
+        })?;
+
+        Ok(((gas.gas_used as f64 * 1.5) * self.gas_price()).ceil() as u64)
+    }
+
+    pub(super) async fn my_account_info(&self) -> MmResult<BaseAccount, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_QUERY_ACCOUNT_PATH).expect("valid path");
+        let request = QueryAccountRequest {
+            address: self.account_id.to_string(),
+        };
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let response = self.rpc_client().await?.perform(request).await?;
+        let account_response = QueryAccountResponse::decode(response.response.value.as_slice())?;
+        let account = account_response
+            .account
+            .or_mm_err(|| TendermintCoinRpcError::InvalidResponse("Account is None".into()))?;
+        Ok(BaseAccount::decode(account.value.as_slice())?)
+    }
+
+    pub(super) async fn balance_for_denom(&self, denom: String) -> MmResult<u64, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_QUERY_BALANCE_PATH).expect("valid path");
+        let request = QueryBalanceRequest {
+            address: self.account_id.to_string(),
+            denom,
+        };
+        let request = AbciRequest::new(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        );
+
+        let response = self.rpc_client().await?.perform(request).await?;
+        let response = QueryBalanceResponse::decode(response.response.value.as_slice())?;
+        response
+            .balance
+            .or_mm_err(|| TendermintCoinRpcError::InvalidResponse("balance is None".into()))?
+            .amount
+            .parse()
+            .map_to_mm(|e| TendermintCoinRpcError::InvalidResponse(format!("balance is not u64, err {}", e)))
+    }
+
+    fn gen_create_htlc_tx(
+        &self,
+        denom: Denom,
+        to: &AccountId,
+        amount: cosmrs::Decimal,
+        secret_hash: &[u8],
+        time_lock: u64,
+    ) -> MmResult<IrisHtlc, TxMarshalingErr> {
+        let amount = vec![Coin { denom, amount }];
+        let timestamp = 0_u64;
+        let msg_payload = MsgCreateHtlc {
+            sender: self.account_id.clone(),
+            to: to.clone(),
+            receiver_on_other_chain: "".to_string(),
+            sender_on_other_chain: "".to_string(),
+            amount: amount.clone(),
+            hash_lock: hex::encode(secret_hash),
+            timestamp,
+            time_lock,
+            transfer: false,
+        };
+
+        let htlc_id = self.calculate_htlc_id(&self.account_id, to, amount, secret_hash);
+
+        Ok(IrisHtlc {
+            id: htlc_id,
+            msg_payload: msg_payload
+                .to_any()
+                .map_err(|e| MmError::new(TxMarshalingErr::InvalidInput(e.to_string())))?,
+        })
+    }
+
+    fn gen_claim_htlc_tx(&self, htlc_id: String, secret: &[u8]) -> MmResult<IrisHtlc, TxMarshalingErr> {
+        let msg_payload = MsgClaimHtlc {
+            id: htlc_id.clone(),
+            sender: self.account_id.clone(),
+            secret: hex::encode(secret),
+        };
+
+        Ok(IrisHtlc {
+            id: htlc_id,
+            msg_payload: msg_payload
+                .to_any()
+                .map_err(|e| MmError::new(TxMarshalingErr::InvalidInput(e.to_string())))?,
+        })
+    }
+
+    pub(super) fn any_to_signed_raw_tx(
+        &self,
+        account_info: BaseAccount,
+        tx_payload: Any,
+        fee: Fee,
+        timeout_height: u64,
+        memo: String,
+    ) -> cosmrs::Result<Raw> {
+        let signkey = SigningKey::from_bytes(&self.priv_key)?;
+        let tx_body = tx::Body::new(vec![tx_payload], memo, timeout_height as u32);
+        let auth_info = SignerInfo::single_direct(Some(signkey.public_key()), account_info.sequence).auth_info(fee);
+        let sign_doc = SignDoc::new(&tx_body, &auth_info, &self.chain_id, account_info.account_number)?;
+        sign_doc.sign(&signkey)
+    }
+
+    pub fn add_activated_token_info(&self, ticker: String, decimals: u8, denom: Denom) {
+        self.tokens_info
+            .lock()
+            .insert(ticker, ActivatedTokenInfo { decimals, denom });
+    }
+
+    fn estimate_blocks_from_duration(&self, duration: u64) -> i64 {
+        let estimated_time_lock = (duration / self.avg_blocktime as u64) as i64;
+
+        estimated_time_lock.clamp(MIN_TIME_LOCK, MAX_TIME_LOCK)
+    }
+
+    pub(crate) fn check_if_my_payment_sent_for_denom(
+        &self,
+        decimals: u8,
+        denom: Denom,
+        other_pub: &[u8],
+        secret_hash: &[u8],
+        amount: &BigDecimal,
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        let amount = try_fus!(sat_from_big_decimal(amount, decimals));
+        let amount = vec![Coin {
+            denom,
+            amount: amount.into(),
+        }];
+
+        let pubkey_hash = dhash160(other_pub);
+        let to_address = try_fus!(AccountId::new(&self.account_prefix, pubkey_hash.as_slice()));
+
+        let htlc_id = self.calculate_htlc_id(&self.account_id, &to_address, amount, secret_hash);
+
+        let coin = self.clone();
+        let fut = async move {
+            let htlc_response = try_s!(coin.query_htlc(htlc_id.clone()).await);
+            let htlc_data = match htlc_response.htlc {
+                Some(htlc) => htlc,
+                None => return Ok(None),
+            };
+
+            match htlc_data.state {
+                HTLC_STATE_OPEN | HTLC_STATE_COMPLETED | HTLC_STATE_REFUNDED => {},
+                unexpected_state => return Err(format!("Unexpected state for HTLC {}", unexpected_state)),
+            };
+
+            let rpc_client = try_s!(coin.rpc_client().await);
+            let q = format!("create_htlc.id = '{}'", htlc_id);
+
+            let response = try_s!(
+                // Search single tx
+                rpc_client
+                    .perform(TxSearchRequest::new(
+                        q,
+                        false,
+                        1,
+                        1,
+                        TendermintResultOrder::Descending.into()
+                    ))
+                    .await
+            );
+
+            if let Some(tx) = response.txs.first() {
+                if let cosmrs::tendermint::abci::Code::Err(err_code) = tx.tx_result.code {
+                    return Err(format!(
+                        "Got {} error code. Broadcasted HTLC likely isn't valid.",
+                        err_code
+                    ));
+                }
+
+                let deserialized_tx = try_s!(cosmrs::Tx::from_bytes(tx.tx.as_bytes()));
+                let msg = try_s!(deserialized_tx.body.messages.first().ok_or("Tx body couldn't be read."));
+                let htlc = try_s!(CreateHtlcProtoRep::decode(msg.value.as_slice()));
+
+                if htlc.hash_lock.to_uppercase() == htlc_data.hash_lock.to_uppercase() {
+                    let htlc = TransactionEnum::CosmosTransaction(CosmosTransaction {
+                        data: try_s!(TxRaw::decode(tx.tx.as_bytes())),
+                    });
+                    return Ok(Some(htlc));
+                }
+            }
+
+            Ok(None)
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    pub(super) fn send_htlc_for_denom(
+        &self,
+        time_lock_duration: u64,
+        other_pub: &[u8],
+        secret_hash: &[u8],
+        amount: BigDecimal,
+        denom: Denom,
+        decimals: u8,
+    ) -> TransactionFut {
+        let pubkey_hash = dhash160(other_pub);
+        let to = try_tx_fus!(AccountId::new(&self.account_prefix, pubkey_hash.as_slice()));
+
+        let amount_as_u64 = try_tx_fus!(sat_from_big_decimal(&amount, decimals));
+        let amount = cosmrs::Decimal::from(amount_as_u64);
+
+        let secret_hash = secret_hash.to_vec();
+        let coin = self.clone();
+        let fut = async move {
+            let time_lock = coin.estimate_blocks_from_duration(time_lock_duration);
+
+            let create_htlc_tx = try_tx_s!(coin.gen_create_htlc_tx(denom, &to, amount, &secret_hash, time_lock as u64));
+
+            let _sequence_lock = coin.sequence_lock.lock().await;
+            let current_block = try_tx_s!(coin.current_block().compat().await);
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+            let account_info = try_tx_s!(coin.my_account_info().await);
+
+            let simulated_tx = try_tx_s!(coin.gen_simulated_tx(
+                account_info.clone(),
+                create_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let fee = try_tx_s!(coin.calculate_fee(coin.denom.clone(), simulated_tx).await);
+
+            let tx_raw = try_tx_s!(coin.any_to_signed_raw_tx(
+                account_info.clone(),
+                create_htlc_tx.msg_payload.clone(),
+                fee,
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let _tx_id = try_tx_s!(coin.send_raw_tx_bytes(&try_tx_s!(tx_raw.to_bytes())).compat().await);
+
+            Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
+                data: tx_raw.into(),
+            }))
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    pub(super) fn send_taker_fee_for_denom(
+        &self,
+        fee_addr: &[u8],
+        amount: BigDecimal,
+        denom: Denom,
+        decimals: u8,
+        uuid: &[u8],
+    ) -> TransactionFut {
+        let memo = try_tx_fus!(Uuid::from_slice(uuid)).to_string();
+        let from_address = self.account_id.clone();
+        let pubkey_hash = dhash160(fee_addr);
+        let to_address = try_tx_fus!(AccountId::new(&self.account_prefix, pubkey_hash.as_slice()));
+
+        let amount_as_u64 = try_tx_fus!(sat_from_big_decimal(&amount, decimals));
+        let amount = cosmrs::Decimal::from(amount_as_u64);
+
+        let amount = vec![Coin { denom, amount }];
+
+        let tx_payload = try_tx_fus!(MsgSend {
+            from_address,
+            to_address,
+            amount,
+        }
+        .to_any());
+
+        let coin = self.clone();
+        let fut = async move {
+            let _sequence_lock = coin.sequence_lock.lock().await;
+            let account_info = try_tx_s!(coin.my_account_info().await);
+
+            let current_block = try_tx_s!(coin.current_block().compat().await.map_to_mm(WithdrawError::Transport));
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+            let simulated_tx = try_tx_s!(coin.gen_simulated_tx(
+                account_info.clone(),
+                tx_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let fee = try_tx_s!(coin.calculate_fee(coin.denom.clone(), simulated_tx).await);
+
+            let tx_raw = try_tx_s!(coin
+                .any_to_signed_raw_tx(account_info, tx_payload, fee, timeout_height, memo)
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string())));
+
+            let tx_bytes = try_tx_s!(tx_raw
+                .to_bytes()
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string())));
+
+            let _tx_id = try_tx_s!(coin.send_raw_tx_bytes(&tx_bytes).compat().await);
+
+            Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
+                data: tx_raw.into(),
+            }))
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub(super) fn validate_fee_for_denom(
+        &self,
+        fee_tx: &TransactionEnum,
+        expected_sender: &[u8],
+        fee_addr: &[u8],
+        amount: &BigDecimal,
+        decimals: u8,
+        uuid: &[u8],
+        denom: String,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match fee_tx {
+            TransactionEnum::CosmosTransaction(tx) => tx.clone(),
+            invalid_variant => {
+                return Box::new(futures01::future::err(ERRL!(
+                    "Unexpected tx variant {:?}",
+                    invalid_variant
+                )))
+            },
+        };
+
+        let uuid = try_fus!(Uuid::from_slice(uuid)).to_string();
+        let sender_pubkey_hash = dhash160(expected_sender);
+        let expected_sender_address =
+            try_fus!(AccountId::new(&self.account_prefix, sender_pubkey_hash.as_slice())).to_string();
+
+        let dex_fee_addr_pubkey_hash = dhash160(fee_addr);
+        let expected_dex_fee_address = try_fus!(AccountId::new(
+            &self.account_prefix,
+            dex_fee_addr_pubkey_hash.as_slice()
+        ))
+        .to_string();
+
+        let expected_amount = try_fus!(sat_from_big_decimal(amount, decimals));
+        let expected_amount = CoinProto {
+            denom,
+            amount: expected_amount.to_string(),
+        };
+
+        let coin = self.clone();
+        let fut = async move {
+            let tx_body = try_s!(TxBody::decode(tx.data.body_bytes.as_slice()));
+            if tx_body.messages.len() != 1 {
+                return ERR!("Tx body must have exactly one message");
+            }
+
+            let msg = try_s!(MsgSendProto::decode(tx_body.messages[0].value.as_slice()));
+            if msg.to_address != expected_dex_fee_address {
+                return ERR!(
+                    "Dex fee is sent to wrong address: {}, expected {}",
+                    msg.to_address,
+                    expected_dex_fee_address
+                );
+            }
+
+            if msg.amount.len() != 1 {
+                return ERR!("Msg must have exactly one Coin");
+            }
+
+            if msg.amount[0] != expected_amount {
+                return ERR!("Invalid amount {:?}, expected {:?}", msg.amount[0], expected_amount);
+            }
+
+            if msg.from_address != expected_sender_address {
+                return ERR!(
+                    "Invalid sender: {}, expected {}",
+                    msg.from_address,
+                    expected_sender_address
+                );
+            }
+
+            if tx_body.memo != uuid {
+                return ERR!("Invalid memo: {}, expected {}", msg.from_address, uuid);
+            }
+
+            let encoded_tx = tx.data.encode_to_vec();
+            let hash = hex::encode_upper(sha256(&encoded_tx).as_slice());
+            let encoded_from_rpc = try_s!(coin.request_tx(hash).await).encode_to_vec();
+            if encoded_tx != encoded_from_rpc {
+                return ERR!("Transaction from RPC doesn't match the input");
+            }
+            Ok(())
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    pub(super) fn validate_payment_for_denom(
+        &self,
+        input: ValidatePaymentInput,
+        denom: Denom,
+        decimals: u8,
+    ) -> ValidatePaymentFut<()> {
+        let coin = self.clone();
+        let fut = async move {
+            let tx = cosmrs::Tx::from_bytes(&input.payment_tx)
+                .map_to_mm(|e| ValidatePaymentError::TxDeserializationError(e.to_string()))?;
+
+            if tx.body.messages.len() != 1 {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                    "Payment tx must have exactly one message".into(),
+                ));
+            }
+
+            let create_htlc_msg_proto = CreateHtlcProtoRep::decode(tx.body.messages[0].value.as_slice())
+                .map_to_mm(|e| ValidatePaymentError::WrongPaymentTx(e.to_string()))?;
+            let create_htlc_msg = MsgCreateHtlc::try_from(create_htlc_msg_proto)
+                .map_to_mm(|e| ValidatePaymentError::WrongPaymentTx(e.to_string()))?;
+
+            let sender_pubkey_hash = dhash160(&input.other_pub);
+            let sender = AccountId::new(&coin.account_prefix, sender_pubkey_hash.as_slice())
+                .map_to_mm(|e| ValidatePaymentError::InvalidParameter(e.to_string()))?;
+
+            let amount = sat_from_big_decimal(&input.amount, decimals)?;
+            let amount = vec![Coin {
+                denom,
+                amount: amount.into(),
+            }];
+
+            let time_lock = coin.estimate_blocks_from_duration(input.time_lock_duration);
+
+            let expected_msg = MsgCreateHtlc {
+                sender: sender.clone(),
+                to: coin.account_id.clone(),
+                receiver_on_other_chain: "".into(),
+                sender_on_other_chain: "".into(),
+                amount: amount.clone(),
+                hash_lock: hex::encode(&input.secret_hash),
+                timestamp: 0,
+                time_lock: time_lock as u64,
+                transfer: false,
+            };
+
+            if create_htlc_msg != expected_msg {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "Incorrect CreateHtlc message {:?}, expected {:?}",
+                    create_htlc_msg, expected_msg
+                )));
+            }
+
+            let hash = hex::encode_upper(sha256(&input.payment_tx).as_slice());
+            let tx_from_rpc = coin.request_tx(hash).await?;
+            if input.payment_tx != tx_from_rpc.encode_to_vec() {
+                return MmError::err(ValidatePaymentError::InvalidRpcResponse(
+                    "Tx from RPC doesn't match the input".into(),
+                ));
+            }
+
+            let htlc_id = coin.calculate_htlc_id(&sender, &coin.account_id, amount, &input.secret_hash);
+
+            let htlc_response = coin.query_htlc(htlc_id.clone()).await?;
+            let htlc_data = htlc_response
+                .htlc
+                .or_mm_err(|| ValidatePaymentError::InvalidRpcResponse(format!("No HTLC data for {}", htlc_id)))?;
+
+            match htlc_data.state {
+                HTLC_STATE_OPEN => Ok(()),
+                unexpected_state => MmError::err(ValidatePaymentError::UnexpectedPaymentState(format!(
+                    "{}",
+                    unexpected_state
+                ))),
+            }
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    pub(super) async fn get_sender_trade_fee_for_denom(
+        &self,
+        ticker: String,
+        denom: Denom,
+        decimals: u8,
+        amount: BigDecimal,
+    ) -> TradePreimageResult<TradeFee> {
+        const TIME_LOCK: u64 = 1750;
+        let sec: [u8; 32] = thread_rng().gen();
+        let to_address = account_id_from_pubkey_hex(&self.account_prefix, DEX_FEE_ADDR_PUBKEY)
+            .map_err(|e| MmError::new(TradePreimageError::InternalError(e.into_inner().to_string())))?;
+
+        let amount = sat_from_big_decimal(&amount, decimals)?;
+
+        let create_htlc_tx = self
+            .gen_create_htlc_tx(denom, &to_address, amount.into(), sha256(&sec).as_slice(), TIME_LOCK)
+            .map_err(|e| {
+                MmError::new(TradePreimageError::InternalError(format!(
+                    "Could not create HTLC. {:?}",
+                    e.into_inner()
+                )))
+            })?;
+
+        let current_block = self.current_block().compat().await.map_err(|e| {
+            MmError::new(TradePreimageError::InternalError(format!(
+                "Could not get current_block. {}",
+                e
+            )))
+        })?;
+
+        let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+        let account_info = self.my_account_info().await?;
+
+        let simulated_tx = self
+            .gen_simulated_tx(
+                account_info.clone(),
+                create_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            )
+            .map_err(|e| {
+                MmError::new(TradePreimageError::InternalError(format!(
+                    "Tx simulation failed. {:?}",
+                    e
+                )))
+            })?;
+
+        let fee_uamount = self.calculate_fee_amount_as_u64(simulated_tx).await?;
+        let fee_amount = big_decimal_from_sat_unsigned(fee_uamount, self.decimals);
+
+        Ok(TradeFee {
+            coin: ticker,
+            amount: fee_amount.into(),
+            paid_from_trading_vol: false,
+        })
+    }
+
+    pub(super) async fn get_fee_to_send_taker_fee_for_denom(
+        &self,
+        ticker: String,
+        denom: Denom,
+        decimals: u8,
+        dex_fee_amount: BigDecimal,
+    ) -> TradePreimageResult<TradeFee> {
+        let to_address = account_id_from_pubkey_hex(&self.account_prefix, DEX_FEE_ADDR_PUBKEY)
+            .map_err(|e| MmError::new(TradePreimageError::InternalError(e.into_inner().to_string())))?;
+        let amount = sat_from_big_decimal(&dex_fee_amount, decimals)?;
+
+        let current_block = self.current_block().compat().await.map_err(|e| {
+            MmError::new(TradePreimageError::InternalError(format!(
+                "Could not get current_block. {}",
+                e
+            )))
+        })?;
+
+        let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+        let account_info = self.my_account_info().await?;
+
+        let msg_send = MsgSend {
+            from_address: self.account_id.clone(),
+            to_address: to_address.clone(),
+            amount: vec![Coin {
+                denom,
+                amount: amount.into(),
+            }],
+        }
+        .to_any()
+        .map_err(|e| MmError::new(TradePreimageError::InternalError(e.to_string())))?;
+
+        let simulated_tx = self
+            .gen_simulated_tx(account_info.clone(), msg_send, timeout_height, TX_DEFAULT_MEMO.into())
+            .map_err(|e| {
+                MmError::new(TradePreimageError::InternalError(format!(
+                    "Tx simulation failed. {:?}",
+                    e
+                )))
+            })?;
+
+        let fee_uamount = self.calculate_fee_amount_as_u64(simulated_tx).await?;
+        let fee_amount = big_decimal_from_sat_unsigned(fee_uamount, decimals);
+
+        Ok(TradeFee {
+            coin: ticker,
+            amount: fee_amount.into(),
+            paid_from_trading_vol: false,
+        })
+    }
+
+    async fn request_tx(&self, hash: String) -> MmResult<Tx, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_GET_TX_PATH).expect("valid path");
+        let request = GetTxRequest { hash };
+        let response = self
+            .rpc_client()
+            .await?
+            .abci_query(
+                Some(path),
+                request.encode_to_vec(),
+                ABCI_REQUEST_HEIGHT,
+                ABCI_REQUEST_PROVE,
+            )
+            .await?;
+
+        let response = GetTxResponse::decode(response.value.as_slice())?;
+        response
+            .tx
+            .or_mm_err(|| TendermintCoinRpcError::InvalidResponse(format!("Tx {} does not exist", request.hash)))
+    }
+
+    /// Returns status code of transaction.
+    /// If tx doesn't exists on chain, then returns `None`.
+    async fn get_tx_status_code_or_none(
+        &self,
+        hash: String,
+    ) -> MmResult<Option<cosmrs::tendermint::abci::Code>, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_GET_TX_PATH).expect("valid path");
+        let request = GetTxRequest { hash };
+        let response = self
+            .rpc_client()
+            .await?
+            .abci_query(
+                Some(path),
+                request.encode_to_vec(),
+                ABCI_REQUEST_HEIGHT,
+                ABCI_REQUEST_PROVE,
+            )
+            .await?;
+
+        let tx = GetTxResponse::decode(response.value.as_slice())?;
+
+        if let Some(tx_response) = tx.tx_response {
+            // non-zero values are error.
+            match tx_response.code {
+                TX_SUCCESS_CODE => Ok(Some(cosmrs::tendermint::abci::Code::Ok)),
+                err_code => Ok(Some(cosmrs::tendermint::abci::Code::Err(err_code))),
+            }
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub(crate) async fn query_htlc(&self, id: String) -> MmResult<QueryHtlcResponseProto, TendermintCoinRpcError> {
+        let path = AbciPath::from_str(ABCI_QUERY_HTLC_PATH).expect("valid path");
+        let request = QueryHtlcRequestProto { id };
+        let response = self
+            .rpc_client()
+            .await?
+            .abci_query(
+                Some(path),
+                request.encode_to_vec(),
+                ABCI_REQUEST_HEIGHT,
+                ABCI_REQUEST_PROVE,
+            )
+            .await?;
+
+        Ok(QueryHtlcResponseProto::decode(response.value.as_slice())?)
+    }
+
+    #[inline]
+    pub(crate) fn is_tx_amount_enough(&self, decimals: u8, amount: &BigDecimal) -> bool {
+        let min_tx_amount = big_decimal_from_sat(MIN_TX_SATOSHIS, decimals);
+        amount >= &min_tx_amount
+    }
+
+    async fn search_for_swap_tx_spend(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> MmResult<Option<FoundSwapTxSpend>, SearchForSwapTxSpendErr> {
+        let tx = cosmrs::Tx::from_bytes(input.tx)?;
+        let first_message = tx
+            .body
+            .messages
+            .first()
+            .or_mm_err(|| SearchForSwapTxSpendErr::TxMessagesEmpty)?;
+        let htlc_proto = CreateHtlcProtoRep::decode(first_message.value.as_slice())?;
+        let htlc = MsgCreateHtlc::try_from(htlc_proto)?;
+        let htlc_id = self.calculate_htlc_id(&htlc.sender, &htlc.to, htlc.amount, input.secret_hash);
+
+        let htlc_response = self.query_htlc(htlc_id.clone()).await?;
+        let htlc_data = match htlc_response.htlc {
+            Some(htlc) => htlc,
+            None => return Ok(None),
+        };
+
+        match htlc_data.state {
+            HTLC_STATE_OPEN => Ok(None),
+            HTLC_STATE_COMPLETED => {
+                let events_string = format!("claim_htlc.id='{}'", htlc_id);
+                let request = GetTxsEventRequest {
+                    events: vec![events_string],
+                    pagination: None,
+                    order_by: TendermintResultOrder::Ascending as i32,
+                };
+                let encoded_request = request.encode_to_vec();
+
+                let path = AbciPath::from_str(ABCI_GET_TXS_EVENT_PATH).expect("valid path");
+                let response = self
+                    .rpc_client()
+                    .await?
+                    .abci_query(
+                        Some(path),
+                        encoded_request.as_slice(),
+                        ABCI_REQUEST_HEIGHT,
+                        ABCI_REQUEST_PROVE,
+                    )
+                    .await
+                    .map_to_mm(TendermintCoinRpcError::from)?;
+                let response = GetTxsEventResponse::decode(response.value.as_slice())?;
+                match response.txs.first() {
+                    Some(tx) => {
+                        let tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
+                            data: TxRaw {
+                                body_bytes: tx.body.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
+                                auth_info_bytes: tx.auth_info.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
+                                signatures: tx.signatures.clone(),
+                            },
+                        });
+                        Ok(Some(FoundSwapTxSpend::Spent(tx)))
+                    },
+                    None => MmError::err(SearchForSwapTxSpendErr::ClaimHtlcTxNotFound),
+                }
+            },
+            HTLC_STATE_REFUNDED => {
+                // HTLC is refunded automatically without transaction. We have to return dummy tx data
+                Ok(Some(FoundSwapTxSpend::Refunded(TransactionEnum::CosmosTransaction(
+                    CosmosTransaction { data: TxRaw::default() },
+                ))))
+            },
+            unexpected_state => MmError::err(SearchForSwapTxSpendErr::UnexpectedHtlcState(unexpected_state)),
+        }
+    }
+}
+
+fn clients_from_urls(rpc_urls: &[String]) -> MmResult<Vec<HttpClient>, TendermintInitErrorKind> {
+    if rpc_urls.is_empty() {
+        return MmError::err(TendermintInitErrorKind::EmptyRpcUrls);
+    }
+    let mut clients = Vec::new();
+    let mut errors = Vec::new();
+    // check that all urls are valid
+    // keep all invalid urls in one vector to show all of them in error
+    for url in rpc_urls.iter() {
+        match HttpClient::new(url.as_str()) {
+            Ok(client) => clients.push(client),
+            Err(e) => errors.push(format!("Url {} is invalid, got error {}", url, e)),
+        }
+    }
+    drop_mutability!(clients);
+    drop_mutability!(errors);
+    if !errors.is_empty() {
+        let errors: String = errors.into_iter().join(", ");
+        return MmError::err(TendermintInitErrorKind::RpcClientInitError(errors));
+    }
+    Ok(clients)
+}
+
+#[async_trait]
+#[allow(unused_variables)]
+impl MmCoin for TendermintCoin {
+    fn is_asset_chain(&self) -> bool { false }
+
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        let coin = self.clone();
+        let fut = async move {
+            let to_address =
+                AccountId::from_str(&req.to).map_to_mm(|e| WithdrawError::InvalidAddress(e.to_string()))?;
+            if to_address.prefix() != coin.account_prefix {
+                return MmError::err(WithdrawError::InvalidAddress(format!(
+                    "expected {} address prefix",
+                    coin.account_prefix
+                )));
+            }
+            let balance_denom = coin.balance_for_denom(coin.denom.to_string()).await?;
+            let balance_dec = big_decimal_from_sat_unsigned(balance_denom, coin.decimals);
+
+            // << BEGIN TX SIMULATION FOR FEE CALCULATION
+            let (amount_denom, amount_dec, total_amount) = if req.max {
+                let amount_denom = balance_denom;
+                (
+                    amount_denom,
+                    big_decimal_from_sat_unsigned(amount_denom, coin.decimals),
+                    balance_dec.clone(),
+                )
+            } else {
+                let total = req.amount.clone();
+
+                (
+                    sat_from_big_decimal(&req.amount, coin.decimals)?,
+                    req.amount.clone(),
+                    total,
+                )
+            };
+
+            if !coin.is_tx_amount_enough(coin.decimals, &amount_dec) {
+                return MmError::err(WithdrawError::AmountTooLow {
+                    amount: amount_dec,
+                    threshold: coin.min_tx_amount(),
+                });
+            }
+
+            let received_by_me = if to_address == coin.account_id {
+                amount_dec
+            } else {
+                BigDecimal::default()
+            };
+
+            let msg_send = MsgSend {
+                from_address: coin.account_id.clone(),
+                to_address: to_address.clone(),
+                amount: vec![Coin {
+                    denom: coin.denom.clone(),
+                    amount: amount_denom.into(),
+                }],
+            }
+            .to_any()
+            .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let memo = req.memo.unwrap_or_else(|| TX_DEFAULT_MEMO.into());
+            let current_block = coin
+                .current_block()
+                .compat()
+                .await
+                .map_to_mm(WithdrawError::Transport)?;
+
+            let _sequence_lock = coin.sequence_lock.lock().await;
+            let account_info = coin.my_account_info().await?;
+
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+            let simulated_tx = coin
+                .gen_simulated_tx(account_info.clone(), msg_send.clone(), timeout_height, memo.clone())
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+            // >> END TX SIMULATION FOR FEE CALCULATION
+
+            let fee_amount_u64 = coin.calculate_fee_amount_as_u64(simulated_tx).await?;
+            let fee_amount_dec = big_decimal_from_sat_unsigned(fee_amount_u64, coin.decimals());
+
+            let fee_amount = Coin {
+                denom: coin.denom.clone(),
+                amount: fee_amount_u64.into(),
+            };
+
+            let fee = Fee::from_amount_and_gas(fee_amount, GAS_LIMIT_DEFAULT);
+
+            let (amount_denom, amount_dec, total_amount) = if req.max {
+                if balance_denom < fee_amount_u64 {
+                    return MmError::err(WithdrawError::NotSufficientBalance {
+                        coin: coin.ticker.clone(),
+                        available: balance_dec,
+                        required: fee_amount_dec,
+                    });
+                }
+                let amount_denom = balance_denom - fee_amount_u64;
+                (
+                    amount_denom,
+                    big_decimal_from_sat_unsigned(amount_denom, coin.decimals),
+                    balance_dec,
+                )
+            } else {
+                let total = &req.amount + &fee_amount_dec;
+                if balance_dec < total {
+                    return MmError::err(WithdrawError::NotSufficientBalance {
+                        coin: coin.ticker.clone(),
+                        available: balance_dec,
+                        required: total,
+                    });
+                }
+
+                (
+                    sat_from_big_decimal(&req.amount, coin.decimals)?,
+                    req.amount.clone(),
+                    total,
+                )
+            };
+
+            let msg_send = MsgSend {
+                from_address: coin.account_id.clone(),
+                to_address,
+                amount: vec![Coin {
+                    denom: coin.denom.clone(),
+                    amount: amount_denom.into(),
+                }],
+            }
+            .to_any()
+            .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let tx_raw = coin
+                .any_to_signed_raw_tx(account_info, msg_send, fee, timeout_height, memo.clone())
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let tx_bytes = tx_raw
+                .to_bytes()
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let hash = sha256(&tx_bytes);
+            Ok(TransactionDetails {
+                tx_hash: hex::encode_upper(hash.as_slice()),
+                tx_hex: tx_bytes.into(),
+                from: vec![coin.account_id.to_string()],
+                to: vec![req.to],
+                my_balance_change: &received_by_me - &total_amount,
+                spent_by_me: total_amount.clone(),
+                total_amount,
+                received_by_me,
+                block_height: 0,
+                timestamp: 0,
+                fee_details: Some(TxFeeDetails::Tendermint(TendermintFeeDetails {
+                    coin: coin.ticker.clone(),
+                    amount: fee_amount_dec,
+                    uamount: fee_amount_u64,
+                    gas_limit: GAS_LIMIT_DEFAULT,
+                })),
+                coin: coin.ticker.to_string(),
+                internal_id: hash.to_vec().into(),
+                kmd_rewards: None,
+                transaction_type: TransactionType::default(),
+                memo: Some(memo),
+            })
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn get_raw_transaction(&self, mut req: RawTransactionRequest) -> RawTransactionFut {
+        let coin = self.clone();
+        let fut = async move {
+            req.tx_hash.make_ascii_uppercase();
+            let tx_from_rpc = coin.request_tx(req.tx_hash).await?;
+            Ok(RawTransactionRes {
+                tx_hex: tx_from_rpc.encode_to_vec().into(),
+            })
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        let coin = self.clone();
+        let hash = hex::encode_upper(H256::from(tx_hash.as_slice()));
+        let fut = async move {
+            let tx_from_rpc = coin.request_tx(hash).await?;
+            Ok(RawTransactionRes {
+                tx_hex: tx_from_rpc.encode_to_vec().into(),
+            })
+        };
+        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> {
+        // TODO
+        Err("Not implemented".into())
+    }
+
+    fn validate_address(&self, address: &str) -> ValidateAddressResult {
+        match AccountId::from_str(address) {
+            Ok(account) if account.prefix() != self.account_prefix => ValidateAddressResult {
+                is_valid: false,
+                reason: Some(format!(
+                    "Expected {} account prefix, got {}",
+                    self.account_prefix,
+                    account.prefix()
+                )),
+            },
+            Ok(_) => ValidateAddressResult {
+                is_valid: true,
+                reason: None,
+            },
+            Err(e) => ValidateAddressResult {
+                is_valid: false,
+                reason: Some(e.to_string()),
+            },
+        }
+    }
+
+    fn process_history_loop(&self, ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> {
+        warn!("process_history_loop is deprecated, tendermint uses tx_history_v2");
+        Box::new(futures01::future::err(()))
+    }
+
+    fn history_sync_status(&self) -> HistorySyncState { self.history_sync_state.lock().unwrap().clone() }
+
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
+        Box::new(futures01::future::err("Not implemented".into()))
+    }
+
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        let amount = match value {
+            TradePreimageValue::Exact(decimal) | TradePreimageValue::UpperBound(decimal) => decimal,
+        };
+        self.get_sender_trade_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, amount)
+            .await
+    }
+
+    fn get_receiver_trade_fee(&self, send_amount: BigDecimal, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        let coin = self.clone();
+        let fut = async move {
+            // We can't simulate Claim Htlc without having information about broadcasted htlc tx.
+            // Since create and claim htlc fees are almost same, we can simply simulate create htlc tx.
+            coin.get_sender_trade_fee_for_denom(coin.ticker.clone(), coin.denom.clone(), coin.decimals, send_amount)
+                .await
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        self.get_fee_to_send_taker_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, dex_fee_amount)
+            .await
+    }
+
+    fn required_confirmations(&self) -> u64 { 0 }
+
+    fn requires_notarization(&self) -> bool { false }
+
+    fn set_required_confirmations(&self, confirmations: u64) {
+        warn!("set_required_confirmations is not supported for tendermint")
+    }
+
+    fn set_requires_notarization(&self, requires_nota: bool) { warn!("TendermintCoin doesn't support notarization") }
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { None }
+
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { None }
+
+    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 }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
+}
+
+impl MarketCoinOps for TendermintCoin {
+    fn ticker(&self) -> &str { &self.ticker }
+
+    fn my_address(&self) -> MmResult<String, MyAddressError> { Ok(self.account_id.to_string()) }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        let key = SigningKey::from_bytes(&self.priv_key).expect("privkey validity is checked on coin creation");
+        Ok(key.public_key().to_string())
+    }
+
+    fn sign_message_hash(&self, _message: &str) -> Option<[u8; 32]> {
+        // TODO
+        None
+    }
+
+    fn sign_message(&self, _message: &str) -> SignatureResult<String> {
+        // TODO
+        MmError::err(SignatureError::InternalError("Not implemented".into()))
+    }
+
+    fn verify_message(&self, _signature: &str, _message: &str, _address: &str) -> VerificationResult<bool> {
+        // TODO
+        MmError::err(VerificationError::InternalError("Not implemented".into()))
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let coin = self.clone();
+        let fut = async move {
+            let balance_denom = coin.balance_for_denom(coin.denom.to_string()).await?;
+            Ok(CoinBalance {
+                spendable: big_decimal_from_sat_unsigned(balance_denom, coin.decimals),
+                unspendable: BigDecimal::default(),
+            })
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> {
+        Box::new(self.my_balance().map(|coin_balance| coin_balance.spendable))
+    }
+
+    fn platform_ticker(&self) -> &str { &self.ticker }
+
+    fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        let tx_bytes = try_fus!(hex::decode(tx));
+        self.send_raw_tx_bytes(&tx_bytes)
+    }
+
+    fn send_raw_tx_bytes(&self, tx: &[u8]) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        // as sanity check
+        try_fus!(Raw::from_bytes(tx));
+
+        let coin = self.clone();
+        let tx_bytes = tx.to_owned();
+        let fut = async move {
+            let broadcast_res = try_s!(
+                try_s!(coin.rpc_client().await)
+                    .broadcast_tx_commit(tx_bytes.into())
+                    .await
+            );
+            if !broadcast_res.check_tx.code.is_ok() {
+                return ERR!("Tx check failed {:?}", broadcast_res.check_tx);
+            }
+
+            if !broadcast_res.deliver_tx.code.is_ok() {
+                return ERR!("Tx deliver failed {:?}", broadcast_res.deliver_tx);
+            }
+            Ok(broadcast_res.hash.to_string())
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn wait_for_confirmations(
+        &self,
+        tx_bytes: &[u8],
+        _confirmations: u64,
+        _requires_nota: bool,
+        wait_until: u64,
+        check_every: u64,
+    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        // Sanity check
+        let _: TxRaw = try_fus!(Message::decode(tx_bytes));
+
+        let tx_hash = hex::encode_upper(sha256(tx_bytes));
+
+        let coin = self.clone();
+        let fut = async move {
+            loop {
+                if now_ms() / 1000 > wait_until {
+                    return ERR!(
+                        "Waited too long until {} for payment {} to be received",
+                        wait_until,
+                        tx_hash.clone()
+                    );
+                }
+
+                let tx_status_code = try_s!(coin.get_tx_status_code_or_none(tx_hash.clone()).await);
+
+                if let Some(tx_status_code) = tx_status_code {
+                    return match tx_status_code {
+                        cosmrs::tendermint::abci::Code::Ok => Ok(()),
+                        cosmrs::tendermint::abci::Code::Err(err_code) => Err(format!(
+                            "Got error code: '{}' for tx: '{}'. Broadcasted tx isn't valid.",
+                            err_code, tx_hash
+                        )),
+                    };
+                };
+
+                Timer::sleep(check_every as f64).await;
+            }
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn wait_for_htlc_tx_spend(
+        &self,
+        transaction: &[u8],
+        secret_hash: &[u8],
+        wait_until: u64,
+        _from_block: u64,
+        _swap_contract_address: &Option<BytesJson>,
+        _check_every: f64,
+    ) -> TransactionFut {
+        let tx = try_tx_fus!(cosmrs::Tx::from_bytes(transaction));
+        let first_message = try_tx_fus!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
+        let htlc_proto = try_tx_fus!(CreateHtlcProtoRep::decode(first_message.value.as_slice()));
+        let htlc = try_tx_fus!(MsgCreateHtlc::try_from(htlc_proto));
+        let htlc_id = self.calculate_htlc_id(&htlc.sender, &htlc.to, htlc.amount, secret_hash);
+
+        let events_string = format!("claim_htlc.id='{}'", htlc_id);
+        let request = GetTxsEventRequest {
+            events: vec![events_string],
+            pagination: None,
+            order_by: TendermintResultOrder::Ascending as i32,
+        };
+        let encoded_request = request.encode_to_vec();
+
+        let coin = self.clone();
+        let path = try_tx_fus!(AbciPath::from_str(ABCI_GET_TXS_EVENT_PATH));
+        let fut = async move {
+            loop {
+                let response = try_tx_s!(
+                    try_tx_s!(coin.rpc_client().await)
+                        .abci_query(
+                            Some(path.clone()),
+                            encoded_request.as_slice(),
+                            ABCI_REQUEST_HEIGHT,
+                            ABCI_REQUEST_PROVE
+                        )
+                        .await
+                );
+                let response = try_tx_s!(GetTxsEventResponse::decode(response.value.as_slice()));
+                if let Some(tx) = response.txs.first() {
+                    return Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
+                        data: TxRaw {
+                            body_bytes: tx.body.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
+                            auth_info_bytes: tx.auth_info.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
+                            signatures: tx.signatures.clone(),
+                        },
+                    }));
+                }
+                Timer::sleep(5.).await;
+                if get_utc_timestamp() > wait_until as i64 {
+                    return Err(TransactionErr::Plain("Waited too long".into()));
+                }
+            }
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        let tx_raw: TxRaw = Message::decode(bytes).map_to_mm(|e| TxMarshalingErr::InvalidInput(e.to_string()))?;
+        Ok(TransactionEnum::CosmosTransaction(CosmosTransaction { data: tx_raw }))
+    }
+
+    fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
+        let coin = self.clone();
+        let fut = async move {
+            let info = try_s!(try_s!(coin.rpc_client().await).abci_info().await);
+            Ok(info.last_block_height.into())
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn display_priv_key(&self) -> Result<String, String> { Ok(hex::encode(&self.priv_key)) }
+
+    fn min_tx_amount(&self) -> BigDecimal { big_decimal_from_sat(MIN_TX_SATOSHIS, self.decimals) }
+
+    fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
+}
+
+#[async_trait]
+#[allow(unused_variables)]
+impl SwapOps for TendermintCoin {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, uuid: &[u8]) -> TransactionFut {
+        self.send_taker_fee_for_denom(fee_addr, amount, self.denom.clone(), self.decimals, uuid)
+    }
+
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
+        self.send_htlc_for_denom(
+            maker_payment_args.time_lock_duration,
+            maker_payment_args.other_pubkey,
+            maker_payment_args.secret_hash,
+            maker_payment_args.amount,
+            self.denom.clone(),
+            self.decimals,
+        )
+    }
+
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
+        self.send_htlc_for_denom(
+            taker_payment_args.time_lock_duration,
+            taker_payment_args.other_pubkey,
+            taker_payment_args.secret_hash,
+            taker_payment_args.amount,
+            self.denom.clone(),
+            self.decimals,
+        )
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
+    ) -> TransactionFut {
+        let tx = try_tx_fus!(cosmrs::Tx::from_bytes(maker_spends_payment_args.other_payment_tx));
+        let msg = try_tx_fus!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
+        let htlc_proto: CreateHtlcProtoRep = try_tx_fus!(prost::Message::decode(msg.value.as_slice()));
+        let htlc = try_tx_fus!(MsgCreateHtlc::try_from(htlc_proto));
+
+        let mut amount = htlc.amount.clone();
+        amount.sort();
+        drop_mutability!(amount);
+
+        let coins_string = amount
+            .iter()
+            .map(|t| format!("{}{}", t.amount, t.denom))
+            .collect::<Vec<String>>()
+            .join(",");
+
+        let htlc_id = self.calculate_htlc_id(&htlc.sender, &htlc.to, amount, maker_spends_payment_args.secret_hash);
+
+        let claim_htlc_tx = try_tx_fus!(self.gen_claim_htlc_tx(htlc_id, maker_spends_payment_args.secret));
+        let coin = self.clone();
+
+        let fut = async move {
+            let _sequence_lock = coin.sequence_lock.lock().await;
+            let current_block = try_tx_s!(coin.current_block().compat().await);
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+            let account_info = try_tx_s!(coin.my_account_info().await);
+
+            let simulated_tx = try_tx_s!(coin.gen_simulated_tx(
+                account_info.clone(),
+                claim_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let fee = try_tx_s!(coin.calculate_fee(coin.denom.clone(), simulated_tx).await);
+
+            let tx_raw = try_tx_s!(coin.any_to_signed_raw_tx(
+                account_info,
+                claim_htlc_tx.msg_payload,
+                fee,
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let tx_id = try_tx_s!(coin.send_raw_tx_bytes(&try_tx_s!(tx_raw.to_bytes())).compat().await);
+
+            Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
+                data: tx_raw.into(),
+            }))
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
+    ) -> TransactionFut {
+        let tx = try_tx_fus!(cosmrs::Tx::from_bytes(taker_spends_payment_args.other_payment_tx));
+        let msg = try_tx_fus!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
+        let htlc_proto: CreateHtlcProtoRep = try_tx_fus!(prost::Message::decode(msg.value.as_slice()));
+        let htlc = try_tx_fus!(MsgCreateHtlc::try_from(htlc_proto));
+
+        let mut amount = htlc.amount.clone();
+        amount.sort();
+        drop_mutability!(amount);
+
+        let coins_string = amount
+            .iter()
+            .map(|t| format!("{}{}", t.amount, t.denom))
+            .collect::<Vec<String>>()
+            .join(",");
+
+        let htlc_id = self.calculate_htlc_id(&htlc.sender, &htlc.to, amount, taker_spends_payment_args.secret_hash);
+
+        let claim_htlc_tx = try_tx_fus!(self.gen_claim_htlc_tx(htlc_id, taker_spends_payment_args.secret));
+        let coin = self.clone();
+
+        let fut = async move {
+            let _sequence_lock = coin.sequence_lock.lock().await;
+            let current_block = try_tx_s!(coin.current_block().compat().await);
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+            let account_info = try_tx_s!(coin.my_account_info().await);
+
+            let simulated_tx = try_tx_s!(coin.gen_simulated_tx(
+                account_info.clone(),
+                claim_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let fee = try_tx_s!(coin.calculate_fee(coin.denom.clone(), simulated_tx).await);
+
+            let tx_raw = try_tx_s!(coin.any_to_signed_raw_tx(
+                account_info,
+                claim_htlc_tx.msg_payload,
+                fee,
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            ));
+
+            let tx_id = try_tx_s!(coin.send_raw_tx_bytes(&try_tx_s!(tx_raw.to_bytes())).compat().await);
+
+            Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
+                data: tx_raw.into(),
+            }))
+        };
+
+        Box::new(fut.boxed().compat())
+    }
+
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to refund IRIS HTLC".into(),
+        )))
+    }
+
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to refund IRIS HTLC".into(),
+        )))
+    }
+
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        self.validate_fee_for_denom(
+            validate_fee_args.fee_tx,
+            validate_fee_args.expected_sender,
+            validate_fee_args.fee_addr,
+            validate_fee_args.amount,
+            self.decimals,
+            validate_fee_args.uuid,
+            self.denom.to_string(),
+        )
+    }
+
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+    }
+
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        self.check_if_my_payment_sent_for_denom(
+            self.decimals,
+            self.denom.clone(),
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.amount,
+        )
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        self.search_for_swap_tx_spend(input).await.map_err(|e| e.to_string())
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        self.search_for_swap_tx_spend(input).await.map_err(|e| e.to_string())
+    }
+
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+        let tx = try_s!(cosmrs::Tx::from_bytes(spend_tx));
+        let msg = try_s!(tx.body.messages.first().ok_or("Tx body couldn't be read."));
+        let htlc_proto: super::iris::htlc_proto::ClaimHtlcProtoRep =
+            try_s!(prost::Message::decode(msg.value.as_slice()));
+        let htlc = try_s!(MsgClaimHtlc::try_from(htlc_proto));
+
+        Ok(try_s!(hex::decode(htlc.secret)))
+    }
+
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    // Todo
+    fn is_auto_refundable(&self) -> bool { false }
+
+    // Todo
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        Ok(None)
+    }
+
+    #[inline]
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        key_pair_from_secret(&self.priv_key).expect("valid priv key")
+    }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+    }
+
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        PublicKey::from_raw_secp256k1(raw_pubkey)
+            .or_mm_err(|| ValidateOtherPubKeyErr::InvalidPubKey(hex::encode(raw_pubkey)))?;
+        Ok(())
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for TendermintCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for TendermintCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for TendermintCoin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
+}
+
+/// Processes the given `priv_key_policy` and returns corresponding `Secp256k1Secret`.
+/// This function expects either [`PrivKeyBuildPolicy::IguanaPrivKey`]
+/// or [`PrivKeyBuildPolicy::GlobalHDAccount`], otherwise returns `PrivKeyPolicyNotAllowed` error.
+pub(crate) fn secret_from_priv_key_policy(
+    conf: &TendermintConf,
+    ticker: &str,
+    priv_key_policy: PrivKeyBuildPolicy,
+) -> MmResult<Secp256k1Secret, TendermintInitError> {
+    match priv_key_policy {
+        PrivKeyBuildPolicy::IguanaPrivKey(iguana) => Ok(iguana),
+        PrivKeyBuildPolicy::GlobalHDAccount(global_hd) => {
+            let derivation_path = conf.derivation_path.as_ref().or_mm_err(|| TendermintInitError {
+                ticker: ticker.to_string(),
+                kind: TendermintInitErrorKind::DerivationPathIsNotSet,
+            })?;
+            global_hd
+                .derive_secp256k1_secret(derivation_path)
+                .mm_err(|e| TendermintInitError {
+                    ticker: ticker.to_string(),
+                    kind: TendermintInitErrorKind::InvalidPrivKey(e.to_string()),
+                })
+        },
+        PrivKeyBuildPolicy::Trezor => {
+            let kind =
+                TendermintInitErrorKind::PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed::HardwareWalletNotSupported);
+            MmError::err(TendermintInitError {
+                ticker: ticker.to_string(),
+                kind,
+            })
+        },
+    }
+}
+
+#[cfg(test)]
+pub mod tendermint_coin_tests {
+    use super::*;
+
+    use common::{block_on, DEX_FEE_ADDR_RAW_PUBKEY};
+    use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, GetTxsEventResponse};
+    use crypto::privkey::key_pair_from_seed;
+    use rand::{thread_rng, Rng};
+    use std::mem::discriminant;
+
+    pub const IRIS_TESTNET_HTLC_PAIR1_SEED: &str = "iris test seed";
+    // pub const IRIS_TESTNET_HTLC_PAIR1_PUB_KEY: &str = &[
+    //     2, 35, 133, 39, 114, 92, 150, 175, 252, 203, 124, 85, 243, 144, 11, 52, 91, 128, 236, 82, 104, 212, 131, 40,
+    //     79, 22, 40, 7, 119, 93, 50, 179, 43,
+    // ];
+    // const IRIS_TESTNET_HTLC_PAIR1_ADDRESS: &str = "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2";
+
+    // const IRIS_TESTNET_HTLC_PAIR2_SEED: &str = "iris test2 seed";
+    const IRIS_TESTNET_HTLC_PAIR2_PUB_KEY: &[u8] = &[
+        2, 90, 55, 151, 92, 7, 154, 117, 67, 96, 63, 202, 178, 78, 37, 101, 164, 173, 238, 60, 249, 175, 137, 52, 105,
+        14, 16, 50, 130, 250, 64, 37, 17,
+    ];
+    const IRIS_TESTNET_HTLC_PAIR2_ADDRESS: &str = "iaa1erfnkjsmalkwtvj44qnfr2drfzdt4n9ldh0kjv";
+
+    pub const IRIS_TESTNET_RPC_URL: &str = "http://34.80.202.172:26657";
+
+    const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
+    const AVG_BLOCKTIME: u8 = 5;
+
+    const SUCCEED_TX_HASH_SAMPLES: &[&str] = &[
+        // https://nyancat.iobscan.io/#/tx?txHash=A010FC0AA33FC6D597A8635F9D127C0A7B892FAAC72489F4DADD90048CFE9279
+        "A010FC0AA33FC6D597A8635F9D127C0A7B892FAAC72489F4DADD90048CFE9279",
+        // https://nyancat.iobscan.io/#/tx?txHash=54FD77054AE311C484CC2EADD4621428BB23D14A9BAAC128B0E7B47422F86EC8
+        "54FD77054AE311C484CC2EADD4621428BB23D14A9BAAC128B0E7B47422F86EC8",
+        // https://nyancat.iobscan.io/#/tx?txHash=7C00FAE7F70C36A316A4736025B08A6EAA2A0CC7919A2C4FC4CD14D9FFD166F9
+        "7C00FAE7F70C36A316A4736025B08A6EAA2A0CC7919A2C4FC4CD14D9FFD166F9",
+    ];
+
+    const FAILED_TX_HASH_SAMPLES: &[&str] = &[
+        // https://nyancat.iobscan.io/#/tx?txHash=57EE62B2DF7E311C98C24AE2A53EB0FF2C16D289CECE0826CA1FF1108C91B3F9
+        "57EE62B2DF7E311C98C24AE2A53EB0FF2C16D289CECE0826CA1FF1108C91B3F9",
+        // https://nyancat.iobscan.io/#/tx?txHash=F3181D69C580318DFD54282C656AC81113BC600BCFBAAA480E6D8A6469EE8786
+        "F3181D69C580318DFD54282C656AC81113BC600BCFBAAA480E6D8A6469EE8786",
+        // https://nyancat.iobscan.io/#/tx?txHash=FE6F9F395DA94A14FCFC04E0E8C496197077D5F4968DA5528D9064C464ADF522
+        "FE6F9F395DA94A14FCFC04E0E8C496197077D5F4968DA5528D9064C464ADF522",
+    ];
+
+    fn get_iris_usdc_ibc_protocol() -> TendermintProtocolInfo {
+        TendermintProtocolInfo {
+            decimals: 6,
+            denom: String::from("ibc/5C465997B4F582F602CD64E12031C6A6E18CAF1E6EDC9B5D808822DC0B5F850C"),
+            account_prefix: String::from("iaa"),
+            chain_id: String::from("nyancat-9"),
+            gas_price: None,
+        }
+    }
+
+    fn get_iris_protocol() -> TendermintProtocolInfo {
+        TendermintProtocolInfo {
+            decimals: 6,
+            denom: String::from("unyan"),
+            account_prefix: String::from("iaa"),
+            chain_id: String::from("nyancat-9"),
+            gas_price: None,
+        }
+    }
+
+    #[test]
+    fn test_tx_hash_str_from_bytes() {
+        let tx_hex = "0a97010a8f010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126f0a2d636f736d6f7331737661773061716334353834783832356a753775613033673578747877643061686c3836687a122d636f736d6f7331737661773061716334353834783832356a753775613033673578747877643061686c3836687a1a0f0a057561746f6d120631303030303018d998bf0512670a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a2102000eef4ab169e7b26a4a16c47420c4176ab702119ba57a8820fb3e53c8e7506212040a020801180312130a0d0a057561746f6d12043130303010a08d061a4093e5aec96f7d311d129f5ec8714b21ad06a75e483ba32afab86354400b2ac8350bfc98731bbb05934bf138282750d71aadbe08ceb6bb195f2b55e1bbfdddaaad";
+        let expected_hash = "1C25ED7D17FCC5959409498D5423594666C4E84F15AF7B4AF17DF29B2AF9E7F5";
+
+        let tx_bytes = hex::decode(tx_hex).unwrap();
+        let hash = sha256(&tx_bytes);
+        assert_eq!(hex::encode_upper(hash.as_slice()), expected_hash);
+    }
+
+    #[test]
+    fn test_htlc_create_and_claim() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_usdc_ibc_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "USDC-IBC".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // << BEGIN HTLC CREATION
+        let base_denom: Denom = "unyan".parse().unwrap();
+        let to: AccountId = IRIS_TESTNET_HTLC_PAIR2_ADDRESS.parse().unwrap();
+        const UAMOUNT: u64 = 1;
+        let amount: cosmrs::Decimal = UAMOUNT.into();
+        let amount_dec = big_decimal_from_sat_unsigned(UAMOUNT, coin.decimals);
+        let sec: [u8; 32] = thread_rng().gen();
+        let time_lock = 1000;
+
+        let create_htlc_tx = coin
+            .gen_create_htlc_tx(coin.denom.clone(), &to, amount, sha256(&sec).as_slice(), time_lock)
+            .unwrap();
+
+        let current_block_fut = coin.current_block().compat();
+        let current_block = block_on(async { current_block_fut.await.unwrap() });
+        let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+        let account_info_fut = coin.my_account_info();
+        let account_info = block_on(async { account_info_fut.await.unwrap() });
+
+        let simulated_tx = coin
+            .gen_simulated_tx(
+                account_info.clone(),
+                create_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            )
+            .unwrap();
+
+        let fee = block_on(async { coin.calculate_fee(base_denom.clone(), simulated_tx).await.unwrap() });
+
+        let raw_tx = block_on(async {
+            coin.any_to_signed_raw_tx(
+                account_info.clone(),
+                create_htlc_tx.msg_payload.clone(),
+                fee,
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            )
+            .unwrap()
+        });
+        let tx_bytes = raw_tx.to_bytes().unwrap();
+
+        let send_tx_fut = coin.send_raw_tx_bytes(&tx_bytes).compat();
+        block_on(async {
+            send_tx_fut.await.unwrap();
+        });
+        // >> END HTLC CREATION
+
+        let htlc_spent = block_on(
+            coin.check_if_my_payment_sent(CheckIfMyPaymentSentArgs {
+                time_lock: 0,
+                other_pub: IRIS_TESTNET_HTLC_PAIR2_PUB_KEY,
+                secret_hash: sha256(&sec).as_slice(),
+                search_from_block: current_block,
+                swap_contract_address: &None,
+                swap_unique_data: &[],
+                amount: &amount_dec,
+                payment_instructions: &None,
+            })
+            .compat(),
+        )
+        .unwrap();
+        assert!(htlc_spent.is_some());
+
+        // << BEGIN HTLC CLAIMING
+        let claim_htlc_tx = coin.gen_claim_htlc_tx(create_htlc_tx.id, &sec).unwrap();
+
+        let current_block_fut = coin.current_block().compat();
+        let current_block = common::block_on(async { current_block_fut.await.unwrap() });
+        let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+        let account_info_fut = coin.my_account_info();
+        let account_info = block_on(async { account_info_fut.await.unwrap() });
+
+        let simulated_tx = coin
+            .gen_simulated_tx(
+                account_info.clone(),
+                claim_htlc_tx.msg_payload.clone(),
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            )
+            .unwrap();
+
+        let fee = block_on(async { coin.calculate_fee(base_denom.clone(), simulated_tx).await.unwrap() });
+
+        let raw_tx = coin
+            .any_to_signed_raw_tx(
+                account_info,
+                claim_htlc_tx.msg_payload,
+                fee,
+                timeout_height,
+                TX_DEFAULT_MEMO.into(),
+            )
+            .unwrap();
+
+        let tx_bytes = raw_tx.to_bytes().unwrap();
+        let send_tx_fut = coin.send_raw_tx_bytes(&tx_bytes).compat();
+        block_on(async {
+            send_tx_fut.await.unwrap();
+        });
+        println!("Claim HTLC tx hash {}", hex::encode_upper(sha256(&tx_bytes).as_slice()));
+        // >> END HTLC CLAIMING
+    }
+
+    #[test]
+    fn try_query_claim_htlc_txs_and_get_secret() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_usdc_ibc_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "USDC-IBC".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        let events = "claim_htlc.id='2B925FC83A106CC81590B3DB108AC2AE496FFA912F368FE5E29BC1ED2B754F2C'";
+        let request = GetTxsEventRequest {
+            events: vec![events.into()],
+            pagination: None,
+            order_by: TendermintResultOrder::Ascending as i32,
+        };
+        let path = AbciPath::from_str(ABCI_GET_TXS_EVENT_PATH).unwrap();
+        let response = block_on(block_on(coin.rpc_client()).unwrap().abci_query(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        ))
+        .unwrap();
+        println!("{:?}", response);
+
+        let response = GetTxsEventResponse::decode(response.value.as_slice()).unwrap();
+        let tx = response.txs.first().unwrap();
+        println!("{:?}", tx);
+
+        let first_msg = tx.body.as_ref().unwrap().messages.first().unwrap();
+        println!("{:?}", first_msg);
+
+        let claim_htlc =
+            crate::tendermint::iris::htlc_proto::ClaimHtlcProtoRep::decode(first_msg.value.as_slice()).unwrap();
+        let expected_secret = [1; 32];
+        let actual_secret = hex::decode(claim_htlc.secret).unwrap();
+
+        assert_eq!(actual_secret, expected_secret);
+    }
+
+    #[test]
+    fn wait_for_tx_spend_test() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_usdc_ibc_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "USDC-IBC".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // https://nyancat.iobscan.io/#/tx?txHash=2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727
+        let create_tx_hash = "2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727";
+
+        let request = GetTxRequest {
+            hash: create_tx_hash.into(),
+        };
+
+        let path = AbciPath::from_str(ABCI_GET_TX_PATH).unwrap();
+        let response = block_on(block_on(coin.rpc_client()).unwrap().abci_query(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        ))
+        .unwrap();
+        println!("{:?}", response);
+
+        let response = GetTxResponse::decode(response.value.as_slice()).unwrap();
+        let tx = response.tx.unwrap();
+
+        println!("{:?}", tx);
+
+        let encoded_tx = tx.encode_to_vec();
+
+        let secret_hash = hex::decode("0C34C71EBA2A51738699F9F3D6DAFFB15BE576E8ED543203485791B5DA39D10D").unwrap();
+        let spend_tx = block_on(
+            coin.wait_for_htlc_tx_spend(
+                &encoded_tx,
+                &secret_hash,
+                get_utc_timestamp() as u64,
+                0,
+                &None,
+                TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+            )
+            .compat(),
+        )
+        .unwrap();
+
+        // https://nyancat.iobscan.io/#/tx?txHash=565C820C1F95556ADC251F16244AAD4E4274772F41BC13F958C9C2F89A14D137
+        let expected_spend_hash = "565C820C1F95556ADC251F16244AAD4E4274772F41BC13F958C9C2F89A14D137";
+        let hash = spend_tx.tx_hash();
+        assert_eq!(hex::encode_upper(&hash.0), expected_spend_hash);
+    }
+
+    #[test]
+    fn validate_taker_fee_test() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "IRIS-TEST".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // CreateHtlc tx, validation should fail because first message of dex fee tx must be MsgSend
+        // https://nyancat.iobscan.io/#/tx?txHash=2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727
+        let create_htlc_tx_hash = "2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727";
+        let create_htlc_tx_bytes = block_on(coin.request_tx(create_htlc_tx_hash.into()))
+            .unwrap()
+            .encode_to_vec();
+        let create_htlc_tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
+            data: TxRaw::decode(create_htlc_tx_bytes.as_slice()).unwrap(),
+        });
+
+        let invalid_amount = 1.into();
+        let validate_err = coin
+            .validate_fee(ValidateFeeArgs {
+                fee_tx: &create_htlc_tx,
+                expected_sender: &[],
+                fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                amount: &invalid_amount,
+                min_block_number: 0,
+                uuid: &[1; 16],
+            })
+            .wait()
+            .unwrap_err();
+        println!("{}", validate_err);
+        assert!(validate_err.contains("failed to decode Protobuf message: MsgSend.amount"));
+
+        // just a random transfer tx not related to AtomicDEX, should fail on recipient address check
+        // https://nyancat.iobscan.io/#/tx?txHash=65815814E7D74832D87956144C1E84801DC94FE9A509D207A0ABC3F17775E5DF
+        let random_transfer_tx_hash = "65815814E7D74832D87956144C1E84801DC94FE9A509D207A0ABC3F17775E5DF";
+        let random_transfer_tx_bytes = block_on(coin.request_tx(random_transfer_tx_hash.into()))
+            .unwrap()
+            .encode_to_vec();
+
+        let random_transfer_tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
+            data: TxRaw::decode(random_transfer_tx_bytes.as_slice()).unwrap(),
+        });
+
+        let validate_err = coin
+            .validate_fee(ValidateFeeArgs {
+                fee_tx: &random_transfer_tx,
+                expected_sender: &[],
+                fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                amount: &invalid_amount,
+                min_block_number: 0,
+                uuid: &[1; 16],
+            })
+            .wait()
+            .unwrap_err();
+        println!("{}", validate_err);
+        assert!(validate_err.contains("sent to wrong address"));
+
+        // dex fee tx sent during real swap
+        // https://nyancat.iobscan.io/#/tx?txHash=8AA6B9591FE1EE93C8B89DE4F2C59B2F5D3473BD9FB5F3CFF6A5442BEDC881D7
+        let dex_fee_hash = "8AA6B9591FE1EE93C8B89DE4F2C59B2F5D3473BD9FB5F3CFF6A5442BEDC881D7";
+        let dex_fee_tx = block_on(coin.request_tx(dex_fee_hash.into())).unwrap();
+
+        let pubkey = dex_fee_tx.auth_info.as_ref().unwrap().signer_infos[0]
+            .public_key
+            .as_ref()
+            .unwrap()
+            .value[2..]
+            .to_vec();
+        let dex_fee_tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
+            data: TxRaw::decode(dex_fee_tx.encode_to_vec().as_slice()).unwrap(),
+        });
+
+        let validate_err = coin
+            .validate_fee(ValidateFeeArgs {
+                fee_tx: &dex_fee_tx,
+                expected_sender: &[],
+                fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                amount: &invalid_amount,
+                min_block_number: 0,
+                uuid: &[1; 16],
+            })
+            .wait()
+            .unwrap_err();
+        println!("{}", validate_err);
+        assert!(validate_err.contains("Invalid amount"));
+
+        let valid_amount: BigDecimal = "0.0001".parse().unwrap();
+        // valid amount but invalid sender
+        let validate_err = coin
+            .validate_fee(ValidateFeeArgs {
+                fee_tx: &dex_fee_tx,
+                expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
+                fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                amount: &valid_amount,
+                min_block_number: 0,
+                uuid: &[1; 16],
+            })
+            .wait()
+            .unwrap_err();
+        println!("{}", validate_err);
+        assert!(validate_err.contains("Invalid sender"));
+
+        // invalid memo
+        let validate_err = coin
+            .validate_fee(ValidateFeeArgs {
+                fee_tx: &dex_fee_tx,
+                expected_sender: &pubkey,
+                fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                amount: &valid_amount,
+                min_block_number: 0,
+                uuid: &[1; 16],
+            })
+            .wait()
+            .unwrap_err();
+        println!("{}", validate_err);
+        assert!(validate_err.contains("Invalid memo"));
+
+        // https://nyancat.iobscan.io/#/tx?txHash=5939A9D1AF57BB828714E0C4C4D7F2AEE349BB719B0A1F25F8FBCC3BB227C5F9
+        let fee_with_memo_hash = "5939A9D1AF57BB828714E0C4C4D7F2AEE349BB719B0A1F25F8FBCC3BB227C5F9";
+        let fee_with_memo_tx = block_on(coin.request_tx(fee_with_memo_hash.into())).unwrap();
+
+        let pubkey = fee_with_memo_tx.auth_info.as_ref().unwrap().signer_infos[0]
+            .public_key
+            .as_ref()
+            .unwrap()
+            .value[2..]
+            .to_vec();
+
+        let fee_with_memo_tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
+            data: TxRaw::decode(fee_with_memo_tx.encode_to_vec().as_slice()).unwrap(),
+        });
+
+        let uuid: Uuid = "cae6011b-9810-4710-b784-1e5dd0b3a0d0".parse().unwrap();
+        let amount: BigDecimal = "0.0001".parse().unwrap();
+        block_on(
+            coin.validate_fee_for_denom(
+                &fee_with_memo_tx,
+                &pubkey,
+                &DEX_FEE_ADDR_RAW_PUBKEY,
+                &amount,
+                6,
+                uuid.as_bytes(),
+                "nim".into(),
+            )
+            .compat(),
+        )
+        .unwrap();
+    }
+
+    #[test]
+    fn validate_payment_test() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "IRIS-TEST".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // just a random transfer tx not related to AtomicDEX, should fail because the message is not CreateHtlc
+        // https://nyancat.iobscan.io/#/tx?txHash=65815814E7D74832D87956144C1E84801DC94FE9A509D207A0ABC3F17775E5DF
+        let random_transfer_tx_hash = "65815814E7D74832D87956144C1E84801DC94FE9A509D207A0ABC3F17775E5DF";
+        let random_transfer_tx_bytes = block_on(coin.request_tx(random_transfer_tx_hash.into()))
+            .unwrap()
+            .encode_to_vec();
+
+        let input = ValidatePaymentInput {
+            payment_tx: random_transfer_tx_bytes,
+            time_lock_duration: 0,
+            time_lock: 0,
+            other_pub: Vec::new(),
+            secret_hash: Vec::new(),
+            amount: Default::default(),
+            swap_contract_address: None,
+            try_spv_proof_until: 0,
+            confirmations: 0,
+            unique_swap_data: Vec::new(),
+        };
+        let validate_err = coin.validate_taker_payment(input).wait().unwrap_err();
+        match validate_err.into_inner() {
+            ValidatePaymentError::WrongPaymentTx(e) => assert!(e.contains("Incorrect CreateHtlc message")),
+            unexpected => panic!("Unexpected error variant {:?}", unexpected),
+        };
+
+        // The HTLC that was already claimed or refunded should not pass the validation
+        // https://nyancat.iobscan.io/#/tx?txHash=93CF377D470EB27BD6E2C5B95BFEFE99359F95B88C70D785B34D1D2C670201B9
+        let claimed_htlc_tx_hash = "93CF377D470EB27BD6E2C5B95BFEFE99359F95B88C70D785B34D1D2C670201B9";
+        let claimed_htlc_tx_bytes = block_on(coin.request_tx(claimed_htlc_tx_hash.into()))
+            .unwrap()
+            .encode_to_vec();
+
+        let input = ValidatePaymentInput {
+            payment_tx: claimed_htlc_tx_bytes,
+            time_lock_duration: 20000,
+            time_lock: 1664984893,
+            other_pub: hex::decode("025a37975c079a7543603fcab24e2565a4adee3cf9af8934690e103282fa402511").unwrap(),
+            secret_hash: hex::decode("441d0237e93677d3458e1e5a2e69f61e3622813521bf048dd56290306acdd134").unwrap(),
+            amount: "0.01".parse().unwrap(),
+            swap_contract_address: None,
+            try_spv_proof_until: 0,
+            confirmations: 0,
+            unique_swap_data: Vec::new(),
+        };
+        let validate_err = block_on(
+            coin.validate_payment_for_denom(input, "nim".parse().unwrap(), 6)
+                .compat(),
+        )
+        .unwrap_err();
+        match validate_err.into_inner() {
+            ValidatePaymentError::UnexpectedPaymentState(_) => (),
+            unexpected => panic!("Unexpected error variant {:?}", unexpected),
+        };
+    }
+
+    #[test]
+    fn test_search_for_swap_tx_spend_spent() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "IRIS-TEST".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // https://nyancat.iobscan.io/#/tx?txHash=2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727
+        let create_tx_hash = "2DB382CE3D9953E4A94957B475B0E8A98F5B6DDB32D6BF0F6A765D949CF4A727";
+
+        let request = GetTxRequest {
+            hash: create_tx_hash.into(),
+        };
+
+        let path = AbciPath::from_str(ABCI_GET_TX_PATH).unwrap();
+        let response = block_on(block_on(coin.rpc_client()).unwrap().abci_query(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        ))
+        .unwrap();
+        println!("{:?}", response);
+
+        let response = GetTxResponse::decode(response.value.as_slice()).unwrap();
+        let tx = response.tx.unwrap();
+
+        println!("{:?}", tx);
+
+        let encoded_tx = tx.encode_to_vec();
+
+        let secret_hash = hex::decode("0C34C71EBA2A51738699F9F3D6DAFFB15BE576E8ED543203485791B5DA39D10D").unwrap();
+        let input = SearchForSwapTxSpendInput {
+            time_lock: 0,
+            other_pub: &[],
+            secret_hash: &secret_hash,
+            tx: &encoded_tx,
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+
+        let spend_tx = match block_on(coin.search_for_swap_tx_spend_my(input)).unwrap().unwrap() {
+            FoundSwapTxSpend::Spent(tx) => tx,
+            unexpected => panic!("Unexpected search_for_swap_tx_spend_my result {:?}", unexpected),
+        };
+
+        // https://nyancat.iobscan.io/#/tx?txHash=565C820C1F95556ADC251F16244AAD4E4274772F41BC13F958C9C2F89A14D137
+        let expected_spend_hash = "565C820C1F95556ADC251F16244AAD4E4274772F41BC13F958C9C2F89A14D137";
+        let hash = spend_tx.tx_hash();
+        assert_eq!(hex::encode_upper(&hash.0), expected_spend_hash);
+    }
+
+    #[test]
+    fn test_search_for_swap_tx_spend_refunded() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+
+        let protocol_conf = get_iris_protocol();
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = block_on(TendermintCoin::init(
+            &ctx,
+            "IRIS-TEST".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        // https://nyancat.iobscan.io/#/tx?txHash=BD1A76F43E8E2C7A1104EE363D63455CD50C76F2BFE93B703235F0A973061297
+        let create_tx_hash = "BD1A76F43E8E2C7A1104EE363D63455CD50C76F2BFE93B703235F0A973061297";
+
+        let request = GetTxRequest {
+            hash: create_tx_hash.into(),
+        };
+
+        let path = AbciPath::from_str(ABCI_GET_TX_PATH).unwrap();
+        let response = block_on(block_on(coin.rpc_client()).unwrap().abci_query(
+            Some(path),
+            request.encode_to_vec(),
+            ABCI_REQUEST_HEIGHT,
+            ABCI_REQUEST_PROVE,
+        ))
+        .unwrap();
+        println!("{:?}", response);
+
+        let response = GetTxResponse::decode(response.value.as_slice()).unwrap();
+        let tx = response.tx.unwrap();
+
+        println!("{:?}", tx);
+
+        let encoded_tx = tx.encode_to_vec();
+
+        let secret_hash = hex::decode("cb11cacffdfc82060aa4a9a1bb9cc094c4141b170994f7642cd54d7e7af6743e").unwrap();
+        let input = SearchForSwapTxSpendInput {
+            time_lock: 0,
+            other_pub: &[],
+            secret_hash: &secret_hash,
+            tx: &encoded_tx,
+            search_from_block: 0,
+            swap_contract_address: &None,
+            swap_unique_data: &[],
+        };
+
+        match block_on(coin.search_for_swap_tx_spend_my(input)).unwrap().unwrap() {
+            FoundSwapTxSpend::Refunded(tx) => {
+                let expected = TransactionEnum::CosmosTransaction(CosmosTransaction { data: TxRaw::default() });
+                assert_eq!(expected, tx);
+            },
+            unexpected => panic!("Unexpected search_for_swap_tx_spend_my result {:?}", unexpected),
+        };
+    }
+
+    #[test]
+    fn test_get_tx_status_code_or_none() {
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+        let protocol_conf = get_iris_usdc_ibc_protocol();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = common::block_on(TendermintCoin::init(
+            &ctx,
+            "USDC-IBC".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        for succeed_tx_hash in SUCCEED_TX_HASH_SAMPLES {
+            let status_code = common::block_on(coin.get_tx_status_code_or_none(succeed_tx_hash.to_string()))
+                .unwrap()
+                .expect("tx exists");
+
+            assert_eq!(status_code, cosmrs::tendermint::abci::Code::Ok);
+        }
+
+        for failed_tx_hash in FAILED_TX_HASH_SAMPLES {
+            let status_code = common::block_on(coin.get_tx_status_code_or_none(failed_tx_hash.to_string()))
+                .unwrap()
+                .expect("tx exists");
+
+            assert_eq!(
+                discriminant(&status_code),
+                discriminant(&cosmrs::tendermint::abci::Code::Err(61))
+            );
+        }
+
+        // Doesn't exists
+        let tx_hash = "0000000000000000000000000000000000000000000000000000000000000000".to_string();
+        let status_code = common::block_on(coin.get_tx_status_code_or_none(tx_hash)).unwrap();
+        assert!(status_code.is_none());
+    }
+
+    #[test]
+    fn test_wait_for_confirmations() {
+        const CHECK_INTERVAL: u64 = 2;
+
+        let rpc_urls = vec![IRIS_TESTNET_RPC_URL.to_string()];
+        let protocol_conf = get_iris_usdc_ibc_protocol();
+
+        let conf = TendermintConf {
+            avg_blocktime: AVG_BLOCKTIME,
+            derivation_path: None,
+        };
+
+        let ctx = mm2_core::mm_ctx::MmCtxBuilder::default().into_mm_arc();
+        let key_pair = key_pair_from_seed(IRIS_TESTNET_HTLC_PAIR1_SEED).unwrap();
+        let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(key_pair.private().secret);
+
+        let coin = common::block_on(TendermintCoin::init(
+            &ctx,
+            "USDC-IBC".to_string(),
+            conf,
+            protocol_conf,
+            rpc_urls,
+            false,
+            priv_key_policy,
+        ))
+        .unwrap();
+
+        let wait_until = || now_ms() + 45;
+
+        for succeed_tx_hash in SUCCEED_TX_HASH_SAMPLES {
+            let tx_bytes = block_on(coin.request_tx(succeed_tx_hash.to_string()))
+                .unwrap()
+                .encode_to_vec();
+
+            block_on(
+                coin.wait_for_confirmations(&tx_bytes, 0, false, wait_until(), CHECK_INTERVAL)
+                    .compat(),
+            )
+            .unwrap();
+        }
+
+        for failed_tx_hash in FAILED_TX_HASH_SAMPLES {
+            let tx_bytes = block_on(coin.request_tx(failed_tx_hash.to_string()))
+                .unwrap()
+                .encode_to_vec();
+
+            block_on(
+                coin.wait_for_confirmations(&tx_bytes, 0, false, wait_until(), CHECK_INTERVAL)
+                    .compat(),
+            )
+            .unwrap_err();
+        }
+    }
+}
diff --git a/mm2src/coins/tendermint/tendermint_token.rs b/mm2src/coins/tendermint/tendermint_token.rs
new file mode 100644
index 0000000000..3a0b6af9f1
--- /dev/null
+++ b/mm2src/coins/tendermint/tendermint_token.rs
@@ -0,0 +1,670 @@
+/// Module containing implementation for Tendermint Tokens. They include native assets + IBC
+use super::{TendermintCoin, TendermintFeeDetails, GAS_LIMIT_DEFAULT, MIN_TX_SATOSHIS, TIMEOUT_HEIGHT_DELTA,
+            TX_DEFAULT_MEMO};
+use crate::utxo::utxo_common::big_decimal_from_sat;
+use crate::{big_decimal_from_sat_unsigned, utxo::sat_from_big_decimal, BalanceFut, BigDecimal,
+            CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend, HistorySyncState,
+            MakerSwapTakerCoin, MarketCoinOps, MmCoin, MyAddressError, NegotiateSwapContractAddrErr,
+            PaymentInstructions, PaymentInstructionsErr, RawTransactionFut, RawTransactionRequest, RefundError,
+            RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs,
+            SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee, TradePreimageFut, TradePreimageResult,
+            TradePreimageValue, TransactionDetails, TransactionEnum, TransactionErr, TransactionFut, TransactionType,
+            TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs,
+            ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut,
+            ValidatePaymentInput, VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawError, WithdrawFut, WithdrawRequest};
+use async_trait::async_trait;
+use bitcrypto::sha256;
+use common::executor::abortable_queue::AbortableQueue;
+use common::executor::{AbortableSystem, AbortedError};
+use common::log::warn;
+use common::Future01CompatExt;
+use cosmrs::{bank::MsgSend,
+             tx::{Fee, Msg},
+             AccountId, Coin, Denom};
+use futures::{FutureExt, TryFutureExt};
+use futures01::Future;
+use keys::KeyPair;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::MmNumber;
+use rpc::v1::types::Bytes as BytesJson;
+use serde_json::Value as Json;
+use std::ops::Deref;
+use std::str::FromStr;
+use std::sync::Arc;
+
+pub struct TendermintTokenImpl {
+    pub ticker: String,
+    pub platform_coin: TendermintCoin,
+    pub decimals: u8,
+    pub denom: Denom,
+    /// This spawner is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// or on [`MmArc::stop`].
+    abortable_system: AbortableQueue,
+}
+
+#[derive(Clone)]
+pub struct TendermintToken(Arc<TendermintTokenImpl>);
+
+impl Deref for TendermintToken {
+    type Target = TendermintTokenImpl;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct TendermintTokenProtocolInfo {
+    pub platform: String,
+    pub decimals: u8,
+    pub denom: String,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct TendermintTokenActivationParams {}
+
+pub enum TendermintTokenInitError {
+    Internal(String),
+    InvalidDenom(String),
+    MyAddressError(String),
+    CouldNotFetchBalance(String),
+}
+
+impl From<MyAddressError> for TendermintTokenInitError {
+    fn from(err: MyAddressError) -> Self { TendermintTokenInitError::MyAddressError(err.to_string()) }
+}
+
+impl From<AbortedError> for TendermintTokenInitError {
+    fn from(e: AbortedError) -> Self { TendermintTokenInitError::Internal(e.to_string()) }
+}
+
+impl TendermintToken {
+    pub fn new(
+        ticker: String,
+        platform_coin: TendermintCoin,
+        decimals: u8,
+        denom: String,
+    ) -> MmResult<Self, TendermintTokenInitError> {
+        let denom = Denom::from_str(&denom).map_to_mm(|e| TendermintTokenInitError::InvalidDenom(e.to_string()))?;
+        let token_impl = TendermintTokenImpl {
+            abortable_system: platform_coin.abortable_system.create_subsystem()?,
+            ticker,
+            platform_coin,
+            decimals,
+            denom,
+        };
+        Ok(TendermintToken(Arc::new(token_impl)))
+    }
+}
+
+#[async_trait]
+#[allow(unused_variables)]
+impl SwapOps for TendermintToken {
+    fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, uuid: &[u8]) -> TransactionFut {
+        self.platform_coin
+            .send_taker_fee_for_denom(fee_addr, amount, self.denom.clone(), self.decimals, uuid)
+    }
+
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
+        self.platform_coin.send_htlc_for_denom(
+            maker_payment_args.time_lock_duration,
+            maker_payment_args.other_pubkey,
+            maker_payment_args.secret_hash,
+            maker_payment_args.amount,
+            self.denom.clone(),
+            self.decimals,
+        )
+    }
+
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
+        self.platform_coin.send_htlc_for_denom(
+            taker_payment_args.time_lock_duration,
+            taker_payment_args.other_pubkey,
+            taker_payment_args.secret_hash,
+            taker_payment_args.amount,
+            self.denom.clone(),
+            self.decimals,
+        )
+    }
+
+    fn send_maker_spends_taker_payment(
+        &self,
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
+    ) -> TransactionFut {
+        self.platform_coin
+            .send_maker_spends_taker_payment(maker_spends_payment_args)
+    }
+
+    fn send_taker_spends_maker_payment(
+        &self,
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
+    ) -> TransactionFut {
+        self.platform_coin
+            .send_taker_spends_maker_payment(taker_spends_payment_args)
+    }
+
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to be refunded".into(),
+        )))
+    }
+
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
+        Box::new(futures01::future::err(TransactionErr::Plain(
+            "Doesn't need transaction broadcast to be refunded".into(),
+        )))
+    }
+
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        self.platform_coin.validate_fee_for_denom(
+            validate_fee_args.fee_tx,
+            validate_fee_args.expected_sender,
+            validate_fee_args.fee_addr,
+            validate_fee_args.amount,
+            self.decimals,
+            validate_fee_args.uuid,
+            self.denom.to_string(),
+        )
+    }
+
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.platform_coin
+            .validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+    }
+
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
+        self.platform_coin
+            .validate_payment_for_denom(input, self.denom.clone(), self.decimals)
+    }
+
+    fn check_if_my_payment_sent(
+        &self,
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
+    ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
+        self.platform_coin.check_if_my_payment_sent_for_denom(
+            self.decimals,
+            self.denom.clone(),
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.amount,
+        )
+    }
+
+    async fn search_for_swap_tx_spend_my(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        self.platform_coin.search_for_swap_tx_spend_my(input).await
+    }
+
+    async fn search_for_swap_tx_spend_other(
+        &self,
+        input: SearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        self.platform_coin.search_for_swap_tx_spend_other(input).await
+    }
+
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
+        self.platform_coin.extract_secret(secret_hash, spend_tx).await
+    }
+
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    // Todo
+    fn is_auto_refundable(&self) -> bool { false }
+
+    // Todo
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    fn negotiate_swap_contract_addr(
+        &self,
+        other_side_address: Option<&[u8]>,
+    ) -> Result<Option<BytesJson>, MmError<NegotiateSwapContractAddrErr>> {
+        self.platform_coin.negotiate_swap_contract_addr(other_side_address)
+    }
+
+    #[inline]
+    fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
+        self.platform_coin.derive_htlc_key_pair(swap_unique_data)
+    }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+    }
+
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        self.platform_coin.validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for TendermintToken {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for TendermintToken {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for TendermintToken {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
+}
+
+impl MarketCoinOps for TendermintToken {
+    fn ticker(&self) -> &str { &self.ticker }
+
+    fn my_address(&self) -> MmResult<String, MyAddressError> { self.platform_coin.my_address() }
+
+    fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
+        self.platform_coin.get_public_key()
+    }
+
+    fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> { self.platform_coin.sign_message_hash(message) }
+
+    fn sign_message(&self, message: &str) -> SignatureResult<String> { self.platform_coin.sign_message(message) }
+
+    fn verify_message(&self, signature: &str, message: &str, address: &str) -> VerificationResult<bool> {
+        self.platform_coin.verify_message(signature, message, address)
+    }
+
+    fn my_balance(&self) -> BalanceFut<CoinBalance> {
+        let coin = self.clone();
+        let fut = async move {
+            let balance_denom = coin.platform_coin.balance_for_denom(coin.denom.to_string()).await?;
+            Ok(CoinBalance {
+                spendable: big_decimal_from_sat_unsigned(balance_denom, coin.decimals),
+                unspendable: BigDecimal::default(),
+            })
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn base_coin_balance(&self) -> BalanceFut<BigDecimal> { self.platform_coin.my_spendable_balance() }
+
+    fn platform_ticker(&self) -> &str { self.platform_coin.ticker() }
+
+    fn send_raw_tx(&self, tx: &str) -> Box<dyn Future<Item = String, Error = String> + Send> {
+        self.platform_coin.send_raw_tx(tx)
+    }
+
+    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> {
+        self.platform_coin
+            .wait_for_confirmations(tx, confirmations, requires_nota, wait_until, check_every)
+    }
+
+    fn wait_for_htlc_tx_spend(
+        &self,
+        transaction: &[u8],
+        secret_hash: &[u8],
+        wait_until: u64,
+        from_block: u64,
+        swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
+    ) -> TransactionFut {
+        self.platform_coin.wait_for_htlc_tx_spend(
+            transaction,
+            secret_hash,
+            wait_until,
+            from_block,
+            swap_contract_address,
+            check_every,
+        )
+    }
+
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        self.platform_coin.tx_enum_from_bytes(bytes)
+    }
+
+    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 { big_decimal_from_sat(MIN_TX_SATOSHIS, self.decimals) }
+
+    /// !! This function includes dummy implementation for P.O.C work
+    fn min_trading_vol(&self) -> MmNumber { MmNumber::from("0.00777") }
+}
+
+#[async_trait]
+#[allow(unused_variables)]
+impl MmCoin for TendermintToken {
+    fn is_asset_chain(&self) -> bool { false }
+
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.abortable_system) }
+
+    fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
+        let platform = self.platform_coin.clone();
+        let token = self.clone();
+        let fut = async move {
+            let to_address =
+                AccountId::from_str(&req.to).map_to_mm(|e| WithdrawError::InvalidAddress(e.to_string()))?;
+            if to_address.prefix() != platform.account_prefix {
+                return MmError::err(WithdrawError::InvalidAddress(format!(
+                    "expected {} address prefix",
+                    platform.account_prefix
+                )));
+            }
+
+            let base_denom_balance = platform.balance_for_denom(platform.denom.to_string()).await?;
+            let base_denom_balance_dec = big_decimal_from_sat_unsigned(base_denom_balance, token.decimals());
+
+            let balance_denom = platform.balance_for_denom(token.denom.to_string()).await?;
+            let balance_dec = big_decimal_from_sat_unsigned(balance_denom, token.decimals());
+
+            let (amount_denom, amount_dec, total_amount) = if req.max {
+                (
+                    balance_denom,
+                    big_decimal_from_sat_unsigned(balance_denom, token.decimals),
+                    balance_dec,
+                )
+            } else {
+                if balance_dec < req.amount {
+                    return MmError::err(WithdrawError::NotSufficientBalance {
+                        coin: token.ticker.clone(),
+                        available: balance_dec,
+                        required: req.amount,
+                    });
+                }
+
+                (
+                    sat_from_big_decimal(&req.amount, token.decimals())?,
+                    req.amount.clone(),
+                    req.amount,
+                )
+            };
+
+            if !platform.is_tx_amount_enough(token.decimals, &amount_dec) {
+                return MmError::err(WithdrawError::AmountTooLow {
+                    amount: amount_dec,
+                    threshold: token.min_tx_amount(),
+                });
+            }
+
+            let received_by_me = if to_address == platform.account_id {
+                amount_dec
+            } else {
+                BigDecimal::default()
+            };
+
+            let msg_send = MsgSend {
+                from_address: platform.account_id.clone(),
+                to_address,
+                amount: vec![Coin {
+                    denom: token.denom.clone(),
+                    amount: amount_denom.into(),
+                }],
+            }
+            .to_any()
+            .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let memo = req.memo.unwrap_or_else(|| TX_DEFAULT_MEMO.into());
+            let current_block = token
+                .current_block()
+                .compat()
+                .await
+                .map_to_mm(WithdrawError::Transport)?;
+
+            let _sequence_lock = platform.sequence_lock.lock().await;
+            let account_info = platform.my_account_info().await?;
+
+            let timeout_height = current_block + TIMEOUT_HEIGHT_DELTA;
+
+            let simulated_tx = platform
+                .gen_simulated_tx(account_info.clone(), msg_send.clone(), timeout_height, memo.clone())
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let fee_amount_u64 = platform.calculate_fee_amount_as_u64(simulated_tx).await?;
+            let fee_amount_dec = big_decimal_from_sat_unsigned(fee_amount_u64, platform.decimals());
+
+            if base_denom_balance < fee_amount_u64 {
+                return MmError::err(WithdrawError::NotSufficientPlatformBalanceForFee {
+                    coin: platform.ticker().to_string(),
+                    available: base_denom_balance_dec,
+                    required: fee_amount_dec,
+                });
+            }
+
+            let fee_amount = Coin {
+                denom: platform.denom.clone(),
+                amount: fee_amount_u64.into(),
+            };
+
+            let fee = Fee::from_amount_and_gas(fee_amount, GAS_LIMIT_DEFAULT);
+
+            let tx_raw = platform
+                .any_to_signed_raw_tx(account_info, msg_send, fee, timeout_height, memo.clone())
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let tx_bytes = tx_raw
+                .to_bytes()
+                .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))?;
+
+            let hash = sha256(&tx_bytes);
+            Ok(TransactionDetails {
+                tx_hash: hex::encode_upper(hash.as_slice()),
+                tx_hex: tx_bytes.into(),
+                from: vec![platform.account_id.to_string()],
+                to: vec![req.to],
+                my_balance_change: &received_by_me - &total_amount,
+                spent_by_me: total_amount.clone(),
+                total_amount,
+                received_by_me,
+                block_height: 0,
+                timestamp: 0,
+                fee_details: Some(TxFeeDetails::Tendermint(TendermintFeeDetails {
+                    coin: platform.ticker().to_string(),
+                    amount: fee_amount_dec,
+                    uamount: fee_amount_u64,
+                    gas_limit: GAS_LIMIT_DEFAULT,
+                })),
+                coin: token.ticker.clone(),
+                internal_id: hash.to_vec().into(),
+                kmd_rewards: None,
+                transaction_type: TransactionType::default(),
+                memo: Some(memo),
+            })
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
+        self.platform_coin.get_raw_transaction(req)
+    }
+
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut { unimplemented!() }
+
+    fn decimals(&self) -> u8 { self.decimals }
+
+    fn convert_to_address(&self, from: &str, to_address_format: Json) -> Result<String, String> {
+        self.platform_coin.convert_to_address(from, to_address_format)
+    }
+
+    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> {
+        warn!("process_history_loop is deprecated, tendermint uses tx_history_v2");
+        Box::new(futures01::future::err(()))
+    }
+
+    fn history_sync_status(&self) -> HistorySyncState { HistorySyncState::NotEnabled }
+
+    fn get_trade_fee(&self) -> Box<dyn Future<Item = TradeFee, Error = String> + Send> {
+        Box::new(futures01::future::err("Not implemented".into()))
+    }
+
+    async fn get_sender_trade_fee(
+        &self,
+        value: TradePreimageValue,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        let amount = match value {
+            TradePreimageValue::Exact(decimal) | TradePreimageValue::UpperBound(decimal) => decimal,
+        };
+
+        self.platform_coin
+            .get_sender_trade_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, amount)
+            .await
+    }
+
+    fn get_receiver_trade_fee(&self, send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        let token = self.clone();
+        let fut = async move {
+            // We can't simulate Claim Htlc without having information about broadcasted htlc tx.
+            // Since create and claim htlc fees are almost same, we can simply simulate create htlc tx.
+            token
+                .platform_coin
+                .get_sender_trade_fee_for_denom(token.ticker.clone(), token.denom.clone(), token.decimals, send_amount)
+                .await
+        };
+        Box::new(fut.boxed().compat())
+    }
+
+    async fn get_fee_to_send_taker_fee(
+        &self,
+        dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
+    ) -> TradePreimageResult<TradeFee> {
+        self.platform_coin
+            .get_fee_to_send_taker_fee_for_denom(self.ticker.clone(), self.denom.clone(), self.decimals, dex_fee_amount)
+            .await
+    }
+
+    fn required_confirmations(&self) -> u64 { self.platform_coin.required_confirmations() }
+
+    fn requires_notarization(&self) -> bool { self.platform_coin.requires_notarization() }
+
+    fn set_required_confirmations(&self, confirmations: u64) {
+        warn!("set_required_confirmations is not supported for tendermint")
+    }
+
+    fn set_requires_notarization(&self, requires_nota: bool) {
+        self.platform_coin.set_requires_notarization(requires_nota)
+    }
+
+    fn swap_contract_address(&self) -> Option<BytesJson> { self.platform_coin.swap_contract_address() }
+
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { self.platform_coin.fallback_swap_contract() }
+
+    fn mature_confirmations(&self) -> Option<u32> { None }
+
+    fn coin_protocol_info(&self) -> Vec<u8> { self.platform_coin.coin_protocol_info() }
+
+    fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
+        self.platform_coin.is_coin_protocol_supported(info)
+    }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { self.abortable_system.abort_all() }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
+}
diff --git a/mm2src/coins/tendermint/tendermint_tx_history_v2.rs b/mm2src/coins/tendermint/tendermint_tx_history_v2.rs
new file mode 100644
index 0000000000..f833594401
--- /dev/null
+++ b/mm2src/coins/tendermint/tendermint_tx_history_v2.rs
@@ -0,0 +1,900 @@
+use super::{rpc::*, AllBalancesResult, TendermintCoin, TendermintCommons, TendermintToken};
+
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget, TxHistoryStorage};
+use crate::tendermint::{CustomTendermintMsgType, TendermintFeeDetails};
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
+use crate::utxo::utxo_common::big_decimal_from_sat_unsigned;
+use crate::{HistorySyncState, MarketCoinOps, MmCoin, TransactionDetails, TransactionType, TxFeeDetails};
+use async_trait::async_trait;
+use bitcrypto::sha256;
+use common::executor::Timer;
+use common::log;
+use common::state_machine::prelude::*;
+use cosmrs::tendermint::abci::Code as TxCode;
+use cosmrs::tendermint::abci::Event;
+use cosmrs::tx::Fee;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::MmResult;
+use mm2_number::BigDecimal;
+use primitives::hash::H256;
+use rpc::v1::types::Bytes as BytesJson;
+use std::cmp;
+
+macro_rules! try_or_return_stopped_as_err {
+    ($exp:expr, $reason: expr, $fmt:literal) => {
+        match $exp {
+            Ok(t) => t,
+            Err(e) => {
+                return Err(Stopped {
+                    phantom: Default::default(),
+                    stop_reason: $reason(format!("{}: {}", $fmt, e)),
+                })
+            },
+        }
+    };
+}
+
+macro_rules! try_or_continue {
+    ($exp:expr, $fmt:literal) => {
+        match $exp {
+            Ok(t) => t,
+            Err(e) => {
+                log::debug!("{}: {}", $fmt, e);
+                continue;
+            },
+        }
+    };
+}
+
+macro_rules! some_or_continue {
+    ($exp:expr) => {
+        match $exp {
+            Some(t) => t,
+            None => {
+                continue;
+            },
+        }
+    };
+}
+
+macro_rules! some_or_return {
+    ($exp:expr) => {
+        match $exp {
+            Some(t) => t,
+            None => {
+                return;
+            },
+        }
+    };
+}
+
+trait CoinCapabilities: TendermintCommons + CoinWithTxHistoryV2 + MmCoin + MarketCoinOps {}
+impl CoinCapabilities for TendermintCoin {}
+
+#[async_trait]
+impl CoinWithTxHistoryV2 for TendermintCoin {
+    fn history_wallet_id(&self) -> WalletId { WalletId::new(self.ticker().into()) }
+
+    async fn get_tx_history_filters(
+        &self,
+        _target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        Ok(GetTxHistoryFilters::for_address(self.account_id.to_string()))
+    }
+}
+
+#[async_trait]
+impl CoinWithTxHistoryV2 for TendermintToken {
+    fn history_wallet_id(&self) -> WalletId { WalletId::new(self.platform_ticker().into()) }
+
+    async fn get_tx_history_filters(
+        &self,
+        _target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        let denom_hash = sha256(self.denom.to_string().as_bytes());
+        let id = H256::from(denom_hash.as_slice());
+
+        Ok(GetTxHistoryFilters::for_address(self.platform_coin.account_id.to_string()).with_token_id(id.to_string()))
+    }
+}
+
+struct TendermintTxHistoryCtx<Coin: CoinCapabilities, Storage: TxHistoryStorage> {
+    coin: Coin,
+    storage: Storage,
+    balances: AllBalancesResult,
+    last_received_page: u32,
+    last_spent_page: u32,
+}
+
+struct TendermintInit<Coin, Storage> {
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> TendermintInit<Coin, Storage> {
+    fn new() -> Self {
+        TendermintInit {
+            phantom: Default::default(),
+        }
+    }
+}
+
+#[derive(Debug)]
+enum StopReason {
+    StorageError(String),
+    RpcClient(String),
+}
+
+struct Stopped<Coin, Storage> {
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+    stop_reason: StopReason,
+}
+
+impl<Coin, Storage> Stopped<Coin, Storage> {
+    fn storage_error<E>(e: E) -> Self
+    where
+        E: std::fmt::Debug,
+    {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::StorageError(format!("{:?}", e)),
+        }
+    }
+}
+
+struct WaitForHistoryUpdateTrigger<Coin, Storage> {
+    address: String,
+    last_height_state: u64,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> WaitForHistoryUpdateTrigger<Coin, Storage> {
+    fn new(address: String, last_height_state: u64) -> Self {
+        WaitForHistoryUpdateTrigger {
+            address,
+            last_height_state,
+            phantom: Default::default(),
+        }
+    }
+}
+
+struct OnIoErrorCooldown<Coin, Storage> {
+    address: String,
+    last_block_height: u64,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> OnIoErrorCooldown<Coin, Storage> {
+    fn new(address: String, last_block_height: u64) -> Self {
+        OnIoErrorCooldown {
+            address,
+            last_block_height,
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>> for OnIoErrorCooldown<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> State for OnIoErrorCooldown<Coin, Storage>
+where
+    Coin: CoinCapabilities,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = TendermintTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(mut self: Box<Self>, _ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        Timer::sleep(30.).await;
+
+        // retry history fetching process from last saved block
+        return Self::change_state(FetchingTransactionsData::new(self.address, self.last_block_height));
+    }
+}
+
+struct FetchingTransactionsData<Coin, Storage> {
+    /// The list of addresses for those we have requested [`UpdatingUnconfirmedTxes::all_tx_ids_with_height`] TX hashes
+    /// at the `FetchingTxHashes` state.
+    address: String,
+    from_block_height: u64,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> FetchingTransactionsData<Coin, Storage> {
+    fn new(address: String, from_block_height: u64) -> Self {
+        FetchingTransactionsData {
+            address,
+            phantom: Default::default(),
+            from_block_height,
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<TendermintInit<Coin, Storage>> for Stopped<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<TendermintInit<Coin, Storage>> for FetchingTransactionsData<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<OnIoErrorCooldown<Coin, Storage>> for FetchingTransactionsData<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<WaitForHistoryUpdateTrigger<Coin, Storage>> for OnIoErrorCooldown<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<WaitForHistoryUpdateTrigger<Coin, Storage>> for Stopped<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>> for Stopped<Coin, Storage> {}
+
+impl<Coin, Storage> TransitionFrom<WaitForHistoryUpdateTrigger<Coin, Storage>>
+    for FetchingTransactionsData<Coin, Storage>
+{
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>>
+    for WaitForHistoryUpdateTrigger<Coin, Storage>
+{
+}
+
+#[async_trait]
+impl<Coin, Storage> State for WaitForHistoryUpdateTrigger<Coin, Storage>
+where
+    Coin: CoinCapabilities,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = TendermintTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        loop {
+            Timer::sleep(30.).await;
+
+            let ctx_balances = ctx.balances.clone();
+
+            let balances = match ctx.coin.all_balances().await {
+                Ok(balances) => balances,
+                Err(_) => {
+                    return Self::change_state(OnIoErrorCooldown::new(self.address.clone(), self.last_height_state));
+                },
+            };
+
+            if balances != ctx_balances {
+                // Update balances
+                ctx.balances = balances;
+
+                return Self::change_state(FetchingTransactionsData::new(
+                    self.address.clone(),
+                    self.last_height_state,
+                ));
+            }
+        }
+    }
+}
+
+#[async_trait]
+impl<Coin, Storage> State for FetchingTransactionsData<Coin, Storage>
+where
+    Coin: CoinCapabilities,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = TendermintTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        const TX_PAGE_SIZE: u8 = 50;
+
+        const DEFAULT_TRANSFER_EVENT_COUNT: usize = 1;
+        const CREATE_HTLC_EVENT: &str = "create_htlc";
+        const CLAIM_HTLC_EVENT: &str = "claim_htlc";
+        const TRANSFER_EVENT: &str = "transfer";
+        const ACCEPTED_EVENTS: &[&str] = &[CREATE_HTLC_EVENT, CLAIM_HTLC_EVENT, TRANSFER_EVENT];
+        const RECIPIENT_TAG_KEY: &str = "recipient";
+        const SENDER_TAG_KEY: &str = "sender";
+        const RECEIVER_TAG_KEY: &str = "receiver";
+        const AMOUNT_TAG_KEY: &str = "amount";
+
+        struct TxAmounts {
+            total: BigDecimal,
+            spent_by_me: BigDecimal,
+            received_by_me: BigDecimal,
+        }
+
+        fn get_tx_amounts(
+            transfer_details: &TransferDetails,
+            is_self_transfer: bool,
+            sent_by_me: bool,
+            is_sign_claim_htlc: bool,
+            fee_details: Option<&TendermintFeeDetails>,
+        ) -> TxAmounts {
+            let amount = BigDecimal::from(transfer_details.amount);
+
+            let total = if is_sign_claim_htlc && !is_self_transfer {
+                BigDecimal::default()
+            } else {
+                amount.clone()
+            };
+
+            let spent_by_me =
+                if sent_by_me && !matches!(transfer_details.transfer_event_type, TransferEventType::ClaimHtlc) {
+                    amount.clone()
+                } else {
+                    BigDecimal::default()
+                };
+
+            let received_by_me = if !sent_by_me || is_self_transfer {
+                amount
+            } else {
+                BigDecimal::default()
+            };
+
+            let mut tx_amounts = TxAmounts {
+                total,
+                spent_by_me,
+                received_by_me,
+            };
+
+            if let Some(fee_details) = fee_details {
+                tx_amounts.total += BigDecimal::from(fee_details.uamount);
+                tx_amounts.spent_by_me += BigDecimal::from(fee_details.uamount);
+            }
+
+            tx_amounts
+        }
+
+        fn get_fee_details<Coin>(fee: Fee, coin: &Coin) -> Result<TendermintFeeDetails, String>
+        where
+            Coin: CoinCapabilities,
+        {
+            let fee_coin = fee
+                .amount
+                .first()
+                .ok_or_else(|| "fee coin can't be empty".to_string())?;
+            let fee_uamount: u64 = fee_coin.amount.to_string().parse().map_err(|e| format!("{:?}", e))?;
+
+            Ok(TendermintFeeDetails {
+                coin: coin.platform_ticker().to_string(),
+                amount: big_decimal_from_sat_unsigned(fee_uamount, coin.decimals()),
+                uamount: fee_uamount,
+                gas_limit: fee.gas_limit.value(),
+            })
+        }
+
+        #[derive(Default, Clone)]
+        enum TransferEventType {
+            #[default]
+            Standard,
+            CreateHtlc,
+            ClaimHtlc,
+        }
+
+        #[derive(Clone)]
+        struct TransferDetails {
+            from: String,
+            to: String,
+            denom: String,
+            amount: u64,
+            transfer_event_type: TransferEventType,
+        }
+
+        // updates sender and receiver addresses if tx is htlc, and if not leaves as it is.
+        fn read_real_htlc_addresses(transfer_details: &mut TransferDetails, msg_event: &&Event) {
+            match msg_event.type_str.as_str() {
+                CREATE_HTLC_EVENT => {
+                    transfer_details.from = some_or_return!(msg_event
+                        .attributes
+                        .iter()
+                        .find(|tag| tag.key.to_string() == SENDER_TAG_KEY))
+                    .value
+                    .to_string();
+
+                    transfer_details.to = some_or_return!(msg_event
+                        .attributes
+                        .iter()
+                        .find(|tag| tag.key.to_string() == RECEIVER_TAG_KEY))
+                    .value
+                    .to_string();
+
+                    transfer_details.transfer_event_type = TransferEventType::CreateHtlc;
+                },
+                CLAIM_HTLC_EVENT => {
+                    transfer_details.from = some_or_return!(msg_event
+                        .attributes
+                        .iter()
+                        .find(|tag| tag.key.to_string() == SENDER_TAG_KEY))
+                    .value
+                    .to_string();
+
+                    transfer_details.transfer_event_type = TransferEventType::ClaimHtlc;
+                },
+                _ => {},
+            }
+        }
+
+        fn parse_transfer_values_from_events(tx_events: Vec<&Event>) -> Vec<TransferDetails> {
+            let mut transfer_details_list: Vec<TransferDetails> = vec![];
+
+            for (index, event) in tx_events.iter().enumerate() {
+                if event.type_str.as_str() == TRANSFER_EVENT {
+                    let amount_with_denoms = some_or_continue!(event
+                        .attributes
+                        .iter()
+                        .find(|tag| tag.key.to_string() == AMOUNT_TAG_KEY))
+                    .value
+                    .to_string();
+                    let amount_with_denoms = amount_with_denoms.split(',');
+
+                    for amount_with_denom in amount_with_denoms {
+                        let extracted_amount: String =
+                            amount_with_denom.chars().take_while(|c| c.is_numeric()).collect();
+                        let denom = &amount_with_denom[extracted_amount.len()..];
+                        let amount = some_or_continue!(extracted_amount.parse().ok());
+
+                        let from = some_or_continue!(event
+                            .attributes
+                            .iter()
+                            .find(|tag| tag.key.to_string() == SENDER_TAG_KEY))
+                        .value
+                        .to_string();
+
+                        let to = some_or_continue!(event
+                            .attributes
+                            .iter()
+                            .find(|tag| tag.key.to_string() == RECIPIENT_TAG_KEY))
+                        .value
+                        .to_string();
+
+                        let mut tx_details = TransferDetails {
+                            from,
+                            to,
+                            denom: denom.to_owned(),
+                            amount,
+                            // Default is Standard, can be changed later in read_real_htlc_addresses
+                            transfer_event_type: TransferEventType::default(),
+                        };
+
+                        if index != 0 {
+                            // If previous message is htlc related, that means current transfer
+                            // addresses will be wrong.
+                            if let Some(prev_event) = tx_events.get(index - 1) {
+                                if [CREATE_HTLC_EVENT, CLAIM_HTLC_EVENT].contains(&prev_event.type_str.as_str()) {
+                                    read_real_htlc_addresses(&mut tx_details, prev_event);
+                                }
+                            };
+                        }
+
+                        // sum the amounts coins and pairs are same
+                        let mut duplicated_details = transfer_details_list.iter_mut().find(|details| {
+                            details.from == tx_details.from
+                                && details.to == tx_details.to
+                                && details.denom == tx_details.denom
+                        });
+
+                        if let Some(duplicated_details) = &mut duplicated_details {
+                            duplicated_details.amount += tx_details.amount;
+                        } else {
+                            transfer_details_list.push(tx_details);
+                        }
+                    }
+                }
+            }
+
+            transfer_details_list
+        }
+
+        fn get_transfer_details(tx_events: Vec<Event>, fee_amount_with_denom: String) -> Vec<TransferDetails> {
+            // Filter out irrelevant events
+            let mut events: Vec<&Event> = tx_events
+                .iter()
+                .filter(|event| ACCEPTED_EVENTS.contains(&event.type_str.as_str()))
+                .collect();
+
+            events.reverse();
+
+            if events.len() > DEFAULT_TRANSFER_EVENT_COUNT {
+                // Retain fee related events
+                events.retain(|event| {
+                    if event.type_str == TRANSFER_EVENT {
+                        let amount_with_denom = event
+                            .attributes
+                            .iter()
+                            .find(|tag| tag.key.to_string() == AMOUNT_TAG_KEY)
+                            .map(|t| t.value.to_string());
+
+                        amount_with_denom != Some(fee_amount_with_denom.clone())
+                    } else {
+                        true
+                    }
+                });
+            }
+
+            parse_transfer_values_from_events(events)
+        }
+
+        fn get_transaction_type(
+            transfer_event_type: &TransferEventType,
+            token_id: Option<BytesJson>,
+            is_sign_claim_htlc: bool,
+        ) -> TransactionType {
+            match (transfer_event_type, token_id) {
+                (TransferEventType::CreateHtlc, token_id) => TransactionType::CustomTendermintMsg {
+                    msg_type: CustomTendermintMsgType::SendHtlcAmount,
+                    token_id,
+                },
+                (TransferEventType::ClaimHtlc, token_id) => TransactionType::CustomTendermintMsg {
+                    msg_type: if is_sign_claim_htlc {
+                        CustomTendermintMsgType::SignClaimHtlc
+                    } else {
+                        CustomTendermintMsgType::ClaimHtlcAmount
+                    },
+                    token_id,
+                },
+                (_, Some(token_id)) => TransactionType::TokenTransfer(token_id),
+                _ => TransactionType::StandardTransfer,
+            }
+        }
+
+        fn get_pair_addresses(
+            my_address: String,
+            tx_sent_by_me: bool,
+            transfer_details: &TransferDetails,
+        ) -> Option<(Vec<String>, Vec<String>)> {
+            match transfer_details.transfer_event_type {
+                TransferEventType::CreateHtlc => {
+                    if tx_sent_by_me {
+                        Some((vec![my_address], vec![]))
+                    } else {
+                        // This shouldn't happen if rpc node properly executes the tx search query.
+                        None
+                    }
+                },
+                TransferEventType::ClaimHtlc => Some((vec![my_address], vec![])),
+                TransferEventType::Standard => {
+                    Some((vec![transfer_details.from.clone()], vec![transfer_details.to.clone()]))
+                },
+            }
+        }
+
+        async fn fetch_and_insert_txs<Coin, Storage>(
+            address: String,
+            coin: &Coin,
+            storage: &Storage,
+            query: String,
+            from_height: u64,
+            page: &mut u32,
+        ) -> Result<u64, Stopped<Coin, Storage>>
+        where
+            Coin: CoinCapabilities,
+            Storage: TxHistoryStorage,
+        {
+            let mut highest_height = from_height;
+
+            let client = try_or_return_stopped_as_err!(
+                coin.rpc_client().await,
+                StopReason::RpcClient,
+                "could not get rpc client"
+            );
+
+            loop {
+                let response = try_or_return_stopped_as_err!(
+                    client
+                        .perform(TxSearchRequest::new(
+                            query.clone(),
+                            false,
+                            *page,
+                            TX_PAGE_SIZE,
+                            TendermintResultOrder::Ascending.into(),
+                        ))
+                        .await,
+                    StopReason::RpcClient,
+                    "tx search rpc call failed"
+                );
+
+                let mut tx_details = vec![];
+                let current_page_is_full = response.txs.len() == TX_PAGE_SIZE as usize;
+                for tx in response.txs {
+                    if tx.tx_result.code != TxCode::Ok {
+                        continue;
+                    }
+
+                    let timestamp = try_or_return_stopped_as_err!(
+                        coin.get_block_timestamp(i64::from(tx.height)).await,
+                        StopReason::RpcClient,
+                        "could not get block_timestamp over rpc node"
+                    );
+                    let timestamp = some_or_continue!(timestamp);
+
+                    let tx_hash = tx.hash.to_string();
+
+                    highest_height = cmp::max(highest_height, tx.height.into());
+
+                    let deserialized_tx = try_or_continue!(
+                        cosmrs::Tx::from_bytes(tx.tx.as_bytes()),
+                        "Could not deserialize transaction"
+                    );
+
+                    let msg = try_or_continue!(
+                        deserialized_tx.body.messages.first().ok_or("Tx body couldn't be read."),
+                        "Tx body messages is empty"
+                    )
+                    .value
+                    .as_slice();
+
+                    let fee_data = match deserialized_tx.auth_info.fee.amount.first() {
+                        Some(data) => data,
+                        None => {
+                            log::debug!("Could not read transaction fee for tx '{}', skipping it", &tx_hash);
+                            continue;
+                        },
+                    };
+
+                    let fee_amount_with_denom = format!("{}{}", fee_data.amount, fee_data.denom);
+
+                    let transfer_details_list = get_transfer_details(tx.tx_result.events, fee_amount_with_denom);
+
+                    if transfer_details_list.is_empty() {
+                        log::debug!(
+                            "Could not find transfer details in events for tx '{}', skipping it",
+                            &tx_hash
+                        );
+                        continue;
+                    }
+
+                    let fee_details = try_or_continue!(
+                        get_fee_details(deserialized_tx.auth_info.fee, coin),
+                        "get_fee_details failed"
+                    );
+
+                    let mut fee_added = false;
+                    for (index, transfer_details) in transfer_details_list.iter().enumerate() {
+                        let mut internal_id_hash = index.to_le_bytes().to_vec();
+                        internal_id_hash.extend_from_slice(tx_hash.as_bytes());
+                        drop_mutability!(internal_id_hash);
+
+                        let internal_id = H256::from(internal_id_hash.as_slice()).reversed().to_vec().into();
+
+                        if let Ok(Some(_)) = storage
+                            .get_tx_from_history(&coin.history_wallet_id(), &internal_id)
+                            .await
+                        {
+                            log::debug!("Tx '{}' already exists in tx_history. Skipping it.", &tx_hash);
+                            continue;
+                        }
+
+                        let tx_sent_by_me = address == transfer_details.from;
+                        let is_platform_coin_tx = transfer_details.denom == coin.platform_denom();
+                        let is_self_tx = transfer_details.to == transfer_details.from && tx_sent_by_me;
+                        let is_sign_claim_htlc = tx_sent_by_me
+                            && matches!(transfer_details.transfer_event_type, TransferEventType::ClaimHtlc);
+
+                        let (from, to) =
+                            some_or_continue!(get_pair_addresses(address.clone(), tx_sent_by_me, transfer_details));
+
+                        let maybe_add_fees = if !fee_added
+                        // if tx is platform coin tx and sent by me
+                            && is_platform_coin_tx && tx_sent_by_me
+                        {
+                            fee_added = true;
+                            Some(&fee_details)
+                        } else {
+                            None
+                        };
+
+                        let tx_amounts = get_tx_amounts(
+                            transfer_details,
+                            is_self_tx,
+                            tx_sent_by_me,
+                            is_sign_claim_htlc,
+                            maybe_add_fees,
+                        );
+
+                        let token_id: Option<BytesJson> = match !is_platform_coin_tx {
+                            true => {
+                                let denom_hash = sha256(transfer_details.denom.clone().as_bytes());
+                                Some(H256::from(denom_hash.as_slice()).to_vec().into())
+                            },
+                            false => None,
+                        };
+
+                        let transaction_type = get_transaction_type(
+                            &transfer_details.transfer_event_type,
+                            token_id.clone(),
+                            is_sign_claim_htlc,
+                        );
+
+                        let details = TransactionDetails {
+                            from,
+                            to,
+                            total_amount: tx_amounts.total,
+                            spent_by_me: tx_amounts.spent_by_me,
+                            received_by_me: tx_amounts.received_by_me,
+                            // This can be 0 since it gets remapped in `coins::my_tx_history_v2`
+                            my_balance_change: BigDecimal::default(),
+                            tx_hash: tx_hash.to_string(),
+                            tx_hex: msg.into(),
+                            fee_details: Some(TxFeeDetails::Tendermint(fee_details.clone())),
+                            block_height: tx.height.into(),
+                            coin: transfer_details.denom.clone(),
+                            internal_id,
+                            timestamp,
+                            kmd_rewards: None,
+                            transaction_type,
+                            memo: Some(deserialized_tx.body.memo.clone()),
+                        };
+                        tx_details.push(details.clone());
+
+                        // Display fees as extra transactions for asset txs sent by user
+                        if tx_sent_by_me && !fee_added && !is_platform_coin_tx {
+                            let fee_details = fee_details.clone();
+                            let mut fee_tx_details = details;
+                            fee_tx_details.to = vec![];
+                            fee_tx_details.total_amount = fee_details.amount.clone();
+                            fee_tx_details.spent_by_me = fee_details.amount.clone();
+                            fee_tx_details.received_by_me = BigDecimal::default();
+                            fee_tx_details.my_balance_change = BigDecimal::default() - &fee_details.amount;
+                            fee_tx_details.coin = coin.platform_ticker().to_string();
+                            // Non-reversed version of original internal id
+                            fee_tx_details.internal_id = H256::from(internal_id_hash.as_slice()).to_vec().into();
+                            fee_tx_details.transaction_type = TransactionType::FeeForTokenTx;
+
+                            tx_details.push(fee_tx_details);
+                            fee_added = true;
+                        }
+                    }
+
+                    log::debug!("Tx '{}' successfully parsed.", tx.hash);
+                }
+
+                try_or_return_stopped_as_err!(
+                    storage
+                        .add_transactions_to_history(&coin.history_wallet_id(), tx_details)
+                        .await
+                        .map_err(|e| format!("{:?}", e)),
+                    StopReason::StorageError,
+                    "add_transactions_to_history failed"
+                );
+
+                if (*page * TX_PAGE_SIZE as u32) >= response.total_count {
+                    // if last page is full, we can start with next page on next iteration
+                    if current_page_is_full {
+                        *page += 1;
+                    }
+                    break Ok(highest_height);
+                }
+                *page += 1;
+            }
+        }
+
+        let q = format!("coin_spent.spender = '{}'", self.address);
+        let highest_send_tx_height = match fetch_and_insert_txs(
+            self.address.clone(),
+            &ctx.coin,
+            &ctx.storage,
+            q,
+            self.from_block_height,
+            &mut ctx.last_spent_page,
+        )
+        .await
+        {
+            Ok(block) => block,
+            Err(stopped) => {
+                if let StopReason::RpcClient(e) = &stopped.stop_reason {
+                    log::error!("Sent tx history process turned into cooldown mode due to rpc error: {e}");
+                    return Self::change_state(OnIoErrorCooldown::new(self.address.clone(), self.from_block_height));
+                }
+
+                return Self::change_state(stopped);
+            },
+        };
+
+        let q = format!("coin_received.receiver = '{}'", self.address);
+        let highest_received_tx_height = match fetch_and_insert_txs(
+            self.address.clone(),
+            &ctx.coin,
+            &ctx.storage,
+            q,
+            self.from_block_height,
+            &mut ctx.last_received_page,
+        )
+        .await
+        {
+            Ok(block) => block,
+            Err(stopped) => {
+                if let StopReason::RpcClient(e) = &stopped.stop_reason {
+                    log::error!("Received tx history process turned into cooldown mode due to rpc error: {e}");
+                    return Self::change_state(OnIoErrorCooldown::new(self.address.clone(), self.from_block_height));
+                }
+
+                return Self::change_state(stopped);
+            },
+        };
+
+        let last_fetched_block = cmp::max(highest_send_tx_height, highest_received_tx_height);
+
+        log::info!(
+            "Tx history fetching finished for {}. Last fetched block {}",
+            ctx.coin.platform_ticker(),
+            last_fetched_block
+        );
+
+        ctx.coin.set_history_sync_state(HistorySyncState::Finished);
+        Self::change_state(WaitForHistoryUpdateTrigger::new(
+            self.address.clone(),
+            last_fetched_block,
+        ))
+    }
+}
+
+#[async_trait]
+impl<Coin, Storage> State for TendermintInit<Coin, Storage>
+where
+    Coin: CoinCapabilities,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = TendermintTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        const INITIAL_SEARCH_HEIGHT: u64 = 0;
+
+        ctx.coin.set_history_sync_state(HistorySyncState::NotStarted);
+
+        if let Err(e) = ctx.storage.init(&ctx.coin.history_wallet_id()).await {
+            return Self::change_state(Stopped::storage_error(e));
+        }
+
+        let search_from = match ctx
+            .storage
+            .get_highest_block_height(&ctx.coin.history_wallet_id())
+            .await
+        {
+            Ok(Some(height)) if height > 0 => height as u64 - 1,
+            _ => INITIAL_SEARCH_HEIGHT,
+        };
+
+        Self::change_state(FetchingTransactionsData::new(
+            ctx.coin.my_address().expect("my_address can't fail"),
+            search_from,
+        ))
+    }
+}
+
+#[async_trait]
+impl<Coin, Storage> LastState for Stopped<Coin, Storage>
+where
+    Coin: CoinCapabilities,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = TendermintTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> Self::Result {
+        log::info!(
+            "Stopping tx history fetching for {}. Reason: {:?}",
+            ctx.coin.ticker(),
+            self.stop_reason
+        );
+
+        let new_state_json = json!({
+            "message": format!("{:?}", self.stop_reason),
+        });
+
+        ctx.coin.set_history_sync_state(HistorySyncState::Error(new_state_json));
+    }
+}
+
+pub async fn tendermint_history_loop(
+    coin: TendermintCoin,
+    storage: impl TxHistoryStorage,
+    _ctx: MmArc,
+    _current_balance: BigDecimal,
+) {
+    let balances = match coin.all_balances().await {
+        Ok(balances) => balances,
+        Err(e) => {
+            log::error!("{}", e);
+            return;
+        },
+    };
+
+    let ctx = TendermintTxHistoryCtx {
+        coin,
+        storage,
+        balances,
+        last_received_page: 1,
+        last_spent_page: 1,
+    };
+
+    let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(ctx);
+    state_machine.run(TendermintInit::new()).await;
+}
diff --git a/mm2src/coins/test_coin.rs b/mm2src/coins/test_coin.rs
index fa8d4d1662..8b59b92cae 100644
--- a/mm2src/coins/test_coin.rs
+++ b/mm2src/coins/test_coin.rs
@@ -1,9 +1,19 @@
+#![allow(clippy::all)]
+
 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 crate::{coin_errors::MyAddressError, BalanceFut, CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinFutSpawner,
+            FeeApproxStage, FoundSwapTxSpend, MakerSwapTakerCoin, NegotiateSwapContractAddrErr, PaymentInstructions,
+            PaymentInstructionsErr, RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureResult, TakerSwapMakerCoin, TradePreimageFut, TradePreimageResult,
+            TradePreimageValue, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs,
+            ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut,
+            ValidatePaymentInput, VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut, WithdrawRequest};
 use async_trait::async_trait;
+use common::executor::AbortedError;
 use futures01::Future;
 use keys::KeyPair;
 use mm2_core::mm_ctx::MmArc;
@@ -29,11 +39,10 @@ impl TestCoin {
 }
 
 #[mockable]
-#[allow(clippy::forget_ref, clippy::forget_copy, clippy::cast_ref_to_mut)]
 impl MarketCoinOps for TestCoin {
     fn ticker(&self) -> &str { &self.ticker }
 
-    fn my_address(&self) -> Result<String, String> { unimplemented!() }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { unimplemented!() }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> { unimplemented!() }
 
@@ -67,17 +76,23 @@ impl MarketCoinOps for TestCoin {
         unimplemented!()
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         unimplemented!()
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> { unimplemented!() }
+    fn tx_enum_from_bytes(&self, _bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        MmError::err(TxMarshalingErr::NotSupported(
+            "tx_enum_from_bytes is not supported for Test coin yet.".to_string(),
+        ))
+    }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> { unimplemented!() }
 
@@ -90,116 +105,46 @@ impl MarketCoinOps for TestCoin {
 
 #[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, 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_maker_payment(&self, _maker_payment_args: SendMakerPaymentArgs) -> 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_taker_payment(&self, _taker_payment_args: SendTakerPaymentArgs) -> 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],
+        _maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> 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],
+        _taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> 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 {
+    fn send_taker_refunds_payment(&self, _taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> 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 {
+    fn send_maker_refunds_payment(&self, _maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> 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> {
+    fn validate_fee(&self, _validate_fee_args: ValidateFeeArgs) -> 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_maker_payment(&self, _input: ValidatePaymentInput) -> ValidatePaymentFut<()> { unimplemented!() }
 
-    fn validate_taker_payment(
-        &self,
-        _input: ValidatePaymentInput,
-    ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        unimplemented!()
-    }
+    fn validate_taker_payment(&self, _input: ValidatePaymentInput) -> ValidatePaymentFut<()> { 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],
+        _if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         unimplemented!()
     }
@@ -218,7 +163,15 @@ impl SwapOps for TestCoin {
         unimplemented!()
     }
 
-    fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> { unimplemented!() }
+
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> { unimplemented!() }
 
     fn negotiate_swap_contract_addr(
         &self,
@@ -228,16 +181,132 @@ impl SwapOps for TestCoin {
     }
 
     fn derive_htlc_key_pair(&self, _swap_unique_data: &[u8]) -> KeyPair { unimplemented!() }
+
+    fn derive_htlc_pubkey(&self, _swap_unique_data: &[u8]) -> Vec<u8> { unimplemented!() }
+
+    fn can_refund_htlc(&self, locktime: u64) -> Box<dyn Future<Item = CanRefundHtlc, Error = String> + Send + '_> {
+        unimplemented!()
+    }
+
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> { unimplemented!() }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        unimplemented!()
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for TestCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for TestCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+#[mockable]
+impl WatcherOps for TestCoin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        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 spawner(&self) -> CoinFutSpawner { unimplemented!() }
+
     fn get_raw_transaction(&self, _req: RawTransactionRequest) -> RawTransactionFut { unimplemented!() }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut { unimplemented!() }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut { unimplemented!() }
 
     fn decimals(&self) -> u8 { unimplemented!() }
@@ -255,18 +324,20 @@ impl MmCoin for TestCoin {
 
     async fn get_sender_trade_fee(
         &self,
-        value: TradePreimageValue,
-        stage: FeeApproxStage,
+        _value: TradePreimageValue,
+        _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
 
-    fn get_receiver_trade_fee(&self, stage: FeeApproxStage) -> TradePreimageFut<TradeFee> { unimplemented!() }
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+        unimplemented!()
+    }
 
     async fn get_fee_to_send_taker_fee(
         &self,
-        dex_fee_amount: BigDecimal,
-        stage: FeeApproxStage,
+        _dex_fee_amount: BigDecimal,
+        _stage: FeeApproxStage,
     ) -> TradePreimageResult<TradeFee> {
         unimplemented!()
     }
@@ -281,9 +352,15 @@ impl MmCoin for TestCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { unimplemented!() }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { unimplemented!() }
+
     fn mature_confirmations(&self) -> Option<u32> { unimplemented!() }
 
     fn coin_protocol_info(&self) -> Vec<u8> { Vec::new() }
 
     fn is_coin_protocol_supported(&self, _info: &Option<Vec<u8>>) -> bool { true }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { Ok(()) }
+
+    fn on_token_deactivated(&self, _ticker: &str) { () }
 }
diff --git a/mm2src/coins/tx_history_storage/mod.rs b/mm2src/coins/tx_history_storage/mod.rs
index 9fca3dcc3d..1f0ca4f8d8 100644
--- a/mm2src/coins/tx_history_storage/mod.rs
+++ b/mm2src/coins/tx_history_storage/mod.rs
@@ -23,7 +23,16 @@ mod tx_history_v2_tests;
 #[inline]
 pub fn token_id_from_tx_type(tx_type: &TransactionType) -> String {
     match tx_type {
-        TransactionType::TokenTransfer(token_id) => format!("{:02x}", token_id),
+        TransactionType::TokenTransfer(token_id) => {
+            format!("{:02x}", token_id)
+        },
+        TransactionType::CustomTendermintMsg { token_id, .. } => {
+            if let Some(token_id) = token_id {
+                format!("{:02x}", token_id)
+            } else {
+                String::new()
+            }
+        },
         _ => String::new(),
     }
 }
@@ -52,8 +61,7 @@ impl<'a> TxHistoryStorageBuilder<'a> {
 }
 
 /// Whether transaction is unconfirmed or confirmed.
-/// Serializes to either `0u8` or `1u8` correspondingly.
-#[repr(u8)]
+/// Serializes to either `0` or `1` correspondingly.
 #[derive(Clone, Copy, Debug)]
 pub enum ConfirmationStatus {
     Unconfirmed = 0,
@@ -107,7 +115,7 @@ impl WalletId {
     #[inline]
     pub fn new(ticker: String) -> WalletId {
         WalletId {
-            ticker,
+            ticker: ticker.replace('-', "_"),
             hd_wallet_rmd160: None,
         }
     }
@@ -122,33 +130,38 @@ impl WalletId {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct GetTxHistoryFilters {
     token_id: Option<String>,
-    for_addresses: Option<FilteringAddresses>,
+    for_addresses: 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
+    pub fn for_address(address: String) -> GetTxHistoryFilters {
+        GetTxHistoryFilters {
+            token_id: None,
+            for_addresses: std::iter::once(address).collect(),
+        }
     }
 
     #[inline]
-    pub fn set_for_addresses<I: IntoIterator<Item = String>>(&mut self, addresses: I) {
-        self.for_addresses = Some(addresses.into_iter().collect());
+    pub fn for_addresses<I: IntoIterator<Item = String>>(addresses: I) -> GetTxHistoryFilters {
+        GetTxHistoryFilters {
+            token_id: None,
+            for_addresses: addresses.into_iter().collect(),
+        }
     }
 
     #[inline]
-    pub fn with_for_addresses<I: IntoIterator<Item = String>>(mut self, addresses: I) -> GetTxHistoryFilters {
-        self.set_for_addresses(addresses);
+    pub fn with_token_id(mut self, token_id: String) -> GetTxHistoryFilters {
+        self.set_token_id(token_id);
         self
     }
 
+    #[inline]
+    pub fn set_token_id(&mut self, token_id: String) { self.token_id = Some(token_id); }
+
     /// 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() }
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
index a0bcf1c915..b418bba556 100644
--- a/mm2src/coins/tx_history_storage/sql_tx_history_storage_v2.rs
+++ b/mm2src/coins/tx_history_storage/sql_tx_history_storage_v2.rs
@@ -4,7 +4,7 @@ use crate::tx_history_storage::{token_id_from_tx_type, ConfirmationStatus, Creat
 use crate::TransactionDetails;
 use async_trait::async_trait;
 use common::{async_blocking, PagingOptionsEnum};
-use db_common::sql_query::SqlQuery;
+use db_common::sql_build::*;
 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};
@@ -155,6 +155,18 @@ fn select_tx_by_internal_id_sql(wallet_id: &WalletId) -> Result<String, MmError<
     Ok(sql)
 }
 
+fn select_highest_block_height_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 block_height FROM {} ORDER BY block_height DESC LIMIT 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)?;
@@ -172,88 +184,141 @@ fn update_tx_in_table_by_internal_id_sql(wallet_id: &WalletId) -> Result<String,
     Ok(sql)
 }
 
-fn contains_unconfirmed_transactions_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
+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 confirmation_status = {};",
-        table_name,
-        ConfirmationStatus::Unconfirmed.to_sql_param()
-    );
+    let sql = format!("SELECT COUNT(id) FROM {} WHERE tx_hash = ?1;", table_name);
 
     Ok(sql)
 }
 
-fn get_unconfirmed_transactions_sql(wallet_id: &WalletId) -> Result<String, MmError<SqlError>> {
-    let table_name = tx_history_table(wallet_id);
+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 details_json FROM {} WHERE confirmation_status = {};",
-        table_name,
-        ConfirmationStatus::Unconfirmed.to_sql_param()
-    );
+    let sql = format!("SELECT tx_hex FROM {} WHERE tx_hash = ?1 LIMIT 1;", table_name);
 
     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)?;
+/// Creates `SqlQuery` builder to query transactions from `tx_history` table
+/// joining `tx_addresses` table and specifying from/to `for_addresses` addresses.
+fn tx_history_with_addresses_builder_preimage<'a>(
+    connection: &'a Connection,
+    wallet_id: &WalletId,
+    for_addresses: FilteringAddresses,
+) -> Result<SqlQuery<'a>, MmError<SqlError>> {
+    let mut sql_builder = SqlQuery::select_from_alias(connection, &tx_history_table(wallet_id), "tx_history")?;
 
-    let sql = format!("SELECT COUNT(id) FROM {} WHERE tx_hash = ?1;", table_name);
+    // Query transactions that were sent from/to `for_addresses` addresses.
+    let tx_address_table_name = tx_address_table(wallet_id);
 
-    Ok(sql)
+    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")?;
+
+    Ok(sql_builder)
 }
 
-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)?;
+fn count_unique_tx_hashes_preimage<'a>(
+    connection: &'a Connection,
+    wallet_id: &WalletId,
+    for_addresses: FilteringAddresses,
+) -> Result<SqlQuery<'a>, MmError<SqlError>> {
+    /// The alias is needed so that the external query can access the results of the subquery.
+    /// Example:
+    ///   SUBQUERY: `SELECT h.tx_hash AS __TX_HASH_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(DISTINCT __TX_HASH_ALIAS) FROM (<SUBQUERY>);`
+    /// Here we can't use `h.tx_hash` in the external query because it doesn't know about the `tx_history h` table.
+    /// So we need to give the `h.tx_hash` an alias like `__TX_HASH_ALIAS`.
+    const TX_HASH_ALIAS: &str = "__TX_HASH_ALIAS";
 
-    let sql = format!("SELECT COUNT(DISTINCT tx_hash) FROM {};", table_name);
+    let subquery = {
+        let mut sql_builder = tx_history_with_addresses_builder_preimage(connection, wallet_id, for_addresses)?;
 
-    Ok(sql)
+        // Query `tx_hash` field and give it the `__TX_HASH_ALIAS` alias.
+        sql_builder.field_alias("tx_history.tx_hash", TX_HASH_ALIAS)?;
+
+        drop_mutability!(sql_builder);
+        sql_builder.subquery()
+    };
+
+    let mut external_query = SqlQuery::select_from_subquery(subquery)?;
+    external_query.count_distinct(TX_HASH_ALIAS)?;
+    Ok(external_query)
 }
 
-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)?;
+fn history_contains_unconfirmed_txes_preimage<'a>(
+    connection: &'a Connection,
+    wallet_id: &WalletId,
+    for_addresses: FilteringAddresses,
+) -> Result<SqlQuery<'a>, MmError<SqlError>> {
+    /// The alias is needed so that the external query can access the results of the subquery.
+    /// Example:
+    ///   SUBQUERY: `SELECT h.id AS __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(__ID_ALIAS) FROM (<SUBQUERY>);`
+    /// Here we can't use `h.id` in the external query because it doesn't know about the `tx_history h` table.
+    /// So we need to give the `h.id` an alias like `__ID_ALIAS`.
+    const ID_ALIAS: &str = "__ID_ALIAS";
 
-    let sql = format!("SELECT tx_hex FROM {} WHERE tx_hash = ?1 LIMIT 1;", table_name);
+    let subquery = {
+        let mut sql_builder = tx_history_with_addresses_builder_preimage(connection, wallet_id, for_addresses)?;
 
-    Ok(sql)
+        // Query `tx_hash` field and give it the `__ID_ALIAS` alias.
+        sql_builder
+            .field_alias("tx_history.id", ID_ALIAS)?
+            .and_where_eq("confirmation_status", ConfirmationStatus::Unconfirmed.to_sql_param())?;
+
+        drop_mutability!(sql_builder);
+        sql_builder.subquery()
+    };
+
+    let mut external_query = SqlQuery::select_from_subquery(subquery)?;
+    external_query.count(ID_ALIAS)?;
+    Ok(external_query)
 }
 
-/// 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>(
+fn get_unconfirmed_txes_builder_preimage<'a>(
     connection: &'a Connection,
     wallet_id: &WalletId,
-    token_id: String,
-    for_addresses: Option<FilteringAddresses>,
+    for_addresses: FilteringAddresses,
 ) -> Result<SqlQuery<'a>, MmError<SqlError>> {
-    let mut sql_builder = SqlQuery::select_from_alias(connection, &tx_history_table(wallet_id), "tx_history")?;
+    let mut sql_builder = tx_history_with_addresses_builder_preimage(connection, wallet_id, for_addresses)?;
 
-    // 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
+        .field("details_json")?
+        .and_where_eq("confirmation_status", ConfirmationStatus::Unconfirmed.to_sql_param())?;
 
-        sql_builder
-            .join_alias(&tx_address_table_name, "tx_address")?
-            .on_join_eq("tx_history.internal_id", "tx_address.internal_id")?;
+    drop_mutability!(sql_builder);
+    Ok(sql_builder)
+}
 
-        sql_builder
-            .and_where_in_params("tx_address.address", for_addresses)?
-            .group_by("tx_history.internal_id")?;
-    }
+/// Creates an `SqlQuery` instance with the required `WHERE`, `ORDER`, `GROUP_BY` constraints.
+///
+/// # Note
+///
+/// 1) You can refer to the [`tx_history_table(wallet_id)`] table by the `tx_history` alias.
+/// 2) The selected transactions will be ordered the same way as `compare_transaction_details` is implemented.
+fn get_history_builder_preimage<'a>(
+    connection: &'a Connection,
+    wallet_id: &WalletId,
+    token_id: String,
+    for_addresses: FilteringAddresses,
+) -> Result<SqlQuery<'a>, MmError<SqlError>> {
+    let mut sql_builder = tx_history_with_addresses_builder_preimage(connection, wallet_id, for_addresses)?;
 
+    // Set other query conditions.
     sql_builder
         .and_where_eq_param("tx_history.token_id", token_id)?
+        // The following statements repeat the `compare_transaction_details` implementation:
         .order_asc("tx_history.confirmation_status")?
         .order_desc("tx_history.block_height")?
-        .order_asc("tx_history.id")?;
+        .order_asc("tx_history.internal_id")?;
     Ok(sql_builder)
 }
 
@@ -287,10 +352,14 @@ fn tx_details_from_row(row: &Row<'_>) -> Result<TransactionDetails, SqlError> {
     json::from_str(&json_string).map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))
 }
 
+fn block_height_from_row(row: &Row<'_>) -> Result<u32, SqlError> { row.get(0) }
+
 impl TxHistoryStorageError for SqlError {}
 
 impl ConfirmationStatus {
-    fn to_sql_param(self) -> String { (self as u8).to_string() }
+    fn to_sql_param_str(self) -> String { (self as u8).to_string() }
+
+    fn to_sql_param(self) -> i64 { self as i64 }
 }
 
 impl WalletId {
@@ -393,7 +462,7 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
                     tx_hash,
                     internal_id.clone(),
                     tx.block_height.to_string(),
-                    confirmation_status.to_sql_param(),
+                    confirmation_status.to_sql_param_str(),
                     token_id,
                     tx_json,
                 ];
@@ -457,13 +526,32 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
         .await
     }
 
-    async fn history_contains_unconfirmed_txes(&self, wallet_id: &WalletId) -> Result<bool, MmError<Self::Error>> {
-        let sql = contains_unconfirmed_transactions_sql(wallet_id)?;
+    async fn get_highest_block_height(&self, wallet_id: &WalletId) -> Result<Option<u32>, MmError<Self::Error>> {
+        let sql = select_highest_block_height_sql(wallet_id)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.0.lock().unwrap();
+            query_single_row(&conn, &sql, NO_PARAMS, block_height_from_row).map_to_mm(SqlError::from)
+        })
+        .await
+    }
+
+    async fn history_contains_unconfirmed_txes(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> Result<bool, MmError<Self::Error>> {
+        let wallet_id = wallet_id.clone();
         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))?;
+            let sql_query = history_contains_unconfirmed_txes_preimage(&conn, &wallet_id, for_addresses)?;
+
+            let count_unconfirmed: u32 = sql_query
+                .query_single_row(|row| row.get(0))?
+                .or_mm_err(|| SqlError::QueryReturnedNoRows)?;
             Ok(count_unconfirmed > 0)
         })
         .await
@@ -472,15 +560,16 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
     async fn get_unconfirmed_txes_from_history(
         &self,
         wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
     ) -> Result<Vec<TransactionDetails>, MmError<Self::Error>> {
-        let sql = get_unconfirmed_transactions_sql(wallet_id)?;
+        let wallet_id = wallet_id.clone();
         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<_, _>>()?;
+
+            let sql_query = get_unconfirmed_txes_builder_preimage(&conn, &wallet_id, for_addresses)?;
+            let result = sql_query.query(tx_details_from_row)?;
             Ok(result)
         })
         .await
@@ -500,7 +589,7 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
 
         let params = [
             block_height,
-            confirmation_status.to_sql_param(),
+            confirmation_status.to_sql_param_str(),
             json_details,
             internal_id,
         ];
@@ -526,12 +615,21 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
         .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)?;
+    async fn unique_tx_hashes_num_in_history(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> Result<usize, MmError<Self::Error>> {
         let selfi = self.clone();
+        let wallet_id = wallet_id.clone();
+
         async_blocking(move || {
             let conn = selfi.0.lock().unwrap();
-            let count: u32 = conn.query_row(&sql, NO_PARAMS, |row| row.get(0))?;
+
+            let sql_query = count_unique_tx_hashes_preimage(&conn, &wallet_id, for_addresses)?;
+            let count: u32 = sql_query
+                .query_single_row(|row| row.get(0))?
+                .or_mm_err(|| SqlError::QueryReturnedNoRows)?;
             Ok(count as usize)
         })
         .await
@@ -570,7 +668,7 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
             }
             let tx_hex = maybe_tx_hex?;
             let tx_bytes =
-                hex::decode(&tx_hex).map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))?;
+                hex::decode(tx_hex).map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))?;
             Ok(Some(tx_bytes.into()))
         })
         .await
@@ -583,9 +681,9 @@ impl TxHistoryStorage for SqliteTxHistoryStorage {
         paging: PagingOptionsEnum<BytesJson>,
         limit: usize,
     ) -> Result<GetHistoryResult, MmError<Self::Error>> {
-        // Check if [`GetTxHistoryFilters::for_addresses`] is specified and empty.
+        // Check if [`GetTxHistoryFilters::for_addresses`] is 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()) {
+        if filters.for_addresses.is_empty() {
             return Ok(GetHistoryResult {
                 transactions: Vec::new(),
                 skipped: 0,
diff --git a/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs b/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs
index 8adefb6a74..69e9bb4eee 100644
--- a/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs
+++ b/mm2src/coins/tx_history_storage/tx_history_v2_tests.rs
@@ -1,10 +1,14 @@
+//! Consider using very dirty [Rust script](https://pastebin.ubuntu.com/p/9r2mDmGGHT/)
+//! to print all transactions from `../for_tests/tBCH_tx_history_fixtures.json` ordered.
+
 use crate::my_tx_history_v2::{GetHistoryResult, TxHistoryStorage};
-use crate::tx_history_storage::{GetTxHistoryFilters, TxHistoryStorageBuilder, WalletId};
+use crate::tx_history_storage::{FilteringAddresses, 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::iter::FromIterator;
 use std::num::NonZeroUsize;
 
 const BCH_TX_HISTORY_STR: &str = include_str!("../for_tests/tBCH_tx_history_fixtures.json");
@@ -35,20 +39,6 @@ fn assert_get_history_result(actual: GetHistoryResult, expected_ids: Vec<BytesJs
     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");
 
@@ -60,12 +50,20 @@ async fn test_add_transactions_impl() {
     let tx1 = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
     let transactions = [tx1.clone(), tx1.clone()];
 
+    let filters = GetTxHistoryFilters::for_address("bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_string());
+    let paging_options = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
+    let limit = u32::MAX as usize;
+
     // 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;
+    let actual_txs = storage
+        .get_history(&wallet_id, filters.clone(), paging_options.clone(), limit)
+        .await
+        .unwrap()
+        .transactions;
     assert!(actual_txs.is_empty());
 
     let tx2 = get_bch_tx_details("c07836722bbdfa2404d8fe0ea56700d02e2012cb9dc100ccaf1138f334a759ce");
@@ -74,7 +72,11 @@ async fn test_add_transactions_impl() {
         .add_transactions_to_history(&wallet_id, transactions.clone())
         .await
         .unwrap();
-    let actual_txs = get_coin_history(&storage, &wallet_id).await;
+    let actual_txs = storage
+        .get_history(&wallet_id, filters, paging_options, limit)
+        .await
+        .unwrap()
+        .transactions;
     assert_eq!(actual_txs, transactions);
 }
 
@@ -187,26 +189,84 @@ async fn test_contains_and_get_unconfirmed_transaction_impl() {
 
     storage.init(&wallet_id).await.unwrap();
 
-    let mut tx_details = get_bch_tx_details("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69");
-    tx_details.block_height = 0;
+    let mut tx1 = get_bch_tx_details("afa7785fdb0e49e649aa9b6467fa183c8185c398095baac2c11df50175a7f92b");
+    tx1.block_height = 0;
+    let mut tx2 = get_bch_tx_details("06f38595a2d5d23df8a81a0d744ac3a70c3e46a01efa64a4be862b9d582167b0");
+    tx2.block_height = 0;
+    let mut tx3 = get_bch_tx_details("0fcc9cf22ea2332c73cf6cb4cf89b764d1b936a1ef4d92a087e760378fe6b96e");
+    tx3.block_height = 0;
+
     storage
-        .add_transactions_to_history(&wallet_id, [tx_details.clone()])
+        .add_transactions_to_history(&wallet_id, [tx1.clone(), tx2.clone(), tx3.clone()])
         .await
         .unwrap();
 
-    let contains_unconfirmed = storage.history_contains_unconfirmed_txes(&wallet_id).await.unwrap();
+    let for_first_address =
+        FilteringAddresses::from_iter(["bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x".to_string()]);
+
+    let contains_unconfirmed = storage
+        .history_contains_unconfirmed_txes(&wallet_id, for_first_address.clone())
+        .await
+        .unwrap();
     assert!(contains_unconfirmed);
 
-    let unconfirmed_transactions = storage.get_unconfirmed_txes_from_history(&wallet_id).await.unwrap();
+    let unconfirmed_transactions = storage
+        .get_unconfirmed_txes_from_history(&wallet_id, for_first_address.clone())
+        .await
+        .unwrap();
+    // There only 2 unconfirmed transactions for `bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x` address.
+    assert_eq!(unconfirmed_transactions.len(), 2);
+
+    tx1.block_height = 12345;
+    storage.update_tx_in_history(&wallet_id, &tx1).await.unwrap();
+
+    let unconfirmed_transactions = storage
+        .get_unconfirmed_txes_from_history(&wallet_id, for_first_address)
+        .await
+        .unwrap();
+    // Now there is 1 unconfirmed transaction for `bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x` address.
     assert_eq!(unconfirmed_transactions.len(), 1);
 
-    tx_details.block_height = 12345;
-    storage.update_tx_in_history(&wallet_id, &tx_details).await.unwrap();
+    let for_all_addresses = FilteringAddresses::from_iter([
+        "bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x".to_string(),
+        "bchtest:qp5fphvvj3pvrrv2awhm7dyu8xjueydapg3ju9kwmm".to_string(),
+    ]);
+    let unconfirmed_transactions = storage
+        .get_unconfirmed_txes_from_history(&wallet_id, for_all_addresses)
+        .await
+        .unwrap();
+    // 1 unconfirmed transaction for `bchtest:pqtflkhvhpeqsxphk36yp7pq22stu7ed3sqfxsdt7x`
+    // and 1 unconfirmed transaction for `bchtest:qp5fphvvj3pvrrv2awhm7dyu8xjueydapg3ju9kwmm`.
+    assert_eq!(unconfirmed_transactions.len(), 2);
+
+    tx3.block_height = 54321;
+    storage.update_tx_in_history(&wallet_id, &tx3).await.unwrap();
 
-    let contains_unconfirmed = storage.history_contains_unconfirmed_txes(&wallet_id).await.unwrap();
+    let for_second_address =
+        FilteringAddresses::from_iter(["bchtest:qp5fphvvj3pvrrv2awhm7dyu8xjueydapg3ju9kwmm".to_string()]);
+    let contains_unconfirmed = storage
+        .history_contains_unconfirmed_txes(&wallet_id, for_second_address.clone())
+        .await
+        .unwrap();
     assert!(!contains_unconfirmed);
 
-    let unconfirmed_transactions = storage.get_unconfirmed_txes_from_history(&wallet_id).await.unwrap();
+    let unconfirmed_transactions = storage
+        .get_unconfirmed_txes_from_history(&wallet_id, for_second_address)
+        .await
+        .unwrap();
+    assert!(unconfirmed_transactions.is_empty());
+
+    let for_unknown_address = FilteringAddresses::from_iter(["bchtest:unknown_address".to_string()]);
+    let contains_unconfirmed = storage
+        .history_contains_unconfirmed_txes(&wallet_id, for_unknown_address.clone())
+        .await
+        .unwrap();
+    assert!(!contains_unconfirmed);
+
+    let unconfirmed_transactions = storage
+        .get_unconfirmed_txes_from_history(&wallet_id, for_unknown_address)
+        .await
+        .unwrap();
     assert!(unconfirmed_transactions.is_empty());
 }
 
@@ -264,8 +324,28 @@ async fn test_unique_tx_hashes_num_impl() {
         .await
         .unwrap();
 
-    let tx_hashes_num = storage.unique_tx_hashes_num_in_history(&wallet_id).await.unwrap();
+    let for_addresses =
+        FilteringAddresses::from_iter(["bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_string()]);
+    let tx_hashes_num = storage
+        .unique_tx_hashes_num_in_history(&wallet_id, for_addresses)
+        .await
+        .unwrap();
     assert_eq!(2, tx_hashes_num);
+
+    let for_addresses =
+        FilteringAddresses::from_iter(["bchtest:qz2nkwgfla42y60ctk35cye2jfpygs8p3c87hd35es".to_string()]);
+    let tx_hashes_num = storage
+        .unique_tx_hashes_num_in_history(&wallet_id, for_addresses)
+        .await
+        .unwrap();
+    assert_eq!(1, tx_hashes_num);
+
+    let for_addresses = FilteringAddresses::from_iter(["bchtest:unknown_address".to_string()]);
+    let tx_hashes_num = storage
+        .unique_tx_hashes_num_in_history(&wallet_id, for_addresses)
+        .await
+        .unwrap();
+    assert_eq!(0, tx_hashes_num);
 }
 
 async fn test_add_and_get_tx_from_cache_impl() {
@@ -351,7 +431,7 @@ async fn test_get_history_page_number_impl() {
         .await
         .unwrap();
 
-    let filters = GetTxHistoryFilters::new();
+    let filters = GetTxHistoryFilters::for_address("bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_string());
     let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
     let limit = 4;
 
@@ -365,21 +445,19 @@ async fn test_get_history_page_number_impl() {
     ];
     assert_get_history_result(result, expected_internal_ids, 0, 123);
 
-    let filters = GetTxHistoryFilters::new()
+    let filters = GetTxHistoryFilters::for_address("slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8".to_string())
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
-    let limit = 5;
+    let limit = 3;
 
     let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
 
     let expected_internal_ids: Vec<BytesJson> = vec![
-        "433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970".into(),
-        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
+        "babe9bd0dc1495dff0920da14a76311b744daadc9d01314f8bd4e2438c6b183b".into(),
         "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97".into(),
-        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06".into(),
-        "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c".into(),
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
     ];
-    assert_get_history_result(result, expected_internal_ids, 5, 121);
+    assert_get_history_result(result, expected_internal_ids, 3, 119);
 }
 
 async fn test_get_history_from_id_impl() {
@@ -395,7 +473,7 @@ async fn test_get_history_from_id_impl() {
         .await
         .unwrap();
 
-    let filters = GetTxHistoryFilters::new();
+    let filters = GetTxHistoryFilters::for_address("bchtest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsnnczzt66".to_string());
     let paging = PagingOptionsEnum::FromId("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into());
     let limit = 3;
 
@@ -408,7 +486,7 @@ async fn test_get_history_from_id_impl() {
     ];
     assert_get_history_result(result, expected_internal_ids, 1, 123);
 
-    let filters = GetTxHistoryFilters::new()
+    let filters = GetTxHistoryFilters::for_address("slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8".to_string())
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::FromId("433b641bc89e1b59c22717918583c60ec98421805c8e85b064691705d9aeb970".into());
     let limit = 4;
@@ -416,12 +494,12 @@ async fn test_get_history_from_id_impl() {
     let result = storage.get_history(&wallet_id, filters, paging, limit).await.unwrap();
 
     let expected_internal_ids: Vec<BytesJson> = vec![
-        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
+        "babe9bd0dc1495dff0920da14a76311b744daadc9d01314f8bd4e2438c6b183b".into(),
         "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97".into(),
-        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06".into(),
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989".into(),
         "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c".into(),
     ];
-    assert_get_history_result(result, expected_internal_ids, 6, 121);
+    assert_get_history_result(result, expected_internal_ids, 3, 119);
 }
 
 async fn test_get_history_for_addresses_impl() {
@@ -441,8 +519,7 @@ async fn test_get_history_for_addresses_impl() {
         "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
         "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
     ];
-    let filters = GetTxHistoryFilters::new()
-        .with_for_addresses(for_addresses)
+    let filters = GetTxHistoryFilters::for_addresses(for_addresses)
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap());
     let limit = 5;
@@ -462,8 +539,7 @@ async fn test_get_history_for_addresses_impl() {
         "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
         "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
     ];
-    let filters = GetTxHistoryFilters::new()
-        .with_for_addresses(for_addresses)
+    let filters = GetTxHistoryFilters::for_addresses(for_addresses)
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::FromId("e46fa0836be0534f7799b2ef5b538551ea25b6f430b7e015a95731efb7a0cd4f".into());
     let limit = 4;
@@ -482,8 +558,7 @@ async fn test_get_history_for_addresses_impl() {
         "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
         "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
     ];
-    let filters = GetTxHistoryFilters::new()
-        .with_for_addresses(for_addresses)
+    let filters = GetTxHistoryFilters::for_addresses(for_addresses)
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::FromId("6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69".into());
     let limit = 2;
@@ -498,8 +573,7 @@ async fn test_get_history_for_addresses_impl() {
         "slptest:ppfdp6t2qs7rc79wxjppwv0hwvr776x5vu2enth4zh".to_owned(),
         "slptest:pqgk69yyj6dzag4mdyur9lykye89ucz9vskelzwhck".to_owned(),
     ];
-    let filters = GetTxHistoryFilters::new()
-        .with_for_addresses(for_addresses)
+    let filters = GetTxHistoryFilters::for_addresses(for_addresses)
         .with_token_id("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".to_owned());
     let paging = PagingOptionsEnum::PageNumber(NonZeroUsize::new(2).unwrap());
     let limit = 4;
@@ -508,7 +582,7 @@ async fn test_get_history_for_addresses_impl() {
     assert_get_history_result(result, Vec::new(), 4, 4);
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_arch = "wasm32")))]
 mod native_tests {
     use super::wallet_id_for_test;
     use crate::my_tx_history_v2::TxHistoryStorage;
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
index a07bdaf6fc..12255a6a10 100644
--- a/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v2.rs
+++ b/mm2src/coins/tx_history_storage/wasm/tx_history_storage_v2.rs
@@ -3,7 +3,7 @@ use crate::tx_history_storage::wasm::tx_history_db::{TxHistoryDb, TxHistoryDbLoc
 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 crate::{compare_transaction_details, CoinsContext, TransactionDetails};
 use async_trait::async_trait;
 use common::PagingOptionsEnum;
 use itertools::Itertools;
@@ -118,24 +118,28 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
         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)?;
+    async fn get_highest_block_height(&self, _wallet_id: &WalletId) -> Result<Option<u32>, MmError<Self::Error>> {
+        // TODO
+        Ok(None)
+    }
 
-        let count_unconfirmed = table.count_by_multi_index(index_keys).await?;
-        Ok(count_unconfirmed > 0)
+    /// Since we need to filter the transactions by the given `for_addresses`,
+    /// we can't use [`DbTable::count_by_multi_index`].
+    /// TODO consider one of the solutions described at [`IndexedDbTxHistoryStorage::get_history`].
+    async fn history_contains_unconfirmed_txes(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> Result<bool, MmError<Self::Error>> {
+        let txs = self.get_unconfirmed_txes_from_history(wallet_id, for_addresses).await?;
+        Ok(!txs.is_empty())
     }
 
     /// Gets the unconfirmed transactions from the history
     async fn get_unconfirmed_txes_from_history(
         &self,
         wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
     ) -> MmResult<Vec<TransactionDetails>, Self::Error> {
         let locked_db = self.lock_db().await?;
         let db_transaction = locked_db.get_inner().transaction().await?;
@@ -146,13 +150,13 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
             .with_value(wallet_id.hd_wallet_rmd160_or_exclude())?
             .with_value(ConfirmationStatus::Unconfirmed)?;
 
-        table
+        let transactions = 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()
+            .map(|(_item_id, item)| item);
+
+        Self::take_according_to_filtering_addresses(transactions, &for_addresses)
     }
 
     /// Updates transaction in the selected coin's history
@@ -183,9 +187,12 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
         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>> {
+    /// TODO consider refactoring this method to avoid fetching all transactions.
+    async fn unique_tx_hashes_num_in_history(
+        &self,
+        wallet_id: &WalletId,
+        for_addresses: FilteringAddresses,
+    ) -> 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?;
@@ -196,12 +203,15 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
 
         // `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
+        let transactions = table
             .get_items_by_multi_index(index_keys)
             .await?
             .into_iter()
-            .unique_by(|(_item_id, tx)| tx.tx_hash.clone())
-            .count())
+            .map(|(_item_id, tx)| tx)
+            .unique_by(|tx| tx.tx_hash.clone());
+
+        let filtered_transactions = Self::take_according_to_filtering_addresses(transactions, &for_addresses)?;
+        Ok(filtered_transactions.len())
     }
 
     async fn add_tx_to_cache(
@@ -260,9 +270,9 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
         paging: PagingOptionsEnum<BytesJson>,
         limit: usize,
     ) -> MmResult<GetHistoryResult, Self::Error> {
-        // Check if [`GetTxHistoryFilters::for_addresses`] is specified and empty.
+        // Check if [`GetTxHistoryFilters::for_addresses`] is 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()) {
+        if filters.for_addresses.is_empty() {
             return Ok(GetHistoryResult {
                 transactions: Vec::new(),
                 skipped: 0,
@@ -285,7 +295,7 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
             .into_iter()
             .map(|(_item_id, tx)| tx);
 
-        let transactions = Self::take_according_to_filtering_addresses(transactions, &filters.for_addresses);
+        let transactions = Self::take_according_to_filtering_addresses(transactions, &filters.for_addresses)?;
         Self::take_according_to_paging_opts(transactions, paging, limit)
     }
 }
@@ -293,28 +303,31 @@ impl TxHistoryStorage for IndexedDbTxHistoryStorage {
 impl IndexedDbTxHistoryStorage {
     fn take_according_to_filtering_addresses<I>(
         txs: I,
-        for_addresses: &Option<FilteringAddresses>,
-    ) -> Vec<TxHistoryTableV2>
+        for_addresses: &FilteringAddresses,
+    ) -> WasmTxHistoryResult<Vec<TransactionDetails>>
     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(),
-        }
+        txs.filter(|tx| {
+            tx.from_addresses.has_intersection(for_addresses) || tx.to_addresses.has_intersection(for_addresses)
+        })
+        .map(tx_details_from_item)
+        .collect()
     }
 
     pub(super) fn take_according_to_paging_opts(
-        txs: Vec<TxHistoryTableV2>,
+        mut txs: Vec<TransactionDetails>,
         paging: PagingOptionsEnum<BytesJson>,
         limit: usize,
     ) -> WasmTxHistoryResult<GetHistoryResult> {
         let total_count = txs.len();
 
+        // This is super inefficient to fetch the whole transaction history, sort it on the client side.
+        // It's required to implement `DESC` order for `IdbCursor` in order to sort the transactions
+        // the same way as `compare_transaction_details` does.
+        // But it's difficult to implement, and I think it can be postponed for a while.
+        txs.sort_by(compare_transaction_details);
+
         let skip = match paging {
             // `page_number` is ignored if from_uuid is set
             PagingOptionsEnum::FromId(from_internal_id) => {
@@ -336,15 +349,8 @@ impl IndexedDbTxHistoryStorage {
             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,
+            transactions: txs.into_iter().skip(skip).take(limit).collect(),
             skipped: skip,
             total: total_count,
         })
diff --git a/mm2src/coins/utxo.rs b/mm2src/coins/utxo.rs
index 6e30d5468f..f3519f9807 100644
--- a/mm2src/coins/utxo.rs
+++ b/mm2src/coins/utxo.rs
@@ -22,8 +22,7 @@
 //
 
 pub mod bch;
-pub mod bch_and_slp_tx_history;
-mod bchd_grpc;
+pub(crate) mod bchd_grpc;
 #[allow(clippy::all)]
 #[rustfmt::skip]
 #[path = "utxo/pb.rs"]
@@ -31,51 +30,58 @@ mod bchd_pb;
 pub mod qtum;
 pub mod rpc_clients;
 pub mod slp;
+pub mod spv;
 pub mod utxo_block_header_storage;
 pub mod utxo_builder;
 pub mod utxo_common;
 pub mod utxo_standard;
+pub mod utxo_tx_history_v2;
 pub mod utxo_withdraw;
 
 use async_trait::async_trait;
+#[cfg(not(target_arch = "wasm32"))]
 use bitcoin::network::constants::Network as BitcoinNetwork;
 pub use bitcrypto::{dhash160, sha256, ChecksumType};
 pub use chain::Transaction as UtxoTx;
 use chain::{OutPoint, TransactionOutput, TxHashAlgo};
+use common::executor::abortable_queue::AbortableQueue;
 #[cfg(not(target_arch = "wasm32"))]
 use common::first_char_to_upper;
 use common::jsonrpc_client::JsonRpcError;
-use common::mm_metrics::MetricsArc;
+use common::log::LogOnError;
 use common::now_ms;
-use crypto::trezor::utxo::TrezorUtxoCoin;
-use crypto::{Bip32DerPathOps, Bip32Error, Bip44Chain, Bip44DerPathError, Bip44PathToAccount, Bip44PathToCoin,
-             ChildNumber, DerivationPath, Secp256k1ExtendedPublicKey};
+use crypto::{Bip32DerPathOps, Bip32Error, Bip44Chain, ChildNumber, DerivationPath, Secp256k1ExtendedPublicKey,
+             StandardHDPathError, StandardHDPathToAccount, StandardHDPathToCoin};
 use derive_more::Display;
 #[cfg(not(target_arch = "wasm32"))] use dirs::home_dir;
-use futures::channel::mpsc;
+use futures::channel::mpsc::{Receiver as AsyncReceiver, Sender as AsyncSender, UnboundedSender};
 use futures::compat::Future01CompatExt;
 use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
 use futures01::Future;
 use keys::bytes::Bytes;
 pub use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, KeyPair, Private, Public, Secret,
                Type as ScriptType};
+#[cfg(not(target_arch = "wasm32"))]
 use lightning_invoice::Currency as LightningCurrency;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
 use mm2_number::BigDecimal;
 #[cfg(test)] use mocktopus::macros::*;
 use num_traits::ToPrimitive;
-use primitives::hash::{H256, H264};
+use primitives::hash::{H160, 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 serialization::{serialize, serialize_with_flags, Error as SerError, SERIALIZE_TRANSACTION_WITNESS};
+use spv_validation::conf::SPVConf;
 use spv_validation::helpers_validation::SPVError;
+use spv_validation::storage::BlockHeaderStorageError;
 use std::array::TryFromSliceError;
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
 use std::hash::Hash;
-use std::num::NonZeroU64;
+use std::num::{NonZeroU64, TryFromIntError};
 use std::ops::Deref;
 #[cfg(not(target_arch = "wasm32"))]
 use std::path::{Path, PathBuf};
@@ -90,26 +96,20 @@ 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 super::{big_decimal_from_sat_unsigned, BalanceError, BalanceFut, BalanceResult, CoinBalance, CoinFutSpawner,
+            CoinsContext, DerivationMethod, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, KmdRewardsDetails,
+            MarketCoinOps, MmCoin, NumConversError, NumConversResult, PrivKeyActivationPolicy, PrivKeyPolicy,
+            PrivKeyPolicyNotAllowed, RawTransactionFut, RawTransactionRequest, RawTransactionResult,
+            RpcTransportEventHandler, RpcTransportEventHandlerShared, TradeFee, TradePreimageError, TradePreimageFut,
+            TradePreimageResult, Transaction, TransactionDetails, TransactionEnum, TransactionErr,
+            UnexpectedDerivationMethod, VerificationError, WithdrawError, WithdrawRequest};
+use crate::coin_balance::{EnableCoinScanPolicy, EnabledCoinBalanceParams, HDAddressBalanceScanner};
+use crate::hd_wallet::{HDAccountOps, HDAccountsMutex, HDAddress, HDAddressId, 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"))]
-pub mod utxo_sql_block_header_storage;
 
 #[cfg(any(test, target_arch = "wasm32"))]
 pub mod utxo_common_tests;
@@ -135,6 +135,7 @@ pub type GenerateTxResult = Result<(TransactionInputSigner, AdditionalTxData), M
 pub type HistoryUtxoTxMap = HashMap<H256Json, HistoryUtxoTx>;
 pub type MatureUnspentMap = HashMap<Address, MatureUnspentList>;
 pub type RecentlySpentOutPointsGuard<'a> = AsyncMutexGuard<'a, RecentlySpentOutPoints>;
+pub type UtxoHDAddress = HDAddress<Address, Public>;
 
 #[cfg(windows)]
 #[cfg(not(target_arch = "wasm32"))]
@@ -225,8 +226,8 @@ impl From<UtxoRpcError> for TxProviderError {
     }
 }
 
-impl From<Bip44DerPathError> for HDWalletStorageError {
-    fn from(e: Bip44DerPathError) -> Self { HDWalletStorageError::ErrorDeserializing(e.to_string()) }
+impl From<StandardHDPathError> for HDWalletStorageError {
+    fn from(e: StandardHDPathError) -> Self { HDWalletStorageError::ErrorDeserializing(e.to_string()) }
 }
 
 impl From<Bip32Error> for HDWalletStorageError {
@@ -381,23 +382,20 @@ impl RecentlySpentOutPoints {
 
     pub fn replace_spent_outputs_with_cache(&self, mut outputs: HashSet<UnspentInfo>) -> HashSet<UnspentInfo> {
         let mut replacement_unspents = HashSet::new();
-        outputs = outputs
-            .into_iter()
-            .filter(|unspent| {
-                let outs = self.input_to_output_map.get(&unspent.clone().into());
-                match outs {
-                    Some(outs) => {
-                        for out in outs.iter() {
-                            if !replacement_unspents.contains(out) {
-                                replacement_unspents.insert(out.clone());
-                            }
+        outputs.retain(|unspent| {
+            let outs = self.input_to_output_map.get(&unspent.clone().into());
+            match outs {
+                Some(outs) => {
+                    for out in outs.iter() {
+                        if !replacement_unspents.contains(out) {
+                            replacement_unspents.insert(out.clone());
                         }
-                        false
-                    },
-                    None => true,
-                }
-            })
-            .collect();
+                    }
+                    false
+                },
+                None => true,
+            }
+        });
         if replacement_unspents.is_empty() {
             return outputs;
         }
@@ -416,6 +414,7 @@ pub enum BlockchainNetwork {
     Regtest,
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 impl From<BlockchainNetwork> for BitcoinNetwork {
     fn from(network: BlockchainNetwork) -> Self {
         match network {
@@ -426,6 +425,7 @@ impl From<BlockchainNetwork> for BitcoinNetwork {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 impl From<BlockchainNetwork> for LightningCurrency {
     fn from(network: BlockchainNetwork) -> Self {
         match network {
@@ -436,6 +436,54 @@ impl From<BlockchainNetwork> for LightningCurrency {
     }
 }
 
+pub enum UtxoSyncStatus {
+    SyncingBlockHeaders {
+        current_scanned_block: u64,
+        last_block: u64,
+    },
+    TemporaryError(String),
+    PermanentError(String),
+    Finished {
+        block_number: u64,
+    },
+}
+
+#[derive(Clone)]
+pub struct UtxoSyncStatusLoopHandle(AsyncSender<UtxoSyncStatus>);
+
+impl UtxoSyncStatusLoopHandle {
+    pub fn new(sync_status_notifier: AsyncSender<UtxoSyncStatus>) -> Self {
+        UtxoSyncStatusLoopHandle(sync_status_notifier)
+    }
+
+    pub fn notify_blocks_headers_sync_status(&mut self, current_scanned_block: u64, last_block: u64) {
+        self.0
+            .try_send(UtxoSyncStatus::SyncingBlockHeaders {
+                current_scanned_block,
+                last_block,
+            })
+            .debug_log_with_msg("No one seems interested in UtxoSyncStatus");
+    }
+
+    pub fn notify_on_temp_error(&mut self, error: impl ToString) {
+        self.0
+            .try_send(UtxoSyncStatus::TemporaryError(error.to_string()))
+            .debug_log_with_msg("No one seems interested in UtxoSyncStatus");
+    }
+
+    pub fn notify_on_permanent_error(&mut self, error: impl ToString) {
+        self.0
+            .try_send(UtxoSyncStatus::PermanentError(error.to_string()))
+            .debug_log_with_msg("No one seems interested in UtxoSyncStatus");
+    }
+
+    pub fn notify_sync_finished(&mut self, block_number: u64) {
+        self.0
+            .try_send(UtxoSyncStatus::Finished { block_number })
+            .debug_log_with_msg("No one seems interested in UtxoSyncStatus");
+    }
+}
+
 #[derive(Debug)]
 pub struct UtxoCoinConf {
     pub ticker: String,
@@ -503,12 +551,19 @@ pub struct UtxoCoinConf {
     /// 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,
+    pub trezor_coin: Option<String>,
+    /// Whether to verify swaps and lightning transactions using spv or not. When enabled, block headers will be retrieved, verified according
+    /// to [`SPVConf::validation_params`] and stored in the DB. Can be false if the coin's RPC server is trusted.
+    pub spv_conf: Option<SPVConf>,
+    /// 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: Option<StandardHDPathToCoin>,
+    /// The average time in seconds needed to mine a new block for this coin.
+    pub avg_blocktime: Option<u64>,
 }
 
-#[derive(Debug)]
 pub struct UtxoCoinFields {
     /// UTXO coin config
     pub conf: UtxoCoinConf,
@@ -530,7 +585,6 @@ pub struct UtxoCoinFields {
     pub history_sync_state: Mutex<HistorySyncState>,
     /// 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
@@ -539,6 +593,15 @@ pub struct UtxoCoinFields {
     /// 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,
+    /// The notifier/sender of the block headers synchronization status,
+    /// initialized only for non-native mode if spv is enabled for the coin.
+    pub block_headers_status_notifier: Option<UtxoSyncStatusLoopHandle>,
+    /// The watcher/receiver of the block headers synchronization status,
+    /// initialized only for non-native mode if spv is enabled for the coin.
+    pub block_headers_status_watcher: Option<AsyncMutex<AsyncReceiver<UtxoSyncStatus>>>,
+    /// This abortable system is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// and on [`MmArc::stop`].
+    pub abortable_system: AbortableQueue,
 }
 
 #[derive(Debug, Display)]
@@ -567,26 +630,62 @@ impl From<UnsupportedAddr> for WithdrawError {
 }
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum GetTxError {
+    Rpc(UtxoRpcError),
+    TxDeserialization(SerError),
+}
+
+impl From<UtxoRpcError> for GetTxError {
+    fn from(err: UtxoRpcError) -> GetTxError { GetTxError::Rpc(err) }
+}
+
+impl From<SerError> for GetTxError {
+    fn from(err: SerError) -> GetTxError { GetTxError::TxDeserialization(err) }
+}
+
+#[derive(Debug, Display)]
 pub enum GetTxHeightError {
-    HeightNotFound,
+    HeightNotFound(String),
+    StorageError(BlockHeaderStorageError),
+    ConversionError(TryFromIntError),
 }
 
 impl From<GetTxHeightError> for SPVError {
     fn from(e: GetTxHeightError) -> Self {
         match e {
-            GetTxHeightError::HeightNotFound => SPVError::InvalidHeight,
+            GetTxHeightError::HeightNotFound(e) => SPVError::InvalidHeight(e),
+            GetTxHeightError::StorageError(e) => SPVError::HeaderStorageError(e),
+            GetTxHeightError::ConversionError(e) => SPVError::Internal(e.to_string()),
         }
     }
 }
 
-#[derive(Debug)]
+impl From<UtxoRpcError> for GetTxHeightError {
+    fn from(e: UtxoRpcError) -> Self { GetTxHeightError::HeightNotFound(e.to_string()) }
+}
+
+impl From<BlockHeaderStorageError> for GetTxHeightError {
+    fn from(e: BlockHeaderStorageError) -> Self { GetTxHeightError::StorageError(e) }
+}
+
+impl From<TryFromIntError> for GetTxHeightError {
+    fn from(err: TryFromIntError) -> GetTxHeightError { GetTxHeightError::ConversionError(err) }
+}
+
+#[derive(Debug, Display)]
 pub enum GetBlockHeaderError {
+    #[display(fmt = "Block header storage error: {}", _0)]
     StorageError(BlockHeaderStorageError),
+    #[display(fmt = "RPC error: {}", _0)]
     RpcError(JsonRpcError),
+    #[display(fmt = "Serialization error: {}", _0)]
     SerializationError(serialization::Error),
+    #[display(fmt = "Invalid response: {}", _0)]
     InvalidResponse(String),
+    #[display(fmt = "Error validating headers: {}", _0)]
     SPVError(SPVError),
-    NativeNotSupported(String),
+    #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
 
@@ -604,10 +703,6 @@ impl From<UtxoRpcError> for GetBlockHeaderError {
     }
 }
 
-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) }
 }
@@ -616,6 +711,55 @@ impl From<BlockHeaderStorageError> for GetBlockHeaderError {
     fn from(err: BlockHeaderStorageError) -> Self { GetBlockHeaderError::StorageError(err) }
 }
 
+impl From<GetBlockHeaderError> for SPVError {
+    fn from(e: GetBlockHeaderError) -> Self { SPVError::UnableToGetHeader(e.to_string()) }
+}
+
+#[derive(Debug, Display)]
+pub enum GetConfirmedTxError {
+    HeightNotFound(GetTxHeightError),
+    UnableToGetHeader(GetBlockHeaderError),
+    RpcError(JsonRpcError),
+    SerializationError(serialization::Error),
+    SPVError(SPVError),
+}
+
+impl From<GetTxHeightError> for GetConfirmedTxError {
+    fn from(err: GetTxHeightError) -> Self { GetConfirmedTxError::HeightNotFound(err) }
+}
+
+impl From<GetBlockHeaderError> for GetConfirmedTxError {
+    fn from(err: GetBlockHeaderError) -> Self { GetConfirmedTxError::UnableToGetHeader(err) }
+}
+
+impl From<JsonRpcError> for GetConfirmedTxError {
+    fn from(err: JsonRpcError) -> Self { GetConfirmedTxError::RpcError(err) }
+}
+
+impl From<serialization::Error> for GetConfirmedTxError {
+    fn from(err: serialization::Error) -> Self { GetConfirmedTxError::SerializationError(err) }
+}
+
+#[derive(Debug, Display)]
+pub enum AddrFromStrError {
+    #[display(fmt = "{}", _0)]
+    Unsupported(UnsupportedAddr),
+    #[display(fmt = "Cannot determine format: {:?}", _0)]
+    CannotDetermineFormat(Vec<String>),
+}
+
+impl From<UnsupportedAddr> for AddrFromStrError {
+    fn from(e: UnsupportedAddr) -> Self { AddrFromStrError::Unsupported(e) }
+}
+
+impl From<AddrFromStrError> for VerificationError {
+    fn from(e: AddrFromStrError) -> Self { VerificationError::AddressDecodingError(e.to_string()) }
+}
+
+impl From<AddrFromStrError> for WithdrawError {
+    fn from(e: AddrFromStrError) -> Self { WithdrawError::InvalidAddress(e.to_string()) }
+}
+
 impl UtxoCoinFields {
     pub fn transaction_preimage(&self) -> TransactionInputSigner {
         let lock_time = if self.conf.ticker == "KMD" {
@@ -702,6 +846,7 @@ pub enum UtxoAddressScanner {
 }
 
 #[async_trait]
+#[cfg_attr(test, mockable)]
 impl HDAddressBalanceScanner for UtxoAddressScanner {
     type Address = Address;
 
@@ -788,7 +933,7 @@ impl MatureUnspentList {
 pub trait UtxoCommonOps:
     AsRef<UtxoCoinFields> + UtxoTxGenerationOps + UtxoTxBroadcastOps + Clone + Send + Sync + 'static
 {
-    async fn get_htlc_spend_fee(&self, tx_size: u64) -> UtxoRpcResult<u64>;
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64>;
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String>;
 
@@ -805,7 +950,7 @@ pub trait UtxoCommonOps:
 
     /// Try to parse address from string using specified on asset enable format,
     /// and if it failed inform user that he used a wrong format.
-    fn address_from_str(&self, address: &str) -> Result<Address, String>;
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError>;
 
     async fn get_current_mtp(&self) -> UtxoRpcResult<u32>;
 
@@ -953,11 +1098,11 @@ pub trait UtxoStandardOps {
     ) -> UtxoRpcResult<()>;
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UtxoArc(Arc<UtxoCoinFields>);
 impl Deref for UtxoArc {
     type Target = UtxoCoinFields;
-    fn deref(&self) -> &UtxoCoinFields { &*self.0 }
+    fn deref(&self) -> &UtxoCoinFields { &self.0 }
 }
 
 impl From<UtxoCoinFields> for UtxoArc {
@@ -980,7 +1125,7 @@ impl UtxoArc {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UtxoWeak(Weak<UtxoCoinFields>);
 
 impl From<Weak<UtxoCoinFields>> for UtxoWeak {
@@ -1159,10 +1304,15 @@ pub fn coin_daemon_data_dir(name: &str, is_asset_chain: bool) -> PathBuf {
     data_dir
 }
 
+enum ElectrumProtoVerifierEvent {
+    Connected(String),
+    Disconnected(String),
+}
+
 /// Electrum protocol version verifier.
 /// The structure is used to handle the `on_connected` event and notify `electrum_version_loop`.
 struct ElectrumProtoVerifier {
-    on_connect_tx: mpsc::UnboundedSender<String>,
+    on_event_tx: UnboundedSender<ElectrumProtoVerifierEvent>,
 }
 
 impl ElectrumProtoVerifier {
@@ -1177,7 +1327,16 @@ impl RpcTransportEventHandler for ElectrumProtoVerifier {
     fn on_incoming_response(&self, _data: &[u8]) {}
 
     fn on_connected(&self, address: String) -> Result<(), String> {
-        try_s!(self.on_connect_tx.unbounded_send(address));
+        try_s!(self
+            .on_event_tx
+            .unbounded_send(ElectrumProtoVerifierEvent::Connected(address)));
+        Ok(())
+    }
+
+    fn on_disconnected(&self, address: String) -> Result<(), String> {
+        try_s!(self
+            .on_event_tx
+            .unbounded_send(ElectrumProtoVerifierEvent::Disconnected(address)));
         Ok(())
     }
 }
@@ -1191,14 +1350,6 @@ pub struct UtxoMergeParams {
     pub max_merge_at_once: usize,
 }
 
-#[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,
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct UtxoActivationParams {
     pub mode: UtxoRpcMode,
@@ -1208,10 +1359,12 @@ pub struct UtxoActivationParams {
     pub required_confirmations: Option<u64>,
     pub requires_notarization: Option<bool>,
     pub address_format: Option<UtxoAddressFormat>,
+    // The max number of empty addresses in a row.
+    // If transactions were sent to an address outside the `gap_limit`, they will not be identified.
     pub gap_limit: Option<u32>,
+    #[serde(flatten)]
+    pub enable_params: EnabledCoinBalanceParams,
     #[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
@@ -1229,6 +1382,7 @@ pub enum UtxoFromLegacyReqErr {
     InvalidAddressFormat(json::Error),
     InvalidCheckUtxoMaturity(json::Error),
     InvalidScanPolicy(json::Error),
+    InvalidMinAddressesNumber(json::Error),
     InvalidPrivKeyPolicy(json::Error),
 }
 
@@ -1258,9 +1412,15 @@ impl UtxoActivationParams {
         let scan_policy = json::from_value::<Option<EnableCoinScanPolicy>>(req["scan_policy"].clone())
             .map_to_mm(UtxoFromLegacyReqErr::InvalidScanPolicy)?
             .unwrap_or_default();
+        let min_addresses_number = json::from_value(req["min_addresses_number"].clone())
+            .map_to_mm(UtxoFromLegacyReqErr::InvalidMinAddressesNumber)?;
+        let enable_params = EnabledCoinBalanceParams {
+            scan_policy,
+            min_addresses_number,
+        };
         let priv_key_policy = json::from_value::<Option<PrivKeyActivationPolicy>>(req["priv_key_policy"].clone())
             .map_to_mm(UtxoFromLegacyReqErr::InvalidPrivKeyPolicy)?
-            .unwrap_or(PrivKeyActivationPolicy::IguanaPrivKey);
+            .unwrap_or(PrivKeyActivationPolicy::ContextPrivKey);
 
         Ok(UtxoActivationParams {
             mode,
@@ -1270,7 +1430,7 @@ impl UtxoActivationParams {
             requires_notarization,
             address_format,
             gap_limit: None,
-            scan_policy,
+            enable_params,
             priv_key_policy,
             check_utxo_maturity,
         })
@@ -1284,6 +1444,11 @@ pub enum UtxoRpcMode {
     Electrum { servers: Vec<ElectrumRpcRequest> },
 }
 
+impl UtxoRpcMode {
+    #[inline]
+    pub fn is_native(&self) -> bool { matches!(*self, UtxoRpcMode::Native) }
+}
+
 #[derive(Debug)]
 pub struct ElectrumBuilderArgs {
     pub spawn_ping: bool,
@@ -1303,15 +1468,18 @@ impl Default for ElectrumBuilderArgs {
 
 #[derive(Debug)]
 pub struct UtxoHDWallet {
+    pub hd_wallet_rmd160: H160,
     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,
+    pub derivation_path: StandardHDPathToCoin,
     /// User accounts.
     pub accounts: HDAccountsMutex<UtxoHDAccount>,
+    // The max number of empty addresses in a row.
+    // If transactions were sent to an address outside the `gap_limit`, they will not be identified.
     pub gap_limit: u32,
 }
 
@@ -1325,19 +1493,37 @@ impl HDWalletOps for UtxoHDWallet {
     fn get_accounts_mutex(&self) -> &HDAccountsMutex<Self::HDAccount> { &self.accounts }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, Default)]
+pub struct HDAddressesCache {
+    cache: Arc<AsyncMutex<HashMap<HDAddressId, UtxoHDAddress>>>,
+}
+
+impl HDAddressesCache {
+    pub fn with_capacity(capacity: usize) -> HDAddressesCache {
+        HDAddressesCache {
+            cache: Arc::new(AsyncMutex::new(HashMap::with_capacity(capacity))),
+        }
+    }
+
+    pub async fn lock(&self) -> AsyncMutexGuard<'_, HashMap<HDAddressId, UtxoHDAddress>> { self.cache.lock().await }
+}
+
+#[derive(Clone, Debug)]
 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,
+    pub account_derivation_path: StandardHDPathToAccount,
     /// 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,
+    /// The cache of derived addresses.
+    /// This is used at [`HDWalletCoinOps::derive_address`].
+    pub derived_addresses: HDAddressesCache,
 }
 
 impl HDAccountOps for UtxoHDAccount {
@@ -1355,7 +1541,7 @@ impl HDAccountOps for UtxoHDAccount {
 
 impl UtxoHDAccount {
     pub fn try_from_storage_item(
-        wallet_der_path: &Bip44PathToCoin,
+        wallet_der_path: &StandardHDPathToCoin,
         account_info: &HDAccountStorageItem,
     ) -> HDWalletStorageResult<UtxoHDAccount> {
         const ACCOUNT_CHILD_HARDENED: bool = true;
@@ -1363,14 +1549,17 @@ impl UtxoHDAccount {
         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)?;
+            .map_to_mm(StandardHDPathError::from)?;
         let extended_pubkey = Secp256k1ExtendedPublicKey::from_str(&account_info.account_xpub)?;
+        let capacity =
+            account_info.external_addresses_number + account_info.internal_addresses_number + DEFAULT_GAP_LIMIT;
         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,
+            derived_addresses: HDAddressesCache::with_capacity(capacity as usize),
         })
     }
 
@@ -1505,7 +1694,7 @@ pub async fn kmd_rewards_info<T: UtxoCommonOps>(coin: &T) -> Result<Vec<KmdRewar
     }
 
     let utxo = coin.as_ref();
-    let my_address = try_s!(utxo.derivation_method.iguana_or_err());
+    let my_address = try_s!(utxo.derivation_method.single_addr_or_err());
     let rpc_client = &utxo.rpc_client;
     let mut unspents = try_s!(rpc_client.list_unspent(my_address, utxo.decimals).compat().await);
     // Reorder from highest to lowest unspent outputs.
@@ -1572,7 +1761,7 @@ async fn send_outputs_from_my_address_impl<T>(
 where
     T: UtxoCommonOps + GetUtxoListOps,
 {
-    let my_address = try_tx_s!(coin.as_ref().derivation_method.iguana_or_err());
+    let my_address = try_tx_s!(coin.as_ref().derivation_method.single_addr_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
 }
@@ -1589,7 +1778,7 @@ async fn generate_and_send_tx<T>(
 where
     T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps + UtxoTxBroadcastOps,
 {
-    let my_address = try_tx_s!(coin.as_ref().derivation_method.iguana_or_err());
+    let my_address = try_tx_s!(coin.as_ref().derivation_method.single_addr_or_err());
     let key_pair = try_tx_s!(coin.as_ref().priv_key_policy.key_pair_or_err());
 
     let mut builder = UtxoTxBuilder::new(coin)
@@ -1659,8 +1848,8 @@ pub fn address_by_conf_and_pubkey_str(
         requires_notarization: None,
         address_format: None,
         gap_limit: None,
-        scan_policy: EnableCoinScanPolicy::default(),
-        priv_key_policy: PrivKeyActivationPolicy::IguanaPrivKey,
+        enable_params: EnabledCoinBalanceParams::default(),
+        priv_key_policy: PrivKeyActivationPolicy::ContextPrivKey,
         check_utxo_maturity: None,
     };
     let conf_builder = UtxoConfBuilder::new(conf, &params, coin);
diff --git a/mm2src/coins/utxo/bch.rs b/mm2src/coins/utxo/bch.rs
index 1cbaea6a5e..e04d345877 100644
--- a/mm2src/coins/utxo/bch.rs
+++ b/mm2src/coins/utxo/bch.rs
@@ -1,23 +1,34 @@
 use super::*;
-use crate::my_tx_history_v2::{CoinWithTxHistoryV2, TxDetailsBuilder, TxHistoryStorage, TxHistoryStorageError};
+use crate::coin_errors::MyAddressError;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget, TxDetailsBuilder,
+                              TxHistoryStorage};
 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::slp::{parse_slp_script, 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 crate::utxo::utxo_tx_history_v2::{UtxoMyAddressesHistoryError, UtxoTxDetailsError, UtxoTxDetailsParams,
+                                      UtxoTxHistoryOps};
+use crate::{BlockHeightAndTime, CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinBalance, CoinProtocol,
+            CoinWithDerivationMethod, IguanaPrivKey, MakerSwapTakerCoin, NegotiateSwapContractAddrErr,
+            PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy, RawTransactionFut, RawTransactionRequest,
+            RefundError, RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureResult, SwapOps, TakerSwapMakerCoin, TradePreimageValue,
+            TransactionFut, TransactionType, TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr,
+            ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, VerificationResult, WatcherOps,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
+use common::executor::{AbortableSystem, AbortedError};
 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_metrics::MetricsArc;
 use mm2_number::MmNumber;
 use serde_json::{self as json, Value as Json};
 use serialization::{deserialize, CoinVariant};
@@ -58,7 +69,7 @@ impl BchActivationRequest {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct BchCoin {
     utxo_arc: UtxoArc,
     slp_addr_prefix: CashAddrPrefix,
@@ -140,40 +151,6 @@ 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 }
 
@@ -329,7 +306,7 @@ impl BchCoin {
         let my_address = self
             .as_ref()
             .derivation_method
-            .iguana_or_err()
+            .single_addr_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) = (
@@ -348,7 +325,7 @@ impl BchCoin {
         let my_address = self
             .as_ref()
             .derivation_method
-            .iguana_or_err()
+            .single_addr_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) = (
@@ -369,7 +346,7 @@ impl BchCoin {
     }
 
     pub fn get_my_slp_address(&self) -> Result<CashAddress, String> {
-        let my_address = try_s!(self.as_ref().derivation_method.iguana_or_err());
+        let my_address = try_s!(self.as_ref().derivation_method.single_addr_or_err());
         let slp_address = my_address.to_cashaddress(
             &self.slp_prefix().to_string(),
             self.as_ref().conf.pub_addr_prefix,
@@ -378,36 +355,21 @@ impl BchCoin {
         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?;
+        params: UtxoTxDetailsParams<'_, T>,
+    ) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError> {
+        let tx = self.tx_from_storage_or_rpc(params.hash, params.storage).await?;
 
         let bch_tx_details = self
-            .bch_tx_details(tx_hash, &tx, block_height_and_time, storage)
+            .bch_tx_details(
+                params.hash,
+                &tx,
+                params.block_height_and_time,
+                params.storage,
+                params.my_addresses,
+            )
             .await?;
         let maybe_op_return: Script = tx.outputs[0].script_pubkey.clone().into();
         if !(maybe_op_return.is_pay_to_public_key_hash()
@@ -419,9 +381,10 @@ impl BchCoin {
                     .slp_tx_details(
                         &tx,
                         slp_details.transaction,
-                        block_height_and_time,
+                        params.block_height_and_time,
                         bch_tx_details.fee_details.clone(),
-                        storage,
+                        params.storage,
+                        params.my_addresses,
                     )
                     .await?;
                 return Ok(vec![bch_tx_details, slp_tx_details]);
@@ -437,10 +400,9 @@ impl BchCoin {
         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);
+        my_addresses: &HashSet<Address>,
+    ) -> MmResult<TransactionDetails, UtxoTxDetailsError> {
+        let mut tx_builder = TxDetailsBuilder::new(self.ticker().to_owned(), tx, height_and_time, my_addresses.clone());
         for output in &tx.outputs {
             let addresses = match self.addresses_from_script(&output.script_pubkey.clone().into()) {
                 Ok(a) => a,
@@ -457,7 +419,7 @@ impl BchCoin {
                     self.ticker(),
                     tx_hash,
                 );
-                return MmError::err(GetTxDetailsError::AddressesFromScriptError(msg));
+                return MmError::err(UtxoTxDetailsError::TxAddressDeserializationError(msg));
             }
 
             let amount = big_decimal_from_sat_unsigned(output.value, self.decimals());
@@ -475,14 +437,14 @@ impl BchCoin {
             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)?;
+                .map_to_mm(UtxoTxDetailsError::TxAddressDeserializationError)?;
             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));
+                return MmError::err(UtxoTxDetailsError::TxAddressDeserializationError(msg));
             }
 
             let prev_value = prev_tx.outputs[index as usize].value;
@@ -506,13 +468,16 @@ impl BchCoin {
         &self,
         token_id: H256,
         storage: &T,
-    ) -> Result<SlpGenesisParams, MmError<GetTxDetailsError<T::Error>>> {
+    ) -> MmResult<SlpGenesisParams, UtxoTxDetailsError> {
         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)),
+            _ => {
+                let error = format!("SLP token ID '{}' is not a genesis TX", token_id);
+                MmError::err(UtxoTxDetailsError::InvalidTransaction(error))
+            },
         }
     }
 
@@ -521,7 +486,7 @@ impl BchCoin {
         utxo_tx: &UtxoTx,
         slp_tx: SlpTransaction,
         storage: &T,
-    ) -> Result<HashMap<usize, (CashAddress, BigDecimal)>, MmError<GetTxDetailsError<T::Error>>> {
+    ) -> MmResult<HashMap<usize, (CashAddress, BigDecimal)>, UtxoTxDetailsError> {
         let slp_amounts = match slp_tx {
             SlpTransaction::Send { token_id, amounts } => {
                 let genesis_params = self.get_slp_genesis_params(token_id, storage).await?;
@@ -554,22 +519,29 @@ impl BchCoin {
                 Some(output) => {
                     let addresses = self
                         .addresses_from_script(&output.script_pubkey.clone().into())
-                        .map_to_mm(GetTxDetailsError::AddressesFromScriptError)?;
+                        .map_to_mm(UtxoTxDetailsError::TxAddressDeserializationError)?;
                     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));
+                        return MmError::err(UtxoTxDetailsError::TxAddressDeserializationError(msg));
                     }
 
                     let slp_address = self
                         .slp_address(&addresses[0])
-                        .map_to_mm(GetTxDetailsError::ToSlpAddressError)?;
+                        .map_to_mm(UtxoTxDetailsError::InvalidTransaction)?;
                     result.insert(output_index, (slp_address, amount));
                 },
-                None => return MmError::err(GetTxDetailsError::InvalidSlpTransaction(utxo_tx.hash().reversed())),
+                None => {
+                    let error = format!(
+                        "Unexpected '{}' output index at {} TX",
+                        output_index,
+                        utxo_tx.hash().reversed()
+                    );
+                    return MmError::err(UtxoTxDetailsError::InvalidTransaction(error));
+                },
             }
         }
         Ok(result)
@@ -582,20 +554,21 @@ impl BchCoin {
         height_and_time: Option<BlockHeightAndTime>,
         tx_fee: Option<TxFeeDetails>,
         storage: &Storage,
-    ) -> Result<TransactionDetails, MmError<GetTxDetailsError<Storage::Error>>> {
+        my_addresses: &HashSet<Address>,
+    ) -> MmResult<TransactionDetails, UtxoTxDetailsError> {
         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 slp_addresses: Vec<_> = my_addresses
+            .iter()
+            .map(|addr| self.slp_address(addr))
+            .collect::<Result<_, _>>()
+            .map_to_mm(UtxoTxDetailsError::Internal)?;
 
         let mut slp_tx_details_builder =
-            TxDetailsBuilder::new(self.ticker().to_owned(), tx, height_and_time, addresses);
+            TxDetailsBuilder::new(self.ticker().to_owned(), tx, height_and_time, slp_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);
@@ -622,7 +595,7 @@ impl BchCoin {
         Ok(slp_tx_details_builder.build())
     }
 
-    pub async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>> {
+    pub async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<GetBlockHeaderError>> {
         self.as_ref().rpc_client.get_block_timestamp(height).await
     }
 }
@@ -631,13 +604,13 @@ impl AsRef<UtxoCoinFields> for BchCoin {
     fn as_ref(&self) -> &UtxoCoinFields { &self.utxo_arc }
 }
 
-pub async fn bch_coin_from_conf_and_params(
+pub async fn bch_coin_with_policy(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
     params: BchActivationRequest,
     slp_addr_prefix: CashAddrPrefix,
-    priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> 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());
@@ -654,7 +627,6 @@ pub async fn bch_coin_from_conf_and_params(
         }
     };
 
-    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()
@@ -663,6 +635,18 @@ pub async fn bch_coin_from_conf_and_params(
     Ok(coin)
 }
 
+pub async fn bch_coin_with_priv_key(
+    ctx: &MmArc,
+    ticker: &str,
+    conf: &Json,
+    params: BchActivationRequest,
+    slp_addr_prefix: CashAddrPrefix,
+    priv_key: IguanaPrivKey,
+) -> Result<BchCoin, String> {
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    bch_coin_with_policy(ctx, ticker, conf, params, slp_addr_prefix, priv_key_policy).await
+}
+
 #[derive(Debug)]
 pub enum BchActivationError {
     CoinInitError(String),
@@ -746,8 +730,8 @@ impl GetUtxoListOps for BchCoin {
 #[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
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size, stage).await
     }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
@@ -760,7 +744,7 @@ impl UtxoCommonOps for BchCoin {
         utxo_common::my_public_key(self.as_ref())
     }
 
-    fn address_from_str(&self, address: &str) -> Result<Address, String> {
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
         utxo_common::checked_address_from_str(self, address)
     }
 
@@ -845,134 +829,93 @@ impl UtxoCommonOps for BchCoin {
 
 #[async_trait]
 impl SwapOps for BchCoin {
+    #[inline]
     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 {
+    #[inline]
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_payment(
             self.clone(),
-            time_lock,
-            taker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            maker_payment_args.time_lock,
+            maker_payment_args.other_pubkey,
+            maker_payment_args.secret_hash,
+            maker_payment_args.amount,
+            maker_payment_args.secret_hash,
         )
     }
 
-    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 {
+    #[inline]
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_payment(
             self.clone(),
-            time_lock,
-            maker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            taker_payment_args.time_lock,
+            taker_payment_args.other_pubkey,
+            taker_payment_args.secret_hash,
+            taker_payment_args.amount,
+            taker_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_maker_spends_taker_payment(
             self.clone(),
-            taker_payment_tx,
-            time_lock,
-            taker_pub,
-            secret,
-            swap_unique_data,
+            maker_spends_payment_args.other_payment_tx,
+            maker_spends_payment_args.time_lock,
+            maker_spends_payment_args.other_pubkey,
+            maker_spends_payment_args.secret,
+            maker_spends_payment_args.secret_hash,
+            maker_spends_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_taker_spends_maker_payment(
             self.clone(),
-            maker_payment_tx,
-            time_lock,
-            maker_pub,
-            secret,
-            swap_unique_data,
+            taker_spends_payment_args.other_payment_tx,
+            taker_spends_payment_args.time_lock,
+            taker_spends_payment_args.other_pubkey,
+            taker_spends_payment_args.secret,
+            taker_spends_payment_args.secret_hash,
+            taker_spends_payment_args.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 {
+    #[inline]
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_refunds_payment(
             self.clone(),
-            taker_tx,
-            time_lock,
-            maker_pub,
-            secret_hash,
-            swap_unique_data,
+            taker_refunds_payment_args.payment_tx,
+            taker_refunds_payment_args.time_lock,
+            taker_refunds_payment_args.other_pubkey,
+            taker_refunds_payment_args.secret_hash,
+            taker_refunds_payment_args.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 {
+    #[inline]
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_refunds_payment(
             self.clone(),
-            maker_tx,
-            time_lock,
-            taker_pub,
-            secret_hash,
-            swap_unique_data,
+            maker_refunds_payment_args.payment_tx,
+            maker_refunds_payment_args.time_lock,
+            maker_refunds_payment_args.other_pubkey,
+            maker_refunds_payment_args.secret_hash,
+            maker_refunds_payment_args.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 {
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match validate_fee_args.fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
             _ => panic!(),
         };
@@ -980,33 +923,38 @@ impl SwapOps for BchCoin {
             self.clone(),
             tx,
             utxo_common::DEFAULT_FEE_VOUT,
-            expected_sender,
-            amount,
-            min_block_number,
-            fee_addr,
+            validate_fee_args.expected_sender,
+            validate_fee_args.amount,
+            validate_fee_args.min_block_number,
+            validate_fee_args.fee_addr,
         )
     }
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_taker_payment(self, input)
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> 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)
+        utxo_common::check_if_my_payment_sent(
+            self.clone(),
+            if_my_payment_sent_args.time_lock,
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.swap_unique_data,
+        )
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1014,6 +962,7 @@ impl SwapOps for BchCoin {
         utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_other(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1021,10 +970,25 @@ impl SwapOps for BchCoin {
         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> {
+    #[inline]
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        utxo_common::check_all_inputs_signed_by_pub(tx, expected_pub)
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         utxo_common::extract_secret(secret_hash, spend_tx)
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    #[inline]
     fn can_refund_htlc(&self, locktime: u64) -> Box<dyn Future<Item = CanRefundHtlc, Error = String> + Send + '_> {
         Box::new(
             utxo_common::can_refund_htlc(self, locktime)
@@ -1034,6 +998,7 @@ impl SwapOps for BchCoin {
         )
     }
 
+    #[inline]
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
@@ -1044,16 +1009,151 @@ impl SwapOps for BchCoin {
     fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
         utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
     }
+
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        utxo_common::derive_htlc_pubkey(self, swap_unique_data)
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn is_supported_by_watchers(&self) -> bool { true }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for BchCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for BchCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
 }
 
 fn total_unspent_value<'a>(unspents: impl IntoIterator<Item = &'a UnspentInfo>) -> u64 {
     unspents.into_iter().fold(0, |cur, unspent| cur + unspent.value)
 }
 
+#[async_trait]
+impl WatcherOps for BchCoin {
+    #[inline]
+    fn create_maker_payment_spend_preimage(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::create_maker_payment_spend_preimage(
+            self,
+            maker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn send_maker_payment_spend_preimage(&self, input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        utxo_common::send_maker_payment_spend_preimage(self, input)
+    }
+
+    #[inline]
+    fn create_taker_payment_refund_preimage(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::create_taker_payment_refund_preimage(
+            self,
+            taker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn send_taker_payment_refund_preimage(
+        &self,
+        watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        utxo_common::send_taker_payment_refund_preimage(self, watcher_refunds_payment_args)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_fee(self, input, utxo_common::DEFAULT_FEE_VOUT)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_payment(&self, input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_payment(self, input)
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::watcher_search_for_swap_tx_spend(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
+    }
+}
+
 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 my_address(&self) -> MmResult<String, MyAddressError> { utxo_common::my_address(self) }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
         let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
@@ -1075,7 +1175,7 @@ impl MarketCoinOps for BchCoin {
     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 my_address = coin.as_ref().derivation_method.single_addr_or_err()?;
             let bch_unspents = coin.bch_unspents_for_display(my_address).await?;
             Ok(bch_unspents.platform_balance(coin.as_ref().decimals))
         };
@@ -1114,12 +1214,14 @@ impl MarketCoinOps for BchCoin {
         )
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
             &self.utxo_arc,
@@ -1127,10 +1229,11 @@ impl MarketCoinOps for BchCoin {
             utxo_common::DEFAULT_SWAP_VOUT,
             from_block,
             wait_until,
+            check_every,
         )
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
         utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
     }
 
@@ -1145,37 +1248,24 @@ impl MarketCoinOps for BchCoin {
     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 spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.as_ref().abortable_system) }
+
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
         Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_tx_hex_by_hash(&self.utxo_arc, tx_hash)
+                .boxed()
+                .compat(),
+        )
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
     }
@@ -1188,13 +1278,9 @@ impl MmCoin for BchCoin {
 
     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 process_history_loop(&self, _ctx: MmArc) -> Box<dyn Future<Item = (), Error = ()> + Send> {
+        warn!("'process_history_loop' is not implemented for BchCoin! Consider using 'my_tx_history_v2'");
+        Box::new(futures01::future::err(()))
     }
 
     fn history_sync_status(&self) -> HistorySyncState { utxo_common::history_sync_status(&self.utxo_arc) }
@@ -1211,7 +1297,7 @@ impl MmCoin for BchCoin {
         utxo_common::get_sender_trade_fee(self, value, stage).await
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
@@ -1237,6 +1323,8 @@ impl MmCoin for BchCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::swap_contract_address() }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
+
     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) }
@@ -1244,21 +1332,108 @@ impl MmCoin for BchCoin {
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
         utxo_common::is_coin_protocol_supported(self, info)
     }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.as_ref().abortable_system) }
+
+    fn on_token_deactivated(&self, ticker: &str) {
+        if let Ok(tokens) = self.slp_tokens_infos.lock().as_deref_mut() {
+            tokens.remove(ticker);
+        };
+    }
 }
 
+impl CoinWithDerivationMethod for BchCoin {
+    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 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() }
+    /// TODO consider using `utxo_common::utxo_tx_history_common::get_tx_history_filters`
+    /// when `BchCoin` implements `CoinWithDerivationMethod`.
+    async fn get_tx_history_filters(
+        &self,
+        target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        match target {
+            MyTxHistoryTarget::Iguana => (),
+            target => {
+                let error = format!("Expected 'Iguana' target, found {target:?}");
+                return MmError::err(MyTxHistoryErrorV2::InvalidTarget(error));
+            },
+        }
+        let my_address = self.my_address()?;
+        Ok(GetTxHistoryFilters::for_address(my_address))
+    }
+}
+
+#[async_trait]
+impl UtxoTxHistoryOps for BchCoin {
+    async fn my_addresses(&self) -> MmResult<HashSet<Address>, UtxoMyAddressesHistoryError> {
+        let my_address = self.as_ref().derivation_method.single_addr_or_err()?;
+        Ok(std::iter::once(my_address.clone()).collect())
+    }
+
+    async fn tx_details_by_hash<Storage>(
+        &self,
+        params: UtxoTxDetailsParams<'_, Storage>,
+    ) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError>
+    where
+        Storage: TxHistoryStorage,
+    {
+        Ok(self.transaction_details_with_token_transfers(params).await?)
+    }
+
+    async fn tx_from_storage_or_rpc<Storage: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        storage: &Storage,
+    ) -> MmResult<UtxoTx, UtxoTxDetailsError> {
+        utxo_common::utxo_tx_history_v2_common::tx_from_storage_or_rpc(self, tx_hash, storage).await
+    }
+
+    async fn request_tx_history(
+        &self,
+        metrics: MetricsArc,
+        for_addresses: &HashSet<Address>,
+    ) -> RequestTxHistoryResult {
+        utxo_common::utxo_tx_history_v2_common::request_tx_history(self, metrics, for_addresses).await
+    }
+
+    async fn get_block_timestamp(&self, height: u64) -> MmResult<u64, GetBlockHeaderError> {
+        self.get_block_timestamp(height).await
+    }
+
+    async fn my_addresses_balances(&self) -> BalanceResult<HashMap<String, BigDecimal>> {
+        let my_address = self
+            .my_address()
+            .map_err(|err| BalanceError::Internal(err.to_string()))?;
+        let my_balance = self.my_balance().compat().await?;
+        Ok(std::iter::once((my_address, my_balance.into_total())).collect())
+    }
+
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
+        utxo_common::checked_address_from_str(self, address)
+    }
+
+    fn set_history_sync_state(&self, new_state: HistorySyncState) {
+        *self.as_ref().history_sync_state.lock().unwrap() = new_state;
+    }
 }
 
 // testnet
 #[cfg(test)]
-pub fn tbch_coin_for_test() -> BchCoin {
+pub fn tbch_coin_for_test() -> (MmArc, BchCoin) {
     use common::block_on;
     use crypto::privkey::key_pair_from_seed;
     use mm2_core::mm_ctx::MmCtxBuilder;
+    use mm2_test_helpers::for_tests::BCHD_TESTNET_URLS;
 
     let ctx = MmCtxBuilder::default().into_mm_arc();
     let keypair = key_pair_from_seed("BCH SLP test").unwrap();
@@ -1269,20 +1444,21 @@ pub fn tbch_coin_for_test() -> BchCoin {
         "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"],
+        "bchd_urls": BCHD_TESTNET_URLS,
         "allow_slp_unsafe_conf": false,
     });
 
     let params = BchActivationRequest::from_legacy_req(&req).unwrap();
-    block_on(bch_coin_from_conf_and_params(
+    let coin = block_on(bch_coin_with_priv_key(
         &ctx,
         "BCH",
         &conf,
         params,
         CashAddrPrefix::SlpTest,
-        &*keypair.private().secret,
+        keypair.private().secret,
     ))
-    .unwrap()
+    .unwrap();
+    (ctx, coin)
 }
 
 // mainnet
@@ -1306,13 +1482,13 @@ pub fn bch_coin_for_test() -> BchCoin {
     });
 
     let params = BchActivationRequest::from_legacy_req(&req).unwrap();
-    block_on(bch_coin_from_conf_and_params(
+    block_on(bch_coin_with_priv_key(
         &ctx,
         "BCH",
         &conf,
         params,
         CashAddrPrefix::SimpleLedger,
-        &*keypair.private().secret,
+        keypair.private().secret,
     ))
     .unwrap()
 }
@@ -1320,21 +1496,13 @@ pub fn bch_coin_for_test() -> BchCoin {
 #[cfg(test)]
 mod bch_tests {
     use super::*;
-    use crate::tx_history_storage::TxHistoryStorageBuilder;
+    use crate::my_tx_history_v2::for_tests::init_storage_for;
     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 (_ctx, coin) = tbch_coin_for_test();
         let token_id = "bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7".into();
         let (_ctx, storage) = init_storage_for(&coin);
 
@@ -1345,13 +1513,14 @@ mod bch_tests {
 
     #[test]
     fn test_plain_bch_tx_details() {
-        let coin = tbch_coin_for_test();
+        let (_ctx, 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 my_addresses = block_on(coin.my_addresses()).unwrap();
+        let details = block_on(coin.bch_tx_details(&hash, &tx, None, &storage, &my_addresses)).unwrap();
         let expected_total: BigDecimal = "0.11407782".parse().unwrap();
         assert_eq!(expected_total, details.total_amount);
 
@@ -1387,7 +1556,7 @@ mod bch_tests {
 
     #[test]
     fn test_slp_tx_details() {
-        let coin = tbch_coin_for_test();
+        let (_ctx, coin) = tbch_coin_for_test();
         let (_ctx, storage) = init_storage_for(&coin);
 
         let hash = "a8dcc3c6776e93e7bd21fb81551e853447c55e2d8ac141b418583bc8095ce390".into();
@@ -1395,7 +1564,9 @@ mod bch_tests {
 
         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 my_addresses = block_on(coin.my_addresses()).unwrap();
+        let slp_tx_details =
+            block_on(coin.slp_tx_details(&tx, slp_details.transaction, None, None, &storage, &my_addresses)).unwrap();
 
         let expected_total: BigDecimal = "6.2974".parse().unwrap();
         assert_eq!(expected_total, slp_tx_details.total_amount);
@@ -1427,7 +1598,7 @@ mod bch_tests {
 
     #[test]
     fn test_sign_message() {
-        let coin = tbch_coin_for_test();
+        let (_ctx, coin) = tbch_coin_for_test();
         let signature = coin.sign_message("test").unwrap();
         assert_eq!(
             signature,
@@ -1438,7 +1609,7 @@ mod bch_tests {
     #[test]
     #[cfg(not(target_arch = "wasm32"))]
     fn test_verify_message() {
-        let coin = tbch_coin_for_test();
+        let (_ctx, coin) = tbch_coin_for_test();
         let is_valid = coin
             .verify_message(
                 "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA=",
diff --git a/mm2src/coins/utxo/bch_and_slp_tx_history.rs b/mm2src/coins/utxo/bch_and_slp_tx_history.rs
deleted file mode 100644
index 5da1212e9d..0000000000
--- a/mm2src/coins/utxo/bch_and_slp_tx_history.rs
+++ /dev/null
@@ -1,406 +0,0 @@
-/// 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
index f0a632cef6..70e3594bb9 100644
--- a/mm2src/coins/utxo/bchd_grpc.rs
+++ b/mm2src/coins/utxo/bchd_grpc.rs
@@ -1,7 +1,7 @@
 /// https://bchd.cash/
 /// https://bchd.fountainhead.cash/
 use super::bchd_pb::*;
-use crate::utxo::slp::SlpUnspent;
+use crate::{coin_errors::ValidatePaymentError, utxo::slp::SlpUnspent};
 use chain::OutPoint;
 use derive_more::Display;
 use futures::future::join_all;
@@ -70,6 +70,7 @@ pub enum ValidateSlpUtxosErrKind {
     UnexpectedUtxoInResponse {
         outpoint: OutPoint,
     },
+    InvalidSlpTxData(String),
 }
 
 #[derive(Debug, Display)]
@@ -79,11 +80,29 @@ pub struct ValidateSlpUtxosErr {
     kind: ValidateSlpUtxosErrKind,
 }
 
+impl From<ValidateSlpUtxosErr> for ValidatePaymentError {
+    fn from(err: ValidateSlpUtxosErr) -> Self {
+        match err.kind {
+            ValidateSlpUtxosErrKind::MultiReqErr(_) => Self::Transport(err.to_string()),
+            ValidateSlpUtxosErrKind::InvalidSlpTxData(_) => Self::WrongPaymentTx(err.to_string()),
+            _ => Self::InvalidRpcResponse(err.to_string()),
+        }
+    }
+}
+
 impl From<GrpcWebMultiUrlReqErr> for ValidateSlpUtxosErr {
     fn from(err: GrpcWebMultiUrlReqErr) -> Self {
-        ValidateSlpUtxosErr {
-            to_url: err.to_url.clone(),
-            kind: ValidateSlpUtxosErrKind::MultiReqErr(err),
+        match err.err {
+            // For some reason, BCHD responds with empty payload (Which is mapped to PostGrpcWebErr::PayloadTooShort error) in cases where an invalid UTXO is used with grpc-web.
+            // while it does provide meaningful error response when use with gRPC HTTP2 TLS.
+            PostGrpcWebErr::PayloadTooShort(e) => ValidateSlpUtxosErr {
+                to_url: err.to_url.clone(),
+                kind: ValidateSlpUtxosErrKind::InvalidSlpTxData(e),
+            },
+            _ => ValidateSlpUtxosErr {
+                to_url: err.to_url.clone(),
+                kind: ValidateSlpUtxosErrKind::MultiReqErr(err),
+            },
         }
     }
 }
@@ -225,6 +244,7 @@ mod bchd_grpc_tests {
     use super::*;
     use crate::utxo::rpc_clients::UnspentInfo;
     use common::block_on;
+    use mm2_test_helpers::for_tests::BCHD_TESTNET_URLS;
 
     #[test]
     fn test_validate_slp_utxos_valid() {
@@ -255,9 +275,8 @@ mod bchd_grpc_tests {
             },
         ];
 
-        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();
+        block_on(validate_slp_utxos(BCHD_TESTNET_URLS, &slp_utxos, &token_id)).unwrap();
     }
 
     #[test]
@@ -300,11 +319,10 @@ mod bchd_grpc_tests {
             },
         ];
 
-        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();
+        let err = block_on(validate_slp_utxos(BCHD_TESTNET_URLS, &slp_utxos, &token_id)).unwrap_err();
         match err.into_inner().kind {
-            ValidateSlpUtxosErrKind::MultiReqErr { .. } => (),
+            ValidateSlpUtxosErrKind::InvalidSlpTxData(_) => (),
             err @ _ => panic!("Unexpected error {:?}", err),
         }
     }
@@ -336,9 +354,8 @@ mod bchd_grpc_tests {
             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();
+        let err = block_on(validate_slp_utxos(BCHD_TESTNET_URLS, &slp_utxos, &token_id)).unwrap_err();
         match err.into_inner().kind {
             ValidateSlpUtxosErrKind::UnexpectedValidityResultType {
                 for_unspent,
@@ -381,10 +398,9 @@ mod bchd_grpc_tests {
             },
         ];
 
-        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();
+        let err = block_on(validate_slp_utxos(BCHD_TESTNET_URLS, &slp_utxos, &invalid_token_id)).unwrap_err();
         match err.into_inner().kind {
             ValidateSlpUtxosErrKind::UnexpectedTokenId { expected, actual } => {
                 assert_eq!(invalid_token_id, expected);
@@ -396,18 +412,16 @@ mod bchd_grpc_tests {
 
     #[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();
+        block_on(check_slp_transaction(BCHD_TESTNET_URLS, 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();
+        let err = block_on(check_slp_transaction(BCHD_TESTNET_URLS, tx)).unwrap_err();
         match err.into_inner().kind {
             CheckSlpTransactionErrKind::InvalidTransaction { reason, .. } => {
                 println!("{}", reason);
@@ -420,15 +434,15 @@ mod bchd_grpc_tests {
 #[cfg(target_arch = "wasm32")]
 mod wasm_tests {
     use super::*;
+    use mm2_test_helpers::for_tests::BCHD_TESTNET_URLS;
     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();
+        check_slp_transaction(BCHD_TESTNET_URLS, tx).await.unwrap();
     }
 }
diff --git a/mm2src/coins/utxo/qtum.rs b/mm2src/coins/utxo/qtum.rs
index cd9ba229af..ab3f336ceb 100644
--- a/mm2src/coins/utxo/qtum.rs
+++ b/mm2src/coins/utxo/qtum.rs
@@ -1,29 +1,46 @@
 use super::*;
-use crate::coin_balance::{self, EnableCoinBalanceError, HDAccountBalance, HDAddressBalance, HDWalletBalance,
-                          HDWalletBalanceOps};
+use crate::coin_balance::{self, EnableCoinBalanceError, EnabledCoinBalanceParams, HDAccountBalance, HDAddressBalance,
+                          HDWalletBalance, HDWalletBalanceOps};
+use crate::coin_errors::MyAddressError;
+use crate::hd_confirm_address::HDConfirmAddress;
 use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
-use crate::hd_wallet::{self, AccountUpdatingError, AddressDerivingError, GetNewHDAddressParams,
-                       GetNewHDAddressResponse, HDAccountMut, HDWalletRpcError, HDWalletRpcOps,
-                       NewAccountCreatingError};
+use crate::hd_wallet::{AccountUpdatingError, AddressDerivingResult, HDAccountMut, NewAccountCreatingError,
+                       NewAddressDeriveConfirmError};
 use crate::hd_wallet_storage::HDWalletCoinWithStorageOps;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget, TxHistoryStorage};
 use crate::rpc_command::account_balance::{self, AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::get_new_address::{self, GetNewAddressParams, GetNewAddressResponse, GetNewAddressRpcError,
+                                          GetNewAddressRpcOps};
 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_account_balance::{self, InitAccountBalanceParams, InitAccountBalanceRpcOps};
+use crate::rpc_command::init_create_account::{self, CreateAccountRpcError, CreateAccountState, CreateNewAccountParams,
+                                              InitCreateAccountRpcOps};
 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 crypto::trezor::utxo::TrezorUtxoCoin;
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
+use crate::utxo::utxo_builder::{BlockHeaderUtxoArcOps, MergeUtxoArcOps, UtxoCoinBuildError, UtxoCoinBuilder,
+                                UtxoCoinBuilderCommonOps, UtxoFieldsWithGlobalHDBuilder,
+                                UtxoFieldsWithHardwareWalletBuilder, UtxoFieldsWithIguanaSecretBuilder};
+use crate::utxo::utxo_tx_history_v2::{UtxoMyAddressesHistoryError, UtxoTxDetailsError, UtxoTxDetailsParams,
+                                      UtxoTxHistoryOps};
+use crate::{eth, CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinBalance, CoinWithDerivationMethod, DelegationError,
+            DelegationFut, GetWithdrawSenderAddress, IguanaPrivKey, MakerSwapTakerCoin, NegotiateSwapContractAddrErr,
+            PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy, RefundError, RefundResult,
+            SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs,
+            SignatureResult, StakingInfosFut, SwapOps, TakerSwapMakerCoin, TradePreimageValue, TransactionFut,
+            TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs,
+            ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut,
+            ValidatePaymentInput, VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut, WithdrawSenderAddress};
+use common::executor::{AbortableSystem, AbortedError};
 use crypto::Bip44Chain;
 use ethereum_types::H160;
 use futures::{FutureExt, TryFutureExt};
 use keys::AddressHashEnum;
+use mm2_metrics::MetricsArc;
 use mm2_number::MmNumber;
 use serde::Serialize;
 use serialization::CoinVariant;
@@ -76,6 +93,7 @@ pub trait QtumDelegationOps {
 
     fn remove_delegation(&self) -> DelegationFut;
 
+    #[allow(clippy::result_large_err)]
     fn generate_pod(&self, addr_hash: AddressHashEnum) -> Result<keys::Signature, MmError<DelegationError>>;
 }
 
@@ -145,7 +163,7 @@ pub trait QtumBasedCoin: UtxoCommonOps + MarketCoinOps {
     }
 
     fn my_addr_as_contract_addr(&self) -> MmResult<H160, Qrc20AddressError> {
-        let my_address = self.as_ref().derivation_method.iguana_or_err()?.clone();
+        let my_address = self.as_ref().derivation_method.single_addr_or_err()?.clone();
         contract_addr_from_utxo_addr(my_address).mm_err(Qrc20AddressError::from)
     }
 
@@ -187,7 +205,7 @@ pub struct QtumCoinBuilder<'a> {
     ticker: &'a str,
     conf: &'a Json,
     activation_params: &'a UtxoActivationParams,
-    priv_key_policy: PrivKeyBuildPolicy<'a>,
+    priv_key_policy: PrivKeyBuildPolicy,
 }
 
 #[async_trait]
@@ -203,7 +221,9 @@ impl<'a> UtxoCoinBuilderCommonOps for QtumCoinBuilder<'a> {
     fn check_utxo_maturity(&self) -> bool { self.activation_params().check_utxo_maturity.unwrap_or(true) }
 }
 
-impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for QtumCoinBuilder<'a> {}
+impl<'a> UtxoFieldsWithIguanaSecretBuilder for QtumCoinBuilder<'a> {}
+
+impl<'a> UtxoFieldsWithGlobalHDBuilder for QtumCoinBuilder<'a> {}
 
 impl<'a> UtxoFieldsWithHardwareWalletBuilder for QtumCoinBuilder<'a> {}
 
@@ -212,28 +232,28 @@ impl<'a> UtxoCoinBuilder for QtumCoinBuilder<'a> {
     type ResultCoin = QtumCoin;
     type Error = UtxoCoinBuildError;
 
-    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_> { self.priv_key_policy.clone() }
+    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)
+        self.spawn_merge_utxo_loop_if_required(&utxo_arc, QtumCoin::from);
+        Ok(QtumCoin::from(utxo_arc))
     }
 }
 
 impl<'a> MergeUtxoArcOps<QtumCoin> for QtumCoinBuilder<'a> {}
 
+impl<'a> BlockHeaderUtxoArcOps<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>,
+        priv_key_policy: PrivKeyBuildPolicy,
     ) -> Self {
         QtumCoinBuilder {
             ctx,
@@ -245,7 +265,7 @@ impl<'a> QtumCoinBuilder<'a> {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct QtumCoin {
     utxo_arc: UtxoArc,
 }
@@ -262,14 +282,13 @@ impl From<QtumCoin> for UtxoArc {
     fn from(coin: QtumCoin) -> Self { coin.utxo_arc }
 }
 
-pub async fn qtum_coin_with_priv_key(
+pub async fn qtum_coin_with_policy(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
     activation_params: &UtxoActivationParams,
-    priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> Result<QtumCoin, String> {
-    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
     let coin = try_s!(
         QtumCoinBuilder::new(ctx, ticker, conf, activation_params, priv_key_policy)
             .build()
@@ -278,6 +297,17 @@ pub async fn qtum_coin_with_priv_key(
     Ok(coin)
 }
 
+pub async fn qtum_coin_with_priv_key(
+    ctx: &MmArc,
+    ticker: &str,
+    conf: &Json,
+    activation_params: &UtxoActivationParams,
+    priv_key: IguanaPrivKey,
+) -> Result<QtumCoin, String> {
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    qtum_coin_with_policy(ctx, ticker, conf, activation_params, priv_key_policy).await
+}
+
 impl QtumBasedCoin for QtumCoin {}
 
 #[derive(Clone, Debug, Deserialize)]
@@ -371,8 +401,8 @@ impl GetUtxoMapOps for QtumCoin {
 #[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
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size, stage).await
     }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
@@ -385,7 +415,7 @@ impl UtxoCommonOps for QtumCoin {
         utxo_common::my_public_key(self.as_ref())
     }
 
-    fn address_from_str(&self, address: &str) -> Result<Address, String> {
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
         utxo_common::checked_address_from_str(self, address)
     }
 
@@ -496,134 +526,93 @@ impl UtxoStandardOps for QtumCoin {
 
 #[async_trait]
 impl SwapOps for QtumCoin {
+    #[inline]
     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 {
+    #[inline]
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_payment(
             self.clone(),
-            time_lock,
-            taker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            maker_payment_args.time_lock,
+            maker_payment_args.other_pubkey,
+            maker_payment_args.secret_hash,
+            maker_payment_args.amount,
+            maker_payment_args.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 {
+    #[inline]
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_payment(
             self.clone(),
-            time_lock,
-            maker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            taker_payment_args.time_lock,
+            taker_payment_args.other_pubkey,
+            taker_payment_args.secret_hash,
+            taker_payment_args.amount,
+            taker_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     fn send_maker_spends_taker_payment(
         &self,
-        taker_tx: &[u8],
-        time_lock: u32,
-        taker_pub: &[u8],
-        secret: &[u8],
-        _swap_contract_address: &Option<BytesJson>,
-        swap_unique_data: &[u8],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_maker_spends_taker_payment(
             self.clone(),
-            taker_tx,
-            time_lock,
-            taker_pub,
-            secret,
-            swap_unique_data,
+            maker_spends_payment_args.other_payment_tx,
+            maker_spends_payment_args.time_lock,
+            maker_spends_payment_args.other_pubkey,
+            maker_spends_payment_args.secret,
+            maker_spends_payment_args.secret_hash,
+            maker_spends_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     fn send_taker_spends_maker_payment(
         &self,
-        maker_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        secret: &[u8],
-        _swap_contract_address: &Option<BytesJson>,
-        swap_unique_data: &[u8],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_taker_spends_maker_payment(
             self.clone(),
-            maker_tx,
-            time_lock,
-            maker_pub,
-            secret,
-            swap_unique_data,
+            taker_spends_payment_args.other_payment_tx,
+            taker_spends_payment_args.time_lock,
+            taker_spends_payment_args.other_pubkey,
+            taker_spends_payment_args.secret,
+            taker_spends_payment_args.secret_hash,
+            taker_spends_payment_args.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 {
+    #[inline]
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_refunds_payment(
             self.clone(),
-            taker_tx,
-            time_lock,
-            maker_pub,
-            secret_hash,
-            swap_unique_data,
+            taker_refunds_payment_args.payment_tx,
+            taker_refunds_payment_args.time_lock,
+            taker_refunds_payment_args.other_pubkey,
+            taker_refunds_payment_args.secret_hash,
+            taker_refunds_payment_args.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 {
+    #[inline]
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_refunds_payment(
             self.clone(),
-            maker_tx,
-            time_lock,
-            taker_pub,
-            secret_hash,
-            swap_unique_data,
+            maker_refunds_payment_args.payment_tx,
+            maker_refunds_payment_args.time_lock,
+            maker_refunds_payment_args.other_pubkey,
+            maker_refunds_payment_args.secret_hash,
+            maker_refunds_payment_args.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 {
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match validate_fee_args.fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
             _ => panic!(),
         };
@@ -631,33 +620,38 @@ impl SwapOps for QtumCoin {
             self.clone(),
             tx,
             utxo_common::DEFAULT_FEE_VOUT,
-            expected_sender,
-            amount,
-            min_block_number,
-            fee_addr,
+            validate_fee_args.expected_sender,
+            validate_fee_args.amount,
+            validate_fee_args.min_block_number,
+            validate_fee_args.fee_addr,
         )
     }
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_taker_payment(self, input)
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> 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)
+        utxo_common::check_if_my_payment_sent(
+            self.clone(),
+            if_my_payment_sent_args.time_lock,
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.swap_unique_data,
+        )
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -665,6 +659,7 @@ impl SwapOps for QtumCoin {
         utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_other(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -672,10 +667,25 @@ impl SwapOps for QtumCoin {
         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> {
+    #[inline]
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        utxo_common::check_all_inputs_signed_by_pub(tx, expected_pub)
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         utxo_common::extract_secret(secret_hash, spend_tx)
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    #[inline]
     fn can_refund_htlc(&self, locktime: u64) -> Box<dyn Future<Item = CanRefundHtlc, Error = String> + Send + '_> {
         Box::new(
             utxo_common::can_refund_htlc(self, locktime)
@@ -685,6 +695,7 @@ impl SwapOps for QtumCoin {
         )
     }
 
+    #[inline]
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
@@ -695,12 +706,147 @@ impl SwapOps for QtumCoin {
     fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
         utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
     }
+
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        utxo_common::derive_htlc_pubkey(self, swap_unique_data)
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn is_supported_by_watchers(&self) -> bool { true }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for QtumCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for QtumCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for QtumCoin {
+    #[inline]
+    fn create_maker_payment_spend_preimage(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::create_maker_payment_spend_preimage(
+            self,
+            maker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn send_maker_payment_spend_preimage(&self, input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        utxo_common::send_maker_payment_spend_preimage(self, input)
+    }
+
+    #[inline]
+    fn create_taker_payment_refund_preimage(
+        &self,
+        taker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        _swap_contract_address: &Option<BytesJson>,
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::create_taker_payment_refund_preimage(
+            self,
+            taker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn send_taker_payment_refund_preimage(
+        &self,
+        watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        utxo_common::send_taker_payment_refund_preimage(self, watcher_refunds_payment_args)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_fee(self, input, utxo_common::DEFAULT_FEE_VOUT)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_payment(&self, input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_payment(self, input)
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::watcher_search_for_swap_tx_spend(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
+    }
 }
 
 impl MarketCoinOps for QtumCoin {
     fn ticker(&self) -> &str { &self.utxo_arc.conf.ticker }
 
-    fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { utxo_common::my_address(self) }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
         let pubkey = utxo_common::my_public_key(&self.utxo_arc)?;
@@ -753,12 +899,14 @@ impl MarketCoinOps for QtumCoin {
         )
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
             &self.utxo_arc,
@@ -766,10 +914,11 @@ impl MarketCoinOps for QtumCoin {
             utxo_common::DEFAULT_SWAP_VOUT,
             from_block,
             wait_until,
+            check_every,
         )
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
         utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
     }
 
@@ -788,10 +937,20 @@ impl MarketCoinOps for QtumCoin {
 impl MmCoin for QtumCoin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo_arc) }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.as_ref().abortable_system) }
+
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
         Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_tx_hex_by_hash(&self.utxo_arc, tx_hash)
+                .boxed()
+                .compat(),
+        )
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
     }
@@ -828,7 +987,7 @@ impl MmCoin for QtumCoin {
         utxo_common::get_sender_trade_fee(self, value, stage).await
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
@@ -854,6 +1013,8 @@ impl MmCoin for QtumCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::swap_contract_address() }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
+
     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) }
@@ -861,6 +1022,10 @@ impl MmCoin for QtumCoin {
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
         utxo_common::is_coin_protocol_supported(self, info)
     }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.as_ref().abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
 
 #[async_trait]
@@ -891,10 +1056,11 @@ impl InitWithdrawCoin for QtumCoin {
 impl UtxoSignerOps for QtumCoin {
     type TxGetter = UtxoRpcClientEnum;
 
-    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin> {
+    fn trezor_coin(&self) -> UtxoSignTxResult<String> {
         self.utxo_arc
             .conf
             .trezor_coin
+            .clone()
             .or_mm_err(|| UtxoSignTxError::CoinNotSupportedWithTrezor {
                 coin: self.utxo_arc.conf.ticker.clone(),
             })
@@ -926,7 +1092,7 @@ impl ExtractExtendedPubkey for QtumCoin {
         derivation_path: DerivationPath,
     ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         utxo_common::extract_extended_pubkey(&self.utxo_arc.conf, xpub_extractor, derivation_path).await
     }
@@ -939,13 +1105,28 @@ impl HDWalletCoinOps for QtumCoin {
     type HDWallet = UtxoHDWallet;
     type HDAccount = UtxoHDAccount;
 
-    fn derive_address(
+    async fn derive_addresses<Ids>(
         &self,
         hd_account: &Self::HDAccount,
+        address_ids: Ids,
+    ) -> AddressDerivingResult<Vec<HDAddress<Self::Address, Self::Pubkey>>>
+    where
+        Ids: Iterator<Item = HDAddressId> + Send,
+    {
+        utxo_common::derive_addresses(self, hd_account, address_ids).await
+    }
+
+    async fn generate_and_confirm_new_address<ConfirmAddress>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
         chain: Bip44Chain,
-        address_id: u32,
-    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError> {
-        utxo_common::derive_address(self, hd_account, chain, address_id)
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, NewAddressDeriveConfirmError>
+    where
+        ConfirmAddress: HDConfirmAddress,
+    {
+        utxo_common::generate_and_confirm_new_address(self, hd_wallet, hd_account, chain, confirm_address).await
     }
 
     async fn create_new_account<'a, XPubExtractor>(
@@ -954,7 +1135,7 @@ impl HDWalletCoinOps for QtumCoin {
         xpub_extractor: &XPubExtractor,
     ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         utxo_common::create_new_account(self, hd_wallet, xpub_extractor).await
     }
@@ -982,12 +1163,12 @@ impl HDWalletBalanceOps for QtumCoin {
         &self,
         hd_wallet: &Self::HDWallet,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
+        params: EnabledCoinBalanceParams,
     ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
-        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, scan_policy).await
+        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, params).await
     }
 
     async fn scan_for_new_addresses(
@@ -1023,12 +1204,23 @@ impl HDWalletCoinWithStorageOps for QtumCoin {
 }
 
 #[async_trait]
-impl HDWalletRpcOps for QtumCoin {
-    async fn get_new_address_rpc(
+impl GetNewAddressRpcOps for QtumCoin {
+    async fn get_new_address_rpc_without_conf(
         &self,
-        params: GetNewHDAddressParams,
-    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError> {
-        hd_wallet::common_impl::get_new_address_rpc(self, params).await
+        params: GetNewAddressParams,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError> {
+        get_new_address::common_impl::get_new_address_rpc_without_conf(self, params).await
+    }
+
+    async fn get_new_address_rpc<ConfirmAddress>(
+        &self,
+        params: GetNewAddressParams,
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+    where
+        ConfirmAddress: HDConfirmAddress,
+    {
+        get_new_address::common_impl::get_new_address_rpc(self, params, confirm_address).await
     }
 }
 
@@ -1042,6 +1234,16 @@ impl AccountBalanceRpcOps for QtumCoin {
     }
 }
 
+#[async_trait]
+impl InitAccountBalanceRpcOps for QtumCoin {
+    async fn init_account_balance_rpc(
+        &self,
+        params: InitAccountBalanceParams,
+    ) -> MmResult<HDAccountBalance, HDAccountBalanceRpcError> {
+        init_account_balance::common_impl::init_account_balance_rpc(self, params).await
+    }
+}
+
 #[async_trait]
 impl InitScanAddressesRpcOps for QtumCoin {
     async fn init_scan_for_new_addresses_rpc(
@@ -1053,16 +1255,82 @@ impl InitScanAddressesRpcOps for QtumCoin {
 }
 
 #[async_trait]
-impl InitCreateHDAccountRpcOps for QtumCoin {
+impl InitCreateAccountRpcOps for QtumCoin {
     async fn init_create_account_rpc<XPubExtractor>(
         &self,
         params: CreateNewAccountParams,
+        state: CreateAccountState,
         xpub_extractor: &XPubExtractor,
-    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    ) -> MmResult<HDAccountBalance, CreateAccountRpcError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
-        init_create_account::common_impl::init_create_new_account_rpc(self, params, xpub_extractor).await
+        init_create_account::common_impl::init_create_new_account_rpc(self, params, state, xpub_extractor).await
+    }
+
+    async fn revert_creating_account(&self, account_id: u32) {
+        init_create_account::common_impl::revert_creating_account(self, account_id).await
+    }
+}
+
+#[async_trait]
+impl CoinWithTxHistoryV2 for QtumCoin {
+    fn history_wallet_id(&self) -> WalletId { utxo_common::utxo_tx_history_v2_common::history_wallet_id(self.as_ref()) }
+
+    async fn get_tx_history_filters(
+        &self,
+        target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        utxo_common::utxo_tx_history_v2_common::get_tx_history_filters(self, target).await
+    }
+}
+
+#[async_trait]
+impl UtxoTxHistoryOps for QtumCoin {
+    async fn my_addresses(&self) -> MmResult<HashSet<Address>, UtxoMyAddressesHistoryError> {
+        utxo_common::utxo_tx_history_v2_common::my_addresses(self).await
+    }
+
+    async fn tx_details_by_hash<Storage>(
+        &self,
+        params: UtxoTxDetailsParams<'_, Storage>,
+    ) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError>
+    where
+        Storage: TxHistoryStorage,
+    {
+        utxo_common::utxo_tx_history_v2_common::tx_details_by_hash(self, params).await
+    }
+
+    async fn tx_from_storage_or_rpc<Storage: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        storage: &Storage,
+    ) -> MmResult<UtxoTx, UtxoTxDetailsError> {
+        utxo_common::utxo_tx_history_v2_common::tx_from_storage_or_rpc(self, tx_hash, storage).await
+    }
+
+    async fn request_tx_history(
+        &self,
+        metrics: MetricsArc,
+        for_addresses: &HashSet<Address>,
+    ) -> RequestTxHistoryResult {
+        utxo_common::utxo_tx_history_v2_common::request_tx_history(self, metrics, for_addresses).await
+    }
+
+    async fn get_block_timestamp(&self, height: u64) -> MmResult<u64, GetBlockHeaderError> {
+        self.as_ref().rpc_client.get_block_timestamp(height).await
+    }
+
+    async fn my_addresses_balances(&self) -> BalanceResult<HashMap<String, BigDecimal>> {
+        utxo_common::utxo_tx_history_v2_common::my_addresses_balances(self).await
+    }
+
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
+        utxo_common::checked_address_from_str(self, address)
+    }
+
+    fn set_history_sync_state(&self, new_state: HistorySyncState) {
+        *self.as_ref().history_sync_state.lock().unwrap() = new_state;
     }
 }
 
diff --git a/mm2src/coins/utxo/qtum_delegation.rs b/mm2src/coins/utxo/qtum_delegation.rs
index 4a532a3716..c7c172dbd2 100644
--- a/mm2src/coins/utxo/qtum_delegation.rs
+++ b/mm2src/coins/utxo/qtum_delegation.rs
@@ -6,7 +6,7 @@ use crate::utxo::qtum::{QtumBasedCoin, QtumCoin, QtumDelegationOps, QtumDelegati
 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::utxo::{PrivKeyPolicyNotAllowed, UTXO_LOCK};
 use crate::{DelegationError, DelegationFut, DelegationResult, MarketCoinOps, StakingInfos, StakingInfosError,
             StakingInfosFut, StakingInfosResult, TransactionDetails, TransactionType};
 use bitcrypto::dhash256;
@@ -78,8 +78,8 @@ 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 From<PrivKeyPolicyNotAllowed> for QtumStakingAbiError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { QtumStakingAbiError::Internal(e.to_string()) }
 }
 
 impl QtumDelegationOps for QtumCoin {
@@ -123,7 +123,7 @@ impl QtumCoin {
         }
         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)?;
+        let my_address = self.my_address()?;
         self.generate_delegation_transaction(
             outputs,
             my_address,
@@ -156,10 +156,7 @@ impl QtumCoin {
             .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 last_tx_add = some_or_return_ok_none!(add_delegation_history.last());
             let res = &client
                 .blockchain_transaction_get_receipt(&last_tx_add.tx_hash)
                 .compat()
@@ -201,7 +198,7 @@ impl QtumCoin {
 
     async fn get_delegation_infos_impl(&self) -> StakingInfosResult {
         let coin = self.as_ref();
-        let my_address = coin.derivation_method.iguana_or_err()?;
+        let my_address = coin.derivation_method.single_addr_or_err()?;
 
         let staker = self.am_i_currently_staking().await?;
         let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
@@ -252,7 +249,7 @@ impl QtumCoin {
         )?;
 
         let outputs = vec![delegation_output];
-        let my_address = self.my_address().map_to_mm(DelegationError::InternalError)?;
+        let my_address = self.my_address()?;
         self.generate_delegation_transaction(
             outputs,
             my_address,
@@ -272,7 +269,7 @@ impl QtumCoin {
         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 my_address = utxo.derivation_method.single_addr_or_err()?;
 
         let (unspents, _) = self.get_unspent_ordered_list(my_address).await?;
         let mut gas_fee = 0;
@@ -317,7 +314,7 @@ impl QtumCoin {
             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 my_address_string = self.my_address()?;
 
         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();
@@ -340,15 +337,20 @@ impl QtumCoin {
             internal_id: vec![].into(),
             kmd_rewards: None,
             transaction_type,
+            memo: None,
         })
     }
 
     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();
+        let script_pubkey = generate_contract_call_script_pubkey(
+            &params,
+            gas_limit,
+            gas_price,
+            QTUM_DELEGATE_CONTRACT_ADDRESS.as_bytes(),
+        )?
+        .to_bytes();
         Ok(ContractCallOutput {
             value: OUTPUT_QTUM_AMOUNT,
             script_pubkey,
@@ -357,6 +359,7 @@ impl QtumCoin {
         })
     }
 
+    #[allow(clippy::result_large_err)]
     fn add_delegation_output(
         &self,
         to_addr: H160,
@@ -373,9 +376,13 @@ impl QtumCoin {
             Token::Bytes(pod.into()),
         ])?;
 
-        let script_pubkey =
-            generate_contract_call_script_pubkey(&params, gas_limit, gas_price, &QTUM_DELEGATE_CONTRACT_ADDRESS)?
-                .to_bytes();
+        let script_pubkey = generate_contract_call_script_pubkey(
+            &params,
+            gas_limit,
+            gas_price,
+            QTUM_DELEGATE_CONTRACT_ADDRESS.as_bytes(),
+        )?
+        .to_bytes();
         Ok(ContractCallOutput {
             value: OUTPUT_QTUM_AMOUNT,
             script_pubkey,
diff --git a/mm2src/coins/utxo/rpc_clients.rs b/mm2src/coins/utxo/rpc_clients.rs
index dac1d3712f..2029702ee5 100644
--- a/mm2src/coins/utxo/rpc_clients.rs
+++ b/mm2src/coins/utxo/rpc_clients.rs
@@ -1,26 +1,29 @@
 #![cfg_attr(target_arch = "wasm32", allow(unused_macros))]
 #![cfg_attr(target_arch = "wasm32", allow(dead_code))]
 
-use crate::utxo::{output_script, sat_from_big_decimal};
+use crate::utxo::utxo_block_header_storage::BlockHeaderStorage;
+use crate::utxo::{output_script, sat_from_big_decimal, GetBlockHeaderError, GetConfirmedTxError, GetTxError,
+                  GetTxHeightError};
 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_futures::{select_ok_sequential, timeout::FutureTimerExt};
 use common::custom_iter::{CollectInto, TryIntoGroupMap};
-use common::executor::{spawn, Timer};
+use common::executor::{abortable_queue, abortable_queue::AbortableQueue, AbortableSystem, SpawnFuture, Timer};
 use common::jsonrpc_client::{JsonRpcBatchClient, JsonRpcBatchResponse, JsonRpcClient, JsonRpcError, JsonRpcErrorType,
                              JsonRpcId, JsonRpcMultiClient, JsonRpcRemoteAddr, JsonRpcRequest, JsonRpcRequestEnum,
                              JsonRpcResponse, JsonRpcResponseEnum, JsonRpcResponseFut, RpcRes};
+use common::log::LogOnError;
 use common::log::{error, info, warn};
 use common::{median, now_float, now_ms, OrdRange};
 use derive_more::Display;
 use futures::channel::oneshot as async_oneshot;
 use futures::compat::{Future01CompatExt, Stream01CompatExt};
-use futures::future::{select as select_func, FutureExt, TryFutureExt};
+use futures::future::{FutureExt, TryFutureExt};
 use futures::lock::Mutex as AsyncMutex;
 use futures::{select, StreamExt};
 use futures01::future::select_ok;
-use futures01::sync::{mpsc, oneshot};
+use futures01::sync::mpsc;
 use futures01::{Future, Sink, Stream};
 use http::Uri;
 use itertools::Itertools;
@@ -31,11 +34,14 @@ 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::{coin_variant_by_ticker, deserialize, serialize, serialize_with_flags, CoinVariant, CompactInteger,
-                    Reader, SERIALIZE_TRANSACTION_WITNESS};
+use serialization::{deserialize, serialize, serialize_with_flags, CoinVariant, CompactInteger, Reader,
+                    SERIALIZE_TRANSACTION_WITNESS};
 use sha2::{Digest, Sha256};
+use spv_validation::helpers_validation::SPVError;
+use spv_validation::storage::BlockHeaderStorageOps;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::convert::TryInto;
 use std::fmt;
 use std::io;
 use std::net::{SocketAddr, ToSocketAddrs};
@@ -63,11 +69,16 @@ cfg_native! {
     use webpki_roots::TLS_SERVER_ROOTS;
 }
 
+pub const NO_TX_ERROR_CODE: &str = "'code': -5";
+const RESPONSE_TOO_LARGE_CODE: i16 = -32600;
+const TX_NOT_FOUND_RETRIES: u8 = 10;
+
 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 ElectrumTxHistory = Vec<ElectrumTxHistoryItem>;
 type ElectrumScriptHash = String;
 type ScriptHashUnspents = Vec<ElectrumUnspent>;
 
@@ -139,6 +150,7 @@ impl UtxoRpcClientEnum {
         check_every: u64,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
         let selfi = self.clone();
+        let mut tx_not_found_retries = TX_NOT_FOUND_RETRIES;
         let fut = async move {
             loop {
                 if now_ms() / 1000 > wait_until {
@@ -167,11 +179,29 @@ impl UtxoRpcClientEnum {
                         }
                     },
                     Err(e) => {
+                        if e.get_inner().is_tx_not_found_error() {
+                            if tx_not_found_retries == 0 {
+                                return ERR!(
+                                    "Tx {} was not found on chain after {} tries, error: {}",
+                                    tx_hash,
+                                    TX_NOT_FOUND_RETRIES,
+                                    e,
+                                );
+                            }
+                            error!(
+                                "Tx {} not found on chain, error: {}, retrying in {} seconds. Retries left: {}",
+                                tx_hash, e, check_every, tx_not_found_retries
+                            );
+                            tx_not_found_retries -= 1;
+                            Timer::sleep(check_every as f64).await;
+                            continue;
+                        };
+
                         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);
+                                    error!("Error {} getting block number, retrying in {} seconds", e, check_every);
                                     Timer::sleep(check_every as f64).await;
                                     continue;
                                 },
@@ -182,8 +212,8 @@ impl UtxoRpcClientEnum {
                             }
                         }
                         error!(
-                            "Error {:?} getting the transaction {:?}, retrying in 10 seconds",
-                            e, tx_hash
+                            "Error {:?} getting the transaction {:?}, retrying in {} seconds",
+                            e, tx_hash, check_every
                         )
                     },
                 }
@@ -258,7 +288,9 @@ pub enum UtxoRpcError {
 impl From<JsonRpcError> for UtxoRpcError {
     fn from(e: JsonRpcError) -> Self {
         match e.error {
-            JsonRpcErrorType::InvalidRequest(_) => UtxoRpcError::Internal(e.to_string()),
+            JsonRpcErrorType::InvalidRequest(_) | JsonRpcErrorType::Internal(_) => {
+                UtxoRpcError::Internal(e.to_string())
+            },
             JsonRpcErrorType::Transport(_) => UtxoRpcError::Transport(e),
             JsonRpcErrorType::Parse(_, _) | JsonRpcErrorType::Response(_, _) => UtxoRpcError::ResponseParseError(e),
         }
@@ -273,6 +305,30 @@ impl From<NumConversError> for UtxoRpcError {
     fn from(e: NumConversError) -> Self { UtxoRpcError::Internal(e.to_string()) }
 }
 
+impl UtxoRpcError {
+    pub fn is_tx_not_found_error(&self) -> bool {
+        if let UtxoRpcError::ResponseParseError(ref json_err) = self {
+            if let JsonRpcErrorType::Response(_, json) = &json_err.error {
+                return json["error"]["code"] == -5 // native compatible
+                    || json["message"].as_str().unwrap_or_default().contains(NO_TX_ERROR_CODE);
+                // electrum compatible;
+            }
+        };
+        false
+    }
+
+    pub fn is_response_too_large(&self) -> bool {
+        if let UtxoRpcError::ResponseParseError(ref json_err) = self {
+            if let JsonRpcErrorType::Response(_, json) = &json_err.error {
+                return json["code"] == RESPONSE_TOO_LARGE_CODE;
+            }
+        };
+        false
+    }
+
+    pub fn is_network_error(&self) -> bool { matches!(self, UtxoRpcError::Transport(_)) }
+}
+
 /// Common operations that both types of UTXO clients have but implement them differently
 #[async_trait]
 pub trait UtxoRpcClientOps: fmt::Debug + Send + Sync + 'static {
@@ -337,7 +393,25 @@ pub trait UtxoRpcClientOps: fmt::Debug + Send + Sync + 'static {
     ) -> 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>>;
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<GetBlockHeaderError>>;
+
+    /// Returns verbose transaction by the given `txid` if it's on-chain or None if it's not.
+    async fn get_tx_if_onchain(&self, tx_hash: &H256Json) -> Result<Option<UtxoTx>, MmError<GetTxError>> {
+        match self
+            .get_transaction_bytes(tx_hash)
+            .compat()
+            .await
+            .map_err(|e| e.into_inner())
+        {
+            Ok(bytes) => Ok(Some(deserialize(bytes.as_slice())?)),
+            Err(err) => {
+                if err.is_tx_not_found_error() {
+                    return Ok(None);
+                }
+                Err(err.into())
+            },
+        }
+    }
 }
 
 #[derive(Clone, Deserialize, Debug)]
@@ -483,14 +557,14 @@ pub enum EstimateFeeMethod {
     SmartFee,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
 pub enum BlockNonce {
     String(String),
     U64(u64),
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct VerboseBlock {
     /// Block hash
     pub hash: H256Json,
@@ -578,7 +652,7 @@ impl Default for NativeClientImpl {
 pub struct NativeClient(pub Arc<NativeClientImpl>);
 impl Deref for NativeClient {
     type Target = NativeClientImpl;
-    fn deref(&self) -> &NativeClientImpl { &*self.0 }
+    fn deref(&self) -> &NativeClientImpl { &self.0 }
 }
 
 /// The trait provides methods to generate the JsonRpcClient instance info such as name of coin.
@@ -603,8 +677,8 @@ impl JsonRpcClient for NativeClientImpl {
 
     #[cfg(target_arch = "wasm32")]
     fn transport(&self, _request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
-        Box::new(futures01::future::err(ERRL!(
-            "'NativeClientImpl' must be used in native mode only"
+        Box::new(futures01::future::err(JsonRpcErrorType::Internal(
+            "'NativeClientImpl' must be used in native mode only".to_string(),
         )))
     }
 
@@ -612,37 +686,37 @@ impl JsonRpcClient for NativeClientImpl {
     fn transport(&self, request: JsonRpcRequestEnum) -> JsonRpcResponseFut {
         use mm2_net::transport::slurp_req;
 
-        let request_body = try_fus!(json::to_string(&request));
+        let request_body =
+            try_f!(json::to_string(&request).map_err(|e| JsonRpcErrorType::InvalidRequest(e.to_string())));
         // 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());
 
         let uri = self.uri.clone();
 
-        let http_request = try_fus!(Request::builder()
+        let http_request = try_f!(Request::builder()
             .method("POST")
             .header(AUTHORIZATION, self.auth.clone())
             .uri(uri.clone())
-            .body(Vec::from(request_body)));
+            .body(Vec::from(request_body))
+            .map_err(|e| JsonRpcErrorType::InvalidRequest(e.to_string())));
 
         let event_handles = self.event_handlers.clone();
         Box::new(slurp_req(http_request).boxed().compat().then(
-            move |result| -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
-                let res = try_s!(result);
+            move |result| -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), JsonRpcErrorType> {
+                let res = result.map_err(|e| e.into_inner())?;
                 // 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);
 
-                let body = try_s!(std::str::from_utf8(&res.2));
+                let body =
+                    std::str::from_utf8(&res.2).map_err(|e| JsonRpcErrorType::parse_error(&uri, e.to_string()))?;
 
                 if res.0 != StatusCode::OK {
-                    return ERR!(
-                        "Rpc request {:?} failed with HTTP status code {}, response body: {}",
-                        request,
-                        res.0,
-                        body
-                    );
+                    let res_value = serde_json::from_slice(&res.2)
+                        .map_err(|e| JsonRpcErrorType::parse_error(&uri, e.to_string()))?;
+                    return Err(JsonRpcErrorType::Response(uri.into(), res_value));
                 }
 
-                let response = try_s!(json::from_str(body));
+                let response = json::from_str(body).map_err(|e| JsonRpcErrorType::parse_error(&uri, e.to_string()))?;
                 Ok((uri.into(), response))
             },
         ))
@@ -873,7 +947,7 @@ impl UtxoRpcClientOps for NativeClient {
         Box::new(fut.boxed().compat())
     }
 
-    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<UtxoRpcError>> {
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<GetBlockHeaderError>> {
         let block = self.get_block_by_height(height).await?;
         Ok(block.time as u64)
     }
@@ -1096,7 +1170,7 @@ impl NativeClientImpl {
 
     /// https://developer.bitcoin.org/reference/rpc/getblockheader.html
     pub fn get_block_header_bytes(&self, block_hash: H256Json) -> RpcRes<BytesJson> {
-        let verbose = 0;
+        let verbose = false;
         rpc_func!(self, "getblockheader", block_hash, verbose)
     }
 }
@@ -1228,6 +1302,14 @@ pub struct TxMerkleBranch {
     pub pos: usize,
 }
 
+#[derive(Clone)]
+pub struct ConfirmedTransactionInfo {
+    pub tx: UtxoTx,
+    pub header: BlockHeader,
+    pub index: u64,
+    pub height: u64,
+}
+
 #[derive(Debug, PartialEq)]
 pub struct BestBlock {
     pub height: u64,
@@ -1373,10 +1455,12 @@ fn addr_to_socket_addr(input: &str) -> Result<SocketAddr, String> {
 }
 
 /// Attempts to process the request (parse url, etc), build up the config and create new electrum connection
+/// The function takes `abortable_system` that will be used to spawn Electrum's related futures.
 #[cfg(not(target_arch = "wasm32"))]
 pub fn spawn_electrum(
     req: &ElectrumRpcRequest,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
+    abortable_system: AbortableQueue,
 ) -> Result<ElectrumConnection, String> {
     let config = match req.protocol {
         ElectrumProtocol::TCP => ElectrumConfig::TCP,
@@ -1399,14 +1483,21 @@ pub fn spawn_electrum(
         },
     };
 
-    Ok(electrum_connect(req.url.clone(), config, event_handlers))
+    Ok(electrum_connect(
+        req.url.clone(),
+        config,
+        event_handlers,
+        abortable_system,
+    ))
 }
 
 /// Attempts to process the request (parse url, etc), build up the config and create new electrum connection
+/// The function takes `abortable_system` that will be used to spawn Electrum's related futures.
 #[cfg(target_arch = "wasm32")]
 pub fn spawn_electrum(
     req: &ElectrumRpcRequest,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
+    abortable_system: AbortableQueue,
 ) -> Result<ElectrumConnection, String> {
     let mut url = req.url.clone();
     let uri: Uri = try_s!(req.url.parse());
@@ -1434,10 +1525,9 @@ pub fn spawn_electrum(
         },
     };
 
-    Ok(electrum_connect(url, config, event_handlers))
+    Ok(electrum_connect(url, config, event_handlers, abortable_system))
 }
 
-#[derive(Debug)]
 /// Represents the active Electrum connection to selected address
 pub struct ElectrumConnection {
     /// The client connected to this SocketAddr
@@ -1447,28 +1537,25 @@ pub struct ElectrumConnection {
     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: JsonRpcPendingRequestsShared,
     /// Selected protocol version. The value is initialized after the server.version RPC call.
     protocol_version: AsyncMutex<Option<f32>>,
+    /// This spawner is used to spawn Electrum's related futures that should be aborted on coin deactivation.
+    /// and on [`MmArc::stop`].
+    /// This field is not used directly, but it holds all abort handles of futures spawned at `electrum_connect`.
+    ///
+    /// Please also note that this abortable system is a subsystem of [`ElectrumClientImpl::abortable_system`].
+    /// For more info see [`ElectrumClientImpl::add_server`].
+    _abortable_system: AbortableQueue,
 }
 
 impl ElectrumConnection {
     async fn is_connected(&self) -> bool { self.tx.lock().await.is_some() }
 
     async fn set_protocol_version(&self, version: f32) { self.protocol_version.lock().await.replace(version); }
-}
 
-impl Drop for ElectrumConnection {
-    fn drop(&mut self) {
-        if let Some(shutdown_tx) = self.shutdown_tx.take() {
-            if shutdown_tx.send(()).is_err() {
-                warn!("electrum_connection_drop] Warning, shutdown_tx already closed");
-            }
-        }
-    }
+    async fn reset_protocol_version(&self) { *self.protocol_version.lock().await = None; }
 }
 
 #[derive(Debug)]
@@ -1539,52 +1626,61 @@ pub struct ElectrumClientImpl {
     protocol_version: OrdRange<f32>,
     get_balance_concurrent_map: ConcurrentRequestMap<String, ElectrumBalance>,
     list_unspent_concurrent_map: ConcurrentRequestMap<String, Vec<ElectrumUnspent>>,
+    block_headers_storage: BlockHeaderStorage,
+    /// This spawner is used to spawn Electrum's related futures that should be aborted on coin deactivation,
+    /// and on [`MmArc::stop`].
+    ///
+    /// Please also note that this abortable system is a subsystem of [`UtxoCoinFields::abortable_system`].
+    abortable_system: AbortableQueue,
+    negotiate_version: bool,
 }
 
 async fn electrum_request_multi(
     client: ElectrumClient,
     request: JsonRpcRequestEnum,
-) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
+) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), JsonRpcErrorType> {
     let mut futures = vec![];
     let connections = client.connections.lock().await;
     for (i, connection) in connections.iter().enumerate() {
+        if client.negotiate_version && connection.protocol_version.lock().await.is_none() {
+            continue;
+        }
+
         let connection_addr = connection.addr.clone();
-        match &*connection.tx.lock().await {
-            Some(tx) => {
-                let fut = electrum_request(
-                    request.clone(),
-                    tx.clone(),
-                    connection.responses.clone(),
-                    ELECTRUM_TIMEOUT / (connections.len() - i) as u64,
-                )
-                .map(|response| (JsonRpcRemoteAddr(connection_addr), response));
-                futures.push(fut)
-            },
-            None => (),
+        let json = json::to_string(&request).map_err(|e| JsonRpcErrorType::InvalidRequest(e.to_string()))?;
+        if let Some(tx) = &*connection.tx.lock().await {
+            let fut = electrum_request(
+                json,
+                request.rpc_id(),
+                tx.clone(),
+                connection.responses.clone(),
+                ELECTRUM_TIMEOUT / (connections.len() - i) as u64,
+            )
+            .map(|response| (JsonRpcRemoteAddr(connection_addr), response));
+            futures.push(fut)
         }
     }
     drop(connections);
+
     if futures.is_empty() {
-        return ERR!("All electrums are currently disconnected");
+        return Err(JsonRpcErrorType::Transport(
+            "All electrums are currently disconnected".to_string(),
+        ));
     }
 
-    match request {
-        JsonRpcRequestEnum::Single(single) if single.method == "server.ping" => {
+    if let JsonRpcRequestEnum::Single(single) = &request {
+        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;
-        },
-        _ => (),
+            return select_ok(futures).map(|(result, _)| result).compat().await;
+        }
     }
 
     let (res, no_of_failed_requests) = select_ok_sequential(futures)
         .compat()
         .await
-        .map_err(|e| ERRL!("{:?}", e))?;
+        .map_err(|e| JsonRpcErrorType::Transport(format!("{:?}", e)))?;
     client.rotate_servers(no_of_failed_requests).await;
+
     Ok(res)
 }
 
@@ -1592,35 +1688,41 @@ async fn electrum_request_to(
     client: ElectrumClient,
     request: JsonRpcRequestEnum,
     to_addr: String,
-) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), String> {
+) -> Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), JsonRpcErrorType> {
     let (tx, responses) = {
         let connections = client.connections.lock().await;
         let connection = connections
             .iter()
             .find(|c| c.addr == to_addr)
-            .ok_or(ERRL!("Unknown destination address {}", to_addr))?;
+            .ok_or_else(|| JsonRpcErrorType::Internal(format!("Unknown destination address {}", to_addr)))?;
         let responses = connection.responses.clone();
         let tx = {
             match &*connection.tx.lock().await {
                 Some(tx) => tx.clone(),
-                None => return ERR!("Connection {} is not established yet", to_addr),
+                None => {
+                    return Err(JsonRpcErrorType::Transport(format!(
+                        "Connection {} is not established yet",
+                        to_addr
+                    )))
+                },
             }
         };
         (tx, responses)
     };
-
-    let response = try_s!(
-        electrum_request(request.clone(), tx, responses, ELECTRUM_TIMEOUT)
-            .compat()
-            .await
-    );
+    let json = json::to_string(&request).map_err(|err| JsonRpcErrorType::InvalidRequest(err.to_string()))?;
+    let response = electrum_request(json, request.rpc_id(), tx, responses, ELECTRUM_TIMEOUT)
+        .compat()
+        .await?;
     Ok((JsonRpcRemoteAddr(to_addr.to_owned()), response))
 }
 
 impl ElectrumClientImpl {
+    pub fn spawner(&self) -> abortable_queue::WeakSpawner { self.abortable_system.weak_spawner() }
+
     /// Create an Electrum connection and spawn a green thread actor to handle it.
     pub async fn add_server(&self, req: &ElectrumRpcRequest) -> Result<(), String> {
-        let connection = try_s!(spawn_electrum(req, self.event_handlers.clone()));
+        let subsystem = try_s!(self.abortable_system.create_subsystem());
+        let connection = try_s!(spawn_electrum(req, self.event_handlers.clone(), subsystem));
         self.connections.lock().await.push(connection);
         Ok(())
     }
@@ -1677,15 +1779,29 @@ impl ElectrumClientImpl {
         Ok(())
     }
 
+    /// Reset the protocol version for the specified server.
+    pub async fn reset_protocol_version(&self, server_addr: &str) -> Result<(), String> {
+        let connections = self.connections.lock().await;
+        let con = connections
+            .iter()
+            .find(|con| con.addr == server_addr)
+            .ok_or(ERRL!("Unknown electrum address {}", server_addr))?;
+        con.reset_protocol_version().await;
+        Ok(())
+    }
+
     /// Get available protocol versions.
     pub fn protocol_version(&self) -> &OrdRange<f32> { &self.protocol_version }
+
+    /// Get block headers storage.
+    pub fn block_headers_storage(&self) -> &BlockHeaderStorage { &self.block_headers_storage }
 }
 
 #[derive(Clone, Debug)]
 pub struct ElectrumClient(pub Arc<ElectrumClientImpl>);
 impl Deref for ElectrumClient {
     type Target = ElectrumClientImpl;
-    fn deref(&self) -> &ElectrumClientImpl { &*self.0 }
+    fn deref(&self) -> &ElectrumClientImpl { &self.0 }
 }
 
 const BLOCKCHAIN_HEADERS_SUB_ID: &str = "blockchain.headers.subscribe";
@@ -1777,10 +1893,22 @@ impl ElectrumClient {
     }
 
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-get-history
-    pub fn scripthash_get_history(&self, hash: &str) -> RpcRes<Vec<ElectrumTxHistoryItem>> {
+    pub fn scripthash_get_history(&self, hash: &str) -> RpcRes<ElectrumTxHistory> {
         rpc_func!(self, "blockchain.scripthash.get_history", hash)
     }
 
+    /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-get-history
+    /// Requests history of the `hashes` in a batch and returns them in the same order they were requested.
+    pub fn scripthash_get_history_batch<I>(&self, hashes: I) -> RpcRes<Vec<ElectrumTxHistory>>
+    where
+        I: IntoIterator<Item = String>,
+    {
+        let requests = hashes
+            .into_iter()
+            .map(|hash| rpc_req!(self, "blockchain.scripthash.get_history", hash));
+        self.batch_rpc(requests)
+    }
+
     /// https://electrumx.readthedocs.io/en/latest/protocol-methods.html#blockchain-scripthash-gethistory
     pub fn scripthash_get_balance(&self, hash: &str) -> RpcRes<ElectrumBalance> {
         let arc = self.clone();
@@ -1837,19 +1965,121 @@ impl ElectrumClient {
         rpc_func!(self, "blockchain.block.headers", start_height, count)
     }
 
-    pub fn retrieve_last_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)
+    }
+
+    // get_tx_height_from_rpc is costly since it loops through history after requesting the whole history of the script pubkey
+    // This method should always be used if the block headers are saved to the DB
+    async fn get_tx_height_from_storage(&self, tx: &UtxoTx) -> Result<u64, MmError<GetTxHeightError>> {
+        let tx_hash = tx.hash().reversed();
+        let blockhash = self.get_verbose_transaction(&tx_hash.into()).compat().await?.blockhash;
+        Ok(self
+            .block_headers_storage()
+            .get_block_height_by_hash(blockhash.into())
+            .await?
+            .ok_or_else(|| {
+                GetTxHeightError::HeightNotFound(format!(
+                    "Transaction block header is not found in storage for {}",
+                    self.0.coin_ticker
+                ))
+            })?
+            .try_into()?)
+    }
+
+    // get_tx_height_from_storage is always preferred to be used instead of this, but if there is no headers in storage (storing headers is not enabled)
+    // this function can be used instead
+    async fn get_tx_height_from_rpc(&self, tx: &UtxoTx) -> Result<u64, GetTxHeightError> {
+        for output in tx.outputs.clone() {
+            let script_pubkey_str = hex::encode(electrum_script_hash(&output.script_pubkey));
+            if let Ok(history) = self.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);
+                }
+            }
+        }
+        Err(GetTxHeightError::HeightNotFound(format!(
+            "Couldn't find height through electrum for {}",
+            self.coin_ticker
+        )))
+    }
+
+    async fn block_header_from_storage(&self, height: u64) -> Result<BlockHeader, MmError<GetBlockHeaderError>> {
+        self.block_headers_storage()
+            .get_block_header(height)
+            .await?
+            .ok_or_else(|| {
+                GetBlockHeaderError::Internal(format!("Header not found in storage for {}", self.coin_ticker)).into()
+            })
+    }
+
+    async fn block_header_from_storage_or_rpc(&self, height: u64) -> Result<BlockHeader, MmError<GetBlockHeaderError>> {
+        match self.block_header_from_storage(height).await {
+            Ok(h) => Ok(h),
+            Err(_) => Ok(deserialize(
+                self.blockchain_block_header(height).compat().await?.as_slice(),
+            )?),
+        }
+    }
+
+    pub async fn get_confirmed_tx_info_from_rpc(
         &self,
-        blocks_limit_to_check: NonZeroU64,
-        block_height: u64,
-    ) -> UtxoRpcFut<(HashMap<u64, BlockHeader>, Vec<BlockHeader>)> {
+        tx: &UtxoTx,
+    ) -> Result<ConfirmedTransactionInfo, GetConfirmedTxError> {
+        let height = self.get_tx_height_from_rpc(tx).await?;
+
+        let merkle_branch = self
+            .blockchain_transaction_get_merkle(tx.hash().reversed().into(), height)
+            .compat()
+            .await?;
+
+        let header = deserialize(self.blockchain_block_header(height).compat().await?.as_slice())?;
+
+        Ok(ConfirmedTransactionInfo {
+            tx: tx.clone(),
+            header,
+            index: merkle_branch.pos as u64,
+            height,
+        })
+    }
+
+    pub async fn get_merkle_and_validated_header(
+        &self,
+        tx: &UtxoTx,
+    ) -> Result<(TxMerkleBranch, BlockHeader, u64), MmError<SPVError>> {
+        let height = self.get_tx_height_from_storage(tx).await?;
+
+        let merkle_branch = self
+            .blockchain_transaction_get_merkle(tx.hash().reversed().into(), height)
+            .compat()
+            .await
+            .map_to_mm(|err| SPVError::UnableToGetMerkle {
+                coin: self.coin_ticker.clone(),
+                err: err.to_string(),
+            })?;
+
+        let header = self.block_header_from_storage(height).await?;
+
+        Ok((merkle_branch, header, height))
+    }
+}
+
+#[cfg_attr(test, mockable)]
+impl ElectrumClient {
+    pub fn retrieve_headers(&self, from: u64, to: 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)
+        if from == 0 || to < from {
+            return Box::new(futures01::future::err(
+                UtxoRpcError::Internal("Invalid values for from/to parameters".to_string()).into(),
+            ));
+        }
+        let count: NonZeroU64 = match (to - from + 1).try_into() {
+            Ok(c) => c,
+            Err(e) => return Box::new(futures01::future::err(UtxoRpcError::Internal(e.to_string()).into())),
         };
         Box::new(
             self.blockchain_block_headers(from, count)
@@ -1862,8 +2092,9 @@ impl ElectrumClient {
                         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);
+                        drop_mutability!(serialized);
+                        let mut reader =
+                            Reader::new_with_coin_variant(serialized.as_slice(), coin_name.as_str().into());
                         let maybe_block_headers = reader.read_list::<BlockHeader>();
                         let block_headers = match maybe_block_headers {
                             Ok(headers) => headers,
@@ -1881,11 +2112,6 @@ impl ElectrumClient {
                 }),
         )
     }
-
-    /// 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
@@ -2107,17 +2333,20 @@ 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)
+    async fn get_block_timestamp(&self, height: u64) -> Result<u64, MmError<GetBlockHeaderError>> {
+        Ok(self.block_header_from_storage_or_rpc(height).await?.time as u64)
     }
 }
 
 #[cfg_attr(test, mockable)]
 impl ElectrumClientImpl {
-    pub fn new(coin_ticker: String, event_handlers: Vec<RpcTransportEventHandlerShared>) -> ElectrumClientImpl {
+    pub fn new(
+        coin_ticker: String,
+        event_handlers: Vec<RpcTransportEventHandlerShared>,
+        block_headers_storage: BlockHeaderStorage,
+        abortable_system: AbortableQueue,
+        negotiate_version: bool,
+    ) -> ElectrumClientImpl {
         let protocol_version = OrdRange::new(1.2, 1.4).unwrap();
         ElectrumClientImpl {
             coin_ticker,
@@ -2127,6 +2356,9 @@ impl ElectrumClientImpl {
             protocol_version,
             get_balance_concurrent_map: ConcurrentRequestMap::new(),
             list_unspent_concurrent_map: ConcurrentRequestMap::new(),
+            block_headers_storage,
+            abortable_system,
+            negotiate_version,
         }
     }
 
@@ -2135,10 +2367,18 @@ impl ElectrumClientImpl {
         coin_ticker: String,
         event_handlers: Vec<RpcTransportEventHandlerShared>,
         protocol_version: OrdRange<f32>,
+        block_headers_storage: BlockHeaderStorage,
+        abortable_system: AbortableQueue,
     ) -> ElectrumClientImpl {
         ElectrumClientImpl {
             protocol_version,
-            ..ElectrumClientImpl::new(coin_ticker, event_handlers)
+            ..ElectrumClientImpl::new(
+                coin_ticker,
+                event_handlers,
+                block_headers_storage,
+                abortable_system,
+                false,
+            )
         }
     }
 }
@@ -2333,12 +2573,13 @@ lazy_static! {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-async fn connect_loop(
+async fn connect_loop<Spawner: SpawnFuture>(
     config: ElectrumConfig,
     addr: String,
     responses: JsonRpcPendingRequestsShared,
     connection_tx: Arc<AsyncMutex<Option<mpsc::Sender<Vec<u8>>>>>,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
+    _spawner: Spawner,
 ) -> Result<(), ()> {
     let delay = Arc::new(AtomicU64::new(0));
 
@@ -2436,6 +2677,7 @@ async fn connect_loop(
         macro_rules! reset_tx_and_continue {
             () => {
                 info!("{} connection dropped", addr);
+                event_handlers.on_disconnected(addr.clone()).error_log();
                 *connection_tx.lock().await = None;
                 increase_delay(&delay);
                 continue;
@@ -2451,12 +2693,13 @@ async fn connect_loop(
 }
 
 #[cfg(target_arch = "wasm32")]
-async fn connect_loop(
+async fn connect_loop<Spawner: SpawnFuture>(
     _config: ElectrumConfig,
     addr: String,
     responses: JsonRpcPendingRequestsShared,
     connection_tx: Arc<AsyncMutex<Option<mpsc::Sender<Vec<u8>>>>>,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
+    spawner: Spawner,
 ) -> Result<(), ()> {
     use std::sync::atomic::AtomicUsize;
 
@@ -2474,7 +2717,8 @@ async fn connect_loop(
         }
 
         let conn_idx = CONN_IDX.fetch_add(1, AtomicOrdering::Relaxed);
-        let (mut transport_tx, mut transport_rx) = try_loop!(ws_transport(conn_idx, &addr).await, addr, delay);
+        let (mut transport_tx, mut transport_rx) =
+            try_loop!(ws_transport(conn_idx, &addr, &spawner).await, addr, delay);
 
         info!("Electrum client connected to {}", addr);
         try_loop!(event_handlers.on_connected(addr.clone()), addr, delay);
@@ -2540,6 +2784,7 @@ async fn connect_loop(
             () => {
                 info!("{} connection dropped", addr);
                 *connection_tx.lock().await = None;
+                event_handlers.on_disconnected(addr.clone()).error_log();
                 increase_delay(&delay);
                 continue;
             };
@@ -2554,66 +2799,69 @@ async fn connect_loop(
 }
 
 /// Builds up the electrum connection, spawns endless loop that attempts to reconnect to the server
-/// in case of connection errors
+/// in case of connection errors.
+/// The function takes `abortable_system` that will be used to spawn Electrum's related futures.
 fn electrum_connect(
     addr: String,
     config: ElectrumConfig,
     event_handlers: Vec<RpcTransportEventHandlerShared>,
+    abortable_system: AbortableQueue,
 ) -> ElectrumConnection {
-    let (shutdown_tx, shutdown_rx) = oneshot::channel::<()>();
     let responses = Arc::new(AsyncMutex::new(JsonRpcPendingRequests::default()));
     let tx = Arc::new(AsyncMutex::new(None));
 
-    let connect_loop = connect_loop(
+    let spawner = abortable_system.weak_spawner();
+    let fut = connect_loop(
         config.clone(),
         addr.clone(),
         responses.clone(),
         tx.clone(),
         event_handlers,
-    );
+        spawner.clone(),
+    )
+    .then(|_| futures::future::ready(()));
 
-    let connect_loop = select_func(connect_loop.boxed(), shutdown_rx.compat());
-    spawn(connect_loop.map(|_| ()));
+    spawner.spawn(fut);
     ElectrumConnection {
         addr,
         config,
         tx,
-        shutdown_tx: Some(shutdown_tx),
         responses,
         protocol_version: AsyncMutex::new(None),
+        _abortable_system: abortable_system,
     }
 }
 
+/// # Important
+/// `electrum_request` should always return [`JsonRpcErrorType::Transport`] error.
 fn electrum_request(
-    request: JsonRpcRequestEnum,
+    mut req_json: String,
+    rpc_id: JsonRpcId,
     tx: mpsc::Sender<Vec<u8>>,
     responses: JsonRpcPendingRequestsShared,
     timeout: u64,
-) -> Box<dyn Future<Item = JsonRpcResponseEnum, Error = String> + Send + 'static> {
+) -> Box<dyn Future<Item = JsonRpcResponseEnum, Error = JsonRpcErrorType> + Send + 'static> {
     let send_fut = async move {
-        let mut json = try_s!(json::to_string(&request));
         #[cfg(not(target_arch = "wasm"))]
         {
             // Electrum request and responses must end with \n
             // https://electrumx.readthedocs.io/en/latest/protocol-basics.html#message-stream
-            json.push('\n');
+            req_json.push('\n');
         }
-
         let (req_tx, resp_rx) = async_oneshot::channel();
-        responses.lock().await.insert(request.rpc_id(), req_tx);
-        try_s!(tx.send(json.into_bytes()).compat().await);
-        let resps = try_s!(resp_rx.await);
+        responses.lock().await.insert(rpc_id, req_tx);
+        tx.send(req_json.into_bytes())
+            .compat()
+            .await
+            .map_err(|err| JsonRpcErrorType::Transport(err.to_string()))?;
+        let resps = resp_rx.await.map_err(|e| JsonRpcErrorType::Transport(e.to_string()))?;
         Ok(resps)
     };
     let send_fut = send_fut
         .boxed()
         .timeout(Duration::from_secs(timeout))
         .compat()
-        .then(|res| match res {
-            Ok(response) => response,
-            Err(timeout_error) => ERR!("{}", timeout_error),
-        })
-        .map_err(|e| ERRL!("{}", e));
+        .then(move |res| res.map_err(|err| JsonRpcErrorType::Transport(err.to_string()))?);
     Box::new(send_fut)
 }
 
diff --git a/mm2src/coins/utxo/slp.rs b/mm2src/coins/utxo/slp.rs
index 9ed15d4843..1f7cf01839 100644
--- a/mm2src/coins/utxo/slp.rs
+++ b/mm2src/coins/utxo/slp.rs
@@ -3,7 +3,8 @@
 //! 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::coin_errors::{MyAddressError, ValidatePaymentError, ValidatePaymentFut};
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget};
 use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
 use crate::utxo::bch::BchCoin;
 use crate::utxo::bchd_grpc::{check_slp_transaction, validate_slp_utxos, ValidateSlpUtxosErr};
@@ -12,17 +13,24 @@ use crate::utxo::utxo_common::{self, big_decimal_from_sat_unsigned, payment_scri
 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,
+use crate::{BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner, FeeApproxStage, FoundSwapTxSpend,
+            HistorySyncState, MakerSwapTakerCoin, MarketCoinOps, MmCoin, NegotiateSwapContractAddrErr,
+            NumConversError, PaymentInstructions, PaymentInstructionsErr, PrivKeyPolicyNotAllowed, RawTransactionFut,
+            RawTransactionRequest, RefundError, RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee, TradePreimageError,
             TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum,
-            TransactionErr, TransactionFut, TxFeeDetails, UnexpectedDerivationMethod, ValidateAddressResult,
-            ValidatePaymentInput, VerificationError, VerificationResult, WithdrawError, WithdrawFee, WithdrawFut,
+            TransactionErr, TransactionFut, TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod,
+            ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr,
+            ValidatePaymentInput, VerificationError, VerificationResult, WatcherOps, WatcherSearchForSwapTxSpendInput,
+            WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawError, WithdrawFee, WithdrawFut,
             WithdrawRequest};
 use async_trait::async_trait;
 use bitcrypto::dhash160;
 use chain::constants::SEQUENCE_FINAL;
 use chain::{OutPoint, TransactionOutput};
+use common::executor::{abortable_queue::AbortableQueue, AbortableSystem, AbortedError};
 use common::log::warn;
 use common::now_ms;
 use derive_more::Display;
@@ -41,7 +49,7 @@ use rpc::v1::types::{Bytes as BytesJson, ToTxHash, H256 as H256Json};
 use script::bytes::Bytes;
 use script::{Builder as ScriptBuilder, Opcode, Script, TransactionInputSigner};
 use serde_json::Value as Json;
-use serialization::{deserialize, serialize, Deserializable, Error, Reader};
+use serialization::{deserialize, serialize, Deserializable, Error as SerError, Reader};
 use serialization_derive::Deserializable;
 use std::convert::TryInto;
 use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering};
@@ -57,12 +65,35 @@ const SLP_SEND: &str = "SEND";
 const SLP_MINT: &str = "MINT";
 const SLP_GENESIS: &str = "GENESIS";
 
-#[derive(Debug)]
-pub struct SlpTokenConf {
+#[derive(Debug, Display)]
+#[allow(clippy::large_enum_variant)]
+pub enum EnableSlpError {
+    GetBalanceError(UtxoRpcError),
+    UnexpectedDerivationMethod(String),
+    Internal(String),
+}
+
+impl From<MyAddressError> for EnableSlpError {
+    fn from(err: MyAddressError) -> Self {
+        match err {
+            MyAddressError::UnexpectedDerivationMethod(der) => EnableSlpError::UnexpectedDerivationMethod(der),
+            MyAddressError::InternalError(internal) => EnableSlpError::Internal(internal),
+        }
+    }
+}
+
+impl From<AbortedError> for EnableSlpError {
+    fn from(e: AbortedError) -> Self { EnableSlpError::Internal(e.to_string()) }
+}
+
+pub struct SlpTokenFields {
     decimals: u8,
     ticker: String,
     token_id: H256,
     required_confirmations: AtomicU64,
+    /// This abortable system is used to spawn coin's related futures that should be aborted on coin deactivation
+    /// and on [`MmArc::stop`].
+    abortable_system: AbortableQueue,
 }
 
 /// Minimalistic info that is used to be stored outside of the token's context
@@ -73,9 +104,9 @@ pub struct SlpTokenInfo {
     pub decimals: u8,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct SlpToken {
-    conf: Arc<SlpTokenConf>,
+    conf: Arc<SlpTokenFields>,
     platform_coin: BchCoin,
 }
 
@@ -98,37 +129,6 @@ struct SlpTxPreimage {
     outputs: Vec<TransactionOutput>,
 }
 
-#[derive(Debug, Display)]
-enum ValidateHtlcError {
-    TxLackOfOutputs,
-    #[display(fmt = "TxParseError: {:?}", _0)]
-    TxParseError(Error),
-    #[display(fmt = "OpReturnParseError: {:?}", _0)]
-    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,
@@ -153,7 +153,7 @@ pub enum SpendP2SHError {
     GenerateTxErr(GenerateTxError),
     Rpc(UtxoRpcError),
     SignTxErr(UtxoSignWithKeyPairError),
-    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     UnexpectedDerivationMethod(UnexpectedDerivationMethod),
     String(String),
 }
@@ -170,8 +170,8 @@ 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<PrivKeyPolicyNotAllowed> for SpendP2SHError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { SpendP2SHError::PrivKeyPolicyNotAllowed(e) }
 }
 
 impl From<UnexpectedDerivationMethod> for SpendP2SHError {
@@ -186,7 +186,7 @@ impl From<String> for SpendP2SHError {
 pub enum SpendHtlcError {
     TxLackOfOutputs,
     #[display(fmt = "DeserializationErr: {:?}", _0)]
-    DeserializationErr(Error),
+    DeserializationErr(SerError),
     #[display(fmt = "PubkeyParseError: {:?}", _0)]
     PubkeyParseErr(keys::Error),
     InvalidSlpDetails,
@@ -206,8 +206,8 @@ impl From<NumConversError> for SpendHtlcError {
     fn from(err: NumConversError) -> SpendHtlcError { SpendHtlcError::NumConversionErr(err) }
 }
 
-impl From<Error> for SpendHtlcError {
-    fn from(err: Error) -> SpendHtlcError { SpendHtlcError::DeserializationErr(err) }
+impl From<SerError> for SpendHtlcError {
+    fn from(err: SerError) -> SpendHtlcError { SpendHtlcError::DeserializationErr(err) }
 }
 
 impl From<keys::Error> for SpendHtlcError {
@@ -303,14 +303,19 @@ impl SlpToken {
         token_id: H256,
         platform_coin: BchCoin,
         required_confirmations: u64,
-    ) -> SlpToken {
-        let conf = Arc::new(SlpTokenConf {
+    ) -> MmResult<SlpToken, EnableSlpError> {
+        // Create an abortable system linked to `platform_coin` so if the platform coin is disabled,
+        // all spawned futures related to `SlpToken` will be aborted as well.
+        let abortable_system = platform_coin.as_ref().abortable_system.create_subsystem()?;
+
+        let conf = Arc::new(SlpTokenFields {
             decimals,
             ticker,
             token_id,
             required_confirmations: AtomicU64::new(required_confirmations),
+            abortable_system,
         });
-        SlpToken { conf, platform_coin }
+        Ok(SlpToken { conf, platform_coin })
     }
 
     /// Returns the OP_RETURN output for SLP Send transaction
@@ -432,11 +437,13 @@ impl SlpToken {
         .await
     }
 
-    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)?;
+    async fn validate_htlc(&self, input: ValidatePaymentInput) -> Result<(), MmError<ValidatePaymentError>> {
+        let mut tx: UtxoTx = deserialize(input.payment_tx.as_slice())?;
         tx.tx_hash_algo = self.platform_coin.as_ref().tx_hash_algo;
         if tx.outputs.len() < 2 {
-            return MmError::err(ValidateHtlcError::TxLackOfOutputs);
+            return MmError::err(ValidatePaymentError::TxDeserializationError(
+                "Not enough transaction output".to_string(),
+            ));
         }
 
         let slp_satoshis = sat_from_big_decimal(&input.amount, self.decimals())?;
@@ -459,26 +466,41 @@ impl SlpToken {
         match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
                 if token_id != self.token_id() {
-                    return MmError::err(ValidateHtlcError::InvalidSlpDetails);
+                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                        "Invalid tx token_id, Expected: {}, found: {}",
+                        token_id,
+                        self.token_id()
+                    )));
                 }
 
                 if amounts.is_empty() {
-                    return MmError::err(ValidateHtlcError::InvalidSlpDetails);
+                    return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                        "Input amount can't be empty".to_string(),
+                    ));
                 }
 
                 if amounts[0] != slp_satoshis {
-                    return MmError::err(ValidateHtlcError::InvalidSlpDetails);
+                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                        "Invalid input amount. Expected: {}, found: {}",
+                        slp_satoshis, amounts[0]
+                    )));
                 }
             },
-            _ => return MmError::err(ValidateHtlcError::InvalidSlpDetails),
+            _ => {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                    "Invalid Slp tx details".to_string(),
+                ))
+            },
         }
 
         let htlc_keypair = self.derive_htlc_key_pair(&input.unique_swap_data);
+        let first_pub = &Public::from_slice(&input.other_pub)
+            .map_to_mm(|err| ValidatePaymentError::InvalidParameter(err.to_string()))?;
         let validate_fut = utxo_common::validate_payment(
             self.platform_coin.clone(),
             tx,
             SLP_SWAP_VOUT,
-            &Public::from_slice(&input.other_pub).map_to_mm(ValidateHtlcError::OtherPubInvalid)?,
+            first_pub,
             htlc_keypair.public(),
             &input.secret_hash,
             self.platform_dust_dec(),
@@ -486,13 +508,7 @@ impl SlpToken {
             now_ms() / 1000 + 60,
             input.confirmations,
         );
-
-        validate_fut
-            .compat()
-            .await
-            .map_to_mm(ValidateHtlcError::ValidatePaymentError)?;
-
-        Ok(())
+        validate_fut.compat().await
     }
 
     pub async fn refund_htlc(
@@ -519,7 +535,7 @@ impl SlpToken {
                 if token_id != self.token_id() {
                     return MmError::err(SpendHtlcError::InvalidSlpDetails);
                 }
-                *amounts.get(0).ok_or(SpendHtlcError::InvalidSlpDetails)?
+                *amounts.first().ok_or(SpendHtlcError::InvalidSlpDetails)?
             },
             _ => return MmError::err(SpendHtlcError::InvalidSlpDetails),
         };
@@ -556,20 +572,21 @@ impl SlpToken {
         other_pub: &Public,
         time_lock: u32,
         secret: &[u8],
+        secret_hash: &[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 = payment_script(time_lock, &*dhash160(secret), &other_pub, keypair.public());
+        let redeem = payment_script(time_lock, secret_hash, &other_pub, keypair.public());
 
         let slp_amount = match slp_tx.transaction {
             SlpTransaction::Send { token_id, amounts } => {
                 if token_id != self.token_id() {
                     return MmError::err(SpendHtlcError::InvalidSlpDetails);
                 }
-                *amounts.get(0).ok_or(SpendHtlcError::InvalidSlpDetails)?
+                *amounts.first().ok_or(SpendHtlcError::InvalidSlpDetails)?
             },
             _ => return MmError::err(SpendHtlcError::InvalidSlpDetails),
         };
@@ -815,7 +832,7 @@ impl SlpTransaction {
 }
 
 impl Deserializable for SlpTransaction {
-    fn deserialize<T>(reader: &mut Reader<T>) -> Result<Self, Error>
+    fn deserialize<T>(reader: &mut Reader<T>) -> Result<Self, SerError>
     where
         Self: Sized,
         T: std::io::Read,
@@ -831,7 +848,7 @@ impl Deserializable for SlpTransaction {
                 } else {
                     let mut url = vec![0; maybe_push_op_code as usize];
                     reader.read_slice(&mut url)?;
-                    String::from_utf8(url).map_err(|e| Error::Custom(e.to_string()))?
+                    String::from_utf8(url).map_err(|e| SerError::Custom(e.to_string()))?
                 };
 
                 let maybe_push_op_code: u8 = reader.read()?;
@@ -852,7 +869,7 @@ impl Deserializable for SlpTransaction {
                 };
                 let bytes: Vec<u8> = reader.read_list()?;
                 if bytes.len() != 8 {
-                    return Err(Error::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
+                    return Err(SerError::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"));
 
@@ -869,7 +886,10 @@ impl Deserializable for SlpTransaction {
             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())));
+                    return Err(SerError::Custom(format!(
+                        "Unexpected token id length {}",
+                        maybe_id.len()
+                    )));
                 }
 
                 let maybe_push_op_code: u8 = reader.read()?;
@@ -882,7 +902,7 @@ impl Deserializable for SlpTransaction {
 
                 let bytes: Vec<u8> = reader.read_list()?;
                 if bytes.len() != 8 {
-                    return Err(Error::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
+                    return Err(SerError::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
                 }
                 let additional_token_quantity = u64::from_be_bytes(bytes.try_into().expect("length is 8 bytes"));
 
@@ -895,7 +915,10 @@ impl Deserializable for SlpTransaction {
             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())));
+                    return Err(SerError::Custom(format!(
+                        "Unexpected token id length {}",
+                        maybe_id.len()
+                    )));
                 }
 
                 let token_id = H256::from(maybe_id.as_slice());
@@ -903,21 +926,21 @@ impl Deserializable for SlpTransaction {
                 while !reader.is_finished() {
                     let bytes: Vec<u8> = reader.read_list()?;
                     if bytes.len() != 8 {
-                        return Err(Error::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
+                        return Err(SerError::Custom(format!("Expected 8 bytes, got {}", bytes.len())));
                     }
                     let amount = u64::from_be_bytes(bytes.try_into().expect("length is 8 bytes"));
                     amounts.push(amount)
                 }
 
                 if amounts.len() > 19 {
-                    return Err(Error::Custom(format!(
+                    return Err(SerError::Custom(format!(
                         "Expected at most 19 token amounts, got {}",
                         amounts.len()
                     )));
                 }
                 Ok(SlpTransaction::Send { token_id, amounts })
             },
-            _ => Err(Error::Custom(format!(
+            _ => Err(SerError::Custom(format!(
                 "Unsupported transaction type {}",
                 transaction_type
             ))),
@@ -940,11 +963,15 @@ pub enum ParseSlpScriptError {
     #[display(fmt = "UnexpectedTokenType: {:?}", _0)]
     UnexpectedTokenType(Vec<u8>),
     #[display(fmt = "DeserializeFailed: {:?}", _0)]
-    DeserializeFailed(Error),
+    DeserializeFailed(SerError),
+}
+
+impl From<SerError> for ParseSlpScriptError {
+    fn from(err: SerError) -> ParseSlpScriptError { ParseSlpScriptError::DeserializeFailed(err) }
 }
 
-impl From<Error> for ParseSlpScriptError {
-    fn from(err: Error) -> ParseSlpScriptError { ParseSlpScriptError::DeserializeFailed(err) }
+impl From<ParseSlpScriptError> for ValidatePaymentError {
+    fn from(err: ParseSlpScriptError) -> Self { Self::TxDeserializationError(err.to_string()) }
 }
 
 pub fn parse_slp_script(script: &[u8]) -> Result<SlpTxDetails, MmError<ParseSlpScriptError>> {
@@ -1053,10 +1080,13 @@ impl UtxoTxGenerationOps for SlpToken {
 impl MarketCoinOps for SlpToken {
     fn ticker(&self) -> &str { &self.conf.ticker }
 
-    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 my_address(&self) -> MmResult<String, MyAddressError> {
+        let my_address = self.as_ref().derivation_method.single_addr_or_err()?;
+        let slp_address = self
+            .platform_coin
+            .slp_address(my_address)
+            .map_to_mm(MyAddressError::InternalError)?;
+        slp_address.encode().map_to_mm(MyAddressError::InternalError)
     }
 
     fn get_public_key(&self) -> Result<String, MmError<UnexpectedDerivationMethod>> {
@@ -1138,12 +1168,14 @@ impl MarketCoinOps for SlpToken {
             .wait_for_confirmations(tx, confirmations, requires_nota, wait_until, check_every)
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
             self.platform_coin.as_ref(),
@@ -1151,10 +1183,11 @@ impl MarketCoinOps for SlpToken {
             SLP_SWAP_VOUT,
             from_block,
             wait_until,
+            check_every,
         )
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
         self.platform_coin.tx_enum_from_bytes(bytes)
     }
 
@@ -1191,19 +1224,12 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat().map(|tx| tx.into()))
     }
 
-    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 {
-        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);
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
+        let taker_pub = try_tx_fus!(Public::from_slice(maker_payment_args.other_pubkey));
+        let amount = try_tx_fus!(sat_from_big_decimal(&maker_payment_args.amount, self.decimals()));
+        let secret_hash = maker_payment_args.secret_hash.to_owned();
+        let maker_htlc_keypair = self.derive_htlc_key_pair(maker_payment_args.swap_unique_data);
+        let time_lock = maker_payment_args.time_lock;
 
         let coin = self.clone();
         let fut = async move {
@@ -1216,20 +1242,13 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        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();
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
+        let maker_pub = try_tx_fus!(Public::from_slice(taker_payment_args.other_pubkey));
+        let amount = try_tx_fus!(sat_from_big_decimal(&taker_payment_args.amount, self.decimals()));
+        let secret_hash = taker_payment_args.secret_hash.to_owned();
 
-        let taker_htlc_keypair = self.derive_htlc_key_pair(swap_unique_data);
+        let taker_htlc_keypair = self.derive_htlc_key_pair(taker_payment_args.swap_unique_data);
+        let time_lock = taker_payment_args.time_lock;
 
         let coin = self.clone();
         let fut = async move {
@@ -1244,22 +1263,19 @@ impl SwapOps for SlpToken {
 
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
-        let tx = taker_payment_tx.to_owned();
-        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 tx = maker_spends_payment_args.other_payment_tx.to_owned();
+        let taker_pub = try_tx_fus!(Public::from_slice(maker_spends_payment_args.other_pubkey));
+        let secret = maker_spends_payment_args.secret.to_owned();
+        let secret_hash = maker_spends_payment_args.secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(maker_spends_payment_args.swap_unique_data);
         let coin = self.clone();
+        let time_lock = maker_spends_payment_args.time_lock;
 
         let fut = async move {
             let tx = try_tx_s!(
-                coin.spend_htlc(&tx, &taker_pub, time_lock, &secret, &htlc_keypair)
+                coin.spend_htlc(&tx, &taker_pub, time_lock, &secret, &secret_hash, &htlc_keypair)
                     .await
             );
             Ok(tx.into())
@@ -1269,22 +1285,19 @@ impl SwapOps for SlpToken {
 
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
-        let tx = maker_payment_tx.to_owned();
-        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 tx = taker_spends_payment_args.other_payment_tx.to_owned();
+        let maker_pub = try_tx_fus!(Public::from_slice(taker_spends_payment_args.other_pubkey));
+        let secret = taker_spends_payment_args.secret.to_owned();
+        let secret_hash = taker_spends_payment_args.secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(taker_spends_payment_args.swap_unique_data);
         let coin = self.clone();
+        let time_lock = taker_spends_payment_args.time_lock;
 
         let fut = async move {
             let tx = try_tx_s!(
-                coin.spend_htlc(&tx, &maker_pub, time_lock, &secret, &htlc_keypair)
+                coin.spend_htlc(&tx, &maker_pub, time_lock, &secret, &secret_hash, &htlc_keypair)
                     .await
             );
             Ok(tx.into())
@@ -1292,20 +1305,13 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
-        let tx = taker_payment_tx.to_owned();
-        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);
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
+        let tx = taker_refunds_payment_args.payment_tx.to_owned();
+        let maker_pub = try_tx_fus!(Public::from_slice(taker_refunds_payment_args.other_pubkey));
+        let secret_hash = taker_refunds_payment_args.secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(taker_refunds_payment_args.swap_unique_data);
         let coin = self.clone();
+        let time_lock = taker_refunds_payment_args.time_lock;
 
         let fut = async move {
             let tx = try_s!(
@@ -1317,20 +1323,13 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat().map_err(TransactionErr::Plain))
     }
 
-    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 {
-        let tx = maker_payment_tx.to_owned();
-        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);
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
+        let tx = maker_refunds_payment_args.payment_tx.to_owned();
+        let taker_pub = try_tx_fus!(Public::from_slice(maker_refunds_payment_args.other_pubkey));
+        let secret_hash = maker_refunds_payment_args.secret_hash.to_owned();
+        let htlc_keypair = self.derive_htlc_key_pair(maker_refunds_payment_args.swap_unique_data);
         let coin = self.clone();
+        let time_lock = maker_refunds_payment_args.time_lock;
 
         let fut = async move {
             let tx = try_tx_s!(
@@ -1342,23 +1341,16 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match validate_fee_args.fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
             _ => panic!(),
         };
         let coin = self.clone();
-        let expected_sender = expected_sender.to_owned();
-        let fee_addr = fee_addr.to_owned();
-        let amount = amount.to_owned();
+        let expected_sender = validate_fee_args.expected_sender.to_owned();
+        let fee_addr = validate_fee_args.fee_addr.to_owned();
+        let amount = validate_fee_args.amount.to_owned();
+        let min_block_number = validate_fee_args.min_block_number;
 
         let fut = async move {
             try_s!(
@@ -1370,42 +1362,39 @@ impl SwapOps for SlpToken {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         let coin = self.clone();
         let fut = async move {
-            try_s!(coin.validate_htlc(input).await);
+            coin.validate_htlc(input).await?;
             Ok(())
         };
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         let coin = self.clone();
         let fut = async move {
-            try_s!(coin.validate_htlc(input).await);
+            coin.validate_htlc(input).await?;
             Ok(())
         };
         Box::new(fut.boxed().compat())
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> Box<dyn Future<Item = Option<TransactionEnum>, Error = String> + Send> {
         utxo_common::check_if_my_payment_sent(
             self.platform_coin.clone(),
-            time_lock,
-            other_pub,
-            secret_hash,
-            swap_unique_data,
+            if_my_payment_sent_args.time_lock,
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.swap_unique_data,
         )
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1413,6 +1402,7 @@ impl SwapOps for SlpToken {
         utxo_common::search_for_swap_tx_spend_my(&self.platform_coin, input, SLP_SWAP_VOUT).await
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_other(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1420,10 +1410,24 @@ impl SwapOps for SlpToken {
         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> {
+    fn check_tx_signed_by_pub(&self, _tx: &[u8], _expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         utxo_common::extract_secret(secret_hash, spend_tx)
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    #[inline]
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
@@ -1434,6 +1438,119 @@ impl SwapOps for SlpToken {
     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)
     }
+
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        utxo_common::derive_htlc_pubkey(self, swap_unique_data)
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for SlpToken {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for SlpToken {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for SlpToken {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
 }
 
 impl From<GenSlpSpendErr> for TradePreimageError {
@@ -1471,6 +1588,8 @@ impl From<SlpFeeDetails> for TxFeeDetails {
 impl MmCoin for SlpToken {
     fn is_asset_chain(&self) -> bool { false }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.conf.abortable_system) }
+
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
         Box::new(
             utxo_common::get_raw_transaction(self.platform_coin.as_ref(), req)
@@ -1479,10 +1598,18 @@ impl MmCoin for SlpToken {
         )
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_tx_hex_by_hash(self.platform_coin.as_ref(), tx_hash)
+                .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 my_address = coin.platform_coin.as_ref().derivation_method.single_addr_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)?;
@@ -1560,7 +1687,7 @@ impl MmCoin for SlpToken {
                 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 my_address_string = coin.my_address()?;
             let to_address = address.encode().map_to_mm(WithdrawError::InternalError)?;
 
             let total_amount = big_decimal_from_sat_unsigned(amount, coin.decimals());
@@ -1588,6 +1715,7 @@ impl MmCoin for SlpToken {
                 coin: coin.ticker().into(),
                 kmd_rewards: None,
                 transaction_type: Default::default(),
+                memo: None,
             };
             Ok(details)
         };
@@ -1674,11 +1802,14 @@ impl MmCoin for SlpToken {
         })
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         let coin = self.clone();
 
         let fut = async move {
-            let htlc_fee = coin.platform_coin.get_htlc_spend_fee(SLP_HTLC_SPEND_SIZE).await?;
+            let htlc_fee = coin
+                .platform_coin
+                .get_htlc_spend_fee(SLP_HTLC_SPEND_SIZE, &FeeApproxStage::WithoutApprox)
+                .await?;
             let amount =
                 (big_decimal_from_sat_unsigned(htlc_fee, coin.platform_decimals()) + coin.platform_dust_dec()).into();
             Ok(TradeFee {
@@ -1734,20 +1865,37 @@ impl MmCoin for SlpToken {
         warn!("set_requires_notarization has no effect on SLPTOKEN!")
     }
 
-    fn swap_contract_address(&self) -> Option<BytesJson> { None }
+    fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
+
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
 
     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 on_disabled(&self) -> Result<(), AbortedError> { self.conf.abortable_system.abort_all() }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
 
+#[async_trait]
 impl CoinWithTxHistoryV2 for SlpToken {
     fn history_wallet_id(&self) -> WalletId { WalletId::new(self.platform_ticker().to_owned()) }
 
-    fn get_tx_history_filters(&self) -> GetTxHistoryFilters {
-        GetTxHistoryFilters::new().with_token_id(self.token_id().to_string())
+    /// TODO consider using `utxo_common::utxo_tx_history_common::get_tx_history_filters`
+    /// when `SlpToken` implements `CoinWithDerivationMethod`.
+    async fn get_tx_history_filters(
+        &self,
+        target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        match target {
+            MyTxHistoryTarget::Iguana => (),
+            target => return MmError::err(MyTxHistoryErrorV2::with_expected_target(target, "Iguana")),
+        }
+        let my_address = self.my_address()?;
+        Ok(GetTxHistoryFilters::for_address(my_address).with_token_id(self.token_id().to_string()))
     }
 }
 
@@ -1931,9 +2079,9 @@ mod slp_tests {
 
     #[test]
     fn test_slp_address() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, 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, 0).unwrap();
 
         let slp_address = fusd.my_address().unwrap();
         assert_eq!("slptest:qzx0llpyp8gxxsmad25twksqnwd62xm3lsg8lecug8", slp_address);
@@ -1941,9 +2089,9 @@ mod slp_tests {
 
     #[test]
     fn test_validate_htlc_valid() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, 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, 0).unwrap();
 
         // https://testnet.simpleledger.info/tx/e935160bfb5b45007a0fc6f8fbe8da618f28df6573731f1ffb54d9560abb49b2
         let payment_tx = hex::decode("0100000002736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5020000006a47304402206be99fe56a98e7a8c2ffe6f2d05c5c1f46a6577064b84d27d45fe0e959f6e77402201c512629313b48cd4df873222aa49046ae9a3a6e34e359d10d4308cb40438fba4121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff736cf584f877ec7b6b95974bc461a9cfb9f126655b5d335471683154cc6cf4c5030000006a473044022020d774d045bbe3dce5b04af836f6a5629c6c4ce75b0b5ba8a1da0ae9a4ecc0530220522f86d20c9e4142e40f9a9c8d25db16fde91d4a0ad6f6ff2107e201386131b64121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff040000000000000000406a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8080000000000001f3ee80300000000000017a914b0ca1fea17cf522c7e858416093fc6d95e55824087e8030000000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88accf614801000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88ac8c83d460").unwrap();
@@ -1963,6 +2111,7 @@ mod slp_tests {
         let input = ValidatePaymentInput {
             payment_tx,
             other_pub,
+            time_lock_duration: 0,
             time_lock: lock_time,
             secret_hash,
             amount,
@@ -1976,11 +2125,11 @@ mod slp_tests {
 
     #[test]
     fn construct_and_send_invalid_slp_htlc_should_fail() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, bch) = tbch_coin_for_test();
         let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
-        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0);
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0).unwrap();
 
-        let bch_address = bch.as_ref().derivation_method.unwrap_iguana();
+        let bch_address = bch.as_ref().derivation_method.unwrap_single_addr();
         let (unspents, recently_spent) = block_on(bch.get_unspent_ordered_list(bch_address)).unwrap();
 
         let secret_hash = hex::decode("5d9e149ad9ccb20e9f931a69b605df2ffde60242").unwrap();
@@ -2061,9 +2210,9 @@ mod slp_tests {
 
     #[test]
     fn test_validate_htlc_invalid_slp_utxo() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, bch) = tbch_coin_for_test();
         let token_id = H256::from("bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7");
-        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0);
+        let fusd = SlpToken::new(4, "FUSD".into(), token_id, bch.clone(), 0).unwrap();
 
         // https://www.blockchain.com/ru/bch-testnet/tx/6686ee013620d31ba645b27d581fed85437ce00f46b595a576718afac4dd5b69
         let payment_tx = hex::decode("0100000001ce59a734f33811afcc00c19dcb12202ed00067a50efed80424fabd2b723678c0020000006b483045022100ec1fecff9c60fb7e821b9a412bd8c4ce4a757c68287f9cf9e0f461165492d6530220222f020dd05d65ba35cddd0116c99255612ec90d63019bb1cea45e2cf09a62a94121036879df230663db4cd083c8eeb0f293f46abc460ad3c299b0089b72e6d472202cffffffff030000000000000000376a04534c500001010453454e4420bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb70800000000000003e8e80300000000000017a914953b3909ff6aa269f85da34c132a92424440e18e879decad00000000001976a9148cfffc2409d063437d6aa8b75a009b9ba51b71fc88acd1215c61").unwrap();
@@ -2096,6 +2245,7 @@ mod slp_tests {
         let input = ValidatePaymentInput {
             payment_tx,
             other_pub: other_pub_bytes,
+            time_lock_duration: 0,
             time_lock: lock_time,
             secret_hash,
             amount,
@@ -2106,16 +2256,16 @@ mod slp_tests {
         };
         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),
+            ValidatePaymentError::WrongPaymentTx(e) => println!("{:#?}", e),
+            err @ _ => panic!("Unexpected err {:#?}", err),
         };
     }
 
     #[test]
     fn test_sign_message() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, 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, 0).unwrap();
         let signature = fusd.sign_message("test").unwrap();
         assert_eq!(
             signature,
@@ -2126,9 +2276,9 @@ mod slp_tests {
     #[test]
     #[cfg(not(target_arch = "wasm32"))]
     fn test_verify_message() {
-        let bch = tbch_coin_for_test();
+        let (_ctx, 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, 0).unwrap();
         let is_valid = fusd
             .verify_message(
                 "ILuePKMsycXwJiNDOT7Zb7TfIlUW7Iq+5ylKd15AK72vGVYXbnf7Gj9Lk9MFV+6Ub955j7MiAkp0wQjvuIoRPPA=",
diff --git a/mm2src/coins/utxo/spv.rs b/mm2src/coins/utxo/spv.rs
new file mode 100644
index 0000000000..8abb2da216
--- /dev/null
+++ b/mm2src/coins/utxo/spv.rs
@@ -0,0 +1,66 @@
+use crate::utxo::rpc_clients::{ConfirmedTransactionInfo, ElectrumClient};
+use async_trait::async_trait;
+use chain::Transaction as UtxoTx;
+use common::log::error;
+use keys::hash::H256;
+use serialization::serialize_list;
+use spv_validation::helpers_validation::SPVError;
+use spv_validation::spv_proof::{SPVProof, TRY_SPV_PROOF_INTERVAL};
+
+#[async_trait]
+pub trait SimplePaymentVerification {
+    async fn validate_spv_proof(
+        &self,
+        tx: &UtxoTx,
+        try_spv_proof_until: u64,
+    ) -> Result<ConfirmedTransactionInfo, SPVError>;
+}
+
+#[async_trait]
+impl SimplePaymentVerification for ElectrumClient {
+    async fn validate_spv_proof(
+        &self,
+        tx: &UtxoTx,
+        try_spv_proof_until: u64,
+    ) -> Result<ConfirmedTransactionInfo, SPVError> {
+        if tx.outputs.is_empty() {
+            return Err(SPVError::InvalidVout);
+        }
+
+        let tx_hash = tx.hash().reversed();
+        let (merkle_branch, validated_header, height) =
+            retry_on_err!(async { self.get_merkle_and_validated_header(tx).await })
+                .repeat_every_secs(TRY_SPV_PROOF_INTERVAL as f64)
+                .with_timeout_secs(try_spv_proof_until as f64)
+                .inspect_err(move |e| {
+                    error!(
+                        "Failed spv proof validation for transaction {tx_hash} with error: {e:?}, retrying in {TRY_SPV_PROOF_INTERVAL} seconds.",
+                    )
+                })
+                .await
+                .map_err(|_| SPVError::Timeout)?;
+
+        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,
+            intermediate_nodes,
+        };
+
+        proof.validate(&validated_header)?;
+
+        Ok(ConfirmedTransactionInfo {
+            tx: tx.clone(),
+            header: validated_header,
+            index: proof.index,
+            height,
+        })
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_block_header_storage.rs b/mm2src/coins/utxo/utxo_block_header_storage.rs
deleted file mode 100644
index 925a0c80c3..0000000000
--- a/mm2src/coins/utxo/utxo_block_header_storage.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-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_block_header_storage/mod.rs b/mm2src/coins/utxo/utxo_block_header_storage/mod.rs
new file mode 100644
index 0000000000..1932d9afda
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage/mod.rs
@@ -0,0 +1,361 @@
+#[cfg(not(target_arch = "wasm32"))] mod sql_block_header_storage;
+#[cfg(not(target_arch = "wasm32"))]
+pub use sql_block_header_storage::SqliteBlockHeadersStorage;
+
+#[cfg(target_arch = "wasm32")] mod wasm;
+#[cfg(target_arch = "wasm32")]
+pub use wasm::IDBBlockHeadersStorage;
+
+use async_trait::async_trait;
+use chain::BlockHeader;
+use mm2_core::mm_ctx::MmArc;
+#[cfg(all(test, not(target_arch = "wasm32")))]
+use mocktopus::macros::*;
+use primitives::hash::H256;
+use spv_validation::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use std::collections::HashMap;
+use std::fmt::{Debug, Formatter};
+
+pub struct BlockHeaderStorage {
+    pub inner: Box<dyn BlockHeaderStorageOps>,
+}
+
+impl Debug for BlockHeaderStorage {
+    fn fmt(&self, _f: &mut Formatter<'_>) -> std::fmt::Result { Ok(()) }
+}
+
+impl BlockHeaderStorage {
+    #[cfg(all(not(test), not(target_arch = "wasm32")))]
+    pub(crate) fn new_from_ctx(ctx: MmArc, ticker: String) -> Result<Self, BlockHeaderStorageError> {
+        let sqlite_connection = ctx.sqlite_connection.ok_or(BlockHeaderStorageError::Internal(
+            "sqlite_connection is not initialized".to_owned(),
+        ))?;
+        Ok(BlockHeaderStorage {
+            inner: Box::new(SqliteBlockHeadersStorage {
+                ticker,
+                conn: sqlite_connection.clone(),
+            }),
+        })
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub(crate) fn new_from_ctx(ctx: MmArc, ticker: String) -> Result<Self, BlockHeaderStorageError> {
+        Ok(BlockHeaderStorage {
+            inner: Box::new(IDBBlockHeadersStorage::new(&ctx, ticker)),
+        })
+    }
+
+    #[cfg(all(test, not(target_arch = "wasm32")))]
+    pub(crate) fn new_from_ctx(ctx: MmArc, ticker: String) -> Result<Self, BlockHeaderStorageError> {
+        use db_common::sqlite::rusqlite::Connection;
+        use std::sync::{Arc, Mutex};
+
+        let conn = Arc::new(Mutex::new(Connection::open_in_memory().unwrap()));
+        let conn = ctx.sqlite_connection.clone_or(conn);
+
+        Ok(BlockHeaderStorage {
+            inner: Box::new(SqliteBlockHeadersStorage { ticker, conn }),
+        })
+    }
+
+    #[cfg(test)]
+    pub(crate) fn into_inner(self) -> Box<dyn BlockHeaderStorageOps> { self.inner }
+}
+
+#[async_trait]
+#[cfg_attr(all(test, not(target_arch = "wasm32")), mockable)]
+impl BlockHeaderStorageOps for BlockHeaderStorage {
+    async fn init(&self) -> Result<(), BlockHeaderStorageError> { self.inner.init().await }
+
+    async fn is_initialized_for(&self) -> Result<bool, BlockHeaderStorageError> {
+        self.inner.is_initialized_for().await
+    }
+
+    async fn add_block_headers_to_storage(
+        &self,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), BlockHeaderStorageError> {
+        self.inner.add_block_headers_to_storage(headers).await
+    }
+
+    async fn get_block_header(&self, height: u64) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        self.inner.get_block_header(height).await
+    }
+
+    async fn get_block_header_raw(&self, height: u64) -> Result<Option<String>, BlockHeaderStorageError> {
+        self.inner.get_block_header_raw(height).await
+    }
+
+    async fn get_last_block_height(&self) -> Result<Option<u64>, BlockHeaderStorageError> {
+        self.inner.get_last_block_height().await
+    }
+
+    async fn get_last_block_header_with_non_max_bits(
+        &self,
+        max_bits: u32,
+    ) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        self.inner.get_last_block_header_with_non_max_bits(max_bits).await
+    }
+
+    async fn get_block_height_by_hash(&self, hash: H256) -> Result<Option<i64>, BlockHeaderStorageError> {
+        self.inner.get_block_height_by_hash(hash).await
+    }
+
+    async fn remove_headers_up_to_height(&self, to_height: u64) -> Result<(), BlockHeaderStorageError> {
+        self.inner.remove_headers_up_to_height(to_height).await
+    }
+
+    async fn is_table_empty(&self) -> Result<(), BlockHeaderStorageError> { self.inner.is_table_empty().await }
+}
+
+#[cfg(test)]
+mod block_headers_storage_tests {
+    use super::*;
+    use chain::BlockHeaderBits;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+
+    cfg_wasm32! {
+        use wasm_bindgen_test::*;
+        use spv_validation::work::MAX_BITS_BTC;
+
+        wasm_bindgen_test_configure!(run_in_browser);
+    }
+
+    cfg_native! {
+        use spv_validation::work::MAX_BITS_BTC;
+
+    }
+
+    pub(crate) async fn test_add_block_headers_impl(for_coin: &str) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+        storage.init().await.unwrap();
+
+        let mut headers = HashMap::with_capacity(1);
+        let block_header: BlockHeader = "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".into();
+        headers.insert(520481, block_header);
+        storage.add_block_headers_to_storage(headers).await.unwrap();
+        assert!(!storage.is_table_empty().await.is_ok());
+    }
+
+    pub(crate) async fn test_get_block_header_impl(for_coin: &str) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+        storage.init().await.unwrap();
+
+        let mut headers = HashMap::with_capacity(1);
+        let block_header: BlockHeader = "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".into();
+        headers.insert(520481, block_header);
+
+        storage.add_block_headers_to_storage(headers).await.unwrap();
+        assert!(!storage.is_table_empty().await.is_ok());
+
+        let hex = storage.get_block_header_raw(520481).await.unwrap().unwrap();
+        assert_eq!(hex, "0000002076d41d3e4b0bfd4c0d3b30aa69fdff3ed35d85829efd04000000000000000000b386498b583390959d9bac72346986e3015e83ac0b54bc7747a11a494ac35c94bb3ce65a53fb45177f7e311c".to_string());
+
+        let block_header = storage.get_block_header(520481).await.unwrap().unwrap();
+        let block_hash: H256 = "0000000000000000002e31d0714a5ab23100945ff87ba2d856cd566a3c9344ec".into();
+        assert_eq!(block_header.hash(), block_hash.reversed());
+
+        let height = storage.get_block_height_by_hash(block_hash).await.unwrap().unwrap();
+        assert_eq!(height, 520481);
+    }
+
+    pub(crate) async fn test_get_last_block_header_with_non_max_bits_impl(for_coin: &str) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+        storage.init().await.unwrap();
+
+        let mut headers = HashMap::with_capacity(2);
+
+        // This block has max difficulty
+        // https://live.blockcypher.com/btc-testnet/block/00000000961a9d117feb57e516e17217207a849bf6cdfce529f31d9a96053530/
+        let block_header: BlockHeader = "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0".into();
+        headers.insert(201595, block_header);
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let expected_block_header: BlockHeader = "02000000cbed7fd98f1f06e85c47e13ff956533642056be45e7e6b532d4d768f00000000f2680982f333fcc9afa7f9a5e2a84dc54b7fe10605cd187362980b3aa882e9683be21353ab80011c813e1fc0".into();
+        headers.insert(201594, expected_block_header.clone());
+
+        // This block has max difficulty
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let block_header: BlockHeader = "020000001f38c8e30b30af912fbd4c3e781506713cfb43e73dff6250348e060000000000afa8f3eede276ccb4c4ee649ad9823fc181632f262848ca330733e7e7e541beb9be51353ffff001d00a63037".into();
+        headers.insert(201593, block_header);
+
+        storage.add_block_headers_to_storage(headers).await.unwrap();
+        assert!(!storage.is_table_empty().await.is_ok());
+
+        let actual_block_header = storage
+            .get_last_block_header_with_non_max_bits(MAX_BITS_BTC)
+            .await
+            .unwrap()
+            .unwrap();
+        assert_ne!(actual_block_header.bits, BlockHeaderBits::Compact(MAX_BITS_BTC.into()));
+        assert_eq!(actual_block_header, expected_block_header);
+    }
+
+    pub(crate) async fn test_get_last_block_height_impl(for_coin: &str) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+        storage.init().await.unwrap();
+
+        let mut headers = HashMap::with_capacity(2);
+
+        // https://live.blockcypher.com/btc-testnet/block/00000000961a9d117feb57e516e17217207a849bf6cdfce529f31d9a96053530/
+        let block_header: BlockHeader = "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0".into();
+        headers.insert(201595, block_header);
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let block_header: BlockHeader = "02000000cbed7fd98f1f06e85c47e13ff956533642056be45e7e6b532d4d768f00000000f2680982f333fcc9afa7f9a5e2a84dc54b7fe10605cd187362980b3aa882e9683be21353ab80011c813e1fc0".into();
+        headers.insert(201594, block_header);
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let block_header: BlockHeader = "020000001f38c8e30b30af912fbd4c3e781506713cfb43e73dff6250348e060000000000afa8f3eede276ccb4c4ee649ad9823fc181632f262848ca330733e7e7e541beb9be51353ffff001d00a63037".into();
+        headers.insert(201593, block_header);
+
+        storage.add_block_headers_to_storage(headers).await.unwrap();
+        assert!(!storage.is_table_empty().await.is_ok());
+
+        let last_block_height = storage.get_last_block_height().await.unwrap();
+        assert_eq!(last_block_height.unwrap(), 201595);
+    }
+
+    pub(crate) async fn test_remove_headers_up_to_height_impl(for_coin: &str) {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+        storage.init().await.unwrap();
+
+        let mut headers = HashMap::with_capacity(2);
+
+        // https://live.blockcypher.com/btc-testnet/block/00000000961a9d117feb57e516e17217207a849bf6cdfce529f31d9a96053530/
+        let block_header: BlockHeader = "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0".into();
+        headers.insert(201595, block_header);
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let block_header: BlockHeader = "02000000cbed7fd98f1f06e85c47e13ff956533642056be45e7e6b532d4d768f00000000f2680982f333fcc9afa7f9a5e2a84dc54b7fe10605cd187362980b3aa882e9683be21353ab80011c813e1fc0".into();
+        headers.insert(201594, block_header);
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let block_header: BlockHeader = "020000001f38c8e30b30af912fbd4c3e781506713cfb43e73dff6250348e060000000000afa8f3eede276ccb4c4ee649ad9823fc181632f262848ca330733e7e7e541beb9be51353ffff001d00a63037".into();
+        headers.insert(201593, block_header);
+
+        storage.add_block_headers_to_storage(headers).await.unwrap();
+        assert!(!storage.is_table_empty().await.is_ok());
+
+        // Remove 2 headers from storage.
+        storage.remove_headers_up_to_height(201594).await.unwrap();
+
+        // Validate that blockers 201593..201594 are removed from storage.
+        for h in 201593..201594 {
+            let block_header = storage.get_block_header(h).await.unwrap();
+            assert!(block_header.is_none());
+        }
+
+        // Last height should be 201595
+        let last_block_height = storage.get_last_block_height().await.unwrap();
+        assert_eq!(last_block_height.unwrap(), 201595);
+    }
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod native_tests {
+    use super::*;
+    use crate::utxo::utxo_block_header_storage::block_headers_storage_tests::*;
+    use common::block_on;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+
+    #[test]
+    fn test_init_collection() {
+        let for_coin = "init_collection";
+        let ctx = mm_ctx_with_custom_db();
+        let storage = BlockHeaderStorage::new_from_ctx(ctx, for_coin.to_string())
+            .unwrap()
+            .into_inner();
+
+        let initialized = block_on(storage.is_initialized_for()).unwrap();
+        assert!(!initialized);
+
+        block_on(storage.init()).unwrap();
+        // repetitive init must not fail
+        block_on(storage.init()).unwrap();
+
+        let initialized = block_on(storage.is_initialized_for()).unwrap();
+        assert!(initialized);
+    }
+
+    const FOR_COIN_GET: &str = "get";
+    const FOR_COIN_INSERT: &str = "insert";
+    #[test]
+    fn test_add_block_headers() { block_on(test_add_block_headers_impl(FOR_COIN_INSERT)) }
+
+    #[test]
+    fn test_test_get_block_header() { block_on(test_get_block_header_impl(FOR_COIN_GET)) }
+
+    #[test]
+    fn test_get_last_block_header_with_non_max_bits() {
+        block_on(test_get_last_block_header_with_non_max_bits_impl(FOR_COIN_GET))
+    }
+
+    #[test]
+    fn test_get_last_block_height() { block_on(test_get_last_block_height_impl(FOR_COIN_GET)) }
+
+    #[test]
+    fn test_remove_headers_up_to_height() { block_on(test_remove_headers_up_to_height_impl(FOR_COIN_GET)) }
+}
+
+#[cfg(all(test, target_arch = "wasm32"))]
+mod wasm_test {
+    use super::*;
+    use crate::utxo::utxo_block_header_storage::block_headers_storage_tests::*;
+    use common::log::wasm_log::register_wasm_log;
+    use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+    use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    const FOR_COIN: &str = "RICK";
+
+    #[wasm_bindgen_test]
+    async fn test_storage_init() {
+        let ctx = mm_ctx_with_custom_db();
+        let storage = IDBBlockHeadersStorage::new(&ctx, "RICK".to_string());
+
+        register_wasm_log();
+
+        let initialized = storage.is_initialized_for().await.unwrap();
+        assert!(initialized);
+
+        // repetitive init must not fail
+        storage.init().await.unwrap();
+
+        let initialized = storage.is_initialized_for().await.unwrap();
+        assert!(initialized);
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_add_block_headers() { test_add_block_headers_impl(FOR_COIN).await }
+
+    #[wasm_bindgen_test]
+    async fn test_test_get_block_header() { test_get_block_header_impl(FOR_COIN).await }
+
+    #[wasm_bindgen_test]
+    async fn test_get_last_block_header_with_non_max_bits() {
+        test_get_last_block_header_with_non_max_bits_impl(FOR_COIN).await
+    }
+
+    #[wasm_bindgen_test]
+    async fn test_get_last_block_height() { test_get_last_block_height_impl(FOR_COIN).await }
+
+    #[wasm_bindgen_test]
+    async fn test_remove_headers_up_to_height() { test_remove_headers_up_to_height_impl(FOR_COIN).await }
+}
diff --git a/mm2src/coins/utxo/utxo_block_header_storage/sql_block_header_storage.rs b/mm2src/coins/utxo/utxo_block_header_storage/sql_block_header_storage.rs
new file mode 100644
index 0000000000..7ae019a57d
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage/sql_block_header_storage.rs
@@ -0,0 +1,348 @@
+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 primitives::hash::H256;
+use serialization::Reader;
+use spv_validation::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use std::collections::HashMap;
+use std::convert::TryInto;
+use std::num::TryFromIntError;
+use std::sync::{Arc, Mutex};
+
+pub(crate) 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, BlockHeaderStorageError> {
+    let table_name = block_headers_cache_table(for_coin);
+    validate_table_name(&table_name).map_err(|e| BlockHeaderStorageError::CantRetrieveTableError {
+        coin: for_coin.to_string(),
+        reason: e.to_string(),
+    })?;
+    Ok(table_name)
+}
+
+fn create_block_header_cache_table_sql(for_coin: &str) -> Result<String, 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,
+            block_bits INTEGER NOT NULL,
+            block_hash VARCHAR(255) NOT NULL UNIQUE
+        );",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn insert_block_header_in_cache_sql(for_coin: &str) -> Result<String, 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, block_bits, block_hash) VALUES (?1, ?2, ?3, ?4);",
+        table_name
+    );
+    Ok(sql)
+}
+
+fn get_block_header_by_height(for_coin: &str) -> Result<String, 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)
+}
+
+fn get_last_block_height_sql(for_coin: &str) -> Result<String, BlockHeaderStorageError> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!(
+        "SELECT block_height FROM {} ORDER BY block_height DESC LIMIT 1;",
+        table_name
+    );
+
+    Ok(sql)
+}
+
+fn get_last_block_header_with_non_max_bits_sql(
+    for_coin: &str,
+    max_bits: u32,
+) -> Result<String, BlockHeaderStorageError> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!(
+        "SELECT hex FROM {} WHERE block_bits<>{} ORDER BY block_height DESC LIMIT 1;",
+        table_name, max_bits
+    );
+
+    Ok(sql)
+}
+
+fn get_block_height_by_hash(for_coin: &str) -> Result<String, BlockHeaderStorageError> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!("SELECT block_height FROM {} WHERE block_hash=?1;", table_name);
+
+    Ok(sql)
+}
+
+fn remove_headers_up_to_height_sql(for_coin: &str, to_height: u64) -> Result<String, BlockHeaderStorageError> {
+    let table_name = get_table_name_and_validate(for_coin)?;
+    let sql = format!("DELETE FROM {table_name} WHERE block_height <= {to_height};");
+
+    Ok(sql)
+}
+
+#[derive(Clone, Debug)]
+pub struct SqliteBlockHeadersStorage {
+    pub ticker: String,
+    pub conn: Arc<Mutex<Connection>>,
+}
+
+fn query_single_row<T, P, F>(
+    conn: &Connection,
+    query: &str,
+    params: P,
+    map_fn: F,
+) -> Result<Option<T>, 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| BlockHeaderStorageError::QueryError {
+        query: query.to_string(),
+        reason: e.to_string(),
+    })
+}
+
+#[async_trait]
+impl BlockHeaderStorageOps for SqliteBlockHeadersStorage {
+    async fn init(&self) -> Result<(), BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let selfi = self.clone();
+        let sql_cache = create_block_header_cache_table_sql(&coin)?;
+        async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            conn.execute(&sql_cache, NO_PARAMS).map(|_| ()).map_err(|e| {
+                BlockHeaderStorageError::InitializationError {
+                    coin,
+                    reason: e.to_string(),
+                }
+            })?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn is_initialized_for(&self) -> Result<bool, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let block_headers_cache_table = get_table_name_and_validate(&coin)?;
+        let selfi = self.clone();
+        async_blocking(move || {
+            let conn = selfi.conn.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_block_headers_to_storage(
+        &self,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let selfi = self.clone();
+        async_blocking(move || {
+            let mut conn = selfi.conn.lock().unwrap();
+            let sql_transaction = conn
+                .transaction()
+                .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+                    coin: coin.clone(),
+                    reason: e.to_string(),
+                })?;
+
+            for (height, header) in headers {
+                let height = height as i64;
+                let hash = header.hash().reversed().to_string();
+                let raw_header = hex::encode(header.raw());
+                let bits: u32 = header.bits.into();
+                let block_cache_params = [
+                    &height as &dyn ToSql,
+                    &raw_header as &dyn ToSql,
+                    &bits as &dyn ToSql,
+                    &hash as &dyn ToSql,
+                ];
+                sql_transaction
+                    .execute(&insert_block_header_in_cache_sql(&coin.clone())?, block_cache_params)
+                    .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+                        coin: coin.clone(),
+                        reason: e.to_string(),
+                    })?;
+            }
+            sql_transaction
+                .commit()
+                .map_err(|e| BlockHeaderStorageError::AddToStorageError {
+                    coin: coin.clone(),
+                    reason: e.to_string(),
+                })?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn get_block_header(&self, height: u64) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        if let Some(header_raw) = self.get_block_header_raw(height).await? {
+            let serialized = &hex::decode(header_raw).map_err(|e| BlockHeaderStorageError::DecodeError {
+                coin: coin.clone(),
+                reason: e.to_string(),
+            })?;
+            let mut reader = Reader::new_with_coin_variant(serialized, coin.as_str().into());
+            let header: BlockHeader =
+                reader
+                    .read()
+                    .map_err(|e: serialization::Error| BlockHeaderStorageError::DecodeError {
+                        coin,
+                        reason: e.to_string(),
+                    })?;
+            return Ok(Some(header));
+        }
+        Ok(None)
+    }
+
+    async fn get_block_header_raw(&self, height: u64) -> Result<Option<String>, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let params = [height as i64];
+        let sql = get_block_header_by_height(&coin)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            query_single_row(&conn, &sql, params, string_from_row)
+        })
+        .await
+        .map_err(|e| BlockHeaderStorageError::GetFromStorageError {
+            coin,
+            reason: e.to_string(),
+        })
+    }
+
+    async fn get_last_block_height(&self) -> Result<Option<u64>, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let sql = get_last_block_height_sql(&coin)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            query_single_row(&conn, &sql, NO_PARAMS, |row| row.get::<_, i64>(0))
+        })
+        .await
+        .map_err(|e| BlockHeaderStorageError::GetFromStorageError {
+            coin: coin.clone(),
+            reason: e.to_string(),
+        })?
+        .map(|h| h.try_into())
+        .transpose()
+        .map_err(|e: TryFromIntError| BlockHeaderStorageError::DecodeError {
+            coin,
+            reason: e.to_string(),
+        })
+    }
+
+    async fn get_last_block_header_with_non_max_bits(
+        &self,
+        max_bits: u32,
+    ) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let sql = get_last_block_header_with_non_max_bits_sql(&coin, max_bits)?;
+        let selfi = self.clone();
+
+        let maybe_header_raw = async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            query_single_row(&conn, &sql, NO_PARAMS, string_from_row)
+        })
+        .await
+        .map_err(|e| BlockHeaderStorageError::GetFromStorageError {
+            coin: coin.clone(),
+            reason: e.to_string(),
+        })?;
+
+        if let Some(header_raw) = maybe_header_raw {
+            let header = BlockHeader::try_from_string_with_coin_variant(header_raw, coin.as_str().into()).map_err(
+                |e: serialization::Error| BlockHeaderStorageError::DecodeError {
+                    coin,
+                    reason: e.to_string(),
+                },
+            )?;
+            return Ok(Some(header));
+        }
+        Ok(None)
+    }
+
+    async fn get_block_height_by_hash(&self, hash: H256) -> Result<Option<i64>, BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let params = [hash.to_string()];
+        let sql = get_block_height_by_hash(&coin)?;
+        let selfi = self.clone();
+
+        async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            query_single_row(&conn, &sql, params, |row| row.get(0))
+        })
+        .await
+        .map_err(|e| BlockHeaderStorageError::GetFromStorageError {
+            coin,
+            reason: e.to_string(),
+        })
+    }
+
+    async fn remove_headers_up_to_height(&self, to_height: u64) -> Result<(), BlockHeaderStorageError> {
+        let coin = self.ticker.clone();
+        let selfi = self.clone();
+        let sql = remove_headers_up_to_height_sql(&coin, to_height)?;
+
+        async_blocking(move || {
+            let conn = selfi.conn.lock().unwrap();
+            conn.execute(&sql, NO_PARAMS)
+                .map_err(|e| BlockHeaderStorageError::UnableToDeleteHeaders {
+                    coin: coin.clone(),
+                    to_height,
+                    reason: e.to_string(),
+                })?;
+            Ok(())
+        })
+        .await
+    }
+
+    async fn is_table_empty(&self) -> Result<(), BlockHeaderStorageError> {
+        let table_name = get_table_name_and_validate(&self.ticker).unwrap();
+        let sql = format!("SELECT COUNT(block_height) FROM {table_name};");
+        let conn = self.conn.lock().unwrap();
+        let rows_count: u32 = conn.query_row(&sql, NO_PARAMS, |row| row.get(0)).unwrap();
+        if rows_count == 0 {
+            return Ok(());
+        };
+
+        Err(BlockHeaderStorageError::table_err(
+            &self.ticker,
+            "Table is not empty".to_string(),
+        ))
+    }
+}
+
+#[cfg(test)]
+impl SqliteBlockHeadersStorage {
+    pub fn in_memory(ticker: String) -> Self {
+        SqliteBlockHeadersStorage {
+            ticker,
+            conn: Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        }
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_block_header_storage/wasm.rs b/mm2src/coins/utxo/utxo_block_header_storage/wasm.rs
new file mode 100644
index 0000000000..f6d54b5114
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage/wasm.rs
@@ -0,0 +1,7 @@
+mod block_header_table;
+mod indexeddb_block_header_storage;
+
+#[cfg(target_arch = "wasm32")]
+pub use block_header_table::BlockHeaderStorageTable;
+#[cfg(target_arch = "wasm32")]
+pub use indexeddb_block_header_storage::IDBBlockHeadersStorage;
diff --git a/mm2src/coins/utxo/utxo_block_header_storage/wasm/block_header_table.rs b/mm2src/coins/utxo/utxo_block_header_storage/wasm/block_header_table.rs
new file mode 100644
index 0000000000..79121043d6
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage/wasm/block_header_table.rs
@@ -0,0 +1,32 @@
+use mm2_db::indexed_db::{DbUpgrader, OnUpgradeResult, TableSignature};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct BlockHeaderStorageTable {
+    pub height: u64,
+    pub bits: u32,
+    pub hash: String,
+    pub raw_header: String,
+    pub ticker: String,
+}
+
+impl BlockHeaderStorageTable {
+    pub const HEIGHT_TICKER_INDEX: &str = "block_height_ticker_index";
+    pub const HASH_TICKER_INDEX: &str = "block_hash_ticker_index";
+}
+
+impl TableSignature for BlockHeaderStorageTable {
+    fn table_name() -> &'static str { "block_header_storage_cache_table" }
+
+    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(Self::HEIGHT_TICKER_INDEX, &["height", "ticker"], true)?;
+                table.create_multi_index(Self::HASH_TICKER_INDEX, &["hash", "ticker"], true)?;
+                table.create_index("ticker", false)?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_block_header_storage/wasm/indexeddb_block_header_storage.rs b/mm2src/coins/utxo/utxo_block_header_storage/wasm/indexeddb_block_header_storage.rs
new file mode 100644
index 0000000000..c5a02dd151
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_block_header_storage/wasm/indexeddb_block_header_storage.rs
@@ -0,0 +1,345 @@
+use super::BlockHeaderStorageTable;
+
+use async_trait::async_trait;
+use chain::BlockHeader;
+use mm2_core::mm_ctx::MmArc;
+use mm2_db::indexed_db::cursor_prelude::{CollectCursor, WithOnly};
+use mm2_db::indexed_db::{ConstructibleDb, DbIdentifier, DbInstance, DbLocked, IndexedDb, IndexedDbBuilder,
+                         InitDbResult, MultiIndex, SharedDb};
+use mm2_err_handle::prelude::*;
+use primitives::hash::H256;
+use serialization::Reader;
+use spv_validation::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use std::collections::HashMap;
+
+const DB_NAME: &str = "block_headers_cache";
+const DB_VERSION: u32 = 1;
+
+pub type IDBBlockHeadersStorageRes<T> = MmResult<T, BlockHeaderStorageError>;
+pub type IDBBlockHeadersInnerLocked<'a> = DbLocked<'a, IDBBlockHeadersInner>;
+
+pub struct IDBBlockHeadersInner {
+    pub inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for IDBBlockHeadersInner {
+    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::<BlockHeaderStorageTable>()
+            .build()
+            .await?;
+
+        Ok(Self { inner })
+    }
+}
+
+impl IDBBlockHeadersInner {
+    pub fn get_inner(&self) -> &IndexedDb { &self.inner }
+}
+
+pub struct IDBBlockHeadersStorage {
+    pub db: SharedDb<IDBBlockHeadersInner>,
+    pub ticker: String,
+}
+
+impl IDBBlockHeadersStorage {
+    pub fn new(ctx: &MmArc, ticker: String) -> Self {
+        Self {
+            db: ConstructibleDb::new(ctx).into_shared(),
+            ticker,
+        }
+    }
+
+    async fn lock_db(&self) -> IDBBlockHeadersStorageRes<IDBBlockHeadersInnerLocked<'_>> {
+        self.db
+            .get_or_initialize()
+            .await
+            .mm_err(|err| BlockHeaderStorageError::init_err(&self.ticker, err.to_string()))
+    }
+}
+
+#[async_trait]
+impl BlockHeaderStorageOps for IDBBlockHeadersStorage {
+    async fn init(&self) -> Result<(), BlockHeaderStorageError> { Ok(()) }
+
+    async fn is_initialized_for(&self) -> Result<bool, BlockHeaderStorageError> { Ok(true) }
+
+    async fn add_block_headers_to_storage(
+        &self,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::add_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::add_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        for (height, header) in headers {
+            let hash = header.hash().reversed().to_string();
+            let raw_header = hex::encode(header.raw());
+            let bits: u32 = header.bits.into();
+            let headers_to_store = BlockHeaderStorageTable {
+                ticker: ticker.clone(),
+                height,
+                bits,
+                hash,
+                raw_header,
+            };
+            let index_keys = MultiIndex::new(BlockHeaderStorageTable::HEIGHT_TICKER_INDEX)
+                .with_value(&height)
+                .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?
+                .with_value(&ticker)
+                .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+            block_headers_db
+                .replace_item_by_unique_multi_index(index_keys, &headers_to_store)
+                .await
+                .map_err(|err| BlockHeaderStorageError::add_err(&ticker, err.to_string()))?;
+        }
+        Ok(())
+    }
+
+    async fn get_block_header(&self, height: u64) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        if let Some(raw_header) = self.get_block_header_raw(height).await? {
+            let serialized = &hex::decode(raw_header).map_err(|e| BlockHeaderStorageError::DecodeError {
+                coin: ticker.clone(),
+                reason: e.to_string(),
+            })?;
+            let mut reader = Reader::new_with_coin_variant(serialized, ticker.as_str().into());
+            let header: BlockHeader =
+                reader
+                    .read()
+                    .map_err(|e: serialization::Error| BlockHeaderStorageError::DecodeError {
+                        coin: ticker,
+                        reason: e.to_string(),
+                    })?;
+
+            return Ok(Some(header));
+        };
+
+        Ok(None)
+    }
+
+    async fn get_block_header_raw(&self, height: u64) -> Result<Option<String>, BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+        let index_keys = MultiIndex::new(BlockHeaderStorageTable::HEIGHT_TICKER_INDEX)
+            .with_value(&height)
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?
+            .with_value(&ticker)
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        Ok(block_headers_db
+            .get_item_by_unique_multi_index(index_keys)
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .map(|raw| raw.1.raw_header))
+    }
+
+    async fn get_last_block_height(&self) -> Result<Option<u64>, BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        // Todo: use open_cursor with direction to optimze this process.
+        let res = block_headers_db
+            .open_cursor("ticker")
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .only("ticker", ticker.clone())
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .collect()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .into_iter()
+            .map(|(_item_id, item)| item.height)
+            .collect::<Vec<_>>();
+
+        Ok(res.into_iter().max())
+    }
+
+    async fn get_last_block_header_with_non_max_bits(
+        &self,
+        max_bits: u32,
+    ) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        // Todo: use open_cursor with direction to optimze this process.
+        let res = block_headers_db
+            .open_cursor("ticker")
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .only("ticker", ticker.clone())
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .collect()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .into_iter()
+            .map(|(_item_id, item)| item)
+            .collect::<Vec<_>>();
+        let res = res
+            .into_iter()
+            .filter_map(|e| if e.bits != max_bits { Some(e) } else { None })
+            .collect::<Vec<_>>();
+
+        for header in res {
+            let serialized = &hex::decode(header.raw_header).map_err(|e| BlockHeaderStorageError::DecodeError {
+                coin: ticker.clone(),
+                reason: e.to_string(),
+            })?;
+            let mut reader = Reader::new_with_coin_variant(serialized, ticker.as_str().into());
+            let header: BlockHeader =
+                reader
+                    .read()
+                    .map_err(|e: serialization::Error| BlockHeaderStorageError::DecodeError {
+                        coin: ticker,
+                        reason: e.to_string(),
+                    })?;
+
+            return Ok(Some(header));
+        }
+
+        Ok(None)
+    }
+
+    async fn get_block_height_by_hash(&self, hash: H256) -> Result<Option<i64>, BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+        let index_keys = MultiIndex::new(BlockHeaderStorageTable::HASH_TICKER_INDEX)
+            .with_value(&hash.to_string())
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?
+            .with_value(&ticker)
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        Ok(block_headers_db
+            .get_item_by_unique_multi_index(index_keys)
+            .await
+            .map_err(|err| BlockHeaderStorageError::get_err(&ticker, err.to_string()))?
+            .map(|raw| raw.1.height as i64))
+    }
+
+    async fn remove_headers_up_to_height(&self, to_height: u64) -> Result<(), BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::delete_err(&ticker, err.to_string(), to_height))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::delete_err(&ticker, err.to_string(), to_height))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        for height in 0..=to_height {
+            let index_keys = MultiIndex::new(BlockHeaderStorageTable::HEIGHT_TICKER_INDEX)
+                .with_value(&height)
+                .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?
+                .with_value(&ticker)
+                .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+            block_headers_db
+                .delete_item_by_unique_multi_index(index_keys)
+                .await
+                .map_err(|err| BlockHeaderStorageError::delete_err(&ticker, err.to_string(), to_height))?;
+        }
+
+        Ok(())
+    }
+
+    async fn is_table_empty(&self) -> Result<(), BlockHeaderStorageError> {
+        let ticker = self.ticker.clone();
+        let locked_db = self
+            .lock_db()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+        let db_transaction = locked_db
+            .get_inner()
+            .transaction()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+        let block_headers_db = db_transaction
+            .table::<BlockHeaderStorageTable>()
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        let items = block_headers_db
+            .get_items("ticker", ticker.clone())
+            .await
+            .map_err(|err| BlockHeaderStorageError::table_err(&ticker, err.to_string()))?;
+
+        if !items.is_empty() {
+            return Err(BlockHeaderStorageError::table_err(
+                &ticker,
+                "Table is not empty".to_string(),
+            ));
+        };
+
+        Ok(())
+    }
+}
diff --git a/mm2src/coins/utxo/utxo_builder/mod.rs b/mm2src/coins/utxo/utxo_builder/mod.rs
index 9c1cf135d0..88be32e275 100644
--- a/mm2src/coins/utxo/utxo_builder/mod.rs
+++ b/mm2src/coins/utxo/utxo_builder/mod.rs
@@ -2,8 +2,11 @@ mod utxo_arc_builder;
 mod utxo_coin_builder;
 mod utxo_conf_builder;
 
-pub use utxo_arc_builder::{MergeUtxoArcOps, UtxoArcBuilder};
+pub use utxo_arc_builder::{BlockHeaderUtxoArcOps, MergeUtxoArcOps, UtxoArcBuilder};
 pub use utxo_coin_builder::{UtxoCoinBuildError, UtxoCoinBuildResult, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
-                            UtxoCoinWithIguanaPrivKeyBuilder, UtxoFieldsWithHardwareWalletBuilder,
-                            UtxoFieldsWithIguanaPrivKeyBuilder};
+                            UtxoFieldsWithGlobalHDBuilder, UtxoFieldsWithHardwareWalletBuilder,
+                            UtxoFieldsWithIguanaSecretBuilder};
 pub use utxo_conf_builder::{UtxoConfBuilder, UtxoConfError, UtxoConfResult};
+
+#[cfg(test)]
+pub(crate) use utxo_arc_builder::{block_header_utxo_loop, BlockHeaderUtxoLoopExtraArgs};
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs
index d4964b12c4..ecd204d30f 100644
--- a/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs
+++ b/mm2src/coins/utxo/utxo_builder/utxo_arc_builder.rs
@@ -1,16 +1,30 @@
+use crate::utxo::rpc_clients::{ElectrumClient, UtxoRpcClientEnum};
 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};
+                                UtxoFieldsWithGlobalHDBuilder, UtxoFieldsWithHardwareWalletBuilder,
+                                UtxoFieldsWithIguanaSecretBuilder};
+use crate::utxo::{generate_and_send_tx, FeePolicy, GetUtxoListOps, UtxoArc, UtxoCommonOps, UtxoSyncStatusLoopHandle,
+                  UtxoWeak};
+use crate::{DerivationMethod, PrivKeyBuildPolicy, UtxoActivationParams};
 use async_trait::async_trait;
-use common::executor::spawn;
-use common::log::info;
-use futures::future::{abortable, AbortHandle};
+use chain::TransactionOutput;
+use common::executor::{AbortSettings, SpawnAbortable, Timer};
+use common::log::{error, info, warn};
+use futures::compat::Future01CompatExt;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+#[cfg(test)] use mocktopus::macros::*;
+use script::Builder;
 use serde_json::Value as Json;
+use serialization::Reader;
+use spv_validation::conf::SPVConf;
+use spv_validation::helpers_validation::validate_headers;
+use spv_validation::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use std::collections::HashMap;
+use std::num::NonZeroU64;
+
+const FETCH_BLOCK_HEADERS_ATTEMPTS: u64 = 3;
+const CHUNK_SIZE_REDUCER_VALUE: u64 = 100;
 
 pub struct UtxoArcBuilder<'a, F, T>
 where
@@ -20,7 +34,7 @@ where
     ticker: &'a str,
     conf: &'a Json,
     activation_params: &'a UtxoActivationParams,
-    priv_key_policy: PrivKeyBuildPolicy<'a>,
+    priv_key_policy: PrivKeyBuildPolicy,
     constructor: F,
 }
 
@@ -33,7 +47,7 @@ where
         ticker: &'a str,
         conf: &'a Json,
         activation_params: &'a UtxoActivationParams,
-        priv_key_policy: PrivKeyBuildPolicy<'a>,
+        priv_key_policy: PrivKeyBuildPolicy,
         constructor: F,
     ) -> UtxoArcBuilder<'a, F, T> {
         UtxoArcBuilder {
@@ -61,7 +75,12 @@ where
     fn ticker(&self) -> &str { self.ticker }
 }
 
-impl<'a, F, T> UtxoFieldsWithIguanaPrivKeyBuilder for UtxoArcBuilder<'a, F, T> where
+impl<'a, F, T> UtxoFieldsWithIguanaSecretBuilder for UtxoArcBuilder<'a, F, T> where
+    F: Fn(UtxoArc) -> T + Send + Sync + 'static
+{
+}
+
+impl<'a, F, T> UtxoFieldsWithGlobalHDBuilder for UtxoArcBuilder<'a, F, T> where
     F: Fn(UtxoArc) -> T + Send + Sync + 'static
 {
 }
@@ -80,22 +99,31 @@ where
     type ResultCoin = T;
     type Error = UtxoCoinBuildError;
 
-    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_> { self.priv_key_policy.clone() }
+    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 sync_status_loop_handle = utxo.block_headers_status_notifier.clone();
+        let spv_conf = utxo.conf.spv_conf.clone();
         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);
+        self.spawn_merge_utxo_loop_if_required(&utxo_arc, self.constructor.clone());
+
+        let result_coin = (self.constructor)(utxo_arc.clone());
+
+        if let (Some(spv_conf), Some(sync_handle)) = (spv_conf, sync_status_loop_handle) {
+            spv_conf.validate(self.ticker).map_to_mm(UtxoCoinBuildError::SPVError)?;
+
+            let block_count = result_coin
+                .as_ref()
+                .rpc_client
+                .get_block_count()
+                .compat()
+                .await
+                .map_err(|err| UtxoCoinBuildError::CantGetBlockCount(err.to_string()))?;
+            self.spawn_block_header_utxo_loop(&utxo_arc, self.constructor.clone(), sync_handle, block_count, spv_conf);
         }
+
         Ok(result_coin)
     }
 }
@@ -114,50 +142,326 @@ where
 {
 }
 
+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) => constructor(arc),
+            None => break,
+        };
+
+        let my_address = match coin.as_ref().derivation_method {
+            DerivationMethod::SingleAddress(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.get_unspent_ordered_list(my_address).await {
+            Ok((unspents, recently_spent)) => (unspents, recently_spent),
+            Err(e) => {
+                error!("Error {} on get_unspent_ordered_list of coin {}", e, ticker);
+                continue;
+            },
+        };
+        if unspents.len() >= merge_at {
+            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(&my_address.hash).to_bytes();
+            let output = TransactionOutput { value, script_pubkey };
+            let merge_tx_fut = generate_and_send_tx(
+                &coin,
+                unspents,
+                None,
+                FeePolicy::DeductFromOutput(0),
+                recently_spent,
+                vec![output],
+            );
+            match merge_tx_fut.await {
+                Ok(tx) => info!(
+                    "UTXO merge successful for coin {}, tx_hash {:?}",
+                    ticker,
+                    tx.hash().reversed()
+                ),
+                Err(e) => error!("Error {:?} on UTXO merge attempt for coin {}", e, ticker),
+            }
+        }
+    }
+}
+
 pub trait MergeUtxoArcOps<T: UtxoCommonOps + GetUtxoListOps>: UtxoCoinBuilderCommonOps {
-    fn spawn_merge_utxo_loop_if_required<F>(&self, weak: UtxoWeak, constructor: F)
+    fn spawn_merge_utxo_loop_if_required<F>(&self, utxo_arc: &UtxoArc, 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);
+        let merge_params = match self.activation_params().utxo_merge_params {
+            Some(ref merge_params) => merge_params,
+            None => return,
+        };
+
+        let ticker = self.ticker();
+        info!("Starting UTXO merge loop for coin {ticker}");
+
+        let utxo_weak = utxo_arc.downgrade();
+        let fut = merge_utxo_loop(
+            utxo_weak,
+            merge_params.merge_at,
+            merge_params.check_every,
+            merge_params.max_merge_at_once,
+            constructor,
+        );
+
+        let settings = AbortSettings::info_on_abort(format!("spawn_merge_utxo_loop_if_required stopped for {ticker}"));
+        utxo_arc
+            .abortable_system
+            .weak_spawner()
+            .spawn_with_settings(fut, settings);
+    }
+}
+
+pub(crate) struct BlockHeaderUtxoLoopExtraArgs {
+    pub(crate) chunk_size: u64,
+    pub(crate) error_sleep: f64,
+    pub(crate) success_sleep: f64,
+}
+
+#[cfg_attr(test, mockable)]
+impl Default for BlockHeaderUtxoLoopExtraArgs {
+    fn default() -> Self {
+        Self {
+            chunk_size: 2016,
+            error_sleep: 10.,
+            success_sleep: 60.,
+        }
+    }
+}
+
+pub(crate) async fn block_header_utxo_loop<T: UtxoCommonOps>(
+    weak: UtxoWeak,
+    constructor: impl Fn(UtxoArc) -> T,
+    mut sync_status_loop_handle: UtxoSyncStatusLoopHandle,
+    mut block_count: u64,
+    spv_conf: SPVConf,
+) {
+    let args = BlockHeaderUtxoLoopExtraArgs::default();
+    let mut chunk_size = args.chunk_size;
+    while let Some(arc) = weak.upgrade() {
+        let coin = constructor(arc);
+        let ticker = coin.as_ref().conf.ticker.as_str();
+        let client = match &coin.as_ref().rpc_client {
+            UtxoRpcClientEnum::Native(_) => break,
+            UtxoRpcClientEnum::Electrum(client) => client,
+        };
+
+        let storage = client.block_headers_storage();
+        let from_block_height = match storage.get_last_block_height().await {
+            Ok(Some(height)) => height,
+            Ok(None) => {
+                if let Err(err) = validate_and_store_starting_header(client, ticker, storage, &spv_conf).await {
+                    sync_status_loop_handle.notify_on_permanent_error(err);
+                    break;
+                }
+                spv_conf.starting_block_header.height
+            },
+            Err(err) => {
+                error!("Error {err:?} on getting the height of the last stored {ticker} header in DB!",);
+                sync_status_loop_handle.notify_on_temp_error(err);
+                Timer::sleep(args.error_sleep).await;
+                continue;
+            },
+        };
+
+        let mut to_block_height = from_block_height + chunk_size;
+        if to_block_height > block_count {
+            block_count = match coin.as_ref().rpc_client.get_block_count().compat().await {
+                Ok(h) => h,
+                Err(err) => {
+                    error!("Error {err:} on getting the height of the latest {ticker} block from rpc!");
+                    sync_status_loop_handle.notify_on_temp_error(err);
+                    Timer::sleep(args.error_sleep).await;
+                    continue;
+                },
+            };
+
+            // More than `chunk_size` blocks could have appeared since the last `get_block_count` RPC.
+            // So reset `to_block_height` if only `from_block_height + chunk_size > actual_block_count`.
+            if to_block_height > block_count {
+                to_block_height = block_count;
+            }
+        }
+        drop_mutability!(to_block_height);
+
+        // Todo: Add code for the case if a chain reorganization happens
+        if from_block_height == block_count {
+            sync_status_loop_handle.notify_sync_finished(to_block_height);
+            Timer::sleep(args.success_sleep).await;
+            continue;
+        }
+
+        // Check if there should be a limit on the number of headers stored in storage.
+        if let Some(max_stored_block_headers) = spv_conf.max_stored_block_headers {
+            if let Err(err) =
+                remove_excessive_headers_from_storage(storage, to_block_height, max_stored_block_headers).await
+            {
+                sync_status_loop_handle.notify_on_temp_error(err);
+                Timer::sleep(args.error_sleep).await;
+            };
         }
+
+        sync_status_loop_handle.notify_blocks_headers_sync_status(from_block_height + 1, to_block_height);
+
+        let mut fetch_blocker_headers_attempts = FETCH_BLOCK_HEADERS_ATTEMPTS;
+        let (block_registry, block_headers) = match client
+            .retrieve_headers(from_block_height + 1, to_block_height)
+            .compat()
+            .await
+        {
+            Ok(res) => res,
+            Err(error) => {
+                let err_inner = error.get_inner();
+                if err_inner.is_network_error() {
+                    log!("Network Error: Will try fetching {ticker} block headers again after 10 secs");
+                    sync_status_loop_handle.notify_on_temp_error(error);
+                    Timer::sleep(args.error_sleep).await;
+                    continue;
+                };
+
+                // If electrum returns response too large error, we will reduce the requested headers by CHUNK_SIZE_REDUCER_VALUE in every loop until we arrive at a reasonable value.
+                if err_inner.is_response_too_large() && chunk_size > CHUNK_SIZE_REDUCER_VALUE {
+                    chunk_size -= CHUNK_SIZE_REDUCER_VALUE;
+                    continue;
+                }
+
+                if fetch_blocker_headers_attempts > 0 {
+                    fetch_blocker_headers_attempts -= 1;
+                    error!("Error {error:?} on retrieving latest {ticker} headers from rpc! {fetch_blocker_headers_attempts} attempts left");
+                    // Todo: remove this electrum server and use another in this case since the headers from this server can't be retrieved
+                    sync_status_loop_handle.notify_on_temp_error(error);
+                    Timer::sleep(args.error_sleep).await;
+                    continue;
+                };
+
+                error!(
+                    "Error {error:?} on retrieving latest {ticker} headers from rpc after {FETCH_BLOCK_HEADERS_ATTEMPTS} attempts"
+                );
+                // Todo: remove this electrum server and use another in this case since the headers from this server can't be retrieved
+                sync_status_loop_handle.notify_on_permanent_error(error);
+                break;
+            },
+        };
+
+        // Validate retrieved block headers.
+        if let Err(err) = validate_headers(ticker, from_block_height, block_headers, storage, &spv_conf).await {
+            error!("Error {err:?} on validating the latest headers for {ticker}!");
+            // Todo: remove this electrum server and use another in this case since the headers from this server are invalid
+            sync_status_loop_handle.notify_on_permanent_error(err);
+            break;
+        };
+
+        let sleep = args.success_sleep;
+        ok_or_continue_after_sleep!(storage.add_block_headers_to_storage(block_registry).await, sleep);
     }
 }
 
+#[derive(Display)]
+enum StartingHeaderValidationError {
+    #[display(fmt = "Can't decode/deserialize from storage for {} - reason: {}", coin, reason)]
+    DecodeErr {
+        coin: String,
+        reason: String,
+    },
+    RpcError(String),
+    StorageError(String),
+    #[display(fmt = "Error validating starting header for {} - reason: {}", coin, reason)]
+    ValidationError {
+        coin: String,
+        reason: String,
+    },
+}
+
+async fn validate_and_store_starting_header(
+    client: &ElectrumClient,
+    ticker: &str,
+    storage: &BlockHeaderStorage,
+    spv_conf: &SPVConf,
+) -> MmResult<(), StartingHeaderValidationError> {
+    let height = spv_conf.starting_block_header.height;
+    let header_bytes = client
+        .blockchain_block_header(height)
+        .compat()
+        .await
+        .map_to_mm(|err| StartingHeaderValidationError::RpcError(err.to_string()))?;
+
+    let mut reader = Reader::new_with_coin_variant(&header_bytes, ticker.into());
+    let header = reader
+        .read()
+        .map_to_mm(|err| StartingHeaderValidationError::DecodeErr {
+            coin: ticker.to_string(),
+            reason: err.to_string(),
+        })?;
+
+    spv_conf
+        .validate_rpc_starting_header(height, &header)
+        .map_to_mm(|err| StartingHeaderValidationError::ValidationError {
+            coin: ticker.to_string(),
+            reason: err.to_string(),
+        })?;
+
+    storage
+        .add_block_headers_to_storage(HashMap::from([(height, header)]))
+        .await
+        .map_to_mm(|err| StartingHeaderValidationError::StorageError(err.to_string()))
+}
+
+async fn remove_excessive_headers_from_storage(
+    storage: &BlockHeaderStorage,
+    last_height_to_be_added: u64,
+    max_allowed_headers: NonZeroU64,
+) -> Result<(), BlockHeaderStorageError> {
+    let max_allowed_headers = max_allowed_headers.get();
+    if last_height_to_be_added > max_allowed_headers {
+        return storage
+            .remove_headers_up_to_height(last_height_to_be_added - max_allowed_headers)
+            .await;
+    }
+
+    Ok(())
+}
+
 pub trait BlockHeaderUtxoArcOps<T>: UtxoCoinBuilderCommonOps {
-    fn spawn_block_header_utxo_loop_if_required<F>(
+    fn spawn_block_header_utxo_loop<F>(
         &self,
-        weak: UtxoWeak,
-        maybe_storage: &Option<BlockHeaderStorage>,
+        utxo_arc: &UtxoArc,
         constructor: F,
-    ) -> Option<AbortHandle>
-    where
+        sync_status_loop_handle: UtxoSyncStatusLoopHandle,
+        block_count: u64,
+        spv_conf: SPVConf,
+    ) 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
+        let ticker = self.ticker();
+        info!("Starting UTXO block header loop for coin {ticker}");
+
+        let utxo_weak = utxo_arc.downgrade();
+        let fut = block_header_utxo_loop(utxo_weak, constructor, sync_status_loop_handle, block_count, spv_conf);
+
+        let settings = AbortSettings::info_on_abort(format!("spawn_block_header_utxo_loop stopped for {ticker}"));
+        utxo_arc
+            .abortable_system
+            .weak_spawner()
+            .spawn_with_settings(fut, settings);
     }
 }
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
index bb35108ccb..af9ba59f8a 100644
--- a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
+++ b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
@@ -3,21 +3,24 @@ 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 crate::utxo::utxo_block_header_storage::BlockHeaderStorage;
+use crate::utxo::utxo_builder::utxo_conf_builder::{UtxoConfBuilder, UtxoConfError};
+use crate::utxo::{output_script, utxo_common, ElectrumBuilderArgs, ElectrumProtoVerifier, ElectrumProtoVerifierEvent,
+                  RecentlySpentOutPoints, TxFee, UtxoCoinConf, UtxoCoinFields, UtxoHDAccount, UtxoHDWallet,
+                  UtxoRpcMode, UtxoSyncStatus, UtxoSyncStatusLoopHandle, DEFAULT_GAP_LIMIT, UTXO_DUST_AMOUNT};
+use crate::{BlockchainNetwork, CoinTransportMetrics, DerivationMethod, HistorySyncState, IguanaPrivKey,
+            PrivKeyBuildPolicy, PrivKeyPolicy, PrivKeyPolicyNotAllowed, RpcClientType, UtxoActivationParams};
 use async_trait::async_trait;
 use chain::TxHashAlgo;
-use common::executor::{spawn, Timer};
-use common::log::{error, info};
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::executor::{abortable_queue::AbortableQueue, AbortSettings, AbortableSystem, AbortedError, SpawnAbortable,
+                       Timer};
+use common::log::{error, info, LogOnError};
 use common::small_rng;
-use crypto::{Bip32DerPathError, Bip44DerPathError, Bip44PathToCoin, CryptoCtx, CryptoInitError, HwWalletType};
+use crypto::{Bip32DerPathError, CryptoCtx, CryptoCtxError, GlobalHDAccountArc, HwWalletType, Secp256k1Secret,
+             StandardHDPathError, StandardHDPathToCoin};
 use derive_more::Display;
-use futures::channel::mpsc;
+use futures::channel::mpsc::{channel, unbounded, Receiver as AsyncReceiver, UnboundedReceiver};
 use futures::compat::Future01CompatExt;
 use futures::lock::Mutex as AsyncMutex;
 use futures::StreamExt;
@@ -26,9 +29,12 @@ pub use keys::{Address, AddressFormat as UtxoAddressFormat, AddressHashEnum, Key
                Type as ScriptType};
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
-use primitives::hash::H256;
+use primitives::hash::H160;
 use rand::seq::SliceRandom;
 use serde_json::{self as json, Value as Json};
+use spv_validation::conf::SPVConf;
+use spv_validation::helpers_validation::SPVError;
+use spv_validation::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
 use std::sync::{Arc, Mutex, Weak};
 
 cfg_native! {
@@ -63,8 +69,8 @@ pub enum UtxoCoinBuildError {
     ElectrumProtocolVersionCheckError(String),
     #[display(fmt = "Can not detect the user home directory")]
     CantDetectUserHome,
-    #[display(fmt = "Unexpected derivation method: {}", _0)]
-    UnexpectedDerivationMethod(String),
+    #[display(fmt = "Private key policy is not allowed: {}", _0)]
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     #[display(fmt = "Hardware Wallet context is not initialized")]
     HwContextNotInitialized,
     HDWalletStorageError(HDWalletStorageError),
@@ -72,108 +78,155 @@ pub enum UtxoCoinBuildError {
         fmt = "Coin doesn't support Trezor hardware wallet. Please consider adding the 'trezor_coin' field to the coins config"
     )]
     CoinDoesntSupportTrezor,
+    BlockHeaderStorageError(BlockHeaderStorageError),
+    #[display(fmt = "Error {} on getting the height of the latest block from rpc!", _0)]
+    CantGetBlockCount(String),
     #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
+    #[display(fmt = "SPV params verificaiton failed. Error: {_0}")]
+    SPVError(SPVError),
 }
 
 impl From<UtxoConfError> for UtxoCoinBuildError {
     fn from(e: UtxoConfError) -> Self { UtxoCoinBuildError::ConfError(e) }
 }
 
-impl From<CryptoInitError> for UtxoCoinBuildError {
+impl From<CryptoCtxError> for UtxoCoinBuildError {
     /// `CryptoCtx` is expected to be initialized already.
-    fn from(crypto_err: CryptoInitError) -> Self { UtxoCoinBuildError::Internal(crypto_err.to_string()) }
+    fn from(crypto_err: CryptoCtxError) -> Self { UtxoCoinBuildError::Internal(crypto_err.to_string()) }
 }
 
 impl From<Bip32DerPathError> for UtxoCoinBuildError {
-    fn from(e: Bip32DerPathError) -> Self { UtxoCoinBuildError::Internal(Bip44DerPathError::from(e).to_string()) }
+    fn from(e: Bip32DerPathError) -> Self { UtxoCoinBuildError::Internal(StandardHDPathError::from(e).to_string()) }
 }
 
 impl From<HDWalletStorageError> for UtxoCoinBuildError {
     fn from(e: HDWalletStorageError) -> Self { UtxoCoinBuildError::HDWalletStorageError(e) }
 }
 
+impl From<BlockHeaderStorageError> for UtxoCoinBuildError {
+    fn from(e: BlockHeaderStorageError) -> Self { UtxoCoinBuildError::BlockHeaderStorageError(e) }
+}
+
+impl From<AbortedError> for UtxoCoinBuildError {
+    fn from(e: AbortedError) -> Self { UtxoCoinBuildError::Internal(e.to_string()) }
+}
+
 #[async_trait]
-pub trait UtxoCoinBuilder: UtxoFieldsWithIguanaPrivKeyBuilder + UtxoFieldsWithHardwareWalletBuilder {
+pub trait UtxoCoinBuilder:
+    UtxoFieldsWithIguanaSecretBuilder + UtxoFieldsWithGlobalHDBuilder + UtxoFieldsWithHardwareWalletBuilder
+{
     type ResultCoin;
     type Error: NotMmError;
 
-    fn priv_key_policy(&self) -> PrivKeyBuildPolicy<'_>;
+    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::IguanaPrivKey(priv_key) => self.build_utxo_fields_with_iguana_secret(priv_key).await,
+            PrivKeyBuildPolicy::GlobalHDAccount(global_hd_ctx) => {
+                self.build_utxo_fields_with_global_hd(global_hd_ctx).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>;
+pub trait UtxoFieldsWithIguanaSecretBuilder: UtxoCoinBuilderCommonOps {
+    async fn build_utxo_fields_with_iguana_secret(
+        &self,
+        priv_key: IguanaPrivKey,
+    ) -> UtxoCoinBuildResult<UtxoCoinFields> {
+        let conf = UtxoConfBuilder::new(self.conf(), self.activation_params(), self.ticker()).build()?;
+        build_utxo_coin_fields_with_conf_and_secret(self, conf, priv_key).await
+    }
 }
 
 #[async_trait]
-pub trait UtxoFieldsWithIguanaPrivKeyBuilder: UtxoCoinBuilderCommonOps {
-    async fn build_utxo_fields_with_iguana_priv_key(&self, priv_key: &[u8]) -> UtxoCoinBuildResult<UtxoCoinFields> {
+pub trait UtxoFieldsWithGlobalHDBuilder: UtxoCoinBuilderCommonOps {
+    async fn build_utxo_fields_with_global_hd(
+        &self,
+        global_hd_ctx: GlobalHDAccountArc,
+    ) -> UtxoCoinBuildResult<UtxoCoinFields> {
         let conf = UtxoConfBuilder::new(self.conf(), self.activation_params(), self.ticker()).build()?;
 
-        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 derivation_path = conf
+            .derivation_path
+            .as_ref()
+            .or_mm_err(|| UtxoConfError::DerivationPathIsNotSet)?;
+        let secret = global_hd_ctx
+            .derive_secp256k1_secret(derivation_path)
+            .mm_err(|e| UtxoCoinBuildError::Internal(e.to_string()))?;
+        build_utxo_coin_fields_with_conf_and_secret(self, conf, secret).await
+    }
+}
 
-        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()?;
+async fn build_utxo_coin_fields_with_conf_and_secret<Builder>(
+    builder: &Builder,
+    conf: UtxoCoinConf,
+    secret: Secp256k1Secret,
+) -> UtxoCoinBuildResult<UtxoCoinFields>
+where
+    Builder: UtxoCoinBuilderCommonOps + Sync + ?Sized,
+{
+    let private = Private {
+        prefix: conf.wif_prefix,
+        secret,
+        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 = builder.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 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)
-    }
+    let my_script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
+    let derivation_method = DerivationMethod::SingleAddress(my_address);
+    let priv_key_policy = PrivKeyPolicy::KeyPair(key_pair);
+
+    // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+    // all spawned futures related to this `UTXO` coin will be aborted as well.
+    let abortable_system: AbortableQueue = builder.ctx().abortable_system.create_subsystem()?;
+
+    let rpc_client = builder.rpc_client(abortable_system.create_subsystem()?).await?;
+    let tx_fee = builder.tx_fee(&rpc_client).await?;
+    let decimals = builder.decimals(&rpc_client).await?;
+    let dust_amount = builder.dust_amount();
+
+    let initial_history_state = builder.initial_history_state();
+    let tx_hash_algo = builder.tx_hash_algo();
+    let check_utxo_maturity = builder.check_utxo_maturity();
+    let tx_cache = builder.tx_cache();
+    let (block_headers_status_notifier, block_headers_status_watcher) =
+        builder.block_header_status_channel(&conf.spv_conf);
+
+    let coin = UtxoCoinFields {
+        conf,
+        decimals,
+        dust_amount,
+        rpc_client,
+        priv_key_policy,
+        derivation_method,
+        history_sync_state: Mutex::new(initial_history_state),
+        tx_cache,
+        recently_spent_outpoints: AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey)),
+        tx_fee,
+        tx_hash_algo,
+        check_utxo_maturity,
+        block_headers_status_notifier,
+        block_headers_status_watcher,
+        abortable_system,
+    };
+    Ok(coin)
 }
 
 #[async_trait]
@@ -185,7 +238,7 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
         if !self.supports_trezor(&conf) {
             return MmError::err(UtxoCoinBuildError::CoinDoesntSupportTrezor);
         }
-        self.check_if_trezor_is_initialized()?;
+        let hd_wallet_rmd160 = self.trezor_wallet_rmd160()?;
 
         // For now, use a default script pubkey.
         // TODO change the type of `recently_spent_outpoints` to `AsyncMutex<HashMap<Bytes, RecentlySpentOutPoints>>`
@@ -193,7 +246,10 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
         let recently_spent_outpoints = AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey));
 
         let address_format = self.address_format()?;
-        let derivation_path = self.derivation_path()?;
+        let derivation_path = conf
+            .derivation_path
+            .clone()
+            .or_mm_err(|| UtxoConfError::DerivationPathIsNotSet)?;
 
         let hd_wallet_storage = HDWalletCoinStorage::init(self.ctx(), ticker).await?;
 
@@ -202,6 +258,7 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
             .await?;
         let gap_limit = self.gap_limit();
         let hd_wallet = UtxoHDWallet {
+            hd_wallet_rmd160,
             hd_wallet_storage,
             address_format,
             derivation_path,
@@ -209,7 +266,11 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
             gap_limit,
         };
 
-        let rpc_client = self.rpc_client().await?;
+        // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+        // all spawned futures related to this `UTXO` coin will be aborted as well.
+        let abortable_system: AbortableQueue = self.ctx().abortable_system.create_subsystem()?;
+
+        let rpc_client = self.rpc_client(abortable_system.create_subsystem()?).await?;
         let tx_fee = self.tx_fee(&rpc_client).await?;
         let decimals = self.decimals(&rpc_client).await?;
         let dust_amount = self.dust_amount();
@@ -218,7 +279,8 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
         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 (block_headers_status_notifier, block_headers_status_watcher) =
+            self.block_header_status_channel(&conf.spv_conf);
 
         let coin = UtxoCoinFields {
             conf,
@@ -228,12 +290,14 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
             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,
+            block_headers_status_notifier,
+            block_headers_status_watcher,
+            abortable_system,
         };
         Ok(coin)
     }
@@ -241,25 +305,27 @@ pub trait UtxoFieldsWithHardwareWalletBuilder: UtxoCoinBuilderCommonOps {
     async fn load_hd_wallet_accounts(
         &self,
         hd_wallet_storage: &HDWalletCoinStorage,
-        derivation_path: &Bip44PathToCoin,
+        derivation_path: &StandardHDPathToCoin,
     ) -> 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 trezor_wallet_rmd160(&self) -> UtxoCoinBuildResult<H160> {
+        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(hw_ctx.rmd160()),
+        }
+    }
+
     fn check_if_trezor_is_initialized(&self) -> UtxoCoinBuildResult<()> {
         let crypto_ctx = CryptoCtx::from_ctx(self.ctx())?;
         let hw_ctx = crypto_ctx
@@ -281,15 +347,6 @@ pub trait UtxoCoinBuilderCommonOps {
 
     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())
@@ -385,7 +442,7 @@ pub trait UtxoCoinBuilderCommonOps {
         }
     }
 
-    async fn rpc_client(&self) -> UtxoCoinBuildResult<UtxoRpcClientEnum> {
+    async fn rpc_client(&self, abortable_system: AbortableQueue) -> UtxoCoinBuildResult<UtxoRpcClientEnum> {
         match self.activation_params().mode.clone() {
             UtxoRpcMode::Native => {
                 #[cfg(target_arch = "wasm32")]
@@ -399,18 +456,23 @@ pub trait UtxoCoinBuilderCommonOps {
                 }
             },
             UtxoRpcMode::Electrum { servers } => {
-                let electrum = self.electrum_client(ElectrumBuilderArgs::default(), servers).await?;
+                let electrum = self
+                    .electrum_client(abortable_system, ElectrumBuilderArgs::default(), servers)
+                    .await?;
                 Ok(UtxoRpcClientEnum::Electrum(electrum))
             },
         }
     }
 
+    /// The method takes `abortable_system` that will be used to spawn Electrum's related futures.
+    /// It can be pinned to the coin's abortable system via [`AbortableSystem::create_subsystem`], but not required.
     async fn electrum_client(
         &self,
+        abortable_system: AbortableQueue,
         args: ElectrumBuilderArgs,
         mut servers: Vec<ElectrumRpcRequest>,
     ) -> UtxoCoinBuildResult<ElectrumClient> {
-        let (on_connect_tx, on_connect_rx) = mpsc::unbounded();
+        let (on_event_tx, on_event_rx) = unbounded();
         let ticker = self.ticker().to_owned();
         let ctx = self.ctx();
         let mut event_handlers = vec![];
@@ -421,12 +483,26 @@ pub trait UtxoCoinBuilderCommonOps {
         }
 
         if args.negotiate_version {
-            event_handlers.push(ElectrumProtoVerifier { on_connect_tx }.into_shared());
+            event_handlers.push(ElectrumProtoVerifier { on_event_tx }.into_shared());
+        }
+
+        let storage_ticker = self.ticker().replace('-', "_");
+        let block_headers_storage = BlockHeaderStorage::new_from_ctx(self.ctx().clone(), storage_ticker)
+            .map_to_mm(|e| UtxoCoinBuildError::Internal(e.to_string()))?;
+        if !block_headers_storage.is_initialized_for().await? {
+            block_headers_storage.init().await?;
         }
 
         let mut rng = small_rng();
         servers.as_mut_slice().shuffle(&mut rng);
-        let client = ElectrumClientImpl::new(ticker, event_handlers);
+
+        let client = ElectrumClientImpl::new(
+            ticker,
+            event_handlers,
+            block_headers_storage,
+            abortable_system,
+            args.negotiate_version,
+        );
         for server in servers.iter() {
             match client.add_server(server).await {
                 Ok(_) => (),
@@ -449,10 +525,11 @@ pub trait UtxoCoinBuilderCommonOps {
 
         let client = Arc::new(client);
 
+        let spawner = client.spawner();
         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);
+            spawn_electrum_version_loop(&spawner, weak_client, on_event_rx, client_name);
 
             wait_for_protocol_version_checked(&client)
                 .await
@@ -461,7 +538,7 @@ pub trait UtxoCoinBuilderCommonOps {
 
         if args.spawn_ping {
             let weak_client = Arc::downgrade(&client);
-            spawn_electrum_ping_loop(weak_client, servers);
+            spawn_electrum_ping_loop(&spawner, weak_client, servers);
         }
 
         Ok(ElectrumClient(client))
@@ -572,6 +649,24 @@ pub trait UtxoCoinBuilderCommonOps {
 
     #[cfg(not(target_arch = "wasm32"))]
     fn tx_cache_path(&self) -> PathBuf { self.ctx().dbdir().join("TX_CACHE") }
+
+    fn block_header_status_channel(
+        &self,
+        spv_conf: &Option<SPVConf>,
+    ) -> (
+        Option<UtxoSyncStatusLoopHandle>,
+        Option<AsyncMutex<AsyncReceiver<UtxoSyncStatus>>>,
+    ) {
+        if spv_conf.is_some() && !self.activation_params().mode.is_native() {
+            let (sync_status_notifier, sync_watcher) = channel(1);
+            return (
+                Some(UtxoSyncStatusLoopHandle::new(sync_status_notifier)),
+                Some(AsyncMutex::new(sync_watcher)),
+            );
+        };
+
+        (None, None)
+    }
 }
 
 /// Attempts to parse native daemon conf file and return rpcport, rpcuser and rpcpassword
@@ -593,7 +688,7 @@ fn read_native_mode_conf(
             .or_else(|| conf.general_section().get(property))
     }
 
-    let conf: Ini = match Ini::load_from_file(&filename) {
+    let conf: Ini = match Ini::load_from_file(filename) {
         Ok(ini) => ini,
         Err(err) => {
             return ERR!(
@@ -622,41 +717,54 @@ fn read_native_mode_conf(
 /// 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 {
+fn spawn_electrum_ping_loop<Spawner: SpawnAbortable>(
+    spawner: &Spawner,
+    weak_client: Weak<ElectrumClientImpl>,
+    servers: Vec<ElectrumRpcRequest>,
+) {
+    let msg_on_stopped = format!("Electrum servers {servers:?} ping loop stopped");
+    let fut = 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
         }
-    });
+    };
+
+    let settings = AbortSettings::info_on_any_stop(msg_on_stopped);
+    spawner.spawn_with_settings(fut, settings);
 }
 
 /// 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(
+fn spawn_electrum_version_loop<Spawner: SpawnAbortable>(
+    spawner: &Spawner,
     weak_client: Weak<ElectrumClientImpl>,
-    mut on_connect_rx: mpsc::UnboundedReceiver<String>,
+    mut on_event_rx: UnboundedReceiver<ElectrumProtoVerifierEvent>,
     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,
-            ));
+    let fut = async move {
+        while let Some(event) = on_event_rx.next().await {
+            match event {
+                ElectrumProtoVerifierEvent::Connected(electrum_addr) => {
+                    check_electrum_server_version(weak_client.clone(), client_name.clone(), electrum_addr).await
+                },
+                ElectrumProtoVerifierEvent::Disconnected(electrum_addr) => {
+                    if let Some(client) = weak_client.upgrade() {
+                        client.reset_protocol_version(&electrum_addr).await.error_log();
+                    }
+                },
+            }
         }
-
-        info!("Electrum server.version loop stopped");
-    });
+    };
+    let settings = AbortSettings::info_on_any_stop("Electrum server.version loop stopped".to_string());
+    spawner.spawn_with_settings(fut, settings);
 }
 
 async fn check_electrum_server_version(
@@ -720,27 +828,24 @@ async fn check_electrum_server_version(
 
 /// 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.");
-        }
-
+    repeatable!(async {
         if client.count_connections().await == 0 {
             // All of the connections were removed because of server.version checking
-            return ERR!(
+            return Ready(ERR!(
                 "There are no Electrums with the required protocol version {:?}",
                 client.protocol_version()
-            );
+            ));
         }
 
         if client.is_protocol_version_checked().await {
-            break;
+            return Ready(Ok(()));
         }
-
-        Timer::sleep(0.5).await;
-        attempts += 1;
-    }
-
-    Ok(())
+        Retry(())
+    })
+    .repeat_every_secs(0.5)
+    .attempts(10)
+    .await
+    .map_err(|_exceed| ERRL!("Failed protocol version verifying of at least 1 of Electrums in 5 seconds."))
+    // Flatten `Result< Result<(), String>, String >`
+    .flatten()
 }
diff --git a/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
index 3cc89efe7b..d19bded6cf 100644
--- a/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
+++ b/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
@@ -3,14 +3,14 @@ use crate::utxo::{parse_hex_encoded_u32, UtxoCoinConf, DEFAULT_DYNAMIC_FEE_VOLAT
                   MATURE_CONFIRMATIONS_DEFAULT};
 use crate::UtxoActivationParams;
 use bitcrypto::ChecksumType;
-use crypto::trezor::utxo::TrezorUtxoCoin;
-use crypto::{Bip32Error, ChildNumber};
+use crypto::{Bip32Error, StandardHDPathToCoin};
 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 spv_validation::conf::SPVConf;
 use std::num::NonZeroU64;
 use std::sync::atomic::AtomicBool;
 
@@ -24,23 +24,13 @@ pub enum UtxoConfError {
     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),
+    #[display(fmt = "Error deserializing 'spv_conf': {}", _0)]
+    ErrorDeserializingSPVConf(String),
     InvalidConsensusBranchId(String),
     InvalidVersionGroupId(String),
     InvalidAddressFormat(String),
-    InvalidBlockHeaderParams(String),
     InvalidDecimals(String),
 }
 
@@ -98,7 +88,9 @@ impl<'a> UtxoConfBuilder<'a> {
         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();
+        let derivation_path = self.derivation_path()?;
+        let avg_blocktime = self.avg_blocktime();
+        let spv_conf = self.spv_conf()?;
 
         Ok(UtxoCoinConf {
             ticker: self.ticker.to_owned(),
@@ -130,7 +122,9 @@ impl<'a> UtxoConfBuilder<'a> {
             mature_confirmations,
             estimate_fee_blocks,
             trezor_coin,
-            enable_spv_proof,
+            spv_conf,
+            derivation_path,
+            avg_blocktime,
         })
     }
 
@@ -284,9 +278,17 @@ impl<'a> UtxoConfBuilder<'a> {
 
     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 trezor_coin(&self) -> Option<String> { self.conf["trezor_coin"].as_str().map(|coin| coin.to_string()) }
+
+    fn spv_conf(&self) -> UtxoConfResult<Option<SPVConf>> {
+        json::from_value(self.conf["spv_conf"].clone())
+            .map_to_mm(|e| UtxoConfError::ErrorDeserializingSPVConf(e.to_string()))
+    }
+
+    fn derivation_path(&self) -> UtxoConfResult<Option<StandardHDPathToCoin>> {
+        json::from_value(self.conf["derivation_path"].clone())
+            .map_to_mm(|e| UtxoConfError::ErrorDeserializingDerivationPath(e.to_string()))
     }
 
-    fn enable_spv_proof(&self) -> bool { self.conf["enable_spv_proof"].as_bool().unwrap_or(false) }
+    fn avg_blocktime(&self) -> Option<u64> { self.conf["avg_blocktime"].as_u64() }
 }
diff --git a/mm2src/coins/utxo/utxo_common.rs b/mm2src/coins/utxo/utxo_common.rs
index a67c9136c4..19db7c9f32 100644
--- a/mm2src/coins/utxo/utxo_common.rs
+++ b/mm2src/coins/utxo/utxo_common.rs
@@ -1,30 +1,34 @@
-use super::rpc_clients::TxMerkleBranch;
 use super::*;
 use crate::coin_balance::{AddressBalanceStatus, HDAddressBalance, HDWalletBalanceOps};
+use crate::coin_errors::{MyAddressError, ValidatePaymentError};
+use crate::hd_confirm_address::HDConfirmAddress;
 use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
-use crate::hd_wallet::{AccountUpdatingError, AddressDerivingError, HDAccountMut, HDAccountsMap,
-                       NewAccountCreatingError};
+use crate::hd_wallet::{AccountUpdatingError, AddressDerivingResult, HDAccountMut, HDAccountsMap,
+                       NewAccountCreatingError, NewAddressDeriveConfirmError, NewAddressDerivingError};
 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::spv::SimplePaymentVerification;
 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;
+use crate::{CanRefundHtlc, CoinBalance, CoinWithDerivationMethod, GetWithdrawSenderAddress, HDAccountAddressId,
+            RawTransactionError, RawTransactionRequest, RawTransactionRes, SearchForSwapTxSpendInput,
+            SendMakerPaymentSpendPreimageInput, SendWatcherRefundsPaymentArgs, SignatureError, SignatureResult,
+            SwapOps, TradePreimageValue, TransactionFut, TxFeeDetails, TxMarshalingErr, ValidateAddressResult,
+            ValidateOtherPubKeyErr, ValidatePaymentFut, ValidatePaymentInput, VerificationError, VerificationResult,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFrom,
+            WithdrawResult, WithdrawSenderAddress, EARLY_CONFIRMATION_ERR_LOG, INVALID_RECEIVER_ERR_LOG,
+            INVALID_SENDER_ERR_LOG, OLD_TRANSACTION_ERR_LOG};
 pub use bitcrypto::{dhash160, sha256, ChecksumType};
+use bitcrypto::{dhash256, ripemd160};
 use chain::constants::SEQUENCE_FINAL;
-use chain::{BlockHeader, OutPoint, RawBlockHeader, TransactionOutput};
+use chain::{OutPoint, TransactionOutput};
 use common::executor::Timer;
 use common::jsonrpc_client::JsonRpcErrorType;
-use common::log::{debug, error, info, warn};
-use common::mm_metrics::MetricsArc;
+use common::log::{error, warn};
 use common::{now_ms, one_hundred, ten_f64};
-use crypto::{Bip32DerPathOps, Bip44Chain, Bip44DerPathError, Bip44DerivationPath, RpcDerivationPath};
+use crypto::{Bip32DerPathOps, Bip44Chain, RpcDerivationPath, StandardHDPath, StandardHDPathError};
 use futures::compat::Future01CompatExt;
 use futures::future::{FutureExt, TryFutureExt};
 use futures01::future::Either;
@@ -40,26 +44,24 @@ use rpc::v1::types::{Bytes as BytesJson, ToTxHash, TransactionInputEnum, H256 as
 use script::{Builder, Opcode, Script, ScriptAddress, TransactionInputSigner, UnsignedTransactionInput};
 use secp256k1::{PublicKey, Signature};
 use serde_json::{self as json};
-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 serialization::{deserialize, serialize, serialize_with_flags, CoinVariant, CompactInteger, Serializable, Stream,
+                    SERIALIZE_TRANSACTION_WITNESS};
 use std::cmp::Ordering;
 use std::collections::hash_map::{Entry, HashMap};
 use std::str::FromStr;
 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;
 
+pub mod utxo_tx_history_v2_common;
+
 pub const DEFAULT_FEE_VOUT: usize = 0;
 pub const DEFAULT_SWAP_TX_SPEND_SIZE: u64 = 305;
 pub const DEFAULT_SWAP_VOUT: usize = 0;
+pub const DEFAULT_SWAP_VIN: 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) => {
@@ -102,14 +104,22 @@ pub async fn get_tx_fee(coin: &UtxoCoinFields) -> UtxoRpcResult<ActualTxFee> {
     }
 }
 
-pub fn derive_address<T: UtxoCommonOps>(
+fn derive_address_with_cache<T>(
     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);
+    hd_addresses_cache: &mut HashMap<HDAddressId, UtxoHDAddress>,
+    hd_address_id: HDAddressId,
+) -> AddressDerivingResult<UtxoHDAddress>
+where
+    T: UtxoCommonOps,
+{
+    // Check if the given HD address has been derived already.
+    if let Some(hd_address) = hd_addresses_cache.get(&hd_address_id) {
+        return Ok(hd_address.clone());
+    }
+
+    let change_child = hd_address_id.chain.to_child_number();
+    let address_id_child = ChildNumber::from(hd_address_id.address_id);
 
     let derived_pubkey = hd_account
         .extended_pubkey
@@ -121,11 +131,113 @@ pub fn derive_address<T: UtxoCommonOps>(
     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 {
+
+    let hd_address = HDAddress {
         address,
         pubkey,
         derivation_path,
-    })
+    };
+
+    // Cache the derived `hd_address`.
+    hd_addresses_cache.insert(hd_address_id, hd_address.clone());
+    Ok(hd_address)
+}
+
+/// [`HDWalletCoinOps::derive_addresses`] native implementation.
+///
+/// # Important
+///
+/// The [`HDAddressesCache::cache`] mutex is locked once for the entire duration of this function.
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn derive_addresses<T, Ids>(
+    coin: &T,
+    hd_account: &UtxoHDAccount,
+    address_ids: Ids,
+) -> AddressDerivingResult<Vec<UtxoHDAddress>>
+where
+    T: UtxoCommonOps,
+    Ids: Iterator<Item = HDAddressId>,
+{
+    let mut hd_addresses_cache = hd_account.derived_addresses.lock().await;
+    address_ids
+        .map(|hd_address_id| derive_address_with_cache(coin, hd_account, &mut hd_addresses_cache, hd_address_id))
+        .collect()
+}
+
+/// [`HDWalletCoinOps::derive_addresses`] WASM implementation.
+///
+/// # Important
+///
+/// This function locks [`HDAddressesCache::cache`] mutex at each iteration.
+///
+/// # Performance
+///
+/// Locking the [`HDAddressesCache::cache`] mutex at each iteration may significantly degrade performance.
+/// But this is required at least for now due the facts that:
+/// 1) mm2 runs in the same thread as `KomodoPlatform/air_dex` runs;
+/// 2) [`ExtendedPublicKey::derive_child`] is a synchronous operation, and it takes a long time.
+/// So we need to periodically invoke Javascript runtime to handle UI events and other asynchronous tasks.
+#[cfg(target_arch = "wasm32")]
+pub async fn derive_addresses<T, Ids>(
+    coin: &T,
+    hd_account: &UtxoHDAccount,
+    address_ids: Ids,
+) -> AddressDerivingResult<Vec<UtxoHDAddress>>
+where
+    T: UtxoCommonOps,
+    Ids: Iterator<Item = HDAddressId>,
+{
+    let mut result = Vec::new();
+    for hd_address_id in address_ids {
+        let mut hd_addresses_cache = hd_account.derived_addresses.lock().await;
+
+        let hd_address = derive_address_with_cache(coin, hd_account, &mut hd_addresses_cache, hd_address_id)?;
+        result.push(hd_address);
+    }
+
+    Ok(result)
+}
+
+pub async fn generate_and_confirm_new_address<Coin, ConfirmAddress>(
+    coin: &Coin,
+    hd_wallet: &Coin::HDWallet,
+    hd_account: &mut Coin::HDAccount,
+    chain: Bip44Chain,
+    confirm_address: &ConfirmAddress,
+) -> MmResult<HDAddress<Coin::Address, Coin::Pubkey>, NewAddressDeriveConfirmError>
+where
+    Coin: HDWalletCoinWithStorageOps<Address = Address, HDWallet = UtxoHDWallet, HDAccount = UtxoHDAccount>
+        + AsRef<UtxoCoinFields>
+        + Sync,
+    ConfirmAddress: HDConfirmAddress,
+{
+    use crate::hd_wallet::inner_impl;
+
+    let inner_impl::NewAddress {
+        address,
+        new_known_addresses_number,
+    } = inner_impl::generate_new_address_immutable(coin, hd_wallet, hd_account, chain).await?;
+
+    let trezor_coin = coin.as_ref().conf.trezor_coin.clone().or_mm_err(|| {
+        let ticker = &coin.as_ref().conf.ticker;
+        let error = format!("'{ticker}' coin must contain the 'trezor_coin' field in the coins config");
+        NewAddressDeriveConfirmError::DeriveError(NewAddressDerivingError::Internal(error))
+    })?;
+    let expected_address = address.address.to_string();
+    // Ask the user to confirm if the given `expected_address` is the same as on the HW display.
+    confirm_address
+        .confirm_utxo_address(trezor_coin, address.derivation_path.clone(), expected_address)
+        .await?;
+
+    let actual_known_addresses_number = hd_account.known_addresses_number(chain)?;
+    // Check if the actual `known_addresses_number` hasn't been changed while we waited for the user confirmation.
+    // If the actual value is greater than the new one, we don't need to update.
+    if actual_known_addresses_number < new_known_addresses_number {
+        coin.set_known_addresses_number(hd_wallet, hd_account, chain, new_known_addresses_number)
+            .await?;
+    }
+
+    Ok(address)
 }
 
 pub async fn create_new_account<'a, Coin, XPubExtractor>(
@@ -137,7 +249,7 @@ where
     Coin: ExtractExtendedPubkey<ExtendedPublicKey = Secp256k1ExtendedPublicKey>
         + HDWalletCoinWithStorageOps<HDWallet = UtxoHDWallet, HDAccount = UtxoHDAccount>
         + Sync,
-    XPubExtractor: HDXPubExtractor + Sync,
+    XPubExtractor: HDXPubExtractor,
 {
     const INIT_ACCOUNT_ID: u32 = 0;
     let new_account_id = hd_wallet
@@ -149,17 +261,16 @@ where
         .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,
-        });
+    let max_accounts_number = hd_wallet.account_limit();
+    if new_account_id >= max_accounts_number {
+        return MmError::err(NewAccountCreatingError::AccountLimitReached { max_accounts_number });
     }
 
     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()))?;
 
-    let account_derivation_path: Bip44PathToAccount = hd_wallet.derivation_path.derive(account_child)?;
+    let account_derivation_path: StandardHDPathToAccount = hd_wallet.derivation_path.derive(account_child)?;
     let account_pubkey = coin
         .extract_extended_pubkey(xpub_extractor, account_derivation_path.to_derivation_path())
         .await?;
@@ -171,6 +282,7 @@ where
         // We don't know how many addresses are used by the user at this moment.
         external_addresses_number: 0,
         internal_addresses_number: 0,
+        derived_addresses: HDAddressesCache::default(),
     };
 
     let accounts = hd_wallet.accounts.lock().await;
@@ -203,10 +315,9 @@ pub async fn set_known_addresses_number<T>(
 where
     T: HDWalletCoinWithStorageOps<HDWallet = UtxoHDWallet, HDAccount = UtxoHDAccount> + Sync,
 {
-    if new_known_addresses_number >= ChildNumber::HARDENED_FLAG {
-        return MmError::err(AccountUpdatingError::AddressLimitReached {
-            max_addresses_number: ChildNumber::HARDENED_FLAG,
-        });
+    let max_addresses_number = hd_wallet.address_limit();
+    if new_known_addresses_number >= max_addresses_number {
+        return MmError::err(AccountUpdatingError::AddressLimitReached { max_addresses_number });
     }
     match chain {
         Bip44Chain::External => {
@@ -288,29 +399,37 @@ where
         .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 max_addresses_number = hd_wallet.address_limit();
+    while checking_address_id < max_addresses_number && 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)?;
+        } = coin.derive_address(hd_account, chain, checking_address_id).await?;
 
         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(),
-                    });
-                }
 
+                // First, derive all empty addresses and put it into `balances` with default balance.
+                let address_ids = (last_non_empty_address_id..checking_address_id)
+                    .into_iter()
+                    .map(|address_id| HDAddressId { chain, address_id });
+                let empty_addresses =
+                    coin.derive_addresses(hd_account, address_ids)
+                        .await?
+                        .into_iter()
+                        .map(|empty_address| HDAddressBalance {
+                            address: empty_address.address.to_string(),
+                            derivation_path: RpcDerivationPath(empty_address.derivation_path),
+                            chain,
+                            balance: CoinBalance::default(),
+                        });
+                balances.extend(empty_addresses);
+
+                // Then push this non-empty address.
                 balances.push(HDAddressBalance {
                     address: checking_address.to_string(),
                     derivation_path: RpcDerivationPath(checking_address_der_path),
@@ -367,7 +486,7 @@ where
 
 pub async fn load_hd_accounts_from_storage(
     hd_wallet_storage: &HDWalletCoinStorage,
-    derivation_path: &Bip44PathToCoin,
+    derivation_path: &StandardHDPathToCoin,
 ) -> HDWalletStorageResult<HDAccountsMap<UtxoHDAccount>> {
     let accounts = hd_wallet_storage.load_all_accounts().await?;
     let res: HDWalletStorageResult<HDAccountsMap<UtxoHDAccount>> = accounts
@@ -459,17 +578,25 @@ where
 {
     let trezor_coin = conf
         .trezor_coin
+        .clone()
         .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)
+    Secp256k1ExtendedPublicKey::from_str(&xpub).map_to_mm(|e| HDExtractPubkeyError::InvalidXpub(e.to_string()))
 }
 
 /// 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> {
+pub async fn get_htlc_spend_fee<T: UtxoCommonOps>(
+    coin: &T,
+    tx_size: u64,
+    stage: &FeeApproxStage,
+) -> 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 * tx_size) / KILO_BYTE,
+        ActualTxFee::Dynamic(fee_per_kb) => {
+            let fee_per_kb = increase_dynamic_fee_by_stage(&coin, fee_per_kb, stage);
+            (fee_per_kb * tx_size) / KILO_BYTE
+        },
         // return satoshis here as swap spend transaction size is always less than 1 kb
         ActualTxFee::FixedPerKb(satoshis) => {
             let tx_size_kb = if tx_size % KILO_BYTE == 0 {
@@ -538,44 +665,49 @@ where
     coin.my_spendable_balance()
 }
 
-pub fn address_from_str_unchecked(coin: &UtxoCoinFields, address: &str) -> Result<Address, String> {
-    if let Ok(legacy) = Address::from_str(address) {
-        return Ok(legacy);
-    }
+pub fn address_from_str_unchecked(coin: &UtxoCoinFields, address: &str) -> MmResult<Address, AddrFromStrError> {
+    let mut errors = Vec::with_capacity(3);
+
+    match Address::from_str(address) {
+        Ok(legacy) => return Ok(legacy),
+        Err(e) => errors.push(e.to_string()),
+    };
 
-    if let Ok(segwit) = Address::from_segwitaddress(
+    match Address::from_segwitaddress(
         address,
         coin.conf.checksum_type,
         coin.conf.pub_addr_prefix,
         coin.conf.pub_t_addr_prefix,
     ) {
-        return Ok(segwit);
+        Ok(segwit) => return Ok(segwit),
+        Err(e) => errors.push(e),
     }
 
-    if let Ok(cashaddress) = Address::from_cashaddress(
+    match Address::from_cashaddress(
         address,
         coin.conf.checksum_type,
         coin.conf.pub_addr_prefix,
         coin.conf.p2sh_addr_prefix,
         coin.conf.pub_t_addr_prefix,
     ) {
-        return Ok(cashaddress);
+        Ok(cashaddress) => return Ok(cashaddress),
+        Err(e) => errors.push(e),
     }
 
-    return ERR!("Invalid address: {}", address);
+    MmError::err(AddrFromStrError::CannotDetermineFormat(errors))
 }
 
 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),
+        PrivKeyPolicy::Trezor => MmError::err(UnexpectedDerivationMethod::ExpectedSingleAddress),
     }
 }
 
-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));
+pub fn checked_address_from_str<T: UtxoCommonOps>(coin: &T, address: &str) -> MmResult<Address, AddrFromStrError> {
+    let addr = address_from_str_unchecked(coin.as_ref(), address)?;
+    check_withdraw_address_supported(coin, &addr)?;
     Ok(addr)
 }
 
@@ -635,7 +767,7 @@ impl<'a, T: AsRef<UtxoCoinFields> + UtxoTxGenerationOps> UtxoTxBuilder<'a, T> {
         UtxoTxBuilder {
             tx: coin.as_ref().transaction_preimage(),
             coin,
-            from: coin.as_ref().derivation_method.iguana().cloned(),
+            from: coin.as_ref().derivation_method.single_addr().cloned(),
             available_inputs: vec![],
             fee_policy: FeePolicy::SendExact,
             fee: None,
@@ -965,6 +1097,9 @@ pub struct P2SHSpendingTxInput<'a> {
 }
 
 pub async fn p2sh_spending_tx<T: UtxoCommonOps>(coin: &T, input: P2SHSpendingTxInput<'_>) -> Result<UtxoTx, String> {
+    if input.prev_transaction.outputs.is_empty() {
+        return ERR!("Transaction doesn't have any output");
+    }
     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)
@@ -1137,26 +1272,42 @@ pub fn send_maker_spends_taker_payment<T: UtxoCommonOps + SwapOps>(
     time_lock: u32,
     taker_pub: &[u8],
     secret: &[u8],
+    secret_hash: &[u8],
     swap_unique_data: &[u8],
 ) -> TransactionFut {
-    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
 
     let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default()
         .push_data(secret)
         .push_opcode(Opcode::OP_0)
         .into_script();
+
     let redeem_script = payment_script(
         time_lock,
-        &*dhash160(secret),
+        secret_hash,
         &try_tx_fus!(Public::from_slice(taker_pub)),
         key_pair.public(),
     )
     .into();
     let fut = async move {
-        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WithoutApprox)
+                .await
+        );
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
         let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
             value: prev_transaction.outputs[0].value - fee,
@@ -1182,17 +1333,188 @@ pub fn send_maker_spends_taker_payment<T: UtxoCommonOps + SwapOps>(
     Box::new(fut.boxed().compat())
 }
 
+pub fn send_maker_payment_spend_preimage<T: UtxoCommonOps + SwapOps>(
+    coin: &T,
+    input: SendMakerPaymentSpendPreimageInput,
+) -> TransactionFut {
+    let mut transaction: UtxoTx = try_tx_fus!(deserialize(input.preimage).map_err(|e| ERRL!("{:?}", e)));
+    if transaction.inputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any input"));
+    }
+    let script = Script::from(transaction.inputs[DEFAULT_SWAP_VIN].script_sig.clone());
+    let mut instructions = script.iter();
+
+    let instruction_1 = try_tx_fus!(try_tx_fus!(instructions.next().ok_or("Instruction not found")));
+    let instruction_2 = try_tx_fus!(try_tx_fus!(instructions.next().ok_or("Instruction not found")));
+
+    let script_sig = try_tx_fus!(instruction_1
+        .data
+        .ok_or("No script signature in the taker spends maker payment preimage"));
+    let redeem_script = try_tx_fus!(instruction_2
+        .data
+        .ok_or("No redeem script in the taker spends maker payment preimage"));
+    let script_data = Builder::default()
+        .push_data(input.secret)
+        .push_opcode(Opcode::OP_0)
+        .into_script();
+
+    let mut resulting_script = Builder::default().push_data(script_sig).into_bytes();
+    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);
+
+    transaction.inputs[DEFAULT_SWAP_VIN].script_sig = resulting_script;
+
+    let coin = coin.clone();
+    let fut = async move {
+        let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
+        try_tx_s!(tx_fut.await, transaction);
+
+        Ok(transaction.into())
+    };
+
+    Box::new(fut.boxed().compat())
+}
+
+pub fn create_maker_payment_spend_preimage<T: UtxoCommonOps + SwapOps>(
+    coin: &T,
+    maker_payment_tx: &[u8],
+    time_lock: u32,
+    maker_pub: &[u8],
+    secret_hash: &[u8],
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
+
+    let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
+
+    let script_data = Builder::default().into_script();
+    let redeem_script = payment_script(
+        time_lock,
+        secret_hash,
+        &try_tx_fus!(Public::from_slice(maker_pub)),
+        key_pair.public(),
+    )
+    .into();
+    let coin = coin.clone();
+    let fut = async move {
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WatcherPreimage)
+                .await
+        );
+
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
+        let output = TransactionOutput {
+            value: prev_transaction.outputs[0].value - fee,
+            script_pubkey,
+        };
+
+        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);
+
+        Ok(transaction.into())
+    };
+    Box::new(fut.boxed().compat())
+}
+
+pub fn create_taker_payment_refund_preimage<T: UtxoCommonOps + SwapOps>(
+    coin: &T,
+    taker_payment_tx: &[u8],
+    time_lock: u32,
+    maker_pub: &[u8],
+    secret_hash: &[u8],
+    swap_unique_data: &[u8],
+) -> TransactionFut {
+    let coin = coin.clone();
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
+
+    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,
+        key_pair.public(),
+        &try_tx_fus!(Public::from_slice(maker_pub)),
+    )
+    .into();
+    let fut = async move {
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WatcherPreimage)
+                .await
+        );
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
+        let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
+        let output = TransactionOutput {
+            value: prev_transaction.outputs[0].value - fee,
+            script_pubkey,
+        };
+
+        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);
+
+        Ok(transaction.into())
+    };
+    Box::new(fut.boxed().compat())
+}
+
 pub fn send_taker_spends_maker_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     maker_payment_tx: &[u8],
     time_lock: u32,
     maker_pub: &[u8],
     secret: &[u8],
+    secret_hash: &[u8],
     swap_unique_data: &[u8],
 ) -> TransactionFut {
-    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
 
     let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
 
@@ -1202,13 +1524,23 @@ pub fn send_taker_spends_maker_payment<T: UtxoCommonOps + SwapOps>(
         .into_script();
     let redeem_script = payment_script(
         time_lock,
-        &*dhash160(secret),
+        secret_hash,
         &try_tx_fus!(Public::from_slice(maker_pub)),
         key_pair.public(),
     )
     .into();
     let fut = async move {
-        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WithoutApprox)
+                .await
+        );
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
         let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
             value: prev_transaction.outputs[0].value - fee,
@@ -1242,10 +1574,14 @@ pub fn send_taker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     secret_hash: &[u8],
     swap_unique_data: &[u8],
 ) -> TransactionFut {
-    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
 
     let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default().push_opcode(Opcode::OP_1).into_script();
@@ -1257,7 +1593,17 @@ pub fn send_taker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     )
     .into();
     let fut = async move {
-        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WithoutApprox)
+                .await
+        );
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
         let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
             value: prev_transaction.outputs[0].value - fee,
@@ -1283,6 +1629,25 @@ pub fn send_taker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     Box::new(fut.boxed().compat())
 }
 
+pub fn send_taker_payment_refund_preimage<T: UtxoCommonOps + SwapOps>(
+    coin: &T,
+    watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+) -> TransactionFut {
+    let coin = coin.clone();
+    let transaction: UtxoTx = try_tx_fus!(
+        deserialize(watcher_refunds_payment_args.payment_tx).map_err(|e| TransactionErr::Plain(format!("{:?}", e)))
+    );
+
+    let fut = async move {
+        let tx_fut = coin.as_ref().rpc_client.send_transaction(&transaction).compat();
+        try_tx_s!(tx_fut.await, transaction);
+
+        Ok(transaction.into())
+    };
+
+    Box::new(fut.boxed().compat())
+}
+
 pub fn send_maker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     coin: T,
     maker_payment_tx: &[u8],
@@ -1291,9 +1656,13 @@ pub fn send_maker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     secret_hash: &[u8],
     swap_unique_data: &[u8],
 ) -> TransactionFut {
-    let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone();
+    let my_address = try_tx_fus!(coin.as_ref().derivation_method.single_addr_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;
+    drop_mutability!(prev_transaction);
+    if prev_transaction.outputs.is_empty() {
+        return try_tx_fus!(TX_PLAIN_ERR!("Transaction doesn't have any output"));
+    }
 
     let key_pair = coin.derive_htlc_key_pair(swap_unique_data);
     let script_data = Builder::default().push_opcode(Opcode::OP_1).into_script();
@@ -1305,7 +1674,17 @@ pub fn send_maker_refunds_payment<T: UtxoCommonOps + SwapOps>(
     )
     .into();
     let fut = async move {
-        let fee = try_tx_s!(coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE).await);
+        let fee = try_tx_s!(
+            coin.get_htlc_spend_fee(DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WithoutApprox)
+                .await
+        );
+        if fee >= prev_transaction.outputs[0].value {
+            return TX_PLAIN_ERR!(
+                "HTLC spend fee {} is greater than transaction output {}",
+                fee,
+                prev_transaction.outputs[0].value
+            );
+        }
         let script_pubkey = output_script(&my_address, ScriptType::P2PKH).to_bytes();
         let output = TransactionOutput {
             value: prev_transaction.outputs[0].value - fee,
@@ -1399,13 +1778,21 @@ where
     }
 }
 
-pub fn check_all_inputs_signed_by_pub(tx: &UtxoTx, expected_pub: &[u8]) -> Result<bool, String> {
+pub fn check_all_inputs_signed_by_pub(tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+    let tx: UtxoTx = deserialize(tx)?;
+    check_all_utxo_inputs_signed_by_pub(&tx, expected_pub)
+}
+
+pub fn check_all_utxo_inputs_signed_by_pub(
+    tx: &UtxoTx,
+    expected_pub: &[u8],
+) -> Result<bool, MmError<ValidatePaymentError>> {
     for input in &tx.inputs {
         let pubkey = if input.has_witness() {
-            try_s!(pubkey_from_witness_script(&input.script_witness))
+            pubkey_from_witness_script(&input.script_witness).map_to_mm(ValidatePaymentError::TxDeserializationError)?
         } else {
             let script: Script = input.script_sig.clone().into();
-            try_s!(pubkey_from_script_sig(&script))
+            pubkey_from_script_sig(&script).map_to_mm(ValidatePaymentError::TxDeserializationError)?
         };
         if *pubkey != expected_pub {
             return Ok(false);
@@ -1415,6 +1802,100 @@ pub fn check_all_inputs_signed_by_pub(tx: &UtxoTx, expected_pub: &[u8]) -> Resul
     Ok(true)
 }
 
+pub fn watcher_validate_taker_fee<T: UtxoCommonOps>(
+    coin: &T,
+    input: WatcherValidateTakerFeeInput,
+    output_index: usize,
+) -> ValidatePaymentFut<()> {
+    let coin = coin.clone();
+    let sender_pubkey = input.sender_pubkey;
+    let taker_fee_hash = input.taker_fee_hash;
+    let min_block_number = input.min_block_number;
+    let lock_duration = input.lock_duration;
+    let fee_addr = input.fee_addr.to_vec();
+
+    let fut = async move {
+        let mut attempts = 0;
+        loop {
+            let tx_from_rpc = match coin
+                .as_ref()
+                .rpc_client
+                .get_verbose_transaction(&H256Json::from(taker_fee_hash.as_slice()))
+                .compat()
+                .await
+            {
+                Ok(t) => t,
+                Err(e) => {
+                    if attempts > 2 {
+                        return MmError::err(ValidatePaymentError::from(e.into_inner()));
+                    };
+                    attempts += 1;
+                    error!("Error getting tx {:?} from rpc: {:?}", taker_fee_hash, e);
+                    Timer::sleep(10.).await;
+                    continue;
+                },
+            };
+
+            let taker_fee_tx: UtxoTx = deserialize(tx_from_rpc.hex.0.as_slice())?;
+            let inputs_signed_by_pub = check_all_utxo_inputs_signed_by_pub(&taker_fee_tx, &sender_pubkey)?;
+            if !inputs_signed_by_pub {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "{}: Taker fee does not belong to the verified public key",
+                    INVALID_SENDER_ERR_LOG
+                )));
+            }
+
+            let tx_confirmed_before_block = is_tx_confirmed_before_block(&coin, &tx_from_rpc, min_block_number)
+                .await
+                .map_to_mm(ValidatePaymentError::InternalError)?;
+            if tx_confirmed_before_block {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "{}: Fee tx {:?} confirmed before min_block {}",
+                    EARLY_CONFIRMATION_ERR_LOG, taker_fee_tx, min_block_number
+                )));
+            }
+
+            if (now_ms() / 1000) as u32 - taker_fee_tx.lock_time > lock_duration as u32 {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                    "{}: Taker fee {:?} is too old",
+                    OLD_TRANSACTION_ERR_LOG, taker_fee_tx
+                )));
+            }
+
+            let address = address_from_raw_pubkey(
+                &fee_addr,
+                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.addr_format().clone(),
+            )
+            .map_to_mm(ValidatePaymentError::TxDeserializationError)?;
+
+            match taker_fee_tx.outputs.get(output_index) {
+                Some(out) => {
+                    let expected_script_pubkey = Builder::build_p2pkh(&address.hash).to_bytes();
+                    if out.script_pubkey != expected_script_pubkey {
+                        return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                            "{}: Provided dex fee tx output script_pubkey doesn't match expected {:?} {:?}",
+                            INVALID_RECEIVER_ERR_LOG, out.script_pubkey, expected_script_pubkey
+                        )));
+                    }
+                },
+                None => {
+                    return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                        "Provided dex fee tx {:?} does not have output {}",
+                        taker_fee_tx, output_index
+                    )))
+                },
+            }
+
+            return Ok(());
+        }
+    };
+    Box::new(fut.boxed().compat())
+}
+
 pub fn validate_fee<T: UtxoCommonOps>(
     coin: T,
     tx: UtxoTx,
@@ -1434,7 +1915,7 @@ pub fn validate_fee<T: UtxoCommonOps>(
         coin.addr_format().clone(),
     ));
 
-    if !try_fus!(check_all_inputs_signed_by_pub(&tx, sender_pubkey)) {
+    if !try_fus!(check_all_utxo_inputs_signed_by_pub(&tx, sender_pubkey)) {
         return Box::new(futures01::future::err(ERRL!("The dex fee was sent from wrong address")));
     }
     let fut = async move {
@@ -1494,16 +1975,19 @@ pub fn validate_fee<T: UtxoCommonOps>(
 pub fn validate_maker_payment<T: UtxoCommonOps + SwapOps>(
     coin: &T,
     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)));
+) -> ValidatePaymentFut<()> {
+    let mut tx: UtxoTx = try_f!(deserialize(input.payment_tx.as_slice()));
     tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
 
     let htlc_keypair = coin.derive_htlc_key_pair(&input.unique_swap_data);
+    let other_pub =
+        &try_f!(Public::from_slice(&input.other_pub)
+            .map_to_mm(|err| ValidatePaymentError::InvalidParameter(err.to_string())));
     validate_payment(
         coin.clone(),
         tx,
         DEFAULT_SWAP_VOUT,
-        &try_fus!(Public::from_slice(&input.other_pub)),
+        other_pub,
         htlc_keypair.public(),
         &input.secret_hash,
         input.amount,
@@ -1513,19 +1997,99 @@ pub fn validate_maker_payment<T: UtxoCommonOps + SwapOps>(
     )
 }
 
+pub fn watcher_validate_taker_payment<T: UtxoCommonOps + SwapOps>(
+    coin: &T,
+    input: WatcherValidatePaymentInput,
+) -> ValidatePaymentFut<()> {
+    let taker_payment_tx: UtxoTx = try_f!(deserialize(input.payment_tx.as_slice()));
+    let taker_payment_refund_preimage: UtxoTx = try_f!(deserialize(input.taker_payment_refund_preimage.as_slice()));
+    let taker_pub = &try_f!(
+        Public::from_slice(&input.taker_pub).map_err(|err| ValidatePaymentError::InvalidParameter(err.to_string()))
+    );
+    let maker_pub = &try_f!(
+        Public::from_slice(&input.maker_pub).map_err(|err| ValidatePaymentError::InvalidParameter(err.to_string()))
+    );
+    let expected_redeem = payment_script(input.time_lock, &input.secret_hash, taker_pub, maker_pub);
+    let coin = coin.clone();
+
+    let fut = async move {
+        let inputs_signed_by_pub = check_all_utxo_inputs_signed_by_pub(&taker_payment_tx, &input.taker_pub)?;
+        if !inputs_signed_by_pub {
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                "Taker payment does not belong to the verified public key".to_string(),
+            ));
+        }
+
+        let taker_payment_locking_script = match taker_payment_tx.outputs.get(DEFAULT_SWAP_VOUT) {
+            Some(output) => output.script_pubkey.clone(),
+            None => {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                    "Payment tx has no outputs".to_string(),
+                ))
+            },
+        };
+
+        if taker_payment_locking_script != Builder::build_p2sh(&dhash160(&expected_redeem).into()).to_bytes() {
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                "Payment tx locking script {:?} doesn't match expected",
+                taker_payment_locking_script
+            )));
+        }
+
+        let script_sig = match taker_payment_refund_preimage.inputs.get(DEFAULT_SWAP_VIN) {
+            Some(input) => Script::from(input.script_sig.clone()),
+            None => {
+                return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                    "Taker payment refund tx has no inputs".to_string(),
+                ))
+            },
+        };
+
+        let instruction = script_sig
+            .iter()
+            .last()
+            .or_mm_err(|| ValidatePaymentError::WrongPaymentTx(String::from("Instruction not found")))?
+            .map_to_mm(|err| ValidatePaymentError::WrongPaymentTx(err.to_string()))?;
+
+        let redeem_script = instruction.data.or_mm_err(|| {
+            ValidatePaymentError::WrongPaymentTx(String::from("No redeem script in the taker payment refund preimage"))
+        })?;
+
+        if expected_redeem.as_slice() != redeem_script {
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(
+                "Taker payment tx locking script doesn't match with taker payment refund redeem script".to_string(),
+            ));
+        }
+
+        if let UtxoRpcClientEnum::Electrum(client) = &coin.as_ref().rpc_client {
+            if coin.as_ref().conf.spv_conf.is_some() && input.confirmations != 0 {
+                client
+                    .validate_spv_proof(&taker_payment_tx, input.try_spv_proof_until)
+                    .await?;
+            }
+        }
+        Ok(())
+    };
+    Box::new(fut.boxed().compat())
+}
+
 pub fn validate_taker_payment<T: UtxoCommonOps + SwapOps>(
     coin: &T,
     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)));
+) -> ValidatePaymentFut<()> {
+    let mut tx: UtxoTx = try_f!(deserialize(input.payment_tx.as_slice()));
     tx.tx_hash_algo = coin.as_ref().tx_hash_algo;
 
     let htlc_keypair = coin.derive_htlc_key_pair(&input.unique_swap_data);
+    let other_pub =
+        &try_f!(Public::from_slice(&input.other_pub)
+            .map_to_mm(|err| ValidatePaymentError::InvalidParameter(err.to_string())));
+
     validate_payment(
         coin.clone(),
         tx,
         DEFAULT_SWAP_VOUT,
-        &try_fus!(Public::from_slice(&input.other_pub)),
+        other_pub,
         htlc_keypair.public(),
         &input.secret_hash,
         input.amount,
@@ -1596,6 +2160,24 @@ pub fn check_if_my_payment_sent<T: UtxoCommonOps + SwapOps>(
     Box::new(fut.boxed().compat())
 }
 
+pub async fn watcher_search_for_swap_tx_spend<T: AsRef<UtxoCoinFields> + SwapOps>(
+    coin: &T,
+    input: WatcherSearchForSwapTxSpendInput<'_>,
+    output_index: usize,
+) -> Result<Option<FoundSwapTxSpend>, String> {
+    search_for_swap_output_spend(
+        coin.as_ref(),
+        input.time_lock,
+        &try_s!(Public::from_slice(input.taker_pub)),
+        &try_s!(Public::from_slice(input.maker_pub)),
+        input.secret_hash,
+        input.tx,
+        output_index,
+        input.search_from_block,
+    )
+    .await
+}
+
 pub async fn search_for_swap_tx_spend_my<T: AsRef<UtxoCoinFields> + SwapOps>(
     coin: &T,
     input: SearchForSwapTxSpendInput<'_>,
@@ -1668,11 +2250,16 @@ pub fn extract_secret(secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, St
             },
         };
 
-        let actual_secret_hash = &*dhash160(&secret);
-        if actual_secret_hash != secret_hash {
+        let expected_secret_hash = if secret_hash.len() == 32 {
+            ripemd160(secret_hash)
+        } else {
+            H160::from(secret_hash)
+        };
+        let actual_secret_hash = dhash160(&secret);
+        if actual_secret_hash != expected_secret_hash {
             warn!(
-                "Invalid 'dhash160(secret)' {:?}, expected {:?}",
-                actual_secret_hash, secret_hash
+                "Invalid secret hash {:?}, expected {:?}",
+                actual_secret_hash, expected_secret_hash
             );
             continue;
         }
@@ -1681,10 +2268,14 @@ pub fn extract_secret(secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, St
     ERR!("Couldn't extract secret")
 }
 
-pub fn my_address<T: UtxoCommonOps>(coin: &T) -> Result<String, String> {
+pub fn my_address<T: UtxoCommonOps>(coin: &T) -> MmResult<String, MyAddressError> {
     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"),
+        DerivationMethod::SingleAddress(ref my_address) => {
+            my_address.display_address().map_to_mm(MyAddressError::InternalError)
+        },
+        DerivationMethod::HDWallet(_) => MmError::err(MyAddressError::UnexpectedDerivationMethod(
+            "'my_address' is deprecated for HD wallets".to_string(),
+        )),
     }
 }
 
@@ -1718,7 +2309,7 @@ pub fn verify_message<T: UtxoCommonOps>(
     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)?;
+    let received_address = checked_address_from_str(coin, address)?;
     Ok(AddressHashEnum::from(recovered_pubkey.address_hash()) == received_address.hash)
 }
 
@@ -1729,7 +2320,7 @@ where
     let my_address = try_f!(coin
         .as_ref()
         .derivation_method
-        .iguana_or_err()
+        .single_addr_or_err()
         .mm_err(BalanceError::from))
     .clone();
     let fut = async move { address_balance(&coin, &my_address).await };
@@ -1786,6 +2377,7 @@ pub fn wait_for_output_spend(
     output_index: usize,
     from_block: u64,
     wait_until: u64,
+    check_every: f64,
 ) -> TransactionFut {
     let mut tx: UtxoTx = try_tx_fus!(deserialize(tx_bytes).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
@@ -1820,14 +2412,24 @@ pub fn wait_for_output_spend(
                     output_index,
                 );
             }
-            Timer::sleep(10.).await;
+            Timer::sleep(check_every).await;
         }
     };
     Box::new(fut.boxed().compat())
 }
 
-pub fn tx_enum_from_bytes(coin: &UtxoCoinFields, bytes: &[u8]) -> Result<TransactionEnum, String> {
-    let mut transaction: UtxoTx = try_s!(deserialize(bytes).map_err(|err| format!("{:?}", err)));
+pub fn tx_enum_from_bytes(coin: &UtxoCoinFields, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+    let mut transaction: UtxoTx = deserialize(bytes).map_to_mm(|e| TxMarshalingErr::InvalidInput(e.to_string()))?;
+
+    let serialized_length = transaction.tx_hex().len();
+    if bytes.len() != serialized_length {
+        return MmError::err(TxMarshalingErr::CrossCheckFailed(format!(
+            "Expected '{}' lenght of the serialized transaction, found '{}'",
+            bytes.len(),
+            serialized_length
+        )));
+    }
+
     transaction.tx_hash_algo = coin.tx_hash_algo;
     Ok(transaction.into())
 }
@@ -1868,6 +2470,16 @@ pub async fn get_raw_transaction(coin: &UtxoCoinFields, req: RawTransactionReque
     Ok(RawTransactionRes { tx_hex: hex })
 }
 
+pub async fn get_tx_hex_by_hash(coin: &UtxoCoinFields, tx_hash: Vec<u8>) -> RawTransactionResult {
+    let hex = coin
+        .rpc_client
+        .get_transaction_bytes(&H256Json::from(tx_hash.as_slice()))
+        .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: UtxoCommonOps + GetUtxoListOps + MarketCoinOps,
@@ -1901,11 +2513,12 @@ where
         + UtxoCommonOps,
 {
     match coin.derivation_method() {
-        DerivationMethod::Iguana(my_address) => get_withdraw_iguana_sender(coin, req, my_address),
+        DerivationMethod::SingleAddress(my_address) => get_withdraw_iguana_sender(coin, req, my_address),
         DerivationMethod::HDWallet(hd_wallet) => get_withdraw_hd_sender(coin, req, hd_wallet).await,
     }
 }
 
+#[allow(clippy::result_large_err)]
 pub fn get_withdraw_iguana_sender<T: UtxoCommonOps>(
     coin: &T,
     req: &WithdrawRequest,
@@ -1931,17 +2544,17 @@ pub async fn get_withdraw_hd_sender<T>(
     hd_wallet: &T::HDWallet,
 ) -> MmResult<WithdrawSenderAddress<Address, Public>, WithdrawError>
 where
-    T: HDWalletCoinOps<Address = Address, Pubkey = Public>,
+    T: HDWalletCoinOps<Address = Address, Pubkey = Public> + Sync,
 {
-    let HDAddressId {
+    let HDAccountAddressId {
         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)
+            let derivation_path = StandardHDPath::from_str(&derivation_path)
+                .map_to_mm(StandardHDPathError::from)
                 .mm_err(|e| WithdrawError::UnexpectedFromAddress(e.to_string()))?;
             let coin_type = derivation_path.coin_type();
             let expected_coin_type = hd_wallet.coin_type();
@@ -1952,7 +2565,7 @@ where
                 );
                 return MmError::err(WithdrawError::UnexpectedFromAddress(error));
             }
-            HDAddressId::from(derivation_path)
+            HDAccountAddressId::from(derivation_path)
         },
     };
 
@@ -1960,7 +2573,7 @@ where
         .get_account(account_id)
         .await
         .or_mm_err(|| WithdrawError::UnknownAccount { account_id })?;
-    let hd_address = coin.derive_address(&hd_account, chain, address_id)?;
+    let hd_address = coin.derive_address(&hd_account, chain, address_id).await?;
 
     let is_address_activated = hd_account
         .is_address_activated(chain, address_id)
@@ -2009,7 +2622,7 @@ pub fn validate_address<T: UtxoCommonOps>(coin: &T, address: &str) -> ValidateAd
         Err(e) => {
             return ValidateAddressResult {
                 is_valid: false,
-                reason: Some(e),
+                reason: Some(e.to_string()),
             }
         },
     };
@@ -2033,11 +2646,85 @@ pub fn validate_address<T: UtxoCommonOps>(coin: &T, address: &str) -> ValidateAd
     }
 }
 
+// Quick fix for null valued coin fields in fee details of old tx history entries
+#[cfg(not(target_arch = "wasm32"))]
+async fn tx_history_migration_1<T>(coin: &T, ctx: &MmArc)
+where
+    T: UtxoStandardOps + UtxoCommonOps + MmCoin + MarketCoinOps,
+{
+    const MIGRATION_NUMBER: u64 = 1;
+    let history = match coin.load_history_from_file(ctx).compat().await {
+        Ok(history) => history,
+        Err(e) => {
+            log_tag!(
+                ctx,
+                "",
+                "tx_history",
+                "coin" => coin.as_ref().conf.ticker;
+                fmt = "Error {} on 'load_history_from_file', stop the history loop", e
+            );
+            return;
+        },
+    };
+
+    let mut updated = false;
+    let to_write: Vec<TransactionDetails> = history
+        .into_iter()
+        .filter_map(|mut tx| match tx.fee_details {
+            Some(TxFeeDetails::Utxo(ref mut fee_details)) => {
+                if fee_details.coin.is_none() {
+                    fee_details.coin = Some(String::from(&tx.coin));
+                    updated = true;
+                }
+                Some(tx)
+            },
+            Some(_) => None,
+            None => Some(tx),
+        })
+        .collect();
+
+    if updated {
+        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'", e
+            );
+            return;
+        };
+    }
+    if let Err(e) = coin.update_migration_file(ctx, MIGRATION_NUMBER).compat().await {
+        log_tag!(
+            ctx,
+            "",
+            "tx_history",
+            "coin" => coin.as_ref().conf.ticker;
+            fmt = "Error {} on 'update_migration_file'", e
+        );
+    };
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+async fn migrate_tx_history<T>(coin: &T, ctx: &MmArc)
+where
+    T: UtxoStandardOps + UtxoCommonOps + MmCoin + MarketCoinOps,
+{
+    let current_migration = coin.get_tx_history_migration(ctx).compat().await.unwrap_or(0);
+    if current_migration < 1 {
+        tx_history_migration_1(coin, ctx).await;
+    }
+}
+
 #[allow(clippy::cognitive_complexity)]
 pub async fn process_history_loop<T>(coin: T, ctx: MmArc)
 where
     T: UtxoStandardOps + UtxoCommonOps + MmCoin + MarketCoinOps,
 {
+    #[cfg(not(target_arch = "wasm32"))]
+    migrate_tx_history(&coin, &ctx).await;
+
     let mut my_balance: Option<CoinBalance> = None;
     let history = match coin.load_history_from_file(&ctx).compat().await {
         Ok(history) => history,
@@ -2145,7 +2832,7 @@ where
         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();
+            let to_write: Vec<TransactionDetails> = history_map.values().cloned().collect();
             if let Err(e) = coin.save_history_to_file(&ctx, to_write).compat().await {
                 log_tag!(
                     ctx,
@@ -2222,7 +2909,7 @@ where
                 },
             }
             if updated {
-                let to_write: Vec<TransactionDetails> = history_map.iter().map(|(_, value)| value.clone()).collect();
+                let to_write: Vec<TransactionDetails> = history_map.values().cloned().collect();
                 if let Err(e) = coin.save_history_to_file(&ctx, to_write).compat().await {
                     log_tag!(
                         ctx,
@@ -2309,7 +2996,7 @@ where
                 .collect()
         },
         UtxoRpcClientEnum::Electrum(client) => {
-            let my_address = match coin.as_ref().derivation_method.iguana_or_err() {
+            let my_address = match coin.as_ref().derivation_method.single_addr_or_err() {
                 Ok(my_address) => my_address,
                 Err(e) => return RequestTxHistoryResult::CriticalError(e.to_string()),
             };
@@ -2323,8 +3010,9 @@ where
                 Ok(value) => value,
                 Err(e) => match &e.error {
                     JsonRpcErrorType::InvalidRequest(e)
+                    | JsonRpcErrorType::Parse(_, e)
                     | JsonRpcErrorType::Transport(e)
-                    | JsonRpcErrorType::Parse(_, e) => {
+                    | JsonRpcErrorType::Internal(e) => {
                         return RequestTxHistoryResult::Retry {
                             error: ERRL!("Error {} on scripthash_get_history", e),
                         };
@@ -2371,7 +3059,7 @@ pub async fn tx_details_by_hash<T: UtxoCommonOps>(
     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());
+    let my_address = try_s!(coin.as_ref().derivation_method.single_addr_or_err());
 
     input_transactions.insert(hash, HistoryUtxoTx {
         tx: tx.clone(),
@@ -2499,6 +3187,7 @@ pub async fn tx_details_by_hash<T: UtxoCommonOps>(
         timestamp: verbose_tx.time.into(),
         kmd_rewards,
         transaction_type: Default::default(),
+        memo: None,
     })
 }
 
@@ -2566,7 +3255,7 @@ where
         }));
     }
 
-    let my_address = &coin.my_address().map_to_mm(UtxoRpcError::Internal)?;
+    let my_address = &coin.my_address()?;
     let claimed_by_me = tx_details.from.iter().all(|from| from == my_address) && tx_details.to.contains(my_address);
 
     tx_details.kmd_rewards = Some(KmdRewardsDetails {
@@ -2657,7 +3346,7 @@ where
     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()?;
+    let my_address = coin.as_ref().derivation_method.single_addr_or_err()?;
 
     match tx_fee {
         // if it's a dynamic fee, we should generate a swap transaction to get an actual trade fee
@@ -2752,7 +3441,7 @@ where
 
     // `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)
+        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
@@ -2768,7 +3457,7 @@ where
 /// 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: UtxoCommonOps>(coin: T) -> TradePreimageFut<TradeFee> {
     let fut = async move {
-        let amount_sat = get_htlc_spend_fee(&coin, DEFAULT_SWAP_TX_SPEND_SIZE).await?;
+        let amount_sat = get_htlc_spend_fee(&coin, DEFAULT_SWAP_TX_SPEND_SIZE, &FeeApproxStage::WithoutApprox).await?;
         let amount = big_decimal_from_sat_unsigned(amount_sat, coin.as_ref().decimals).into();
         Ok(TradeFee {
             coin: coin.as_ref().conf.ticker.clone(),
@@ -3031,6 +3720,10 @@ pub async fn get_verbose_transactions_from_cache_or_rpc(
 #[inline]
 pub fn swap_contract_address() -> Option<BytesJson> { None }
 
+/// Fallback swap contract address is not used by standard UTXO coins.
+#[inline]
+pub fn fallback_swap_contract() -> Option<BytesJson> { None }
+
 /// Convert satoshis to BigDecimal amount of coin units
 #[inline]
 pub fn big_decimal_from_sat(satoshis: i64, decimals: u8) -> BigDecimal {
@@ -3078,130 +3771,6 @@ pub fn address_from_pubkey(
     }
 }
 
-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)]
 #[cfg_attr(test, mockable)]
 pub fn validate_payment<T: UtxoCommonOps>(
@@ -3215,70 +3784,53 @@ pub fn validate_payment<T: UtxoCommonOps>(
     time_lock: u32,
     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));
+) -> ValidatePaymentFut<()> {
+    let amount = try_f!(sat_from_big_decimal(&amount, coin.as_ref().decimals));
 
     let expected_redeem = payment_script(time_lock, priv_bn_hash, first_pub0, second_pub0);
     let fut = async move {
-        let mut attempts = 0;
-        loop {
-            let tx_from_rpc = match coin
-                .as_ref()
-                .rpc_client
-                .get_transaction_bytes(&tx.hash().reversed().into())
-                .compat()
-                .await
-            {
-                Ok(t) => t,
-                Err(e) => {
-                    if attempts > 2 {
-                        return ERR!(
-                            "Got error {:?} after 3 attempts of getting tx {:?} from RPC",
-                            e,
-                            tx.tx_hash()
-                        );
-                    };
-                    attempts += 1;
-                    error!("Error getting tx {:?} from rpc: {:?}", tx.tx_hash(), e);
-                    Timer::sleep(10.).await;
-                    continue;
-                },
-            };
-            if serialize(&tx).take() != tx_from_rpc.0
-                && serialize_with_flags(&tx, SERIALIZE_TRANSACTION_WITNESS).take() != tx_from_rpc.0
-            {
-                return ERR!(
-                    "Provided payment tx {:?} doesn't match tx data from rpc {:?}",
-                    tx,
-                    tx_from_rpc
-                );
-            }
+        let tx_hash = tx.tx_hash();
 
-            let expected_output = TransactionOutput {
-                value: amount,
-                script_pubkey: Builder::build_p2sh(&dhash160(&expected_redeem).into()).into(),
-            };
+        let tx_from_rpc = retry_on_err!(coin
+            .as_ref()
+            .rpc_client
+            .get_transaction_bytes(&tx.hash().reversed().into())
+            .compat())
+        .repeat_every_secs(10.)
+        .attempts(4)
+        .inspect_err(move |e| error!("Error getting tx {tx_hash:?} from rpc: {e:?}"))
+        .await
+        .map_err(|repeat_err| repeat_err.into_error().map(ValidatePaymentError::from))?;
 
-            let actual_output = tx.outputs.get(output_index);
-            if actual_output != Some(&expected_output) {
-                return ERR!(
-                    "Provided payment tx output doesn't match expected {:?} {:?}",
-                    actual_output,
-                    expected_output
-                );
-            }
+        if serialize(&tx).take() != tx_from_rpc.0
+            && serialize_with_flags(&tx, SERIALIZE_TRANSACTION_WITNESS).take() != tx_from_rpc.0
+        {
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                "Provided payment tx {:?} doesn't match tx data from rpc {:?}",
+                tx, tx_from_rpc
+            )));
+        }
 
-            if !coin.as_ref().conf.enable_spv_proof {
-                return Ok(());
-            }
+        let expected_output = TransactionOutput {
+            value: amount,
+            script_pubkey: Builder::build_p2sh(&dhash160(&expected_redeem).into()).into(),
+        };
 
-            return match confirmations {
-                0 => Ok(()),
-                _ => validate_spv_proof(coin, tx, try_spv_proof_until)
-                    .await
-                    .map_err(|e| format!("{:?}", e)),
-            };
+        let actual_output = tx.outputs.get(output_index);
+        if actual_output != Some(&expected_output) {
+            return MmError::err(ValidatePaymentError::WrongPaymentTx(format!(
+                "Provided payment tx output doesn't match expected {:?} {:?}",
+                actual_output, expected_output
+            )));
         }
+
+        if let UtxoRpcClientEnum::Electrum(client) = &coin.as_ref().rpc_client {
+            if coin.as_ref().conf.spv_conf.is_some() && confirmations != 0 {
+                client.validate_spv_proof(&tx, try_spv_proof_until).await?;
+            }
+        }
+
+        Ok(())
     };
     Box::new(fut.boxed().compat())
 }
@@ -3296,6 +3848,10 @@ async fn search_for_swap_output_spend(
 ) -> Result<Option<FoundSwapTxSpend>, String> {
     let mut tx: UtxoTx = try_s!(deserialize(tx).map_err(|e| ERRL!("{:?}", e)));
     tx.tx_hash_algo = coin.tx_hash_algo;
+    drop_mutability!(tx);
+    if tx.outputs.is_empty() {
+        return ERR!("Transaction doesn't have any output");
+    }
     let script = payment_script(time_lock, secret_hash, first_pub, second_pub);
     let expected_script_pubkey = Builder::build_p2sh(&dhash160(&script).into()).to_bytes();
     if tx.outputs[0].script_pubkey != expected_script_pubkey {
@@ -3321,7 +3877,7 @@ async fn search_for_swap_output_spend(
         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();
+            let script: Script = tx.inputs[DEFAULT_SWAP_VIN].script_sig.clone().into();
             if let Some(Ok(ref i)) = script.iter().nth(2) {
                 if i.opcode == Opcode::OP_0 {
                     return Ok(Some(FoundSwapTxSpend::Spent(tx.into())));
@@ -3406,8 +3962,7 @@ where
 }
 
 pub fn payment_script(time_lock: u32, secret_hash: &[u8], pub_0: &Public, pub_1: &Public) -> Script {
-    let builder = Builder::default();
-    builder
+    let mut builder = Builder::default()
         .push_opcode(Opcode::OP_IF)
         .push_bytes(&time_lock.to_le_bytes())
         .push_opcode(Opcode::OP_CHECKLOCKTIMEVERIFY)
@@ -3418,8 +3973,15 @@ pub fn payment_script(time_lock: u32, secret_hash: &[u8], pub_0: &Public, pub_1:
         .push_opcode(Opcode::OP_SIZE)
         .push_bytes(&[32])
         .push_opcode(Opcode::OP_EQUALVERIFY)
-        .push_opcode(Opcode::OP_HASH160)
-        .push_bytes(secret_hash)
+        .push_opcode(Opcode::OP_HASH160);
+
+    if secret_hash.len() == 32 {
+        builder = builder.push_bytes(ripemd160(secret_hash).as_slice());
+    } else {
+        builder = builder.push_bytes(secret_hash);
+    }
+
+    builder
         .push_opcode(Opcode::OP_EQUALVERIFY)
         .push_bytes(pub_1)
         .push_opcode(Opcode::OP_CHECKSIG)
@@ -3543,6 +4105,8 @@ where
         FeeApproxStage::WithoutApprox => return dynamic_fee,
         // Take into account that the dynamic fee may increase during the swap by [`UtxoCoinFields::tx_fee_volatility_percent`].
         FeeApproxStage::StartSwap => base_percent,
+        // Take into account that the dynamic fee may increase until the watcher can spend it [`UtxoCoinFields::tx_fee_volatility_percent`].
+        FeeApproxStage::WatcherPreimage => base_percent, //This needs discussion
         // Take into account that the dynamic fee may increase at each of the following stages up to [`UtxoCoinFields::tx_fee_volatility_percent`]:
         // - until a swap is started;
         // - during the swap.
@@ -3561,187 +4125,6 @@ fn increase_by_percent(num: u64, percent: f64) -> u64 {
     num + (percent.round() as u64)
 }
 
-pub async fn valid_block_header_from_storage<T>(
-    coin: &T,
-    height: u64,
-    storage: &BlockHeaderStorage,
-    client: &ElectrumClient,
-) -> Result<BlockHeader, MmError<GetBlockHeaderError>>
-where
-    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) => 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.get_unspent_ordered_list(my_address).await {
-            Ok((unspents, recently_spent)) => (unspents, recently_spent),
-            Err(e) => {
-                error!("Error {} on get_unspent_ordered_list of coin {}", e, ticker);
-                continue;
-            },
-        };
-        if unspents.len() >= merge_at {
-            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(&my_address.hash).to_bytes();
-            let output = TransactionOutput { value, script_pubkey };
-            let merge_tx_fut = generate_and_send_tx(
-                &coin,
-                unspents,
-                None,
-                FeePolicy::DeductFromOutput(0),
-                recently_spent,
-                vec![output],
-            );
-            match merge_tx_fut.await {
-                Ok(tx) => info!(
-                    "UTXO merge successful for coin {}, tx_hash {:?}",
-                    ticker,
-                    tx.hash().reversed()
-                ),
-                Err(e) => error!("Error {:?} on UTXO merge attempt for coin {}", e, ticker),
-            }
-        }
-    }
-}
-
 pub async fn can_refund_htlc<T>(coin: &T, locktime: u64) -> Result<CanRefundHtlc, MmError<UtxoRpcError>>
 where
     T: UtxoCommonOps,
@@ -3749,7 +4132,7 @@ where
     let now = now_ms() / 1000;
     if now < locktime {
         let to_wait = locktime - now + 1;
-        return Ok(CanRefundHtlc::HaveToWait(to_wait.max(3600)));
+        return Ok(CanRefundHtlc::HaveToWait(to_wait.min(3600)));
     }
 
     let mtp = coin.get_current_mtp().await?;
@@ -3759,7 +4142,7 @@ where
         Ok(CanRefundHtlc::CanRefundNow)
     } else {
         let to_wait = (locktime - mtp + 1) as u64;
-        Ok(CanRefundHtlc::HaveToWait(to_wait.max(3600)))
+        Ok(CanRefundHtlc::HaveToWait(to_wait.min(3600)))
     }
 }
 
@@ -3777,7 +4160,7 @@ where
 
 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::SingleAddress(ref my_address) => &my_address.addr_format,
         DerivationMethod::HDWallet(UtxoHDWallet { ref address_format, .. }) => address_format,
     }
 }
@@ -3789,7 +4172,7 @@ 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>>
+fn check_withdraw_address_supported<T>(coin: &T, addr: &Address) -> MmResult<(), UnsupportedAddr>
 where
     T: UtxoCommonOps,
 {
@@ -3847,6 +4230,7 @@ where
         .mm_err(From::from)
 }
 
+#[inline]
 pub fn derive_htlc_key_pair(coin: &UtxoCoinFields, _swap_unique_data: &[u8]) -> KeyPair {
     match coin.priv_key_policy {
         PrivKeyPolicy::KeyPair(k) => k,
@@ -3854,6 +4238,18 @@ pub fn derive_htlc_key_pair(coin: &UtxoCoinFields, _swap_unique_data: &[u8]) ->
     }
 }
 
+#[inline]
+pub fn derive_htlc_pubkey(coin: &dyn SwapOps, swap_unique_data: &[u8]) -> Vec<u8> {
+    coin.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+}
+
+pub fn validate_other_pubkey(raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+    if let Err(err) = Public::from_slice(raw_pubkey) {
+        return MmError::err(ValidateOtherPubKeyErr::InvalidPubKey(err.to_string()));
+    };
+    Ok(())
+}
+
 /// Sorts and deduplicates the given `unspents` in ascending order.
 fn sort_dedup_unspents<I>(unspents: I) -> Vec<UnspentInfo>
 where
diff --git a/mm2src/coins/utxo/utxo_common/utxo_tx_history_v2_common.rs b/mm2src/coins/utxo/utxo_common/utxo_tx_history_v2_common.rs
new file mode 100644
index 0000000000..8e6c8dcdd3
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_common/utxo_tx_history_v2_common.rs
@@ -0,0 +1,417 @@
+use crate::coin_balance::CoinBalanceReportOps;
+use crate::hd_wallet::{HDAccountOps, HDWalletCoinOps, HDWalletOps};
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, DisplayAddress, MyTxHistoryErrorV2, MyTxHistoryTarget,
+                              TxDetailsBuilder, TxHistoryStorage};
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
+use crate::utxo::rpc_clients::{electrum_script_hash, ElectrumClient, NativeClient, UtxoRpcClientEnum};
+use crate::utxo::utxo_common::{big_decimal_from_sat, HISTORY_TOO_LARGE_ERROR};
+use crate::utxo::utxo_tx_history_v2::{UtxoMyAddressesHistoryError, UtxoTxDetailsError, UtxoTxDetailsParams,
+                                      UtxoTxHistoryOps};
+use crate::utxo::{output_script, RequestTxHistoryResult, UtxoCoinFields, UtxoCommonOps, UtxoHDAccount};
+use crate::{big_decimal_from_sat_unsigned, compare_transactions, BalanceResult, CoinWithDerivationMethod,
+            DerivationMethod, HDAccountAddressId, MarketCoinOps, TransactionDetails, TxFeeDetails, TxIdHeight,
+            UtxoFeeDetails, UtxoTx};
+use common::jsonrpc_client::JsonRpcErrorType;
+use crypto::Bip44Chain;
+use futures::compat::Future01CompatExt;
+use itertools::Itertools;
+use keys::{Address, Type as ScriptType};
+use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
+use rpc::v1::types::{TransactionInputEnum, H256 as H256Json};
+use serialization::deserialize;
+use std::collections::{HashMap, HashSet};
+use std::convert::TryFrom;
+use std::iter;
+
+/// [`CoinWithTxHistoryV2::history_wallet_id`] implementation.
+pub fn history_wallet_id(coin: &UtxoCoinFields) -> WalletId { WalletId::new(coin.conf.ticker.clone()) }
+
+/// [`CoinWithTxHistoryV2::get_tx_history_filters`] implementation.
+/// Returns `GetTxHistoryFilters` according to the derivation method.
+pub async fn get_tx_history_filters<Coin>(
+    coin: &Coin,
+    target: MyTxHistoryTarget,
+) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2>
+where
+    Coin: CoinWithDerivationMethod<HDWallet = <Coin as HDWalletCoinOps>::HDWallet>
+        + HDWalletCoinOps
+        + MarketCoinOps
+        + Sync,
+    <Coin as HDWalletCoinOps>::Address: DisplayAddress,
+{
+    match (coin.derivation_method(), target) {
+        (DerivationMethod::SingleAddress(_), MyTxHistoryTarget::Iguana) => {
+            let my_address = coin.my_address()?;
+            Ok(GetTxHistoryFilters::for_address(my_address))
+        },
+        (DerivationMethod::SingleAddress(_), target) => {
+            MmError::err(MyTxHistoryErrorV2::with_expected_target(target, "Iguana"))
+        },
+        (DerivationMethod::HDWallet(hd_wallet), MyTxHistoryTarget::AccountId { account_id }) => {
+            get_tx_history_filters_for_hd_account(coin, hd_wallet, account_id).await
+        },
+        (DerivationMethod::HDWallet(hd_wallet), MyTxHistoryTarget::AddressId(hd_address_id)) => {
+            get_tx_history_filters_for_hd_address(coin, hd_wallet, hd_address_id).await
+        },
+        (DerivationMethod::HDWallet(hd_wallet), MyTxHistoryTarget::AddressDerivationPath(derivation_path)) => {
+            let hd_address_id = HDAccountAddressId::from(derivation_path);
+            get_tx_history_filters_for_hd_address(coin, hd_wallet, hd_address_id).await
+        },
+        (DerivationMethod::HDWallet(_), target) => MmError::err(MyTxHistoryErrorV2::with_expected_target(
+            target,
+            "an HD account/address",
+        )),
+    }
+}
+
+/// `get_tx_history_filters` function's helper.
+async fn get_tx_history_filters_for_hd_account<Coin>(
+    coin: &Coin,
+    hd_wallet: &Coin::HDWallet,
+    account_id: u32,
+) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2>
+where
+    Coin: HDWalletCoinOps + Sync,
+    Coin::Address: DisplayAddress,
+{
+    let hd_account = hd_wallet
+        .get_account(account_id)
+        .await
+        .or_mm_err(|| MyTxHistoryErrorV2::InvalidTarget(format!("No such account_id={account_id}")))?;
+
+    let external_addresses = coin.derive_known_addresses(&hd_account, Bip44Chain::External).await?;
+    let internal_addresses = coin.derive_known_addresses(&hd_account, Bip44Chain::Internal).await?;
+
+    let addresses_iter = external_addresses
+        .into_iter()
+        .chain(internal_addresses)
+        .map(|hd_address| DisplayAddress::display_address(&hd_address.address));
+    Ok(GetTxHistoryFilters::for_addresses(addresses_iter))
+}
+
+/// `get_tx_history_filters` function's helper.
+async fn get_tx_history_filters_for_hd_address<Coin>(
+    coin: &Coin,
+    hd_wallet: &Coin::HDWallet,
+    hd_address_id: HDAccountAddressId,
+) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2>
+where
+    Coin: HDWalletCoinOps + Sync,
+    Coin::Address: DisplayAddress,
+{
+    let hd_account = hd_wallet
+        .get_account(hd_address_id.account_id)
+        .await
+        .or_mm_err(|| MyTxHistoryErrorV2::InvalidTarget(format!("No such account_id={}", hd_address_id.account_id)))?;
+
+    let is_address_activated = hd_account.is_address_activated(hd_address_id.chain, hd_address_id.address_id)?;
+    if !is_address_activated {
+        let error = format!(
+            "'{:?}:{}' address is not activated",
+            hd_address_id.chain, hd_address_id.address_id
+        );
+        return MmError::err(MyTxHistoryErrorV2::InvalidTarget(error));
+    }
+
+    let hd_address = coin
+        .derive_address(&hd_account, hd_address_id.chain, hd_address_id.address_id)
+        .await?;
+    Ok(GetTxHistoryFilters::for_address(hd_address.address.display_address()))
+}
+
+/// [`UtxoTxHistoryOps::my_addresses`] implementation.
+pub async fn my_addresses<Coin>(coin: &Coin) -> MmResult<HashSet<Address>, UtxoMyAddressesHistoryError>
+where
+    Coin: HDWalletCoinOps<Address = Address, HDAccount = UtxoHDAccount> + UtxoCommonOps,
+{
+    const ADDRESSES_CAPACITY: usize = 60;
+
+    match coin.as_ref().derivation_method {
+        DerivationMethod::SingleAddress(ref my_address) => Ok(iter::once(my_address.clone()).collect()),
+        DerivationMethod::HDWallet(ref hd_wallet) => {
+            let hd_accounts = hd_wallet.get_accounts().await;
+
+            let mut all_addresses = HashSet::with_capacity(ADDRESSES_CAPACITY);
+            for (_, hd_account) in hd_accounts {
+                let external_addresses = coin.derive_known_addresses(&hd_account, Bip44Chain::External).await?;
+                let internal_addresses = coin.derive_known_addresses(&hd_account, Bip44Chain::Internal).await?;
+
+                let addresses_it = external_addresses
+                    .into_iter()
+                    .chain(internal_addresses)
+                    .map(|hd_address| hd_address.address);
+                all_addresses.extend(addresses_it);
+            }
+
+            Ok(all_addresses)
+        },
+    }
+}
+
+/// [`UtxoTxHistoryOps::tx_details_by_hash`] implementation.
+pub async fn tx_details_by_hash<Coin, Storage>(
+    coin: &Coin,
+    params: UtxoTxDetailsParams<'_, Storage>,
+) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError>
+where
+    Coin: UtxoTxHistoryOps + UtxoCommonOps + MarketCoinOps,
+    Storage: TxHistoryStorage,
+{
+    let ticker = coin.ticker();
+    let decimals = coin.as_ref().decimals;
+
+    let verbose_tx = coin
+        .as_ref()
+        .rpc_client
+        .get_verbose_transaction(params.hash)
+        .compat()
+        .await?;
+    let tx: UtxoTx = deserialize(verbose_tx.hex.as_slice())?;
+
+    let mut tx_builder = TxDetailsBuilder::new(
+        ticker.to_string(),
+        &tx,
+        params.block_height_and_time,
+        params.my_addresses.clone(),
+    );
+
+    let mut input_amount = 0;
+    let mut output_amount = 0;
+
+    for input in tx.inputs.iter() {
+        // input transaction is zero if the tx is the coinbase transaction
+        if input.previous_output.hash.is_zero() {
+            continue;
+        }
+
+        let prev_tx_hash: H256Json = input.previous_output.hash.reversed().into();
+
+        let prev_tx = coin.tx_from_storage_or_rpc(&prev_tx_hash, params.storage).await?;
+
+        let prev_output_index = input.previous_output.index as usize;
+        let prev_tx_value = prev_tx.outputs[prev_output_index].value;
+        let prev_script = prev_tx.outputs[prev_output_index].script_pubkey.clone().into();
+
+        input_amount += prev_tx_value;
+        let amount = big_decimal_from_sat_unsigned(prev_tx_value, decimals);
+
+        let from: Vec<Address> = coin
+            .addresses_from_script(&prev_script)
+            .map_to_mm(UtxoTxDetailsError::TxAddressDeserializationError)?;
+        for address in from {
+            tx_builder.transferred_from(address, &amount);
+        }
+    }
+
+    for output in tx.outputs.iter() {
+        let output_script = output.script_pubkey.clone().into();
+        let to = coin
+            .addresses_from_script(&output_script)
+            .map_to_mm(UtxoTxDetailsError::TxAddressDeserializationError)?;
+        if to.is_empty() {
+            continue;
+        }
+
+        output_amount += output.value;
+        let amount = big_decimal_from_sat_unsigned(output.value, decimals);
+        for address in to {
+            tx_builder.transferred_to(address, &amount);
+        }
+    }
+
+    let fee = if input_amount == 0 {
+        let fee = verbose_tx.vin.iter().fold(0., |cur, input| {
+            let fee = match input {
+                TransactionInputEnum::Lelantus(lelantus) => lelantus.n_fees,
+                _ => 0.,
+            };
+            cur + fee
+        });
+        BigDecimal::try_from(fee)?
+    } else {
+        let fee = input_amount as i64 - output_amount as i64;
+        big_decimal_from_sat(fee, decimals)
+    };
+
+    let fee_details = UtxoFeeDetails {
+        coin: Some(ticker.to_string()),
+        amount: fee,
+    };
+
+    tx_builder.set_tx_fee(Some(TxFeeDetails::from(fee_details)));
+    Ok(vec![tx_builder.build()])
+}
+
+/// [`UtxoTxHistoryOps::tx_from_storage_or_rpc`] implementation.
+pub async fn tx_from_storage_or_rpc<Coin, Storage>(
+    coin: &Coin,
+    tx_hash: &H256Json,
+    storage: &Storage,
+) -> MmResult<UtxoTx, UtxoTxDetailsError>
+where
+    Coin: CoinWithTxHistoryV2 + UtxoCommonOps,
+    Storage: TxHistoryStorage,
+{
+    let tx_hash_str = format!("{:02x}", tx_hash);
+    let wallet_id = coin.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 = coin.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)
+}
+
+/// [`UtxoTxHistoryOps::my_addresses_balances`] implementation.
+/// Requests balances of all activated addresses.
+pub async fn my_addresses_balances<Coin>(coin: &Coin) -> BalanceResult<HashMap<String, BigDecimal>>
+where
+    Coin: CoinBalanceReportOps,
+{
+    let coin_balance = coin.coin_balance_report().await?;
+    Ok(coin_balance.to_addresses_total_balances())
+}
+
+/// [`UtxoTxHistoryOps::request_tx_history`] implementation.
+/// Requests transaction history according to `UtxoRpcClientEnum`.
+pub async fn request_tx_history<Coin>(
+    coin: &Coin,
+    metrics: MetricsArc,
+    for_addresses: &HashSet<Address>,
+) -> RequestTxHistoryResult
+where
+    Coin: UtxoCommonOps + MarketCoinOps,
+{
+    let ticker = coin.ticker();
+    match coin.as_ref().rpc_client {
+        UtxoRpcClientEnum::Native(ref native) => {
+            request_tx_history_with_native(ticker, native, metrics, for_addresses).await
+        },
+        UtxoRpcClientEnum::Electrum(ref electrum) => {
+            request_tx_history_with_electrum(ticker, electrum, metrics, for_addresses).await
+        },
+    }
+}
+
+/// `request_tx_history_with_der_method` function's helper.
+async fn request_tx_history_with_native(
+    ticker: &str,
+    native: &NativeClient,
+    metrics: MetricsArc,
+    for_addresses: &HashSet<Address>,
+) -> RequestTxHistoryResult {
+    let my_addresses: HashSet<String> = for_addresses.iter().map(DisplayAddress::display_address).collect();
+
+    let mut from = 0;
+    let mut all_transactions = vec![];
+    loop {
+        mm_counter!(metrics, "tx.history.request.count", 1,
+            "coin" => ticker, "client" => "native", "method" => "listtransactions");
+
+        let transactions = match native.list_transactions(100, from).compat().await {
+            Ok(value) => value,
+            Err(e) => {
+                return RequestTxHistoryResult::Retry {
+                    error: ERRL!("Error {} on list transactions", e),
+                };
+            },
+        };
+
+        mm_counter!(metrics, "tx.history.response.count", 1,
+            "coin" => ticker, "client" => "native", "method" => "listtransactions");
+
+        if transactions.is_empty() {
+            break;
+        }
+        from += 100;
+        all_transactions.extend(transactions);
+    }
+
+    mm_counter!(metrics, "tx.history.response.total_length", all_transactions.len() as u64,
+        "coin" => ticker, "client" => "native", "method" => "listtransactions");
+
+    let all_transactions = all_transactions
+        .into_iter()
+        .filter_map(|item| {
+            if my_addresses.contains(&item.address) {
+                Some((item.txid, item.blockindex))
+            } else {
+                None
+            }
+        })
+        .collect();
+
+    RequestTxHistoryResult::Ok(all_transactions)
+}
+
+/// `request_tx_history_with_der_method` function's helper.
+async fn request_tx_history_with_electrum(
+    ticker: &str,
+    electrum: &ElectrumClient,
+    metrics: MetricsArc,
+    for_addresses: &HashSet<Address>,
+) -> RequestTxHistoryResult {
+    fn addr_to_script_hash(addr: &Address) -> String {
+        let script = output_script(addr, ScriptType::P2PKH);
+        let script_hash = electrum_script_hash(&script);
+        hex::encode(script_hash)
+    }
+
+    let script_hashes_count = for_addresses.len() as u64;
+    let script_hashes = for_addresses.iter().map(addr_to_script_hash);
+
+    mm_counter!(metrics, "tx.history.request.count", script_hashes_count,
+        "coin" => ticker, "client" => "electrum", "method" => "blockchain.scripthash.get_history");
+
+    let hashes_history = match electrum.scripthash_get_history_batch(script_hashes).compat().await {
+        Ok(hashes_history) => hashes_history,
+        Err(e) => match &e.error {
+            JsonRpcErrorType::InvalidRequest(e)
+            | JsonRpcErrorType::Transport(e)
+            | JsonRpcErrorType::Parse(_, e)
+            | JsonRpcErrorType::Internal(e) => {
+                return RequestTxHistoryResult::Retry {
+                    error: ERRL!("Error {} on scripthash_get_history", e),
+                };
+            },
+            JsonRpcErrorType::Response(_addr, err) => {
+                if HISTORY_TOO_LARGE_ERROR.eq(err) {
+                    return RequestTxHistoryResult::HistoryTooLarge;
+                } else {
+                    return RequestTxHistoryResult::Retry {
+                        error: ERRL!("Error {:?} on scripthash_get_history", e),
+                    };
+                }
+            },
+        },
+    };
+
+    let ordered_history: Vec<_> = hashes_history
+        .into_iter()
+        .flatten()
+        .map(|item| {
+            let height = if item.height < 0 { 0 } else { item.height as u64 };
+            (item.tx_hash, height)
+        })
+        // We need to order transactions by their height and TX hash.
+        .sorted_by(|(tx_hash_left, height_left), (tx_hash_right, height_right)| {
+            let left = TxIdHeight::new(*height_left, tx_hash_left);
+            let right = TxIdHeight::new(*height_right, tx_hash_right);
+            compare_transactions(left, right)
+        })
+        .collect();
+
+    mm_counter!(metrics, "tx.history.response.count", script_hashes_count,
+        "coin" => ticker, "client" => "electrum", "method" => "blockchain.scripthash.get_history");
+
+    mm_counter!(metrics, "tx.history.response.total_length", ordered_history.len() as u64,
+        "coin" => ticker, "client" => "electrum", "method" => "blockchain.scripthash.get_history");
+
+    RequestTxHistoryResult::Ok(ordered_history)
+}
diff --git a/mm2src/coins/utxo/utxo_common_tests.rs b/mm2src/coins/utxo/utxo_common_tests.rs
index 94613eb5c8..eef16a64ba 100644
--- a/mm2src/coins/utxo/utxo_common_tests.rs
+++ b/mm2src/coins/utxo/utxo_common_tests.rs
@@ -1,9 +1,198 @@
 use super::*;
+use crate::hd_wallet::HDAccountsMap;
+use crate::my_tx_history_v2::{my_tx_history_v2_impl, CoinWithTxHistoryV2, MyTxHistoryDetails, MyTxHistoryRequestV2,
+                              MyTxHistoryResponseV2, MyTxHistoryTarget};
+use crate::tx_history_storage::TxHistoryStorageBuilder;
 use crate::utxo::rpc_clients::{ElectrumClient, UtxoRpcClientOps};
+use crate::utxo::tx_cache::dummy_tx_cache::DummyVerboseCache;
+use crate::utxo::tx_cache::UtxoVerboseCacheOps;
+use crate::utxo::utxo_tx_history_v2::{utxo_history_loop, UtxoTxHistoryOps};
+use crate::{compare_transaction_details, UtxoStandardCoin};
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::executor::{spawn, Timer};
 use common::jsonrpc_client::JsonRpcErrorType;
+use common::PagingOptionsEnum;
+use crypto::privkey::key_pair_from_seed;
+use itertools::Itertools;
+use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
 use std::convert::TryFrom;
+use std::num::NonZeroUsize;
+use std::time::Duration;
 
-pub async fn test_electrum_display_balances(rpc_client: &ElectrumClient) {
+pub(super) const TEST_COIN_NAME: &'static str = "RICK";
+// Made-up hrp for rick to test p2wpkh script
+pub(super) const TEST_COIN_HRP: &'static str = "rck";
+pub(super) const TEST_COIN_DECIMALS: u8 = 8;
+
+const MORTY_HD_TX_HISTORY_STR: &str = include_str!("../for_tests/MORTY_HD_tx_history_fixtures.json");
+
+lazy_static! {
+    static ref MORTY_HD_TX_HISTORY: Vec<TransactionDetails> = parse_tx_history(MORTY_HD_TX_HISTORY_STR);
+    static ref MORTY_HD_TX_HISTORY_MAP: HashMap<String, TransactionDetails> =
+        parse_tx_history_map(MORTY_HD_TX_HISTORY_STR);
+}
+
+fn parse_tx_history(history_str: &'static str) -> Vec<TransactionDetails> { json::from_str(history_str).unwrap() }
+
+fn parse_tx_history_map(history_str: &'static str) -> HashMap<String, TransactionDetails> {
+    parse_tx_history(history_str)
+        .into_iter()
+        .map(|tx| (format!("{:02x}", tx.internal_id), tx))
+        .collect()
+}
+
+pub(super) fn utxo_coin_fields_for_test(
+    rpc_client: UtxoRpcClientEnum,
+    force_seed: Option<&str>,
+    is_segwit_coin: bool,
+) -> UtxoCoinFields {
+    let checksum_type = ChecksumType::DSHA256;
+    let default_seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
+    let seed = match force_seed {
+        Some(s) => s.into(),
+        None => match std::env::var("BOB_PASSPHRASE") {
+            Ok(p) => {
+                if p.is_empty() {
+                    default_seed.into()
+                } else {
+                    p
+                }
+            },
+            Err(_) => default_seed.into(),
+        },
+    };
+    let key_pair = key_pair_from_seed(&seed).unwrap();
+    let my_address = Address {
+        prefix: 60,
+        hash: key_pair.public().address_hash().into(),
+        t_addr_prefix: 0,
+        checksum_type,
+        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::SingleAddress(my_address);
+
+    let bech32_hrp = if is_segwit_coin {
+        Some(TEST_COIN_HRP.to_string())
+    } else {
+        None
+    };
+
+    UtxoCoinFields {
+        conf: UtxoCoinConf {
+            is_pos: false,
+            requires_notarization: false.into(),
+            overwintered: true,
+            segwit: true,
+            tx_version: 4,
+            default_address_format: UtxoAddressFormat::Standard,
+            asset_chain: true,
+            p2sh_addr_prefix: 85,
+            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,
+            tx_fee_volatility_percent: DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT,
+            version_group_id: 0x892f2085,
+            consensus_branch_id: 0x76b809bb,
+            zcash: true,
+            checksum_type,
+            fork_id: 0,
+            signature_version: SignatureVersion::Base,
+            required_confirmations: 1.into(),
+            force_min_relay_fee: false,
+            mtp_block_count: NonZeroU64::new(11).unwrap(),
+            estimate_fee_mode: None,
+            mature_confirmations: MATURE_CONFIRMATIONS_DEFAULT,
+            estimate_fee_blocks: 1,
+            trezor_coin: None,
+            spv_conf: None,
+            derivation_path: None,
+            avg_blocktime: None,
+        },
+        decimals: TEST_COIN_DECIMALS,
+        dust_amount: UTXO_DUST_AMOUNT,
+        tx_fee: TxFee::FixedPerKb(1000),
+        rpc_client,
+        priv_key_policy,
+        derivation_method,
+        history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
+        tx_cache: DummyVerboseCache::default().into_shared(),
+        recently_spent_outpoints: AsyncMutex::new(RecentlySpentOutPoints::new(my_script_pubkey)),
+        tx_hash_algo: TxHashAlgo::DSHA256,
+        check_utxo_maturity: false,
+        block_headers_status_notifier: None,
+        block_headers_status_watcher: None,
+        abortable_system: AbortableQueue::default(),
+    }
+}
+
+pub(super) fn utxo_coin_from_fields(coin: UtxoCoinFields) -> UtxoStandardCoin {
+    let arc: UtxoArc = coin.into();
+    arc.into()
+}
+
+pub(super) async fn wait_for_tx_history_finished<Coin>(
+    ctx: &MmArc,
+    coin: &Coin,
+    target: MyTxHistoryTarget,
+    expected_txs: usize,
+    timeout_s: u64,
+) -> MyTxHistoryResponseV2<MyTxHistoryDetails, BytesJson>
+where
+    Coin: CoinWithTxHistoryV2 + MmCoin,
+{
+    let req = MyTxHistoryRequestV2 {
+        coin: coin.ticker().to_owned(),
+        limit: u32::MAX as usize,
+        paging_options: PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()),
+        target,
+    };
+
+    // Let the storage to be initialized for the given coin.
+    Timer::sleep(1.).await;
+
+    repeatable!(async {
+        let response = my_tx_history_v2_impl(ctx.clone(), coin, req.clone()).await.unwrap();
+        if response.transactions.len() >= expected_txs {
+            return Ready(response);
+        }
+        Retry(())
+    })
+    .repeat_every(Duration::from_secs(3))
+    .with_timeout_ms(timeout_s * 1000)
+    .await
+    .unwrap()
+}
+
+pub(super) fn get_morty_hd_transactions_ordered(tx_hashes: &[&str]) -> Vec<TransactionDetails> {
+    tx_hashes
+        .iter()
+        .map(|tx_hash| {
+            MORTY_HD_TX_HISTORY_MAP
+                .get(*tx_hash)
+                .expect(&format!("No such {tx_hash:?} TX in the file"))
+                .clone()
+        })
+        .sorted_by(compare_transaction_details)
+        .collect()
+}
+
+pub(super) async fn test_electrum_display_balances(rpc_client: &ElectrumClient) {
     let addresses = vec![
         "RG278CfeNPFtNztFZQir8cgdWexVhViYVy".into(),
         "RYPz6Lr4muj4gcFzpMdv3ks1NCGn3mkDPN".into(),
@@ -48,3 +237,79 @@ pub async fn test_electrum_display_balances(rpc_client: &ElectrumClient) {
         ekind => panic!("Unexpected `JsonRpcErrorType`: {:?}", ekind),
     }
 }
+
+/// TODO move this test to `mm2_tests.rs`
+/// when [Trezor Daemon Emulator](https://github.com/trezor/trezord-go#emulator-support) is integrated.
+pub(super) async fn test_hd_utxo_tx_history_impl(rpc_client: ElectrumClient) {
+    let ctx = mm_ctx_with_custom_db();
+
+    let hd_account_for_test = UtxoHDAccount {
+        account_id: 0,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ").unwrap(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/0'").unwrap(),
+        external_addresses_number: 11,
+        internal_addresses_number: 3,
+        derived_addresses: HDAddressesCache::default(),
+    };
+    let mut hd_accounts = HDAccountsMap::new();
+    hd_accounts.insert(0, hd_account_for_test);
+
+    let mut fields = utxo_coin_fields_for_test(rpc_client.into(), None, false);
+    fields.conf.ticker = "MORTY".to_string();
+    fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_rmd160: "6d9d2b554d768232320587df75c4338ecc8bf37d".into(),
+        hd_wallet_storage: HDWalletCoinStorage::default(),
+        address_format: UtxoAddressFormat::Standard,
+        derivation_path: StandardHDPathToCoin::from_str("m/44'/141'").unwrap(),
+        accounts: HDAccountsMutex::new(hd_accounts),
+        gap_limit: 20,
+    });
+
+    let coin = utxo_coin_from_fields(fields);
+
+    let current_balances = coin.my_addresses_balances().await.unwrap();
+
+    let storage = TxHistoryStorageBuilder::new(&ctx).build().unwrap();
+    spawn(utxo_history_loop(
+        coin.clone(),
+        storage,
+        ctx.metrics.clone(),
+        current_balances,
+    ));
+
+    let target = MyTxHistoryTarget::AccountId { account_id: 0 };
+    let tx_history = wait_for_tx_history_finished(&ctx, &coin, target, 4, 30).await;
+
+    let actual: Vec<_> = tx_history.transactions.into_iter().map(|tx| tx.details).collect();
+    let expected = get_morty_hd_transactions_ordered(&[
+        "70c62f42d65f9d71a8fb7f4560057b80dc2ecd9e4990621323faf1de9a53ca97",
+        "bd031dc681cdc63491fd71902c5960985127b04eb02211a1049bff0d0c8ebce3",
+        "bf02bea67c568108c91f58d88f2f7adda84a3287949ad89cc8c05de95042fb75",
+        "7dc038aae5eef3108f8071450b590cd0d376a08c1aea190ba89491cc3b27ea8d",
+    ]);
+    assert_eq!(actual, expected);
+
+    // Activate new `RQstQeTUEZLh6c3YWJDkeVTTQoZUsfvNCr` address.
+    match coin.as_ref().derivation_method {
+        DerivationMethod::HDWallet(ref hd_wallet) => {
+            let mut accounts = hd_wallet.accounts.lock().await;
+            accounts.get_mut(&0).unwrap().internal_addresses_number += 1
+        },
+        _ => unimplemented!(),
+    }
+
+    // Wait for the TX history loop to fetch Transactions of the activated address.
+    let target = MyTxHistoryTarget::AccountId { account_id: 0 };
+    let tx_history = wait_for_tx_history_finished(&ctx, &coin, target, 5, 60).await;
+
+    let actual: Vec<_> = tx_history.transactions.into_iter().map(|tx| tx.details).collect();
+    let expected = get_morty_hd_transactions_ordered(&[
+        // New transaction:
+        "6ca27dd058b939c98a33625b9f68eaeebca5a3058aec062647ca6fd7634bb339",
+        "70c62f42d65f9d71a8fb7f4560057b80dc2ecd9e4990621323faf1de9a53ca97",
+        "bd031dc681cdc63491fd71902c5960985127b04eb02211a1049bff0d0c8ebce3",
+        "bf02bea67c568108c91f58d88f2f7adda84a3287949ad89cc8c05de95042fb75",
+        "7dc038aae5eef3108f8071450b590cd0d376a08c1aea190ba89491cc3b27ea8d",
+    ]);
+    assert_eq!(actual, expected);
+}
diff --git a/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs b/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs
deleted file mode 100644
index d00d4f261f..0000000000
--- a/mm2src/coins/utxo/utxo_indexedb_block_header_storage.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index d11b794e54..0000000000
--- a/mm2src/coins/utxo/utxo_sql_block_header_storage.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-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 b48f9bfe59..34746570f7 100644
--- a/mm2src/coins/utxo/utxo_standard.rs
+++ b/mm2src/coins/utxo/utxo_standard.rs
@@ -1,31 +1,46 @@
 use super::*;
-use crate::coin_balance::{self, EnableCoinBalanceError, HDAccountBalance, HDAddressBalance, HDWalletBalance,
-                          HDWalletBalanceOps};
+use crate::coin_balance::{self, EnableCoinBalanceError, EnabledCoinBalanceParams, HDAccountBalance, HDAddressBalance,
+                          HDWalletBalance, HDWalletBalanceOps};
+use crate::coin_errors::MyAddressError;
+use crate::hd_confirm_address::HDConfirmAddress;
 use crate::hd_pubkey::{ExtractExtendedPubkey, HDExtractPubkeyError, HDXPubExtractor};
-use crate::hd_wallet::{self, AccountUpdatingError, AddressDerivingError, GetNewHDAddressParams,
-                       GetNewHDAddressResponse, HDAccountMut, HDWalletRpcError, HDWalletRpcOps,
-                       NewAccountCreatingError};
+use crate::hd_wallet::{AccountUpdatingError, AddressDerivingResult, HDAccountMut, NewAccountCreatingError,
+                       NewAddressDeriveConfirmError};
 use crate::hd_wallet_storage::HDWalletCoinWithStorageOps;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, MyTxHistoryErrorV2, MyTxHistoryTarget, TxHistoryStorage};
 use crate::rpc_command::account_balance::{self, AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::get_new_address::{self, GetNewAddressParams, GetNewAddressResponse, GetNewAddressRpcError,
+                                          GetNewAddressRpcOps};
 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_account_balance::{self, InitAccountBalanceParams, InitAccountBalanceRpcOps};
+use crate::rpc_command::init_create_account::{self, CreateAccountRpcError, CreateAccountState, CreateNewAccountParams,
+                                              InitCreateAccountRpcOps};
 use crate::rpc_command::init_scan_for_new_addresses::{self, InitScanAddressesRpcOps, ScanAddressesParams,
                                                       ScanAddressesResponse};
 use crate::rpc_command::init_withdraw::{InitWithdrawCoin, WithdrawTaskHandle};
+use crate::tx_history_storage::{GetTxHistoryFilters, WalletId};
 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 crypto::trezor::utxo::TrezorUtxoCoin;
+use crate::utxo::utxo_tx_history_v2::{UtxoMyAddressesHistoryError, UtxoTxDetailsError, UtxoTxDetailsParams,
+                                      UtxoTxHistoryOps};
+use crate::{CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinBalance, CoinWithDerivationMethod, GetWithdrawSenderAddress,
+            IguanaPrivKey, MakerSwapTakerCoin, NegotiateSwapContractAddrErr, PaymentInstructions,
+            PaymentInstructionsErr, PrivKeyBuildPolicy, RefundError, RefundResult, SearchForSwapTxSpendInput,
+            SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs,
+            SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs, SendTakerRefundsPaymentArgs,
+            SendTakerSpendsMakerPaymentArgs, SendWatcherRefundsPaymentArgs, SignatureResult, SwapOps,
+            TakerSwapMakerCoin, TradePreimageValue, TransactionFut, TxMarshalingErr, ValidateAddressResult,
+            ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
+            ValidatePaymentFut, ValidatePaymentInput, VerificationResult, WatcherOps,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut,
+            WithdrawSenderAddress};
+use common::executor::{AbortableSystem, AbortedError};
 use crypto::Bip44Chain;
 use futures::{FutureExt, TryFutureExt};
+use mm2_metrics::MetricsArc;
 use mm2_number::MmNumber;
-use serialization::coin_variant_by_ticker;
 use utxo_signer::UtxoSignerOps;
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct UtxoStandardCoin {
     utxo_arc: UtxoArc,
 }
@@ -42,14 +57,13 @@ impl From<UtxoStandardCoin> for UtxoArc {
     fn from(coin: UtxoStandardCoin) -> Self { coin.utxo_arc }
 }
 
-pub async fn utxo_standard_coin_with_priv_key(
+pub async fn utxo_standard_coin_with_policy(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
     activation_params: &UtxoActivationParams,
-    priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> Result<UtxoStandardCoin, String> {
-    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
     let coin = try_s!(
         UtxoArcBuilder::new(
             ctx,
@@ -65,6 +79,17 @@ pub async fn utxo_standard_coin_with_priv_key(
     Ok(coin)
 }
 
+pub async fn utxo_standard_coin_with_priv_key(
+    ctx: &MmArc,
+    ticker: &str,
+    conf: &Json,
+    activation_params: &UtxoActivationParams,
+    priv_key: IguanaPrivKey,
+) -> Result<UtxoStandardCoin, String> {
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    utxo_standard_coin_with_policy(ctx, ticker, conf, activation_params, priv_key_policy).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)]
@@ -144,8 +169,8 @@ impl GetUtxoMapOps for UtxoStandardCoin {
 #[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
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size, stage).await
     }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
@@ -158,13 +183,12 @@ impl UtxoCommonOps for UtxoStandardCoin {
         utxo_common::my_public_key(self.as_ref())
     }
 
-    fn address_from_str(&self, address: &str) -> Result<Address, String> {
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
         utxo_common::checked_address_from_str(self, address)
     }
 
     async fn get_current_mtp(&self) -> UtxoRpcResult<u32> {
-        let coin_variant = coin_variant_by_ticker(self.ticker());
-        utxo_common::get_current_mtp(&self.utxo_arc, coin_variant).await
+        utxo_common::get_current_mtp(&self.utxo_arc, self.ticker().into()).await
     }
 
     fn is_unspent_mature(&self, output: &RpcTransaction) -> bool {
@@ -266,134 +290,93 @@ impl UtxoStandardOps for UtxoStandardCoin {
 
 #[async_trait]
 impl SwapOps for UtxoStandardCoin {
+    #[inline]
     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 {
+    #[inline]
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_payment(
             self.clone(),
-            time_lock,
-            taker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            maker_payment_args.time_lock,
+            maker_payment_args.other_pubkey,
+            maker_payment_args.secret_hash,
+            maker_payment_args.amount,
+            maker_payment_args.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 {
+    #[inline]
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_payment(
             self.clone(),
-            time_lock,
-            maker_pub,
-            secret_hash,
-            amount,
-            swap_unique_data,
+            taker_payment_args.time_lock,
+            taker_payment_args.other_pubkey,
+            taker_payment_args.secret_hash,
+            taker_payment_args.amount,
+            taker_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_maker_spends_taker_payment(
             self.clone(),
-            taker_payment_tx,
-            time_lock,
-            taker_pub,
-            secret,
-            swap_unique_data,
+            maker_spends_payment_args.other_payment_tx,
+            maker_spends_payment_args.time_lock,
+            maker_spends_payment_args.other_pubkey,
+            maker_spends_payment_args.secret,
+            maker_spends_payment_args.secret_hash,
+            maker_spends_payment_args.swap_unique_data,
         )
     }
 
+    #[inline]
     fn send_taker_spends_maker_payment(
         &self,
-        maker_tx: &[u8],
-        time_lock: u32,
-        maker_pub: &[u8],
-        secret: &[u8],
-        _swap_contract_address: &Option<BytesJson>,
-        swap_unique_data: &[u8],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs,
     ) -> TransactionFut {
         utxo_common::send_taker_spends_maker_payment(
             self.clone(),
-            maker_tx,
-            time_lock,
-            maker_pub,
-            secret,
-            swap_unique_data,
+            taker_spends_payment_args.other_payment_tx,
+            taker_spends_payment_args.time_lock,
+            taker_spends_payment_args.other_pubkey,
+            taker_spends_payment_args.secret,
+            taker_spends_payment_args.secret_hash,
+            taker_spends_payment_args.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 {
+    #[inline]
+    fn send_taker_refunds_payment(&self, taker_refunds_payment_args: SendTakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_taker_refunds_payment(
             self.clone(),
-            taker_tx,
-            time_lock,
-            maker_pub,
-            secret_hash,
-            swap_unique_data,
+            taker_refunds_payment_args.payment_tx,
+            taker_refunds_payment_args.time_lock,
+            taker_refunds_payment_args.other_pubkey,
+            taker_refunds_payment_args.secret_hash,
+            taker_refunds_payment_args.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 {
+    #[inline]
+    fn send_maker_refunds_payment(&self, maker_refunds_payment_args: SendMakerRefundsPaymentArgs) -> TransactionFut {
         utxo_common::send_maker_refunds_payment(
             self.clone(),
-            maker_tx,
-            time_lock,
-            taker_pub,
-            secret_hash,
-            swap_unique_data,
+            maker_refunds_payment_args.payment_tx,
+            maker_refunds_payment_args.time_lock,
+            maker_refunds_payment_args.other_pubkey,
+            maker_refunds_payment_args.secret_hash,
+            maker_refunds_payment_args.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 {
+    fn validate_fee(&self, validate_fee_args: ValidateFeeArgs) -> Box<dyn Future<Item = (), Error = String> + Send> {
+        let tx = match validate_fee_args.fee_tx {
             TransactionEnum::UtxoTx(tx) => tx.clone(),
             _ => panic!(),
         };
@@ -401,33 +384,38 @@ impl SwapOps for UtxoStandardCoin {
             self.clone(),
             tx,
             utxo_common::DEFAULT_FEE_VOUT,
-            expected_sender,
-            amount,
-            min_block_number,
-            fee_addr,
+            validate_fee_args.expected_sender,
+            validate_fee_args.amount,
+            validate_fee_args.min_block_number,
+            validate_fee_args.fee_addr,
         )
     }
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_taker_payment(self, input)
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs,
     ) -> 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)
+        utxo_common::check_if_my_payment_sent(
+            self.clone(),
+            if_my_payment_sent_args.time_lock,
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.swap_unique_data,
+        )
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -435,6 +423,7 @@ impl SwapOps for UtxoStandardCoin {
         utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_other(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -442,10 +431,17 @@ impl SwapOps for UtxoStandardCoin {
         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> {
+    #[inline]
+    fn check_tx_signed_by_pub(&self, tx: &[u8], expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        utxo_common::check_all_inputs_signed_by_pub(tx, expected_pub)
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         utxo_common::extract_secret(secret_hash, spend_tx)
     }
 
+    #[inline]
     fn can_refund_htlc(&self, locktime: u64) -> Box<dyn Future<Item = CanRefundHtlc, Error = String> + Send + '_> {
         Box::new(
             utxo_common::can_refund_htlc(self, locktime)
@@ -455,6 +451,15 @@ impl SwapOps for UtxoStandardCoin {
         )
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    #[inline]
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
@@ -465,6 +470,142 @@ impl SwapOps for UtxoStandardCoin {
     fn derive_htlc_key_pair(&self, swap_unique_data: &[u8]) -> KeyPair {
         utxo_common::derive_htlc_key_pair(self.as_ref(), swap_unique_data)
     }
+
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        utxo_common::derive_htlc_pubkey(self, swap_unique_data)
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn is_supported_by_watchers(&self) -> bool { true }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for UtxoStandardCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for UtxoStandardCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for UtxoStandardCoin {
+    #[inline]
+    fn create_taker_payment_refund_preimage(
+        &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::create_taker_payment_refund_preimage(
+            self,
+            taker_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn create_maker_payment_spend_preimage(
+        &self,
+        maker_payment_tx: &[u8],
+        time_lock: u32,
+        maker_pub: &[u8],
+        secret_hash: &[u8],
+        swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        utxo_common::create_maker_payment_spend_preimage(
+            self,
+            maker_payment_tx,
+            time_lock,
+            maker_pub,
+            secret_hash,
+            swap_unique_data,
+        )
+    }
+
+    #[inline]
+    fn send_taker_payment_refund_preimage(
+        &self,
+        watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        utxo_common::send_taker_payment_refund_preimage(self, watcher_refunds_payment_args)
+    }
+
+    #[inline]
+    fn send_maker_payment_spend_preimage(&self, input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        utxo_common::send_maker_payment_spend_preimage(self, input)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_fee(&self, input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_fee(self, input, utxo_common::DEFAULT_FEE_VOUT)
+    }
+
+    #[inline]
+    fn watcher_validate_taker_payment(&self, input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        utxo_common::watcher_validate_taker_payment(self, input)
+    }
+
+    #[inline]
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        utxo_common::watcher_search_for_swap_tx_spend(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
+    }
 }
 
 impl MarketCoinOps for UtxoStandardCoin {
@@ -475,7 +616,7 @@ impl MarketCoinOps for UtxoStandardCoin {
         Ok(pubkey.to_string())
     }
 
-    fn my_address(&self) -> Result<String, String> { utxo_common::my_address(self) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { utxo_common::my_address(self) }
 
     fn sign_message_hash(&self, message: &str) -> Option<[u8; 32]> {
         utxo_common::sign_message_hash(self.as_ref(), message)
@@ -523,12 +664,14 @@ impl MarketCoinOps for UtxoStandardCoin {
         )
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
             &self.utxo_arc,
@@ -536,10 +679,11 @@ impl MarketCoinOps for UtxoStandardCoin {
             utxo_common::DEFAULT_SWAP_VOUT,
             from_block,
             wait_until,
+            check_every,
         )
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
         utxo_common::tx_enum_from_bytes(self.as_ref(), bytes)
     }
 
@@ -558,10 +702,20 @@ impl MarketCoinOps for UtxoStandardCoin {
 impl MmCoin for UtxoStandardCoin {
     fn is_asset_chain(&self) -> bool { utxo_common::is_asset_chain(&self.utxo_arc) }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.as_ref().abortable_system) }
+
     fn get_raw_transaction(&self, req: RawTransactionRequest) -> RawTransactionFut {
         Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_tx_hex_by_hash(&self.utxo_arc, tx_hash)
+                .boxed()
+                .compat(),
+        )
+    }
+
     fn withdraw(&self, req: WithdrawRequest) -> WithdrawFut {
         Box::new(utxo_common::withdraw(self.clone(), req).boxed().compat())
     }
@@ -597,7 +751,7 @@ impl MmCoin for UtxoStandardCoin {
         utxo_common::get_sender_trade_fee(self, value, stage).await
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
@@ -623,6 +777,8 @@ impl MmCoin for UtxoStandardCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::swap_contract_address() }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
+
     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) }
@@ -630,6 +786,10 @@ impl MmCoin for UtxoStandardCoin {
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
         utxo_common::is_coin_protocol_supported(self, info)
     }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.as_ref().abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
 
 #[async_trait]
@@ -660,10 +820,11 @@ impl InitWithdrawCoin for UtxoStandardCoin {
 impl UtxoSignerOps for UtxoStandardCoin {
     type TxGetter = UtxoRpcClientEnum;
 
-    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin> {
+    fn trezor_coin(&self) -> UtxoSignTxResult<String> {
         self.utxo_arc
             .conf
             .trezor_coin
+            .clone()
             .or_mm_err(|| UtxoSignTxError::CoinNotSupportedWithTrezor {
                 coin: self.utxo_arc.conf.ticker.clone(),
             })
@@ -695,7 +856,7 @@ impl ExtractExtendedPubkey for UtxoStandardCoin {
         derivation_path: DerivationPath,
     ) -> MmResult<Self::ExtendedPublicKey, HDExtractPubkeyError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         utxo_common::extract_extended_pubkey(&self.utxo_arc.conf, xpub_extractor, derivation_path).await
     }
@@ -708,13 +869,28 @@ impl HDWalletCoinOps for UtxoStandardCoin {
     type HDWallet = UtxoHDWallet;
     type HDAccount = UtxoHDAccount;
 
-    fn derive_address(
+    async fn derive_addresses<Ids>(
         &self,
         hd_account: &Self::HDAccount,
+        address_ids: Ids,
+    ) -> AddressDerivingResult<Vec<HDAddress<Self::Address, Self::Pubkey>>>
+    where
+        Ids: Iterator<Item = HDAddressId> + Send,
+    {
+        utxo_common::derive_addresses(self, hd_account, address_ids).await
+    }
+
+    async fn generate_and_confirm_new_address<ConfirmAddress>(
+        &self,
+        hd_wallet: &Self::HDWallet,
+        hd_account: &mut Self::HDAccount,
         chain: Bip44Chain,
-        address_id: u32,
-    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, AddressDerivingError> {
-        utxo_common::derive_address(self, hd_account, chain, address_id)
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<HDAddress<Self::Address, Self::Pubkey>, NewAddressDeriveConfirmError>
+    where
+        ConfirmAddress: HDConfirmAddress,
+    {
+        utxo_common::generate_and_confirm_new_address(self, hd_wallet, hd_account, chain, confirm_address).await
     }
 
     async fn create_new_account<'a, XPubExtractor>(
@@ -723,7 +899,7 @@ impl HDWalletCoinOps for UtxoStandardCoin {
         xpub_extractor: &XPubExtractor,
     ) -> MmResult<HDAccountMut<'a, Self::HDAccount>, NewAccountCreatingError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
         utxo_common::create_new_account(self, hd_wallet, xpub_extractor).await
     }
@@ -740,12 +916,23 @@ impl HDWalletCoinOps for UtxoStandardCoin {
 }
 
 #[async_trait]
-impl HDWalletRpcOps for UtxoStandardCoin {
-    async fn get_new_address_rpc(
+impl GetNewAddressRpcOps for UtxoStandardCoin {
+    async fn get_new_address_rpc_without_conf(
         &self,
-        params: GetNewHDAddressParams,
-    ) -> MmResult<GetNewHDAddressResponse, HDWalletRpcError> {
-        hd_wallet::common_impl::get_new_address_rpc(self, params).await
+        params: GetNewAddressParams,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError> {
+        get_new_address::common_impl::get_new_address_rpc_without_conf(self, params).await
+    }
+
+    async fn get_new_address_rpc<ConfirmAddress>(
+        &self,
+        params: GetNewAddressParams,
+        confirm_address: &ConfirmAddress,
+    ) -> MmResult<GetNewAddressResponse, GetNewAddressRpcError>
+    where
+        ConfirmAddress: HDConfirmAddress,
+    {
+        get_new_address::common_impl::get_new_address_rpc(self, params, confirm_address).await
     }
 }
 
@@ -761,12 +948,12 @@ impl HDWalletBalanceOps for UtxoStandardCoin {
         &self,
         hd_wallet: &Self::HDWallet,
         xpub_extractor: &XPubExtractor,
-        scan_policy: EnableCoinScanPolicy,
+        params: EnabledCoinBalanceParams,
     ) -> MmResult<HDWalletBalance, EnableCoinBalanceError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
-        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, scan_policy).await
+        coin_balance::common_impl::enable_hd_wallet(self, hd_wallet, xpub_extractor, params).await
     }
 
     async fn scan_for_new_addresses(
@@ -811,6 +998,16 @@ impl AccountBalanceRpcOps for UtxoStandardCoin {
     }
 }
 
+#[async_trait]
+impl InitAccountBalanceRpcOps for UtxoStandardCoin {
+    async fn init_account_balance_rpc(
+        &self,
+        params: InitAccountBalanceParams,
+    ) -> MmResult<HDAccountBalance, HDAccountBalanceRpcError> {
+        init_account_balance::common_impl::init_account_balance_rpc(self, params).await
+    }
+}
+
 #[async_trait]
 impl InitScanAddressesRpcOps for UtxoStandardCoin {
     async fn init_scan_for_new_addresses_rpc(
@@ -822,15 +1019,81 @@ impl InitScanAddressesRpcOps for UtxoStandardCoin {
 }
 
 #[async_trait]
-impl InitCreateHDAccountRpcOps for UtxoStandardCoin {
+impl InitCreateAccountRpcOps for UtxoStandardCoin {
     async fn init_create_account_rpc<XPubExtractor>(
         &self,
         params: CreateNewAccountParams,
+        state: CreateAccountState,
         xpub_extractor: &XPubExtractor,
-    ) -> MmResult<HDAccountBalance, HDWalletRpcError>
+    ) -> MmResult<HDAccountBalance, CreateAccountRpcError>
     where
-        XPubExtractor: HDXPubExtractor + Sync,
+        XPubExtractor: HDXPubExtractor,
     {
-        init_create_account::common_impl::init_create_new_account_rpc(self, params, xpub_extractor).await
+        init_create_account::common_impl::init_create_new_account_rpc(self, params, state, xpub_extractor).await
+    }
+
+    async fn revert_creating_account(&self, account_id: u32) {
+        init_create_account::common_impl::revert_creating_account(self, account_id).await
+    }
+}
+
+#[async_trait]
+impl CoinWithTxHistoryV2 for UtxoStandardCoin {
+    fn history_wallet_id(&self) -> WalletId { utxo_common::utxo_tx_history_v2_common::history_wallet_id(self.as_ref()) }
+
+    async fn get_tx_history_filters(
+        &self,
+        target: MyTxHistoryTarget,
+    ) -> MmResult<GetTxHistoryFilters, MyTxHistoryErrorV2> {
+        utxo_common::utxo_tx_history_v2_common::get_tx_history_filters(self, target).await
+    }
+}
+
+#[async_trait]
+impl UtxoTxHistoryOps for UtxoStandardCoin {
+    async fn my_addresses(&self) -> MmResult<HashSet<Address>, UtxoMyAddressesHistoryError> {
+        utxo_common::utxo_tx_history_v2_common::my_addresses(self).await
+    }
+
+    async fn tx_details_by_hash<Storage>(
+        &self,
+        params: UtxoTxDetailsParams<'_, Storage>,
+    ) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError>
+    where
+        Storage: TxHistoryStorage,
+    {
+        utxo_common::utxo_tx_history_v2_common::tx_details_by_hash(self, params).await
+    }
+
+    async fn tx_from_storage_or_rpc<Storage: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        storage: &Storage,
+    ) -> MmResult<UtxoTx, UtxoTxDetailsError> {
+        utxo_common::utxo_tx_history_v2_common::tx_from_storage_or_rpc(self, tx_hash, storage).await
+    }
+
+    async fn request_tx_history(
+        &self,
+        metrics: MetricsArc,
+        for_addresses: &HashSet<Address>,
+    ) -> RequestTxHistoryResult {
+        utxo_common::utxo_tx_history_v2_common::request_tx_history(self, metrics, for_addresses).await
+    }
+
+    async fn get_block_timestamp(&self, height: u64) -> MmResult<u64, GetBlockHeaderError> {
+        self.as_ref().rpc_client.get_block_timestamp(height).await
+    }
+
+    async fn my_addresses_balances(&self) -> BalanceResult<HashMap<String, BigDecimal>> {
+        utxo_common::utxo_tx_history_v2_common::my_addresses_balances(self).await
+    }
+
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
+        utxo_common::checked_address_from_str(self, address)
+    }
+
+    fn set_history_sync_state(&self, new_state: HistorySyncState) {
+        *self.as_ref().history_sync_state.lock().unwrap() = new_state;
     }
 }
diff --git a/mm2src/coins/utxo/utxo_tests.rs b/mm2src/coins/utxo/utxo_tests.rs
index e864ac9946..cec80eb40c 100644
--- a/mm2src/coins/utxo/utxo_tests.rs
+++ b/mm2src/coins/utxo/utxo_tests.rs
@@ -1,49 +1,60 @@
 use super::*;
 use crate::coin_balance::HDAddressBalance;
+use crate::hd_confirm_address::for_tests::MockableConfirmAddress;
+use crate::hd_confirm_address::{HDConfirmAddress, HDConfirmAddressError};
 use crate::hd_wallet::HDAccountsMap;
 use crate::hd_wallet_storage::{HDWalletMockStorage, HDWalletStorageInternalOps};
+use crate::my_tx_history_v2::for_tests::init_storage_for;
+use crate::my_tx_history_v2::CoinWithTxHistoryV2;
 use crate::rpc_command::account_balance::{AccountBalanceParams, AccountBalanceRpcOps, HDAccountBalanceResponse};
+use crate::rpc_command::get_new_address::{GetNewAddressParams, GetNewAddressRpcError, GetNewAddressRpcOps};
 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};
+#[cfg(not(target_arch = "wasm32"))]
+use crate::utxo::rpc_clients::{BlockHashOrHeight, NativeUnspent};
+use crate::utxo::rpc_clients::{ElectrumBalance, ElectrumClient, ElectrumClientImpl, GetAddressInfoRes,
+                               ListSinceBlockRes, NativeClient, NativeClientImpl, NetworkInfo, UtxoRpcClientOps,
+                               ValidateAddressRes, VerboseBlock};
+use crate::utxo::spv::SimplePaymentVerification;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::utxo::utxo_block_header_storage::{BlockHeaderStorage, SqliteBlockHeadersStorage};
+use crate::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilder, UtxoCoinBuilderCommonOps};
 use crate::utxo::utxo_common::UtxoTxBuilder;
-use crate::utxo::utxo_common_tests;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::utxo::utxo_common_tests::TEST_COIN_DECIMALS;
+use crate::utxo::utxo_common_tests::{self, utxo_coin_fields_for_test, utxo_coin_from_fields, TEST_COIN_NAME};
 use crate::utxo::utxo_standard::{utxo_standard_coin_with_priv_key, UtxoStandardCoin};
+use crate::utxo::utxo_tx_history_v2::{UtxoTxDetailsParams, UtxoTxHistoryOps};
 #[cfg(not(target_arch = "wasm32"))] use crate::WithdrawFee;
-use crate::{CoinBalance, PrivKeyBuildPolicy, SearchForSwapTxSpendInput, StakingInfosDetails, SwapOps,
-            TradePreimageValue, TxFeeDetails};
-use chain::OutPoint;
+use crate::{BlockHeightAndTime, CoinBalance, IguanaPrivKey, PrivKeyBuildPolicy, SearchForSwapTxSpendInput,
+            SendMakerSpendsTakerPaymentArgs, StakingInfosDetails, SwapOps, TradePreimageValue, TxFeeDetails,
+            TxMarshalingErr, ValidateFeeArgs};
+use chain::{BlockHeader, BlockHeaderBits, OutPoint};
 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 crypto::{privkey::key_pair_from_seed, Bip44Chain, RpcDerivationPath, Secp256k1Secret};
+#[cfg(not(target_arch = "wasm32"))]
+use db_common::sqlite::rusqlite::Connection;
+use futures::channel::mpsc::channel;
 use futures::future::join_all;
 use futures::TryFutureExt;
 use mm2_core::mm_ctx::MmCtxBuilder;
 use mm2_number::bigdecimal::{BigDecimal, Signed};
+use mm2_test_helpers::for_tests::{mm_ctx_with_custom_db, MORTY_ELECTRUM_ADDRS, RICK_ELECTRUM_ADDRS};
 use mocktopus::mocking::*;
 use rpc::v1::types::H256 as H256Json;
 use serialization::{deserialize, CoinVariant};
-use std::convert::TryFrom;
+use spv_validation::conf::{BlockHeaderValidationParams, SPVBlockHeader};
+use spv_validation::storage::BlockHeaderStorageOps;
+use spv_validation::work::DifficultyAlgorithm;
+#[cfg(not(target_arch = "wasm32"))] 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
-const TEST_COIN_HRP: &'static str = "rck";
-const RICK_ELECTRUM_ADDRS: &[&'static str] = &[
-    "electrum1.cipig.net:10017",
-    "electrum2.cipig.net:10017",
-    "electrum3.cipig.net:10017",
-];
-const TEST_COIN_DECIMALS: u8 = 8;
+#[cfg(not(target_arch = "wasm32"))]
+const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
 
 pub fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
     let ctx = MmCtxBuilder::default().into_mm_arc();
@@ -53,7 +64,7 @@ pub fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
         "servers": servers,
     });
     let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
-    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(&[]);
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(IguanaPrivKey::default());
     let builder = UtxoArcBuilder::new(
         &ctx,
         TEST_COIN_NAME,
@@ -69,120 +80,65 @@ pub fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
     };
 
     let servers = servers.into_iter().map(|s| json::from_value(s).unwrap()).collect();
-    block_on(builder.electrum_client(args, servers)).unwrap()
+    let abortable_system = AbortableQueue::default();
+    block_on(builder.electrum_client(abortable_system, args, servers)).unwrap()
 }
 
 /// Returned client won't work by default, requires some mocks to be usable
 #[cfg(not(target_arch = "wasm32"))]
 fn native_client_for_test() -> NativeClient { NativeClient(Arc::new(NativeClientImpl::default())) }
 
-fn utxo_coin_fields_for_test(
+fn utxo_coin_for_test(
     rpc_client: UtxoRpcClientEnum,
     force_seed: Option<&str>,
     is_segwit_coin: bool,
-) -> UtxoCoinFields {
-    let checksum_type = ChecksumType::DSHA256;
-    let default_seed = "spice describe gravity federal blast come thank unfair canal monkey style afraid";
-    let seed = match force_seed {
-        Some(s) => s.into(),
-        None => match std::env::var("BOB_PASSPHRASE") {
-            Ok(p) => {
-                if p.is_empty() {
-                    default_seed.into()
-                } else {
-                    p
-                }
-            },
-            Err(_) => default_seed.into(),
-        },
-    };
-    let key_pair = key_pair_from_seed(&seed).unwrap();
-    let my_address = Address {
-        prefix: 60,
-        hash: key_pair.public().address_hash().into(),
-        t_addr_prefix: 0,
-        checksum_type,
-        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 {
-        None
-    };
-
-    UtxoCoinFields {
-        conf: UtxoCoinConf {
-            is_pos: false,
-            requires_notarization: false.into(),
-            overwintered: true,
-            segwit: true,
-            tx_version: 4,
-            default_address_format: UtxoAddressFormat::Standard,
-            asset_chain: true,
-            p2sh_addr_prefix: 85,
-            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,
-            tx_fee_volatility_percent: DEFAULT_DYNAMIC_FEE_VOLATILITY_PERCENT,
-            version_group_id: 0x892f2085,
-            consensus_branch_id: 0x76b809bb,
-            zcash: true,
-            checksum_type,
-            fork_id: 0,
-            signature_version: SignatureVersion::Base,
-            required_confirmations: 1.into(),
-            force_min_relay_fee: false,
-            mtp_block_count: NonZeroU64::new(11).unwrap(),
-            estimate_fee_mode: None,
-            mature_confirmations: MATURE_CONFIRMATIONS_DEFAULT,
-            estimate_fee_blocks: 1,
-            trezor_coin: None,
-            enable_spv_proof: false,
-        },
-        decimals: TEST_COIN_DECIMALS,
-        dust_amount: UTXO_DUST_AMOUNT,
-        tx_fee: TxFee::FixedPerKb(1000),
-        rpc_client,
-        priv_key_policy,
-        derivation_method,
-        history_sync_state: Mutex::new(HistorySyncState::NotEnabled),
-        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,
-    }
+) -> UtxoStandardCoin {
+    utxo_coin_from_fields(utxo_coin_fields_for_test(rpc_client, force_seed, is_segwit_coin))
 }
 
-fn utxo_coin_from_fields(coin: UtxoCoinFields) -> UtxoStandardCoin {
-    let arc: UtxoArc = coin.into();
-    arc.into()
+/// Returns `TransactionDetails` of the given `tx_hash` via [`UtxoStandardOps::tx_details_by_hash`].
+#[track_caller]
+fn get_tx_details_by_hash<Coin: UtxoStandardOps>(coin: &Coin, tx_hash: &str) -> TransactionDetails {
+    let hash = hex::decode(tx_hash).unwrap();
+    let mut input_transactions = HistoryUtxoTxMap::new();
+
+    block_on(UtxoStandardOps::tx_details_by_hash(
+        coin,
+        &hash,
+        &mut input_transactions,
+    ))
+    .unwrap()
 }
 
-fn utxo_coin_for_test(
-    rpc_client: UtxoRpcClientEnum,
-    force_seed: Option<&str>,
-    is_segwit_coin: bool,
-) -> UtxoStandardCoin {
-    utxo_coin_from_fields(utxo_coin_fields_for_test(rpc_client, force_seed, is_segwit_coin))
+/// Returns `TransactionDetails` of the given `tx_hash` via [`UtxoTxHistoryOps::tx_details_by_hash`].
+fn get_tx_details_by_hash_v2<Coin>(coin: &Coin, tx_hash: &str, height: u64, timestamp: u64) -> Vec<TransactionDetails>
+where
+    Coin: CoinWithTxHistoryV2 + UtxoTxHistoryOps,
+{
+    let my_addresses = block_on(coin.my_addresses()).unwrap();
+    let (_ctx, storage) = init_storage_for(coin);
+    let params = UtxoTxDetailsParams {
+        hash: &hex::decode(tx_hash).unwrap().as_slice().into(),
+        block_height_and_time: Some(BlockHeightAndTime { height, timestamp }),
+        storage: &storage,
+        my_addresses: &my_addresses,
+    };
+
+    block_on(UtxoTxHistoryOps::tx_details_by_hash(coin, params)).unwrap()
+}
+
+/// Returns `TransactionDetails` of the given `tx_hash` and checks that
+/// [`UtxoTxHistoryOps::tx_details_by_hash`] and [`UtxoStandardOps::tx_details_by_hash`] return the same TX details.
+#[track_caller]
+fn get_tx_details_eq_for_both_versions<Coin>(coin: &Coin, tx_hash: &str) -> TransactionDetails
+where
+    Coin: CoinWithTxHistoryV2 + UtxoTxHistoryOps + UtxoStandardOps,
+{
+    let tx_details_v1 = get_tx_details_by_hash(coin, tx_hash);
+    let tx_details_v2 = get_tx_details_by_hash_v2(coin, tx_hash, tx_details_v1.block_height, tx_details_v1.timestamp);
+
+    assert_eq!(vec![tx_details_v1.clone()], tx_details_v2);
+    tx_details_v1
 }
 
 #[test]
@@ -193,7 +149,7 @@ fn test_extract_secret() {
     let tx_hex = hex::decode("0100000001de7aa8d29524906b2b54ee2e0281f3607f75662cbc9080df81d1047b78e21dbc00000000d7473044022079b6c50820040b1fbbe9251ced32ab334d33830f6f8d0bf0a40c7f1336b67d5b0220142ccf723ddabb34e542ed65c395abc1fbf5b6c3e730396f15d25c49b668a1a401209da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365004c6b6304f62b0e5cb175210270e75970bb20029b3879ec76c4acd320a8d0589e003636264d01a7d566504bfbac6782012088a9142fb610d856c19fd57f2d0cffe8dff689074b3d8a882103f368228456c940ac113e53dad5c104cf209f2f102a409207269383b6ab9b03deac68ffffffff01d0dc9800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac40280e5c").unwrap();
     let expected_secret = hex::decode("9da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365").unwrap();
     let secret_hash = &*dhash160(&expected_secret);
-    let secret = coin.extract_secret(secret_hash, &tx_hex).unwrap();
+    let secret = block_on(coin.extract_secret(secret_hash, &tx_hex)).unwrap();
     assert_eq!(secret, expected_secret);
 }
 
@@ -203,16 +159,17 @@ fn test_send_maker_spends_taker_payment_recoverable_tx() {
     let coin = utxo_coin_for_test(client.into(), None, false);
     let tx_hex = hex::decode("0100000001de7aa8d29524906b2b54ee2e0281f3607f75662cbc9080df81d1047b78e21dbc00000000d7473044022079b6c50820040b1fbbe9251ced32ab334d33830f6f8d0bf0a40c7f1336b67d5b0220142ccf723ddabb34e542ed65c395abc1fbf5b6c3e730396f15d25c49b668a1a401209da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365004c6b6304f62b0e5cb175210270e75970bb20029b3879ec76c4acd320a8d0589e003636264d01a7d566504bfbac6782012088a9142fb610d856c19fd57f2d0cffe8dff689074b3d8a882103f368228456c940ac113e53dad5c104cf209f2f102a409207269383b6ab9b03deac68ffffffff01d0dc9800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac40280e5c").unwrap();
     let secret = hex::decode("9da937e5609680cb30bff4a7661364ca1d1851c2506fa80c443f00a3d3bf7365").unwrap();
-
+    let maker_spends_payment_args = SendMakerSpendsTakerPaymentArgs {
+        other_payment_tx: &tx_hex,
+        time_lock: 777,
+        other_pubkey: &coin.my_public_key().unwrap().to_vec(),
+        secret: &secret,
+        secret_hash: &*dhash160(&secret),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let tx_err = coin
-        .send_maker_spends_taker_payment(
-            &tx_hex,
-            777,
-            &coin.my_public_key().unwrap().to_vec(),
-            &secret,
-            &coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_spends_taker_payment(maker_spends_payment_args)
         .wait()
         .unwrap_err();
 
@@ -278,7 +235,7 @@ fn test_generate_transaction() {
     }];
 
     let outputs = vec![TransactionOutput {
-        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_iguana().hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_single_addr().hash).to_bytes(),
         value: 100000,
     }];
 
@@ -455,21 +412,44 @@ fn test_wait_for_payment_spend_timeout_native() {
     let from_block = 1000;
 
     assert!(coin
-        .wait_for_tx_spend(&transaction, wait_until, from_block, &None)
+        .wait_for_htlc_tx_spend(
+            &transaction,
+            &[],
+            wait_until,
+            from_block,
+            &None,
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL
+        )
         .wait()
         .is_err());
     assert!(unsafe { OUTPUT_SPEND_CALLED });
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 #[test]
 fn test_wait_for_payment_spend_timeout_electrum() {
     static mut OUTPUT_SPEND_CALLED: bool = false;
+
     ElectrumClient::find_output_spend.mock_safe(|_, _, _, _, _| {
         unsafe { OUTPUT_SPEND_CALLED = true };
         MockResult::Return(Box::new(futures01::future::ok(None)))
     });
 
-    let client = ElectrumClientImpl::new(TEST_COIN_NAME.into(), Default::default());
+    let block_headers_storage = BlockHeaderStorage {
+        inner: Box::new(SqliteBlockHeadersStorage {
+            ticker: TEST_COIN_NAME.into(),
+            conn: Arc::new(Mutex::new(Connection::open_in_memory().unwrap())),
+        }),
+    };
+    let abortable_system = AbortableQueue::default();
+
+    let client = ElectrumClientImpl::new(
+        TEST_COIN_NAME.into(),
+        Default::default(),
+        block_headers_storage,
+        abortable_system,
+        true,
+    );
     let client = UtxoRpcClientEnum::Electrum(ElectrumClient(Arc::new(client)));
     let coin = utxo_coin_for_test(client, None, false);
     let transaction = hex::decode("01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01eeffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02202cb206000000001976a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac9093510d000000001976a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac000247304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee0121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635711000000")
@@ -478,7 +458,14 @@ fn test_wait_for_payment_spend_timeout_electrum() {
     let from_block = 1000;
 
     assert!(coin
-        .wait_for_tx_spend(&transaction, wait_until, from_block, &None)
+        .wait_for_htlc_tx_spend(
+            &transaction,
+            &[],
+            wait_until,
+            from_block,
+            &None,
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL
+        )
         .wait()
         .is_err());
     assert!(unsafe { OUTPUT_SPEND_CALLED });
@@ -949,7 +936,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().derivation_method.unwrap_iguana().hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_single_addr().hash).to_bytes(),
     };
     let mut futures = vec![];
     for _ in 0..5 {
@@ -964,18 +951,24 @@ 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()
+    let header: BlockHeader = deserialize(
+        block_on(client.blockchain_block_header(452248).compat())
+            .unwrap()
+            .as_slice(),
+    )
+    .unwrap();
+    let mut headers = HashMap::new();
+    headers.insert(452248, header);
+    let storage = client.block_headers_storage();
+    block_on(storage.add_block_headers_to_storage(headers)).unwrap();
+
+    let res = block_on(client.validate_spv_proof(&tx, now_ms() / 1000 + 30));
+    res.unwrap();
 }
 
 #[test]
@@ -988,6 +981,10 @@ fn list_since_block_btc_serde() {
 #[test]
 // https://github.com/KomodoPlatform/atomicDEX-API/issues/587
 fn get_tx_details_coinbase_transaction() {
+    /// Hash of coinbase transaction
+    /// https://morty.explorer.dexstats.info/tx/b59b093ed97c1798f2a88ee3375a0c11d0822b6e4468478777f899891abd34a5
+    const TX_HASH: &str = "b59b093ed97c1798f2a88ee3375a0c11d0822b6e4468478777f899891abd34a5";
+
     let client = electrum_client_for_test(&[
         "electrum1.cipig.net:10018",
         "electrum2.cipig.net:10018",
@@ -999,16 +996,8 @@ fn get_tx_details_coinbase_transaction() {
         false,
     );
 
-    let fut = async move {
-        // hash of coinbase transaction https://morty.explorer.dexstats.info/tx/b59b093ed97c1798f2a88ee3375a0c11d0822b6e4468478777f899891abd34a5
-        let hash = hex::decode("b59b093ed97c1798f2a88ee3375a0c11d0822b6e4468478777f899891abd34a5").unwrap();
-
-        let mut input_transactions = HistoryUtxoTxMap::new();
-        let tx_details = coin.tx_details_by_hash(&hash, &mut input_transactions).await.unwrap();
-        assert!(tx_details.from.is_empty());
-    };
-
-    block_on(fut);
+    let tx_details = get_tx_details_eq_for_both_versions(&coin, TX_HASH);
+    assert!(tx_details.from.is_empty());
 }
 
 #[test]
@@ -1350,6 +1339,8 @@ fn test_get_median_time_past_from_native_does_not_have_median_in_get_block() {
 
 #[test]
 fn test_cashaddresses_in_tx_details_by_hash() {
+    const TX_HASH: &str = "0f2f6e0c8f440c641895023782783426c3aca1acc78d7c0db7751995e8aa5751";
+
     let conf = json!({
         "coin": "BCH",
         "pubtype": 0,
@@ -1371,28 +1362,20 @@ 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_with_priv_key(
-        &ctx, "BCH", &conf, &params, &[1u8; 32],
-    ))
-    .unwrap();
-
-    let hash = hex::decode("0f2f6e0c8f440c641895023782783426c3aca1acc78d7c0db7751995e8aa5751").unwrap();
-    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);
+    let priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "BCH", &conf, &params, priv_key)).unwrap();
 
-        assert!(tx_details
-            .from
-            .iter()
-            .any(|addr| addr == "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"));
-        assert!(tx_details
-            .to
-            .iter()
-            .any(|addr| addr == "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"));
-    };
+    let tx_details = get_tx_details_eq_for_both_versions(&coin, TX_HASH);
+    log!("{:?}", tx_details);
 
-    block_on(fut);
+    assert!(tx_details
+        .from
+        .iter()
+        .any(|addr| addr == "bchtest:qze8g4gx3z428jjcxzpycpxl7ke7d947gca2a7n2la"));
+    assert!(tx_details
+        .to
+        .iter()
+        .any(|addr| addr == "bchtest:qr39na5d25wdeecgw3euh9fkd4ygvd4pnsury96597"));
 }
 
 #[test]
@@ -1418,17 +1401,20 @@ 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_with_priv_key(
-        &ctx, "BCH", &conf, &params, &[1u8; 32],
-    ))
-    .unwrap();
+    let priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "BCH", &conf, &params, priv_key)).unwrap();
 
     // other error on parse
-    let error = coin
-        .address_from_str("bitcoincash:000000000000000000000000000000000000000000")
+    let error = UtxoCommonOps::address_from_str(&coin, "bitcoincash:000000000000000000000000000000000000000000")
         .err()
         .unwrap();
-    assert!(error.contains("Invalid address: bitcoincash:000000000000000000000000000000000000000000"));
+    match error.into_inner() {
+        AddrFromStrError::CannotDetermineFormat(_) => (),
+        other => panic!(
+            "Expected 'AddrFromStrError::CannotDetermineFormat' error, found: {}",
+            other
+        ),
+    }
 }
 
 #[test]
@@ -1453,23 +1439,36 @@ 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_with_priv_key(
-        &ctx, "BCH", &conf, &params, &[1u8; 32],
-    ))
-    .unwrap();
+    let priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "BCH", &conf, &params, priv_key)).unwrap();
 
-    let error = coin
-        .address_from_str("bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55")
+    let error = UtxoCommonOps::address_from_str(&coin, "bitcoincash:qzxqqt9lh4feptf0mplnk58gnajfepzwcq9f2rxk55")
         .err()
         .unwrap();
-    assert!(error.contains("Legacy address format activated for BCH, but CashAddress format used instead"));
+    match error.into_inner() {
+        AddrFromStrError::Unsupported(UnsupportedAddr::FormatMismatch {
+            ticker,
+            activated_format,
+            used_format,
+        }) => {
+            assert_eq!(ticker, "BCH");
+            assert_eq!(activated_format, "Legacy");
+            assert_eq!(used_format, "CashAddress");
+        },
+        other => panic!("Expected 'UnsupportedAddr::FormatMismatch' error, found: {}", other),
+    }
 
     // other error on parse
-    let error = coin
-        .address_from_str("0000000000000000000000000000000000")
+    let error = UtxoCommonOps::address_from_str(&coin, "0000000000000000000000000000000000")
         .err()
         .unwrap();
-    assert!(error.contains("Invalid address: 0000000000000000000000000000000000"));
+    match error.into_inner() {
+        AddrFromStrError::CannotDetermineFormat(_) => (),
+        other => panic!(
+            "Expected 'AddrFromStrError::CannotDetermineFormat' error, found: {}",
+            other
+        ),
+    }
 }
 
 #[test]
@@ -1481,13 +1480,17 @@ fn test_network_info_negative_time_offset() {
 
 #[test]
 fn test_unavailable_electrum_proto_version() {
-    ElectrumClientImpl::new.mock_safe(|coin_ticker, event_handlers| {
-        MockResult::Return(ElectrumClientImpl::with_protocol_version(
-            coin_ticker,
-            event_handlers,
-            OrdRange::new(1.8, 1.9).unwrap(),
-        ))
-    });
+    ElectrumClientImpl::new.mock_safe(
+        |coin_ticker, event_handlers, block_headers_storage, abortable_system, _| {
+            MockResult::Return(ElectrumClientImpl::with_protocol_version(
+                coin_ticker,
+                event_handlers,
+                OrdRange::new(1.8, 1.9).unwrap(),
+                block_headers_storage,
+                abortable_system,
+            ))
+        },
+    );
 
     let conf = json!({"coin":"RICK","asset":"RICK","rpcport":8923});
     let req = json!({
@@ -1497,11 +1500,10 @@ fn test_unavailable_electrum_proto_version() {
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
     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();
+    let priv_key = Secp256k1Secret::from([1; 32]);
+    let error = block_on(utxo_standard_coin_with_priv_key(&ctx, "RICK", &conf, &params, priv_key))
+        .err()
+        .unwrap();
     log!("Error: {}", error);
     assert!(error.contains("There are no Electrums with the required protocol version"));
 }
@@ -1525,13 +1527,13 @@ fn test_spam_rick() {
         "RICK",
         &conf,
         &params,
-        &*key_pair.private().secret,
+        key_pair.private().secret,
     ))
     .unwrap();
 
     let output = TransactionOutput {
         value: 1000000,
-        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_iguana().hash).to_bytes(),
+        script_pubkey: Builder::build_p2pkh(&coin.as_ref().derivation_method.unwrap_single_addr().hash).to_bytes(),
     };
     let mut futures = vec![];
     for _ in 0..5 {
@@ -1573,10 +1575,8 @@ fn test_one_unavailable_electrum_proto_version() {
     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, "BTC", &conf, &params, &[1u8; 32],
-    ))
-    .unwrap();
+    let priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "BTC", &conf, &params, priv_key)).unwrap();
 
     block_on(async { Timer::sleep(0.5).await });
 
@@ -1585,10 +1585,10 @@ fn test_one_unavailable_electrum_proto_version() {
 
 #[test]
 fn test_qtum_generate_pod() {
-    let priv_key = [
+    let priv_key = Secp256k1Secret::from([
         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","rpcport":13889,"pubtype":120,"p2shtype":110});
     let req = json!({
         "method": "electrum",
@@ -1598,7 +1598,7 @@ fn test_qtum_generate_pod() {
     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 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();
@@ -1621,7 +1621,7 @@ fn test_qtum_add_delegation() {
         "tQTUM",
         &conf,
         &params,
-        keypair.private().secret.as_slice(),
+        keypair.private().secret,
     ))
     .unwrap();
     let address = Address::from_str("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE").unwrap();
@@ -1660,7 +1660,7 @@ fn test_qtum_add_delegation_on_already_delegating() {
         "tQTUM",
         &conf,
         &params,
-        keypair.private().secret.as_slice(),
+        keypair.private().secret,
     ))
     .unwrap();
     let address = Address::from_str("qcyBHeSct7Wr4mAw18iuQ1zW5mMFYmtmBE").unwrap();
@@ -1691,7 +1691,7 @@ fn test_qtum_get_delegation_infos() {
         "tQTUM",
         &conf,
         &params,
-        keypair.private().secret.as_slice(),
+        keypair.private().secret,
     ))
     .unwrap();
     let staking_infos = coin.get_delegation_infos().wait().unwrap();
@@ -1721,7 +1721,7 @@ fn test_qtum_remove_delegation() {
         "tQTUM",
         &conf,
         &params,
-        keypair.private().secret.as_slice(),
+        keypair.private().secret,
     ))
     .unwrap();
     let res = coin.remove_delegation().wait();
@@ -1774,13 +1774,13 @@ fn test_qtum_my_balance() {
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
 
-    let priv_key = [
+    let priv_key = Secp256k1Secret::from([
         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 params = UtxoActivationParams::from_legacy_req(&req).unwrap();
-    let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, &params, &priv_key)).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);
@@ -1810,13 +1810,13 @@ fn test_qtum_my_balance_with_check_utxo_maturity_false() {
 
     let ctx = MmCtxBuilder::new().into_mm_arc();
 
-    let priv_key = [
+    let priv_key = Secp256k1Secret::from([
         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 params = UtxoActivationParams::from_legacy_req(&req).unwrap();
-    let coin = block_on(qtum_coin_with_priv_key(&ctx, "tQTUM", &conf, &params, &priv_key)).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(DISPLAY_BALANCE);
@@ -2527,17 +2527,15 @@ fn test_validate_fee_wrong_sender() {
     let tx_bytes = hex::decode("0400008085202f890199cc492c24cc617731d13cff0ef22e7b0c277a64e7368a615b46214424a1c894020000006a473044022071edae37cf518e98db3f7637b9073a7a980b957b0c7b871415dbb4898ec3ebdc022031b402a6b98e64ffdf752266449ca979a9f70144dba77ed7a6a25bfab11648f6012103ad6f89abc2e5beaa8a3ac28e22170659b3209fe2ddf439681b4b8f31508c36faffffffff0202290200000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac8a96e70b000000001976a914d55f0df6cb82630ad21a4e6049522a6f2b6c9d4588ac8afb2c60000000000000000000000000000000").unwrap();
     let taker_fee_tx = coin.tx_enum_from_bytes(&tx_bytes).unwrap();
     let amount: BigDecimal = "0.0014157".parse().unwrap();
-    let validate_err = coin
-        .validate_fee(
-            &taker_fee_tx,
-            &*DEX_FEE_ADDR_RAW_PUBKEY,
-            &*DEX_FEE_ADDR_RAW_PUBKEY,
-            &amount,
-            0,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &taker_fee_tx,
+        expected_sender: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 0,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("was sent from wrong address"));
 }
 
@@ -2554,17 +2552,15 @@ fn test_validate_fee_min_block() {
     let taker_fee_tx = coin.tx_enum_from_bytes(&tx_bytes).unwrap();
     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,
-            &[],
-        )
-        .wait()
-        .unwrap_err();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &taker_fee_tx,
+        expected_sender: &sender_pub,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 810329,
+        uuid: &[],
+    };
+    let validate_err = coin.validate_fee(validate_fee_args).wait().unwrap_err();
     assert!(validate_err.contains("confirmed before min_block"));
 }
 
@@ -2582,9 +2578,15 @@ 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, &[])
-        .wait()
-        .unwrap();
+    let validate_fee_args = ValidateFeeArgs {
+        fee_tx: &taker_fee_tx,
+        expected_sender: &sender_pub,
+        fee_addr: &*DEX_FEE_ADDR_RAW_PUBKEY,
+        amount: &amount,
+        min_block_number: 0,
+        uuid: &[],
+    };
+    coin.validate_fee(validate_fee_args).wait().unwrap();
 }
 
 #[test]
@@ -2651,10 +2653,11 @@ fn firo_lelantus_tx_details() {
         "electrumx03.firo.org:50001",
     ]);
     let coin = utxo_coin_for_test(electrum.into(), None, false);
-    let mut map = HashMap::new();
 
-    let tx_hash = hex::decode("ad812911f5cba3eab7c193b6cd7020ea02fb5c25634ae64959c3171a6bd5a74d").unwrap();
-    let tx_details = block_on(coin.tx_details_by_hash(&tx_hash, &mut map)).unwrap();
+    let tx_details = get_tx_details_eq_for_both_versions(
+        &coin,
+        "ad812911f5cba3eab7c193b6cd7020ea02fb5c25634ae64959c3171a6bd5a74d",
+    );
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
         coin: Some(TEST_COIN_NAME.into()),
@@ -2662,8 +2665,10 @@ fn firo_lelantus_tx_details() {
     });
     assert_eq!(Some(expected_fee), tx_details.fee_details);
 
-    let tx_hash = hex::decode("06ed4b75010edcf404a315be70903473f44050c978bc37fbcee90e0b49114ba8").unwrap();
-    let tx_details = block_on(coin.tx_details_by_hash(&tx_hash, &mut map)).unwrap();
+    let tx_details = get_tx_details_eq_for_both_versions(
+        &coin,
+        "06ed4b75010edcf404a315be70903473f44050c978bc37fbcee90e0b49114ba8",
+    );
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
         coin: Some(TEST_COIN_NAME.into()),
@@ -2700,8 +2705,9 @@ fn test_generate_tx_doge_fee() {
     let ctx = MmCtxBuilder::default().into_mm_arc();
     let params = UtxoActivationParams::from_legacy_req(&request).unwrap();
 
+    let priv_key = Secp256k1Secret::from([1; 32]);
     let doge = block_on(utxo_standard_coin_with_priv_key(
-        &ctx, "DOGE", &config, &params, &[1; 32],
+        &ctx, "DOGE", &config, &params, priv_key,
     ))
     .unwrap();
 
@@ -2882,12 +2888,13 @@ 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.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
+    fields.derivation_method = DerivationMethod::SingleAddress(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
-    let mut input_transactions = HistoryUtxoTxMap::new();
-    let hash = hex::decode("535ffa3387d3fca14f4a4d373daf7edf00e463982755afce89bc8c48d8168024").unwrap();
-    let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
+    let tx_details = get_tx_details_eq_for_both_versions(
+        &coin,
+        "535ffa3387d3fca14f4a4d373daf7edf00e463982755afce89bc8c48d8168024",
+    );
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
         coin: Some("KMD".into()),
@@ -2909,6 +2916,8 @@ fn test_tx_details_kmd_rewards() {
 #[ignore]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_tx_details_kmd_rewards_claimed_by_other() {
+    const TX_HASH: &str = "f09e8894959e74c1e727ffa5a753a30bf2dc6d5d677cc1f24b7ee5bb64e32c7d";
+
     let electrum = electrum_client_for_test(&[
         "electrum1.cipig.net:10001",
         "electrum2.cipig.net:10001",
@@ -2916,12 +2925,10 @@ 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.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
+    fields.derivation_method = DerivationMethod::SingleAddress(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
-    let mut input_transactions = HistoryUtxoTxMap::new();
-    let hash = hex::decode("f09e8894959e74c1e727ffa5a753a30bf2dc6d5d677cc1f24b7ee5bb64e32c7d").unwrap();
-    let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
+    let tx_details = get_tx_details_eq_for_both_versions(&coin, TX_HASH);
 
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
         coin: Some("KMD".into()),
@@ -2938,6 +2945,8 @@ fn test_tx_details_kmd_rewards_claimed_by_other() {
 
 #[test]
 fn test_tx_details_bch_no_rewards() {
+    const TX_HASH: &str = "eb13d926f15cbb896e0bcc7a1a77a4ec63504e57a1524c13a7a9b80f43ecb05c";
+
     let electrum = electrum_client_for_test(&[
         "electroncash.de:50003",
         "tbch.loping.net:60001",
@@ -2947,10 +2956,7 @@ fn test_tx_details_bch_no_rewards() {
     ]);
     let coin = utxo_coin_for_test(electrum.into(), None, false);
 
-    let mut input_transactions = HistoryUtxoTxMap::new();
-    let hash = hex::decode("eb13d926f15cbb896e0bcc7a1a77a4ec63504e57a1524c13a7a9b80f43ecb05c").unwrap();
-    let tx_details = block_on(coin.tx_details_by_hash(&hash, &mut input_transactions)).expect("!tx_details_by_hash");
-
+    let tx_details = get_tx_details_eq_for_both_versions(&coin, TX_HASH);
     let expected_fee = TxFeeDetails::Utxo(UtxoFeeDetails {
         coin: Some(TEST_COIN_NAME.into()),
         amount: BigDecimal::from_str("0.00000452").unwrap(),
@@ -2971,7 +2977,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.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
+    fields.derivation_method = DerivationMethod::SingleAddress(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::default();
@@ -3003,7 +3009,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.derivation_method = DerivationMethod::Iguana(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
+    fields.derivation_method = DerivationMethod::SingleAddress(Address::from("RMGJ9tRST45RnwEKHPGgBLuY3moSYP7Mhk"));
     let coin = utxo_coin_from_fields(fields);
 
     let mut input_transactions = HistoryUtxoTxMap::default();
@@ -3066,9 +3072,9 @@ 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().derivation_method.unwrap_iguana().hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_single_addr().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.pub_t_addr_prefix,
-        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_single_addr().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Standard,
     };
@@ -3114,9 +3120,9 @@ 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().derivation_method.unwrap_iguana().hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_single_addr().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.p2sh_t_addr_prefix,
-        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_single_addr().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Standard,
     };
@@ -3162,9 +3168,9 @@ 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().derivation_method.unwrap_iguana().hash.clone(),
+        hash: coin.as_ref().derivation_method.unwrap_single_addr().hash.clone(),
         t_addr_prefix: coin.as_ref().conf.pub_t_addr_prefix,
-        checksum_type: coin.as_ref().derivation_method.unwrap_iguana().checksum_type,
+        checksum_type: coin.as_ref().derivation_method.unwrap_single_addr().checksum_type,
         hrp: coin.as_ref().conf.bech32_hrp.clone(),
         addr_format: UtxoAddressFormat::Segwit,
     };
@@ -3214,10 +3220,8 @@ fn test_utxo_standard_with_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 priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "RICK", &conf, &params, priv_key)).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`].
@@ -3256,10 +3260,8 @@ fn test_utxo_standard_without_check_utxo_maturity() {
     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 priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "RICK", &conf, &params, priv_key)).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`].
@@ -3293,7 +3295,8 @@ fn test_qtum_without_check_utxo_maturity() {
     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 priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).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`].
@@ -3305,10 +3308,10 @@ fn test_qtum_without_check_utxo_maturity() {
 #[test]
 #[ignore]
 fn test_split_qtum() {
-    let priv_key = [
+    let priv_key = Secp256k1Secret::from([
         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",
@@ -3336,8 +3339,8 @@ fn test_split_qtum() {
     });
     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 coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).unwrap();
+    let p2pkh_address = coin.as_ref().derivation_method.unwrap_single_addr();
     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");
@@ -3407,7 +3410,8 @@ fn test_qtum_with_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 priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).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`].
@@ -3478,21 +3482,24 @@ fn test_account_balance_rpc() {
     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(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/0'").unwrap(),
         external_addresses_number: 7,
         internal_addresses_number: 3,
+        derived_addresses: HDAddressesCache::default(),
     });
     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(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/1'").unwrap(),
         external_addresses_number: 0,
         internal_addresses_number: 1,
+        derived_addresses: HDAddressesCache::default(),
     });
     fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_rmd160: "21605444b36ec72780bdf52a5ffbc18288893664".into(),
         hd_wallet_storage: HDWalletCoinStorage::default(),
         address_format: UtxoAddressFormat::Standard,
-        derivation_path: Bip44PathToCoin::from_str("m/44'/141'").unwrap(),
+        derivation_path: StandardHDPathToCoin::from_str("m/44'/141'").unwrap(),
         accounts: HDAccountsMutex::new(hd_accounts),
         gap_limit: 3,
     });
@@ -3697,30 +3704,39 @@ fn test_scan_for_new_addresses() {
         },
     );
 
-    let mut checking_addresses: HashMap<String, Option<u64>> = HashMap::new();
-    let mut non_empty_addresses: Vec<String> = Vec::new();
+    // The list of addresses that were checked using [`UtxoAddressScanner::is_address_used`].
+    static mut CHECKED_ADDRESSES: Vec<String> = Vec::new();
+
+    // The map of addresses for those [`NativeClient::display_balance`] called.
+    let mut display_balances: HashMap<String, u64> = HashMap::new();
+    // The expected list of the addresses that were checked using [`UtxoAddressScanner::is_address_used`].
+    let mut expected_checked_addresses: Vec<String> = Vec::new();
+    // The list of addresses with a non-empty transaction history.
+    let mut non_empty_addresses: HashSet<String> = HashSet::new();
+    // The map of results by the addresses.
     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);
+            if let Some(balance) = $balance {
+                display_balances.insert($address.to_string(), balance);
+                non_empty_addresses.insert($address.to_string());
+            }
+            expected_checked_addresses.push($address.to_string());
             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))),
+                balance: CoinBalance::new(BigDecimal::from($balance.unwrap_or(0i32))),
             });
-            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)
-        };
+        ($_der_path:literal, $address:literal) => {{
+            let address = $address.to_string();
+            expected_checked_addresses.push(address);
+        }};
     }
 
     macro_rules! get_balances {
@@ -3736,7 +3752,8 @@ fn test_scan_for_new_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).
+        unused_address!("m/44'/141'/0'/0/6", "RSvKMMegKGP5e2EanH7fnD4yNsxdJvLAmL");
+        unused_address!("m/44'/141'/0'/0/7", "RX76e9G7H4Xy6cYrtr1qGghxytAmWpv375"); // 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));
@@ -3744,7 +3761,8 @@ fn test_scan_for_new_addresses() {
         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).
+        unused_address!("m/44'/141'/0'/1/6", "RSkY6twW8knTcn6wGACUAG9crJHcuQ2kEH");
+        unused_address!("m/44'/141'/0'/1/7", "RGRybU5awT9Chn9FeKZd8CEBREq5vNFDKJ"); // 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));
@@ -3754,59 +3772,61 @@ fn test_scan_for_new_addresses() {
         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).
+        unused_address!("m/44'/141'/1'/0/7", "RYJ6vbhxFre5yChCMiJJFNTTBhAQbKM9AY");
+        unused_address!("m/44'/141'/1'/0/8", "RWaND65Cucwc2Cs1djBUQ2z1rrxTopEjoG"); // 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).
+        unused_address!("m/44'/141'/1'/0/4", "RS4UZtkwZ8eYaTL1xodXgFNryJoTbPJYE5");
+        unused_address!("m/44'/141'/1'/0/5", "RDzcAqivNqUCJA4auetoVE4hcmH2p4L1fB"); // 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
+        let balance = display_balances
             .remove(&address)
-            .expect(&format!("Unexpected address: {}", address))
-            .expect(&format!(
-                "'{}' address is empty. 'NativeClient::display_balance' must not be called for this address",
-                address
-            ));
+            .expect(&format!("Unexpected 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)))
+    UtxoAddressScanner::is_address_used.mock_safe(move |_, address| {
+        let address = address.to_string();
+        unsafe {
+            CHECKED_ADDRESSES.push(address.clone());
+        }
+        let is_used = non_empty_addresses.remove(&address);
+        MockResult::Return(Box::pin(futures::future::ok(is_used)))
     });
 
+    // This mock is required just not to fail on [`UtxoAddressScanner::init`].
+    NativeClient::list_all_transactions
+        .mock_safe(move |_, _| MockResult::Return(Box::new(futures01::future::ok(Vec::new()))));
+
     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(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/0'").unwrap(),
         external_addresses_number: 3,
         internal_addresses_number: 1,
+        derived_addresses: HDAddressesCache::default(),
     });
     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(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/1'").unwrap(),
         external_addresses_number: 0,
         internal_addresses_number: 2,
+        derived_addresses: HDAddressesCache::default(),
     });
     fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_rmd160: "21605444b36ec72780bdf52a5ffbc18288893664".into(),
         hd_wallet_storage: HDWalletCoinStorage::default(),
         address_format: UtxoAddressFormat::Standard,
-        derivation_path: Bip44PathToCoin::from_str("m/44'/141'").unwrap(),
+        derivation_path: StandardHDPathToCoin::from_str("m/44'/141'").unwrap(),
         accounts: HDAccountsMutex::new(hd_accounts),
         gap_limit: 3,
     });
@@ -3871,6 +3891,204 @@ fn test_scan_for_new_addresses() {
     assert_eq!(accounts[&0].internal_addresses_number, 4);
     assert_eq!(accounts[&1].external_addresses_number, 5);
     assert_eq!(accounts[&1].internal_addresses_number, 2);
+    assert_eq!(unsafe { &CHECKED_ADDRESSES }, &expected_checked_addresses);
+}
+
+#[test]
+fn test_get_new_address() {
+    static mut EXPECTED_CHECKED_ADDRESSES: Vec<String> = Vec::new();
+    static mut CHECKED_ADDRESSES: Vec<String> = Vec::new();
+    static mut NON_EMPTY_ADDRESSES: Option<HashSet<String>> = None;
+
+    macro_rules! expected_checked_addresses {
+        ($($_der_path:literal, $addr:literal);*) => {
+            unsafe {
+                CHECKED_ADDRESSES.clear();
+                EXPECTED_CHECKED_ADDRESSES = vec![$($addr.to_string()),*];
+            }
+        };
+    }
+
+    macro_rules! non_empty_addresses {
+        ($($_der_path:literal, $addr:literal);*) => {
+            unsafe {
+                NON_EMPTY_ADDRESSES = Some(vec![$($addr.to_string()),*].into_iter().collect());
+            }
+        };
+    }
+
+    HDWalletMockStorage::update_external_addresses_number
+        .mock_safe(|_, _, _account_id, _new_val| MockResult::Return(Box::pin(futures::future::ok(()))));
+    HDWalletMockStorage::update_internal_addresses_number
+        .mock_safe(|_, _, _account_id, _new_val| MockResult::Return(Box::pin(futures::future::ok(()))));
+
+    // This mock is required just not to fail on [`UtxoStandardCoin::known_address_balance`].
+    NativeClient::display_balance
+        .mock_safe(move |_, _, _| MockResult::Return(Box::new(futures01::future::ok(BigDecimal::from(0)))));
+
+    UtxoAddressScanner::is_address_used.mock_safe(move |_, address| {
+        let address = address.to_string();
+        unsafe {
+            CHECKED_ADDRESSES.push(address.clone());
+            let is_used = NON_EMPTY_ADDRESSES.as_mut().unwrap().remove(&address);
+            MockResult::Return(Box::pin(futures::future::ok(is_used)))
+        }
+    });
+
+    MockableConfirmAddress::confirm_utxo_address
+        .mock_safe(move |_, _, _, _| MockResult::Return(Box::pin(futures::future::ok(()))));
+
+    // This mock is required just not to fail on [`UtxoAddressScanner::init`].
+    NativeClient::list_all_transactions
+        .mock_safe(move |_, _| MockResult::Return(Box::new(futures01::future::ok(Vec::new()))));
+
+    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();
+    let hd_account_for_test = UtxoHDAccount {
+        account_id: 0,
+        extended_pubkey: Secp256k1ExtendedPublicKey::from_str("xpub6DEHSksajpRPM59RPw7Eg6PKdU7E2ehxJWtYdrfQ6JFmMGBsrR6jA78ANCLgzKYm4s5UqQ4ydLEYPbh3TRVvn5oAZVtWfi4qJLMntpZ8uGJ").unwrap(),
+        account_derivation_path: StandardHDPathToAccount::from_str("m/44'/141'/0'").unwrap(),
+        external_addresses_number: 4,
+        internal_addresses_number: 0,
+        derived_addresses: HDAddressesCache::default(),
+    };
+    // Put multiple the same accounts for tests,
+    // since every successful `get_new_address_rpc` changes the state of the account.
+    hd_accounts.insert(0, hd_account_for_test.clone());
+    hd_accounts.insert(1, hd_account_for_test.clone());
+    hd_accounts.insert(2, hd_account_for_test);
+
+    fields.derivation_method = DerivationMethod::HDWallet(UtxoHDWallet {
+        hd_wallet_rmd160: "21605444b36ec72780bdf52a5ffbc18288893664".into(),
+        hd_wallet_storage: HDWalletCoinStorage::default(),
+        address_format: UtxoAddressFormat::Standard,
+        derivation_path: StandardHDPathToCoin::from_str("m/44'/141'").unwrap(),
+        accounts: HDAccountsMutex::new(hd_accounts),
+        gap_limit: 2,
+    });
+    fields.conf.trezor_coin = Some("Komodo".to_string());
+    let coin = utxo_coin_from_fields(fields);
+
+    // =======
+
+    let confirm_address = MockableConfirmAddress::default();
+
+    expected_checked_addresses!["m/44'/141'/0'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1"];
+    non_empty_addresses!["m/44'/141'/0'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1"];
+    let params = GetNewAddressParams {
+        account_id: 0,
+        chain: Some(Bip44Chain::External),
+        gap_limit: None, // Will be used 2 from `UtxoHDWallet` by default.
+    };
+    block_on(coin.get_new_address_rpc(params, &confirm_address)).unwrap();
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `m/44'/141'/1'/0/3` is empty, so `m/44'/141'/1'/0/2` will be checked.
+
+    expected_checked_addresses!["m/44'/141'/1'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1"];
+    non_empty_addresses!["m/44'/141'/1'/0/2", "RSSZjtgfnLzvqF4cZQJJEpN5gvK3pWmd3h"];
+    let params = GetNewAddressParams {
+        account_id: 1,
+        chain: Some(Bip44Chain::External),
+        gap_limit: Some(1),
+    };
+    let err = block_on(coin.get_new_address_rpc(params, &confirm_address))
+        .expect_err("get_new_address_rpc should have failed with 'EmptyAddressesLimitReached' error");
+    let expected = GetNewAddressRpcError::EmptyAddressesLimitReached { gap_limit: 1 };
+    assert_eq!(err.into_inner(), expected);
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `m/44'/141'/1'/0/3` is empty, but `m/44'/141'/1'/0/2` is not.
+
+    expected_checked_addresses![
+        "m/44'/141'/1'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1";
+        "m/44'/141'/1'/0/2", "RSSZjtgfnLzvqF4cZQJJEpN5gvK3pWmd3h"
+    ];
+    non_empty_addresses!["m/44'/141'/1'/0/2", "RSSZjtgfnLzvqF4cZQJJEpN5gvK3pWmd3h"];
+    let params = GetNewAddressParams {
+        account_id: 1,
+        chain: Some(Bip44Chain::External),
+        gap_limit: Some(2),
+    };
+    block_on(coin.get_new_address_rpc(params, &confirm_address)).unwrap();
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `m/44'/141'/2'/0/3` and `m/44'/141'/2'/0/2` are empty.
+
+    expected_checked_addresses![
+        "m/44'/141'/2'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1";
+        "m/44'/141'/2'/0/2", "RSSZjtgfnLzvqF4cZQJJEpN5gvK3pWmd3h"
+    ];
+    non_empty_addresses![];
+    let params = GetNewAddressParams {
+        account_id: 2,
+        chain: Some(Bip44Chain::External),
+        gap_limit: Some(2),
+    };
+    let err = block_on(coin.get_new_address_rpc(params, &confirm_address))
+        .expect_err("get_new_address_rpc should have failed with 'EmptyAddressesLimitReached' error");
+    let expected = GetNewAddressRpcError::EmptyAddressesLimitReached { gap_limit: 2 };
+    assert_eq!(err.into_inner(), expected);
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `gap_limit=0` means don't allow to generate new address if the last one is empty yet.
+
+    expected_checked_addresses!["m/44'/141'/2'/0/3", "RU1gRFXWXNx7uPRAEJ7wdZAW1RZ4TE6Vv1"];
+    non_empty_addresses![];
+    let params = GetNewAddressParams {
+        account_id: 2,
+        chain: Some(Bip44Chain::External),
+        gap_limit: Some(0),
+    };
+    let err = block_on(coin.get_new_address_rpc(params, &confirm_address))
+        .expect_err("!get_new_address_rpc should have failed with 'EmptyAddressesLimitReached' error");
+    let expected = GetNewAddressRpcError::EmptyAddressesLimitReached { gap_limit: 0 };
+    assert_eq!(err.into_inner(), expected);
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `(gap_limit=5) > (known_addresses_number=4)`, there should not be any network request.
+
+    expected_checked_addresses![];
+    non_empty_addresses![];
+    let params = GetNewAddressParams {
+        account_id: 2,
+        chain: Some(Bip44Chain::External),
+        gap_limit: Some(5),
+    };
+    block_on(coin.get_new_address_rpc(params, &confirm_address)).unwrap();
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // `known_addresses_number=0`, always allow.
+
+    expected_checked_addresses![];
+    non_empty_addresses![];
+    let params = GetNewAddressParams {
+        account_id: 0,
+        chain: Some(Bip44Chain::Internal),
+        gap_limit: Some(0),
+    };
+    block_on(coin.get_new_address_rpc(params, &confirm_address)).unwrap();
+    unsafe { assert_eq!(CHECKED_ADDRESSES, EXPECTED_CHECKED_ADDRESSES) };
+
+    // Check if `get_new_address_rpc` fails on the `HDAddressConfirm::confirm_utxo_address` error.
+
+    MockableConfirmAddress::confirm_utxo_address.mock_safe(move |_, _, _, _| {
+        MockResult::Return(Box::pin(futures::future::ready(MmError::err(
+            HDConfirmAddressError::HwContextNotInitialized,
+        ))))
+    });
+
+    expected_checked_addresses![];
+    non_empty_addresses![];
+    let params = GetNewAddressParams {
+        account_id: 0,
+        chain: Some(Bip44Chain::Internal),
+        gap_limit: Some(2),
+    };
+    let err = block_on(coin.get_new_address_rpc(params, &confirm_address))
+        .expect_err("!get_new_address_rpc should have failed with 'HwContextNotInitialized' error");
+    assert_eq!(err.into_inner(), GetNewAddressRpcError::HwContextNotInitialized);
 }
 
 /// https://github.com/KomodoPlatform/atomicDEX-API/issues/1196
@@ -3893,6 +4111,29 @@ fn test_electrum_display_balances() {
     block_on(utxo_common_tests::test_electrum_display_balances(&rpc_client));
 }
 
+#[test]
+fn test_for_non_existent_tx_hex_utxo_electrum() {
+    // This test shouldn't wait till timeout!
+    let timeout = (now_ms() / 1000) + 120;
+    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,
+    );
+    // bad transaction hex
+    let tx = hex::decode("0400008085202f8902bf17bf7d1daace52e08f732a6b8771743ca4b1cb765a187e72fd091a0aabfd52000000006a47304402203eaaa3c4da101240f80f9c5e9de716a22b1ec6d66080de6a0cca32011cd77223022040d9082b6242d6acf9a1a8e658779e1c655d708379862f235e8ba7b8ca4e69c6012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffffff023ca13c0e9e085dd13f481f193e8a3e8fd609020936e98b5587342d994f4d020000006b483045022100c0ba56adb8de923975052312467347d83238bd8d480ce66e8b709a7997373994022048507bcac921fdb2302fa5224ce86e41b7efc1a2e20ae63aa738dfa99b7be826012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0300e1f5050000000017a9141ee6d4c38a3c078eab87ad1a5e4b00f21259b10d87000000000000000016611400000000000000000000000000000000000000001b94d736000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac2d08e35e000000000000000000000000000000").unwrap();
+    let actual = coin
+        .wait_for_confirmations(&tx, 1, false, timeout, 1)
+        .wait()
+        .err()
+        .unwrap();
+    assert!(actual.contains(
+        "Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 was not found on chain after 10 tries"
+    ));
+}
+
+#[cfg(not(target_arch = "wasm32"))]
 #[test]
 fn test_native_display_balances() {
     let unspents = vec![
@@ -4013,3 +4254,244 @@ fn test_sign_verify_message_segwit() {
         .unwrap();
     assert!(is_valid);
 }
+
+#[test]
+fn test_tx_enum_from_bytes() {
+    let client = electrum_client_for_test(RICK_ELECTRUM_ADDRS);
+    let coin = utxo_coin_for_test(client.into(), None, false);
+
+    let tx_hex = hex::decode("01000000017b1eabe0209b1fe794124575ef807057c77ada2138ae4fa8d6c4de0398a14f3f00000000494830450221008949f0cb400094ad2b5eb399d59d01c14d73d8fe6e96df1a7150deb388ab8935022079656090d7f6bac4c9a94e0aad311a4268e082a725f8aeae0573fb12ff866a5f01ffffffff01f0ca052a010000001976a914cbc20a7664f2f69e5355aa427045bc15e7c6c77288ac00000000").unwrap();
+    coin.tx_enum_from_bytes(&tx_hex).unwrap();
+
+    let tx_hex = hex::decode("0100000002440f1a2929eb08c350cc8d2385c77c40411560c3b43b65efb5b06f997fc67672020000006b483045022100f82e88af256d2487afe0c30a166c9ecf6b7013e764e1407317c712d47f7731bd0220358a4d7987bfde2271599b5c4376d26f9ce9f1df2e04f5de8f89593352607110012103c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3edfffffffffb9c2fd7a19b55a4ffbda2ce5065d988a4f4efcf1ae567b4ddb6d97529c8fb0c000000006b483045022100dd75291db32dc859657a5eead13b85c340b4d508e57d2450ebfad76484f254130220727fcd65dda046ea62b449ab217da264dbf7c7ca7e63b39c8835973a152752c1012103c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3edffffffff03102700000000000017a9148d0ad41545dea44e914c419d33d422148c35a274870000000000000000166a149c0a919d4e9a23f0234df916a7dd21f9e2fdaa8f931d0000000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88acbd8ff160").unwrap();
+    coin.tx_enum_from_bytes(&tx_hex).unwrap();
+
+    let tx_hex = hex::decode("0200000000010192a4497268107d7999e9551be733f5e0eab479be7d995a061a7bbdc43ef0e5ed0000000000feffffff02cd857a00000000001600145cb39bfcd68d520e29cadc990bceb5cd1562c507a0860100000000001600149a85cc05e9a722575feb770a217c73fd6145cf01024730440220030e0fb58889ab939c701f12d950f00b64836a1a33ec0d6697fd3053d469d244022053e33d72ef53b37b86eea8dfebbafffb0f919ef952dcb6ea6058b81576d8dc86012102225de6aed071dc29d0ca10b9f64a4b502e33e55b3c0759eedd8e333834c6a7d07a1f2000").unwrap();
+    coin.tx_enum_from_bytes(&tx_hex).unwrap();
+
+    let err = coin.tx_enum_from_bytes(&vec![0; 1000000]).unwrap_err().into_inner();
+    assert_eq!(
+        discriminant(&err),
+        discriminant(&TxMarshalingErr::CrossCheckFailed(String::new()))
+    );
+}
+
+#[test]
+fn test_hd_utxo_tx_history() {
+    let client = electrum_client_for_test(MORTY_ELECTRUM_ADDRS);
+    block_on(utxo_common_tests::test_hd_utxo_tx_history_impl(client));
+}
+
+#[test]
+fn test_utxo_validate_valid_and_invalid_pubkey() {
+    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 priv_key = Secp256k1Secret::from([1; 32]);
+    let coin = block_on(utxo_standard_coin_with_priv_key(&ctx, "RICK", &conf, &params, priv_key)).unwrap();
+    // Test expected to pass at this point as we're using a valid pubkey to validate against a valid pubkey
+    assert!(coin
+        .validate_other_pubkey(&[
+            3, 23, 183, 225, 206, 31, 159, 148, 195, 42, 67, 115, 146, 41, 248, 140, 11, 3, 51, 41, 111, 180, 110, 143,
+            114, 134, 88, 73, 198, 174, 52, 184, 78
+        ])
+        .is_ok());
+    // Test expected to fail at this point as we're using a valid pubkey to validate against an invalid pubkeys
+    assert!(coin.validate_other_pubkey(&[1u8; 20]).is_err());
+    assert!(coin.validate_other_pubkey(&[1u8; 8]).is_err());
+}
+
+#[test]
+fn test_block_header_utxo_loop() {
+    use crate::utxo::utxo_builder::{block_header_utxo_loop, BlockHeaderUtxoLoopExtraArgs};
+    use futures::future::{Either, FutureExt};
+    use keys::hash::H256 as H256Json;
+
+    static mut CURRENT_BLOCK_COUNT: u64 = 13;
+
+    ElectrumClient::get_block_count
+        .mock_safe(move |_| MockResult::Return(Box::new(futures01::future::ok(unsafe { CURRENT_BLOCK_COUNT }))));
+    let expected_steps: Arc<Mutex<Vec<(u64, u64)>>> = Arc::new(Mutex::new(Vec::with_capacity(14)));
+
+    ElectrumClient::retrieve_headers.mock_safe({
+        let expected_steps = expected_steps.clone();
+        move |this, from, to| {
+            let (expected_from, expected_to) = expected_steps.lock().unwrap().remove(0);
+            assert_eq!(from, expected_from);
+            assert_eq!(to, expected_to);
+            MockResult::Continue((this, from, to))
+        }
+    });
+
+    BlockHeaderUtxoLoopExtraArgs::default.mock_safe(move || {
+        MockResult::Return(BlockHeaderUtxoLoopExtraArgs {
+            chunk_size: 4,
+            error_sleep: 1.,
+            success_sleep: 0.8,
+        })
+    });
+
+    let ctx = mm_ctx_with_custom_db();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(IguanaPrivKey::from(H256Json::from([1u8; 32])));
+    let servers: Vec<_> = RICK_ELECTRUM_ADDRS
+        .iter()
+        .map(|server| json!({ "url": server }))
+        .collect();
+    let req = json!({ "method": "electrum", "servers": servers });
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let conf = json!({"coin":"RICK", "asset":"RICK", "rpcport":8923});
+    let builder = UtxoArcBuilder::new(&ctx, "RICK", &conf, &params, priv_key_policy, UtxoStandardCoin::from);
+    let arc: UtxoArc = block_on(builder.build_utxo_fields()).unwrap().into();
+    let client = match &arc.rpc_client {
+        UtxoRpcClientEnum::Electrum(electrum) => electrum.clone(),
+        UtxoRpcClientEnum::Native(_) => unreachable!(),
+    };
+
+    let (sync_status_notifier, _) = channel::<UtxoSyncStatus>(1);
+    let loop_handle = UtxoSyncStatusLoopHandle::new(sync_status_notifier);
+
+    let spv_conf = json::from_value(json!({
+        "starting_block_header": {
+            "height": 1,
+            "hash": "0c714ba4f8d5f2d5c014a08c4e21a5387156e23bcc819c0f9bc536437586cdf5",
+            "time": 1564482125,
+            "bits": 537857807
+        },
+        "max_stored_block_headers": 15
+    }));
+
+    let loop_fut = async move {
+        block_header_utxo_loop(
+            arc.downgrade(),
+            UtxoStandardCoin::from,
+            loop_handle,
+            unsafe { CURRENT_BLOCK_COUNT },
+            spv_conf.unwrap(),
+        )
+        .await
+    };
+
+    let test_fut = async move {
+        *expected_steps.lock().unwrap() = vec![(2, 5), (6, 9), (10, 13), (14, 14)];
+        unsafe { CURRENT_BLOCK_COUNT = 14 }
+        Timer::sleep(3.).await;
+        let get_headers_count = client
+            .block_headers_storage()
+            .get_last_block_height()
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(get_headers_count, 14);
+        assert!(expected_steps.lock().unwrap().is_empty());
+
+        *expected_steps.lock().unwrap() = vec![(15, 18)];
+        unsafe { CURRENT_BLOCK_COUNT = 18 }
+        Timer::sleep(2.).await;
+        let get_headers_count = client
+            .block_headers_storage()
+            .get_last_block_height()
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(get_headers_count, 18);
+        assert!(expected_steps.lock().unwrap().is_empty());
+
+        *expected_steps.lock().unwrap() = vec![(19, 19)];
+        unsafe { CURRENT_BLOCK_COUNT = 19 }
+        Timer::sleep(2.).await;
+        let get_headers_count = client
+            .block_headers_storage()
+            .get_last_block_height()
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(get_headers_count, 19);
+        assert!(expected_steps.lock().unwrap().is_empty());
+
+        // Validate max_stored_block_headers
+        // Since max_stored_block_headers = 15, headers from 2 - 4 shouldn't be in
+        // storage anymore.
+        for i in 2..=19 {
+            let header = client.block_headers_storage().get_block_header(i).await.unwrap();
+            if i >= 5 {
+                assert!(header.is_some());
+                break;
+            }
+
+            assert_eq!(header, None);
+        }
+        Timer::sleep(2.).await;
+    };
+
+    if let Either::Left(_) = block_on(futures::future::select(loop_fut.boxed(), test_fut.boxed())) {
+        panic!("Loop shouldn't stop")
+    };
+}
+
+#[test]
+fn test_spv_conf_with_verification() {
+    let verification_params = BlockHeaderValidationParams {
+        difficulty_check: false,
+        constant_difficulty: false,
+        difficulty_algorithm: Some(DifficultyAlgorithm::BitcoinMainnet),
+    };
+
+    // Block header hash for BLOCK HEIGHT 4032
+    let hash = "00000000ca4b69045a03d7b20624def97a5366418648d5005e82fd3b345d20d0".into();
+    // test for good retarget_block_header_height
+    let mut spv_conf = SPVConf {
+        starting_block_header: SPVBlockHeader {
+            height: 4032,
+            hash,
+            time: 1234466190,
+            bits: BlockHeaderBits::Compact(486604799.into()),
+        },
+        max_stored_block_headers: None,
+        validation_params: Some(verification_params.clone()),
+    };
+    assert!(spv_conf.validate("BTC").is_ok());
+
+    // test for bad retarget_block_header_height
+    // Block header hash for BLOCK HEIGHT 4032
+    let hash = "0000000045c689dc49dee778a9fbca7b5bc48fceca9f05cde5fc8d667f00e7d2".into();
+    spv_conf.starting_block_header = SPVBlockHeader {
+        height: 4037,
+        hash,
+        time: 1234470475,
+        bits: BlockHeaderBits::Compact(486604799.into()),
+    };
+    let validate = spv_conf.validate("BTC").err().unwrap();
+    if let SPVError::WrongRetargetHeight { coin, expected_height } = validate {
+        assert_eq!(coin, "BTC");
+        assert_eq!(expected_height, 4032);
+    }
+
+    // test for bad max_stored_block_headers
+    // Block header hash for BLOCK HEIGHT 4032
+    let hash = "00000000ca4b69045a03d7b20624def97a5366418648d5005e82fd3b345d20d0".into();
+    spv_conf = SPVConf {
+        starting_block_header: SPVBlockHeader {
+            height: 4032,
+            hash,
+            time: 1234466190,
+            bits: BlockHeaderBits::Compact(486604799.into()),
+        },
+        max_stored_block_headers: NonZeroU64::new(2000),
+        validation_params: Some(verification_params),
+    };
+    let validate = spv_conf.validate("BTC").err().unwrap();
+    assert!(validate
+        .to_string()
+        .contains("max_stored_block_headers 2000 must be greater than retargeting interval"));
+}
diff --git a/mm2src/coins/utxo/utxo_tx_history_v2.rs b/mm2src/coins/utxo/utxo_tx_history_v2.rs
new file mode 100644
index 0000000000..f822a285b5
--- /dev/null
+++ b/mm2src/coins/utxo/utxo_tx_history_v2.rs
@@ -0,0 +1,726 @@
+use super::RequestTxHistoryResult;
+use crate::hd_wallet::AddressDerivingError;
+use crate::my_tx_history_v2::{CoinWithTxHistoryV2, DisplayAddress, TxHistoryStorage, TxHistoryStorageError};
+use crate::tx_history_storage::FilteringAddresses;
+use crate::utxo::bch::BchCoin;
+use crate::utxo::slp::ParseSlpScriptError;
+use crate::utxo::{utxo_common, AddrFromStrError, GetBlockHeaderError};
+use crate::{BalanceError, BalanceResult, BlockHeightAndTime, HistorySyncState, MarketCoinOps, NumConversError,
+            ParseBigDecimalError, TransactionDetails, UnexpectedDerivationMethod, UtxoRpcError, UtxoTx};
+use async_trait::async_trait;
+use common::executor::Timer;
+use common::log::{error, info};
+use common::state_machine::prelude::*;
+use derive_more::Display;
+use keys::Address;
+use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
+use rpc::v1::types::H256 as H256Json;
+use std::collections::{hash_map::Entry, HashMap, HashSet};
+use std::iter::FromIterator;
+use std::str::FromStr;
+
+macro_rules! try_or_stop_unknown {
+    ($exp:expr, $fmt:literal) => {
+        match $exp {
+            Ok(t) => t,
+            Err(e) => return Self::change_state(Stopped::unknown(format!("{}: {}", $fmt, e))),
+        }
+    };
+}
+
+#[derive(Debug, Display)]
+pub enum UtxoMyAddressesHistoryError {
+    AddressDerivingError(AddressDerivingError),
+    UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+}
+
+impl From<AddressDerivingError> for UtxoMyAddressesHistoryError {
+    fn from(e: AddressDerivingError) -> Self { UtxoMyAddressesHistoryError::AddressDerivingError(e) }
+}
+
+impl From<UnexpectedDerivationMethod> for UtxoMyAddressesHistoryError {
+    fn from(e: UnexpectedDerivationMethod) -> Self { UtxoMyAddressesHistoryError::UnexpectedDerivationMethod(e) }
+}
+
+#[allow(clippy::large_enum_variant)]
+#[derive(Debug, Display)]
+pub enum UtxoTxDetailsError {
+    #[display(fmt = "Storage error: {}", _0)]
+    StorageError(String),
+    #[display(fmt = "Transaction deserialization error: {}", _0)]
+    TxDeserializationError(serialization::Error),
+    #[display(fmt = "Invalid transaction: {}", _0)]
+    InvalidTransaction(String),
+    #[display(fmt = "TX Address deserialization error: {}", _0)]
+    TxAddressDeserializationError(String),
+    #[display(fmt = "{}", _0)]
+    NumConversionErr(NumConversError),
+    #[display(fmt = "RPC error: {}", _0)]
+    RpcError(UtxoRpcError),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<serialization::Error> for UtxoTxDetailsError {
+    fn from(e: serialization::Error) -> Self { UtxoTxDetailsError::TxDeserializationError(e) }
+}
+
+impl From<UtxoRpcError> for UtxoTxDetailsError {
+    fn from(e: UtxoRpcError) -> Self { UtxoTxDetailsError::RpcError(e) }
+}
+
+impl From<NumConversError> for UtxoTxDetailsError {
+    fn from(e: NumConversError) -> Self { UtxoTxDetailsError::NumConversionErr(e) }
+}
+
+impl From<ParseBigDecimalError> for UtxoTxDetailsError {
+    fn from(e: ParseBigDecimalError) -> Self { UtxoTxDetailsError::from(NumConversError::from(e)) }
+}
+
+impl From<ParseSlpScriptError> for UtxoTxDetailsError {
+    fn from(err: ParseSlpScriptError) -> Self {
+        UtxoTxDetailsError::InvalidTransaction(format!("Error parsing SLP script: {err}"))
+    }
+}
+
+impl<StorageErr> From<StorageErr> for UtxoTxDetailsError
+where
+    StorageErr: TxHistoryStorageError,
+{
+    fn from(e: StorageErr) -> Self { UtxoTxDetailsError::StorageError(format!("{:?}", e)) }
+}
+
+pub struct UtxoTxDetailsParams<'a, Storage> {
+    pub hash: &'a H256Json,
+    pub block_height_and_time: Option<BlockHeightAndTime>,
+    pub storage: &'a Storage,
+    pub my_addresses: &'a HashSet<Address>,
+}
+
+#[async_trait]
+pub trait UtxoTxHistoryOps: CoinWithTxHistoryV2 + MarketCoinOps + Send + Sync + 'static {
+    /// Returns addresses for those we need to request Transaction history.
+    async fn my_addresses(&self) -> MmResult<HashSet<Address>, UtxoMyAddressesHistoryError>;
+
+    /// Returns Transaction details by hash using the coin RPC if required.
+    async fn tx_details_by_hash<T>(
+        &self,
+        params: UtxoTxDetailsParams<'_, T>,
+    ) -> MmResult<Vec<TransactionDetails>, UtxoTxDetailsError>
+    where
+        T: TxHistoryStorage;
+
+    /// Loads transaction from `storage` or requests it using coin RPC.
+    async fn tx_from_storage_or_rpc<Storage: TxHistoryStorage>(
+        &self,
+        tx_hash: &H256Json,
+        storage: &Storage,
+    ) -> MmResult<UtxoTx, UtxoTxDetailsError>;
+
+    /// Requests transaction history.
+    async fn request_tx_history(&self, metrics: MetricsArc, for_addresses: &HashSet<Address>)
+        -> RequestTxHistoryResult;
+
+    /// Requests timestamp of the given block.
+
+    async fn get_block_timestamp(&self, height: u64) -> MmResult<u64, GetBlockHeaderError>;
+
+    /// Requests balances of all activated coin's addresses.
+    async fn my_addresses_balances(&self) -> BalanceResult<HashMap<String, BigDecimal>>;
+
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError>;
+
+    /// Sets the history sync state.
+    fn set_history_sync_state(&self, new_state: HistorySyncState);
+}
+
+struct UtxoTxHistoryCtx<Coin: UtxoTxHistoryOps, Storage: TxHistoryStorage> {
+    coin: Coin,
+    storage: Storage,
+    metrics: MetricsArc,
+    /// Last requested balances of the activated coin's addresses.
+    /// TODO add a `CoinBalanceState` structure and replace [`HashMap<String, BigDecimal>`] everywhere.
+    balances: HashMap<String, BigDecimal>,
+}
+
+impl<Coin, Storage> UtxoTxHistoryCtx<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    /// Requests balances for every activated address, updates the balances in [`UtxoTxHistoryCtx::balances`]
+    /// and returns the addresses whose balance has changed.
+    ///
+    /// # Note
+    ///
+    /// [`UtxoTxHistoryCtx::balances`] is changed if we successfully handled all balances **only**.
+    async fn updated_addresses(&mut self) -> BalanceResult<HashSet<Address>> {
+        let current_balances = self.coin.my_addresses_balances().await?;
+
+        // Create a copy of the CTX balances state.
+        // We must not to save any change of `ctx.balances` if an error occurs while processing `current_balances` collection.
+        let mut ctx_balances = self.balances.clone();
+
+        let mut updated_addresses = HashSet::with_capacity(ctx_balances.len());
+        for (address, current_balance) in current_balances {
+            let updated_address = match ctx_balances.entry(address.clone()) {
+                // Do nothing if the balance hasn't been changed.
+                Entry::Occupied(entry) if *entry.get() == current_balance => continue,
+                Entry::Occupied(mut entry) => {
+                    entry.insert(current_balance);
+                    address
+                },
+                Entry::Vacant(entry) => {
+                    entry.insert(current_balance);
+                    address
+                },
+            };
+
+            // Currently, it's easier to convert `Address` from stringified address
+            // than to refactor `CoinBalanceReport` by replacing stringified addresses with a type parameter.
+            // Such refactoring will lead to huge code changes, complex and nested trait bounds.
+            // I personally think that it's overhead since, a least for now,
+            // we need to parse `CoinBalanceReport` within the transaction history only.
+            match self.coin.address_from_str(&updated_address) {
+                Ok(addr) => updated_addresses.insert(addr),
+                Err(e) => {
+                    let (kind, trace) = e.split();
+                    let error =
+                        format!("Error on converting address from 'UtxoTxHistoryOps::my_addresses_balances': {kind}");
+                    return MmError::err_with_trace(BalanceError::Internal(error), trace);
+                },
+            };
+        }
+
+        // Save the changes in the context.
+        self.balances = ctx_balances;
+
+        Ok(updated_addresses)
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct Init<Coin, Storage> {
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> Init<Coin, Storage> {
+    fn new() -> Self {
+        Init {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<Init<Coin, Storage>> for Stopped<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> State for Init<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        ctx.coin.set_history_sync_state(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::for_all_addresses())
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct FetchingTxHashes<Coin, Storage> {
+    fetch_for_addresses: Option<HashSet<Address>>,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> FetchingTxHashes<Coin, Storage> {
+    fn for_all_addresses() -> Self {
+        FetchingTxHashes {
+            fetch_for_addresses: None,
+            phantom: Default::default(),
+        }
+    }
+
+    fn for_addresses(fetch_for_addresses: HashSet<Address>) -> Self {
+        FetchingTxHashes {
+            fetch_for_addresses: Some(fetch_for_addresses),
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<Init<Coin, Storage>> for FetchingTxHashes<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<OnIoErrorCooldown<Coin, Storage>> for FetchingTxHashes<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<WaitForHistoryUpdateTrigger<Coin, Storage>> for FetchingTxHashes<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> State for FetchingTxHashes<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        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 fetch_for_addresses = match self.fetch_for_addresses {
+            Some(for_addresses) => for_addresses,
+            // `fetch_for_addresses` hasn't been specified. Fetch TX hashses for all addresses.
+            None => try_or_stop_unknown!(ctx.coin.my_addresses().await, "Error on getting my addresses"),
+        };
+
+        let maybe_tx_ids = ctx
+            .coin
+            .request_tx_history(ctx.metrics.clone(), &fetch_for_addresses)
+            .await;
+        match maybe_tx_ids {
+            RequestTxHistoryResult::Ok(all_tx_ids_with_height) => {
+                let filtering_addresses =
+                    FilteringAddresses::from_iter(fetch_for_addresses.iter().map(DisplayAddress::display_address));
+
+                let in_storage = match ctx
+                    .storage
+                    .unique_tx_hashes_num_in_history(&wallet_id, filtering_addresses)
+                    .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;
+                    let new_state_json = json!({ "transactions_left": txes_left });
+                    ctx.coin
+                        .set_history_sync_state(HistorySyncState::InProgress(new_state_json));
+                }
+
+                Self::change_state(UpdatingUnconfirmedTxes::new(
+                    fetch_for_addresses,
+                    all_tx_ids_with_height,
+                ))
+            },
+            RequestTxHistoryResult::HistoryTooLarge => Self::change_state(Stopped::history_too_large()),
+            RequestTxHistoryResult::Retry { error } => {
+                error!("Error {} on requesting tx history for {}", error, ctx.coin.ticker());
+                Self::change_state(OnIoErrorCooldown::new(fetch_for_addresses))
+            },
+            RequestTxHistoryResult::CriticalError(e) => {
+                error!(
+                    "Critical error {} on requesting tx history for {}",
+                    e,
+                    ctx.coin.ticker()
+                );
+                Self::change_state(Stopped::unknown(e))
+            },
+        }
+    }
+}
+
+/// An I/O cooldown before `FetchingTxHashes` state.
+/// States have to be generic over storage type because `UtxoTxHistoryCtx` is generic over it.
+struct OnIoErrorCooldown<Coin, Storage> {
+    /// The list of addresses of those we need to fetch TX hashes at the upcoming `FetchingTxHashses` state.
+    fetch_for_addresses: HashSet<Address>,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> OnIoErrorCooldown<Coin, Storage> {
+    fn new(fetch_for_addresses: HashSet<Address>) -> Self {
+        OnIoErrorCooldown {
+            fetch_for_addresses,
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTxHashes<Coin, Storage>> for OnIoErrorCooldown<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>> for OnIoErrorCooldown<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<UpdatingUnconfirmedTxes<Coin, Storage>> for OnIoErrorCooldown<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> State for OnIoErrorCooldown<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(mut self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        loop {
+            Timer::sleep(30.).await;
+
+            // We need to check whose balance has changed in these 30 seconds.
+            let updated_addresses = match ctx.updated_addresses().await {
+                Ok(updated) => updated,
+                Err(e) => {
+                    error!("Error {e:?} on balance fetching for the coin {}", ctx.coin.ticker());
+                    continue;
+                },
+            };
+
+            // We still need to fetch TX hashes for [`OnIoErrorCooldown::fetch_for_addresses`],
+            // but now we also need to fetch TX hashes for new `updated_addresses`.
+            // Merge these two containers.
+            self.fetch_for_addresses.extend(updated_addresses);
+
+            return Self::change_state(FetchingTxHashes::for_addresses(self.fetch_for_addresses));
+        }
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct WaitForHistoryUpdateTrigger<Coin, Storage> {
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> WaitForHistoryUpdateTrigger<Coin, Storage> {
+    fn new() -> Self {
+        WaitForHistoryUpdateTrigger {
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>>
+    for WaitForHistoryUpdateTrigger<Coin, Storage>
+{
+}
+
+#[async_trait]
+impl<Coin, Storage> State for WaitForHistoryUpdateTrigger<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        let wallet_id = ctx.coin.history_wallet_id();
+        loop {
+            Timer::sleep(30.).await;
+
+            let my_addresses = try_or_stop_unknown!(ctx.coin.my_addresses().await, "Error on getting my addresses");
+            let for_addresses = to_filtering_addresses(&my_addresses);
+
+            match ctx
+                .storage
+                .history_contains_unconfirmed_txes(&wallet_id, for_addresses)
+                .await
+            {
+                // Fetch TX hashses for all addresses.
+                Ok(true) => return Self::change_state(FetchingTxHashes::for_addresses(my_addresses)),
+                Ok(false) => (),
+                Err(e) => return Self::change_state(Stopped::storage_error(e)),
+            }
+
+            let updated_addresses = match ctx.updated_addresses().await {
+                Ok(updated) => updated,
+                Err(e) => {
+                    error!("Error {e:?} on balance fetching for the coin {}", ctx.coin.ticker());
+                    continue;
+                },
+            };
+
+            if !updated_addresses.is_empty() {
+                // Fetch TX hashes for those addresses whose balance has changed only.
+                return Self::change_state(FetchingTxHashes::for_addresses(updated_addresses));
+            }
+        }
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct UpdatingUnconfirmedTxes<Coin, Storage> {
+    /// The list of addresses for those we have requested [`UpdatingUnconfirmedTxes::all_tx_ids_with_height`] TX hashses
+    /// at the `FetchingTxHashes` state.
+    requested_for_addresses: HashSet<Address>,
+    all_tx_ids_with_height: Vec<(H256Json, u64)>,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> UpdatingUnconfirmedTxes<Coin, Storage> {
+    fn new(requested_for_addresses: HashSet<Address>, all_tx_ids_with_height: Vec<(H256Json, u64)>) -> Self {
+        UpdatingUnconfirmedTxes {
+            requested_for_addresses,
+            all_tx_ids_with_height,
+            phantom: Default::default(),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTxHashes<Coin, Storage>> for UpdatingUnconfirmedTxes<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> State for UpdatingUnconfirmedTxes<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        let wallet_id = ctx.coin.history_wallet_id();
+
+        let for_addresses = to_filtering_addresses(&self.requested_for_addresses);
+        let unconfirmed = match ctx
+            .storage
+            .get_unconfirmed_txes_from_history(&wallet_id, for_addresses)
+            .await
+        {
+            Ok(unconfirmed) => unconfirmed,
+            Err(e) => return Self::change_state(Stopped::storage_error(e)),
+        };
+
+        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(self.requested_for_addresses)),
+                        };
+                        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.requested_for_addresses,
+            self.all_tx_ids_with_height,
+        ))
+    }
+}
+
+// States have to be generic over storage type because BchAndSlpHistoryCtx is generic over it
+struct FetchingTransactionsData<Coin, Storage> {
+    /// The list of addresses for those we have requested [`UpdatingUnconfirmedTxes::all_tx_ids_with_height`] TX hashses
+    /// at the `FetchingTxHashes` state.
+    requested_for_addresses: HashSet<Address>,
+    all_tx_ids_with_height: Vec<(H256Json, u64)>,
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+}
+
+impl<Coin, Storage> TransitionFrom<UpdatingUnconfirmedTxes<Coin, Storage>> for FetchingTransactionsData<Coin, Storage> {}
+
+impl<Coin, Storage> FetchingTransactionsData<Coin, Storage> {
+    fn new(requested_for_addresses: HashSet<Address>, all_tx_ids_with_height: Vec<(H256Json, u64)>) -> Self {
+        FetchingTransactionsData {
+            requested_for_addresses,
+            all_tx_ids_with_height,
+            phantom: Default::default(),
+        }
+    }
+}
+
+#[async_trait]
+impl<Coin, Storage> State for FetchingTransactionsData<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
+        let ticker = ctx.coin.ticker();
+        let wallet_id = ctx.coin.history_wallet_id();
+
+        let my_addresses = try_or_stop_unknown!(ctx.coin.my_addresses().await, "Error on getting my addresses");
+
+        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(self.requested_for_addresses)),
+                };
+                Some(BlockHeightAndTime { height, timestamp })
+            } else {
+                None
+            };
+            let params = UtxoTxDetailsParams {
+                hash: &tx_hash,
+                block_height_and_time,
+                storage: &ctx.storage,
+                my_addresses: &my_addresses,
+            };
+            let tx_details = match ctx.coin.tx_details_by_hash(params).await {
+                Ok(tx) => tx,
+                Err(e) => {
+                    error!("Error on getting {ticker} tx details for hash {tx_hash:02x}: {e}");
+                    return Self::change_state(OnIoErrorCooldown::new(self.requested_for_addresses));
+                },
+            };
+
+            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 {ticker}");
+        ctx.coin.set_history_sync_state(HistorySyncState::Finished);
+        Self::change_state(WaitForHistoryUpdateTrigger::new())
+    }
+}
+
+#[derive(Debug)]
+enum StopReason {
+    HistoryTooLarge,
+    StorageError(String),
+    UnknownError(String),
+}
+
+struct Stopped<Coin, Storage> {
+    phantom: std::marker::PhantomData<(Coin, Storage)>,
+    stop_reason: StopReason,
+}
+
+impl<Coin, Storage> Stopped<Coin, Storage> {
+    fn history_too_large() -> Self {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::HistoryTooLarge,
+        }
+    }
+
+    fn storage_error<E>(e: E) -> Self
+    where
+        E: std::fmt::Debug,
+    {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::StorageError(format!("{:?}", e)),
+        }
+    }
+
+    fn unknown(e: String) -> Self {
+        Stopped {
+            phantom: Default::default(),
+            stop_reason: StopReason::UnknownError(e),
+        }
+    }
+}
+
+impl<Coin, Storage> TransitionFrom<FetchingTxHashes<Coin, Storage>> for Stopped<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<UpdatingUnconfirmedTxes<Coin, Storage>> for Stopped<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<WaitForHistoryUpdateTrigger<Coin, Storage>> for Stopped<Coin, Storage> {}
+impl<Coin, Storage> TransitionFrom<FetchingTransactionsData<Coin, Storage>> for Stopped<Coin, Storage> {}
+
+#[async_trait]
+impl<Coin, Storage> LastState for Stopped<Coin, Storage>
+where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    type Ctx = UtxoTxHistoryCtx<Coin, Storage>;
+    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.set_history_sync_state(HistorySyncState::Error(new_state_json));
+    }
+}
+
+pub async fn bch_and_slp_history_loop(
+    coin: BchCoin,
+    storage: impl TxHistoryStorage,
+    metrics: MetricsArc,
+    current_balance: BigDecimal,
+) {
+    let my_address = match coin.my_address() {
+        Ok(my_address) => my_address,
+        Err(e) => {
+            error!("{}", e);
+            return;
+        },
+    };
+    let mut balances = HashMap::new();
+    balances.insert(my_address, current_balance);
+    drop_mutability!(balances);
+
+    let ctx = UtxoTxHistoryCtx {
+        coin,
+        storage,
+        metrics,
+        balances,
+    };
+    let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(ctx);
+    state_machine.run(Init::new()).await;
+}
+
+pub async fn utxo_history_loop<Coin, Storage>(
+    coin: Coin,
+    storage: Storage,
+    metrics: MetricsArc,
+    current_balances: HashMap<String, BigDecimal>,
+) where
+    Coin: UtxoTxHistoryOps,
+    Storage: TxHistoryStorage,
+{
+    let ctx = UtxoTxHistoryCtx {
+        coin,
+        storage,
+        metrics,
+        balances: current_balances,
+    };
+    let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(ctx);
+    state_machine.run(Init::new()).await;
+}
+
+fn to_filtering_addresses(addresses: &HashSet<Address>) -> FilteringAddresses {
+    FilteringAddresses::from_iter(addresses.iter().map(DisplayAddress::display_address))
+}
diff --git a/mm2src/coins/utxo/utxo_wasm_tests.rs b/mm2src/coins/utxo/utxo_wasm_tests.rs
index 4eaaf01d79..0d3dd0041d 100644
--- a/mm2src/coins/utxo/utxo_wasm_tests.rs
+++ b/mm2src/coins/utxo/utxo_wasm_tests.rs
@@ -1,8 +1,10 @@
-use super::rpc_clients::{ElectrumClient, ElectrumClientImpl, ElectrumProtocol};
+use super::rpc_clients::{ElectrumClient, UtxoRpcClientOps};
+use super::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilderCommonOps};
+use super::utxo_standard::UtxoStandardCoin;
 use super::*;
-use crate::utxo::rpc_clients::UtxoRpcClientOps;
 use crate::utxo::utxo_common_tests;
-use common::executor::Timer;
+use crate::{IguanaPrivKey, PrivKeyBuildPolicy};
+use mm2_core::mm_ctx::MmCtxBuilder;
 use serialization::deserialize;
 use wasm_bindgen_test::*;
 
@@ -11,29 +13,34 @@ wasm_bindgen_test_configure!(run_in_browser);
 const TEST_COIN_NAME: &'static str = "RICK";
 
 pub async fn electrum_client_for_test(servers: &[&str]) -> ElectrumClient {
-    let client = ElectrumClientImpl::new(TEST_COIN_NAME.into(), Default::default());
-    for server in servers {
-        client
-            .add_server(&ElectrumRpcRequest {
-                url: server.to_string(),
-                protocol: ElectrumProtocol::WSS,
-                disable_cert_verification: false,
-            })
-            .await
-            .expect("!add_server");
-    }
-
-    let mut attempts = 0;
-    while !client.is_connected().await {
-        if attempts >= 10 {
-            panic!("Failed to connect to at least 1 of {:?} in 5 seconds.", servers);
-        }
-
-        Timer::sleep(0.5).await;
-        attempts += 1;
-    }
-
-    ElectrumClient(Arc::new(client))
+    let ctx = MmCtxBuilder::default().into_mm_arc();
+    let servers: Vec<_> = servers
+        .iter()
+        .map(|server| json!({ "url": server, "protocol": "WSS" }))
+        .collect();
+    let req = json!({
+        "method": "electrum",
+        "servers": servers,
+    });
+    let params = UtxoActivationParams::from_legacy_req(&req).unwrap();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(IguanaPrivKey::default());
+    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,
+    };
+
+    let servers = servers.into_iter().map(|s| json::from_value(s).unwrap()).collect();
+    let abortable_system = AbortableQueue::default();
+    builder.electrum_client(abortable_system, args, servers).await.unwrap()
 }
 
 #[wasm_bindgen_test]
@@ -59,3 +66,9 @@ 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;
 }
+
+#[wasm_bindgen_test]
+async fn test_hd_utxo_tx_history() {
+    let rpc_client = electrum_client_for_test(&["electrum1.cipig.net:30018", "electrum2.cipig.net:30018"]).await;
+    utxo_common_tests::test_hd_utxo_tx_history_impl(rpc_client).await;
+}
diff --git a/mm2src/coins/utxo/utxo_withdraw.rs b/mm2src/coins/utxo/utxo_withdraw.rs
index b54fd7a5fd..4f825a6c14 100644
--- a/mm2src/coins/utxo/utxo_withdraw.rs
+++ b/mm2src/coins/utxo/utxo_withdraw.rs
@@ -1,4 +1,4 @@
-use crate::rpc_command::init_withdraw::{WithdrawAwaitingStatus, WithdrawInProgressStatus, WithdrawTaskHandle};
+use crate::rpc_command::init_withdraw::{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};
@@ -8,10 +8,8 @@ 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 crypto::{from_hw_error, CryptoCtx, CryptoCtxError, DerivationPath, HwError, HwProcessingError, HwRpcError};
 use keys::{Public as PublicKey, Type as ScriptType};
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
@@ -20,14 +18,10 @@ 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::sign_params::{OutputDestination, 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 {
@@ -58,44 +52,37 @@ impl From<TrezorProcessingError<RpcTaskError>> for WithdrawError {
 }
 
 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),
-        }
-    }
+    fn from(e: HwError) -> Self { from_hw_error(e) }
 }
 
 impl From<TrezorError> for WithdrawError {
-    fn from(e: TrezorError) -> Self { WithdrawError::HardwareWalletInternal(e.to_string()) }
+    fn from(e: TrezorError) -> Self {
+        match e {
+            TrezorError::DeviceDisconnected => WithdrawError::HwError(HwRpcError::NoTrezorDeviceAvailable),
+            other => WithdrawError::InternalError(other.to_string()),
+        }
+    }
 }
 
-impl From<CryptoInitError> for WithdrawError {
-    fn from(e: CryptoInitError) -> Self { WithdrawError::InternalError(e.to_string()) }
+impl From<CryptoCtxError> for WithdrawError {
+    fn from(e: CryptoCtxError) -> 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::Cancelled => WithdrawError::InternalError("Cancelled".to_owned()),
             RpcTaskError::Timeout(timeout) => WithdrawError::Timeout(timeout),
             RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
                 WithdrawError::InternalError(error)
             },
+            RpcTaskError::UnexpectedUserAction { expected } => WithdrawError::UnexpectedUserAction { expected },
             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
@@ -119,8 +106,10 @@ where
 
     fn prev_script(&self) -> Script { Builder::build_p2pkh(&self.sender_address().hash) }
 
+    #[allow(clippy::result_large_err)]
     fn on_generating_transaction(&self) -> Result<(), MmError<WithdrawError>>;
 
+    #[allow(clippy::result_large_err)]
     fn on_finishing(&self) -> Result<(), MmError<WithdrawError>>;
 
     async fn sign_tx(&self, unsigned_tx: TransactionInputSigner) -> Result<UtxoTx, MmError<WithdrawError>>;
@@ -132,9 +121,7 @@ where
         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 to = coin.address_from_str(&req.to)?;
 
         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;
@@ -225,6 +212,7 @@ where
             timestamp: now_ms() / 1000,
             kmd_rewards: data.kmd_rewards,
             transaction_type: Default::default(),
+            memo: None,
         })
     }
 }
@@ -291,8 +279,9 @@ where
             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(),
+            destination_address: OutputDestination::plain(self.req.to.clone()),
         }));
         match unsigned_tx.outputs.len() {
             // There is no change output.
@@ -300,7 +289,7 @@ where
             // There is a change output.
             2 => {
                 sign_params.add_outputs_infos(once(SendingOutputInfo {
-                    destination_address: self.from_address_string.clone(),
+                    destination_address: OutputDestination::change(self.from_derivation_path.clone()),
                 }));
             },
             unexpected => {
@@ -315,11 +304,16 @@ where
             .with_prev_script(Builder::build_p2pkh(&self.from_address.hash));
         let sign_params = sign_params.build()?;
 
+        let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
+        let hw_ctx = crypto_ctx
+            .hw_ctx()
+            .or_mm_err(|| WithdrawError::HwError(HwRpcError::NoTrezorDeviceAvailable))?;
+
         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)
+                let trezor_session = hw_ctx.trezor().await?;
+                SignPolicy::WithTrezor(trezor_session)
             },
         };
 
@@ -366,32 +360,6 @@ impl<'a, Coin> InitUtxoWithdraw<'a, Coin> {
             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> {
@@ -434,9 +402,10 @@ impl<Coin> StandardUtxoWithdraw<Coin>
 where
     Coin: AsRef<UtxoCoinFields> + MarketCoinOps,
 {
+    #[allow(clippy::result_large_err)]
     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)?;
+        let my_address = coin.as_ref().derivation_method.single_addr_or_err()?.clone();
+        let my_address_string = coin.my_address()?;
         Ok(StandardUtxoWithdraw {
             coin,
             req,
diff --git a/mm2src/coins/utxo_signer/Cargo.toml b/mm2src/coins/utxo_signer/Cargo.toml
index db17cd348d..7e44ad011e 100644
--- a/mm2src/coins/utxo_signer/Cargo.toml
+++ b/mm2src/coins/utxo_signer/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 async-trait = "0.1"
diff --git a/mm2src/coins/utxo_signer/src/lib.rs b/mm2src/coins/utxo_signer/src/lib.rs
index ce6d716d68..9285bf8587 100644
--- a/mm2src/coins/utxo_signer/src/lib.rs
+++ b/mm2src/coins/utxo_signer/src/lib.rs
@@ -1,8 +1,6 @@
 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 crypto::trezor::{TrezorError, TrezorSession};
 use derive_more::Display;
 use keys::bytes::Bytes;
 use keys::KeyPair;
@@ -112,7 +110,7 @@ pub trait TxProvider {
 }
 
 pub enum SignPolicy<'a> {
-    WithTrezor(TrezorClient),
+    WithTrezor(TrezorSession<'a>),
     WithKeyPair(&'a KeyPair),
 }
 
@@ -120,7 +118,7 @@ pub enum SignPolicy<'a> {
 pub trait UtxoSignerOps {
     type TxGetter: TxProvider + Send + Sync;
 
-    fn trezor_coin(&self) -> UtxoSignTxResult<TrezorUtxoCoin>;
+    fn trezor_coin(&self) -> UtxoSignTxResult<String>;
 
     fn fork_id(&self) -> u32;
 
diff --git a/mm2src/coins/utxo_signer/src/sign_params.rs b/mm2src/coins/utxo_signer/src/sign_params.rs
index 545b951c67..dab3ad17a4 100644
--- a/mm2src/coins/utxo_signer/src/sign_params.rs
+++ b/mm2src/coins/utxo_signer/src/sign_params.rs
@@ -25,9 +25,23 @@ pub enum SpendingInputInfo {
     // P2SH {}
 }
 
+/// Either plain destination address or derivation path of a change address.
+pub enum OutputDestination {
+    Plain { address: String },
+    Change { derivation_path: DerivationPath },
+}
+
+impl OutputDestination {
+    pub fn plain(address: String) -> OutputDestination { OutputDestination::Plain { address } }
+
+    pub fn change(derivation_path: DerivationPath) -> OutputDestination {
+        OutputDestination::Change { derivation_path }
+    }
+}
+
 /// An additional info of a sending output.
 pub struct SendingOutputInfo {
-    pub destination_address: String,
+    pub destination_address: OutputDestination,
 }
 
 impl SendingOutputInfo {
@@ -161,8 +175,8 @@ impl UtxoSignTxParams {
     /// Please see [`UtxoSignTxParamsBuilder::build`].
     pub fn outputs(&self) -> impl Iterator<Item = (&TransactionOutput, &SendingOutputInfo)> {
         assert_eq!(
-            self.unsigned_tx.inputs.len(),
-            self.inputs_infos.len(),
+            self.unsigned_tx.outputs.len(),
+            self.outputs_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_trezor.rs b/mm2src/coins/utxo_signer/src/with_trezor.rs
index c6cc9b1dfe..5cbe8709ae 100644
--- a/mm2src/coins/utxo_signer/src/with_trezor.rs
+++ b/mm2src/coins/utxo_signer/src/with_trezor.rs
@@ -1,39 +1,38 @@
 use crate::sign_common::{complete_tx, p2pkh_spend_with_signature};
-use crate::sign_params::{SendingOutputInfo, SpendingInputInfo, UtxoSignTxParams};
+use crate::sign_params::{OutputDestination, 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 crypto::trezor::utxo::{PrevTx, PrevTxInput, PrevTxOutput, TrezorInputScriptType, TxOutput, TxSignResult,
+                           UnsignedTxInput, UnsignedUtxoTx};
+use crypto::trezor::TrezorSession;
 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 struct TrezorTxSigner<'a, TxP> {
+    pub trezor: TrezorSession<'a>,
     pub tx_provider: TxP,
-    pub trezor_coin: TrezorUtxoCoin,
+    pub trezor_coin: String,
     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> {
+impl<'a, TxP: TxProvider + Send + Sync> TrezorTxSigner<'a, TxP> {
+    pub async fn sign_tx(mut 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?;
+        } = self.trezor.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 {
@@ -69,19 +68,25 @@ impl<TxP: TxProvider + Send + Sync> TrezorTxSigner<TxP> {
             .collect();
 
         Ok(UnsignedUtxoTx {
-            coin: self.trezor_coin,
+            coin: self.trezor_coin.clone(),
             inputs,
             outputs,
             version: self.params.unsigned_tx.version as u32,
             lock_time: self.params.unsigned_tx.lock_time,
+            expiry: self.expiry_if_required(self.params.unsigned_tx.expiry_height),
             version_group_id: self.version_group_id(),
             branch_id: self.branch_id(),
         })
     }
 
     fn get_trezor_output(&self, tx_output: &TransactionOutput, output_info: &SendingOutputInfo) -> TxOutput {
+        let (address, address_derivation_path) = match output_info.destination_address {
+            OutputDestination::Plain { ref address } => (Some(address.clone()), None),
+            OutputDestination::Change { ref derivation_path } => (None, Some(derivation_path.clone())),
+        };
         TxOutput {
-            address: output_info.destination_address.clone(),
+            address,
+            address_derivation_path,
             amount: tx_output.value,
             script_type: output_info.trezor_output_script_type(),
         }
@@ -144,6 +149,7 @@ impl<TxP: TxProvider + Send + Sync> TrezorTxSigner<TxP> {
             outputs: prev_tx_outputs,
             version: prev_utxo.version as u32,
             lock_time: prev_utxo.lock_time,
+            expiry: self.expiry_if_required(prev_utxo.expiry_height),
             version_group_id: self.version_group_id(),
             branch_id: self.branch_id(),
             extra_data: self.extra_data(),
@@ -168,6 +174,16 @@ impl<TxP: TxProvider + Send + Sync> TrezorTxSigner<TxP> {
         }
     }
 
+    /// `expiry` must be set for Decred and Zcash coins *only*.
+    /// This fixes : https://github.com/KomodoPlatform/atomicDEX-API/issues/1626
+    fn expiry_if_required(&self, tx_expiry: u32) -> Option<u32> {
+        if self.is_overwinter_compatible() {
+            Some(tx_expiry)
+        } 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> {
@@ -179,5 +195,8 @@ impl<TxP: TxProvider + Send + Sync> TrezorTxSigner<TxP> {
     }
 
     /// 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 }
+    fn is_overwinter_compatible(&self) -> bool { self.is_zcash_type() && self.params.unsigned_tx.version > 3 }
+
+    /// https://github.com/trezor/trezor-utxo-lib/blob/trezor/src/coins.js#L55
+    fn is_zcash_type(&self) -> bool { matches!(self.trezor_coin.as_str(), "Komodo" | "Zcash" | "Zcash Testnet") }
 }
diff --git a/mm2src/coins/z_coin.rs b/mm2src/coins/z_coin.rs
index 8038cf6ae7..72c86f38a1 100644
--- a/mm2src/coins/z_coin.rs
+++ b/mm2src/coins/z_coin.rs
@@ -1,29 +1,41 @@
+use crate::coin_errors::MyAddressError;
 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_builder::{UtxoCoinBuildError, UtxoCoinBuilder, UtxoCoinBuilderCommonOps,
+                                UtxoFieldsWithGlobalHDBuilder, UtxoFieldsWithHardwareWalletBuilder,
+                                UtxoFieldsWithIguanaSecretBuilder};
 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,
+use crate::utxo::{sat_from_big_decimal, utxo_common, ActualTxFee, AdditionalTxData, AddrFromStrError, Address,
+                  BroadcastTxErr, FeePolicy, GetUtxoListOps, HistoryUtxoTx, HistoryUtxoTxMap, MatureUnspentList,
                   RecentlySpentOutPointsGuard, UtxoActivationParams, UtxoAddressFormat, UtxoArc, UtxoCoinFields,
                   UtxoCommonOps, UtxoFeeDetails, UtxoRpcMode, UtxoTxBroadcastOps, UtxoTxGenerationOps,
                   VerboseTransactionFrom};
-use crate::{BalanceError, BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps,
-            MmCoin, NegotiateSwapContractAddrErr, NumConversError, PrivKeyActivationPolicy, RawTransactionFut,
-            RawTransactionRequest, SearchForSwapTxSpendInput, SignatureError, SignatureResult, SwapOps, TradeFee,
+use crate::{BalanceError, BalanceFut, CheckIfMyPaymentSentArgs, CoinBalance, CoinFutSpawner, FeeApproxStage,
+            FoundSwapTxSpend, HistorySyncState, MakerSwapTakerCoin, MarketCoinOps, MmCoin,
+            NegotiateSwapContractAddrErr, NumConversError, PaymentInstructions, PaymentInstructionsErr,
+            PrivKeyActivationPolicy, PrivKeyBuildPolicy, PrivKeyPolicyNotAllowed, RawTransactionFut,
+            RawTransactionRequest, RefundError, RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerPaymentSpendPreimageInput, SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SignatureError, SignatureResult, SwapOps, TakerSwapMakerCoin, TradeFee,
             TradePreimageFut, TradePreimageResult, TradePreimageValue, TransactionDetails, TransactionEnum,
-            TransactionFut, TxFeeDetails, UnexpectedDerivationMethod, ValidateAddressResult, ValidatePaymentInput,
-            VerificationError, VerificationResult, WithdrawFut, WithdrawRequest};
+            TransactionFut, TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
+            ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
+            ValidatePaymentFut, ValidatePaymentInput, VerificationError, VerificationResult, WatcherOps,
+            WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut,
+            WithdrawRequest};
 use crate::{Transaction, WithdrawError};
 use async_trait::async_trait;
-use bitcrypto::{dhash160, dhash256};
+use bitcrypto::dhash256;
 use chain::constants::SEQUENCE_FINAL;
 use chain::{Transaction as UtxoTx, TransactionOutput};
-use common::{async_blocking, calc_total_pages, log, PagingOptionsEnum};
+use common::executor::{AbortableSystem, AbortedError};
+use common::{async_blocking, calc_total_pages, log, one_thousand_u32, sha256_digest, PagingOptionsEnum};
 use crypto::privkey::{key_pair_from_secret, secp_privkey_from_hash};
+use crypto::{Bip32DerPathOps, GlobalHDAccountArc, StandardHDPathToCoin};
 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};
@@ -31,21 +43,21 @@ use futures::compat::Future01CompatExt;
 use futures::lock::Mutex as AsyncMutex;
 use futures::{FutureExt, TryFutureExt};
 use futures01::Future;
-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 parking_lot::Mutex;
 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::CoinVariant;
 use std::collections::{HashMap, HashSet};
+use std::iter;
 use std::path::PathBuf;
-use std::str::FromStr;
 use std::sync::Arc;
 use zcash_client_backend::data_api::WalletRead;
 use zcash_client_backend::encoding::{decode_payment_address, encode_extended_spending_key, encode_payment_address};
@@ -61,8 +73,10 @@ 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::zip32::ChildIndex as Zip32Child;
 use zcash_primitives::{consensus, constants::mainnet as z_mainnet_constants, sapling::PaymentAddress,
                        zip32::ExtendedFullViewingKey, zip32::ExtendedSpendingKey};
+use zcash_proofs::default_params_folder;
 use zcash_proofs::prover::LocalTxProver;
 
 mod z_htlc;
@@ -70,9 +84,10 @@ use z_htlc::{z_p2sh_spend, z_send_dex_fee, z_send_htlc};
 
 mod z_rpc;
 pub use z_rpc::SyncStatus;
-use z_rpc::{init_light_client, SaplingSyncConnector, SaplingSyncGuard, WalletDbShared};
+use z_rpc::{init_light_client, init_native_client, SaplingSyncConnector, SaplingSyncGuard, WalletDbShared};
 
 mod z_coin_errors;
+use crate::z_coin::z_rpc::{create_wallet_db, BlockDb};
 pub use z_coin_errors::*;
 
 #[cfg(all(test, feature = "zhtlc-native-tests"))]
@@ -101,6 +116,10 @@ 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";
+const SAPLING_SPEND_NAME: &str = "sapling-spend.params";
+const SAPLING_OUTPUT_NAME: &str = "sapling-output.params";
+const SAPLING_SPEND_EXPECTED_HASH: &str = "8e48ffd23abb3a5fd9c5589204f32d9c31285a04b78096ba40a79b75677efc13";
+const SAPLING_OUTPUT_EXPECTED_HASH: &str = "2f0ebbcbb9bb0bcffe95a397e7eba89c29eb4dde6191c339db88570e3f3fb0e4";
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ZcoinConsensusParams {
@@ -131,6 +150,8 @@ pub struct CheckPointBlockInfo {
 pub struct ZcoinProtocolInfo {
     consensus_params: ZcoinConsensusParams,
     check_point_block: Option<CheckPointBlockInfo>,
+    // `z_derivation_path` can be the same or different from [`UtxoCoinFields::derivation_path`].
+    z_derivation_path: Option<StandardHDPathToCoin>,
 }
 
 impl Parameters for ZcoinConsensusParams {
@@ -169,16 +190,6 @@ pub struct ZCoinFields {
     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 {{ 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);
@@ -193,7 +204,7 @@ impl Transaction for ZTransaction {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct ZCoin {
     utxo_arc: UtxoArc,
     z_fields: Arc<ZCoinFields>,
@@ -671,6 +682,7 @@ impl ZCoin {
 
         Ok(MyTxHistoryResponseV2 {
             coin: self.ticker().into(),
+            target: request.target,
             current_block,
             transactions,
             // Zcoin is activated only after the state is synced
@@ -698,11 +710,16 @@ pub enum ZcoinRpcMode {
     },
 }
 
-#[derive(Deserialize)]
+#[derive(Clone, Deserialize)]
 pub struct ZcoinActivationParams {
     pub mode: ZcoinRpcMode,
     pub required_confirmations: Option<u64>,
     pub requires_notarization: Option<bool>,
+    pub zcash_params_path: Option<String>,
+    #[serde(default = "one_thousand_u32")]
+    pub scan_blocks_per_iteration: u32,
+    #[serde(default)]
+    pub scan_interval_ms: u64,
 }
 
 pub async fn z_coin_from_conf_and_params(
@@ -711,11 +728,40 @@ pub async fn z_coin_from_conf_and_params(
     conf: &Json,
     params: &ZcoinActivationParams,
     protocol_info: ZcoinProtocolInfo,
-    secp_priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
 ) -> Result<ZCoin, MmError<ZCoinBuildError>> {
-    let z_key = ExtendedSpendingKey::master(secp_priv_key);
-    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, protocol_info).await
+    let db_dir_path = ctx.dbdir();
+    let z_spending_key = None;
+    let builder = ZCoinBuilder::new(
+        ctx,
+        ticker,
+        conf,
+        params,
+        priv_key_policy,
+        db_dir_path,
+        z_spending_key,
+        protocol_info,
+    );
+    builder.build().await
+}
+
+fn verify_checksum_zcash_params(spend_path: &PathBuf, output_path: &PathBuf) -> Result<bool, ZCoinBuildError> {
+    let spend_hash = sha256_digest(spend_path)?;
+    let out_hash = sha256_digest(output_path)?;
+    Ok(spend_hash == SAPLING_SPEND_EXPECTED_HASH && out_hash == SAPLING_OUTPUT_EXPECTED_HASH)
+}
+
+fn get_spend_output_paths(params_dir: PathBuf) -> Result<(PathBuf, PathBuf), ZCoinBuildError> {
+    if !params_dir.exists() {
+        return Err(ZCoinBuildError::ZCashParamsNotFound);
+    };
+    let spend_path = params_dir.join(SAPLING_SPEND_NAME);
+    let output_path = params_dir.join(SAPLING_OUTPUT_NAME);
+
+    if !(spend_path.exists() && output_path.exists()) {
+        return Err(ZCoinBuildError::ZCashParamsNotFound);
+    }
+    Ok((spend_path, output_path))
 }
 
 pub struct ZCoinBuilder<'a> {
@@ -724,9 +770,10 @@ pub struct ZCoinBuilder<'a> {
     conf: &'a Json,
     z_coin_params: &'a ZcoinActivationParams,
     utxo_params: UtxoActivationParams,
-    secp_priv_key: &'a [u8],
+    priv_key_policy: PrivKeyBuildPolicy,
     db_dir_path: PathBuf,
-    z_spending_key: ExtendedSpendingKey,
+    /// `Some` if `ZCoin` should be initialized with a forced spending key.
+    z_spending_key: Option<ExtendedSpendingKey>,
     protocol_info: ZcoinProtocolInfo,
 }
 
@@ -740,22 +787,31 @@ impl<'a> UtxoCoinBuilderCommonOps for ZCoinBuilder<'a> {
     fn ticker(&self) -> &str { self.ticker }
 }
 
-#[async_trait]
-impl<'a> UtxoFieldsWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {}
+impl<'a> UtxoFieldsWithIguanaSecretBuilder for ZCoinBuilder<'a> {}
+
+impl<'a> UtxoFieldsWithGlobalHDBuilder for ZCoinBuilder<'a> {}
+
+/// Although, `ZCoin` doesn't support [`PrivKeyBuildPolicy::Trezor`] yet,
+/// `UtxoCoinBuilder` trait requires `UtxoFieldsWithHardwareWalletBuilder` to be implemented.
+impl<'a> UtxoFieldsWithHardwareWalletBuilder for ZCoinBuilder<'a> {}
 
 #[async_trait]
-impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {
+impl<'a> UtxoCoinBuilder for ZCoinBuilder<'a> {
     type ResultCoin = ZCoin;
     type Error = ZCoinBuildError;
 
-    fn priv_key(&self) -> &[u8] { self.secp_priv_key }
+    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_with_iguana_priv_key(self.priv_key()).await?;
+        let utxo = self.build_utxo_fields().await?;
         let utxo_arc = UtxoArc::new(utxo);
 
-        let (_, my_z_addr) = self
-            .z_spending_key
+        let z_spending_key = match self.z_spending_key {
+            Some(ref z_spending_key) => z_spending_key.clone(),
+            None => extended_spending_key_from_protocol_info_and_policy(&self.protocol_info, &self.priv_key_policy)?,
+        };
+
+        let (_, my_z_addr) = z_spending_key
             .default_address()
             .map_err(|_| MmError::new(ZCoinBuildError::GetAddressError))?;
 
@@ -766,39 +822,66 @@ impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {
         .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 params_dir = match &self.z_coin_params.zcash_params_path {
+            None => default_params_folder().or_mm_err(|| ZCoinBuildError::ZCashParamsNotFound)?,
+            Some(file_path) => PathBuf::from(file_path),
+        };
+
+        let z_tx_prover = async_blocking(move || {
+            let (spend_path, output_path) = get_spend_output_paths(params_dir)?;
+            let verification_successful = verify_checksum_zcash_params(&spend_path, &output_path)?;
+            if verification_successful {
+                Ok(LocalTxProver::new(&spend_path, &output_path))
+            } else {
+                MmError::err(ZCoinBuildError::SaplingParamsInvalidChecksum)
+            }
+        })
+        .await?;
 
         let my_z_addr_encoded = encode_payment_address(
             self.protocol_info.consensus_params.hrp_sapling_payment_address(),
             &my_z_addr,
         );
 
-        let evk = ExtendedFullViewingKey::from(&self.z_spending_key);
+        let evk = ExtendedFullViewingKey::from(&z_spending_key);
+        let cache_db_path = self.db_dir_path.join(format!("{}_cache.db", self.ticker));
+        let wallet_db_path = self.db_dir_path.join(format!("{}_wallet.db", self.ticker));
+        let blocks_db =
+            async_blocking(|| BlockDb::for_path(cache_db_path).map_to_mm(ZcoinClientInitError::BlocksDbInitFailure))
+                .await?;
+        let wallet_db = create_wallet_db(
+            wallet_db_path,
+            self.protocol_info.consensus_params.clone(),
+            self.protocol_info.check_point_block.clone(),
+            evk,
+        )
+        .await?;
+        let wallet_db = Arc::new(Mutex::new(wallet_db));
         let (sync_state_connector, light_wallet_db) = match &self.z_coin_params.mode {
             ZcoinRpcMode::Native => {
-                return MmError::err(ZCoinBuildError::NativeModeIsNotSupportedYet);
+                let native_client = self.native_client()?;
+                init_native_client(
+                    self.ticker.into(),
+                    native_client,
+                    blocks_db,
+                    wallet_db,
+                    self.protocol_info.consensus_params.clone(),
+                    self.z_coin_params.scan_blocks_per_iteration,
+                    self.z_coin_params.scan_interval_ms,
+                )
+                .await?
             },
             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.ticker.into(),
+                    light_wallet_d_servers.clone(),
+                    blocks_db,
+                    wallet_db,
                     self.protocol_info.consensus_params.clone(),
-                    self.protocol_info.check_point_block,
-                    evk,
+                    self.z_coin_params.scan_blocks_per_iteration,
+                    self.z_coin_params.scan_interval_ms,
                 )
                 .await?
             },
@@ -808,8 +891,8 @@ impl<'a> UtxoCoinWithIguanaPrivKeyBuilder for ZCoinBuilder<'a> {
             dex_fee_addr,
             my_z_addr,
             my_z_addr_encoded,
-            evk: ExtendedFullViewingKey::from(&self.z_spending_key),
-            z_spending_key: self.z_spending_key,
+            evk: ExtendedFullViewingKey::from(&z_spending_key),
+            z_spending_key,
             z_tx_prover: Arc::new(z_tx_prover),
             light_wallet_db,
             consensus_params: self.protocol_info.consensus_params,
@@ -832,9 +915,9 @@ impl<'a> ZCoinBuilder<'a> {
         ticker: &'a str,
         conf: &'a Json,
         z_coin_params: &'a ZcoinActivationParams,
-        secp_priv_key: &'a [u8],
+        priv_key_policy: PrivKeyBuildPolicy,
         db_dir_path: PathBuf,
-        z_spending_key: ExtendedSpendingKey,
+        z_spending_key: Option<ExtendedSpendingKey>,
         protocol_info: ZcoinProtocolInfo,
     ) -> ZCoinBuilder<'a> {
         let utxo_mode = match &z_coin_params.mode {
@@ -851,8 +934,8 @@ impl<'a> ZCoinBuilder<'a> {
             requires_notarization: z_coin_params.requires_notarization,
             address_format: None,
             gap_limit: None,
-            scan_policy: Default::default(),
-            priv_key_policy: PrivKeyActivationPolicy::IguanaPrivKey,
+            enable_params: Default::default(),
+            priv_key_policy: PrivKeyActivationPolicy::ContextPrivKey,
             check_utxo_maturity: None,
         };
         ZCoinBuilder {
@@ -861,7 +944,7 @@ impl<'a> ZCoinBuilder<'a> {
             conf,
             z_coin_params,
             utxo_params,
-            secp_priv_key,
+            priv_key_policy,
             db_dir_path,
             z_spending_key,
             protocol_info,
@@ -869,13 +952,15 @@ impl<'a> ZCoinBuilder<'a> {
     }
 }
 
+/// Initialize `ZCoin` with a forced `z_spending_key`.
+#[cfg(all(test, feature = "zhtlc-native-tests"))]
 #[allow(clippy::too_many_arguments)]
 async fn z_coin_from_conf_and_params_with_z_key(
     ctx: &MmArc,
     ticker: &str,
     conf: &Json,
     params: &ZcoinActivationParams,
-    secp_priv_key: &[u8],
+    priv_key_policy: PrivKeyBuildPolicy,
     db_dir_path: PathBuf,
     z_spending_key: ExtendedSpendingKey,
     protocol_info: ZcoinProtocolInfo,
@@ -885,9 +970,9 @@ async fn z_coin_from_conf_and_params_with_z_key(
         ticker,
         conf,
         params,
-        secp_priv_key,
+        priv_key_policy,
         db_dir_path,
-        z_spending_key,
+        Some(z_spending_key),
         protocol_info,
     );
     builder.build().await
@@ -896,7 +981,7 @@ async fn z_coin_from_conf_and_params_with_z_key(
 impl MarketCoinOps for ZCoin {
     fn ticker(&self) -> &str { &self.utxo_arc.conf.ticker }
 
-    fn my_address(&self) -> Result<String, String> { Ok(self.z_fields.my_z_addr_encoded.clone()) }
+    fn my_address(&self) -> MmResult<String, MyAddressError> { 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())?;
@@ -975,12 +1060,14 @@ impl MarketCoinOps for ZCoin {
         utxo_common::wait_for_confirmations(self.as_ref(), tx, confirmations, requires_nota, wait_until, check_every)
     }
 
-    fn wait_for_tx_spend(
+    fn wait_for_htlc_tx_spend(
         &self,
         transaction: &[u8],
+        _secret_hash: &[u8],
         wait_until: u64,
         from_block: u64,
         _swap_contract_address: &Option<BytesJson>,
+        check_every: f64,
     ) -> TransactionFut {
         utxo_common::wait_for_output_spend(
             self.as_ref(),
@@ -988,11 +1075,14 @@ impl MarketCoinOps for ZCoin {
             utxo_common::DEFAULT_SWAP_VOUT,
             from_block,
             wait_until,
+            check_every,
         )
     }
 
-    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, String> {
-        ZTransaction::read(bytes).map(|tx| tx.into()).map_err(|e| e.to_string())
+    fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> {
+        ZTransaction::read(bytes)
+            .map(TransactionEnum::from)
+            .map_to_mm(|e| TxMarshalingErr::InvalidInput(e.to_string()))
     }
 
     fn current_block(&self) -> Box<dyn Future<Item = u64, Error = String> + Send> {
@@ -1025,19 +1115,13 @@ impl SwapOps for ZCoin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
+    fn send_maker_payment(&self, maker_payment_args: SendMakerPaymentArgs<'_>) -> TransactionFut {
         let selfi = self.clone();
-        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 maker_key_pair = self.derive_htlc_key_pair(maker_payment_args.swap_unique_data);
+        let taker_pub = try_tx_fus!(Public::from_slice(maker_payment_args.other_pubkey));
+        let secret_hash = maker_payment_args.secret_hash.to_vec();
+        let time_lock = maker_payment_args.time_lock;
+        let amount = maker_payment_args.amount;
         let fut = async move {
             let utxo_tx = try_tx_s!(
                 z_send_htlc(
@@ -1055,19 +1139,13 @@ impl SwapOps for ZCoin {
         Box::new(fut.boxed().compat())
     }
 
-    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 {
+    fn send_taker_payment(&self, taker_payment_args: SendTakerPaymentArgs<'_>) -> TransactionFut {
         let selfi = self.clone();
-        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 taker_keypair = self.derive_htlc_key_pair(taker_payment_args.swap_unique_data);
+        let maker_pub = try_tx_fus!(Public::from_slice(taker_payment_args.other_pubkey));
+        let secret_hash = taker_payment_args.secret_hash.to_vec();
+        let time_lock = taker_payment_args.time_lock;
+        let amount = taker_payment_args.amount;
         let fut = async move {
             let utxo_tx = try_tx_s!(
                 z_send_htlc(
@@ -1087,23 +1165,19 @@ impl SwapOps for ZCoin {
 
     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],
+        maker_spends_payment_args: SendMakerSpendsTakerPaymentArgs<'_>,
     ) -> TransactionFut {
-        let tx = try_tx_fus!(ZTransaction::read(taker_payment_tx));
-        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
+        let tx = try_tx_fus!(ZTransaction::read(maker_spends_payment_args.other_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(maker_spends_payment_args.swap_unique_data);
+        let time_lock = maker_spends_payment_args.time_lock;
         let redeem_script = payment_script(
             time_lock,
-            &*dhash160(secret),
-            &try_tx_fus!(Public::from_slice(taker_pub)),
+            maker_spends_payment_args.secret_hash,
+            &try_tx_fus!(Public::from_slice(maker_spends_payment_args.other_pubkey)),
             key_pair.public(),
         );
         let script_data = ScriptBuilder::default()
-            .push_data(secret)
+            .push_data(maker_spends_payment_args.secret)
             .push_opcode(Opcode::OP_0)
             .into_script();
         let selfi = self.clone();
@@ -1125,23 +1199,19 @@ impl SwapOps for ZCoin {
 
     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],
+        taker_spends_payment_args: SendTakerSpendsMakerPaymentArgs<'_>,
     ) -> TransactionFut {
-        let tx = try_tx_fus!(ZTransaction::read(maker_payment_tx));
-        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
+        let tx = try_tx_fus!(ZTransaction::read(taker_spends_payment_args.other_payment_tx));
+        let key_pair = self.derive_htlc_key_pair(taker_spends_payment_args.swap_unique_data);
+        let time_lock = taker_spends_payment_args.time_lock;
         let redeem_script = payment_script(
             time_lock,
-            &*dhash160(secret),
-            &try_tx_fus!(Public::from_slice(maker_pub)),
+            taker_spends_payment_args.secret_hash,
+            &try_tx_fus!(Public::from_slice(taker_spends_payment_args.other_pubkey)),
             key_pair.public(),
         );
         let script_data = ScriptBuilder::default()
-            .push_data(secret)
+            .push_data(taker_spends_payment_args.secret)
             .push_opcode(Opcode::OP_0)
             .into_script();
         let selfi = self.clone();
@@ -1163,20 +1233,16 @@ impl SwapOps for ZCoin {
 
     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],
+        taker_refunds_payment_args: SendTakerRefundsPaymentArgs<'_>,
     ) -> TransactionFut {
-        let tx = try_tx_fus!(ZTransaction::read(taker_payment_tx));
-        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
+        let tx = try_tx_fus!(ZTransaction::read(taker_refunds_payment_args.payment_tx));
+        let key_pair = self.derive_htlc_key_pair(taker_refunds_payment_args.swap_unique_data);
+        let time_lock = taker_refunds_payment_args.time_lock;
         let redeem_script = payment_script(
             time_lock,
-            secret_hash,
+            taker_refunds_payment_args.secret_hash,
             key_pair.public(),
-            &try_tx_fus!(Public::from_slice(maker_pub)),
+            &try_tx_fus!(Public::from_slice(taker_refunds_payment_args.other_pubkey)),
         );
         let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
         let selfi = self.clone();
@@ -1198,20 +1264,16 @@ impl SwapOps for ZCoin {
 
     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],
+        maker_refunds_payment_args: SendMakerRefundsPaymentArgs<'_>,
     ) -> TransactionFut {
-        let tx = try_tx_fus!(ZTransaction::read(maker_payment_tx));
-        let key_pair = self.derive_htlc_key_pair(swap_unique_data);
+        let tx = try_tx_fus!(ZTransaction::read(maker_refunds_payment_args.payment_tx));
+        let key_pair = self.derive_htlc_key_pair(maker_refunds_payment_args.swap_unique_data);
+        let time_lock = maker_refunds_payment_args.time_lock;
         let redeem_script = payment_script(
             time_lock,
-            secret_hash,
+            maker_refunds_payment_args.secret_hash,
             key_pair.public(),
-            &try_tx_fus!(Public::from_slice(taker_pub)),
+            &try_tx_fus!(Public::from_slice(maker_refunds_payment_args.other_pubkey)),
         );
         let script_data = ScriptBuilder::default().push_opcode(Opcode::OP_1).into_script();
         let selfi = self.clone();
@@ -1233,19 +1295,15 @@ impl SwapOps for ZCoin {
 
     fn validate_fee(
         &self,
-        fee_tx: &TransactionEnum,
-        _expected_sender: &[u8],
-        _fee_addr: &[u8],
-        amount: &BigDecimal,
-        min_block_number: u64,
-        uuid: &[u8],
+        validate_fee_args: ValidateFeeArgs<'_>,
     ) -> Box<dyn Future<Item = (), Error = String> + Send> {
-        let z_tx = match fee_tx {
+        let z_tx = match validate_fee_args.fee_tx {
             TransactionEnum::ZTransaction(t) => t.clone(),
-            _ => panic!("Unexpected tx {:?}", fee_tx),
+            _ => panic!("Unexpected tx {:?}", validate_fee_args.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 amount_sat = try_fus!(sat_from_big_decimal(validate_fee_args.amount, self.utxo_arc.decimals));
+        let expected_memo = MemoBytes::from_bytes(validate_fee_args.uuid).expect("Uuid length < 512");
+        let min_block_number = validate_fee_args.min_block_number;
 
         let coin = self.clone();
         let fut = async move {
@@ -1316,26 +1374,31 @@ impl SwapOps for ZCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_maker_payment(self, input)
     }
 
-    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> Box<dyn Future<Item = (), Error = String> + Send> {
+    #[inline]
+    fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> {
         utxo_common::validate_taker_payment(self, input)
     }
 
+    #[inline]
     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],
+        if_my_payment_sent_args: CheckIfMyPaymentSentArgs<'_>,
     ) -> 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)
+        utxo_common::check_if_my_payment_sent(
+            self.clone(),
+            if_my_payment_sent_args.time_lock,
+            if_my_payment_sent_args.other_pub,
+            if_my_payment_sent_args.secret_hash,
+            if_my_payment_sent_args.swap_unique_data,
+        )
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_my(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1343,6 +1406,7 @@ impl SwapOps for ZCoin {
         utxo_common::search_for_swap_tx_spend_my(self, input, utxo_common::DEFAULT_SWAP_VOUT).await
     }
 
+    #[inline]
     async fn search_for_swap_tx_spend_other(
         &self,
         input: SearchForSwapTxSpendInput<'_>,
@@ -1350,10 +1414,24 @@ impl SwapOps for ZCoin {
         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> {
+    fn check_tx_signed_by_pub(&self, _tx: &[u8], _expected_pub: &[u8]) -> Result<bool, MmError<ValidatePaymentError>> {
+        unimplemented!();
+    }
+
+    #[inline]
+    async fn extract_secret(&self, secret_hash: &[u8], spend_tx: &[u8]) -> Result<Vec<u8>, String> {
         utxo_common::extract_secret(secret_hash, spend_tx)
     }
 
+    fn is_auto_refundable(&self) -> bool { false }
+
+    async fn wait_for_htlc_refund(&self, _tx: &[u8], _locktime: u64) -> RefundResult<()> {
+        MmError::err(RefundError::Internal(
+            "wait_for_htlc_refund is not supported for this coin!".into(),
+        ))
+    }
+
+    #[inline]
     fn negotiate_swap_contract_addr(
         &self,
         _other_side_address: Option<&[u8]>,
@@ -1368,12 +1446,128 @@ impl SwapOps for ZCoin {
         let key = secp_privkey_from_hash(dhash256(&signature));
         key_pair_from_secret(key.as_slice()).expect("valid privkey")
     }
+
+    #[inline]
+    fn derive_htlc_pubkey(&self, swap_unique_data: &[u8]) -> Vec<u8> {
+        self.derive_htlc_key_pair(swap_unique_data).public_slice().to_vec()
+    }
+
+    #[inline]
+    fn validate_other_pubkey(&self, raw_pubkey: &[u8]) -> MmResult<(), ValidateOtherPubKeyErr> {
+        utxo_common::validate_other_pubkey(raw_pubkey)
+    }
+
+    async fn maker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _maker_lock_duration: u64,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    async fn taker_payment_instructions(
+        &self,
+        _secret_hash: &[u8],
+        _amount: &BigDecimal,
+        _expires_in: u64,
+    ) -> Result<Option<Vec<u8>>, MmError<PaymentInstructionsErr>> {
+        Ok(None)
+    }
+
+    fn validate_maker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+        _maker_lock_duration: u64,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+
+    fn validate_taker_payment_instructions(
+        &self,
+        _instructions: &[u8],
+        _secret_hash: &[u8],
+        _amount: BigDecimal,
+    ) -> Result<PaymentInstructions, MmError<ValidateInstructionsErr>> {
+        MmError::err(ValidateInstructionsErr::UnsupportedCoin(self.ticker().to_string()))
+    }
+}
+
+#[async_trait]
+impl TakerSwapMakerCoin for ZCoin {
+    async fn on_taker_payment_refund_start(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_taker_payment_refund_success(&self, _maker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl MakerSwapTakerCoin for ZCoin {
+    async fn on_maker_payment_refund_start(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+
+    async fn on_maker_payment_refund_success(&self, _taker_payment: &[u8]) -> RefundResult<()> { Ok(()) }
+}
+
+#[async_trait]
+impl WatcherOps for ZCoin {
+    fn create_maker_payment_spend_preimage(
+        &self,
+        _maker_payment_tx: &[u8],
+        _time_lock: u32,
+        _maker_pub: &[u8],
+        _secret_hash: &[u8],
+        _swap_unique_data: &[u8],
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn send_maker_payment_spend_preimage(&self, _input: SendMakerPaymentSpendPreimageInput) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn create_taker_payment_refund_preimage(
+        &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_taker_payment_refund_preimage(
+        &self,
+        _watcher_refunds_payment_args: SendWatcherRefundsPaymentArgs,
+    ) -> TransactionFut {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_fee(&self, _input: WatcherValidateTakerFeeInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    fn watcher_validate_taker_payment(&self, _input: WatcherValidatePaymentInput) -> ValidatePaymentFut<()> {
+        unimplemented!();
+    }
+
+    async fn watcher_search_for_swap_tx_spend(
+        &self,
+        _input: WatcherSearchForSwapTxSpendInput<'_>,
+    ) -> Result<Option<FoundSwapTxSpend>, String> {
+        unimplemented!();
+    }
 }
 
 #[async_trait]
 impl MmCoin for ZCoin {
     fn is_asset_chain(&self) -> bool { self.utxo_arc.conf.asset_chain }
 
+    fn spawner(&self) -> CoinFutSpawner { CoinFutSpawner::new(&self.as_ref().abortable_system) }
+
     fn withdraw(&self, _req: WithdrawRequest) -> WithdrawFut {
         Box::new(futures01::future::err(MmError::new(WithdrawError::InternalError(
             "Zcoin doesn't support legacy withdraw".into(),
@@ -1384,6 +1578,14 @@ impl MmCoin for ZCoin {
         Box::new(utxo_common::get_raw_transaction(&self.utxo_arc, req).boxed().compat())
     }
 
+    fn get_tx_hex_by_hash(&self, tx_hash: Vec<u8>) -> RawTransactionFut {
+        Box::new(
+            utxo_common::get_tx_hex_by_hash(&self.utxo_arc, tx_hash)
+                .boxed()
+                .compat(),
+        )
+    }
+
     fn decimals(&self) -> u8 { self.utxo_arc.decimals }
 
     fn convert_to_address(&self, _from: &str, _to_address_format: Json) -> Result<String, String> {
@@ -1430,7 +1632,7 @@ impl MmCoin for ZCoin {
         })
     }
 
-    fn get_receiver_trade_fee(&self, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
+    fn get_receiver_trade_fee(&self, _send_amount: BigDecimal, _stage: FeeApproxStage) -> TradePreimageFut<TradeFee> {
         utxo_common::get_receiver_trade_fee(self.clone())
     }
 
@@ -1460,6 +1662,8 @@ impl MmCoin for ZCoin {
 
     fn swap_contract_address(&self) -> Option<BytesJson> { utxo_common::swap_contract_address() }
 
+    fn fallback_swap_contract(&self) -> Option<BytesJson> { utxo_common::fallback_swap_contract() }
+
     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) }
@@ -1467,6 +1671,10 @@ impl MmCoin for ZCoin {
     fn is_coin_protocol_supported(&self, info: &Option<Vec<u8>>) -> bool {
         utxo_common::is_coin_protocol_supported(self, info)
     }
+
+    fn on_disabled(&self) -> Result<(), AbortedError> { AbortableSystem::abort_all(&self.as_ref().abortable_system) }
+
+    fn on_token_deactivated(&self, _ticker: &str) {}
 }
 
 #[async_trait]
@@ -1520,8 +1728,8 @@ impl GetUtxoListOps for ZCoin {
 
 #[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
+    async fn get_htlc_spend_fee(&self, tx_size: u64, stage: &FeeApproxStage) -> UtxoRpcResult<u64> {
+        utxo_common::get_htlc_spend_fee(self, tx_size, stage).await
     }
 
     fn addresses_from_script(&self, script: &Script) -> Result<Vec<Address>, String> {
@@ -1534,7 +1742,7 @@ impl UtxoCommonOps for ZCoin {
         utxo_common::my_public_key(self.as_ref())
     }
 
-    fn address_from_str(&self, address: &str) -> Result<Address, String> {
+    fn address_from_str(&self, address: &str) -> MmResult<Address, AddrFromStrError> {
         utxo_common::checked_address_from_str(self, address)
     }
 
@@ -1650,7 +1858,7 @@ impl InitWithdrawCoin for ZCoin {
         task_handle.update_in_progress_status(WithdrawInProgressStatus::GeneratingTransaction)?;
         let satoshi = sat_from_big_decimal(&amount, self.decimals())?;
 
-        let memo = req.memo.map(|memo| interpret_memo_string(&memo)).transpose()?;
+        let memo = req.memo.as_deref().map(interpret_memo_string).transpose()?;
         let z_output = ZOutput {
             to_addr,
             amount: Amount::from_u64(satoshi)
@@ -1689,12 +1897,14 @@ impl InitWithdrawCoin for ZCoin {
             internal_id: tx_hash.into(),
             kmd_rewards: None,
             transaction_type: Default::default(),
+            memo: req.memo,
         })
     }
 }
 
 /// Interpret a string or hex-encoded memo, and return a Memo object.
 /// Inspired by https://github.com/adityapk00/zecwallet-light-cli/blob/v1.7.20/lib/src/lightwallet/utils.rs#L23
+#[allow(clippy::result_large_err)]
 pub fn interpret_memo_string(memo_str: &str) -> MmResult<MemoBytes, WithdrawError> {
     // If the string starts with an "0x", and contains only hex chars ([a-f0-9]+) then
     // interpret it as a hex.
@@ -1710,6 +1920,50 @@ pub fn interpret_memo_string(memo_str: &str) -> MmResult<MemoBytes, WithdrawErro
     })
 }
 
+fn extended_spending_key_from_protocol_info_and_policy(
+    protocol_info: &ZcoinProtocolInfo,
+    priv_key_policy: &PrivKeyBuildPolicy,
+) -> MmResult<ExtendedSpendingKey, ZCoinBuildError> {
+    match priv_key_policy {
+        PrivKeyBuildPolicy::IguanaPrivKey(iguana) => Ok(ExtendedSpendingKey::master(iguana.as_slice())),
+        PrivKeyBuildPolicy::GlobalHDAccount(global_hd) => {
+            extended_spending_key_from_global_hd_account(protocol_info, global_hd)
+        },
+        PrivKeyBuildPolicy::Trezor => {
+            let priv_key_err = PrivKeyPolicyNotAllowed::HardwareWalletNotSupported;
+            MmError::err(ZCoinBuildError::UtxoBuilderError(
+                UtxoCoinBuildError::PrivKeyPolicyNotAllowed(priv_key_err),
+            ))
+        },
+    }
+}
+
+fn extended_spending_key_from_global_hd_account(
+    protocol_info: &ZcoinProtocolInfo,
+    global_hd: &GlobalHDAccountArc,
+) -> MmResult<ExtendedSpendingKey, ZCoinBuildError> {
+    let path_to_coin = protocol_info
+        .z_derivation_path
+        .clone()
+        .or_mm_err(|| ZCoinBuildError::ZDerivationPathNotSet)?;
+
+    let path_to_account = path_to_coin
+        .to_derivation_path()
+        .into_iter()
+        // Map `bip32::ChildNumber` to `zip32::Zip32Child`.
+        .map(|child| Zip32Child::from_index(child.0))
+        // Push the hardened `account` index, so the derivation path looks like:
+        // `m/purpose'/coin'/account'`.
+        .chain(iter::once(Zip32Child::Hardened(global_hd.account_id())));
+
+    let mut spending_key = ExtendedSpendingKey::master(global_hd.root_seed_bytes());
+    for zip32_child in path_to_account {
+        spending_key = spending_key.derive_child(zip32_child);
+    }
+
+    Ok(spending_key)
+}
+
 #[test]
 fn derive_z_key_from_mm_seed() {
     use crypto::privkey::key_pair_from_seed;
diff --git a/mm2src/coins/z_coin/z_coin_errors.rs b/mm2src/coins/z_coin/z_coin_errors.rs
index add11fc1ba..8cb6da1359 100644
--- a/mm2src/coins/z_coin/z_coin_errors.rs
+++ b/mm2src/coins/z_coin/z_coin_errors.rs
@@ -2,7 +2,8 @@ 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 crate::{NumConversError, PrivKeyPolicyNotAllowed};
+use common::jsonrpc_client::JsonRpcError;
 use db_common::sqlite::rusqlite::Error as SqliteError;
 use db_common::sqlite::rusqlite::Error as SqlError;
 use derive_more::Display;
@@ -19,6 +20,10 @@ pub enum UpdateBlocksCacheErr {
     GrpcError(tonic::Status),
     BlocksDbError(SqliteError),
     ZcashSqliteError(ZcashClientError),
+    UtxoRpcError(UtxoRpcError),
+    InternalError(String),
+    JsonRpcError(JsonRpcError),
+    GetLiveLightClientError(String),
 }
 
 impl From<tonic::Status> for UpdateBlocksCacheErr {
@@ -33,18 +38,34 @@ impl From<ZcashClientError> for UpdateBlocksCacheErr {
     fn from(err: ZcashClientError) -> Self { UpdateBlocksCacheErr::ZcashSqliteError(err) }
 }
 
+impl From<UtxoRpcError> for UpdateBlocksCacheErr {
+    fn from(err: UtxoRpcError) -> Self { UpdateBlocksCacheErr::UtxoRpcError(err) }
+}
+
+impl From<JsonRpcError> for UpdateBlocksCacheErr {
+    fn from(err: JsonRpcError) -> Self { UpdateBlocksCacheErr::JsonRpcError(err) }
+}
+
 #[derive(Debug, Display)]
 #[non_exhaustive]
-pub enum ZcoinLightClientInitError {
-    TlsConfigFailure(tonic::transport::Error),
-    ConnectionFailure(tonic::transport::Error),
+pub enum ZcoinClientInitError {
     BlocksDbInitFailure(SqliteError),
     WalletDbInitFailure(SqliteError),
     ZcashSqliteError(ZcashClientError),
+    EmptyLightwalletdUris,
+    #[display(fmt = "Fail to init clients while iterating lightwalletd urls {:?}", _0)]
+    UrlIterFailure(Vec<UrlIterError>),
 }
 
-impl From<ZcashClientError> for ZcoinLightClientInitError {
-    fn from(err: ZcashClientError) -> Self { ZcoinLightClientInitError::ZcashSqliteError(err) }
+impl From<ZcashClientError> for ZcoinClientInitError {
+    fn from(err: ZcashClientError) -> Self { ZcoinClientInitError::ZcashSqliteError(err) }
+}
+
+#[derive(Debug, Display)]
+pub enum UrlIterError {
+    InvalidUri(InvalidUri),
+    TlsConfigFailure(tonic::transport::Error),
+    ConnectionFailure(tonic::transport::Error),
 }
 
 #[derive(Debug, Display)]
@@ -140,11 +161,11 @@ pub enum SendOutputsErr {
     NumConversion(NumConversError),
     Rpc(UtxoRpcError),
     TxNotMined(String),
-    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
 }
 
-impl From<PrivKeyNotAllowed> for SendOutputsErr {
-    fn from(err: PrivKeyNotAllowed) -> Self { SendOutputsErr::PrivKeyNotAllowed(err) }
+impl From<PrivKeyPolicyNotAllowed> for SendOutputsErr {
+    fn from(err: PrivKeyPolicyNotAllowed) -> Self { SendOutputsErr::PrivKeyPolicyNotAllowed(err) }
 }
 
 impl From<GenTxError> for SendOutputsErr {
@@ -182,11 +203,10 @@ pub enum ZCoinBuildError {
         path: String,
     },
     Io(std::io::Error),
-    EmptyLightwalletdUris,
-    NativeModeIsNotSupportedYet,
-    InvalidLightwalletdUri(InvalidUri),
-    LightClientInitErr(ZcoinLightClientInitError),
+    RpcClientInitErr(ZcoinClientInitError),
     ZCashParamsNotFound,
+    ZDerivationPathNotSet,
+    SaplingParamsInvalidChecksum,
 }
 
 impl From<SqliteError> for ZCoinBuildError {
@@ -205,12 +225,8 @@ 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) }
+impl From<ZcoinClientInitError> for ZCoinBuildError {
+    fn from(err: ZcoinClientInitError) -> Self { ZCoinBuildError::RpcClientInitErr(err) }
 }
 
 pub(super) enum SqlTxHistoryError {
diff --git a/mm2src/coins/z_coin/z_coin_native_tests.rs b/mm2src/coins/z_coin/z_coin_native_tests.rs
index 51957d8218..fca156d0f7 100644
--- a/mm2src/coins/z_coin/z_coin_native_tests.rs
+++ b/mm2src/coins/z_coin/z_coin_native_tests.rs
@@ -43,13 +43,21 @@ fn zombie_coin_send_and_refund_maker_payment() {
             &secret_hash,
             "0.01".parse().unwrap(),
             &None,
+            &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, &priv_key, &None)
+        .send_maker_refunds_payment(
+            &tx.tx_hex().unwrap(),
+            lock_time,
+            &*taker_pub,
+            &secret_hash,
+            &priv_key,
+            &None,
+        )
         .wait()
         .unwrap();
     println!("refund tx {}", hex::encode(&refund_tx.tx_hash().0));
@@ -93,6 +101,7 @@ fn zombie_coin_send_and_spend_maker_payment() {
             &*secret_hash,
             "0.01".parse().unwrap(),
             &None,
+            &None,
         )
         .wait()
         .unwrap();
diff --git a/mm2src/coins/z_coin/z_htlc.rs b/mm2src/coins/z_coin/z_htlc.rs
index ee286b90ab..4914c0002d 100644
--- a/mm2src/coins/z_coin/z_htlc.rs
+++ b/mm2src/coins/z_coin/z_htlc.rs
@@ -10,7 +10,7 @@ use crate::utxo::rpc_clients::{UtxoRpcClientEnum, UtxoRpcError};
 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 crate::{NumConversError, PrivKeyPolicyNotAllowed, TransactionEnum};
 use bitcrypto::dhash160;
 use common::async_blocking;
 use derive_more::Display;
@@ -96,7 +96,7 @@ pub async fn z_send_dex_fee(
 #[allow(clippy::large_enum_variant, clippy::upper_case_acronyms)]
 pub enum ZP2SHSpendError {
     ZTxBuilderError(ZTxBuilderError),
-    PrivKeyNotAllowed(PrivKeyNotAllowed),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     Rpc(UtxoRpcError),
     #[display(fmt = "{:?} {}", _0, _1)]
     TxRecoverable(TransactionEnum, String),
@@ -107,8 +107,8 @@ 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<PrivKeyPolicyNotAllowed> for ZP2SHSpendError {
+    fn from(err: PrivKeyPolicyNotAllowed) -> Self { ZP2SHSpendError::PrivKeyPolicyNotAllowed(err) }
 }
 
 impl From<UtxoRpcError> for ZP2SHSpendError {
diff --git a/mm2src/coins/z_coin/z_rpc.rs b/mm2src/coins/z_coin/z_rpc.rs
index 94f0e79901..66a5cfff1b 100644
--- a/mm2src/coins/z_coin/z_rpc.rs
+++ b/mm2src/coins/z_coin/z_rpc.rs
@@ -1,21 +1,26 @@
 use super::{z_coin_errors::*, CheckPointBlockInfo, ZcoinConsensusParams};
-use crate::utxo::utxo_common;
-use common::executor::Timer;
+use crate::utxo::rpc_clients::{NativeClient, UtxoRpcClientOps, NO_TX_ERROR_CODE};
+use async_trait::async_trait;
+use common::executor::{spawn_abortable, AbortOnDropHandle, Timer};
 use common::log::{debug, error, info, LogOnError};
-use common::{async_blocking, spawn_abortable, AbortOnDropHandle};
+use common::{async_blocking, Future01CompatExt};
 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 group::GroupEncoding;
 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::pin::Pin;
+use std::str::FromStr;
 use std::sync::Arc;
+use std::time::Duration;
 use tokio::task::block_in_place;
 use tonic::transport::{Channel, ClientTlsConfig};
 use zcash_client_backend::data_api::chain::{scan_cached_blocks, validate_chain};
@@ -33,8 +38,12 @@ use zcash_primitives::zip32::ExtendedFullViewingKey;
 mod z_coin_grpc {
     tonic::include_proto!("cash.z.wallet.sdk.rpc");
 }
+use crate::{RpcCommonOps, ZTransaction};
+use rpc::v1::types::H256 as H256Json;
 use z_coin_grpc::compact_tx_streamer_client::CompactTxStreamerClient;
-use z_coin_grpc::{BlockId, BlockRange, ChainSpec, TxFilter};
+use z_coin_grpc::{BlockId, BlockRange, ChainSpec, CompactBlock as TonicCompactBlock,
+                  CompactOutput as TonicCompactOutput, CompactSpend as TonicCompactSpend, CompactTx as TonicCompactTx,
+                  TxFilter};
 
 pub type WalletDbShared = Arc<Mutex<WalletDb<ZcoinConsensusParams>>>;
 
@@ -43,6 +52,225 @@ struct CompactBlockRow {
     data: Vec<u8>,
 }
 
+pub type OnCompactBlockFn<'a> = dyn FnMut(TonicCompactBlock) -> Result<(), MmError<UpdateBlocksCacheErr>> + Send + 'a;
+
+#[async_trait]
+pub trait ZRpcOps {
+    async fn get_block_height(&mut self) -> Result<u64, MmError<UpdateBlocksCacheErr>>;
+
+    async fn scan_blocks(
+        &mut self,
+        start_block: u64,
+        last_block: u64,
+        on_block: &mut OnCompactBlockFn,
+    ) -> Result<(), MmError<UpdateBlocksCacheErr>>;
+
+    async fn check_tx_existence(&mut self, tx_id: TxId) -> bool;
+}
+
+struct LightRpcClient {
+    rpc_clients: AsyncMutex<Vec<CompactTxStreamerClient<Channel>>>,
+}
+
+#[async_trait]
+impl RpcCommonOps for LightRpcClient {
+    type RpcClient = CompactTxStreamerClient<Channel>;
+    type Error = MmError<UpdateBlocksCacheErr>;
+
+    async fn get_live_client(&self) -> Result<Self::RpcClient, Self::Error> {
+        let mut clients = self.rpc_clients.lock().await;
+        for (i, mut client) in clients.clone().into_iter().enumerate() {
+            let request = tonic::Request::new(ChainSpec {});
+            // use get_latest_block method as a health check
+            if client.get_latest_block(request).await.is_ok() {
+                clients.rotate_left(i);
+                return Ok(client);
+            }
+        }
+        return Err(MmError::new(UpdateBlocksCacheErr::GetLiveLightClientError(
+            "All the current light clients are unavailable.".to_string(),
+        )));
+    }
+}
+
+#[async_trait]
+impl ZRpcOps for LightRpcClient {
+    async fn get_block_height(&mut self) -> Result<u64, MmError<UpdateBlocksCacheErr>> {
+        let request = tonic::Request::new(ChainSpec {});
+        let block = self
+            .get_live_client()
+            .await?
+            .get_latest_block(request)
+            .await
+            .map_to_mm(UpdateBlocksCacheErr::GrpcError)?
+            // return the message
+            .into_inner();
+        Ok(block.height)
+    }
+
+    async fn scan_blocks(
+        &mut self,
+        start_block: u64,
+        last_block: u64,
+        on_block: &mut OnCompactBlockFn,
+    ) -> Result<(), MmError<UpdateBlocksCacheErr>> {
+        let request = tonic::Request::new(BlockRange {
+            start: Some(BlockId {
+                height: start_block,
+                hash: Vec::new(),
+            }),
+            end: Some(BlockId {
+                height: last_block,
+                hash: Vec::new(),
+            }),
+        });
+        let mut response = self
+            .get_live_client()
+            .await?
+            .get_block_range(request)
+            .await
+            .map_to_mm(UpdateBlocksCacheErr::GrpcError)?
+            .into_inner();
+        // without Pin method get_mut is not found in current scope
+        while let Some(block) = Pin::new(&mut response).get_mut().message().await? {
+            debug!("Got block {:?}", block);
+            on_block(block)?;
+        }
+        Ok(())
+    }
+
+    async fn check_tx_existence(&mut self, tx_id: TxId) -> bool {
+        let mut attempts = 0;
+        loop {
+            if let Ok(mut client) = self.get_live_client().await {
+                let request = tonic::Request::new(TxFilter {
+                    block: None,
+                    index: 0,
+                    hash: tx_id.0.into(),
+                });
+                match client.get_transaction(request).await {
+                    Ok(_) => break,
+                    Err(e) => {
+                        error!("Error on getting tx {}", tx_id);
+                        if e.message().contains(NO_TX_ERROR_CODE) {
+                            if attempts >= 3 {
+                                return false;
+                            }
+                            attempts += 1;
+                        }
+                        Timer::sleep(30.).await;
+                    },
+                }
+            }
+        }
+        true
+    }
+}
+
+#[async_trait]
+impl ZRpcOps for NativeClient {
+    async fn get_block_height(&mut self) -> Result<u64, MmError<UpdateBlocksCacheErr>> {
+        Ok(self.get_block_count().compat().await?)
+    }
+
+    async fn scan_blocks(
+        &mut self,
+        start_block: u64,
+        last_block: u64,
+        on_block: &mut OnCompactBlockFn,
+    ) -> Result<(), MmError<UpdateBlocksCacheErr>> {
+        for height in start_block..=last_block {
+            let block = self.get_block_by_height(height).await?;
+            debug!("Got block {:?}", block);
+            let mut compact_txs = Vec::new();
+            // By default, CompactBlocks only contain CompactTxs for transactions that contain Sapling spends or outputs.
+            // Create and push compact_tx during iteration.
+            for (tx_id, hash_tx) in block.tx.iter().enumerate() {
+                let tx_bytes = self.get_transaction_bytes(hash_tx).compat().await?;
+                let tx = ZTransaction::read(tx_bytes.as_slice()).unwrap();
+                let mut spends = Vec::new();
+                let mut outputs = Vec::new();
+                if !tx.shielded_spends.is_empty() || !tx.shielded_outputs.is_empty() {
+                    // Create and push spends with outs for compact_tx during iterations.
+                    for spend in &tx.shielded_spends {
+                        let compact_spend = TonicCompactSpend {
+                            nf: spend.nullifier.to_vec(),
+                        };
+                        spends.push(compact_spend);
+                    }
+                    for out in &tx.shielded_outputs {
+                        let compact_out = TonicCompactOutput {
+                            cmu: out.cmu.to_bytes().to_vec(),
+                            epk: out.ephemeral_key.to_bytes().to_vec(),
+                            // https://zips.z.cash/zip-0307#output-compression
+                            // The first 52 bytes of the ciphertext contain the contents and opening of the note commitment,
+                            // which is all of the data needed to spend the note and to verify that the note is spendable.
+                            ciphertext: out.enc_ciphertext[0..52].to_vec(),
+                        };
+                        outputs.push(compact_out);
+                    }
+                    // Shadowing mut variables as immutable. No longer need to update them.
+                    drop_mutability!(spends);
+                    drop_mutability!(outputs);
+                    let mut hash_tx_vec = hash_tx.0.to_vec();
+                    hash_tx_vec.reverse();
+
+                    let compact_tx = TonicCompactTx {
+                        index: tx_id as u64,
+                        hash: hash_tx_vec,
+                        fee: 0,
+                        spends,
+                        outputs,
+                    };
+                    compact_txs.push(compact_tx);
+                }
+            }
+            let mut hash = block.hash.0.to_vec();
+            hash.reverse();
+            // Set 0 in vector in the case of genesis block.
+            let mut prev_hash = block.previousblockhash.unwrap_or_default().0.to_vec();
+            prev_hash.reverse();
+            // Shadowing mut variables as immutable.
+            drop_mutability!(hash);
+            drop_mutability!(prev_hash);
+            drop_mutability!(compact_txs);
+
+            let compact_block = TonicCompactBlock {
+                proto_version: 0,
+                height,
+                hash,
+                prev_hash,
+                time: block.time,
+                // (hash, prevHash, and time) OR (full header)
+                header: Vec::new(),
+                vtx: compact_txs,
+            };
+            on_block(compact_block)?;
+        }
+        Ok(())
+    }
+
+    async fn check_tx_existence(&mut self, tx_id: TxId) -> bool {
+        let mut attempts = 0;
+        loop {
+            match self.get_raw_transaction_bytes(&H256Json::from(tx_id.0)).compat().await {
+                Ok(_) => break,
+                Err(e) => {
+                    error!("Error on getting tx {}", tx_id);
+                    if e.to_string().contains(NO_TX_ERROR_CODE) {
+                        if attempts >= 3 {
+                            return false;
+                        }
+                        attempts += 1;
+                    }
+                    Timer::sleep(30.).await;
+                },
+            }
+        }
+        true
+    }
+}
+
 /// A wrapper for the SQLite connection to the block cache database.
 pub struct BlockDb(Connection);
 
@@ -108,7 +336,7 @@ impl BlockDb {
         Ok(query_single_row(
             &self.0,
             "SELECT height FROM compactblocks ORDER BY height DESC LIMIT 1",
-            db_common::sqlite::rusqlite::NO_PARAMS,
+            NO_PARAMS,
             |row| row.get(0),
         )?
         .unwrap_or(0))
@@ -143,25 +371,18 @@ impl BlockSource for BlockDb {
     }
 }
 
-pub(super) async fn init_light_client(
-    lightwalletd_url: Uri,
-    cache_db_path: PathBuf,
+pub async fn create_wallet_db(
     wallet_db_path: PathBuf,
     consensus_params: ZcoinConsensusParams,
     check_point_block: Option<CheckPointBlockInfo>,
     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>> {
+) -> Result<WalletDb<ZcoinConsensusParams>, MmError<ZcoinClientInitError>> {
+    async_blocking({
+        move || -> Result<WalletDb<ZcoinConsensusParams>, MmError<ZcoinClientInitError>> {
             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)?;
+                .map_to_mm(ZcoinClientInitError::WalletDbInitFailure)?;
+            run_optimization_pragmas(db.sql_conn()).map_to_mm(ZcoinClientInitError::WalletDbInitFailure)?;
+            init_wallet_db(&db).map_to_mm(ZcoinClientInitError::WalletDbInitFailure)?;
             if db.get_extended_full_viewing_keys()?.is_empty() {
                 init_accounts_table(&db, &[evk])?;
                 if let Some(check_point) = check_point_block {
@@ -177,31 +398,105 @@ pub(super) async fn init_light_client(
             Ok(db)
         }
     })
-    .await?;
+    .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);
+pub(super) async fn init_light_client(
+    coin: String,
+    lightwalletd_urls: Vec<String>,
+    blocks_db: BlockDb,
+    wallet_db: WalletDbShared,
+    consensus_params: ZcoinConsensusParams,
+    scan_blocks_per_iteration: u32,
+    scan_interval_ms: u64,
+) -> Result<(AsyncMutex<SaplingSyncConnector>, WalletDbShared), MmError<ZcoinClientInitError>> {
+    let (sync_status_notifier, sync_watcher) = channel(1);
+    let (on_tx_gen_notifier, on_tx_gen_watcher) = channel(1);
+    let mut rpc_clients = Vec::new();
+    let mut errors = Vec::new();
+    if lightwalletd_urls.is_empty() {
+        return MmError::err(ZcoinClientInitError::EmptyLightwalletdUris);
+    }
+    for url in lightwalletd_urls {
+        let uri = match Uri::from_str(&url) {
+            Ok(uri) => uri,
+            Err(err) => {
+                errors.push(UrlIterError::InvalidUri(err));
+                continue;
+            },
+        };
+        let endpoint = match Channel::builder(uri).tls_config(ClientTlsConfig::new()) {
+            Ok(endpoint) => endpoint,
+            Err(err) => {
+                errors.push(UrlIterError::TlsConfigFailure(err));
+                continue;
+            },
+        };
+        let tonic_channel = match endpoint.connect().await {
+            Ok(tonic_channel) => tonic_channel,
+            Err(err) => {
+                errors.push(UrlIterError::ConnectionFailure(err));
+                continue;
+            },
+        };
+        rpc_clients.push(CompactTxStreamerClient::new(tonic_channel));
+    }
+    drop_mutability!(errors);
+    drop_mutability!(rpc_clients);
+    // check if rpc_clients is empty, then for loop wasn't successful
+    if rpc_clients.is_empty() {
+        return MmError::err(ZcoinClientInitError::UrlIterFailure(errors));
+    }
+
+    let sync_handle = SaplingSyncLoopHandle {
+        coin,
+        current_block: BlockHeight::from_u32(0),
+        blocks_db,
+        wallet_db: wallet_db.clone(),
+        consensus_params,
+        sync_status_notifier,
+        on_tx_gen_watcher,
+        watch_for_tx: None,
+        scan_blocks_per_iteration,
+        scan_interval_ms,
+    };
 
+    let light_rpc_clients = LightRpcClient {
+        rpc_clients: AsyncMutex::new(rpc_clients),
+    };
+    let abort_handle = spawn_abortable(light_wallet_db_sync_loop(sync_handle, Box::new(light_rpc_clients)));
+
+    Ok((
+        SaplingSyncConnector::new_mutex_wrapped(sync_watcher, on_tx_gen_notifier, abort_handle),
+        wallet_db,
+    ))
+}
+
+pub(super) async fn init_native_client(
+    coin: String,
+    native_client: NativeClient,
+    blocks_db: BlockDb,
+    wallet_db: WalletDbShared,
+    consensus_params: ZcoinConsensusParams,
+    scan_blocks_per_iteration: u32,
+    scan_interval_ms: u64,
+) -> Result<(AsyncMutex<SaplingSyncConnector>, WalletDbShared), MmError<ZcoinClientInitError>> {
     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 {
+        coin,
         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,
+        scan_blocks_per_iteration,
+        scan_interval_ms,
     };
-    let abort_handle = spawn_abortable(light_wallet_db_sync_loop(sync_handle));
+    let abort_handle = spawn_abortable(light_wallet_db_sync_loop(sync_handle, Box::new(native_client)));
 
     Ok((
         SaplingSyncConnector::new_mutex_wrapped(sync_watcher, on_tx_gen_notifier, abort_handle),
@@ -218,14 +513,14 @@ fn is_tx_imported(conn: &Connection, tx_id: TxId) -> bool {
 }
 
 pub struct SaplingSyncRespawnGuard {
-    pub(super) sync_handle: Option<SaplingSyncLoopHandle>,
+    pub(super) sync_handle: Option<(SaplingSyncLoopHandle, Box<dyn ZRpcOps + Send>)>,
     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));
+        if let Some((handle, rpc)) = self.sync_handle.take() {
+            *self.abort_handle.lock() = spawn_abortable(light_wallet_db_sync_loop(handle, rpc));
         }
     }
 }
@@ -233,12 +528,14 @@ impl Drop for SaplingSyncRespawnGuard {
 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);
+            handle.0.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(super) fn current_block(&self) -> BlockHeight {
+        self.sync_handle.as_ref().expect("always Some").0.current_block
+    }
 }
 
 pub enum SyncStatus {
@@ -257,8 +554,8 @@ pub enum SyncStatus {
 }
 
 pub struct SaplingSyncLoopHandle {
+    coin: String,
     current_block: BlockHeight,
-    grpc_client: CompactTxStreamerClient<Channel>,
     blocks_db: BlockDb,
     wallet_db: WalletDbShared,
     consensus_params: ZcoinConsensusParams,
@@ -266,8 +563,10 @@ pub struct SaplingSyncLoopHandle {
     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>>,
+    on_tx_gen_watcher: AsyncReceiver<OneshotSender<(Self, Box<dyn ZRpcOps + Send>)>>,
     watch_for_tx: Option<TxId>,
+    scan_blocks_per_iteration: u32,
+    scan_interval_ms: u64,
 }
 
 impl SaplingSyncLoopHandle {
@@ -303,12 +602,13 @@ impl SaplingSyncLoopHandle {
             .debug_log_with_msg("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?;
+    async fn update_blocks_cache(
+        &mut self,
+        rpc: &mut (dyn ZRpcOps + Send),
+    ) -> Result<(), MmError<UpdateBlocksCacheErr>> {
+        let current_block = rpc.get_block_height().await?;
         let current_block_in_db = block_in_place(|| self.blocks_db.get_latest_block())?;
         let extrema = block_in_place(|| self.wallet_db.lock().block_height_extrema())?;
-
         let mut from_block = self
             .consensus_params
             .sapling_activation_height
@@ -317,30 +617,14 @@ impl SaplingSyncLoopHandle {
         if let Some((_, max_in_wallet)) = extrema {
             from_block = from_block.max(max_in_wallet.into());
         }
-
-        let current_block: u64 = current_blockchain_block.into_inner().height;
-
         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);
+            rpc.scan_blocks(from_block, current_block, &mut |block: TonicCompactBlock| {
                 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);
-            }
+                Ok(())
+            })
+            .await?;
         }
-
         self.current_block = BlockHeight::from_u32(current_block as u32);
         Ok(())
     }
@@ -384,35 +668,24 @@ impl SaplingSyncLoopHandle {
                 },
                 None => self.notify_building_wallet_db(0, current_block.into()),
             }
-            scan_cached_blocks(&self.consensus_params, &self.blocks_db, &mut wallet_ops, Some(1000))?;
+
+            scan_cached_blocks(
+                &self.consensus_params,
+                &self.blocks_db,
+                &mut wallet_ops,
+                Some(self.scan_blocks_per_iteration),
+            )?;
+            if self.scan_interval_ms > 0 {
+                std::thread::sleep(Duration::from_millis(self.scan_interval_ms));
+            }
         }
         Ok(())
     }
 
-    async fn check_watch_for_tx_existence(&mut self) {
+    async fn check_watch_for_tx_existence(&mut self, rpc: &mut (dyn ZRpcOps + Send)) {
         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;
-                    },
-                }
+            if !rpc.check_tx_existence(tx_id).await {
+                self.watch_for_tx = None;
             }
         }
     }
@@ -439,10 +712,14 @@ impl SaplingSyncLoopHandle {
 /// 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) {
+async fn light_wallet_db_sync_loop(mut sync_handle: SaplingSyncLoopHandle, mut client: Box<dyn ZRpcOps + Send>) {
+    info!(
+        "(Re)starting light_wallet_db_sync_loop for {}, blocks per iteration {}, interval in ms {}",
+        sync_handle.coin, sync_handle.scan_blocks_per_iteration, sync_handle.scan_interval_ms
+    );
     // 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 {
+        if let Err(e) = sync_handle.update_blocks_cache(client.as_mut()).await {
             error!("Error {} on blocks cache update", e);
             sync_handle.notify_on_error(e.to_string());
             Timer::sleep(10.).await;
@@ -458,7 +735,7 @@ async fn light_wallet_db_sync_loop(mut sync_handle: SaplingSyncLoopHandle) {
 
         sync_handle.notify_sync_finished();
 
-        sync_handle.check_watch_for_tx_existence().await;
+        sync_handle.check_watch_for_tx_existence(client.as_mut()).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)) {
@@ -470,10 +747,11 @@ async fn light_wallet_db_sync_loop(mut sync_handle: SaplingSyncLoopHandle) {
         }
 
         if let Ok(Some(sender)) = sync_handle.on_tx_gen_watcher.try_next() {
-            match sender.send(sync_handle) {
+            match sender.send((sync_handle, client)) {
                 Ok(_) => break,
-                Err(handle_from_channel) => {
+                Err((handle_from_channel, rpc_from_channel)) => {
                     sync_handle = handle_from_channel;
+                    client = rpc_from_channel;
                 },
             }
         }
@@ -483,7 +761,7 @@ async fn light_wallet_db_sync_loop(mut sync_handle: SaplingSyncLoopHandle) {
 }
 
 type SyncWatcher = AsyncReceiver<SyncStatus>;
-type NewTxNotifier = AsyncSender<OneshotSender<SaplingSyncLoopHandle>>;
+type NewTxNotifier = AsyncSender<OneshotSender<(SaplingSyncLoopHandle, Box<dyn ZRpcOps + Send>)>>;
 
 pub(super) struct SaplingSyncConnector {
     sync_watcher: SyncWatcher,
@@ -519,8 +797,8 @@ impl SaplingSyncConnector {
             .map_to_mm(|_| BlockchainScanStopped {})?;
         receiver
             .await
-            .map(|handle| SaplingSyncRespawnGuard {
-                sync_handle: Some(handle),
+            .map(|(handle, rpc)| SaplingSyncRespawnGuard {
+                sync_handle: Some((handle, rpc)),
                 abort_handle: self.abort_handle.clone(),
             })
             .map_to_mm(|_| BlockchainScanStopped {})
diff --git a/mm2src/coins_activation/Cargo.toml b/mm2src/coins_activation/Cargo.toml
index e95895aa99..7506494822 100644
--- a/mm2src/coins_activation/Cargo.toml
+++ b/mm2src/coins_activation/Cargo.toml
@@ -3,23 +3,35 @@ 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
+[lib]
+doctest = false
 
 [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"
+ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
 futures = { version = "0.3", package = "futures", features = ["compat", "async-await"] }
 hex = "0.4.2"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_metrics = { path = "../mm2_metrics" }
+mm2_number = { path = "../mm2_number" }
+parking_lot = { version = "0.12.0", features = ["nightly"] }
 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
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+mm2_metamask = { path = "../mm2_metamask" }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+lightning = "0.0.110"
+lightning-background-processor = "0.0.110"
+lightning-invoice = { version = "0.18.0", features = ["serde"] }
diff --git a/mm2src/coins_activation/src/bch_with_tokens_activation.rs b/mm2src/coins_activation/src/bch_with_tokens_activation.rs
index e0f3102b47..97fca2acca 100644
--- a/mm2src/coins_activation/src/bch_with_tokens_activation.rs
+++ b/mm2src/coins_activation/src/bch_with_tokens_activation.rs
@@ -3,17 +3,16 @@ 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::bch::{bch_coin_with_policy, BchActivationRequest, BchCoin, CashAddrPrefix};
 use coins::utxo::rpc_clients::UtxoRpcError;
-use coins::utxo::slp::{SlpProtocolConf, SlpToken};
+use coins::utxo::slp::{EnableSlpError, SlpProtocolConf, SlpToken};
+use coins::utxo::utxo_tx_history_v2::bch_and_slp_history_loop;
 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 coins::{CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, PrivKeyBuildPolicy, PrivKeyPolicyNotAllowed,
+            UnexpectedDerivationMethod};
+use common::executor::{AbortSettings, SpawnAbortable};
 use common::Future01CompatExt;
-use futures::future::{abortable, AbortHandle};
+use crypto::CryptoCtxError;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
 use mm2_number::BigDecimal;
@@ -22,6 +21,19 @@ use serde_json::Value as Json;
 use std::collections::HashMap;
 use std::str::FromStr;
 
+impl From<EnableSlpError> for InitTokensAsMmCoinsError {
+    fn from(e: EnableSlpError) -> Self {
+        match e {
+            EnableSlpError::GetBalanceError(balance_err) => {
+                InitTokensAsMmCoinsError::CouldNotFetchBalance(balance_err.to_string())
+            },
+            EnableSlpError::UnexpectedDerivationMethod(internal) | EnableSlpError::Internal(internal) => {
+                InitTokensAsMmCoinsError::Internal(internal)
+            },
+        }
+    }
+}
+
 pub struct SlpTokenInitializer {
     platform_coin: BchCoin,
 }
@@ -35,7 +47,7 @@ impl TokenInitializer for SlpTokenInitializer {
     type Token = SlpToken;
     type TokenActivationRequest = SlpActivationRequest;
     type TokenProtocol = SlpProtocolConf;
-    type InitTokensError = std::convert::Infallible;
+    type InitTokensError = EnableSlpError;
 
     fn tokens_requests_from_platform_request(
         platform_params: &BchWithTokensActivationRequest,
@@ -46,7 +58,7 @@ impl TokenInitializer for SlpTokenInitializer {
     async fn enable_tokens(
         &self,
         activation_params: Vec<TokenActivationParams<SlpActivationRequest, SlpProtocolConf>>,
-    ) -> Result<Vec<SlpToken>, MmError<std::convert::Infallible>> {
+    ) -> Result<Vec<SlpToken>, MmError<EnableSlpError>> {
         let tokens = activation_params
             .into_iter()
             .map(|params| {
@@ -66,7 +78,7 @@ impl TokenInitializer for SlpTokenInitializer {
                     required_confirmations,
                 )
             })
-            .collect();
+            .collect::<MmResult<_, EnableSlpError>>()?;
 
         Ok(tokens)
     }
@@ -90,8 +102,8 @@ impl From<BchWithTokensActivationError> for EnablePlatformCoinWithTokensError {
                     prefix, ticker, error
                 ))
             },
-            BchWithTokensActivationError::PrivKeyNotAllowed(e) => {
-                EnablePlatformCoinWithTokensError::PrivKeyNotAllowed(e)
+            BchWithTokensActivationError::PrivKeyPolicyNotAllowed(e) => {
+                EnablePlatformCoinWithTokensError::PrivKeyPolicyNotAllowed(e)
             },
             BchWithTokensActivationError::UnexpectedDerivationMethod(e) => {
                 EnablePlatformCoinWithTokensError::UnexpectedDerivationMethod(e)
@@ -161,7 +173,7 @@ pub enum BchWithTokensActivationError {
         prefix: String,
         error: String,
     },
-    PrivKeyNotAllowed(String),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     UnexpectedDerivationMethod(String),
     Transport(String),
     Internal(String),
@@ -177,8 +189,12 @@ impl From<UnexpectedDerivationMethod> for BchWithTokensActivationError {
     }
 }
 
-impl From<PrivKeyNotAllowed> for BchWithTokensActivationError {
-    fn from(e: PrivKeyNotAllowed) -> Self { BchWithTokensActivationError::PrivKeyNotAllowed(e.to_string()) }
+impl From<PrivKeyPolicyNotAllowed> for BchWithTokensActivationError {
+    fn from(e: PrivKeyPolicyNotAllowed) -> Self { BchWithTokensActivationError::PrivKeyPolicyNotAllowed(e) }
+}
+
+impl From<CryptoCtxError> for BchWithTokensActivationError {
+    fn from(e: CryptoCtxError) -> Self { BchWithTokensActivationError::Internal(e.to_string()) }
 }
 
 #[async_trait]
@@ -194,8 +210,9 @@ impl PlatformWithTokensActivationOps for BchCoin {
         platform_conf: Json,
         activation_request: Self::ActivationRequest,
         protocol_conf: Self::PlatformProtocolInfo,
-        priv_key: &[u8],
     ) -> Result<Self, MmError<Self::ActivationError>> {
+        let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(&ctx)?;
+
         let slp_prefix = CashAddrPrefix::from_str(&protocol_conf.slp_prefix).map_to_mm(|error| {
             BchWithTokensActivationError::InvalidSlpPrefix {
                 ticker: ticker.clone(),
@@ -204,13 +221,13 @@ impl PlatformWithTokensActivationOps for BchCoin {
             }
         })?;
 
-        let platform_coin = bch_coin_from_conf_and_params(
+        let platform_coin = bch_coin_with_policy(
             &ctx,
             &ticker,
             &platform_conf,
             activation_request.platform_request,
             slp_prefix,
-            priv_key,
+            priv_key_policy,
         )
         .await
         .map_to_mm(|error| BchWithTokensActivationError::PlatformCoinCreationError { ticker, error })?;
@@ -228,7 +245,7 @@ impl PlatformWithTokensActivationOps for BchCoin {
     async fn get_activation_result(
         &self,
     ) -> Result<BchWithTokensActivationResult, MmError<BchWithTokensActivationError>> {
-        let my_address = self.as_ref().derivation_method.iguana_or_err()?;
+        let my_address = self.as_ref().derivation_method.single_addr_or_err()?;
         let my_slp_address = self
             .get_my_slp_address()
             .map_to_mm(BchWithTokensActivationError::Internal)?
@@ -270,22 +287,13 @@ impl PlatformWithTokensActivationOps for BchCoin {
 
     fn start_history_background_fetching(
         &self,
-        metrics: MetricsArc,
+        ctx: MmArc,
         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
+    ) {
+        let fut = bch_and_slp_history_loop(self.clone(), storage, ctx.metrics.clone(), initial_balance);
+
+        let settings = AbortSettings::info_on_abort(format!("bch_and_slp_history_loop stopped for {}", self.ticker()));
+        self.spawner().spawn_with_settings(fut, settings);
     }
 }
diff --git a/mm2src/coins_activation/src/context.rs b/mm2src/coins_activation/src/context.rs
index 8af083b2e2..a86869e7ab 100644
--- a/mm2src/coins_activation/src/context.rs
+++ b/mm2src/coins_activation/src/context.rs
@@ -1,3 +1,5 @@
+#[cfg(not(target_arch = "wasm32"))]
+use crate::lightning_activation::LightningTaskManagerShared;
 use crate::utxo_activation::{QtumTaskManagerShared, UtxoStandardTaskManagerShared};
 #[cfg(not(target_arch = "wasm32"))]
 use crate::z_coin_activation::ZcoinTaskManagerShared;
@@ -10,6 +12,8 @@ pub struct CoinsActivationContext {
     pub(crate) init_qtum_task_manager: QtumTaskManagerShared,
     #[cfg(not(target_arch = "wasm32"))]
     pub(crate) init_z_coin_task_manager: ZcoinTaskManagerShared,
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) init_lightning_task_manager: LightningTaskManagerShared,
 }
 
 impl CoinsActivationContext {
@@ -21,6 +25,8 @@ impl CoinsActivationContext {
                 init_qtum_task_manager: RpcTaskManager::new_shared(),
                 #[cfg(not(target_arch = "wasm32"))]
                 init_z_coin_task_manager: RpcTaskManager::new_shared(),
+                #[cfg(not(target_arch = "wasm32"))]
+                init_lightning_task_manager: RpcTaskManager::new_shared(),
             })
         })
     }
diff --git a/mm2src/coins_activation/src/erc20_token_activation.rs b/mm2src/coins_activation/src/erc20_token_activation.rs
new file mode 100644
index 0000000000..9a5dff22d9
--- /dev/null
+++ b/mm2src/coins_activation/src/erc20_token_activation.rs
@@ -0,0 +1,106 @@
+use crate::{prelude::{TryFromCoinProtocol, TryPlatformCoinFromMmCoinEnum},
+            token::{EnableTokenError, TokenActivationOps, TokenProtocolParams}};
+use async_trait::async_trait;
+use coins::{eth::{v2_activation::{Erc20Protocol, Erc20TokenActivationError, Erc20TokenActivationRequest},
+                  valid_addr_from_str, EthCoin},
+            CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, MmCoinEnum};
+use common::Future01CompatExt;
+use mm2_err_handle::prelude::MmError;
+use serde::Serialize;
+use std::collections::HashMap;
+
+#[derive(Debug, Serialize)]
+pub struct Erc20InitResult {
+    balances: HashMap<String, CoinBalance>,
+    platform_coin: String,
+    token_contract_address: String,
+    required_confirmations: u64,
+}
+
+impl From<Erc20TokenActivationError> for EnableTokenError {
+    fn from(err: Erc20TokenActivationError) -> Self {
+        match err {
+            Erc20TokenActivationError::InternalError(e) => EnableTokenError::Internal(e),
+            Erc20TokenActivationError::CouldNotFetchBalance(e) => EnableTokenError::Transport(e),
+        }
+    }
+}
+
+impl TryPlatformCoinFromMmCoinEnum for EthCoin {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        match coin {
+            MmCoinEnum::EthCoin(coin) => Some(coin),
+            _ => None,
+        }
+    }
+}
+
+impl TryFromCoinProtocol for Erc20Protocol {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::ERC20 {
+                platform,
+                contract_address,
+            } => {
+                let token_addr = valid_addr_from_str(&contract_address).map_err(|_| CoinProtocol::ERC20 {
+                    platform: platform.clone(),
+                    contract_address,
+                })?;
+
+                Ok(Erc20Protocol { platform, token_addr })
+            },
+            proto => MmError::err(proto),
+        }
+    }
+}
+
+impl TokenProtocolParams for Erc20Protocol {
+    fn platform_coin_ticker(&self) -> &str { &self.platform }
+}
+
+#[async_trait]
+impl TokenActivationOps for EthCoin {
+    type ActivationParams = Erc20TokenActivationRequest;
+    type ProtocolInfo = Erc20Protocol;
+    type ActivationResult = Erc20InitResult;
+    type ActivationError = Erc20TokenActivationError;
+
+    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 = platform_coin
+            .initialize_erc20_token(activation_params, protocol_conf, ticker)
+            .await?;
+
+        let address = token.my_address()?;
+        let token_contract_address = token
+            .erc20_token_address()
+            .ok_or_else(|| Erc20TokenActivationError::InternalError("Token contract address is missing".to_string()))?;
+
+        let balance = token
+            .my_balance()
+            .compat()
+            .await
+            .map_err(|e| Erc20TokenActivationError::CouldNotFetchBalance(e.to_string()))?;
+
+        let balances = HashMap::from([(address, balance)]);
+
+        let init_result = Erc20InitResult {
+            balances,
+            platform_coin: token.platform_ticker().to_owned(),
+            required_confirmations: token.required_confirmations(),
+            token_contract_address: format!("{:#02x}", token_contract_address),
+        };
+
+        Ok((token, init_result))
+    }
+}
diff --git a/mm2src/coins_activation/src/eth_with_token_activation.rs b/mm2src/coins_activation/src/eth_with_token_activation.rs
new file mode 100644
index 0000000000..7b5d099ba5
--- /dev/null
+++ b/mm2src/coins_activation/src/eth_with_token_activation.rs
@@ -0,0 +1,269 @@
+use crate::{platform_coin_with_tokens::{EnablePlatformCoinWithTokensError, GetPlatformBalance,
+                                        InitTokensAsMmCoinsError, PlatformWithTokensActivationOps, RegisterTokenInfo,
+                                        TokenActivationParams, TokenActivationRequest, TokenAsMmCoinInitializer,
+                                        TokenInitializer, TokenOf},
+            prelude::*};
+use async_trait::async_trait;
+use coins::eth::v2_activation::EthPrivKeyActivationPolicy;
+use coins::eth::EthPrivKeyBuildPolicy;
+use coins::{eth::{v2_activation::{eth_coin_from_conf_and_request_v2, Erc20Protocol, Erc20TokenActivationError,
+                                  Erc20TokenActivationRequest, EthActivationV2Error, EthActivationV2Request},
+                  Erc20TokenInfo, EthCoin, EthCoinType},
+            my_tx_history_v2::TxHistoryStorage,
+            CoinBalance, CoinProtocol, MarketCoinOps, MmCoin};
+use common::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+#[cfg(target_arch = "wasm32")]
+use mm2_metamask::MetamaskRpcError;
+use mm2_number::BigDecimal;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashMap;
+
+impl From<EthActivationV2Error> for EnablePlatformCoinWithTokensError {
+    fn from(err: EthActivationV2Error) -> Self {
+        match err {
+            EthActivationV2Error::InvalidPayload(e)
+            | EthActivationV2Error::InvalidSwapContractAddr(e)
+            | EthActivationV2Error::InvalidFallbackSwapContract(e) => {
+                EnablePlatformCoinWithTokensError::InvalidPayload(e)
+            },
+            #[cfg(target_arch = "wasm32")]
+            EthActivationV2Error::ExpectedRpcChainId => {
+                EnablePlatformCoinWithTokensError::InvalidPayload(err.to_string())
+            },
+            EthActivationV2Error::ActivationFailed { ticker, error } => {
+                EnablePlatformCoinWithTokensError::PlatformCoinCreationError { ticker, error }
+            },
+            EthActivationV2Error::AtLeastOneNodeRequired => EnablePlatformCoinWithTokensError::AtLeastOneNodeRequired(
+                "Enable request for ETH coin must have at least 1 node".to_string(),
+            ),
+            EthActivationV2Error::CouldNotFetchBalance(e) | EthActivationV2Error::UnreachableNodes(e) => {
+                EnablePlatformCoinWithTokensError::Transport(e)
+            },
+            EthActivationV2Error::DerivationPathIsNotSet => EnablePlatformCoinWithTokensError::InvalidPayload(
+                "'derivation_path' field is not found in config".to_string(),
+            ),
+            EthActivationV2Error::ErrorDeserializingDerivationPath(e) => {
+                EnablePlatformCoinWithTokensError::InvalidPayload(e)
+            },
+            EthActivationV2Error::PrivKeyPolicyNotAllowed(e) => {
+                EnablePlatformCoinWithTokensError::PrivKeyPolicyNotAllowed(e)
+            },
+            #[cfg(target_arch = "wasm32")]
+            EthActivationV2Error::MetamaskError(metamask) => {
+                EnablePlatformCoinWithTokensError::Transport(metamask.to_string())
+            },
+            EthActivationV2Error::InternalError(e) => EnablePlatformCoinWithTokensError::Internal(e),
+        }
+    }
+}
+
+impl TryFromCoinProtocol for EthCoinType {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
+    where
+        Self: Sized,
+    {
+        match proto {
+            CoinProtocol::ETH => Ok(EthCoinType::Eth),
+            protocol => MmError::err(protocol),
+        }
+    }
+}
+
+pub struct Erc20Initializer {
+    platform_coin: EthCoin,
+}
+
+impl From<Erc20TokenActivationError> for InitTokensAsMmCoinsError {
+    fn from(error: Erc20TokenActivationError) -> Self {
+        match error {
+            Erc20TokenActivationError::InternalError(e) => InitTokensAsMmCoinsError::Internal(e),
+            Erc20TokenActivationError::CouldNotFetchBalance(e) => InitTokensAsMmCoinsError::CouldNotFetchBalance(e),
+        }
+    }
+}
+
+#[async_trait]
+impl TokenInitializer for Erc20Initializer {
+    type Token = EthCoin;
+    type TokenActivationRequest = Erc20TokenActivationRequest;
+    type TokenProtocol = Erc20Protocol;
+    type InitTokensError = Erc20TokenActivationError;
+
+    fn tokens_requests_from_platform_request(
+        platform_params: &EthWithTokensActivationRequest,
+    ) -> Vec<TokenActivationRequest<Self::TokenActivationRequest>> {
+        platform_params.erc20_tokens_requests.clone()
+    }
+
+    async fn enable_tokens(
+        &self,
+        activation_params: Vec<TokenActivationParams<Erc20TokenActivationRequest, Erc20Protocol>>,
+    ) -> Result<Vec<EthCoin>, MmError<Erc20TokenActivationError>> {
+        let mut tokens = vec![];
+        for param in activation_params {
+            let token: EthCoin = self
+                .platform_coin
+                .initialize_erc20_token(param.activation_request, param.protocol, param.ticker)
+                .await?;
+            tokens.push(token);
+        }
+
+        Ok(tokens)
+    }
+
+    fn platform_coin(&self) -> &EthCoin { &self.platform_coin }
+}
+
+#[derive(Clone, Deserialize)]
+pub struct EthWithTokensActivationRequest {
+    #[serde(flatten)]
+    platform_request: EthActivationV2Request,
+    erc20_tokens_requests: Vec<TokenActivationRequest<Erc20TokenActivationRequest>>,
+}
+
+impl TxHistory for EthWithTokensActivationRequest {
+    fn tx_history(&self) -> bool { false }
+}
+
+impl TokenOf for EthCoin {
+    type PlatformCoin = EthCoin;
+}
+
+impl RegisterTokenInfo<EthCoin> for EthCoin {
+    fn register_token_info(&self, token: &EthCoin) {
+        self.add_erc_token_info(token.ticker().to_string(), Erc20TokenInfo {
+            token_address: token.erc20_token_address().unwrap(),
+            decimals: token.decimals(),
+        });
+    }
+}
+
+#[derive(Serialize)]
+pub struct EthWithTokensActivationResult {
+    current_block: u64,
+    eth_addresses_infos: HashMap<String, CoinAddressInfo<CoinBalance>>,
+    erc20_addresses_infos: HashMap<String, CoinAddressInfo<TokenBalances>>,
+}
+
+impl GetPlatformBalance for EthWithTokensActivationResult {
+    fn get_platform_balance(&self) -> BigDecimal {
+        self.eth_addresses_infos
+            .iter()
+            .fold(BigDecimal::from(0), |total, (_, addr_info)| {
+                &total + &addr_info.balances.get_total()
+            })
+    }
+}
+
+impl CurrentBlock for EthWithTokensActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
+
+#[async_trait]
+impl PlatformWithTokensActivationOps for EthCoin {
+    type ActivationRequest = EthWithTokensActivationRequest;
+    type PlatformProtocolInfo = EthCoinType;
+    type ActivationResult = EthWithTokensActivationResult;
+    type ActivationError = EthActivationV2Error;
+
+    async fn enable_platform_coin(
+        ctx: MmArc,
+        ticker: String,
+        platform_conf: Json,
+        activation_request: Self::ActivationRequest,
+        _protocol: Self::PlatformProtocolInfo,
+    ) -> Result<Self, MmError<Self::ActivationError>> {
+        let priv_key_policy = eth_priv_key_build_policy(&ctx, &activation_request.platform_request.priv_key_policy)?;
+
+        let platform_coin = eth_coin_from_conf_and_request_v2(
+            &ctx,
+            &ticker,
+            &platform_conf,
+            activation_request.platform_request,
+            priv_key_policy,
+        )
+        .await?;
+
+        Ok(platform_coin)
+    }
+
+    fn token_initializers(
+        &self,
+    ) -> Vec<Box<dyn TokenAsMmCoinInitializer<PlatformCoin = Self, ActivationRequest = Self::ActivationRequest>>> {
+        vec![Box::new(Erc20Initializer {
+            platform_coin: self.clone(),
+        })]
+    }
+
+    async fn get_activation_result(&self) -> Result<EthWithTokensActivationResult, MmError<EthActivationV2Error>> {
+        let my_address = self.my_address()?;
+        let pubkey = self.get_public_key()?;
+
+        let current_block = self
+            .current_block()
+            .compat()
+            .await
+            .map_err(EthActivationV2Error::InternalError)?;
+
+        let eth_balance = self
+            .my_balance()
+            .compat()
+            .await
+            .map_err(|e| EthActivationV2Error::CouldNotFetchBalance(e.to_string()))?;
+        let token_balances = self
+            .get_tokens_balance_list()
+            .await
+            .map_err(|e| EthActivationV2Error::CouldNotFetchBalance(e.to_string()))?;
+
+        let mut result = EthWithTokensActivationResult {
+            current_block,
+            eth_addresses_infos: HashMap::new(),
+            erc20_addresses_infos: HashMap::new(),
+        };
+
+        result
+            .eth_addresses_infos
+            .insert(my_address.to_string(), CoinAddressInfo {
+                derivation_method: DerivationMethod::Iguana,
+                pubkey: pubkey.clone(),
+                balances: eth_balance,
+            });
+
+        result
+            .erc20_addresses_infos
+            .insert(my_address.to_string(), CoinAddressInfo {
+                derivation_method: DerivationMethod::Iguana,
+                pubkey,
+                balances: token_balances,
+            });
+
+        Ok(result)
+    }
+
+    fn start_history_background_fetching(
+        &self,
+        _ctx: MmArc,
+        _storage: impl TxHistoryStorage + Send + 'static,
+        _initial_balance: BigDecimal,
+    ) {
+    }
+}
+
+fn eth_priv_key_build_policy(
+    ctx: &MmArc,
+    activation_policy: &EthPrivKeyActivationPolicy,
+) -> MmResult<EthPrivKeyBuildPolicy, EthActivationV2Error> {
+    match activation_policy {
+        EthPrivKeyActivationPolicy::ContextPrivKey => Ok(EthPrivKeyBuildPolicy::detect_priv_key_policy(ctx)?),
+        #[cfg(target_arch = "wasm32")]
+        EthPrivKeyActivationPolicy::Metamask => {
+            let metamask_ctx = crypto::CryptoCtx::from_ctx(ctx)?
+                .metamask_ctx()
+                .or_mm_err(|| EthActivationV2Error::MetamaskError(MetamaskRpcError::MetamaskCtxNotInitialized))?;
+            Ok(EthPrivKeyBuildPolicy::Metamask(metamask_ctx))
+        },
+    }
+}
diff --git a/mm2src/coins_activation/src/l2.rs b/mm2src/coins_activation/src/l2.rs
deleted file mode 100644
index 69f5e9a0c6..0000000000
--- a/mm2src/coins_activation/src/l2.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-/// 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/l2/init_l2.rs b/mm2src/coins_activation/src/l2/init_l2.rs
new file mode 100644
index 0000000000..00cf6eb8dc
--- /dev/null
+++ b/mm2src/coins_activation/src/l2/init_l2.rs
@@ -0,0 +1,216 @@
+/// Contains L2 activation traits and their implementations for various coins
+///
+use crate::context::CoinsActivationContext;
+use crate::l2::init_l2_error::{CancelInitL2Error, InitL2StatusError, InitL2UserActionError};
+use crate::l2::InitL2Error;
+use crate::prelude::*;
+use async_trait::async_trait;
+use coins::{lp_coinfind, lp_coinfind_or_err, CoinsContext, MmCoinEnum, RegisterCoinError};
+use common::SuccessResponse;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusRequest, RpcTaskUserActionRequest};
+use rpc_task::{RpcTask, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use serde_derive::Deserialize;
+use serde_json::Value as Json;
+
+pub type InitL2Response = InitRpcTaskResponse;
+pub type InitL2StatusRequest = RpcTaskStatusRequest;
+pub type InitL2UserActionRequest<UserAction> = RpcTaskUserActionRequest<UserAction>;
+pub type InitL2TaskManagerShared<L2> = RpcTaskManagerShared<InitL2Task<L2>>;
+pub type InitL2TaskHandle<L2> = RpcTaskHandle<InitL2Task<L2>>;
+
+#[derive(Debug, Deserialize)]
+pub struct InitL2Req<T> {
+    ticker: String,
+    activation_params: T,
+}
+
+pub trait L2ProtocolParams {
+    fn platform_coin_ticker(&self) -> &str;
+}
+
+#[async_trait]
+pub trait InitL2ActivationOps: Into<MmCoinEnum> + Send + Sync + 'static {
+    type PlatformCoin: TryPlatformCoinFromMmCoinEnum + Clone + Send + Sync;
+    type ActivationParams: Clone;
+    type ProtocolInfo: L2ProtocolParams + TryFromCoinProtocol + Clone + Send + Sync;
+    type ValidatedParams: Clone + Send + Sync;
+    type CoinConf: Clone + Send + Sync;
+    type ActivationResult: serde::Serialize + Clone + Send + Sync;
+    type ActivationError: From<RegisterCoinError> + NotEqual + SerMmErrorType + Clone + Send + Sync;
+    type InProgressStatus: InitL2InitialStatus + Clone + Send + Sync;
+    type AwaitingStatus: Clone + Send + Sync;
+    type UserAction: NotMmError + Send + Sync;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &InitL2TaskManagerShared<Self>;
+
+    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 init_l2(
+        ctx: &MmArc,
+        platform_coin: Self::PlatformCoin,
+        validated_params: Self::ValidatedParams,
+        protocol_conf: Self::ProtocolInfo,
+        coin_conf: Self::CoinConf,
+        task_handle: &InitL2TaskHandle<Self>,
+    ) -> Result<(Self, Self::ActivationResult), MmError<Self::ActivationError>>;
+}
+
+pub async fn init_l2<L2>(
+    ctx: MmArc,
+    req: InitL2Req<L2::ActivationParams>,
+) -> Result<InitL2Response, MmError<InitL2Error>>
+where
+    L2: InitL2ActivationOps,
+    InitL2Error: From<L2::ActivationError>,
+    (L2::ActivationError, InitL2Error): NotEqual,
+{
+    let ticker = req.ticker.clone();
+    if let Ok(Some(_)) = lp_coinfind(&ctx, &ticker).await {
+        return MmError::err(InitL2Error::L2IsAlreadyActivated(ticker));
+    }
+
+    let (coin_conf_json, protocol_conf): (Json, L2::ProtocolInfo) = coin_conf_with_protocol(&ctx, &ticker)?;
+    let coin_conf = L2::coin_conf_from_json(coin_conf_json)?;
+
+    let platform_coin = lp_coinfind_or_err(&ctx, protocol_conf.platform_coin_ticker())
+        .await
+        .mm_err(|_| InitL2Error::PlatformCoinIsNotActivated(ticker.clone()))?;
+
+    let platform_coin =
+        L2::PlatformCoin::try_from_mm_coin(platform_coin).or_mm_err(|| InitL2Error::UnsupportedPlatformCoin {
+            platform_coin_ticker: protocol_conf.platform_coin_ticker().into(),
+            l2_ticker: ticker.clone(),
+        })?;
+
+    L2::validate_platform_configuration(&platform_coin)?;
+
+    let validated_params = L2::validate_activation_params(req.activation_params.clone())?;
+
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitL2Error::Internal)?;
+    let spawner = ctx.spawner();
+    let task = InitL2Task::<L2> {
+        ctx,
+        ticker,
+        platform_coin,
+        validated_params,
+        protocol_conf,
+        coin_conf,
+    };
+    let task_manager = L2::rpc_task_manager(&coins_act_ctx);
+
+    let task_id = RpcTaskManager::spawn_rpc_task(task_manager, &spawner, task)
+        .mm_err(|e| InitL2Error::Internal(e.to_string()))?;
+
+    Ok(InitL2Response { task_id })
+}
+
+pub async fn init_l2_status<L2: InitL2ActivationOps>(
+    ctx: MmArc,
+    req: InitL2StatusRequest,
+) -> MmResult<
+    RpcTaskStatus<L2::ActivationResult, InitL2Error, L2::InProgressStatus, L2::AwaitingStatus>,
+    InitL2StatusError,
+>
+where
+    InitL2Error: From<L2::ActivationError>,
+{
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitL2StatusError::Internal)?;
+    let mut task_manager = L2::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| InitL2StatusError::Internal(poison.to_string()))?;
+    task_manager
+        .task_status(req.task_id, req.forget_if_finished)
+        .or_mm_err(|| InitL2StatusError::NoSuchTask(req.task_id))
+        .map(|rpc_task| rpc_task.map_err(InitL2Error::from))
+}
+
+pub async fn init_l2_user_action<L2: InitL2ActivationOps>(
+    ctx: MmArc,
+    req: InitL2UserActionRequest<L2::UserAction>,
+) -> MmResult<SuccessResponse, InitL2UserActionError> {
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(InitL2UserActionError::Internal)?;
+    let mut task_manager = L2::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| InitL2UserActionError::Internal(poison.to_string()))?;
+    task_manager.on_user_action(req.task_id, req.user_action)?;
+    Ok(SuccessResponse::new())
+}
+
+pub async fn cancel_init_l2<L2: InitL2ActivationOps>(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelInitL2Error> {
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(CancelInitL2Error::Internal)?;
+    let mut task_manager = L2::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| CancelInitL2Error::Internal(poison.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
+pub struct InitL2Task<L2: InitL2ActivationOps> {
+    ctx: MmArc,
+    ticker: String,
+    platform_coin: L2::PlatformCoin,
+    validated_params: L2::ValidatedParams,
+    protocol_conf: L2::ProtocolInfo,
+    coin_conf: L2::CoinConf,
+}
+
+impl<L2: InitL2ActivationOps> RpcTaskTypes for InitL2Task<L2> {
+    type Item = L2::ActivationResult;
+    type Error = L2::ActivationError;
+    type InProgressStatus = L2::InProgressStatus;
+    type AwaitingStatus = L2::AwaitingStatus;
+    type UserAction = L2::UserAction;
+}
+
+#[async_trait]
+impl<L2> RpcTask for InitL2Task<L2>
+where
+    L2: InitL2ActivationOps,
+{
+    fn initial_status(&self) -> Self::InProgressStatus {
+        <L2::InProgressStatus as InitL2InitialStatus>::initial_status()
+    }
+
+    /// Try to disable the coin in case if we managed to register it already.
+    async fn cancel(self) {
+        if let Ok(ctx) = CoinsContext::from_ctx(&self.ctx) {
+            if let Ok(Some(t)) = lp_coinfind(&self.ctx, &self.ticker).await {
+                ctx.remove_coin(t).await;
+            };
+        };
+    }
+
+    async fn run(&mut self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>> {
+        let (coin, result) = L2::init_l2(
+            &self.ctx,
+            self.platform_coin.clone(),
+            self.validated_params.clone(),
+            self.protocol_conf.clone(),
+            self.coin_conf.clone(),
+            task_handle,
+        )
+        .await?;
+
+        let c_ctx = CoinsContext::from_ctx(&self.ctx).map_to_mm(RegisterCoinError::Internal)?;
+        c_ctx.add_l2(coin.into()).await?;
+
+        Ok(result)
+    }
+}
+
+pub trait InitL2InitialStatus {
+    fn initial_status() -> Self;
+}
diff --git a/mm2src/coins_activation/src/l2/init_l2_error.rs b/mm2src/coins_activation/src/l2/init_l2_error.rs
new file mode 100644
index 0000000000..d23fd73078
--- /dev/null
+++ b/mm2src/coins_activation/src/l2/init_l2_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::{CancelRpcTaskError, RpcTaskStatusError, RpcTaskUserActionError};
+use rpc_task::RpcTaskError;
+use ser_error_derive::SerializeErrorType;
+use serde_derive::Serialize;
+use std::time::Duration;
+
+pub type InitL2StatusError = RpcTaskStatusError;
+pub type InitL2UserActionError = RpcTaskUserActionError;
+pub type CancelInitL2Error = CancelRpcTaskError;
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum InitL2Error {
+    #[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 = "Invalid config for platform coin: {}, error: {}", platform_coin_ticker, err)]
+    InvalidPlatformConfiguration {
+        platform_coin_ticker: String,
+        err: String,
+    },
+    #[display(fmt = "Layer 2 configuration parsing failed: {}", _0)]
+    L2ConfigParseError(String),
+    #[display(fmt = "Initialization task has timed out {:?}", duration)]
+    TaskTimedOut {
+        duration: Duration,
+    },
+    Transport(String),
+    Internal(String),
+}
+
+impl From<CoinConfWithProtocolError> for InitL2Error {
+    fn from(err: CoinConfWithProtocolError) -> Self {
+        match err {
+            CoinConfWithProtocolError::ConfigIsNotFound(ticker) => InitL2Error::L2ConfigIsNotFound(ticker),
+            CoinConfWithProtocolError::CoinProtocolParseError { ticker, err } => InitL2Error::L2ProtocolParseError {
+                ticker,
+                error: err.to_string(),
+            },
+            CoinConfWithProtocolError::UnexpectedProtocol { ticker, protocol } => {
+                InitL2Error::UnexpectedL2Protocol { ticker, protocol }
+            },
+        }
+    }
+}
+
+impl From<RpcTaskError> for InitL2Error {
+    fn from(rpc_err: RpcTaskError) -> Self {
+        match rpc_err {
+            RpcTaskError::Timeout(duration) => InitL2Error::TaskTimedOut { duration },
+            internal_error => InitL2Error::Internal(internal_error.to_string()),
+        }
+    }
+}
+
+impl HttpStatusCode for InitL2Error {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            InitL2Error::L2IsAlreadyActivated(_)
+            | InitL2Error::PlatformCoinIsNotActivated(_)
+            | InitL2Error::L2ConfigIsNotFound { .. }
+            | InitL2Error::UnexpectedL2Protocol { .. } => StatusCode::BAD_REQUEST,
+            InitL2Error::TaskTimedOut { .. } => StatusCode::REQUEST_TIMEOUT,
+            InitL2Error::L2ProtocolParseError { .. }
+            | InitL2Error::UnsupportedPlatformCoin { .. }
+            | InitL2Error::InvalidPlatformConfiguration { .. }
+            | InitL2Error::L2ConfigParseError(_)
+            | InitL2Error::Transport(_)
+            | InitL2Error::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
diff --git a/mm2src/coins_activation/src/l2/mod.rs b/mm2src/coins_activation/src/l2/mod.rs
new file mode 100644
index 0000000000..b5168fa87e
--- /dev/null
+++ b/mm2src/coins_activation/src/l2/mod.rs
@@ -0,0 +1,6 @@
+mod init_l2;
+mod init_l2_error;
+
+pub use init_l2::{cancel_init_l2, init_l2, init_l2_status, init_l2_user_action, InitL2ActivationOps,
+                  InitL2InitialStatus, InitL2Task, InitL2TaskHandle, InitL2TaskManagerShared, L2ProtocolParams};
+pub use init_l2_error::InitL2Error;
diff --git a/mm2src/coins_activation/src/lib.rs b/mm2src/coins_activation/src/lib.rs
index 923c835ba1..5f4245af6c 100644
--- a/mm2src/coins_activation/src/lib.rs
+++ b/mm2src/coins_activation/src/lib.rs
@@ -1,5 +1,7 @@
 mod bch_with_tokens_activation;
 mod context;
+mod erc20_token_activation;
+mod eth_with_token_activation;
 mod l2;
 #[cfg(not(target_arch = "wasm32"))] mod lightning_activation;
 mod platform_coin_with_tokens;
@@ -10,11 +12,14 @@ mod solana_with_tokens_activation;
 #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
 mod spl_token_activation;
 mod standalone_coin;
+mod tendermint_token_activation;
+mod tendermint_with_assets_activation;
 mod token;
 mod utxo_activation;
 #[cfg(not(target_arch = "wasm32"))] mod z_coin_activation;
 
-pub use l2::enable_l2;
+pub use l2::{cancel_init_l2, init_l2, init_l2_status, init_l2_user_action};
 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 standalone_coin::{cancel_init_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
index 5572755d09..b3da8c3f7b 100644
--- a/mm2src/coins_activation/src/lightning_activation.rs
+++ b/mm2src/coins_activation/src/lightning_activation.rs
@@ -1,22 +1,67 @@
-use crate::l2::{EnableL2Error, L2ActivationOps, L2ProtocolParams};
+use crate::context::CoinsActivationContext;
+use crate::l2::{InitL2ActivationOps, InitL2Error, InitL2InitialStatus, InitL2TaskHandle, InitL2TaskManagerShared,
+                L2ProtocolParams};
 use crate::prelude::*;
 use async_trait::async_trait;
+use coins::coin_errors::MyAddressError;
 use coins::lightning::ln_conf::{LightningCoinConf, LightningProtocolConf};
-use coins::lightning::ln_errors::EnableLightningError;
-use coins::lightning::{start_lightning, LightningCoin, LightningParams};
+use coins::lightning::ln_errors::{EnableLightningError, EnableLightningResult};
+use coins::lightning::ln_events::{init_abortable_events, LightningEventHandler};
+use coins::lightning::ln_p2p::{connect_to_ln_nodes_loop, init_peer_manager, ln_node_announcement_loop};
+use coins::lightning::ln_platform::Platform;
+use coins::lightning::ln_storage::LightningStorage;
+use coins::lightning::ln_utils::{get_open_channels_nodes_addresses, init_channel_manager, init_db, init_keys_manager,
+                                 init_persister, PAYMENT_RETRY_ATTEMPTS};
+use coins::lightning::{InvoicePayer, LightningCoin};
 use coins::utxo::utxo_standard::UtxoStandardCoin;
 use coins::utxo::UtxoCommonOps;
-use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum};
+use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum, RegisterCoinError};
+use common::executor::{SpawnFuture, Timer};
+use crypto::hw_rpc_task::{HwRpcTaskAwaitingStatus, HwRpcTaskUserAction};
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
+use lightning::chain::keysinterface::{KeysInterface, Recipient};
+use lightning::chain::Access;
+use lightning::routing::gossip;
+use lightning_background_processor::{BackgroundProcessor, GossipSync};
+use lightning_invoice::payment;
+use lightning_invoice::utils::DefaultRouter;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use parking_lot::Mutex as PaMutex;
 use ser_error_derive::SerializeErrorType;
 use serde_derive::{Deserialize, Serialize};
 use serde_json::{self as json, Value as Json};
+use std::sync::Arc;
 
 const DEFAULT_LISTENING_PORT: u16 = 9735;
 
+pub type LightningTaskManagerShared = InitL2TaskManagerShared<LightningCoin>;
+pub type LightningRpcTaskHandle = InitL2TaskHandle<LightningCoin>;
+pub type LightningAwaitingStatus = HwRpcTaskAwaitingStatus;
+pub type LightningUserAction = HwRpcTaskUserAction;
+
+#[derive(Clone, PartialEq, Serialize)]
+pub enum LightningInProgressStatus {
+    ActivatingCoin,
+    GettingFeesFromRPC,
+    ReadingNetworkGraphFromFile,
+    InitializingChannelManager,
+    InitializingPeerManager,
+    ReadingScorerFromFile,
+    InitializingBackgroundProcessor,
+    ReadingChannelsAddressesFromFile,
+    Finished,
+    /// 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 InitL2InitialStatus for LightningInProgressStatus {
+    fn initial_status() -> Self { LightningInProgressStatus::ActivatingCoin }
+}
+
 impl TryPlatformCoinFromMmCoinEnum for UtxoStandardCoin {
     fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
     where
@@ -38,11 +83,11 @@ impl TryFromCoinProtocol for LightningProtocolConf {
             CoinProtocol::LIGHTNING {
                 platform,
                 network,
-                confirmations,
+                confirmation_targets,
             } => Ok(LightningProtocolConf {
                 platform_coin_ticker: platform,
                 network,
-                confirmations,
+                confirmation_targets,
             }),
             proto => MmError::err(proto),
         }
@@ -67,7 +112,23 @@ pub struct LightningActivationParams {
     pub backup_path: Option<String>,
 }
 
-#[derive(Debug, Deserialize, Display, Serialize, SerializeErrorType)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LightningValidatedParams {
+    // 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>,
+}
+
+#[derive(Clone, Debug, Deserialize, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum LightningValidationErr {
     #[display(fmt = "Platform coin {} activated in {} mode", _0, _1)]
@@ -80,36 +141,59 @@ pub enum LightningValidationErr {
     InvalidAddress(String),
 }
 
-#[derive(Debug, Serialize)]
-pub struct LightningInitResult {
+#[derive(Clone, Debug, Serialize)]
+pub struct LightningActivationResult {
     platform_coin: String,
     address: String,
     balance: CoinBalance,
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
 pub enum LightningInitError {
+    CoinIsAlreadyActivated {
+        ticker: String,
+    },
     InvalidConfiguration(String),
+    #[display(fmt = "Error while validating {} configuration: {}", platform_coin_ticker, err)]
+    InvalidPlatformConfiguration {
+        platform_coin_ticker: String,
+        err: String,
+    },
     EnableLightningError(EnableLightningError),
     LightningValidationErr(LightningValidationErr),
     MyBalanceError(BalanceError),
     MyAddressError(String),
+    Internal(String),
+}
+
+impl From<MyAddressError> for LightningInitError {
+    fn from(err: MyAddressError) -> Self { Self::MyAddressError(err.to_string()) }
 }
 
-impl From<LightningInitError> for EnableL2Error {
+impl From<LightningInitError> for InitL2Error {
     fn from(err: LightningInitError) -> Self {
         match err {
-            LightningInitError::InvalidConfiguration(err) => EnableL2Error::L2ConfigParseError(err),
+            LightningInitError::CoinIsAlreadyActivated { ticker } => InitL2Error::L2IsAlreadyActivated(ticker),
+            LightningInitError::InvalidConfiguration(err) => InitL2Error::L2ConfigParseError(err),
+            LightningInitError::InvalidPlatformConfiguration {
+                platform_coin_ticker,
+                err,
+            } => InitL2Error::InvalidPlatformConfiguration {
+                platform_coin_ticker,
+                err,
+            },
             LightningInitError::EnableLightningError(enable_err) => match enable_err {
-                EnableLightningError::RpcError(rpc_err) => EnableL2Error::Transport(rpc_err),
-                enable_error => EnableL2Error::Internal(enable_error.to_string()),
+                EnableLightningError::RpcError(rpc_err) => InitL2Error::Transport(rpc_err),
+                enable_error => InitL2Error::Internal(enable_error.to_string()),
             },
-            LightningInitError::LightningValidationErr(req_err) => EnableL2Error::Internal(req_err.to_string()),
+            LightningInitError::LightningValidationErr(req_err) => InitL2Error::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()),
+                BalanceError::Transport(e) => InitL2Error::Transport(e),
+                balance_error => InitL2Error::Internal(balance_error.to_string()),
             },
-            LightningInitError::MyAddressError(e) => EnableL2Error::Internal(e),
+            LightningInitError::MyAddressError(e) => InitL2Error::Internal(e),
+            LightningInitError::Internal(e) => InitL2Error::Internal(e),
         }
     }
 }
@@ -122,15 +206,33 @@ impl From<LightningValidationErr> for LightningInitError {
     fn from(err: LightningValidationErr) -> Self { LightningInitError::LightningValidationErr(err) }
 }
 
+impl From<RegisterCoinError> for LightningInitError {
+    fn from(reg_err: RegisterCoinError) -> LightningInitError {
+        match reg_err {
+            RegisterCoinError::CoinIsInitializedAlready { coin } => {
+                LightningInitError::CoinIsAlreadyActivated { ticker: coin }
+            },
+            RegisterCoinError::Internal(internal) => LightningInitError::Internal(internal),
+        }
+    }
+}
+
 #[async_trait]
-impl L2ActivationOps for LightningCoin {
+impl InitL2ActivationOps for LightningCoin {
     type PlatformCoin = UtxoStandardCoin;
     type ActivationParams = LightningActivationParams;
     type ProtocolInfo = LightningProtocolConf;
-    type ValidatedParams = LightningParams;
+    type ValidatedParams = LightningValidatedParams;
     type CoinConf = LightningCoinConf;
-    type ActivationResult = LightningInitResult;
+    type ActivationResult = LightningActivationResult;
     type ActivationError = LightningInitError;
+    type InProgressStatus = LightningInProgressStatus;
+    type AwaitingStatus = LightningAwaitingStatus;
+    type UserAction = LightningUserAction;
+
+    fn rpc_task_manager(activation_ctx: &CoinsActivationContext) -> &LightningTaskManagerShared {
+        &activation_ctx.init_lightning_task_manager
+    }
 
     fn coin_conf_from_json(json: Json) -> Result<Self::CoinConf, MmError<Self::ActivationError>> {
         json::from_value::<LightningCoinConf>(json)
@@ -148,6 +250,12 @@ impl L2ActivationOps for LightningCoin {
                 LightningValidationErr::UnsupportedMode("Lightning network".into(), "segwit".into()).into(),
             );
         }
+        if platform_coin.as_ref().conf.avg_blocktime.is_none() {
+            return MmError::err(LightningInitError::InvalidPlatformConfiguration {
+                platform_coin_ticker: platform_coin.ticker().to_string(),
+                err: "'avg_blocktime' field is not found in platform coin config".into(),
+            });
+        }
         Ok(())
     }
 
@@ -172,7 +280,7 @@ impl L2ActivationOps for LightningCoin {
 
         let listening_port = activation_params.listening_port.unwrap_or(DEFAULT_LISTENING_PORT);
 
-        Ok(LightningParams {
+        Ok(LightningValidatedParams {
             listening_port,
             node_name,
             node_color,
@@ -181,24 +289,32 @@ impl L2ActivationOps for LightningCoin {
         })
     }
 
-    async fn enable_l2(
+    async fn init_l2(
         ctx: &MmArc,
         platform_coin: Self::PlatformCoin,
         validated_params: Self::ValidatedParams,
         protocol_conf: Self::ProtocolInfo,
         coin_conf: Self::CoinConf,
+        task_handle: &LightningRpcTaskHandle,
     ) -> 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 lightning_coin = start_lightning(
+            ctx,
+            platform_coin.clone(),
+            protocol_conf,
+            coin_conf,
+            validated_params,
+            task_handle,
+        )
+        .await?;
+        Timer::sleep(10.).await;
+
+        let address = lightning_coin.my_address()?;
         let balance = lightning_coin
             .my_balance()
             .compat()
             .await
             .mm_err(LightningInitError::MyBalanceError)?;
-        let init_result = LightningInitResult {
+        let init_result = LightningActivationResult {
             platform_coin: platform_coin.ticker().into(),
             address,
             balance,
@@ -206,3 +322,172 @@ impl L2ActivationOps for LightningCoin {
         Ok((lightning_coin, init_result))
     }
 }
+
+async fn start_lightning(
+    ctx: &MmArc,
+    platform_coin: UtxoStandardCoin,
+    protocol_conf: LightningProtocolConf,
+    conf: LightningCoinConf,
+    params: LightningValidatedParams,
+    task_handle: &LightningRpcTaskHandle,
+) -> EnableLightningResult<LightningCoin> {
+    // Todo: add support for Hardware wallets for funding transactions and spending spendable outputs (channel closing transactions)
+    if let coins::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.confirmation_targets,
+    )?);
+    task_handle.update_in_progress_status(LightningInProgressStatus::GettingFeesFromRPC)?;
+    platform.set_latest_fees().await?;
+
+    // Initialize the Logger
+    let logger = ctx.log.0.clone();
+
+    // Initialize Persister
+    let persister = init_persister(ctx, conf.ticker.clone(), params.backup_path).await?;
+
+    // Initialize the KeysManager
+    let keys_manager = init_keys_manager(&platform)?;
+
+    // Initialize the P2PGossipSync. This is used for providing routes to send payments over
+    task_handle.update_in_progress_status(LightningInProgressStatus::ReadingNetworkGraphFromFile)?;
+    let network_graph = Arc::new(
+        persister
+            .get_network_graph(protocol_conf.network.into(), logger.clone())
+            .await?,
+    );
+
+    let gossip_sync = Arc::new(gossip::P2PGossipSync::new(
+        network_graph.clone(),
+        None::<Arc<dyn Access + Send + Sync>>,
+        logger.clone(),
+    ));
+
+    // Initialize DB
+    let db = init_db(ctx, conf.ticker.clone()).await?;
+
+    // Initialize the ChannelManager
+    task_handle.update_in_progress_status(LightningInProgressStatus::InitializingChannelManager)?;
+    let (chain_monitor, channel_manager) = init_channel_manager(
+        platform.clone(),
+        logger.clone(),
+        persister.clone(),
+        db.clone(),
+        keys_manager.clone(),
+        conf.clone().into(),
+    )
+    .await?;
+
+    // Initialize the PeerManager
+    task_handle.update_in_progress_status(LightningInProgressStatus::InitializingPeerManager)?;
+    let peer_manager = init_peer_manager(
+        ctx.clone(),
+        &platform,
+        params.listening_port,
+        channel_manager.clone(),
+        gossip_sync.clone(),
+        keys_manager
+            .get_node_secret(Recipient::Node)
+            .map_to_mm(|_| EnableLightningError::UnsupportedMode("'start_lightning'".into(), "local node".into()))?,
+        logger.clone(),
+    )
+    .await?;
+
+    let trusted_nodes = Arc::new(PaMutex::new(persister.get_trusted_nodes().await?));
+
+    init_abortable_events(platform.clone(), db.clone()).await?;
+
+    // Initialize the event handler
+    let event_handler = Arc::new(LightningEventHandler::new(
+        platform.clone(),
+        channel_manager.clone(),
+        keys_manager.clone(),
+        db.clone(),
+        trusted_nodes.clone(),
+    ));
+
+    // Initialize routing Scorer
+    task_handle.update_in_progress_status(LightningInProgressStatus::ReadingScorerFromFile)?;
+    // status_notifier
+    //     .try_send(LightningInProgressStatus::ReadingScorerFromFile)
+    //     .debug_log_with_msg("No one seems interested in LightningInProgressStatus");
+    let scorer = Arc::new(persister.get_scorer(network_graph.clone(), logger.clone()).await?);
+
+    // Create InvoicePayer
+    // random_seed_bytes are additional random seed to improve privacy by adding a random CLTV expiry offset to each path's final hop.
+    // This helps obscure the intended recipient from adversarial intermediate hops. The seed is also used to randomize candidate paths during route selection.
+    // TODO: random_seed_bytes should be taken in consideration when implementing swaps because they change the payment lock-time.
+    // https://github.com/lightningdevkit/rust-lightning/issues/158
+    // https://github.com/lightningdevkit/rust-lightning/pull/1286
+    // https://github.com/lightningdevkit/rust-lightning/pull/1359
+    let router_random_seed_bytes = keys_manager.get_secure_random_bytes();
+    let router = DefaultRouter::new(network_graph.clone(), logger.clone(), router_random_seed_bytes);
+    let invoice_payer = Arc::new(InvoicePayer::new(
+        channel_manager.clone(),
+        router,
+        scorer.clone(),
+        logger.clone(),
+        event_handler,
+        // Todo: Add option for choosing payment::Retry::Timeout instead of Attempts in LightningParams
+        payment::Retry::Attempts(params.payment_retries.unwrap_or(PAYMENT_RETRY_ATTEMPTS)),
+    ));
+
+    // 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.
+    // note: background_processor stops automatically when dropped since BackgroundProcessor implements the Drop trait.
+    task_handle.update_in_progress_status(LightningInProgressStatus::InitializingBackgroundProcessor)?;
+    let background_processor = Arc::new(BackgroundProcessor::start(
+        persister.clone(),
+        invoice_payer.clone(),
+        chain_monitor.clone(),
+        channel_manager.clone(),
+        GossipSync::p2p(gossip_sync),
+        peer_manager.clone(),
+        logger.clone(),
+        Some(scorer.clone()),
+    ));
+
+    // If channel_nodes_data file exists, read channels nodes data from disk and reconnect to channel nodes/peers if possible.
+    task_handle.update_in_progress_status(LightningInProgressStatus::ReadingChannelsAddressesFromFile)?;
+    let open_channels_nodes = Arc::new(PaMutex::new(
+        get_open_channels_nodes_addresses(persister.clone(), channel_manager.clone()).await?,
+    ));
+
+    platform.spawner().spawn(connect_to_ln_nodes_loop(
+        open_channels_nodes.clone(),
+        peer_manager.clone(),
+    ));
+
+    // Broadcast Node Announcement
+    platform.spawner().spawn(ln_node_announcement_loop(
+        channel_manager.clone(),
+        params.node_name,
+        params.node_color,
+        params.listening_port,
+    ));
+
+    Ok(LightningCoin {
+        platform,
+        conf,
+        background_processor,
+        peer_manager,
+        channel_manager,
+        chain_monitor,
+        keys_manager,
+        invoice_payer,
+        persister,
+        db,
+        open_channels_nodes,
+        trusted_nodes,
+        router: Arc::new(DefaultRouter::new(network_graph, logger, router_random_seed_bytes)),
+        scorer,
+    })
+}
diff --git a/mm2src/coins_activation/src/platform_coin_with_tokens.rs b/mm2src/coins_activation/src/platform_coin_with_tokens.rs
index c27a440008..e6e3f1b9f3 100644
--- a/mm2src/coins_activation/src/platform_coin_with_tokens.rs
+++ b/mm2src/coins_activation/src/platform_coin_with_tokens.rs
@@ -2,18 +2,16 @@ 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 coins::{lp_coinfind, CoinProtocol, CoinsContext, MmCoinEnum, PrivKeyPolicyNotAllowed};
 use common::{log, HttpStatusCode, StatusCode};
+use crypto::CryptoCtxError;
 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> {
@@ -23,7 +21,7 @@ pub struct TokenActivationRequest<Req> {
 }
 
 pub trait TokenOf: Into<MmCoinEnum> {
-    type PlatformCoin: PlatformWithTokensActivationOps + RegisterTokenInfo<Self>;
+    type PlatformCoin: TryPlatformCoinFromMmCoinEnum + PlatformWithTokensActivationOps + RegisterTokenInfo<Self> + Clone;
 }
 
 pub struct TokenActivationParams<Req, Protocol> {
@@ -65,7 +63,8 @@ pub trait TokenAsMmCoinInitializer: Send + Sync {
 
 pub enum InitTokensAsMmCoinsError {
     TokenConfigIsNotFound(String),
-    InvalidPubkey(String),
+    CouldNotFetchBalance(String),
+    Internal(String),
     TokenProtocolParseError { ticker: String, error: String },
     UnexpectedTokenProtocol { ticker: String, protocol: CoinProtocol },
 }
@@ -87,14 +86,10 @@ impl From<CoinConfWithProtocolError> for InitTokensAsMmCoinsError {
     }
 }
 
-pub trait RegisterTokenInfo<T: TokenOf<PlatformCoin = Self>> {
+pub trait RegisterTokenInfo<T: TokenOf> {
     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
@@ -149,7 +144,6 @@ pub trait PlatformWithTokensActivationOps: Into<MmCoinEnum> {
         coin_conf: Json,
         activation_request: Self::ActivationRequest,
         protocol_conf: Self::PlatformProtocolInfo,
-        priv_key: &[u8],
     ) -> Result<Self, MmError<Self::ActivationError>>;
 
     fn token_initializers(
@@ -160,10 +154,10 @@ pub trait PlatformWithTokensActivationOps: Into<MmCoinEnum> {
 
     fn start_history_background_fetching(
         &self,
-        metrics: MetricsArc,
+        ctx: MmArc,
         storage: impl TxHistoryStorage,
         initial_balance: BigDecimal,
-    ) -> AbortHandle;
+    );
 }
 
 #[derive(Debug, Deserialize)]
@@ -207,10 +201,12 @@ pub enum EnablePlatformCoinWithTokensError {
         error: String,
     },
     #[display(fmt = "Private key is not allowed: {}", _0)]
-    PrivKeyNotAllowed(String),
+    PrivKeyPolicyNotAllowed(PrivKeyPolicyNotAllowed),
     #[display(fmt = "Unexpected derivation method: {}", _0)]
     UnexpectedDerivationMethod(String),
     Transport(String),
+    AtLeastOneNodeRequired(String),
+    InvalidPayload(String),
     Internal(String),
 }
 
@@ -245,7 +241,8 @@ impl From<InitTokensAsMmCoinsError> for EnablePlatformCoinWithTokensError {
             InitTokensAsMmCoinsError::UnexpectedTokenProtocol { ticker, protocol } => {
                 EnablePlatformCoinWithTokensError::UnexpectedTokenProtocol { ticker, protocol }
             },
-            InitTokensAsMmCoinsError::InvalidPubkey(e) => EnablePlatformCoinWithTokensError::Internal(e),
+            InitTokensAsMmCoinsError::Internal(e) => EnablePlatformCoinWithTokensError::Internal(e),
+            InitTokensAsMmCoinsError::CouldNotFetchBalance(e) => EnablePlatformCoinWithTokensError::Transport(e),
         }
     }
 }
@@ -258,13 +255,17 @@ impl From<CreateTxHistoryStorageError> for EnablePlatformCoinWithTokensError {
     }
 }
 
+impl From<CryptoCtxError> for EnablePlatformCoinWithTokensError {
+    fn from(e: CryptoCtxError) -> Self { EnablePlatformCoinWithTokensError::Internal(e.to_string()) }
+}
+
 impl HttpStatusCode for EnablePlatformCoinWithTokensError {
     fn status_code(&self) -> StatusCode {
         match self {
             EnablePlatformCoinWithTokensError::CoinProtocolParseError { .. }
             | EnablePlatformCoinWithTokensError::TokenProtocolParseError { .. }
             | EnablePlatformCoinWithTokensError::PlatformCoinCreationError { .. }
-            | EnablePlatformCoinWithTokensError::PrivKeyNotAllowed(_)
+            | EnablePlatformCoinWithTokensError::PrivKeyPolicyNotAllowed(_)
             | EnablePlatformCoinWithTokensError::UnexpectedDerivationMethod(_)
             | EnablePlatformCoinWithTokensError::Transport(_)
             | EnablePlatformCoinWithTokensError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
@@ -272,6 +273,8 @@ impl HttpStatusCode for EnablePlatformCoinWithTokensError {
             | EnablePlatformCoinWithTokensError::PlatformConfigIsNotFound(_)
             | EnablePlatformCoinWithTokensError::TokenConfigIsNotFound(_)
             | EnablePlatformCoinWithTokensError::UnexpectedPlatformProtocol { .. }
+            | EnablePlatformCoinWithTokensError::InvalidPayload { .. }
+            | EnablePlatformCoinWithTokensError::AtLeastOneNodeRequired(_)
             | EnablePlatformCoinWithTokensError::UnexpectedTokenProtocol { .. } => StatusCode::BAD_REQUEST,
         }
     }
@@ -294,15 +297,12 @@ where
 
     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();
@@ -315,12 +315,11 @@ where
     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(),
+        platform_coin.start_history_background_fetching(
+            ctx.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();
diff --git a/mm2src/coins_activation/src/prelude.rs b/mm2src/coins_activation/src/prelude.rs
index 63014af89e..55e1d03aba 100644
--- a/mm2src/coins_activation/src/prelude.rs
+++ b/mm2src/coins_activation/src/prelude.rs
@@ -4,6 +4,7 @@ use coins::z_coin::ZcoinActivationParams;
 use coins::{coin_conf, CoinBalance, CoinProtocol, MmCoinEnum};
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
 use serde_derive::Serialize;
 use serde_json::{self as json, Value as Json};
 use std::collections::HashMap;
@@ -25,6 +26,10 @@ impl TxHistory for ZcoinActivationParams {
     fn tx_history(&self) -> bool { false }
 }
 
+pub trait GetAddressesBalances {
+    fn get_addresses_balances(&self) -> HashMap<String, BigDecimal>;
+}
+
 #[derive(Clone, Debug, Serialize)]
 #[serde(tag = "type", content = "data")]
 pub enum DerivationMethod {
@@ -51,6 +56,7 @@ pub trait TryPlatformCoinFromMmCoinEnum {
 }
 
 pub trait TryFromCoinProtocol {
+    #[allow(clippy::result_large_err)]
     fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
     where
         Self: Sized;
@@ -63,6 +69,7 @@ pub enum CoinConfWithProtocolError {
     UnexpectedProtocol { ticker: String, protocol: CoinProtocol },
 }
 
+#[allow(clippy::result_large_err)]
 pub fn coin_conf_with_protocol<T: TryFromCoinProtocol>(
     ctx: &MmArc,
     coin: &str,
diff --git a/mm2src/coins_activation/src/slp_token_activation.rs b/mm2src/coins_activation/src/slp_token_activation.rs
index 55c08c8ac0..85f017b0cc 100644
--- a/mm2src/coins_activation/src/slp_token_activation.rs
+++ b/mm2src/coins_activation/src/slp_token_activation.rs
@@ -2,8 +2,7 @@ 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::utxo::slp::{EnableSlpError, SlpProtocolConf, SlpToken};
 use coins::{CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, MmCoinEnum};
 use mm2_err_handle::prelude::*;
 use rpc::v1::types::H256 as H256Json;
@@ -53,11 +52,13 @@ impl TokenProtocolParams for SlpProtocolConf {
     fn platform_coin_ticker(&self) -> &str { &self.platform_coin_ticker }
 }
 
-impl From<SlpInitError> for EnableTokenError {
-    fn from(err: SlpInitError) -> Self {
+impl From<EnableSlpError> for EnableTokenError {
+    fn from(err: EnableSlpError) -> Self {
         match err {
-            SlpInitError::GetBalanceError(rpc_err) => rpc_err.into(),
-            SlpInitError::MyAddressError(e) => EnableTokenError::Internal(e),
+            EnableSlpError::GetBalanceError(rpc_err) => rpc_err.into(),
+            EnableSlpError::UnexpectedDerivationMethod(e) | EnableSlpError::Internal(e) => {
+                EnableTokenError::Internal(e)
+            },
         }
     }
 }
@@ -70,20 +71,12 @@ pub struct SlpInitResult {
     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;
+    type ActivationError = EnableSlpError;
 
     async fn enable_token(
         ticker: String,
@@ -104,9 +97,9 @@ impl TokenActivationOps for SlpToken {
             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 balance = token.my_coin_balance().await.mm_err(EnableSlpError::GetBalanceError)?;
+        let my_address = token.my_address()?;
         let mut balances = HashMap::new();
         balances.insert(my_address, balance);
         let init_result = SlpInitResult {
diff --git a/mm2src/coins_activation/src/solana_with_tokens_activation.rs b/mm2src/coins_activation/src/solana_with_tokens_activation.rs
index 71fdcf4027..9bdc014691 100644
--- a/mm2src/coins_activation/src/solana_with_tokens_activation.rs
+++ b/mm2src/coins_activation/src/solana_with_tokens_activation.rs
@@ -6,13 +6,14 @@ use crate::prelude::*;
 use crate::prelude::{CoinAddressInfo, TokenBalances, TryFromCoinProtocol, TxHistory};
 use crate::spl_token_activation::SplActivationRequest;
 use async_trait::async_trait;
+use coins::coin_errors::MyAddressError;
 use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::solana::solana_coin_with_policy;
 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 coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, PrivKeyBuildPolicy, SolanaActivationParams,
+            SolanaCoin, SplToken};
 use common::Future01CompatExt;
-use futures::future::AbortHandle;
+use crypto::CryptoCtxError;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
 use mm2_number::BigDecimal;
@@ -28,12 +29,17 @@ impl TokenOf for SplToken {
     type PlatformCoin = SolanaCoin;
 }
 
+pub struct SplTokenInitializerErr {
+    ticker: String,
+    inner: SplTokenCreationError,
+}
+
 #[async_trait]
 impl TokenInitializer for SplTokenInitializer {
     type Token = SplToken;
     type TokenActivationRequest = SplActivationRequest;
     type TokenProtocol = SplProtocolConf;
-    type InitTokensError = SplTokenCreationError;
+    type InitTokensError = SplTokenInitializerErr;
 
     fn tokens_requests_from_platform_request(
         platform_params: &SolanaWithTokensActivationRequest,
@@ -48,12 +54,14 @@ impl TokenInitializer for SplTokenInitializer {
         let tokens = activation_params
             .into_iter()
             .map(|param| {
+                let ticker = param.ticker.clone();
                 SplToken::new(
                     param.protocol.decimals,
                     param.ticker,
                     param.protocol.token_contract_address,
                     self.platform_coin.clone(),
                 )
+                .mm_err(|inner| SplTokenInitializerErr { ticker, inner })
             })
             .collect::<Result<Vec<_>, _>>()?;
         Ok(tokens)
@@ -107,6 +115,10 @@ pub enum SolanaWithTokensActivationError {
     Internal(String),
 }
 
+impl From<MyAddressError> for SolanaWithTokensActivationError {
+    fn from(err: MyAddressError) -> Self { Self::UnableToRetrieveMyAddress(err.to_string()) }
+}
+
 impl From<SolanaWithTokensActivationError> for EnablePlatformCoinWithTokensError {
     fn from(e: SolanaWithTokensActivationError) -> Self {
         match e {
@@ -129,6 +141,10 @@ impl From<BalanceError> for SolanaWithTokensActivationError {
     fn from(e: BalanceError) -> Self { SolanaWithTokensActivationError::GetBalanceError(e) }
 }
 
+impl From<CryptoCtxError> for SolanaWithTokensActivationError {
+    fn from(e: CryptoCtxError) -> Self { SolanaWithTokensActivationError::Internal(e.to_string()) }
+}
+
 pub struct SolanaProtocolInfo {}
 
 impl TryFromCoinProtocol for SolanaProtocolInfo {
@@ -143,10 +159,14 @@ impl TryFromCoinProtocol for SolanaProtocolInfo {
     }
 }
 
-impl From<SplTokenCreationError> for InitTokensAsMmCoinsError {
-    fn from(error: SplTokenCreationError) -> Self {
-        match error {
-            SplTokenCreationError::InvalidPubkey(e) => InitTokensAsMmCoinsError::InvalidPubkey(e),
+impl From<SplTokenInitializerErr> for InitTokensAsMmCoinsError {
+    fn from(err: SplTokenInitializerErr) -> Self {
+        match err.inner {
+            SplTokenCreationError::InvalidPubkey(error) => InitTokensAsMmCoinsError::TokenProtocolParseError {
+                ticker: err.ticker,
+                error,
+            },
+            SplTokenCreationError::Internal(internal) => InitTokensAsMmCoinsError::Internal(internal),
         }
     }
 }
@@ -159,18 +179,22 @@ impl PlatformWithTokensActivationOps for SolanaCoin {
     type ActivationError = SolanaWithTokensActivationError;
 
     async fn enable_platform_coin(
-        _ctx: MmArc,
+        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)
+        let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(&ctx)?;
+        solana_coin_with_policy(
+            &ctx,
+            &ticker,
+            &platform_conf,
+            activation_request.platform_request,
+            priv_key_policy,
+        )
+        .await
+        .map_to_mm(|error| SolanaWithTokensActivationError::PlatformCoinCreationError { ticker, error })
     }
 
     fn token_initializers(
@@ -182,9 +206,7 @@ impl PlatformWithTokensActivationOps for SolanaCoin {
     }
 
     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 my_address = self.my_address()?;
         let current_block = self
             .current_block()
             .compat()
@@ -224,10 +246,9 @@ impl PlatformWithTokensActivationOps for SolanaCoin {
 
     fn start_history_background_fetching(
         &self,
-        _metrics: MetricsArc,
+        _ctx: MmArc,
         _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
index 4f690116b0..69782e11ac 100644
--- a/mm2src/coins_activation/src/spl_token_activation.rs
+++ b/mm2src/coins_activation/src/spl_token_activation.rs
@@ -1,6 +1,7 @@
 use crate::prelude::{TryFromCoinProtocol, TryPlatformCoinFromMmCoinEnum};
 use crate::token::{EnableTokenError, TokenActivationOps, TokenProtocolParams};
 use async_trait::async_trait;
+use coins::coin_errors::MyAddressError;
 use coins::solana::spl::{SplProtocolConf, SplTokenCreationError};
 use coins::{BalanceError, CoinBalance, CoinProtocol, MarketCoinOps, MmCoinEnum, SolanaCoin, SplToken};
 use common::Future01CompatExt;
@@ -62,6 +63,10 @@ pub enum SplInitError {
     MyAddressError(String),
 }
 
+impl From<MyAddressError> for SplInitError {
+    fn from(err: MyAddressError) -> Self { Self::MyAddressError(err.to_string()) }
+}
+
 impl From<SplTokenCreationError> for SplInitError {
     fn from(e: SplTokenCreationError) -> Self { SplInitError::TokenCreationFailed(e) }
 }
@@ -78,7 +83,6 @@ impl From<SplInitError> for EnableTokenError {
 
 #[async_trait]
 impl TokenActivationOps for SplToken {
-    type PlatformCoin = SolanaCoin;
     type ActivationParams = SplActivationRequest;
     type ProtocolInfo = SplProtocolConf;
     type ActivationResult = SplInitResult;
@@ -101,7 +105,7 @@ impl TokenActivationOps for SplToken {
             .compat()
             .await
             .map_err(|e| SplInitError::GetBalanceError(e.into_inner()))?;
-        let my_address = token.my_address().map_to_mm(SplInitError::MyAddressError)?;
+        let my_address = token.my_address()?;
         let mut balances = HashMap::new();
         balances.insert(my_address, balance);
         let init_result = SplInitResult {
diff --git a/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs
index e3d0b57d63..46b9638a4c 100644
--- a/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs
+++ b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs
@@ -1,17 +1,23 @@
 use crate::context::CoinsActivationContext;
 use crate::prelude::*;
-use crate::standalone_coin::init_standalone_coin_error::{InitStandaloneCoinError, InitStandaloneCoinStatusError,
+use crate::standalone_coin::init_standalone_coin_error::{CancelInitStandaloneCoinError, InitStandaloneCoinError,
+                                                         InitStandaloneCoinStatusError,
                                                          InitStandaloneCoinUserActionError};
 use async_trait::async_trait;
-use coins::{lp_coinfind, lp_register_coin, MmCoinEnum, RegisterCoinError, RegisterCoinParams};
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::tx_history_storage::{CreateTxHistoryStorageError, TxHistoryStorageBuilder};
+use coins::{lp_coinfind, lp_register_coin, CoinsContext, 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 mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
+use rpc_task::rpc_common::{CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusRequest, RpcTaskUserActionRequest};
 use rpc_task::{RpcTask, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
 use serde_derive::Deserialize;
 use serde_json::Value as Json;
+use std::collections::HashMap;
 
 pub type InitStandaloneCoinResponse = InitRpcTaskResponse;
 pub type InitStandaloneCoinStatusRequest = RpcTaskStatusRequest;
@@ -27,11 +33,12 @@ pub struct InitStandaloneCoinReq<T> {
 
 #[async_trait]
 pub trait InitStandaloneCoinActivationOps: Into<MmCoinEnum> + Send + Sync + 'static {
-    type ActivationRequest: TxHistory + Sync + Send;
-    type StandaloneProtocol: TryFromCoinProtocol + Send;
+    type ActivationRequest: TxHistory + Clone + Send + Sync;
+    type StandaloneProtocol: TryFromCoinProtocol + Clone + Send + Sync;
     // The following types are related to `RpcTask` management.
-    type ActivationResult: serde::Serialize + Clone + CurrentBlock + Send + Sync + 'static;
+    type ActivationResult: serde::Serialize + Clone + CurrentBlock + GetAddressesBalances + Send + Sync + 'static;
     type ActivationError: From<RegisterCoinError>
+        + From<CreateTxHistoryStorageError>
         + Into<InitStandaloneCoinError>
         + SerMmErrorType
         + NotEqual
@@ -61,6 +68,13 @@ pub trait InitStandaloneCoinActivationOps: Into<MmCoinEnum> + Send + Sync + 'sta
         task_handle: &InitStandaloneCoinTaskHandle<Self>,
         activation_request: &Self::ActivationRequest,
     ) -> Result<Self::ActivationResult, MmError<Self::ActivationError>>;
+
+    fn start_history_background_fetching(
+        &self,
+        metrics: MetricsArc,
+        storage: impl TxHistoryStorage,
+        current_balances: HashMap<String, BigDecimal>,
+    );
 }
 
 pub async fn init_standalone_coin<Standalone>(
@@ -80,6 +94,7 @@ where
     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 spawner = ctx.spawner();
     let task = InitStandaloneCoinTask::<Standalone> {
         ctx,
         request,
@@ -88,7 +103,7 @@ where
     };
     let task_manager = Standalone::rpc_task_manager(&coins_act_ctx);
 
-    let task_id = RpcTaskManager::spawn_rpc_task(task_manager, task)
+    let task_id = RpcTaskManager::spawn_rpc_task(task_manager, &spawner, task)
         .mm_err(|e| InitStandaloneCoinError::Internal(e.to_string()))?;
 
     Ok(InitStandaloneCoinResponse { task_id })
@@ -132,6 +147,18 @@ pub async fn init_standalone_coin_user_action<Standalone: InitStandaloneCoinActi
     Ok(SuccessResponse::new())
 }
 
+pub async fn cancel_init_standalone_coin<Standalone: InitStandaloneCoinActivationOps>(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelInitStandaloneCoinError> {
+    let coins_act_ctx = CoinsActivationContext::from_ctx(&ctx).map_to_mm(CancelInitStandaloneCoinError::Internal)?;
+    let mut task_manager = Standalone::rpc_task_manager(&coins_act_ctx)
+        .lock()
+        .map_to_mm(|poison| CancelInitStandaloneCoinError::Internal(poison.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
+
 pub struct InitStandaloneCoinTask<Standalone: InitStandaloneCoinActivationOps> {
     ctx: MmArc,
     request: InitStandaloneCoinReq<Standalone::ActivationRequest>,
@@ -156,14 +183,23 @@ where
         <Standalone::InProgressStatus as InitStandaloneCoinInitialStatus>::initial_status()
     }
 
-    async fn run(self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>> {
+    /// Try to disable the coin in case if we managed to register it already.
+    async fn cancel(self) {
+        if let Ok(c_ctx) = CoinsContext::from_ctx(&self.ctx) {
+            if let Ok(Some(coin)) = lp_coinfind(&self.ctx, &self.request.ticker).await {
+                c_ctx.remove_coin(coin).await;
+            };
+        };
+    }
+
+    async fn run(&mut 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.coin_conf.clone(),
             &self.request.activation_params,
-            self.protocol_info,
+            self.protocol_info.clone(),
             task_handle,
         )
         .await?;
@@ -174,8 +210,16 @@ where
         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?;
+        if tx_history {
+            let current_balances = result.get_addresses_balances();
+            coin.start_history_background_fetching(
+                self.ctx.metrics.clone(),
+                TxHistoryStorageBuilder::new(&self.ctx).build()?,
+                current_balances,
+            );
+        }
+
+        lp_register_coin(&self.ctx, coin.into(), RegisterCoinParams { ticker }).await?;
 
         Ok(result)
     }
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
index 0224603cb7..1f0b5db764 100644
--- a/mm2src/coins_activation/src/standalone_coin/init_standalone_coin_error.rs
+++ b/mm2src/coins_activation/src/standalone_coin/init_standalone_coin_error.rs
@@ -1,8 +1,9 @@
 use crate::prelude::CoinConfWithProtocolError;
 use coins::CoinProtocol;
 use common::{HttpStatusCode, StatusCode};
+use crypto::HwRpcError;
 use derive_more::Display;
-use rpc_task::rpc_common::{RpcTaskStatusError, RpcTaskUserActionError};
+use rpc_task::rpc_common::{CancelRpcTaskError, RpcTaskStatusError, RpcTaskUserActionError};
 use rpc_task::{RpcTaskError, TaskId};
 use ser_error_derive::SerializeErrorType;
 use serde_derive::Serialize;
@@ -10,40 +11,30 @@ use std::time::Duration;
 
 pub type InitStandaloneCoinStatusError = RpcTaskStatusError;
 pub type InitStandaloneCoinUserActionError = RpcTaskUserActionError;
+pub type CancelInitStandaloneCoinError = CancelRpcTaskError;
 
 #[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum InitStandaloneCoinError {
+    #[display(fmt = "No such task '{}'", _0)]
     NoSuchTask(TaskId),
     #[display(fmt = "Initialization task has timed out {:?}", duration)]
-    TaskTimedOut {
-        duration: Duration,
-    },
-    CoinIsAlreadyActivated {
-        ticker: String,
-    },
+    TaskTimedOut { duration: Duration },
+    #[display(fmt = "Coin {} is activated already", ticker)]
+    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,
-    },
+    CoinProtocolParseError { ticker: String, error: String },
     #[display(fmt = "Unexpected platform protocol {:?} for {}", protocol, ticker)]
-    UnexpectedCoinProtocol {
-        ticker: String,
-        protocol: CoinProtocol,
-    },
+    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),
+    CoinCreationError { ticker: String, error: String },
+    #[display(fmt = "{}", _0)]
+    HwError(HwRpcError),
+    #[display(fmt = "Transport error: {}", _0)]
     Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
 
@@ -82,10 +73,9 @@ impl HttpStatusCode for InitStandaloneCoinError {
             | InitStandaloneCoinError::CoinConfigIsNotFound { .. }
             | InitStandaloneCoinError::CoinProtocolParseError { .. }
             | InitStandaloneCoinError::UnexpectedCoinProtocol { .. }
-            | InitStandaloneCoinError::CoinCreationError { .. }
-            | InitStandaloneCoinError::PrivKeyNotAllowed(_)
-            | InitStandaloneCoinError::UnexpectedDerivationMethod(_) => StatusCode::BAD_REQUEST,
+            | InitStandaloneCoinError::CoinCreationError { .. } => StatusCode::BAD_REQUEST,
             InitStandaloneCoinError::TaskTimedOut { .. } => StatusCode::REQUEST_TIMEOUT,
+            InitStandaloneCoinError::HwError(_) => StatusCode::GONE,
             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
index 44f71c4ac7..6cd26b35bb 100644
--- a/mm2src/coins_activation/src/standalone_coin/mod.rs
+++ b/mm2src/coins_activation/src/standalone_coin/mod.rs
@@ -1,8 +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,
+pub use init_standalone_coin::{cancel_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/tendermint_token_activation.rs b/mm2src/coins_activation/src/tendermint_token_activation.rs
new file mode 100644
index 0000000000..58cc6b90c1
--- /dev/null
+++ b/mm2src/coins_activation/src/tendermint_token_activation.rs
@@ -0,0 +1,78 @@
+use crate::{prelude::TryPlatformCoinFromMmCoinEnum,
+            token::{EnableTokenError, TokenActivationOps, TokenProtocolParams}};
+use async_trait::async_trait;
+use coins::{tendermint::{TendermintCoin, TendermintToken, TendermintTokenActivationParams, TendermintTokenInitError,
+                         TendermintTokenProtocolInfo},
+            CoinBalance, MarketCoinOps, MmCoinEnum};
+use common::Future01CompatExt;
+use mm2_err_handle::prelude::{MapMmError, MmError};
+use serde::Serialize;
+use std::collections::HashMap;
+
+impl From<TendermintTokenInitError> for EnableTokenError {
+    fn from(err: TendermintTokenInitError) -> Self {
+        match err {
+            TendermintTokenInitError::InvalidDenom(e) => EnableTokenError::InvalidConfig(e),
+            TendermintTokenInitError::MyAddressError(e) | TendermintTokenInitError::Internal(e) => {
+                EnableTokenError::Internal(e)
+            },
+            TendermintTokenInitError::CouldNotFetchBalance(e) => EnableTokenError::CouldNotFetchBalance(e),
+        }
+    }
+}
+
+#[derive(Debug, Serialize)]
+pub struct TendermintTokenInitResult {
+    balances: HashMap<String, CoinBalance>,
+    platform_coin: String,
+}
+
+impl TryPlatformCoinFromMmCoinEnum for TendermintCoin {
+    fn try_from_mm_coin(coin: MmCoinEnum) -> Option<Self>
+    where
+        Self: Sized,
+    {
+        match coin {
+            MmCoinEnum::Tendermint(coin) => Some(coin),
+            _ => None,
+        }
+    }
+}
+
+impl TokenProtocolParams for TendermintTokenProtocolInfo {
+    fn platform_coin_ticker(&self) -> &str { &self.platform }
+}
+
+#[async_trait]
+impl TokenActivationOps for TendermintToken {
+    type ActivationParams = TendermintTokenActivationParams;
+    type ProtocolInfo = TendermintTokenProtocolInfo;
+    type ActivationResult = TendermintTokenInitResult;
+    type ActivationError = TendermintTokenInitError;
+
+    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 = TendermintToken::new(ticker, platform_coin, protocol_conf.decimals, protocol_conf.denom)?;
+
+        let balance = token
+            .my_balance()
+            .compat()
+            .await
+            .mm_err(|e| TendermintTokenInitError::CouldNotFetchBalance(e.to_string()))?;
+
+        let my_address = token.my_address()?;
+        let mut balances = HashMap::new();
+        balances.insert(my_address, balance);
+
+        let init_result = TendermintTokenInitResult {
+            balances,
+            platform_coin: token.platform_ticker().into(),
+        };
+
+        Ok((token, init_result))
+    }
+}
diff --git a/mm2src/coins_activation/src/tendermint_with_assets_activation.rs b/mm2src/coins_activation/src/tendermint_with_assets_activation.rs
new file mode 100644
index 0000000000..3c477cfdd3
--- /dev/null
+++ b/mm2src/coins_activation/src/tendermint_with_assets_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 async_trait::async_trait;
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::tendermint::tendermint_tx_history_v2::tendermint_history_loop;
+use coins::tendermint::{TendermintCoin, TendermintCommons, TendermintConf, TendermintInitError,
+                        TendermintInitErrorKind, TendermintProtocolInfo, TendermintToken,
+                        TendermintTokenActivationParams, TendermintTokenInitError, TendermintTokenProtocolInfo};
+use coins::{CoinBalance, CoinProtocol, MarketCoinOps, MmCoin, PrivKeyBuildPolicy};
+use common::executor::{AbortSettings, SpawnAbortable};
+use common::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashMap;
+
+impl TokenOf for TendermintToken {
+    type PlatformCoin = TendermintCoin;
+}
+
+impl RegisterTokenInfo<TendermintToken> for TendermintCoin {
+    fn register_token_info(&self, token: &TendermintToken) {
+        self.add_activated_token_info(token.ticker.clone(), token.decimals, token.denom.clone())
+    }
+}
+
+#[derive(Clone, Deserialize)]
+pub struct TendermintActivationParams {
+    rpc_urls: Vec<String>,
+    pub tokens_params: Vec<TokenActivationRequest<TendermintTokenActivationParams>>,
+    #[serde(default)]
+    tx_history: bool,
+}
+
+impl TxHistory for TendermintActivationParams {
+    fn tx_history(&self) -> bool { self.tx_history }
+}
+
+struct TendermintTokenInitializer {
+    platform_coin: TendermintCoin,
+}
+
+struct TendermintTokenInitializerErr {
+    ticker: String,
+    inner: TendermintTokenInitError,
+}
+
+#[async_trait]
+impl TokenInitializer for TendermintTokenInitializer {
+    type Token = TendermintToken;
+    type TokenActivationRequest = TendermintTokenActivationParams;
+    type TokenProtocol = TendermintTokenProtocolInfo;
+    type InitTokensError = TendermintTokenInitializerErr;
+
+    fn tokens_requests_from_platform_request(
+        platform_request: &TendermintActivationParams,
+    ) -> Vec<TokenActivationRequest<Self::TokenActivationRequest>> {
+        platform_request.tokens_params.clone()
+    }
+
+    async fn enable_tokens(
+        &self,
+        params: Vec<TokenActivationParams<Self::TokenActivationRequest, Self::TokenProtocol>>,
+    ) -> Result<Vec<Self::Token>, MmError<Self::InitTokensError>> {
+        params
+            .into_iter()
+            .map(|param| {
+                let ticker = param.ticker.clone();
+                TendermintToken::new(
+                    param.ticker,
+                    self.platform_coin.clone(),
+                    param.protocol.decimals,
+                    param.protocol.denom,
+                )
+                .mm_err(|inner| TendermintTokenInitializerErr { ticker, inner })
+            })
+            .collect()
+    }
+
+    fn platform_coin(&self) -> &<Self::Token as TokenOf>::PlatformCoin { &self.platform_coin }
+}
+
+impl TryFromCoinProtocol for TendermintProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>> {
+        match proto {
+            CoinProtocol::TENDERMINT(proto) => Ok(proto),
+            other => MmError::err(other),
+        }
+    }
+}
+
+impl TryFromCoinProtocol for TendermintTokenProtocolInfo {
+    fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>> {
+        match proto {
+            CoinProtocol::TENDERMINTTOKEN(proto) => Ok(proto),
+            other => MmError::err(other),
+        }
+    }
+}
+
+impl From<TendermintTokenInitializerErr> for InitTokensAsMmCoinsError {
+    fn from(err: TendermintTokenInitializerErr) -> Self {
+        match err.inner {
+            TendermintTokenInitError::InvalidDenom(error) => InitTokensAsMmCoinsError::TokenProtocolParseError {
+                ticker: err.ticker,
+                error,
+            },
+            TendermintTokenInitError::MyAddressError(error) | TendermintTokenInitError::Internal(error) => {
+                InitTokensAsMmCoinsError::Internal(error)
+            },
+            TendermintTokenInitError::CouldNotFetchBalance(error) => {
+                InitTokensAsMmCoinsError::CouldNotFetchBalance(error)
+            },
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct TendermintActivationResult {
+    ticker: String,
+    address: String,
+    current_block: u64,
+    balance: CoinBalance,
+    tokens_balances: HashMap<String, CoinBalance>,
+}
+
+impl CurrentBlock for TendermintActivationResult {
+    fn current_block(&self) -> u64 { self.current_block }
+}
+
+impl GetPlatformBalance for TendermintActivationResult {
+    fn get_platform_balance(&self) -> BigDecimal { self.balance.spendable.clone() }
+}
+
+impl From<TendermintInitError> for EnablePlatformCoinWithTokensError {
+    fn from(err: TendermintInitError) -> Self {
+        EnablePlatformCoinWithTokensError::PlatformCoinCreationError {
+            ticker: err.ticker,
+            error: err.kind.to_string(),
+        }
+    }
+}
+
+#[async_trait]
+impl PlatformWithTokensActivationOps for TendermintCoin {
+    type ActivationRequest = TendermintActivationParams;
+    type PlatformProtocolInfo = TendermintProtocolInfo;
+    type ActivationResult = TendermintActivationResult;
+    type ActivationError = TendermintInitError;
+
+    async fn enable_platform_coin(
+        ctx: MmArc,
+        ticker: String,
+        coin_conf: Json,
+        activation_request: Self::ActivationRequest,
+        protocol_conf: Self::PlatformProtocolInfo,
+    ) -> Result<Self, MmError<Self::ActivationError>> {
+        let conf = TendermintConf::try_from_json(&ticker, &coin_conf)?;
+
+        let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(&ctx).mm_err(|e| TendermintInitError {
+            ticker: ticker.clone(),
+            kind: TendermintInitErrorKind::Internal(e.to_string()),
+        })?;
+
+        TendermintCoin::init(
+            &ctx,
+            ticker,
+            conf,
+            protocol_conf,
+            activation_request.rpc_urls,
+            activation_request.tx_history,
+            priv_key_policy,
+        )
+        .await
+    }
+
+    fn token_initializers(
+        &self,
+    ) -> Vec<Box<dyn TokenAsMmCoinInitializer<PlatformCoin = Self, ActivationRequest = Self::ActivationRequest>>> {
+        vec![Box::new(TendermintTokenInitializer {
+            platform_coin: self.clone(),
+        })]
+    }
+
+    async fn get_activation_result(&self) -> Result<Self::ActivationResult, MmError<Self::ActivationError>> {
+        let current_block = self.current_block().compat().await.map_to_mm(|e| TendermintInitError {
+            ticker: self.ticker().to_owned(),
+            kind: TendermintInitErrorKind::RpcError(e),
+        })?;
+
+        let balances = self.all_balances().await.mm_err(|e| TendermintInitError {
+            ticker: self.ticker().to_owned(),
+            kind: TendermintInitErrorKind::RpcError(e.to_string()),
+        })?;
+
+        Ok(TendermintActivationResult {
+            address: self.account_id.to_string(),
+            current_block,
+            balance: CoinBalance {
+                spendable: balances.platform_balance,
+                unspendable: BigDecimal::default(),
+            },
+            tokens_balances: balances
+                .tokens_balances
+                .into_iter()
+                .map(|(ticker, balance)| {
+                    (ticker, CoinBalance {
+                        spendable: balance,
+                        unspendable: BigDecimal::default(),
+                    })
+                })
+                .collect(),
+            ticker: self.ticker().to_owned(),
+        })
+    }
+
+    fn start_history_background_fetching(
+        &self,
+        ctx: MmArc,
+        storage: impl TxHistoryStorage,
+        initial_balance: BigDecimal,
+    ) {
+        let fut = tendermint_history_loop(self.clone(), storage, ctx, initial_balance);
+
+        let settings = AbortSettings::info_on_abort(format!("tendermint_history_loop stopped for {}", self.ticker()));
+        self.spawner().spawn_with_settings(fut, settings);
+    }
+}
diff --git a/mm2src/coins_activation/src/token.rs b/mm2src/coins_activation/src/token.rs
index 544c1e0b9b..70751b59cc 100644
--- a/mm2src/coins_activation/src/token.rs
+++ b/mm2src/coins_activation/src/token.rs
@@ -1,9 +1,10 @@
-/// Contains token activation traits and their implementations for various coins
-///
+// Contains token activation traits and their implementations for various coins
+
+use crate::platform_coin_with_tokens::{self, RegisterTokenInfo};
 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,
+use coins::{lp_coinfind, lp_coinfind_or_err, BalanceError, CoinProtocol, CoinsContext, MmCoinEnum, RegisterCoinError,
             UnexpectedDerivationMethod};
 use common::{HttpStatusCode, StatusCode};
 use derive_more::Display;
@@ -17,8 +18,7 @@ pub trait TokenProtocolParams {
 }
 
 #[async_trait]
-pub trait TokenActivationOps: Into<MmCoinEnum> {
-    type PlatformCoin: TryPlatformCoinFromMmCoinEnum;
+pub trait TokenActivationOps: Into<MmCoinEnum> + platform_coin_with_tokens::TokenOf {
     type ActivationParams;
     type ProtocolInfo: TokenProtocolParams + TryFromCoinProtocol;
     type ActivationResult;
@@ -58,10 +58,21 @@ pub enum EnableTokenError {
     },
     #[display(fmt = "{}", _0)]
     UnexpectedDerivationMethod(UnexpectedDerivationMethod),
+    CouldNotFetchBalance(String),
+    InvalidConfig(String),
     Transport(String),
     Internal(String),
 }
 
+impl From<RegisterCoinError> for EnableTokenError {
+    fn from(err: RegisterCoinError) -> Self {
+        match err {
+            RegisterCoinError::CoinIsInitializedAlready { coin } => Self::TokenIsAlreadyActivated(coin),
+            RegisterCoinError::Internal(err) => Self::Internal(err),
+        }
+    }
+}
+
 impl From<CoinConfWithProtocolError> for EnableTokenError {
     fn from(err: CoinConfWithProtocolError) -> Self {
         match err {
@@ -100,7 +111,7 @@ pub async fn enable_token<Token>(
     req: EnableTokenRequest<Token::ActivationParams>,
 ) -> Result<Token::ActivationResult, MmError<EnableTokenError>>
 where
-    Token: TokenActivationOps,
+    Token: TokenActivationOps + Clone,
     EnableTokenError: From<Token::ActivationError>,
     (Token::ActivationError, EnableTokenError): NotEqual,
 {
@@ -122,13 +133,12 @@ where
     })?;
 
     let (token, activation_result) =
-        Token::enable_token(req.ticker, platform_coin, req.activation_params, token_protocol).await?;
+        Token::enable_token(req.ticker, platform_coin.clone(), 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))?;
+    coins_ctx.add_token(token.clone().into()).await?;
+
+    platform_coin.register_token_info(&token);
 
     Ok(activation_result)
 }
@@ -156,6 +166,8 @@ impl HttpStatusCode for EnableTokenError {
             | EnableTokenError::UnsupportedPlatformCoin { .. }
             | EnableTokenError::UnexpectedDerivationMethod(_)
             | EnableTokenError::Transport(_)
+            | EnableTokenError::CouldNotFetchBalance(_)
+            | EnableTokenError::InvalidConfig(_)
             | 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
index 7e216104fd..f33dbd41c5 100644
--- a/mm2src/coins_activation/src/utxo_activation/common_impl.rs
+++ b/mm2src/coins_activation/src/utxo_activation/common_impl.rs
@@ -5,15 +5,21 @@ use crate::utxo_activation::init_utxo_standard_statuses::{UtxoStandardAwaitingSt
 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 coins::my_tx_history_v2::TxHistoryStorage;
+use coins::utxo::utxo_tx_history_v2::{utxo_history_loop, UtxoTxHistoryOps};
+use coins::utxo::{UtxoActivationParams, UtxoCoinFields};
+use coins::{CoinFutSpawner, MarketCoinOps, PrivKeyActivationPolicy, PrivKeyBuildPolicy};
+use common::executor::{AbortSettings, SpawnAbortable};
 use crypto::hw_rpc_task::HwConnectStatuses;
-use crypto::CryptoCtx;
+use crypto::CryptoCtxError;
 use futures::compat::Future01CompatExt;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
+use std::collections::HashMap;
 
-pub async fn get_activation_result<Coin>(
+pub(crate) async fn get_activation_result<Coin>(
     ctx: &MmArc,
     coin: &Coin,
     task_handle: &InitStandaloneCoinTaskHandle<Coin>,
@@ -28,14 +34,12 @@ where
         > + EnableCoinBalanceOps
         + MarketCoinOps,
 {
-    let current_block =
-        coin.current_block()
-            .compat()
-            .await
-            .map_to_mm(|error| InitUtxoStandardError::CoinCreationError {
-                ticker: coin.ticker().to_owned(),
-                error,
-            })?;
+    let ticker = coin.ticker().to_owned();
+    let current_block = coin
+        .current_block()
+        .compat()
+        .await
+        .map_to_mm(InitUtxoStandardError::Transport)?;
 
     // Construct an Xpub extractor without checking if the MarketMaker supports HD wallet ops.
     // [`EnableCoinBalanceOps::enable_coin_balance`] won't just use `xpub_extractor`
@@ -43,35 +47,55 @@ where
     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)
+        .enable_coin_balance(&xpub_extractor, activation_params.enable_params.clone())
         .await
-        .mm_err(|error| InitUtxoStandardError::CoinCreationError {
-            ticker: coin.ticker().to_owned(),
-            error: error.to_string(),
-        })?;
+        .mm_err(|enable_err| InitUtxoStandardError::from_enable_coin_balance_err(enable_err, ticker.clone()))?;
     task_handle.update_in_progress_status(UtxoStandardInProgressStatus::ActivatingCoin)?;
 
     let result = UtxoStandardActivationResult {
+        ticker,
         current_block,
         wallet_balance,
     };
     Ok(result)
 }
 
-pub fn xpub_extractor_rpc_statuses() -> HwConnectStatuses<UtxoStandardInProgressStatus, UtxoStandardAwaitingStatus> {
+pub(crate) 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_button_request: UtxoStandardInProgressStatus::FollowHwDeviceInstructions,
+        on_pin_request: UtxoStandardAwaitingStatus::EnterTrezorPin,
+        on_passphrase_request: UtxoStandardAwaitingStatus::EnterTrezorPassphrase,
         on_ready: UtxoStandardInProgressStatus::ActivatingCoin,
     }
 }
 
-pub fn priv_key_build_policy(crypto_ctx: &CryptoCtx, activation_policy: PrivKeyActivationPolicy) -> PrivKeyBuildPolicy {
+pub(crate) fn priv_key_build_policy(
+    ctx: &MmArc,
+    activation_policy: PrivKeyActivationPolicy,
+) -> MmResult<PrivKeyBuildPolicy, CryptoCtxError> {
     match activation_policy {
-        PrivKeyActivationPolicy::IguanaPrivKey => PrivKeyBuildPolicy::iguana_priv_key(crypto_ctx),
-        PrivKeyActivationPolicy::Trezor => PrivKeyBuildPolicy::Trezor,
+        PrivKeyActivationPolicy::ContextPrivKey => PrivKeyBuildPolicy::detect_priv_key_policy(ctx),
+        PrivKeyActivationPolicy::Trezor => Ok(PrivKeyBuildPolicy::Trezor),
     }
 }
+
+pub(crate) fn start_history_background_fetching<Coin>(
+    coin: Coin,
+    metrics: MetricsArc,
+    storage: impl TxHistoryStorage,
+    current_balances: HashMap<String, BigDecimal>,
+) where
+    Coin: AsRef<UtxoCoinFields> + UtxoTxHistoryOps,
+{
+    let spawner = CoinFutSpawner::new(&coin.as_ref().abortable_system);
+
+    let msg = format!("'utxo_history_loop' has been aborted for {}", coin.ticker());
+    let fut = utxo_history_loop(coin, storage, metrics, current_balances);
+
+    let settings = AbortSettings::info_on_abort(msg);
+    spawner.spawn_with_settings(fut, settings);
+}
diff --git a/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs b/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs
index 116f8cf4f5..74e7d12a77 100644
--- a/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs
+++ b/mm2src/coins_activation/src/utxo_activation/init_qtum_activation.rs
@@ -2,24 +2,29 @@ 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::common_impl::{get_activation_result, priv_key_build_policy,
+                                          start_history_background_fetching};
 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::my_tx_history_v2::TxHistoryStorage;
 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 mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
 use serde_json::Value as Json;
+use std::collections::HashMap;
 
 pub type QtumTaskManagerShared = InitStandaloneCoinTaskManagerShared<QtumCoin>;
 pub type QtumRpcTaskHandle = InitStandaloneCoinTaskHandle<QtumCoin>;
 
+#[derive(Clone)]
 pub struct QtumProtocolInfo;
 
 impl TryFromCoinProtocol for QtumProtocolInfo {
@@ -56,8 +61,7 @@ impl InitStandaloneCoinActivationOps for QtumCoin {
         _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 priv_key_policy = priv_key_build_policy(&ctx, activation_request.priv_key_policy)?;
 
         let coin = QtumCoinBuilder::new(&ctx, &ticker, &coin_conf, activation_request, priv_key_policy)
             .build()
@@ -74,4 +78,13 @@ impl InitStandaloneCoinActivationOps for QtumCoin {
     ) -> MmResult<Self::ActivationResult, InitUtxoStandardError> {
         get_activation_result(&ctx, self, task_handle, activation_request).await
     }
+
+    fn start_history_background_fetching(
+        &self,
+        metrics: MetricsArc,
+        storage: impl TxHistoryStorage,
+        current_balances: HashMap<String, BigDecimal>,
+    ) {
+        start_history_background_fetching(self.clone(), metrics, storage, current_balances)
+    }
 }
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
index 26cbd372c2..342d070469 100644
--- a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs
+++ b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs
@@ -2,24 +2,30 @@ 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::common_impl::{get_activation_result, priv_key_build_policy,
+                                          start_history_background_fetching};
 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::my_tx_history_v2::TxHistoryStorage;
 use coins::utxo::utxo_builder::{UtxoArcBuilder, UtxoCoinBuilder};
 use coins::utxo::utxo_standard::UtxoStandardCoin;
-use coins::utxo::UtxoActivationParams;
+use coins::utxo::{UtxoActivationParams, UtxoSyncStatus};
 use coins::CoinProtocol;
-use crypto::CryptoCtx;
+use futures::StreamExt;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
 use serde_json::Value as Json;
+use std::collections::HashMap;
 
 pub type UtxoStandardTaskManagerShared = InitStandaloneCoinTaskManagerShared<UtxoStandardCoin>;
 pub type UtxoStandardRpcTaskHandle = InitStandaloneCoinTaskHandle<UtxoStandardCoin>;
 
+#[derive(Clone)]
 pub struct UtxoStandardProtocolInfo;
 
 impl TryFromCoinProtocol for UtxoStandardProtocolInfo {
@@ -54,10 +60,9 @@ impl InitStandaloneCoinActivationOps for UtxoStandardCoin {
         coin_conf: Json,
         activation_request: &Self::ActivationRequest,
         _protocol_info: Self::StandaloneProtocol,
-        _task_handle: &UtxoStandardRpcTaskHandle,
+        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 priv_key_policy = priv_key_build_policy(&ctx, activation_request.priv_key_policy)?;
 
         let coin = UtxoArcBuilder::new(
             &ctx,
@@ -70,6 +75,39 @@ impl InitStandaloneCoinActivationOps for UtxoStandardCoin {
         .build()
         .await
         .mm_err(|e| InitUtxoStandardError::from_build_err(e, ticker.clone()))?;
+
+        if let Some(sync_watcher_mutex) = &coin.as_ref().block_headers_status_watcher {
+            let mut sync_watcher = sync_watcher_mutex.lock().await;
+            loop {
+                let in_progress_status =
+                    match sync_watcher
+                        .next()
+                        .await
+                        .ok_or(InitUtxoStandardError::CoinCreationError {
+                            ticker: ticker.clone(),
+                            error: "Error waiting for block headers synchronization status!".into(),
+                        })? {
+                        UtxoSyncStatus::SyncingBlockHeaders {
+                            current_scanned_block,
+                            last_block,
+                        } => UtxoStandardInProgressStatus::SyncingBlockHeaders {
+                            current_scanned_block,
+                            last_block,
+                        },
+                        UtxoSyncStatus::TemporaryError(e) => UtxoStandardInProgressStatus::TemporaryError(e),
+                        UtxoSyncStatus::PermanentError(e) => {
+                            return Err(InitUtxoStandardError::CoinCreationError {
+                                ticker: ticker.clone(),
+                                error: e,
+                            }
+                            .into())
+                        },
+                        UtxoSyncStatus::Finished { .. } => break,
+                    };
+                task_handle.update_in_progress_status(in_progress_status)?;
+            }
+        }
+
         Ok(coin)
     }
 
@@ -81,4 +119,13 @@ impl InitStandaloneCoinActivationOps for UtxoStandardCoin {
     ) -> MmResult<Self::ActivationResult, InitUtxoStandardError> {
         get_activation_result(&ctx, self, task_handle, activation_request).await
     }
+
+    fn start_history_background_fetching(
+        &self,
+        metrics: MetricsArc,
+        storage: impl TxHistoryStorage,
+        current_balances: HashMap<String, BigDecimal>,
+    ) {
+        start_history_background_fetching(self.clone(), metrics, storage, current_balances)
+    }
 }
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
index 6e8fac4834..d6a3497640 100644
--- 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
@@ -1,7 +1,10 @@
 use crate::standalone_coin::InitStandaloneCoinError;
+use coins::coin_balance::EnableCoinBalanceError;
+use coins::hd_wallet::{NewAccountCreatingError, NewAddressDerivingError};
+use coins::tx_history_storage::CreateTxHistoryStorageError;
 use coins::utxo::utxo_builder::UtxoCoinBuildError;
-use coins::RegisterCoinError;
-use crypto::CryptoInitError;
+use coins::{BalanceError, RegisterCoinError};
+use crypto::{CryptoCtxError, HwError, HwRpcError};
 use derive_more::Display;
 use rpc_task::RpcTaskError;
 use ser_error_derive::SerializeErrorType;
@@ -11,18 +14,17 @@ use std::time::Duration;
 #[derive(Clone, Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum InitUtxoStandardError {
+    #[display(fmt = "{}", _0)]
+    HwError(HwRpcError),
     #[display(fmt = "Initialization task has timed out {:?}", duration)]
-    TaskTimedOut {
-        duration: Duration,
-    },
-    CoinIsAlreadyActivated {
-        ticker: String,
-    },
+    TaskTimedOut { duration: Duration },
+    #[display(fmt = "Coin {} is activated already", ticker)]
+    CoinIsAlreadyActivated { ticker: String },
     #[display(fmt = "Error on platform coin {} creation: {}", ticker, error)]
-    CoinCreationError {
-        ticker: String,
-        error: String,
-    },
+    CoinCreationError { ticker: String, error: String },
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
 
@@ -35,14 +37,23 @@ impl From<RpcTaskError> for InitUtxoStandardError {
     }
 }
 
-impl From<CryptoInitError> for InitUtxoStandardError {
+impl From<CryptoCtxError> for InitUtxoStandardError {
     /// `CryptoCtx` is expected to be initialized already.
-    fn from(crypto_err: CryptoInitError) -> Self { InitUtxoStandardError::Internal(crypto_err.to_string()) }
+    fn from(crypto_err: CryptoCtxError) -> Self { InitUtxoStandardError::Internal(crypto_err.to_string()) }
+}
+
+impl From<CreateTxHistoryStorageError> for InitUtxoStandardError {
+    fn from(e: CreateTxHistoryStorageError) -> Self {
+        match e {
+            CreateTxHistoryStorageError::Internal(internal) => InitUtxoStandardError::Internal(internal),
+        }
+    }
 }
 
 impl From<InitUtxoStandardError> for InitStandaloneCoinError {
     fn from(e: InitUtxoStandardError) -> Self {
         match e {
+            InitUtxoStandardError::HwError(hw) => InitStandaloneCoinError::HwError(hw),
             InitUtxoStandardError::TaskTimedOut { duration } => InitStandaloneCoinError::TaskTimedOut { duration },
             InitUtxoStandardError::CoinIsAlreadyActivated { ticker } => {
                 InitStandaloneCoinError::CoinIsAlreadyActivated { ticker }
@@ -50,6 +61,7 @@ impl From<InitUtxoStandardError> for InitStandaloneCoinError {
             InitUtxoStandardError::CoinCreationError { ticker, error } => {
                 InitStandaloneCoinError::CoinCreationError { ticker, error }
             },
+            InitUtxoStandardError::Transport(transport) => InitStandaloneCoinError::Transport(transport),
             InitUtxoStandardError::Internal(internal) => InitStandaloneCoinError::Internal(internal),
         }
     }
@@ -65,6 +77,61 @@ impl InitUtxoStandardError {
             },
         }
     }
+
+    pub fn from_enable_coin_balance_err(enable_coin_balance_err: EnableCoinBalanceError, ticker: String) -> Self {
+        match enable_coin_balance_err {
+            EnableCoinBalanceError::NewAddressDerivingError(addr) => {
+                Self::from_new_address_deriving_error(addr, ticker)
+            },
+            EnableCoinBalanceError::NewAccountCreatingError(acc) => Self::from_new_account_err(acc, ticker),
+            EnableCoinBalanceError::BalanceError(balance) => Self::from_balance_err(balance, ticker),
+        }
+    }
+
+    fn from_new_address_deriving_error(new_addr_err: NewAddressDerivingError, ticker: String) -> Self {
+        InitUtxoStandardError::CoinCreationError {
+            ticker,
+            error: new_addr_err.to_string(),
+        }
+    }
+
+    fn from_new_account_err(new_acc_err: NewAccountCreatingError, ticker: String) -> Self {
+        match new_acc_err {
+            NewAccountCreatingError::RpcTaskError(rpc) => Self::from(rpc),
+            NewAccountCreatingError::HardwareWalletError(hw_err) => Self::from_hw_err(hw_err, ticker),
+            NewAccountCreatingError::Internal(internal) => InitUtxoStandardError::Internal(internal),
+            other => InitUtxoStandardError::CoinCreationError {
+                ticker,
+                error: other.to_string(),
+            },
+        }
+    }
+
+    fn from_hw_err(hw_error: HwError, ticker: String) -> Self {
+        match hw_error {
+            HwError::NoTrezorDeviceAvailable | HwError::DeviceDisconnected => {
+                InitUtxoStandardError::HwError(HwRpcError::NoTrezorDeviceAvailable)
+            },
+            HwError::CannotChooseDevice { .. } => InitUtxoStandardError::HwError(HwRpcError::FoundMultipleDevices),
+            HwError::ConnectionTimedOut { timeout } => InitUtxoStandardError::TaskTimedOut { duration: timeout },
+            HwError::FoundUnexpectedDevice => InitUtxoStandardError::HwError(HwRpcError::FoundUnexpectedDevice),
+            HwError::Failure(error) => InitUtxoStandardError::CoinCreationError { ticker, error },
+            other => InitUtxoStandardError::Internal(other.to_string()),
+        }
+    }
+
+    fn from_balance_err(balance_err: BalanceError, ticker: String) -> Self {
+        match balance_err {
+            BalanceError::Transport(transport) | BalanceError::InvalidResponse(transport) => {
+                InitUtxoStandardError::Transport(transport)
+            },
+            BalanceError::Internal(internal) => InitUtxoStandardError::Internal(internal),
+            other => InitUtxoStandardError::CoinCreationError {
+                ticker,
+                error: other.to_string(),
+            },
+        }
+    }
 }
 
 impl From<RegisterCoinError> for InitUtxoStandardError {
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
index 92ab03da56..5bf863815c 100644
--- a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_statuses.rs
+++ b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_statuses.rs
@@ -8,12 +8,17 @@ pub type UtxoStandardUserAction = HwRpcTaskUserAction;
 #[derive(Clone, Serialize)]
 pub enum UtxoStandardInProgressStatus {
     ActivatingCoin,
+    SyncingBlockHeaders {
+        current_scanned_block: u64,
+        last_block: u64,
+    },
+    TemporaryError(String),
     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,
+    FollowHwDeviceInstructions,
 }
 
 impl InitStandaloneCoinInitialStatus for UtxoStandardInProgressStatus {
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
index 152a4786d8..aa54ec3698 100644
--- a/mm2src/coins_activation/src/utxo_activation/utxo_standard_activation_result.rs
+++ b/mm2src/coins_activation/src/utxo_activation/utxo_standard_activation_result.rs
@@ -1,13 +1,22 @@
-use crate::prelude::CurrentBlock;
-use coins::coin_balance::EnableCoinBalance;
+use crate::prelude::{CurrentBlock, GetAddressesBalances};
+use coins::coin_balance::CoinBalanceReport;
+use mm2_number::BigDecimal;
 use serde_derive::Serialize;
+use std::collections::HashMap;
 
 #[derive(Clone, Serialize)]
 pub struct UtxoStandardActivationResult {
+    pub ticker: String,
     pub current_block: u64,
-    pub wallet_balance: EnableCoinBalance,
+    pub wallet_balance: CoinBalanceReport,
 }
 
 impl CurrentBlock for UtxoStandardActivationResult {
     fn current_block(&self) -> u64 { self.current_block }
 }
+
+impl GetAddressesBalances for UtxoStandardActivationResult {
+    fn get_addresses_balances(&self) -> HashMap<String, BigDecimal> {
+        self.wallet_balance.to_addresses_total_balances()
+    }
+}
diff --git a/mm2src/coins_activation/src/z_coin_activation.rs b/mm2src/coins_activation/src/z_coin_activation.rs
index c1580d6dab..77b397d887 100644
--- a/mm2src/coins_activation/src/z_coin_activation.rs
+++ b/mm2src/coins_activation/src/z_coin_activation.rs
@@ -4,20 +4,25 @@ use crate::standalone_coin::{InitStandaloneCoinActivationOps, InitStandaloneCoin
                              InitStandaloneCoinInitialStatus, InitStandaloneCoinTaskHandle,
                              InitStandaloneCoinTaskManagerShared};
 use async_trait::async_trait;
-use coins::coin_balance::{EnableCoinBalance, IguanaWalletBalance};
+use coins::coin_balance::{CoinBalanceReport, IguanaWalletBalance};
+use coins::my_tx_history_v2::TxHistoryStorage;
+use coins::tx_history_storage::CreateTxHistoryStorageError;
 use coins::z_coin::{z_coin_from_conf_and_params, BlockchainScanStopped, SyncStatus, ZCoin, ZCoinBuildError,
                     ZcoinActivationParams, ZcoinProtocolInfo};
-use coins::{BalanceError, CoinProtocol, MarketCoinOps, RegisterCoinError};
+use coins::{BalanceError, CoinProtocol, MarketCoinOps, PrivKeyBuildPolicy, RegisterCoinError};
 use crypto::hw_rpc_task::{HwRpcTaskAwaitingStatus, HwRpcTaskUserAction};
-use crypto::CryptoInitError;
+use crypto::CryptoCtxError;
 use derive_more::Display;
 use futures::compat::Future01CompatExt;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
+use mm2_metrics::MetricsArc;
+use mm2_number::BigDecimal;
 use rpc_task::RpcTaskError;
 use ser_error_derive::SerializeErrorType;
 use serde_derive::Serialize;
 use serde_json::Value as Json;
+use std::collections::HashMap;
 use std::time::Duration;
 
 pub type ZcoinTaskManagerShared = InitStandaloneCoinTaskManagerShared<ZCoin>;
@@ -29,13 +34,19 @@ pub type ZcoinUserAction = HwRpcTaskUserAction;
 pub struct ZcoinActivationResult {
     pub ticker: String,
     pub current_block: u64,
-    pub wallet_balance: EnableCoinBalance,
+    pub wallet_balance: CoinBalanceReport,
 }
 
 impl CurrentBlock for ZcoinActivationResult {
     fn current_block(&self) -> u64 { self.current_block }
 }
 
+impl GetAddressesBalances for ZcoinActivationResult {
+    fn get_addresses_balances(&self) -> HashMap<String, BigDecimal> {
+        self.wallet_balance.to_addresses_total_balances()
+    }
+}
+
 #[derive(Clone, Serialize)]
 #[non_exhaustive]
 pub enum ZcoinInProgressStatus {
@@ -116,14 +127,22 @@ impl From<RpcTaskError> for ZcoinInitError {
     }
 }
 
-impl From<CryptoInitError> for ZcoinInitError {
-    fn from(err: CryptoInitError) -> Self { ZcoinInitError::Internal(err.to_string()) }
+impl From<CryptoCtxError> for ZcoinInitError {
+    fn from(err: CryptoCtxError) -> Self { ZcoinInitError::Internal(err.to_string()) }
 }
 
 impl From<BlockchainScanStopped> for ZcoinInitError {
     fn from(e: BlockchainScanStopped) -> Self { ZcoinInitError::Internal(e.to_string()) }
 }
 
+impl From<CreateTxHistoryStorageError> for ZcoinInitError {
+    fn from(e: CreateTxHistoryStorageError) -> Self {
+        match e {
+            CreateTxHistoryStorageError::Internal(internal) => ZcoinInitError::Internal(internal),
+        }
+    }
+}
+
 impl From<ZcoinInitError> for InitStandaloneCoinError {
     fn from(err: ZcoinInitError) -> Self {
         match err {
@@ -145,6 +164,10 @@ impl From<ZcoinInitError> for InitStandaloneCoinError {
     }
 }
 
+impl From<CryptoCtxError> for InitStandaloneCoinError {
+    fn from(e: CryptoCtxError) -> Self { InitStandaloneCoinError::Internal(e.to_string()) }
+}
+
 impl TryFromCoinProtocol for ZcoinProtocolInfo {
     fn try_from_coin_protocol(proto: CoinProtocol) -> Result<Self, MmError<CoinProtocol>>
     where
@@ -179,14 +202,17 @@ impl InitStandaloneCoinActivationOps for ZCoin {
         protocol_info: ZcoinProtocolInfo,
         task_handle: &ZcoinRpcTaskHandle,
     ) -> MmResult<Self, ZcoinInitError> {
-        let secp_privkey = ctx.secp256k1_key_pair().private().secret;
+        // When `ZCoin` supports Trezor, we'll need to check [`ZcoinActivationParams::priv_key_policy`]
+        // instead of using [`PrivKeyBuildPolicy::detect_priv_key_policy`].
+        let priv_key_policy = PrivKeyBuildPolicy::detect_priv_key_policy(&ctx)?;
+
         let coin = z_coin_from_conf_and_params(
             &ctx,
             &ticker,
             &coin_conf,
             activation_request,
             protocol_info,
-            secp_privkey.as_slice(),
+            priv_key_policy,
         )
         .await
         .mm_err(|e| ZcoinInitError::from_build_err(e, ticker))?;
@@ -233,10 +259,19 @@ impl InitStandaloneCoinActivationOps for ZCoin {
         Ok(ZcoinActivationResult {
             ticker: self.ticker().into(),
             current_block,
-            wallet_balance: EnableCoinBalance::Iguana(IguanaWalletBalance {
+            wallet_balance: CoinBalanceReport::Iguana(IguanaWalletBalance {
                 address: self.my_z_address_encoded(),
                 balance,
             }),
         })
     }
+
+    /// Transaction history is fetching from a wallet database for `ZCoin`.
+    fn start_history_background_fetching(
+        &self,
+        _metrics: MetricsArc,
+        _storage: impl TxHistoryStorage,
+        _current_balances: HashMap<String, BigDecimal>,
+    ) {
+    }
 }
diff --git a/mm2src/common/Cargo.toml b/mm2src/common/Cargo.toml
index 7018aa5709..2327ebd957 100644
--- a/mm2src/common/Cargo.toml
+++ b/mm2src/common/Cargo.toml
@@ -16,28 +16,29 @@ track-ctx-pointer = ["shared_ref_counter/enable", "shared_ref_counter/log"]
 arrayref = "0.3"
 async-trait = "0.1"
 backtrace = "0.3"
-base64 = "0.10.0"
 bytes = "1.1"
 cfg-if = "1.0"
 crossbeam = "0.7"
 fnv = "1.0.6"
 futures01 = { version = "0.1", package = "futures" }
 futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+futures-timer = "3.0"
 hex = "0.4.2"
 http = "0.2"
 http-body = "0.1"
 itertools = "0.10"
 lazy_static = "1.4"
-lightning = { git = "https://github.com/shamardy/rust-lightning", branch = "0.0.106" }
 log = "0.4.8"
 parking_lot = { version = "0.12.0", features = ["nightly"] }
 parking_lot_core = { version = "0.6", features = ["nightly"] }
+primitive-types = "0.11.1"
 rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
 serde = "1"
 serde_derive = "1"
-serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 ser_error = { path = "../derives/ser_error" }
 ser_error_derive = { path = "../derives/ser_error_derive" }
+sha2 = "0.9"
 shared_ref_counter = { path = "shared_ref_counter", optional = true }
 uuid = { version = "0.7", features = ["serde", "v4"] }
 wasm-timer = "0.2.4"
@@ -59,18 +60,14 @@ anyhow = "1.0"
 chrono = "0.4"
 crossterm = "0.20"
 gstuff = { version = "0.7", features = ["crossterm", "nightly"] }
-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.23", default-features = false, features = ["http1", "http2", "webpki-tokio"] }
 libc = { version = "0.2" }
+lightning = "0.0.110"
 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" }
-tokio = { version = "1.7", features = ["io-util", "rt-multi-thread", "net"] }
+tokio = { version = "1.20", features = ["io-util", "rt-multi-thread", "net"] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3"
diff --git a/mm2src/common/common.rs b/mm2src/common/common.rs
index a6d1e0fd4a..5a8edbd7da 100644
--- a/mm2src/common/common.rs
+++ b/mm2src/common/common.rs
@@ -11,6 +11,7 @@
 //!                   binary
 
 #![allow(uncommon_codepoints)]
+#![feature(allocator_api)]
 #![feature(integer_atomics, panic_info_message)]
 #![feature(async_closure)]
 #![feature(hash_raw_entry)]
@@ -27,7 +28,7 @@
 
 /// Implements a `From` for `enum` with a variant name matching the name of the type stored.
 ///
-/// This is helpful as a workaround for the lack of datasort refinements.  
+/// This is helpful as a workaround for the lack of datasort refinements.
 /// And also as a simpler alternative to `enum_dispatch` and `enum_derive`.
 ///
 ///     enum Color {Red (Red)}
@@ -84,59 +85,79 @@ macro_rules! try_h {
     };
 }
 
+/// Drops mutability of given variable
+#[macro_export]
+macro_rules! drop_mutability {
+    ($t: ident) => {
+        let $t = $t;
+    };
+}
+
+/// Reads inner value of `Option<T>`, returns `Ok(None)` otherwise.
+#[macro_export]
+macro_rules! some_or_return_ok_none {
+    ($val:expr) => {
+        match $val {
+            Some(t) => t,
+            None => {
+                return Ok(None);
+            },
+        }
+    };
+}
+
 #[macro_use]
 pub mod jsonrpc_client;
 #[macro_use]
-pub mod log;
+pub mod fmt;
 #[macro_use]
-pub mod mm_metrics;
+pub mod log;
 
 pub mod crash_reports;
 pub mod custom_futures;
 pub mod custom_iter;
+#[path = "executor/mod.rs"] pub mod executor;
+pub mod number_type_casting;
 pub mod seri;
 #[path = "patterns/state_machine.rs"] pub mod state_machine;
 pub mod time_cache;
 
-#[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 = "executor/wasm_executor.rs"]
-pub mod executor;
-
 #[cfg(target_arch = "wasm32")] pub mod wasm;
+
 #[cfg(target_arch = "wasm32")] pub use wasm::*;
 
 use backtrace::SymbolName;
+use chrono::Utc;
 pub use futures::compat::Future01CompatExt;
-use futures::future::{abortable, AbortHandle, FutureExt};
 use futures01::{future, Future};
-use http::header::{HeaderValue, CONTENT_TYPE};
+use http::header::CONTENT_TYPE;
 use http::Response;
 use parking_lot::{Mutex as PaMutex, MutexGuard as PaMutexGuard};
 use rand::{rngs::SmallRng, SeedableRng};
 use serde::{de, ser};
 use serde_json::{self as json, Value as Json};
-use std::fmt::{self, Write as FmtWrite};
+use sha2::{Digest, Sha256};
+use std::alloc::Allocator;
+use std::fmt::Write as FmtWrite;
+use std::fs::File;
 use std::future::Future as Future03;
-use std::io::Write;
+use std::io::{BufReader, Read, Write};
 use std::iter::Peekable;
 use std::mem::{forget, zeroed};
 use std::num::NonZeroUsize;
 use std::ops::{Add, Deref, Div, RangeInclusive};
 use std::os::raw::c_void;
 use std::panic::{set_hook, PanicInfo};
+use std::path::PathBuf;
 use std::ptr::read_volatile;
 use std::sync::atomic::Ordering;
+use std::time::{Duration, SystemTime, SystemTimeError};
 use uuid::Uuid;
 
-use crate::executor::spawn;
 pub use http::StatusCode;
 pub use serde;
 
@@ -145,7 +166,6 @@ cfg_native! {
     #[cfg(not(windows))]
     use findshlibs::{IterationControl, Segment, SharedLibrary, TargetSharedLibrary};
     use std::env;
-    use std::path::PathBuf;
     use std::sync::Mutex;
 }
 
@@ -153,6 +173,11 @@ cfg_wasm32! {
     use std::sync::atomic::AtomicUsize;
 }
 
+pub const X_GRPC_WEB: &str = "x-grpc-web";
+pub const APPLICATION_JSON: &str = "application/json";
+pub const APPLICATION_GRPC_WEB: &str = "application/grpc-web";
+pub const APPLICATION_GRPC_WEB_PROTO: &str = "application/grpc-web+proto";
+
 pub const SATOSHIS: u64 = 100_000_000;
 
 pub const DEX_FEE_ADDR_PUBKEY: &str = "03bc2c7ba671bae4a6fc835244c9762b41647b9827d4780a89a949b984a8ddcc06";
@@ -164,7 +189,7 @@ 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> {}
+impl<T: ?Sized, A: Allocator> NotSame for Box<T, A> {}
 
 /// Converts u64 satoshis to f64
 pub fn sat_to_f(sat: u64) -> f64 { sat as f64 / SATOSHIS as f64 }
@@ -184,8 +209,8 @@ impl Default for bits256 {
     }
 }
 
-impl fmt::Display for bits256 {
-    fn fmt(&self, fm: &mut fmt::Formatter) -> fmt::Result {
+impl std::fmt::Display for bits256 {
+    fn fmt(&self, fm: &mut std::fmt::Formatter) -> std::fmt::Result {
         for &ch in self.bytes.iter() {
             fn hex_from_digit(num: u8) -> char {
                 if num < 10 {
@@ -218,7 +243,7 @@ impl<'de> de::Deserialize<'de> for bits256 {
         struct Bits256Visitor;
         impl<'de> de::Visitor<'de> for Bits256Visitor {
             type Value = bits256;
-            fn expecting(&self, fm: &mut fmt::Formatter) -> fmt::Result { fm.write_str("a byte array") }
+            fn expecting(&self, fm: &mut std::fmt::Formatter) -> std::fmt::Result { fm.write_str("a byte array") }
             fn visit_seq<S>(self, mut seq: S) -> Result<bits256, S::Error>
             where
                 S: de::SeqAccess<'de>,
@@ -250,8 +275,8 @@ impl<'de> de::Deserialize<'de> for bits256 {
     }
 }
 
-impl fmt::Debug for bits256 {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { (self as &dyn fmt::Display).fmt(f) }
+impl std::fmt::Debug for bits256 {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { (self as &dyn std::fmt::Display).fmt(f) }
 }
 
 impl From<[u8; 32]> for bits256 {
@@ -462,8 +487,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!("{}", info);
-        log::info!("backtrace\n{}", trace);
+        log!("{}", info);
+        log!("backtrace\n{}", trace);
 
         let _ = ENTERED.try_with(|e| e.compare_exchange(true, false, Ordering::Relaxed, Ordering::Relaxed));
     }))
@@ -500,7 +525,7 @@ where
 {
     let rf = match Response::builder()
         .status(status)
-        .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
+        .header(CONTENT_TYPE, APPLICATION_JSON)
         .body(Vec::from(body))
     {
         Ok(r) => future::ok::<Response<Vec<u8>>, String>(r),
@@ -512,6 +537,11 @@ where
     Box::new(rf)
 }
 
+/// An alternative to the `std::convert::Infallible` that implements `Serialize`.
+/// Replace it with `!` when it's stable.
+#[derive(Clone, Deserialize, Serialize)]
+pub enum SerdeInfallible {}
+
 /// 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")]
@@ -519,8 +549,8 @@ pub enum SerializationError {
     InternalError(String),
 }
 
-impl fmt::Display for SerializationError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl std::fmt::Display for SerializationError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             SerializationError::InternalError(internal) => {
                 write!(f, "Internal error: Couldn't serialize an RPC response: {}", internal)
@@ -530,9 +560,7 @@ impl fmt::Display for SerializationError {
 }
 
 impl SerializationError {
-    pub fn from_error<E: serde::ser::Error>(e: E) -> SerializationError {
-        SerializationError::InternalError(e.to_string())
-    }
+    pub fn from_error<E: ser::Error>(e: E) -> SerializationError { SerializationError::InternalError(e.to_string()) }
 }
 
 #[derive(Clone, Serialize)]
@@ -572,7 +600,7 @@ pub fn rpc_err_response(status: u16, msg: &str) -> HyRes {
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn var(name: &str) -> Result<String, String> {
-    match std::env::var(name) {
+    match env::var(name) {
         Ok(v) => Ok(v),
         Err(_err) => ERR!("No {}", name),
     }
@@ -621,7 +649,6 @@ 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()))
 }
 
@@ -750,6 +777,16 @@ pub const fn ten_f64() -> f64 { 10. }
 
 pub const fn one_hundred() -> usize { 100 }
 
+pub const fn one_thousand_u32() -> u32 { 1000 }
+
+pub const fn one_and_half_f64() -> f64 { 1.5 }
+
+pub const fn three_hundred_f64() -> f64 { 300. }
+
+pub const fn one_f64() -> f64 { 1. }
+
+pub const fn sixty_f64() -> f64 { 60. }
+
 pub fn one() -> NonZeroUsize { NonZeroUsize::new(1).unwrap() }
 
 #[derive(Debug, Deserialize)]
@@ -926,16 +963,30 @@ 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);
+#[inline(always)]
+pub fn get_utc_timestamp() -> i64 { Utc::now().timestamp() }
 
-impl Drop for AbortOnDropHandle {
-    #[inline(always)]
-    fn drop(&mut self) { self.0.abort(); }
+#[inline(always)]
+pub fn get_local_duration_since_epoch() -> Result<Duration, SystemTimeError> {
+    SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
 }
 
-pub fn spawn_abortable(fut: impl Future03<Output = ()> + Send + 'static) -> AbortOnDropHandle {
-    let (abortable, handle) = abortable(fut);
-    spawn(abortable.then(|_| async {}));
-    AbortOnDropHandle(handle)
+/// open file and calculate its sha256 digest as lowercase hex string
+pub fn sha256_digest(path: &PathBuf) -> Result<String, std::io::Error> {
+    let input = File::open(path)?;
+    let mut reader = BufReader::new(input);
+
+    let digest = {
+        let mut hasher = Sha256::new();
+        let mut buffer = [0; 1024];
+        loop {
+            let count = reader.read(&mut buffer)?;
+            if count == 0 {
+                break;
+            }
+            hasher.update(&buffer[..count]);
+        }
+        format!("{:x}", hasher.finalize())
+    };
+    Ok(digest)
 }
diff --git a/mm2src/common/custom_futures.rs b/mm2src/common/custom_futures.rs
deleted file mode 100644
index f6b43bf042..0000000000
--- a/mm2src/common/custom_futures.rs
+++ /dev/null
@@ -1,307 +0,0 @@
-/// Custom future combinators/implementations - some of standard do not match our requirements.
-use crate::executor::Timer;
-use crate::now_float;
-
-use futures::future::{select, Either};
-use futures::lock::Mutex as AsyncMutex;
-use futures::task::Poll as Poll03;
-use futures::Future as Future03;
-use futures01::future::{self, loop_fn, Either as Either01, IntoFuture, Loop};
-use futures01::stream::{Fuse, Stream};
-use futures01::{Async, AsyncSink, Future, Poll, Sink};
-
-use std::fmt;
-use std::pin::Pin;
-use std::task::Context;
-use std::time::Duration;
-
-/// The analogue of join_all combinator running futures `sequentially`.
-/// `join_all` runs futures `concurrently` which cause issues with native coins daemons RPC.
-/// We need to get raw transactions containing unspent outputs when we build new one in order
-/// to get denominated integer amount of UTXO instead of f64 provided by `listunspent` call.
-/// Sometimes we might need info about dozens (or even hundreds) transactions at time so we can overflow
-/// RPC queue of daemon very fast like this: https://github.com/bitpay/bitcore-node/issues/463#issuecomment-228788871.
-/// Thx to https://stackoverflow.com/a/51717254/8707622
-pub fn join_all_sequential<I>(
-    i: I,
-) -> impl Future<Item = Vec<<I::Item as IntoFuture>::Item>, Error = <I::Item as IntoFuture>::Error>
-where
-    I: IntoIterator,
-    I::Item: IntoFuture,
-{
-    let iter = i.into_iter();
-    loop_fn((vec![], iter), |(mut output, mut iter)| {
-        let fut = if let Some(next) = iter.next() {
-            Either01::A(next.into_future().map(Some))
-        } else {
-            Either01::B(future::ok(None))
-        };
-
-        fut.and_then(move |val| {
-            if let Some(val) = val {
-                output.push(val);
-                Ok(Loop::Continue((output, iter)))
-            } else {
-                Ok(Loop::Break(output))
-            }
-        })
-    })
-}
-
-/// The analogue of select_ok combinator running futures `sequentially`.
-/// The use case of such combinator is Electrum (and maybe not only Electrum) multiple servers support.
-/// Electrum client uses shared HashMap to store responses and we can treat the first received response as
-/// error while it's really successful. We might change the Electrum support design in the future to avoid
-/// such race condition but `select_ok_sequential` might be still useful to reduce the networking overhead.
-/// There is no reason actually to send same request to all servers concurrently when it's enough to use just 1.
-/// But we do a kind of round-robin if first server fails to respond, etc, and we return error only if all servers attempts failed.
-/// When a server responds successfully we return the response and the number of failed attempts in a tuple.
-pub fn select_ok_sequential<I: IntoIterator>(
-    i: I,
-) -> impl Future<Item = (<I::Item as IntoFuture>::Item, usize), Error = Vec<<I::Item as IntoFuture>::Error>>
-where
-    I::Item: IntoFuture,
-{
-    let futures = i.into_iter();
-    loop_fn((vec![], futures), |(mut errors, mut futures)| {
-        let fut = if let Some(next) = futures.next() {
-            Either01::A(next.into_future().map(Some))
-        } else {
-            Either01::B(future::ok(None))
-        };
-
-        fut.then(move |val| {
-            let val = match val {
-                Ok(val) => val,
-                Err(e) => {
-                    errors.push(e);
-                    return Ok(Loop::Continue((errors, futures)));
-                },
-            };
-
-            if let Some(val) = val {
-                Ok(Loop::Break((val, errors.len())))
-            } else {
-                Err(errors)
-            }
-        })
-    })
-}
-
-/// Future for the `Sink::send_all` combinator, which sends a stream of values
-/// to a sink and then waits until the sink has fully flushed those values.
-/// The difference from standard implementation is this SendAll returns the `Stream` part even in case of errors.
-/// It's useful for Electrum connections (based on MPSC channels):
-/// If we get connection error standard SendAll will consume the receiver but it can still
-/// receive messages from sender bypassing them to new TcpStream created in loop_fn.
-#[derive(Debug)]
-#[must_use = "futures do nothing unless polled"]
-pub struct SendAll<T, U: Stream> {
-    sink: Option<T>,
-    stream: Option<Fuse<U>>,
-    buffered: Option<U::Item>,
-}
-
-impl<T, U> SendAll<T, U>
-where
-    T: Sink,
-    U: Stream<Item = T::SinkItem>,
-    T::SinkError: From<U::Error>,
-{
-    fn sink_mut(&mut self) -> &mut T {
-        self.sink
-            .as_mut()
-            .take()
-            .expect("Attempted to poll SendAll after completion")
-    }
-
-    pub fn new(sink: T, stream: U) -> SendAll<T, U> {
-        SendAll {
-            sink: Some(sink),
-            stream: Some(stream.fuse()),
-            buffered: None,
-        }
-    }
-
-    fn stream_mut(&mut self) -> &mut Fuse<U> {
-        self.stream
-            .as_mut()
-            .take()
-            .expect("Attempted to poll SendAll after completion")
-    }
-
-    fn take_stream(&mut self) -> U {
-        let fuse = self.stream.take().expect("Attempted to poll Forward after completion");
-        fuse.into_inner()
-    }
-
-    fn take_result(&mut self) -> (T, U) {
-        let sink = self.sink.take().expect("Attempted to poll Forward after completion");
-        let fuse = self.stream.take().expect("Attempted to poll Forward after completion");
-        (sink, fuse.into_inner())
-    }
-
-    fn try_start_send(&mut self, item: U::Item) -> Poll<(), T::SinkError> {
-        debug_assert!(self.buffered.is_none());
-        if let AsyncSink::NotReady(item) = self.sink_mut().start_send(item)? {
-            self.buffered = Some(item);
-            return Ok(Async::NotReady);
-        }
-        Ok(Async::Ready(()))
-    }
-}
-
-macro_rules! try_ready_send_all {
-    ($selff: ident, $e:expr) => {
-        match $e {
-            Ok(Async::Ready(t)) => t,
-            Ok(Async::NotReady) => return Ok(Async::NotReady),
-            Err(e) => return Err(($selff.take_stream(), From::from(e))),
-        }
-    };
-}
-
-impl<T, U> Future for SendAll<T, U>
-where
-    T: Sink,
-    U: Stream<Item = T::SinkItem>,
-    T::SinkError: From<U::Error>,
-{
-    type Item = (T, U);
-    type Error = (U, T::SinkError);
-
-    fn poll(&mut self) -> Poll<(T, U), (U, T::SinkError)> {
-        // If we've got an item buffered already, we need to write it to the
-        // sink before we can do anything else
-        if let Some(item) = self.buffered.take() {
-            try_ready_send_all!(self, self.try_start_send(item));
-        }
-
-        loop {
-            match self
-                .stream_mut()
-                .poll()
-                .map_err(|e| (self.take_stream(), From::from(e)))?
-            {
-                Async::Ready(Some(item)) => try_ready_send_all!(self, self.try_start_send(item)),
-                Async::Ready(None) => {
-                    try_ready_send_all!(self, self.sink_mut().close());
-                    return Ok(Async::Ready(self.take_result()));
-                },
-                Async::NotReady => {
-                    try_ready_send_all!(self, self.sink_mut().poll_complete());
-                    return Ok(Async::NotReady);
-                },
-            }
-        }
-    }
-}
-
-pub struct TimedMutexGuard<'a, T>(futures::lock::MutexGuard<'a, T>);
-//impl<'a, T> Drop for TimedMutexGuard<'a, T> {fn drop (&mut self) {}}
-
-/// Like `AsyncMutex` but periodically invokes a callback,
-/// allowing the application to implement timeouts, status updates and shutdowns.
-pub struct TimedAsyncMutex<T>(AsyncMutex<T>);
-impl<T> TimedAsyncMutex<T> {
-    pub fn new(v: T) -> TimedAsyncMutex<T> { TimedAsyncMutex(AsyncMutex::new(v)) }
-
-    /// Like `AsyncMutex::lock` but invokes the `tick` callback periodically.  
-    /// `tick` returns a time till the next tick, or an error to abort the locking attempt.  
-    /// `tick` parameters are the time when the locking attempt has started and the current time
-    /// (they are equal on the first invocation of `tick`).
-    pub async fn lock<F, E>(&self, mut tick: F) -> Result<TimedMutexGuard<'_, T>, E>
-    where
-        F: FnMut(f64, f64) -> Result<f64, E>,
-    {
-        let start = now_float();
-        let mut now = start;
-        let mut l = self.0.lock();
-        let l = loop {
-            let tick_after = tick(start, now)?;
-            let t = Timer::till(now + tick_after);
-            let rc = select(l, t).await;
-            match rc {
-                Either::Left((l, _t)) => break l,
-                Either::Right((_t, lʹ)) => {
-                    now = now_float();
-                    l = lʹ
-                },
-            }
-        };
-        Ok(TimedMutexGuard(l))
-    }
-}
-
-#[derive(Debug)]
-pub struct TimeoutError {
-    pub duration: Duration,
-}
-
-impl fmt::Display for TimeoutError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}s timed out waiting for the future to complete",
-            self.duration.as_secs_f64()
-        )
-    }
-}
-
-/// Unlike `futures_timer::FutureExt` and Tokio timers, this trait implementation works with any reactor and on WASM arch.
-pub trait FutureTimerExt: Future03 + Sized {
-    /// Finishes with `TimeoutError` if the underlying future isn't ready withing the given timeframe.
-    fn timeout(self, duration: Duration) -> Timeout<Self> {
-        Timeout {
-            future: self,
-            timer: Timer::sleep(duration.as_secs_f64()),
-            duration,
-        }
-    }
-
-    fn timeout_secs(self, secs: f64) -> Timeout<Self> {
-        Timeout {
-            future: self,
-            timer: Timer::sleep(secs),
-            duration: Duration::from_secs_f64(secs),
-        }
-    }
-}
-
-impl<F: Future03 + Sized> FutureTimerExt for F {}
-
-/// Future returned by the `FutureTimerExt::timeout` method.
-#[must_use = "futures do nothing unless polled"]
-pub struct Timeout<F: Sized> {
-    future: F,
-    timer: Timer,
-    duration: Duration,
-}
-
-impl<F> Future03 for Timeout<F>
-where
-    F: Future03 + Unpin,
-{
-    type Output = Result<F::Output, TimeoutError>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll03<Self::Output> {
-        match Future03::poll(Pin::new(&mut self.future), cx) {
-            Poll03::Ready(out) => return Poll03::Ready(Ok(out)),
-            Poll03::Pending => (),
-        }
-        match Future03::poll(Pin::new(&mut self.timer), cx) {
-            Poll03::Ready(()) => Poll03::Ready(Err(TimeoutError {
-                duration: self.duration,
-            })),
-            Poll03::Pending => Poll03::Pending,
-        }
-    }
-}
-
-unsafe impl<F> Send for Timeout<F> where F: Send {}
-
-#[test]
-fn test_timeout() {
-    let _err = crate::block_on(Timer::sleep(0.4).timeout(Duration::from_secs_f64(0.1))).expect_err("Expected timeout");
-    let _ok = crate::block_on(Timer::sleep(0.1).timeout(Duration::from_secs_f64(0.2))).expect("Expected future");
-}
diff --git a/mm2src/common/custom_futures/mod.rs b/mm2src/common/custom_futures/mod.rs
new file mode 100644
index 0000000000..f06583a90b
--- /dev/null
+++ b/mm2src/common/custom_futures/mod.rs
@@ -0,0 +1,79 @@
+/// Custom future combinators/implementations - some of standard do not match our requirements.
+use futures01::future::{self, loop_fn, Either as Either01, IntoFuture, Loop};
+use futures01::Future;
+
+pub mod repeatable;
+pub mod timeout;
+
+/// The analogue of join_all combinator running futures `sequentially`.
+/// `join_all` runs futures `concurrently` which cause issues with native coins daemons RPC.
+/// We need to get raw transactions containing unspent outputs when we build new one in order
+/// to get denominated integer amount of UTXO instead of f64 provided by `listunspent` call.
+/// Sometimes we might need info about dozens (or even hundreds) transactions at time so we can overflow
+/// RPC queue of daemon very fast like this: https://github.com/bitpay/bitcore-node/issues/463#issuecomment-228788871.
+/// Thx to https://stackoverflow.com/a/51717254/8707622
+pub fn join_all_sequential<I>(
+    i: I,
+) -> impl Future<Item = Vec<<I::Item as IntoFuture>::Item>, Error = <I::Item as IntoFuture>::Error>
+where
+    I: IntoIterator,
+    I::Item: IntoFuture,
+{
+    let iter = i.into_iter();
+    loop_fn((vec![], iter), |(mut output, mut iter)| {
+        let fut = if let Some(next) = iter.next() {
+            Either01::A(next.into_future().map(Some))
+        } else {
+            Either01::B(future::ok(None))
+        };
+
+        fut.and_then(move |val| {
+            if let Some(val) = val {
+                output.push(val);
+                Ok(Loop::Continue((output, iter)))
+            } else {
+                Ok(Loop::Break(output))
+            }
+        })
+    })
+}
+
+/// The analogue of select_ok combinator running futures `sequentially`.
+/// The use case of such combinator is Electrum (and maybe not only Electrum) multiple servers support.
+/// Electrum client uses shared HashMap to store responses and we can treat the first received response as
+/// error while it's really successful. We might change the Electrum support design in the future to avoid
+/// such race condition but `select_ok_sequential` might be still useful to reduce the networking overhead.
+/// There is no reason actually to send same request to all servers concurrently when it's enough to use just 1.
+/// But we do a kind of round-robin if first server fails to respond, etc, and we return error only if all servers attempts failed.
+/// When a server responds successfully we return the response and the number of failed attempts in a tuple.
+pub fn select_ok_sequential<I: IntoIterator>(
+    i: I,
+) -> impl Future<Item = (<I::Item as IntoFuture>::Item, usize), Error = Vec<<I::Item as IntoFuture>::Error>>
+where
+    I::Item: IntoFuture,
+{
+    let futures = i.into_iter();
+    loop_fn((vec![], futures), |(mut errors, mut futures)| {
+        let fut = if let Some(next) = futures.next() {
+            Either01::A(next.into_future().map(Some))
+        } else {
+            Either01::B(future::ok(None))
+        };
+
+        fut.then(move |val| {
+            let val = match val {
+                Ok(val) => val,
+                Err(e) => {
+                    errors.push(e);
+                    return Ok(Loop::Continue((errors, futures)));
+                },
+            };
+
+            if let Some(val) = val {
+                Ok(Loop::Break((val, errors.len())))
+            } else {
+                Err(errors)
+            }
+        })
+    })
+}
diff --git a/mm2src/common/custom_futures/repeatable.rs b/mm2src/common/custom_futures/repeatable.rs
new file mode 100644
index 0000000000..1e31bc5a4d
--- /dev/null
+++ b/mm2src/common/custom_futures/repeatable.rs
@@ -0,0 +1,659 @@
+//! A future that can be repeated if an error occurs or not all conditions are met.
+//!
+//! # Why `async move` shouldn't be allowed
+//!
+//! Let's consider the following example:
+//!
+//! ```rust
+//! let mut counter = 0;
+//! let res = repeatable!(async move {
+//!   counter += 1;
+//!   if counter > 1 { Ready(()) } else { Retry(()) }
+//! })
+//! .repeat_every_secs(0.1)
+//! .attempts(10)
+//! .await;
+//!
+//! res.expect_err("'counter' will never be greater than 1");
+//! ```
+//!
+//! This happens due to the fact that the `counter` variable is not shared between attempts,
+//! and every time the future starts with `counter = 0`.
+
+use crate::executor::Timer;
+use crate::now_ms;
+use crate::number_type_casting::SafeTypeCastingNumbers;
+use futures::FutureExt;
+use log::warn;
+use std::fmt;
+use std::future::Future;
+use std::marker::PhantomData;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::time::Duration;
+
+pub use Action::{Ready, Retry};
+
+/// Wraps the given future into `Repeatable` future.
+/// The future should return [`Action<T, E>`] with any `T` and `E` types.
+#[macro_export]
+macro_rules! repeatable {
+    (async { $($t:tt)* }) => {
+        $crate::custom_futures::repeatable::Repeatable::new(|| Box::pin(async { $($t)* }))
+    };
+    ($fut:expr) => {
+        $crate::custom_futures::repeatable::Repeatable::new(|| $fut)
+    };
+}
+
+/// Wraps the given future into `Repeatable` future.
+/// The future should return [`Result<T, E>`], where
+/// * `Ok(T)` => `Action::Ready(T)`
+/// * `Err(E)` => `Action::Retry(E)`
+#[macro_export]
+macro_rules! retry_on_err {
+    (async { $($t:tt)* }) => {
+        $crate::custom_futures::repeatable::Repeatable::new(|| {
+            use $crate::custom_futures::repeatable::RetryOnError;
+            use futures::FutureExt;
+
+            let fut = async { $($t)* };
+            Box::pin(fut.map(Result::retry_on_err))
+        })
+    };
+    ($fut:expr) => {
+        $crate::custom_futures::repeatable::Repeatable::new(|| {
+            use $crate::custom_futures::repeatable::RetryOnError;
+            use futures::FutureExt;
+
+            $fut.map(Result::retry_on_err)
+        })
+    };
+}
+
+/// Unwraps a result or returns `Action::Retry(E)`.
+#[macro_export]
+macro_rules! try_or_retry {
+    ($exp:expr) => {{
+        match $exp {
+            Ok(t) => t,
+            Err(e) => return $crate::custom_futures::repeatable::Retry(e),
+        }
+    }};
+}
+
+/// Unwraps a result or returns `Action::Ready(E)`.
+#[macro_export]
+macro_rules! try_or_ready_err {
+    ($exp:expr) => {{
+        match $exp {
+            Ok(t) => t,
+            Err(e) => return $crate::custom_futures::repeatable::Ready(Err(e)),
+        }
+    }};
+}
+
+const DEFAULT_REPEAT_EVERY: Duration = Duration::from_secs(1);
+
+pub trait FactoryTrait<F>: Fn() -> F {}
+
+impl<Factory, F> FactoryTrait<F> for Factory where Factory: Fn() -> F {}
+
+pub trait RepeatableTrait<T, E>: Future<Output = Action<T, E>> + Unpin {}
+
+impl<F, T, E> RepeatableTrait<T, E> for F where F: Future<Output = Action<T, E>> + Unpin {}
+
+pub(crate) trait InspectErrorTrait<E>: 'static + Fn(&E) + Send {}
+
+impl<F: 'static + Fn(&E) + Send, E> InspectErrorTrait<E> for F {}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum RepeatError<E> {
+    TimeoutExpired {
+        until_ms: u64,
+        /// An error occurred during the last attempt.
+        error: E,
+    },
+    AttemptsExceed {
+        attempts: usize,
+        /// An error occurred during the last attempt.
+        error: E,
+    },
+}
+
+impl<E> RepeatError<E> {
+    pub fn error(&self) -> &E {
+        match self {
+            RepeatError::TimeoutExpired { error, .. } | RepeatError::AttemptsExceed { error, .. } => error,
+        }
+    }
+
+    pub fn into_error(self) -> E {
+        match self {
+            RepeatError::TimeoutExpired { error, .. } | RepeatError::AttemptsExceed { error, .. } => error,
+        }
+    }
+
+    fn timeout(until_ms: u64, error: E) -> Self { RepeatError::TimeoutExpired { until_ms, error } }
+
+    fn attempts(attempts: usize, error: E) -> Self { RepeatError::AttemptsExceed { attempts, error } }
+}
+
+impl<E: fmt::Display> fmt::Display for RepeatError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            RepeatError::TimeoutExpired { until_ms, error } => {
+                write!(
+                    f,
+                    "Waited too long until {until_ms}ms for the future to succeed. Error: {error}",
+                )
+            },
+            RepeatError::AttemptsExceed { attempts, error } => {
+                write!(f, "Error {error} on retrying the future after {attempts} attempts")
+            },
+        }
+    }
+}
+
+/// The future is ether ready (with a `T` result), or not ready (failed with an intermediate `E` error).
+#[derive(Debug)]
+pub enum Action<T, E> {
+    Ready(T),
+    Retry(E),
+}
+
+pub trait RetryOnError<T, E> {
+    fn retry_on_err(self) -> Action<T, E>;
+}
+
+impl<T, E> RetryOnError<T, E> for Result<T, E> {
+    /// Converts `Result<T, E>` into `Action<T, E>`:
+    /// * `Ok(T)` => `Action::Ready(T)`.
+    /// * `Err(E)` => `Action::Retry(E)`.
+    #[inline]
+    fn retry_on_err(self) -> Action<T, E> {
+        match self {
+            Ok(ready) => Action::Ready(ready),
+            Err(e) => Action::Retry(e),
+        }
+    }
+}
+
+/// The result of `repeatable` or `retry_on_err` macros - the first step at the future configuration.
+pub struct Repeatable<Factory, F, T, E> {
+    factory: Factory,
+    /// Currently executable future, i.e. an active attempt.
+    exec_fut: F,
+    /// A timeout future if we're currently waiting for a timeout.
+    timeout_fut: Option<Timer>,
+    until: RepeatUntil,
+    repeat_every: Duration,
+    inspect_err: Option<Box<dyn InspectErrorTrait<E>>>,
+    _phantom: PhantomData<(F, T, E)>,
+}
+
+impl<Factory, F, T, E> Repeatable<Factory, F, T, E>
+where
+    Factory: FactoryTrait<F>,
+    F: RepeatableTrait<T, E>,
+{
+    #[inline]
+    pub fn new(factory: Factory) -> Self {
+        let exec_fut = factory();
+
+        Repeatable {
+            factory,
+            exec_fut,
+            timeout_fut: None,
+            until: RepeatUntil::default(),
+            repeat_every: DEFAULT_REPEAT_EVERY,
+            inspect_err: None,
+            _phantom: PhantomData::default(),
+        }
+    }
+
+    /// Specifies an inspect handler that does something with an error on each unsuccessful attempt.
+    #[inline]
+    pub fn inspect_err<Inspect>(mut self, inspect: Inspect) -> Self
+    where
+        Inspect: 'static + Fn(&E) + Send,
+    {
+        self.inspect_err = Some(Box::new(inspect));
+        self
+    }
+
+    #[inline]
+    pub fn repeat_every(mut self, repeat_every: Duration) -> Self {
+        self.repeat_every = repeat_every;
+        self
+    }
+
+    #[inline]
+    pub fn repeat_every_ms(self, repeat_every: u64) -> Self { self.repeat_every(Duration::from_millis(repeat_every)) }
+
+    #[inline]
+    pub fn repeat_every_secs(self, repeat_every: f64) -> Self {
+        self.repeat_every(Duration::from_secs_f64(repeat_every))
+    }
+
+    /// Repeat the future until it's ready.
+    ///
+    /// # Warning
+    ///
+    /// This may lead to an endless loop if the future is never ready.
+    #[inline]
+    pub fn until_ready(mut self) -> Self {
+        self.until = RepeatUntil::Ready;
+        self
+    }
+
+    /// Specifies a total number of attempts to run the future.
+    /// So there will be up to `total_attempts`.
+    ///
+    /// # Panic
+    ///
+    /// Panics if `total_attempts` is 0.
+    #[inline]
+    pub fn attempts(mut self, total_attempts: usize) -> Self {
+        assert!(total_attempts > 0, "'total_attempts' cannot be 0");
+
+        self.until = RepeatUntil::AttemptsExceed(AttemptsState::new(total_attempts));
+        self
+    }
+
+    /// Specifies a deadline in milliseconds before that we may try to repeat the future.
+    #[inline]
+    pub fn until_ms(mut self, until_ms: u64) -> Self {
+        let now = now_ms();
+        if now >= until_ms {
+            warn!("Deadline has already passed: now={now:?} until={until_ms:?}")
+        }
+
+        self.until = RepeatUntil::TimeoutMsExpired(until_ms);
+        self
+    }
+
+    /// Specifies a deadline in seconds before that we may try to repeat the future.
+    #[inline]
+    pub fn until_s(self, until_s: u64) -> Self {
+        let until_ms = until_s * 1000;
+        self.until_ms(until_ms)
+    }
+
+    /// Specifies a timeout in milliseconds before that we may try to repeat the future.
+    /// Note this method name should differ from [`FutureTimerExt::timeout_ms`].
+    #[inline]
+    pub fn with_timeout_ms(self, timeout_ms: u64) -> Self { self.until_ms(now_ms() + timeout_ms) }
+
+    /// Specifies a timeout in seconds before that we may try to repeat the future.
+    /// Note this method name should differ from [`FutureTimerExt::timeout_secs`].
+    #[inline]
+    pub fn with_timeout_secs(self, timeout_secs: f64) -> Self {
+        let timeout_ms = (timeout_secs * 1000.) as u64;
+        self.until_ms(now_ms() + timeout_ms)
+    }
+
+    /// Checks if the deadline is not going to be reached after the `repeat_every` timeout.
+    fn check_can_retry_after_timeout(&self, until_ms: u64) -> bool {
+        let repeat_every_ms: u64 = self.repeat_every.as_millis().into_or_max();
+        let will_be_after_timeout = now_ms() + repeat_every_ms;
+        will_be_after_timeout < until_ms
+    }
+}
+
+impl<Factory, F: Unpin, T, E> Unpin for Repeatable<Factory, F, T, E> {}
+
+impl<Factory, F, T, E> Future for Repeatable<Factory, F, T, E>
+where
+    Factory: FactoryTrait<F>,
+    F: RepeatableTrait<T, E>,
+{
+    type Output = Result<T, RepeatError<E>>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        loop {
+            if poll_timeout(&mut self.timeout_fut, cx).is_pending() {
+                return Poll::Pending;
+            }
+
+            match self.exec_fut.poll_unpin(cx) {
+                Poll::Ready(Ready(ready)) => return Poll::Ready(Ok(ready)),
+                Poll::Ready(Retry(error)) => {
+                    if let Some(ref inspect) = self.inspect_err {
+                        inspect(&error);
+                    }
+
+                    match self.until {
+                        RepeatUntil::TimeoutMsExpired(until_ms) => {
+                            if !self.check_can_retry_after_timeout(until_ms) {
+                                return Poll::Ready(Err(RepeatError::timeout(until_ms, error)));
+                            }
+                        },
+                        RepeatUntil::AttemptsExceed(ref mut attempts) => {
+                            // Check if we have one more attempt to retry to execute the future.
+                            attempts.current_attempt += 1;
+                            if attempts.current_attempt >= attempts.total_attempts {
+                                return Poll::Ready(Err(RepeatError::attempts(attempts.current_attempt, error)));
+                            }
+                        },
+                        // Repeat until the future is ready.
+                        RepeatUntil::Ready => (),
+                    }
+
+                    // Create a new future attempt.
+                    self.exec_fut = (self.factory)();
+                    // Reset the timeout future.
+                    self.timeout_fut = Some(Timer::sleep(self.repeat_every.as_secs_f64()));
+                },
+                // We should proceed with this `exec` future attempt later.
+                Poll::Pending => return Poll::Pending,
+            }
+        }
+    }
+}
+
+struct AttemptsState {
+    current_attempt: usize,
+    total_attempts: usize,
+}
+
+impl AttemptsState {
+    fn new(total_attempts: usize) -> AttemptsState {
+        AttemptsState {
+            current_attempt: 0,
+            total_attempts,
+        }
+    }
+}
+
+enum RepeatUntil {
+    TimeoutMsExpired(u64),
+    AttemptsExceed(AttemptsState),
+    Ready,
+}
+
+impl Default for RepeatUntil {
+    fn default() -> Self { RepeatUntil::AttemptsExceed(AttemptsState::new(1)) }
+}
+
+/// Returns `Poll::Ready(())` if there is no need to wait for the timeout.
+fn poll_timeout(timeout_fut: &mut Option<Timer>, cx: &mut Context<'_>) -> Poll<()> {
+    let mut timeout = match timeout_fut.take() {
+        Some(timeout) => timeout,
+        None => return Poll::Ready(()),
+    };
+
+    match timeout.poll_unpin(cx) {
+        Poll::Ready(_) => Poll::Ready(()),
+        Poll::Pending => {
+            *timeout_fut = Some(timeout);
+            Poll::Pending
+        },
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::block_on;
+    use futures::lock::Mutex as AsyncMutex;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::sync::Arc;
+    use std::time::Duration;
+    use std::time::Instant;
+
+    async fn an_operation(counter: &AsyncMutex<usize>, finish_if: usize) -> Result<usize, &str> {
+        let mut counter = counter.lock().await;
+        *counter += 1;
+        if *counter == finish_if {
+            Ok(*counter)
+        } else {
+            Err("Not ready")
+        }
+    }
+
+    #[test]
+    fn test_attempts_success() {
+        const ATTEMPTS_TO_FINISH: usize = 3;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .attempts(ATTEMPTS_TO_FINISH);
+
+        let actual = block_on(fut);
+        // If the counter is 3, then there were exactly 3 attempts to finish the future.
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+    }
+
+    #[test]
+    fn test_attempts_exceed() {
+        const ATTEMPTS_TO_FINISH: usize = 3;
+        const ACTUAL_ATTEMPTS: usize = 2;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .attempts(ACTUAL_ATTEMPTS);
+
+        let actual = block_on(fut);
+        assert_eq!(
+            actual,
+            Err(RepeatError::AttemptsExceed {
+                attempts: ACTUAL_ATTEMPTS,
+                error: "Not ready"
+            })
+        );
+
+        // If the counter is 2, then there were exactly 2 attempts to finish the future.
+        let actual_attempts = block_on(counter.lock());
+        assert_eq!(*actual_attempts, ACTUAL_ATTEMPTS);
+    }
+
+    #[test]
+    fn test_attempts_retry_on_err() {
+        const ATTEMPTS_TO_FINISH: usize = 3;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .attempts(ATTEMPTS_TO_FINISH);
+
+        let actual = block_on(fut);
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+    }
+
+    #[test]
+    fn test_attempts_retry_on_err_macro() {
+        const ATTEMPTS_TO_FINISH: usize = 3;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = retry_on_err!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await })
+            .repeat_every(Duration::from_millis(100))
+            .attempts(ATTEMPTS_TO_FINISH);
+
+        let actual = block_on(fut);
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+    }
+
+    #[test]
+    fn test_attempts_inspect_err() {
+        const ATTEMPTS_TO_FINISH: usize = 3;
+        const FAILED_ATTEMPTS: usize = 2;
+
+        let inspect_counter = Arc::new(AtomicUsize::new(0));
+        let inspect_counter_c = inspect_counter.clone();
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .inspect_err(move |_| {
+                inspect_counter.fetch_add(1, Ordering::Relaxed);
+            })
+            .attempts(ATTEMPTS_TO_FINISH);
+
+        let actual = block_on(fut);
+        // If the counter is 3, then there were exactly 3 attempts to finish the future.
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+        // There should be 2 errors.
+        assert_eq!(inspect_counter_c.load(Ordering::Relaxed), FAILED_ATTEMPTS);
+    }
+
+    #[test]
+    fn test_until_success() {
+        const ATTEMPTS_TO_FINISH: usize = 5;
+        const LOWEST_TIMEOUT: Duration = Duration::from_millis(350);
+        const HIGHEST_TIMEOUT: Duration = Duration::from_millis(800);
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .until_ms(now_ms() + HIGHEST_TIMEOUT.as_millis() as u64);
+
+        let before = Instant::now();
+        let actual = block_on(fut);
+        let took = before.elapsed();
+
+        // If the counter is 3, then there were exactly 3 attempts to finish the future.
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+
+        assert!(
+            LOWEST_TIMEOUT <= took && took <= HIGHEST_TIMEOUT,
+            "Expected [{:?}, {:?}], but took {:?}",
+            LOWEST_TIMEOUT,
+            HIGHEST_TIMEOUT,
+            took
+        );
+    }
+
+    #[test]
+    fn test_until_expired() {
+        const ATTEMPTS_TO_FINISH: usize = 10;
+        const LOWEST_TIMEOUT: Duration = Duration::from_millis(350);
+        const HIGHEST_TIMEOUT: Duration = Duration::from_millis(800);
+
+        let counter = AsyncMutex::new(0);
+
+        let until_ms = now_ms() + HIGHEST_TIMEOUT.as_millis() as u64;
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .until_ms(until_ms);
+
+        let before = Instant::now();
+        let actual = block_on(fut);
+        let took = before.elapsed();
+
+        // If the counter is 3, then there were exactly 3 attempts to finish the future.
+        let error = RepeatError::TimeoutExpired {
+            until_ms,
+            error: "Not ready",
+        };
+        assert_eq!(actual, Err(error));
+
+        assert!(
+            LOWEST_TIMEOUT <= took && took <= HIGHEST_TIMEOUT,
+            "Expected [{:?}, {:?}], but took {:?}",
+            LOWEST_TIMEOUT,
+            HIGHEST_TIMEOUT,
+            took
+        );
+    }
+
+    #[test]
+    fn test_until_ms() {
+        const ATTEMPTS_TO_FINISH: usize = 5;
+        const LOWEST_TIMEOUT: u64 = 350;
+        const HIGHEST_TIMEOUT: u64 = 800;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every(Duration::from_millis(100))
+            .until_ms(now_ms() + HIGHEST_TIMEOUT);
+
+        let before = Instant::now();
+        let actual = block_on(fut);
+        let took = before.elapsed();
+
+        // If the counter is 3, then there were exactly 3 attempts to finish the future.
+        assert_eq!(actual, Ok(ATTEMPTS_TO_FINISH));
+
+        let lowest = Duration::from_millis(LOWEST_TIMEOUT);
+        let highest = Duration::from_millis(HIGHEST_TIMEOUT);
+        assert!(
+            lowest <= took && took <= highest,
+            "Expected [{:?}, {:?}], but took {:?}",
+            lowest,
+            highest,
+            took
+        );
+    }
+
+    /// `Repeatable` future should be executed the only once
+    /// if neither [`Repeatable::until`] nor [`Repeatable::attempts`] are specified.
+    ///
+    /// The first case within the following:
+    /// https://github.com/KomodoPlatform/atomicDEX-API/pull/1564#discussion_r1040989842
+    #[test]
+    fn test_without_attempts_and_timeout() {
+        const ATTEMPTS_TO_FINISH: usize = 5;
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() });
+
+        let actual = block_on(fut);
+
+        assert_eq!(
+            actual,
+            Err(RepeatError::AttemptsExceed {
+                attempts: 1,
+                error: "Not ready"
+            })
+        );
+    }
+
+    /// `Repeatable` future should be executed the only once
+    /// if neither [`Repeatable::until`] nor [`Repeatable::attempts`] are specified.
+    /// Please note that in this case [`Repeatable::repeat_every`] should have no effect.
+    ///
+    /// The first case within the following:
+    /// https://github.com/KomodoPlatform/atomicDEX-API/pull/1564#discussion_r1040989842
+    #[test]
+    fn test_repeat_every_without_attempts_and_timeout() {
+        const ATTEMPTS_TO_FINISH: usize = 5;
+        const LOWEST_TIMEOUT: Duration = Duration::from_micros(0);
+        const HIGHEST_TIMEOUT: Duration = Duration::from_millis(100);
+
+        let counter = AsyncMutex::new(0);
+
+        let fut = repeatable!(async { an_operation(&counter, ATTEMPTS_TO_FINISH).await.retry_on_err() })
+            .repeat_every_secs(10.);
+
+        let before = Instant::now();
+        let actual = block_on(fut);
+        let took = before.elapsed();
+
+        assert_eq!(
+            actual,
+            Err(RepeatError::AttemptsExceed {
+                attempts: 1,
+                error: "Not ready"
+            })
+        );
+
+        assert!(
+            LOWEST_TIMEOUT <= took && took <= HIGHEST_TIMEOUT,
+            "Expected [{:?}, {:?}], but took {:?}",
+            LOWEST_TIMEOUT,
+            HIGHEST_TIMEOUT,
+            took
+        );
+    }
+}
diff --git a/mm2src/common/custom_futures/timeout.rs b/mm2src/common/custom_futures/timeout.rs
new file mode 100644
index 0000000000..0c54ed71be
--- /dev/null
+++ b/mm2src/common/custom_futures/timeout.rs
@@ -0,0 +1,86 @@
+use crate::executor::Timer;
+use futures::task::Poll as Poll03;
+use futures::Future as Future03;
+use std::fmt;
+use std::pin::Pin;
+use std::task::Context;
+use std::time::Duration;
+
+#[derive(Debug)]
+pub struct TimeoutError {
+    pub duration: Duration,
+}
+
+impl fmt::Display for TimeoutError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}s timed out waiting for the future to complete",
+            self.duration.as_secs_f64()
+        )
+    }
+}
+
+/// Unlike `futures_timer::FutureExt` and Tokio timers, this trait implementation works with any reactor and on WASM arch.
+pub trait FutureTimerExt: Future03 + Sized {
+    /// Finishes with `TimeoutError` if the underlying future isn't ready withing the given timeframe.
+    fn timeout(self, duration: Duration) -> Timeout<Self> {
+        Timeout {
+            future: self,
+            timer: Timer::sleep(duration.as_secs_f64()),
+            duration,
+        }
+    }
+
+    fn timeout_secs(self, secs: f64) -> Timeout<Self> {
+        Timeout {
+            future: self,
+            timer: Timer::sleep(secs),
+            duration: Duration::from_secs_f64(secs),
+        }
+    }
+}
+
+impl<F: Future03 + Sized> FutureTimerExt for F {}
+
+/// Future returned by the `FutureTimerExt::timeout` method.
+#[must_use = "futures do nothing unless polled"]
+pub struct Timeout<F: Sized> {
+    future: F,
+    timer: Timer,
+    duration: Duration,
+}
+
+impl<F> Future03 for Timeout<F>
+where
+    F: Future03 + Unpin,
+{
+    type Output = Result<F::Output, TimeoutError>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll03<Self::Output> {
+        match Future03::poll(Pin::new(&mut self.future), cx) {
+            Poll03::Ready(out) => return Poll03::Ready(Ok(out)),
+            Poll03::Pending => (),
+        }
+        match Future03::poll(Pin::new(&mut self.timer), cx) {
+            Poll03::Ready(()) => Poll03::Ready(Err(TimeoutError {
+                duration: self.duration,
+            })),
+            Poll03::Pending => Poll03::Pending,
+        }
+    }
+}
+
+unsafe impl<F> Send for Timeout<F> where F: Send {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_timeout() {
+        let _err =
+            crate::block_on(Timer::sleep(0.4).timeout(Duration::from_secs_f64(0.1))).expect_err("Expected timeout");
+        let _ok = crate::block_on(Timer::sleep(0.1).timeout(Duration::from_secs_f64(0.2))).expect("Expected future");
+    }
+}
diff --git a/mm2src/common/custom_iter.rs b/mm2src/common/custom_iter.rs
index 4a26d4b336..c7e2d353fc 100644
--- a/mm2src/common/custom_iter.rs
+++ b/mm2src/common/custom_iter.rs
@@ -47,29 +47,6 @@ pub trait TryIntoGroupMap {
 
 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::*;
@@ -95,18 +72,4 @@ mod tests {
             .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/executor.rs b/mm2src/common/executor.rs
deleted file mode 100644
index c31f582371..0000000000
--- a/mm2src/common/executor.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-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/executor/abort_on_drop.rs b/mm2src/common/executor/abort_on_drop.rs
new file mode 100644
index 0000000000..e975f0ba70
--- /dev/null
+++ b/mm2src/common/executor/abort_on_drop.rs
@@ -0,0 +1,13 @@
+use futures::future::AbortHandle;
+
+/// The AbortHandle that aborts on drop
+pub struct AbortOnDropHandle(AbortHandle);
+
+impl From<AbortHandle> for AbortOnDropHandle {
+    fn from(handle: AbortHandle) -> Self { AbortOnDropHandle(handle) }
+}
+
+impl Drop for AbortOnDropHandle {
+    #[inline(always)]
+    fn drop(&mut self) { self.0.abort(); }
+}
diff --git a/mm2src/common/executor/abortable_system/abortable_queue.rs b/mm2src/common/executor/abortable_system/abortable_queue.rs
new file mode 100644
index 0000000000..9e74181e58
--- /dev/null
+++ b/mm2src/common/executor/abortable_system/abortable_queue.rs
@@ -0,0 +1,354 @@
+use crate::executor::abortable_system::{AbortableSystem, AbortedError, InnerShared, InnerWeak, SystemInner};
+use crate::executor::spawner::{SpawnAbortable, SpawnFuture};
+use crate::executor::{spawn, AbortSettings, Timer};
+use crate::log::{error, LogOnError};
+use futures::channel::oneshot;
+use futures::future::{abortable, select, Either};
+use futures::FutureExt;
+use std::future::Future as Future03;
+use std::sync::Arc;
+
+const CAPACITY: usize = 1024;
+
+type FutureId = usize;
+
+/// This is an `AbortableSystem` that ensures that the spawned futures will be aborted
+/// once the `AbortableQueue` instance is dropped.
+///
+/// `AbortableQueue` is responsible for storing future handles in `QueueInnerState`
+/// and deleting them as soon as they complete.
+#[derive(Debug, Default)]
+pub struct AbortableQueue {
+    inner: InnerShared<QueueInnerState>,
+}
+
+impl AbortableQueue {
+    /// Returns `WeakSpawner` that will not prevent the spawned futures from being aborted.
+    /// This is the only way to create a `'static` instance pointing to the same `QueueInnerState`
+    /// that can be passed into spawned futures, since `AbortableQueue` doesn't implement `Clone`.
+    pub fn weak_spawner(&self) -> WeakSpawner {
+        WeakSpawner {
+            inner: Arc::downgrade(&self.inner),
+        }
+    }
+}
+
+impl From<InnerShared<QueueInnerState>> for AbortableQueue {
+    fn from(inner: InnerShared<QueueInnerState>) -> Self { AbortableQueue { inner } }
+}
+
+impl AbortableSystem for AbortableQueue {
+    type Inner = QueueInnerState;
+
+    /// Aborts all spawned futures and initiates aborting of critical futures
+    /// after the specified [`AbortSettings::critical_timeout_s`].
+    fn abort_all(&self) -> Result<(), AbortedError> { self.inner.lock().abort_all() }
+
+    fn __push_subsystem_abort_tx(&self, subsystem_abort_tx: oneshot::Sender<()>) -> Result<(), AbortedError> {
+        self.inner.lock().insert_handle(subsystem_abort_tx).map(|_| ())
+    }
+}
+
+/// `WeakSpawner` doesn't prevent the spawned futures from being aborted.
+/// An instance of `WeakSpawner` can be safely passed into spawned futures.
+///
+/// # Important
+///
+/// If corresponding `AbortableQueue` instance is dropped, [`WeakSpawner::spawn`] won't
+/// actually spawn the future as it's more likely that the program, or part of the program,
+/// ends its work, and there is no need to execute tasks that are no longer relevant.
+#[derive(Clone)]
+pub struct WeakSpawner {
+    inner: InnerWeak<QueueInnerState>,
+}
+
+impl WeakSpawner {
+    /// Spawns the `fut` future with the specified abort `settings`.
+    /// The future won't be executed if `AbortableQueue` is dropped.
+    fn spawn_with_settings_impl<F>(&self, fut: F, settings: AbortSettings) -> Result<(), AbortedError>
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        let (abort_tx, abort_rx) = oneshot::channel();
+        let future_id = match self.inner.upgrade() {
+            Some(inner_arc) => {
+                let mut inner_guard = inner_arc.lock();
+                inner_guard.insert_handle(abort_tx)?
+            },
+            None => return Err(AbortedError),
+        };
+
+        let inner_weak = self.inner.clone();
+
+        let (abortable_fut, abort_handle) = abortable(fut);
+
+        let final_fut = async move {
+            let critical_timeout_s = settings.critical_timeout_s;
+
+            let wait_till_abort = async move {
+                // First, wait for the `abort_tx` sender (i.e. corresponding [`QueueInnerState::abort_handlers`] item) is dropped.
+                abort_rx.await.ok();
+
+                // If the `critical_timeout_s` is set, give the `fut` future to try
+                // to complete in `critical_timeout_s` seconds.
+                if let Some(critical_timeout_s) = critical_timeout_s {
+                    Timer::sleep(critical_timeout_s).await;
+                }
+            };
+
+            match select(abortable_fut.boxed(), wait_till_abort.boxed()).await {
+                // The future has finished normally.
+                Either::Left(_) => {
+                    if let Some(on_finish) = settings.on_finish {
+                        log::log!(on_finish.level, "{}", on_finish.msg);
+                    }
+
+                    if let Some(queue_inner) = inner_weak.upgrade() {
+                        queue_inner.lock().on_future_finished(future_id);
+                    }
+                },
+                // `abort_tx` has been removed from `QueueInnerState::abort_handlers`,
+                // *and* the `critical_timeout_s` timeout has expired (if was specified).
+                Either::Right(_) => {
+                    if let Some(on_abort) = settings.on_abort {
+                        log::log!(on_abort.level, "{}", on_abort.msg);
+                    }
+
+                    // Abort the input `fut`.
+                    abort_handle.abort();
+                },
+            }
+        };
+
+        spawn(final_fut);
+        Ok(())
+    }
+}
+
+impl SpawnFuture for WeakSpawner {
+    /// Records a warning to the log if the corresponding `AbortableQueue` system is aborted already.
+    #[track_caller]
+    fn spawn<F>(&self, f: F)
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        self.spawn_with_settings_impl(f, AbortSettings::default()).warn_log()
+    }
+}
+
+impl SpawnAbortable for WeakSpawner {
+    /// Records a warning to the log if the corresponding `AbortableQueue` system is aborted already.
+    #[track_caller]
+    fn spawn_with_settings<F>(&self, fut: F, settings: AbortSettings)
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        self.spawn_with_settings_impl(fut, settings).warn_log()
+    }
+}
+
+/// `QueueInnerState` is the container of the spawned future handles [`oneshot::Sender<()>`].
+/// It holds the future handles, gives every future its *unique* `FutureId` identifier
+/// (unique between spawned and alive futures).
+/// Once a future is finished, its `FutureId` can be reassign to another future.
+/// This is necessary so that this container does not grow indefinitely.
+#[derive(Debug)]
+pub enum QueueInnerState {
+    Ready {
+        abort_handlers: Vec<oneshot::Sender<()>>,
+        finished_futures: Vec<FutureId>,
+    },
+    Aborted,
+}
+
+impl Default for QueueInnerState {
+    fn default() -> Self {
+        QueueInnerState::Ready {
+            abort_handlers: Vec::with_capacity(CAPACITY),
+            finished_futures: Vec::with_capacity(CAPACITY),
+        }
+    }
+}
+
+impl QueueInnerState {
+    /// Inserts the given future `handle`.
+    fn insert_handle(&mut self, handle: oneshot::Sender<()>) -> Result<FutureId, AbortedError> {
+        let (abort_handlers, finished_futures) = match self {
+            QueueInnerState::Ready {
+                abort_handlers,
+                finished_futures,
+            } => (abort_handlers, finished_futures),
+            QueueInnerState::Aborted => return Err(AbortedError),
+        };
+
+        match finished_futures.pop() {
+            // We can reuse the given `finished_id`.
+            Some(finished_id) if finished_id < abort_handlers.len() => {
+                abort_handlers[finished_id] = handle;
+                // The freed future ID.
+                return Ok(finished_id);
+            },
+            // An invalid `FutureId` has been popped from the `finished_futures` container.
+            Some(invalid_finished_id) => {
+                error!("'The finished future ID ({invalid_finished_id}) doesn't belong to any future. Number of futures = {}", abort_handlers.len());
+            },
+            // There are no finished future IDs.
+            None => (),
+        }
+
+        abort_handlers.push(handle);
+        // Return the last item ID.
+        Ok(abort_handlers.len() - 1)
+    }
+
+    /// Releases the `finished_future_id` so it can be reused later on [`QueueInnerState::insert_handle`].
+    fn on_future_finished(&mut self, finished_future_id: FutureId) {
+        if let QueueInnerState::Ready { finished_futures, .. } = self {
+            finished_futures.push(finished_future_id);
+        }
+    }
+
+    #[cfg(test)]
+    fn count_abort_handlers(&self) -> Result<usize, AbortedError> {
+        match self {
+            QueueInnerState::Ready { abort_handlers, .. } => Ok(abort_handlers.len()),
+            QueueInnerState::Aborted => Err(AbortedError),
+        }
+    }
+
+    #[cfg(test)]
+    fn count_finished_futures(&self) -> Result<usize, AbortedError> {
+        match self {
+            QueueInnerState::Ready { finished_futures, .. } => Ok(finished_futures.len()),
+            QueueInnerState::Aborted => Err(AbortedError),
+        }
+    }
+}
+
+impl SystemInner for QueueInnerState {
+    fn abort_all(&mut self) -> Result<(), AbortedError> {
+        if matches!(self, QueueInnerState::Aborted) {
+            return Err(AbortedError);
+        }
+
+        *self = QueueInnerState::Aborted;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::block_on;
+
+    fn test_future_finished_impl(settings: AbortSettings) {
+        let abortable_system = AbortableQueue::default();
+        let spawner = abortable_system.weak_spawner();
+
+        spawner.spawn_with_settings(async {}, settings.clone());
+        block_on(Timer::sleep(0.1));
+
+        {
+            let inner = abortable_system.inner.lock();
+            assert_eq!(inner.count_abort_handlers().unwrap(), 1);
+            // The future should have finished already.
+            assert_eq!(inner.count_finished_futures().unwrap(), 1);
+        }
+
+        let fut1 = async { Timer::sleep(0.3).await };
+        let fut2 = async { Timer::sleep(0.7).await };
+        spawner.spawn_with_settings(fut1, settings.clone());
+        spawner.spawn_with_settings(fut2, settings.clone());
+
+        {
+            let inner = abortable_system.inner.lock();
+            // `abort_handlers` should be extended once
+            // because `finished_futures` contained only one freed `FutureId`.
+            assert_eq!(inner.count_abort_handlers().unwrap(), 2);
+            // `FutureId` should be used from `finished_futures` container.
+            assert_eq!(inner.count_finished_futures().unwrap(), 0);
+        }
+
+        block_on(Timer::sleep(0.5));
+
+        {
+            let inner = abortable_system.inner.lock();
+            assert_eq!(inner.count_abort_handlers().unwrap(), 2);
+            assert_eq!(inner.count_finished_futures().unwrap(), 1);
+        }
+
+        block_on(Timer::sleep(0.4));
+
+        {
+            let inner = abortable_system.inner.lock();
+            assert_eq!(inner.count_abort_handlers().unwrap(), 2);
+            assert_eq!(inner.count_finished_futures().unwrap(), 2);
+        }
+    }
+
+    #[test]
+    fn test_critical_future_finished() {
+        let settings = AbortSettings::default().critical_timout_s(1.);
+        test_future_finished_impl(settings);
+    }
+
+    #[test]
+    fn test_future_finished() {
+        let settings = AbortSettings::default();
+        test_future_finished_impl(settings);
+    }
+
+    #[test]
+    fn test_spawn_critical() {
+        static mut F1_FINISHED: bool = false;
+        static mut F2_FINISHED: bool = false;
+
+        let abortable_system = AbortableQueue::default();
+        let spawner = abortable_system.weak_spawner();
+
+        let settings = AbortSettings::default().critical_timout_s(0.4);
+
+        let fut1 = async move {
+            Timer::sleep(0.6).await;
+            unsafe { F1_FINISHED = true };
+        };
+        spawner.spawn_with_settings(fut1, settings.clone());
+
+        let fut2 = async move {
+            Timer::sleep(0.2).await;
+            unsafe { F2_FINISHED = true };
+        };
+        spawner.spawn_with_settings(fut2, settings.clone());
+
+        abortable_system.abort_all().unwrap();
+
+        block_on(Timer::sleep(1.2));
+        // `fut1` must not complete.
+        assert!(unsafe { !F1_FINISHED });
+        // `fut` must complete.
+        assert!(unsafe { F2_FINISHED });
+    }
+
+    #[test]
+    fn test_spawn_after_abort() {
+        static mut F1_FINISHED: bool = false;
+
+        for _ in 0..50 {
+            let abortable_system = AbortableQueue::default();
+            let spawner = abortable_system.weak_spawner();
+
+            spawner.spawn(futures::future::ready(()));
+            abortable_system.abort_all().unwrap();
+
+            // This sleep allows to poll the `select(abortable_fut.boxed(), wait_till_abort.boxed()).await` future.
+            block_on(Timer::sleep(0.01));
+
+            spawner.spawn(async move {
+                unsafe { F1_FINISHED = true };
+            });
+        }
+
+        // Futures spawned after `AbortableQueue::abort_all` must not complete.
+        assert!(unsafe { !F1_FINISHED });
+    }
+}
diff --git a/mm2src/common/executor/abortable_system/graceful_shutdown.rs b/mm2src/common/executor/abortable_system/graceful_shutdown.rs
new file mode 100644
index 0000000000..3feee076b2
--- /dev/null
+++ b/mm2src/common/executor/abortable_system/graceful_shutdown.rs
@@ -0,0 +1,76 @@
+use crate::executor::abortable_system::{AbortedError, InnerShared, SystemInner};
+use crate::executor::AbortableSystem;
+use futures::channel::oneshot;
+use futures::FutureExt;
+use std::future::Future;
+
+/// This is an `AbortableSystem` that initiates listeners for graceful shutdown
+/// once the `GracefulShutdownRegistry` instance is dropped.
+///
+/// `GracefulShutdownRegistry` can be used in conjunction with the `spawn` method.
+/// In some cases, the use of `GracefulShutdownRegistry` and `spawn` is justified.
+/// For example, [`hyper::Server::with_graceful_shutdown`].
+#[derive(Default)]
+pub struct GracefulShutdownRegistry {
+    inner: InnerShared<ShutdownInnerState>,
+}
+
+impl GracefulShutdownRegistry {
+    /// Registers a graceful shutdown listener and returns a future
+    /// that acts as a signal for graceful shutdown.
+    pub fn register_listener(&self) -> Result<impl Future<Output = ()> + Send + Sync + 'static, AbortedError> {
+        let (tx, rx) = oneshot::channel();
+        self.inner.lock().insert_handle(tx)?;
+        Ok(rx.then(|_| futures::future::ready(())))
+    }
+}
+
+impl From<InnerShared<ShutdownInnerState>> for GracefulShutdownRegistry {
+    fn from(inner: InnerShared<ShutdownInnerState>) -> Self { GracefulShutdownRegistry { inner } }
+}
+
+impl AbortableSystem for GracefulShutdownRegistry {
+    type Inner = ShutdownInnerState;
+
+    fn abort_all(&self) -> Result<(), AbortedError> { self.inner.lock().abort_all() }
+
+    fn __push_subsystem_abort_tx(&self, subsystem_abort_tx: oneshot::Sender<()>) -> Result<(), AbortedError> {
+        self.inner.lock().insert_handle(subsystem_abort_tx)
+    }
+}
+
+pub enum ShutdownInnerState {
+    Ready { abort_handlers: Vec<oneshot::Sender<()>> },
+    Aborted,
+}
+
+impl Default for ShutdownInnerState {
+    fn default() -> Self {
+        ShutdownInnerState::Ready {
+            abort_handlers: Vec::new(),
+        }
+    }
+}
+
+impl ShutdownInnerState {
+    fn insert_handle(&mut self, handle: oneshot::Sender<()>) -> Result<(), AbortedError> {
+        match self {
+            ShutdownInnerState::Ready { abort_handlers } => {
+                abort_handlers.push(handle);
+                Ok(())
+            },
+            ShutdownInnerState::Aborted => Err(AbortedError),
+        }
+    }
+}
+
+impl SystemInner for ShutdownInnerState {
+    fn abort_all(&mut self) -> Result<(), AbortedError> {
+        if matches!(self, ShutdownInnerState::Aborted) {
+            return Err(AbortedError);
+        }
+
+        *self = ShutdownInnerState::Aborted;
+        Ok(())
+    }
+}
diff --git a/mm2src/common/executor/abortable_system/mod.rs b/mm2src/common/executor/abortable_system/mod.rs
new file mode 100644
index 0000000000..b5399ad6dd
--- /dev/null
+++ b/mm2src/common/executor/abortable_system/mod.rs
@@ -0,0 +1,132 @@
+use crate::executor::spawn;
+use crate::log::LogOnError;
+use futures::channel::oneshot;
+use parking_lot::Mutex as PaMutex;
+use std::fmt;
+use std::sync::{Arc, Weak};
+
+pub mod abortable_queue;
+pub mod graceful_shutdown;
+pub mod simple_map;
+
+pub type InnerShared<Inner> = Arc<PaMutex<Inner>>;
+pub type InnerWeak<Inner> = Weak<PaMutex<Inner>>;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct AbortedError;
+
+impl fmt::Display for AbortedError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "Abortable system has been aborted already") }
+}
+
+pub trait AbortableSystem: From<InnerShared<Self::Inner>> {
+    type Inner: SystemInner;
+
+    /// Aborts all spawned futures and subsystems if they present.
+    /// The abortable system is considered not to be
+    fn abort_all(&self) -> Result<(), AbortedError>;
+
+    /// Creates a new subsystem `S` linked to `Self` the way that
+    /// if `Self` is aborted, the futures spawned by the subsystem will be aborted as well.
+    /// For more info, look at the [`tests::test_abort_subsystem`].
+    ///
+    ///
+    /// But in the same time the subsystem can be aborted independently from `Self` system.
+    /// For more info, look at the [`tests::test_abort_supersystem`].
+    fn create_subsystem<S>(&self) -> Result<S, AbortedError>
+    where
+        S: AbortableSystem,
+    {
+        let (abort_tx, abort_rx) = oneshot::channel();
+        self.__push_subsystem_abort_tx(abort_tx)?;
+
+        let inner_shared = Arc::new(PaMutex::new(S::Inner::default()));
+        let inner_weak = Arc::downgrade(&inner_shared);
+
+        let abort_fut = async move {
+            // Once the `abort_rx` is invoked, we need to abort its all futures.
+            abort_rx.await.ok();
+
+            if let Some(inner_arc) = inner_weak.upgrade() {
+                inner_arc.lock().abort_all().warn_log();
+            }
+        };
+
+        spawn(abort_fut);
+        Ok(S::from(inner_shared))
+    }
+
+    fn __push_subsystem_abort_tx(&self, subsystem_abort_tx: oneshot::Sender<()>) -> Result<(), AbortedError>;
+}
+
+pub trait SystemInner: Default + Send + 'static {
+    /// Aborts all spawned futures and subsystems if they present.
+    fn abort_all(&mut self) -> Result<(), AbortedError>;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::block_on;
+    use crate::executor::{SpawnFuture, Timer};
+    use abortable_queue::AbortableQueue;
+
+    #[test]
+    fn test_abort_subsystem() {
+        static mut SUPER_FINISHED: bool = false;
+        static mut SUB_FINISHED: bool = false;
+
+        let super_system = AbortableQueue::default();
+        super_system.weak_spawner().spawn(async move {
+            Timer::sleep(0.5).await;
+            unsafe { SUPER_FINISHED = true };
+        });
+
+        let sub_system: AbortableQueue = super_system.create_subsystem().unwrap();
+        sub_system.weak_spawner().spawn(async move {
+            Timer::sleep(0.5).await;
+            unsafe { SUB_FINISHED = true };
+        });
+
+        block_on(Timer::sleep(0.1));
+        drop(sub_system);
+        block_on(Timer::sleep(0.8));
+
+        // Only the super system should finish as the sub system has been aborted.
+        unsafe {
+            assert!(SUPER_FINISHED);
+            assert!(!SUB_FINISHED);
+        }
+    }
+
+    #[test]
+    fn test_abort_supersystem() {
+        static mut SUPER_FINISHED: bool = false;
+        static mut SUB_FINISHED: bool = false;
+
+        let super_system = AbortableQueue::default();
+        super_system.weak_spawner().spawn(async move {
+            Timer::sleep(0.5).await;
+            unsafe { SUPER_FINISHED = true };
+        });
+
+        let sub_system: AbortableQueue = super_system.create_subsystem().unwrap();
+        sub_system.weak_spawner().spawn(async move {
+            Timer::sleep(0.5).await;
+            unsafe { SUB_FINISHED = true };
+        });
+
+        block_on(Timer::sleep(0.1));
+        drop(super_system);
+        block_on(Timer::sleep(0.8));
+
+        // Check if the subsystem can't be aborted twice.
+        sub_system.abort_all().unwrap_err();
+
+        // Nothing should finish as the super system has been aborted.
+        unsafe {
+            assert!(!SUPER_FINISHED);
+            assert!(!SUB_FINISHED);
+        }
+    }
+}
diff --git a/mm2src/common/executor/abortable_system/simple_map.rs b/mm2src/common/executor/abortable_system/simple_map.rs
new file mode 100644
index 0000000000..c7cd9fc6cd
--- /dev/null
+++ b/mm2src/common/executor/abortable_system/simple_map.rs
@@ -0,0 +1,232 @@
+use crate::executor::abortable_system::{AbortableSystem, AbortedError, InnerShared, SystemInner};
+use crate::executor::{spawn_abortable, AbortOnDropHandle};
+use futures::channel::oneshot;
+use futures::future::Future as Future03;
+use parking_lot::{Mutex as PaMutex, MutexGuard as PaMutexGuard};
+use std::borrow::Borrow;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::hash::Hash;
+use std::sync::Arc;
+
+/// An alias.
+pub trait FutureIdTrait: 'static + Eq + Hash + Send {}
+
+impl<T: 'static + Eq + Hash + Send> FutureIdTrait for T {}
+
+/// This is a simple `AbortableSystem` that ensures that the spawned futures will be aborted
+/// once the `AbortableMap` instance is dropped.
+///
+/// `AbortableSet` is responsible for storing future handles in `SpawnedFuturesMap` *only*,
+/// and *not* responsible for deleting them when they complete.
+///
+/// `AbortableSet` allows to spawn futures by specified `FutureId`.
+#[derive(Default)]
+pub struct AbortableSimpleMap<FutureId: FutureIdTrait> {
+    inner: Arc<PaMutex<SimpleMapInnerState<FutureId>>>,
+}
+
+impl<FutureId: FutureIdTrait> AbortableSimpleMap<FutureId> {
+    /// Locks the inner `SimpleMapInner` that can be used to spawn/abort/check if contains future
+    /// by its `FutureId` identifier.
+    pub fn lock(&self) -> PaMutexGuard<'_, SimpleMapInnerState<FutureId>> { self.inner.lock() }
+}
+
+impl<FutureId: FutureIdTrait> AbortableSystem for AbortableSimpleMap<FutureId> {
+    type Inner = SimpleMapInnerState<FutureId>;
+
+    fn abort_all(&self) -> Result<(), AbortedError> { self.inner.lock().abort_all() }
+
+    fn __push_subsystem_abort_tx(&self, subsystem_abort_tx: oneshot::Sender<()>) -> Result<(), AbortedError> {
+        self.inner.lock().insert_subsystem(subsystem_abort_tx)
+    }
+}
+
+impl<FutureId: FutureIdTrait> From<InnerShared<SimpleMapInnerState<FutureId>>> for AbortableSimpleMap<FutureId> {
+    fn from(inner: InnerShared<SimpleMapInnerState<FutureId>>) -> Self { AbortableSimpleMap { inner } }
+}
+
+pub enum SimpleMapInnerState<FutureId: FutureIdTrait> {
+    Ready {
+        futures: HashMap<FutureId, AbortOnDropHandle>,
+        subsystems: Vec<oneshot::Sender<()>>,
+    },
+    Aborted,
+}
+
+impl<FutureId: FutureIdTrait> SimpleMapInnerState<FutureId> {
+    fn futures_mut(&mut self) -> Result<&mut HashMap<FutureId, AbortOnDropHandle>, AbortedError> {
+        match self {
+            SimpleMapInnerState::Ready { futures, .. } => Ok(futures),
+            SimpleMapInnerState::Aborted => Err(AbortedError),
+        }
+    }
+}
+
+impl<FutureId: FutureIdTrait> Default for SimpleMapInnerState<FutureId> {
+    fn default() -> Self {
+        SimpleMapInnerState::Ready {
+            futures: HashMap::new(),
+            subsystems: Vec::new(),
+        }
+    }
+}
+
+impl<FutureId: FutureIdTrait> SystemInner for SimpleMapInnerState<FutureId> {
+    fn abort_all(&mut self) -> Result<(), AbortedError> {
+        if matches!(self, SimpleMapInnerState::Aborted) {
+            return Err(AbortedError);
+        }
+
+        *self = SimpleMapInnerState::Aborted;
+        Ok(())
+    }
+}
+
+impl<FutureId: FutureIdTrait> SimpleMapInnerState<FutureId> {
+    /// Spawns the `fut` future by its `future_id`,
+    /// or do nothing if there is a spawned future with the same `future_id` already.
+    ///
+    /// Returns whether the future has been spawned.
+    pub fn spawn_or_ignore<F>(&mut self, future_id: FutureId, fut: F) -> Result<bool, AbortedError>
+    where
+        F: Future03<Output = ()> + Send + 'static,
+    {
+        let futures = self.futures_mut()?;
+        match futures.entry(future_id) {
+            Entry::Occupied(_) => Ok(false),
+            Entry::Vacant(entry) => {
+                let abort_handle = spawn_abortable(fut);
+                entry.insert(abort_handle);
+                Ok(true)
+            },
+        }
+    }
+
+    /// Whether a future with the given `future_id` has been spawned already.
+    pub fn contains<Q>(&self, future_id: &Q) -> Result<bool, AbortedError>
+    where
+        FutureId: Borrow<Q>,
+        Q: Hash + Eq + ?Sized,
+    {
+        match self {
+            SimpleMapInnerState::Ready { futures, .. } => Ok(futures.contains_key(future_id)),
+            SimpleMapInnerState::Aborted => Err(AbortedError),
+        }
+    }
+
+    /// Aborts a spawned future by the given `future_id` if it's still alive.
+    pub fn abort_future<Q>(&mut self, future_id: &Q) -> Result<bool, AbortedError>
+    where
+        FutureId: Borrow<Q>,
+        Q: Hash + Eq + ?Sized,
+    {
+        Ok(self.futures_mut()?.remove(future_id).is_some())
+    }
+
+    fn insert_subsystem(&mut self, subsystem_abort_tx: oneshot::Sender<()>) -> Result<(), AbortedError> {
+        match self {
+            SimpleMapInnerState::Ready { subsystems, .. } => {
+                subsystems.push(subsystem_abort_tx);
+                Ok(())
+            },
+            SimpleMapInnerState::Aborted => Err(AbortedError),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::block_on;
+    use crate::executor::Timer;
+
+    #[test]
+    fn test_abort_all() {
+        static mut F1_FINISHED: bool = false;
+        static mut F2_FINISHED: bool = false;
+
+        let abortable_system = AbortableSimpleMap::default();
+        let mut guard = abortable_system.lock();
+
+        guard
+            .spawn_or_ignore("F1".to_string(), async move {
+                Timer::sleep(0.1).await;
+                unsafe { F1_FINISHED = true };
+            })
+            .unwrap();
+        assert_eq!(guard.contains("F1"), Ok(true));
+        assert_eq!(guard.contains("F2"), Ok(false));
+        guard
+            .spawn_or_ignore("F2".to_string(), async move {
+                Timer::sleep(0.5).await;
+                unsafe { F2_FINISHED = true };
+            })
+            .unwrap();
+
+        drop(guard);
+        block_on(Timer::sleep(0.3));
+        abortable_system.abort_all().unwrap();
+        block_on(Timer::sleep(0.4));
+
+        unsafe {
+            assert!(F1_FINISHED);
+            assert!(!F2_FINISHED);
+        }
+    }
+
+    #[test]
+    fn test_abort_future() {
+        static mut F1_FINISHED: bool = false;
+
+        let abortable_system = AbortableSimpleMap::default();
+        let mut guard = abortable_system.lock();
+
+        guard
+            .spawn_or_ignore("F1".to_string(), async move {
+                Timer::sleep(0.2).await;
+                unsafe { F1_FINISHED = true };
+            })
+            .unwrap();
+
+        drop(guard);
+        block_on(Timer::sleep(0.05));
+
+        let mut guard = abortable_system.lock();
+        guard.abort_future("F1").unwrap();
+        assert_eq!(guard.contains("F1"), Ok(false));
+
+        block_on(Timer::sleep(0.3));
+
+        unsafe {
+            assert!(!F1_FINISHED);
+        }
+    }
+
+    #[test]
+    fn test_spawn_twice() {
+        static mut F1_FINISHED: bool = false;
+        static mut F1_COPY_FINISHED: bool = false;
+
+        let abortable_system = AbortableSimpleMap::default();
+        let mut guard = abortable_system.lock();
+
+        let fut_1 = async move {
+            unsafe { F1_FINISHED = true };
+        };
+        guard.spawn_or_ignore("F1".to_string(), fut_1).unwrap();
+
+        let fut_2 = async move {
+            unsafe { F1_COPY_FINISHED = true };
+        };
+        guard.spawn_or_ignore("F1".to_string(), fut_2).unwrap();
+
+        drop(guard);
+        block_on(Timer::sleep(0.1));
+
+        unsafe {
+            assert!(F1_FINISHED);
+            assert!(!F1_COPY_FINISHED);
+        }
+    }
+}
diff --git a/mm2src/common/executor/mod.rs b/mm2src/common/executor/mod.rs
new file mode 100644
index 0000000000..c11460a22e
--- /dev/null
+++ b/mm2src/common/executor/mod.rs
@@ -0,0 +1,82 @@
+use futures::future::abortable;
+use futures::{Future as Future03, FutureExt};
+
+#[cfg(not(target_arch = "wasm32"))] mod native_executor;
+#[cfg(not(target_arch = "wasm32"))]
+pub use native_executor::{spawn, Timer};
+
+mod abortable_system;
+pub use abortable_system::{abortable_queue, graceful_shutdown, simple_map, AbortableSystem, AbortedError};
+
+mod spawner;
+pub use spawner::{BoxFutureSpawner, SpawnAbortable, SpawnFuture};
+
+mod abort_on_drop;
+pub use abort_on_drop::AbortOnDropHandle;
+
+#[cfg(target_arch = "wasm32")] mod wasm_executor;
+#[cfg(target_arch = "wasm32")]
+pub use wasm_executor::{spawn, spawn_local, spawn_local_abortable, Timer};
+
+#[derive(Clone, Default)]
+pub struct AbortSettings {
+    on_finish: Option<SpawnMsg>,
+    on_abort: Option<SpawnMsg>,
+    critical_timeout_s: Option<f64>,
+}
+
+impl AbortSettings {
+    pub fn info_on_any_stop(msg: String) -> AbortSettings {
+        let msg = SpawnMsg {
+            level: log::Level::Info,
+            msg,
+        };
+        AbortSettings {
+            on_finish: Some(msg.clone()),
+            on_abort: Some(msg),
+            critical_timeout_s: None,
+        }
+    }
+
+    pub fn info_on_finish(msg: String) -> AbortSettings {
+        let msg = SpawnMsg {
+            level: log::Level::Info,
+            msg,
+        };
+        AbortSettings {
+            on_finish: Some(msg),
+            on_abort: None,
+            critical_timeout_s: None,
+        }
+    }
+
+    pub fn info_on_abort(msg: String) -> AbortSettings {
+        let msg = SpawnMsg {
+            level: log::Level::Info,
+            msg,
+        };
+        AbortSettings {
+            on_finish: None,
+            on_abort: Some(msg),
+            critical_timeout_s: None,
+        }
+    }
+
+    pub fn critical_timout_s(mut self, critical_timout_s: f64) -> AbortSettings {
+        self.critical_timeout_s = Some(critical_timout_s);
+        self
+    }
+}
+
+#[derive(Clone)]
+struct SpawnMsg {
+    level: log::Level,
+    msg: String,
+}
+
+#[must_use]
+pub fn spawn_abortable(fut: impl Future03<Output = ()> + Send + 'static) -> AbortOnDropHandle {
+    let (abortable, handle) = abortable(fut);
+    spawn(abortable.then(|_| futures::future::ready(())));
+    AbortOnDropHandle::from(handle)
+}
diff --git a/mm2src/common/executor/native_executor.rs b/mm2src/common/executor/native_executor.rs
index 7dfe275665..6876355b88 100644
--- a/mm2src/common/executor/native_executor.rs
+++ b/mm2src/common/executor/native_executor.rs
@@ -1,127 +1,57 @@
 use futures::task::Context;
 use futures::task::Poll as Poll03;
 use futures::Future as Future03;
-use gstuff::now_float;
+use futures_timer::Delay;
 use std::pin::Pin;
-use std::thread;
 use std::time::Duration;
 
+/// # Important
+///
+/// The `spawn` function must be used carefully to avoid hanging pointers.
+/// Please consider using `AbortableQueue`, `AbortableSimpleMap` or `spawn_abortable` instead.
 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.  
+/// A future that completes at a given time.
+#[must_use]
 pub struct Timer {
-    till_utc: f64,
+    delay: Delay,
 }
 
 impl Timer {
-    pub fn till(till_utc: f64) -> Timer { Timer { till_utc } }
     pub fn sleep(seconds: f64) -> Timer {
         Timer {
-            till_utc: now_float() + seconds,
+            delay: Delay::new(Duration::from_secs_f64(seconds)),
         }
     }
-    pub fn sleep_ms(ms: u32) -> Timer {
-        let seconds = gstuff::duration_to_float(Duration::from_millis(ms as u64));
+
+    pub fn sleep_ms(ms: u64) -> Timer {
         Timer {
-            till_utc: now_float() + seconds,
+            delay: Delay::new(Duration::from_millis(ms)),
         }
     }
-    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
-    }
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll03<Self::Output> { Pin::new(&mut self.delay).poll(cx) }
 }
 
-#[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(test)]
+mod tests {
+    use super::*;
+    use crate::now_float;
+
+    #[test]
+    fn test_timer() {
+        let started = now_float();
+        let ti = Timer::sleep(0.2);
+        let delta = now_float() - started;
+        assert!(delta < 0.04, "{}", delta);
+        crate::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/spawner.rs b/mm2src/common/executor/spawner.rs
new file mode 100644
index 0000000000..169c97ce14
--- /dev/null
+++ b/mm2src/common/executor/spawner.rs
@@ -0,0 +1,24 @@
+use crate::executor::AbortSettings;
+use futures::Future as Future03;
+
+pub trait BoxFutureSpawner {
+    fn spawn_boxed(&self, f: Box<dyn Future03<Output = ()> + Send + Unpin + 'static>);
+}
+
+impl<S: SpawnFuture> BoxFutureSpawner for S {
+    fn spawn_boxed(&self, f: Box<dyn Future03<Output = ()> + Send + Unpin + 'static>) { self.spawn(f) }
+}
+
+pub trait SpawnFuture {
+    /// Spawns the given `f` future.
+    fn spawn<F>(&self, f: F)
+    where
+        F: Future03<Output = ()> + Send + 'static;
+}
+
+pub trait SpawnAbortable {
+    /// Spawns the `fut` future with the specified abort `settings`.
+    fn spawn_with_settings<F>(&self, fut: F, settings: AbortSettings)
+    where
+        F: Future03<Output = ()> + Send + 'static;
+}
diff --git a/mm2src/common/executor/wasm_executor.rs b/mm2src/common/executor/wasm_executor.rs
index c31f582371..422f564623 100644
--- a/mm2src/common/executor/wasm_executor.rs
+++ b/mm2src/common/executor/wasm_executor.rs
@@ -1,4 +1,7 @@
+use crate::executor::AbortOnDropHandle;
 use crate::now_float;
+use crate::number_type_casting::SafeTypeCastingNumbers;
+use futures::future::{abortable, FutureExt};
 use futures::task::{Context, Poll};
 use std::future::Future;
 use std::pin::Pin;
@@ -9,19 +12,31 @@ use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 extern "C" {
-    /// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/setTimeout
+    // 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
+    // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/clearTimeout
     fn clearTimeout(id: i32);
 }
 
+/// # Important
+///
+/// The `spawn` function must be used carefully to avoid hanging pointers.
+/// Please consider using `AbortableQueue`, `AbortableSimpleMap` or `spawn_abortable` instead.
 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) }
-
+/// # Important
+///
+/// The `spawn` function must be used carefully to avoid hanging pointers.
+/// Please consider using `AbortableQueue`, `AbortableSimpleMap` or `spawn_abortable` instead.
 pub fn spawn_local(future: impl Future<Output = ()> + 'static) { wasm_bindgen_futures::spawn_local(future) }
 
+pub fn spawn_local_abortable(future: impl Future<Output = ()> + 'static) -> AbortOnDropHandle {
+    let (abortable, handle) = abortable(future);
+    spawn_local(abortable.then(|_| futures::future::ready(())));
+    AbortOnDropHandle::from(handle)
+}
+
 /// 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).
 ///
@@ -46,11 +61,11 @@ impl Timer {
 
     pub fn sleep(secs: f64) -> Timer {
         let dur = Duration::from_secs_f64(secs);
-        let delay_ms = gstuff::duration_to_ms(dur) as u32;
+        let delay_ms = gstuff::duration_to_ms(dur);
         Timer::sleep_ms(delay_ms)
     }
 
-    pub fn sleep_ms(delay_ms: u32) -> Timer {
+    pub fn sleep_ms(delay_ms: u64) -> Timer {
         fn on_timeout(state: &Arc<Mutex<TimerState>>) {
             let mut state = match state.lock() {
                 Ok(s) => s,
@@ -70,7 +85,7 @@ impl Timer {
         // 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);
+        let timeout_id = setTimeout(&closure, delay_ms.into_or_max());
         Timer {
             timeout_id,
             _closure: closure,
diff --git a/mm2src/common/fmt.rs b/mm2src/common/fmt.rs
new file mode 100644
index 0000000000..46a25a421f
--- /dev/null
+++ b/mm2src/common/fmt.rs
@@ -0,0 +1,68 @@
+use std::fmt;
+
+/// An alternative to the `write!` standard library macro that can never fail.
+/// The macro takes a `WriteSafe` writer as a `$dst` destination.
+#[macro_export]
+macro_rules! write_safe {
+    ($dst:expr, $($arg:tt)*) => {
+        $dst.write_safe(format_args!($($arg)*))
+    }
+}
+
+/// The trait is implemented for those types for those [`std::fmt::Write::write_fmt`] never fails.
+pub trait WriteSafe: fmt::Write {
+    fn write_safe(&mut self, args: fmt::Arguments<'_>) {
+        fmt::Write::write_fmt(self, args).expect("`write_fmt` should never fail for `WriteSafe` types")
+    }
+}
+
+impl WriteSafe for String {}
+
+pub trait WriteJoin: Iterator + Sized
+where
+    Self::Item: fmt::Display,
+{
+    fn write_join<W>(mut self, writer: &mut W, sep: &str) -> fmt::Result
+    where
+        W: fmt::Write,
+    {
+        if let Some(item) = self.next() {
+            write!(writer, "{}", item)?;
+        }
+        for item in self {
+            write!(writer, "{}{}", sep, item)?;
+        }
+        Ok(())
+    }
+}
+
+impl<I, T> WriteJoin for I
+where
+    I: Iterator<Item = T> + Sized,
+    T: fmt::Display,
+{
+}
+
+pub trait WriteSafeJoin: Iterator + Sized
+where
+    Self::Item: fmt::Display,
+{
+    fn write_safe_join<W>(mut self, writer: &mut W, sep: &str)
+    where
+        W: WriteSafe,
+    {
+        if let Some(item) = self.next() {
+            write_safe!(writer, "{}", item);
+        }
+        for item in self {
+            write_safe!(writer, "{}{}", sep, item);
+        }
+    }
+}
+
+impl<I, T> WriteSafeJoin for I
+where
+    I: Iterator<Item = T> + Sized,
+    T: fmt::Display,
+{
+}
diff --git a/mm2src/common/jsonrpc_client.rs b/mm2src/common/jsonrpc_client.rs
index 63f2ea0a55..94a1ca809b 100644
--- a/mm2src/common/jsonrpc_client.rs
+++ b/mm2src/common/jsonrpc_client.rs
@@ -48,7 +48,7 @@ macro_rules! rpc_req {
 }
 
 pub type JsonRpcResponseFut =
-    Box<dyn Future<Item = (JsonRpcRemoteAddr, JsonRpcResponseEnum), Error = String> + Send + 'static>;
+    Box<dyn Future<Item = (JsonRpcRemoteAddr, JsonRpcResponseEnum), Error = JsonRpcErrorType> + 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
@@ -237,6 +237,16 @@ impl fmt::Display for JsonRpcError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{:?}", self) }
 }
 
+impl JsonRpcError {
+    pub fn new(client_info: String, request: JsonRpcRequestEnum, error: JsonRpcErrorType) -> Self {
+        Self {
+            client_info,
+            request,
+            error,
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub enum JsonRpcErrorType {
     /// Invalid outgoing request error
@@ -247,9 +257,12 @@ pub enum JsonRpcErrorType {
     Parse(JsonRpcRemoteAddr, String),
     /// The JSON-RPC error returned from server
     Response(JsonRpcRemoteAddr, Json),
+    Internal(String),
 }
 
 impl JsonRpcErrorType {
+    pub fn parse_error(remote_addr: &str, err: String) -> Self { Self::Parse(remote_addr.to_string().into(), err) }
+
     /// Whether the error type is [`JsonRpcErrorType::Transport`].
     #[inline]
     pub fn is_transport(&self) -> bool { matches!(self, JsonRpcErrorType::Transport(_)) }
@@ -273,9 +286,11 @@ pub trait JsonRpcClient {
     /// 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();
+        let request = JsonRpcRequestEnum::Single(request);
         Box::new(
-            self.transport(JsonRpcRequestEnum::Single(request.clone()))
-                .then(move |result| process_transport_single_result(result, client_info, request)),
+            self.transport(request.clone())
+                .then(move |result| process_transport_single_result(result))
+                .map_err(|e| JsonRpcError::new(client_info, request, e)),
         )
     }
 }
@@ -301,9 +316,11 @@ pub trait JsonRpcBatchClient: JsonRpcClient {
     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();
+        let batch_request = JsonRpcRequestEnum::Batch(request.clone());
         Box::new(
-            self.transport(JsonRpcRequestEnum::Batch(request.clone()))
-                .then(move |result| process_transport_batch_result(result, client_info, request)),
+            self.transport(batch_request.clone())
+                .then(move |result| process_transport_batch_result(result, request))
+                .map_err(|e| JsonRpcError::new(client_info, batch_request, e)),
         )
     }
 
@@ -334,9 +351,11 @@ pub trait JsonRpcMultiClient: JsonRpcClient {
         request: JsonRpcRequest,
     ) -> RpcRes<T> {
         let client_info = self.client_info();
+        let request = JsonRpcRequestEnum::Single(request);
         Box::new(
-            self.transport_exact(to_addr.to_owned(), JsonRpcRequestEnum::Single(request.clone()))
-                .then(move |result| process_transport_single_result(result, client_info, request)),
+            self.transport_exact(to_addr.to_owned(), request.clone())
+                .then(move |result| process_transport_single_result(result))
+                .map_err(|e| JsonRpcError::new(client_info, request, e)),
         )
     }
 }
@@ -344,75 +363,49 @@ pub trait JsonRpcMultiClient: JsonRpcClient {
 /// 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 request = JsonRpcRequestEnum::Single(request);
-
+    result: Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), JsonRpcErrorType>,
+) -> Result<T, JsonRpcErrorType> {
     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),
-        }),
+        Ok((remote_addr, JsonRpcResponseEnum::Single(single))) => process_single_response(remote_addr, single),
+        Ok((remote_addr, JsonRpcResponseEnum::Batch(batch))) => Err(JsonRpcErrorType::Parse(
+            remote_addr,
+            ERRL!("Expected single response, found batch response: {:?}", batch),
+        )),
+        Err(e) => Err(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,
+    result: Result<(JsonRpcRemoteAddr, JsonRpcResponseEnum), JsonRpcErrorType>,
     request: JsonRpcBatchRequest,
-) -> Result<Vec<T>, JsonRpcError> {
+) -> Result<Vec<T>, JsonRpcErrorType> {
     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,
-                request,
-                error: JsonRpcErrorType::Transport(e),
-            })
+            return Err(JsonRpcErrorType::Parse(
+                remote_addr,
+                ERRL!("Expected batch response, found single response: {:?}", single),
+            ));
         },
+        Err(e) => return Err(e),
     };
 
     // 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),
-        });
+        return Err(JsonRpcErrorType::Parse(
+            remote_addr,
+            ERRL!(
+                "Expected '{}' elements in batch response, found '{}'",
+                orig_ids.len(),
+                response_map.len()
+            ),
+        ));
     }
 
     let mut result = Vec::with_capacity(orig_ids.len());
@@ -420,21 +413,14 @@ fn process_transport_batch_result<T: DeserializeOwned + Send + 'static>(
         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),
-                });
+                return Err(JsonRpcErrorType::Parse(
+                    remote_addr,
+                    ERRL!("Batch response doesn't contain '{}' identifier", id),
+                ));
             },
         };
 
-        result.push(process_single_response(
-            client_info.clone(),
-            remote_addr.clone(),
-            request.clone(),
-            single_resp,
-        )?);
+        result.push(process_single_response(remote_addr.clone(), single_resp)?);
     }
     Ok(result)
 }
@@ -442,25 +428,17 @@ fn process_transport_batch_result<T: DeserializeOwned + Send + 'static>(
 /// 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> {
+) -> Result<T, JsonRpcErrorType> {
     if !response.error.is_null() {
-        return Err(JsonRpcError {
-            client_info,
-            request,
-            error: JsonRpcErrorType::Response(remote_addr, response.error),
-        });
+        return Err(JsonRpcErrorType::Response(remote_addr, response.error));
     }
 
-    json::from_value(response.result.clone()).map_err(|e| JsonRpcError {
-        client_info,
-        request,
-        error: JsonRpcErrorType::Parse(
+    json::from_value(response.result.clone()).map_err(|e| {
+        JsonRpcErrorType::Parse(
             remote_addr,
             ERRL!("error {:?} parsing result from response {:?}", e, response),
-        ),
+        )
     })
 }
diff --git a/mm2src/common/log.rs b/mm2src/common/log.rs
index 4c3f9853fb..733d0e8f83 100644
--- a/mm2src/common/log.rs
+++ b/mm2src/common/log.rs
@@ -1,7 +1,7 @@
 //! Human-readable logging and statuses.
 
-use super::executor::{spawn, Timer};
 use super::{now_ms, writeln};
+use crate::executor::{spawn_abortable, AbortOnDropHandle, Timer};
 use crate::filename;
 use chrono::format::strftime::StrftimeItems;
 use chrono::format::DelayedFormat;
@@ -155,6 +155,7 @@ pub fn short_log_time(ms: u64) -> DelayedFormat<StrftimeItems<'static>> {
     // NB: Given that the debugging logs are targeted at the developers and not the users
     // I think it's better to output the time in GMT here
     // in order for the developers to more easily match the events between the various parts of the peer-to-peer system.
+    #[allow(deprecated)]
     let time = Utc.timestamp_millis(ms as i64);
     time.format("%d %H:%M:%S")
 }
@@ -464,6 +465,7 @@ impl Default for LogEntry {
 
 impl LogEntry {
     pub fn format(&self, buf: &mut String) -> Result<(), fmt::Error> {
+        #[allow(deprecated)]
         let time = Local.timestamp_millis(self.time as i64);
         let time_formatted = time.format("%Y-%m-%d %H:%M:%S %z");
         let emotion = if self.emotion.is_empty() { "·" } else { &self.emotion };
@@ -601,6 +603,8 @@ pub struct LogState {
     gravity: PaMutex<Option<Arc<Gravity>>>,
     /// Keeps track of the log level that the log state is initiated with
     level: LogLevel,
+    /// `log_dashboard_sometimes` abort handle if it has been spawned.
+    _dashboard_abort_handle: Option<AbortOnDropHandle>,
 }
 
 #[derive(Clone)]
@@ -608,7 +612,7 @@ pub struct LogArc(pub Arc<LogState>);
 
 impl Deref for LogArc {
     type Target = LogState;
-    fn deref(&self) -> &LogState { &*self.0 }
+    fn deref(&self) -> &LogState { &self.0 }
 }
 
 impl LogArc {
@@ -730,20 +734,21 @@ impl LogState {
             tail: Arc::new(PaMutex::new(VecDeque::with_capacity(64))),
             gravity: PaMutex::new(None),
             level: LogLevel::default(),
+            _dashboard_abort_handle: None,
         }
     }
 
     /// Initialize according to the MM command-line configuration.
     pub fn mm(_conf: &Json) -> LogState {
         let dashboard = Arc::new(PaMutex::new(Vec::new()));
-
-        spawn(log_dashboard_sometimes(Arc::downgrade(&dashboard)));
+        let abort_handle = spawn_abortable(log_dashboard_sometimes(Arc::downgrade(&dashboard)));
 
         LogState {
             dashboard,
             tail: Arc::new(PaMutex::new(VecDeque::with_capacity(64))),
             gravity: PaMutex::new(None),
             level: LogLevel::default(),
+            _dashboard_abort_handle: Some(abort_handle),
         }
     }
 
@@ -769,7 +774,7 @@ impl LogState {
 
     pub fn with_tail(&self, cb: &mut dyn FnMut(&VecDeque<LogEntry>)) {
         let tail = self.tail.lock();
-        cb(&*tail)
+        cb(&tail)
     }
 
     pub fn with_gravity_tail(&self, cb: &mut dyn FnMut(&VecDeque<String>)) {
@@ -777,7 +782,7 @@ impl LogState {
         if let Some(ref gravity) = gravity {
             gravity.flush();
             let tail = gravity.tail.lock();
-            cb(&*tail);
+            cb(&tail);
         }
     }
 
diff --git a/mm2src/common/log/wasm_log.rs b/mm2src/common/log/wasm_log.rs
index ce74fb06ef..3d7f83a16b 100644
--- a/mm2src/common/log/wasm_log.rs
+++ b/mm2src/common/log/wasm_log.rs
@@ -101,6 +101,10 @@ impl WasmCallback {
                 }
             }
         };
+
+        // There is no async operations within the loop except reading from the `rx` receiver.
+        // So we're sure that once the `tx` sender is dropped, the loop will be stopped immediately.
+        // Please note that `WasmCallBack` is set on MarketMaker start/restart.
         spawn_local(fut);
         WasmCallback { tx }
     }
@@ -115,6 +119,10 @@ impl WasmCallback {
                 console::log_1(&msg_js);
             }
         };
+
+        // The future can be spawned safely since it doesn't hold any shared pointer,
+        // and will be stopped immediately once `WasmCallback` is dropped.
+        // Please note that `WasmCallBack` is set on MarketMaker start/restart.
         spawn_local(fut);
         WasmCallback { tx }
     }
diff --git a/mm2src/common/mm_metrics/mod.rs b/mm2src/common/mm_metrics/mod.rs
deleted file mode 100644
index 6c84d4de48..0000000000
--- a/mm2src/common/mm_metrics/mod.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::log::LogWeak;
-use serde_json::{Value as Json, Value};
-use std::collections::HashMap;
-use std::sync::{Arc, Weak};
-
-#[cfg(not(target_arch = "wasm32"))] mod native;
-#[cfg(not(target_arch = "wasm32"))]
-pub use native::{prometheus, Clock, Metrics, TrySink};
-
-#[cfg(target_arch = "wasm32")] mod wasm;
-#[cfg(target_arch = "wasm32")] pub use wasm::{Clock, Metrics};
-
-pub trait MetricsOps {
-    /// If the instance was not initialized yet, create the `receiver` else return an error.
-    fn init(&self) -> Result<(), String>;
-
-    /// Create new Metrics instance and spawn the metrics recording into the log, else return an error.
-    fn init_with_dashboard(&self, log_state: LogWeak, record_interval: f64) -> Result<(), String>;
-
-    /// Handle for sending metric samples.
-    fn clock(&self) -> Result<Clock, String>;
-
-    /// Collect the metrics as Json.
-    fn collect_json(&self) -> Result<Json, String>;
-}
-
-pub trait ClockOps {
-    fn now(&self) -> u64;
-}
-
-#[derive(Clone, Default)]
-pub struct MetricsArc(pub Arc<Metrics>);
-
-impl MetricsOps for MetricsArc {
-    fn init(&self) -> Result<(), String> { self.0.init() }
-
-    fn init_with_dashboard(&self, log_state: LogWeak, record_interval: f64) -> Result<(), String> {
-        self.0.init_with_dashboard(log_state, record_interval)
-    }
-
-    fn clock(&self) -> Result<Clock, String> { self.0.clock() }
-
-    fn collect_json(&self) -> Result<Value, String> { self.0.collect_json() }
-}
-
-impl MetricsArc {
-    /// Create new `Metrics` instance
-    pub fn new() -> MetricsArc { MetricsArc(Arc::new(Default::default())) }
-
-    /// Try to obtain the `Metrics` from the weak pointer.
-    pub fn from_weak(weak: &MetricsWeak) -> Option<MetricsArc> { weak.0.upgrade().map(MetricsArc) }
-
-    /// Create a weak pointer from `MetricsWeak`.
-    pub fn weak(&self) -> MetricsWeak { MetricsWeak(Arc::downgrade(&self.0)) }
-}
-
-#[derive(Clone, Default)]
-pub struct MetricsWeak(pub Weak<Metrics>);
-
-impl MetricsWeak {
-    /// Create a default MmWeak without allocating any memory.
-    pub fn new() -> MetricsWeak { MetricsWeak::default() }
-
-    pub fn dropped(&self) -> bool { self.0.strong_count() == 0 }
-}
-
-#[derive(Serialize, Debug, Default, Deserialize)]
-pub struct MetricsJson {
-    pub metrics: Vec<MetricType>,
-}
-
-#[derive(Eq, Debug, Deserialize, PartialEq, Serialize)]
-#[serde(rename_all = "lowercase")]
-#[serde(tag = "type")]
-pub enum MetricType {
-    Counter {
-        key: String,
-        labels: HashMap<String, String>,
-        value: u64,
-    },
-    Gauge {
-        key: String,
-        labels: HashMap<String, String>,
-        value: i64,
-    },
-    Histogram {
-        key: String,
-        labels: HashMap<String, String>,
-        #[serde(flatten)]
-        quantiles: HashMap<String, u64>,
-    },
-}
diff --git a/mm2src/common/mm_metrics/native.rs b/mm2src/common/mm_metrics/native.rs
deleted file mode 100644
index fafa3beab0..0000000000
--- a/mm2src/common/mm_metrics/native.rs
+++ /dev/null
@@ -1,756 +0,0 @@
-use super::*;
-use crate::executor::{spawn, Timer};
-use crate::log::error;
-use gstuff::Constructible;
-use hdrhistogram::Histogram;
-use itertools::Itertools;
-use metrics_core::{Builder, Drain, Key, Label, Observe, Observer, ScopedString};
-use metrics_runtime::{observers::PrometheusBuilder, Receiver};
-use metrics_util::{parse_quantiles, Quantile};
-use serde_json as json;
-use std::collections::HashMap;
-use std::fmt;
-use std::slice::Iter;
-
-use crate::log::{LogArc, Tag};
-pub use metrics_runtime::Sink;
-
-/// Increment counter if an MmArc is not dropped yet and metrics system is initialized already.
-#[macro_export]
-macro_rules! mm_counter {
-    ($metrics:expr, $name:expr, $value:expr) => {{
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            sink.increment_counter($name, $value);
-        }
-    }};
-    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
-        use metrics::labels;
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            let labels = labels!( $($label_key => $label_val),+ );
-            sink.increment_counter_with_labels($name, $value, labels);
-        }
-    }};
-}
-
-/// Update gauge if an MmArc is not dropped yet and metrics system is initialized already.
-#[macro_export]
-macro_rules! mm_gauge {
-    ($metrics:expr, $name:expr, $value:expr) => {{
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            sink.update_gauge($name, $value);
-        }
-    }};
-
-    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
-        use metrics::labels;
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            let labels = labels!( $($label_key => $label_val),+ );
-            sink.update_gauge_with_labels($name, $value, labels);
-        }
-    }};
-}
-
-/// Pass new timing value if an MmArc is not dropped yet and metrics system is initialized already.
-#[macro_export]
-macro_rules! mm_timing {
-    ($metrics:expr, $name:expr, $start:expr, $end:expr) => {{
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            sink.record_timing($name, $start, $end);
-        }
-    }};
-
-    ($metrics:expr, $name:expr, $start:expr, $end:expr, $($label_key:expr => $label_val:expr),+) => {{
-        use metrics::labels;
-        if let Some(mut sink) = $crate::mm_metrics::TrySink::try_sink(&$metrics) {
-            let labels = labels!( $($label_key => $label_val),+ );
-            sink.record_timing_with_labels($name, $start, $end, labels);
-        }
-    }};
-}
-
-/// Default quantiles are "min" and "max"
-const QUANTILES: &[f64] = &[0.0, 1.0];
-
-pub trait TrySink {
-    fn try_sink(&self) -> Option<Sink>;
-}
-
-impl TrySink for MetricsArc {
-    fn try_sink(&self) -> Option<Sink> { self.0.sink().ok() }
-}
-
-impl TrySink for MetricsWeak {
-    fn try_sink(&self) -> Option<Sink> {
-        let metrics = MetricsArc::from_weak(self)?;
-        metrics.0.sink().ok()
-    }
-}
-
-pub struct Clock {
-    sink: Sink,
-}
-
-impl From<Sink> for Clock {
-    fn from(sink: Sink) -> Self { Clock { sink } }
-}
-
-impl ClockOps for Clock {
-    fn now(&self) -> u64 { self.sink.now() }
-}
-
-#[derive(Default)]
-pub struct Metrics {
-    /// `Receiver` receives and collect all the metrics sent through the `sink`.
-    /// The `receiver` can be initialized only once time.
-    receiver: Constructible<Receiver>,
-}
-
-impl MetricsOps for Metrics {
-    fn init(&self) -> Result<(), String> {
-        if self.receiver.is_some() {
-            return ERR!("metrics system is initialized already");
-        }
-
-        let receiver = try_s!(Receiver::builder().build());
-        let _ = try_s!(self.receiver.pin(receiver));
-
-        Ok(())
-    }
-
-    fn init_with_dashboard(&self, log_state: LogWeak, record_interval: f64) -> Result<(), String> {
-        self.init()?;
-
-        let controller = self.receiver.as_option().unwrap().controller();
-
-        let observer = TagObserver::new(QUANTILES);
-        let exporter = TagExporter {
-            log_state,
-            controller,
-            observer,
-        };
-
-        spawn(exporter.run(record_interval));
-
-        Ok(())
-    }
-
-    fn clock(&self) -> Result<Clock, String> { self.sink().map_err(|e| ERRL!("{}", e)).map(Clock::from) }
-
-    fn collect_json(&self) -> Result<Json, String> {
-        let receiver = try_s!(self.try_receiver());
-        let controller = receiver.controller();
-
-        let mut observer = JsonObserver::new(QUANTILES);
-
-        controller.observe(&mut observer);
-
-        observer.into_json()
-    }
-}
-
-impl Metrics {
-    /// Try get receiver.
-    fn try_receiver(&self) -> Result<&Receiver, String> {
-        self.receiver.ok_or("metrics system is not initialized yet".into())
-    }
-
-    fn sink(&self) -> Result<Sink, String> { Ok(try_s!(self.try_receiver()).sink()) }
-
-    /// Collect the metrics in Prometheus format.
-    pub fn collect_prometheus_format(&self) -> Result<String, String> {
-        let receiver = try_s!(self.try_receiver());
-        let controller = receiver.controller();
-
-        let mut observer = PrometheusBuilder::new().set_quantiles(QUANTILES).build();
-        controller.observe(&mut observer);
-
-        Ok(observer.drain())
-    }
-}
-
-type MetricName = ScopedString;
-
-type MetricLabels = Vec<Label>;
-
-type MetricNameValueMap = HashMap<MetricName, Integer>;
-
-#[derive(Clone, Eq, PartialEq, PartialOrd, Ord)]
-enum Integer {
-    Signed(i64),
-    Unsigned(u64),
-}
-
-impl fmt::Display for Integer {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Integer::Signed(x) => write!(f, "{}", x),
-            Integer::Unsigned(x) => write!(f, "{}", x),
-        }
-    }
-}
-
-struct PreparedMetric {
-    tags: Vec<Tag>,
-    message: String,
-}
-
-/// Observes metrics and histograms in Tag format.
-struct TagObserver {
-    /// Supported quantiles like Min, 0.5, 0.8, Max
-    quantiles: Vec<Quantile>,
-    /// Metric:Value pair matching an unique set of labels.
-    metrics: HashMap<MetricLabels, MetricNameValueMap>,
-    /// Histograms present set of time measurements and analysis over the measurements
-    histograms: HashMap<Key, Histogram<u64>>,
-}
-
-impl TagObserver {
-    fn new(quantiles: &[f64]) -> Self {
-        TagObserver {
-            quantiles: parse_quantiles(quantiles),
-            metrics: Default::default(),
-            histograms: Default::default(),
-        }
-    }
-
-    fn prepare_metrics(&self) -> Vec<PreparedMetric> {
-        self.metrics
-            .iter()
-            .map(|(labels, name_value_map)| {
-                let tags = labels_to_tags(labels.iter());
-                let message = name_value_map_to_message(name_value_map);
-
-                PreparedMetric { tags, message }
-            })
-            .collect()
-    }
-
-    fn prepare_histograms(&self) -> Vec<PreparedMetric> {
-        self.histograms
-            .iter()
-            .map(|(key, hist)| {
-                let tags = labels_to_tags(key.labels());
-                let message = format!("{}: {}", key.name(), hist_to_message(hist, &self.quantiles));
-
-                PreparedMetric { tags, message }
-            })
-            .collect()
-    }
-
-    fn insert_metric(&mut self, key: Key, value: Integer) {
-        let (name, labels) = key.into_parts();
-        self.metrics
-            .entry(labels)
-            .and_modify(|name_value_map| {
-                name_value_map.insert(name.clone(), value.clone());
-            })
-            .or_insert({
-                let mut name_value_map = HashMap::new();
-                name_value_map.insert(name, value);
-                name_value_map
-            });
-    }
-
-    /// Clear metrics or histograms if it's necessary
-    /// after an exporter has turned the observer's metrics and histograms.
-    fn on_turned(&mut self) {
-        // clear histograms because they can be duplicated
-        self.histograms.clear();
-        // don't clear metrics because the keys don't changes often
-    }
-}
-
-impl Observer for TagObserver {
-    fn observe_counter(&mut self, key: Key, value: u64) { self.insert_metric(key, Integer::Unsigned(value)) }
-
-    fn observe_gauge(&mut self, key: Key, value: i64) { self.insert_metric(key, Integer::Signed(value)) }
-
-    fn observe_histogram(&mut self, key: Key, values: &[u64]) {
-        let entry = self.histograms.entry(key).or_insert({
-            // Use default significant figures value.
-            // For more info on `sigfig` see the Historgam::new_with_bounds().
-            let sigfig = 3;
-            match Histogram::new(sigfig) {
-                Ok(x) => x,
-                Err(err) => {
-                    error!("failed to create histogram: {}", err);
-                    // do nothing on error
-                    return;
-                },
-            }
-        });
-
-        for value in values {
-            if let Err(err) = entry.record(*value) {
-                error!("failed to observe histogram value: {}", err);
-            }
-        }
-    }
-}
-
-/// Observes metrics and histograms in Tag format.
-struct JsonObserver {
-    /// Supported quantiles like Min, 0.5, 0.8, Max.
-    quantiles: Vec<Quantile>,
-    /// Collected metrics and histograms as serializable and deserializable structure.
-    metrics: MetricsJson,
-}
-
-impl Observer for JsonObserver {
-    fn observe_counter(&mut self, key: Key, value: u64) {
-        let (key, labels) = key.into_parts();
-
-        let metric = MetricType::Counter {
-            key: key.to_string(),
-            labels: labels_into_parts(labels.iter()),
-            value,
-        };
-
-        self.metrics.metrics.push(metric);
-    }
-
-    fn observe_gauge(&mut self, key: Key, value: i64) {
-        let (key, labels) = key.into_parts();
-
-        let metric = MetricType::Gauge {
-            key: key.to_string(),
-            labels: labels_into_parts(labels.iter()),
-            value,
-        };
-
-        self.metrics.metrics.push(metric);
-    }
-
-    fn observe_histogram(&mut self, key: Key, values: &[u64]) {
-        let (key, labels) = key.into_parts();
-
-        // Use default significant figures value.
-        // For more info on `sigfig` see the Historgam::new_with_bounds().
-        let sigfig = 3;
-        let mut histogram = match Histogram::new(sigfig) {
-            Ok(x) => x,
-            Err(err) => {
-                error!("failed to create histogram: {}", err);
-                // do nothing on error
-                return;
-            },
-        };
-
-        for value in values {
-            if let Err(err) = histogram.record(*value) {
-                error!("failed to observe histogram value: {}", err);
-            }
-        }
-
-        let count = histogram.len() as u64;
-        let mut quantiles = hist_at_quantiles(histogram, &self.quantiles);
-        // add total quantiles number
-        quantiles.insert("count".into(), count);
-
-        let metric = MetricType::Histogram {
-            key: key.to_string(),
-            labels: labels_into_parts(labels.iter()),
-            quantiles,
-        };
-
-        self.metrics.metrics.push(metric);
-    }
-}
-
-impl JsonObserver {
-    fn new(quantiles: &[f64]) -> Self {
-        JsonObserver {
-            quantiles: parse_quantiles(quantiles),
-            metrics: Default::default(),
-        }
-    }
-
-    fn into_json(self) -> Result<Json, String> { json::to_value(self.metrics).map_err(|err| ERRL!("{}", err)) }
-}
-
-/// Exports metrics by converting them to a Tag format and log them using log::Status.
-struct TagExporter<C> {
-    /// Using a weak reference by default in order to avoid circular references and leaks.
-    log_state: LogWeak,
-    /// Handle for acquiring metric snapshots.
-    controller: C,
-    /// Handle for converting snapshots into log.
-    observer: TagObserver,
-}
-
-impl<C> TagExporter<C>
-where
-    C: Observe,
-{
-    /// Run endless async loop
-    async fn run(mut self, interval: f64) {
-        loop {
-            Timer::sleep(interval).await;
-            self.turn();
-        }
-    }
-
-    /// Observe metrics and histograms and record it into the log in Tag format
-    fn turn(&mut self) {
-        let log_state = match LogArc::from_weak(&self.log_state) {
-            Some(x) => x,
-            // MmCtx is dropped already
-            _ => return,
-        };
-
-        log!(">>>>>>>>>> DEX metrics <<<<<<<<<");
-
-        // Observe means fill the observer's metrics and histograms with actual values
-        self.controller.observe(&mut self.observer);
-
-        for PreparedMetric { tags, message } in self.observer.prepare_metrics() {
-            log_state.log_deref_tags("", tags, &message);
-        }
-
-        for PreparedMetric { tags, message } in self.observer.prepare_histograms() {
-            log_state.log_deref_tags("", tags, &message);
-        }
-
-        self.observer.on_turned();
-    }
-}
-
-fn labels_to_tags(labels: Iter<Label>) -> Vec<Tag> {
-    labels
-        .map(|label| Tag {
-            key: label.key().to_string(),
-            val: Some(label.value().to_string()),
-        })
-        .collect()
-}
-
-fn labels_into_parts(labels: Iter<Label>) -> HashMap<String, String> {
-    labels
-        .map(|label| (label.key().to_string(), label.value().to_string()))
-        .collect()
-}
-
-fn name_value_map_to_message(name_value_map: &MetricNameValueMap) -> String {
-    name_value_map
-        .iter()
-        .sorted()
-        .map(|(key, value)| format!("{}={}", key, value))
-        .join(" ")
-}
-
-fn hist_at_quantiles(hist: Histogram<u64>, quantiles: &[Quantile]) -> HashMap<String, u64> {
-    quantiles
-        .iter()
-        .map(|quantile| {
-            let key = quantile.label().to_string();
-            let val = hist.value_at_quantile(quantile.value());
-            (key, val)
-        })
-        .collect()
-}
-
-fn hist_to_message(hist: &Histogram<u64>, quantiles: &[Quantile]) -> String {
-    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 {
-    use super::*;
-    use futures::future::{Future, FutureExt};
-    use hyper::http::{self, header, Request, Response, StatusCode};
-    use hyper::service::{make_service_fn, service_fn};
-    use hyper::{Body, Server};
-    use std::convert::Infallible;
-    use std::net::SocketAddr;
-
-    #[derive(Clone)]
-    pub struct PrometheusCredentials {
-        pub userpass: String,
-    }
-
-    pub fn spawn_prometheus_exporter(
-        metrics: MetricsWeak,
-        address: SocketAddr,
-        shutdown_detector: impl Future<Output = ()> + 'static + Send,
-        credentials: Option<PrometheusCredentials>,
-    ) -> Result<(), String> {
-        let make_svc = make_service_fn(move |_conn| {
-            let metrics = metrics.clone();
-            let credentials = credentials.clone();
-            futures::future::ready(Ok::<_, Infallible>(service_fn(move |req| {
-                futures::future::ready(scrape_handle(req, metrics.clone(), credentials.clone()))
-            })))
-        });
-
-        let server = try_s!(Server::try_bind(&address))
-            .http1_half_close(false) // https://github.com/hyperium/hyper/issues/1764
-            .serve(make_svc)
-            .with_graceful_shutdown(shutdown_detector);
-
-        let server = server.then(|r| {
-            if let Err(err) = r {
-                error!("{}", err);
-            };
-            futures::future::ready(())
-        });
-
-        spawn(server);
-        Ok(())
-    }
-
-    fn scrape_handle(
-        req: Request<Body>,
-        metrics: MetricsWeak,
-        credentials: Option<PrometheusCredentials>,
-    ) -> Result<Response<Body>, http::Error> {
-        fn on_error(status: StatusCode, error: String) -> Result<Response<Body>, http::Error> {
-            error!("{}", error);
-            Response::builder().status(status).body(Body::empty()).map_err(|err| {
-                error!("{}", err);
-                err
-            })
-        }
-
-        if req.uri() != "/metrics" {
-            return on_error(
-                StatusCode::BAD_REQUEST,
-                ERRL!("Warning Prometheus: unexpected URI {}", req.uri()),
-            );
-        }
-
-        if let Some(credentials) = credentials {
-            if let Err(err) = check_auth_credentials(&req, credentials) {
-                return on_error(StatusCode::UNAUTHORIZED, err);
-            }
-        }
-
-        let metrics = match MetricsArc::from_weak(&metrics) {
-            Some(m) => m,
-            _ => {
-                return on_error(
-                    StatusCode::BAD_REQUEST,
-                    ERRL!("Warning Prometheus: metrics system unavailable"),
-                )
-            },
-        };
-
-        let body = match metrics.0.collect_prometheus_format() {
-            Ok(body) => Body::from(body),
-            _ => {
-                return on_error(
-                    StatusCode::BAD_REQUEST,
-                    ERRL!("Warning Prometheus: metrics system is not initialized yet"),
-                )
-            },
-        };
-
-        Response::builder()
-            .status(StatusCode::OK)
-            .header(header::CONTENT_TYPE, "text/plain")
-            .body(body)
-            .map_err(|err| {
-                error!("{}", err);
-                err
-            })
-    }
-
-    fn check_auth_credentials(req: &Request<Body>, expected: PrometheusCredentials) -> Result<(), String> {
-        let header_value = req
-            .headers()
-            .get(header::AUTHORIZATION)
-            .ok_or(ERRL!("Warning Prometheus: authorization required"))
-            .and_then(|header| Ok(try_s!(header.to_str())))?;
-
-        let expected = format!("Basic {}", base64::encode_config(&expected.userpass, base64::URL_SAFE));
-
-        if header_value != expected {
-            return Err(format!("Warning Prometheus: invalid credentials: {}", header_value));
-        }
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::block_on;
-    use crate::log::LogState;
-
-    #[test]
-    fn test_initialization() {
-        let log_state = LogArc::new(LogState::in_memory());
-        let metrics = MetricsArc::new();
-
-        // metrics system is not initialized yet
-        assert!(metrics.try_sink().is_none());
-
-        metrics.init().unwrap();
-        assert!(metrics.init().is_err());
-        assert!(metrics.init_with_dashboard(log_state.weak(), 1.).is_err());
-
-        assert!(metrics.try_sink().is_some());
-    }
-
-    #[test]
-    #[ignore]
-    fn test_dashboard() {
-        let log_state = LogArc::new(LogState::in_memory());
-        let metrics = MetricsArc::new();
-
-        metrics.init_with_dashboard(log_state.weak(), 5.).unwrap();
-        let clock = metrics.clock().unwrap();
-
-        let start = clock.now();
-
-        mm_counter!(metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
-        mm_counter!(metrics, "rpc.traffic.rx", 105, "coin"=> "BTC");
-
-        mm_counter!(metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
-        mm_counter!(metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
-
-        mm_gauge!(metrics, "rpc.connection.count", 3, "coin" => "KMD");
-
-        let end = clock.now();
-        mm_timing!(metrics,
-                   "rpc.query.spent_time",
-                   start,
-                   end,
-                   "coin" => "KMD",
-                   "method" => "blockchain.transaction.get");
-
-        block_on(async { Timer::sleep(6.).await });
-
-        mm_counter!(metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
-        mm_counter!(metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
-
-        mm_gauge!(metrics, "rpc.connection.count", 5, "coin" => "KMD");
-
-        let end = clock.now();
-        mm_timing!(metrics,
-                   "rpc.query.spent_time",
-                   start,
-                   end,
-                   "coin"=> "KMD",
-                   "method"=>"blockchain.transaction.get");
-
-        // measure without labels
-        mm_counter!(metrics, "test.counter", 0);
-        mm_gauge!(metrics, "test.gauge", 1);
-        let end = clock.now();
-        mm_timing!(metrics, "test.uptime", start, end);
-
-        block_on(async { Timer::sleep(6.).await });
-    }
-
-    /// There is a problem inside the `metrics` crate:
-    /// histograms are lost or ignored sometimes when `metrics::Controller::observe` is called.
-    /// Because of this, the `mm_timing` macro usage is commented out.
-    #[test]
-    fn test_collect_json() {
-        let metrics = MetricsArc::new();
-
-        metrics.init().unwrap();
-
-        mm_counter!(metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
-        mm_counter!(metrics, "rpc.traffic.rx", 105, "coin" => "BTC");
-
-        mm_counter!(metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
-        mm_counter!(metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
-
-        mm_counter!(metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
-        mm_counter!(metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
-
-        mm_gauge!(metrics, "rpc.connection.count", 3, "coin" => "KMD");
-
-        // counter, gauge and timing may be collected also by sink API
-        mm_gauge!(metrics, "rpc.connection.count", 5, "coin" => "KMD");
-
-        // mm_timing!(metrics,
-        //            "rpc.query.spent_time",
-        //            // ~ 1 second
-        //            34381019796149, // start
-        //            34382022725155, // end
-        //            "coin" => "KMD",
-        //            "method" => "blockchain.transaction.get");
-        //
-        // mm_timing!(metrics,
-        //            "rpc.query.spent_time",
-        //            // ~ 2 second
-        //            34382022774105, // start
-        //            34384023173373, // end
-        //            "coin" => "KMD",
-        //            "method" => "blockchain.transaction.get");
-
-        let expected = json!({
-            "metrics": [
-                {
-                    "key": "rpc.traffic.tx",
-                    "labels": { "coin": "BTC" },
-                    "type": "counter",
-                    "value": 92
-                },
-                {
-                    "key": "rpc.traffic.rx",
-                    "labels": { "coin": "BTC" },
-                    "type": "counter",
-                    "value": 149
-                },
-                {
-                    "key": "rpc.traffic.tx",
-                    "labels": { "coin": "KMD" },
-                    "type": "counter",
-                    "value": 54
-                },
-                {
-                    "key": "rpc.traffic.rx",
-                    "labels": { "coin": "KMD" },
-                    "type": "counter",
-                    "value": 158
-                },
-                // {
-                //     "count": 2,
-                //     "key": "rpc.query.spent_time",
-                //     "labels": { "coin": "KMD", "method": "blockchain.transaction.get" },
-                //     "max": 2000683007,
-                //     "min": 1002438656,
-                //     "type": "histogram"
-                // },
-                {
-                    "key": "rpc.connection.count",
-                    "labels": { "coin": "KMD" },
-                    "type": "gauge",
-                    "value": 5
-                }
-            ]
-        });
-
-        let mut actual = metrics.collect_json().unwrap();
-
-        let actual = actual["metrics"].as_array_mut().unwrap();
-        for expected in expected["metrics"].as_array().unwrap() {
-            let index = actual.iter().position(|metric| metric == expected).expect(&format!(
-                "Couldn't find expected metric: {:?} in {:?}",
-                expected, actual
-            ));
-            actual.remove(index);
-        }
-
-        assert!(
-            actual.is_empty(),
-            "More metrics collected than expected. Excess metrics: {:?}",
-            actual
-        );
-    }
-}
diff --git a/mm2src/common/mm_metrics/wasm.rs b/mm2src/common/mm_metrics/wasm.rs
deleted file mode 100644
index b2d6eb33e8..0000000000
--- a/mm2src/common/mm_metrics/wasm.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use super::*;
-use crate::now_ms;
-
-/// The dummy macro that imitates [`crate::mm_metrics::native::mm_counter`].
-/// These macros borrow the `$metrics`, `$name`, `$value` and takes ownership of the `$label_key`, `$label_val` to prevent the `unused_variable` warning.
-/// The labels have to be moved because [`metrics_runtime::Sink::increment_counter_with_labels`] also takes ownership of the labels.
-#[macro_export]
-macro_rules! mm_counter {
-    ($metrics:expr, $name:expr, $value:expr) => {{
-        let _ = (&$metrics, &$name, &$value); // borrow
-    }};
-    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
-        let _ = (&$metrics, &$name, &$value); // borrow
-        let _ = ($($label_key, $label_val),+); // move
-    }};
-}
-
-/// The dummy macro that imitates [`crate::mm_metrics::native::mm_gauge`].
-/// These macros borrow the `$metrics`, `$name`, `$value` and takes ownership of the `$label_key`, `$label_val` to prevent the `unused_variable` warning.
-/// The labels have to be moved because [`metrics_runtime::Sink::update_gauge_with_labels`] also takes ownership of the labels.
-#[macro_export]
-macro_rules! mm_gauge {
-    ($metrics:expr, $name:expr, $value:expr) => {{
-        let _ = (&$metrics, &$name, &$value); // borrow
-    }};
-    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
-        let _ = (&$metrics, &$name, &$value); // borrow
-        let _ = ($($label_key, $label_val),+); // move
-    }};
-}
-
-/// The dummy macro that imitates [`crate::mm_metrics::native::mm_timing`].
-/// These macros borrow the `$metrics`, `$name`, `$start`, `$end` and takes ownership of the `$label_key`, `$label_val` to prevent the `unused_variable` warning.
-/// The labels have to be moved because [`metrics_runtime::Sink::record_timing_with_labels`] also takes ownership of the labels.
-#[macro_export]
-macro_rules! mm_timing {
-    ($metrics:expr, $name:expr, $start:expr, $end:expr) => {{
-        let _ = (&$metrics, &$name, &$start, &$end); // borrow
-    }};
-    ($metrics:expr, $name:expr, $start:expr, $end:expr, $($label_key:expr => $label_val:expr),+) => {{
-        let _ = (&$metrics, &$name, &$start, &$end); // borrow
-        let _ = ($($label_key, $label_val),+); // move
-    }};
-}
-
-#[derive(Default)]
-pub struct Clock {}
-
-impl ClockOps for Clock {
-    fn now(&self) -> u64 { now_ms() }
-}
-
-#[derive(Default)]
-pub struct Metrics {}
-
-impl MetricsOps for Metrics {
-    fn init(&self) -> Result<(), String> { Ok(()) }
-
-    fn init_with_dashboard(&self, _log_state: LogWeak, _record_interval: f64) -> Result<(), String> { Ok(()) }
-
-    fn clock(&self) -> Result<Clock, String> { Ok(Clock::default()) }
-
-    fn collect_json(&self) -> Result<Json, String> { Ok(Json::Array(Vec::new())) }
-}
diff --git a/mm2src/common/number_type_casting.rs b/mm2src/common/number_type_casting.rs
new file mode 100644
index 0000000000..7d68029869
--- /dev/null
+++ b/mm2src/common/number_type_casting.rs
@@ -0,0 +1,90 @@
+//! This module contains type casting functions for numbers in a
+//! safe way.
+//!
+//! The problem comes with when casting a type that supports higher value
+//! than the target type's highest value.
+//!
+//! eg:
+//! ```rs
+//! let x: u64 = 4294967295 + 10;
+//! assert_eq!(x as u32, std::u32::MAX, "{} is not {}", x as u32, std::u32::MAX);
+//! ```
+
+use primitive_types::U256;
+
+pub trait SafeTypeCastingNumbers<T>: Sized {
+    fn into_or(self, or: T) -> T;
+    fn into_or_max(self) -> T;
+}
+
+macro_rules! impl_safe_number_type_cast {
+    ($from: ident, $to: ident) => {
+        impl SafeTypeCastingNumbers<$to> for $from {
+            fn into_or(self, or: $to) -> $to { std::convert::TryFrom::try_from(self).unwrap_or(or) }
+            fn into_or_max(self) -> $to { std::convert::TryFrom::try_from(self).unwrap_or(std::$to::MAX) }
+        }
+    };
+}
+
+// primitive_types::U256
+impl_safe_number_type_cast!(U256, u64);
+
+// USIZE
+#[cfg(target_pointer_width = "64")]
+impl_safe_number_type_cast!(usize, i64);
+impl_safe_number_type_cast!(usize, i32);
+impl_safe_number_type_cast!(usize, i16);
+impl_safe_number_type_cast!(usize, i8);
+impl_safe_number_type_cast!(usize, isize);
+
+impl_safe_number_type_cast!(usize, u32);
+impl_safe_number_type_cast!(usize, u16);
+impl_safe_number_type_cast!(usize, u8);
+
+// U128
+impl_safe_number_type_cast!(u128, i128);
+impl_safe_number_type_cast!(u128, i64);
+impl_safe_number_type_cast!(u128, i32);
+impl_safe_number_type_cast!(u128, i16);
+impl_safe_number_type_cast!(u128, i8);
+impl_safe_number_type_cast!(u128, isize);
+
+impl_safe_number_type_cast!(u128, u64);
+impl_safe_number_type_cast!(u128, u32);
+impl_safe_number_type_cast!(u128, u16);
+impl_safe_number_type_cast!(u128, u8);
+impl_safe_number_type_cast!(u128, usize);
+
+// U64
+impl_safe_number_type_cast!(u64, i64);
+impl_safe_number_type_cast!(u64, i32);
+impl_safe_number_type_cast!(u64, i16);
+impl_safe_number_type_cast!(u64, i8);
+impl_safe_number_type_cast!(u64, isize);
+
+impl_safe_number_type_cast!(u64, u32);
+impl_safe_number_type_cast!(u64, u16);
+impl_safe_number_type_cast!(u64, u8);
+impl_safe_number_type_cast!(u64, usize);
+
+// U32
+impl_safe_number_type_cast!(u32, i32);
+impl_safe_number_type_cast!(u32, i16);
+impl_safe_number_type_cast!(u32, i8);
+impl_safe_number_type_cast!(u32, isize);
+
+impl_safe_number_type_cast!(u32, u16);
+impl_safe_number_type_cast!(u32, u8);
+#[cfg(target_pointer_width = "16")]
+impl_safe_number_type_cast!(u32, usize);
+
+// U16
+impl_safe_number_type_cast!(u16, i16);
+impl_safe_number_type_cast!(u16, i8);
+#[cfg(target_pointer_width = "16")]
+impl_safe_number_type_cast!(u16, isize);
+
+impl_safe_number_type_cast!(u16, u8);
+
+// U8
+impl_safe_number_type_cast!(u8, i8);
diff --git a/mm2src/common/patterns/state_machine.rs b/mm2src/common/patterns/state_machine.rs
index c4b8040cbf..a558378de0 100644
--- a/mm2src/common/patterns/state_machine.rs
+++ b/mm2src/common/patterns/state_machine.rs
@@ -257,11 +257,12 @@ mod tests {
         users.insert(("user2".to_owned(), "password2".to_owned()), 2);
         users.insert(("user3".to_owned(), "password3".to_owned()), 3);
 
-        spawn(async move {
+        let fut = async move {
             for ch in credentials.chars() {
                 tx.send(ch).await.expect("!tx.try_send()");
             }
-        });
+        };
+        spawn(fut);
 
         let fut = async move {
             let initial_state: ReadingState = ReadingState { rx };
diff --git a/mm2src/common/shared_ref_counter/Cargo.toml b/mm2src/common/shared_ref_counter/Cargo.toml
index ca49c19b1c..1e76cab8e4 100644
--- a/mm2src/common/shared_ref_counter/Cargo.toml
+++ b/mm2src/common/shared_ref_counter/Cargo.toml
@@ -3,6 +3,9 @@ name = "shared_ref_counter"
 version = "0.1.0"
 edition = "2018"
 
+[lib]
+doctest = false
+
 [features]
 enable = []
 
diff --git a/mm2src/common/time_cache.rs b/mm2src/common/time_cache.rs
index 6667a20137..6428067a7f 100644
--- a/mm2src/common/time_cache.rs
+++ b/mm2src/common/time_cache.rs
@@ -247,10 +247,8 @@ where
     }
 }
 
-#[allow(dead_code)]
 pub struct DuplicateCache<Key: std::hash::Hash>(TimeCache<Key, ()>);
 
-#[allow(dead_code)]
 impl<Key> DuplicateCache<Key>
 where
     Key: Eq + std::hash::Hash + Clone,
@@ -271,6 +269,10 @@ where
     }
 
     pub fn contains(&mut self, key: &Key) -> bool { self.0.contains_key(key) }
+
+    // Removes a certain key even if it didn't expire plus removing other expired keys
+    #[inline]
+    pub fn remove(&mut self, key: Key) { self.0.remove(key); }
 }
 
 #[cfg(test)]
diff --git a/mm2src/common/wio.rs b/mm2src/common/wio.rs
index f425b1c109..7f436f8f2b 100644
--- a/mm2src/common/wio.rs
+++ b/mm2src/common/wio.rs
@@ -3,15 +3,12 @@
 use futures::compat::Future01CompatExt;
 use futures::executor::ThreadPool;
 use futures01::sync::oneshot::{self, Receiver};
-use futures01::{Async, Future, Poll};
-use gstuff::{duration_to_float, now_float};
+use futures01::Future;
 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()) }
@@ -87,72 +84,6 @@ where
     })
 }
 
-/// 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.
diff --git a/mm2src/crypto/Cargo.toml b/mm2src/crypto/Cargo.toml
index d2333932f1..ff28977341 100644
--- a/mm2src/crypto/Cargo.toml
+++ b/mm2src/crypto/Cargo.toml
@@ -3,31 +3,44 @@ name = "crypto"
 version = "1.0.0"
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
-rustc-hex = "2"
-mm2_err_handle = { path = "../mm2_err_handle" }
+arrayref = "0.3"
 async-trait = "0.1"
 bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
 bitcrypto = { path = "../mm2_bitcoin/crypto" }
+bs58 = "0.4.0"
 common = { path = "../common" }
-mm2_core = { path = "../mm2_core" }
 derive_more = "0.99"
+enum_from = { path = "../derives/enum_from" }
 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" }
+lazy_static = "1.4"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
 num-traits = "0.2"
+parking_lot = { version = "0.12.0", features = ["nightly"] }
 primitives = { path = "../mm2_bitcoin/primitives" }
+rpc = { path = "../mm2_bitcoin/rpc" }
 rpc_task = { path = "../rpc_task" }
+rustc-hex = "2"
 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"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+tiny-bip39 = "0.8.0"
 trezor = { path = "../trezor" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+mm2_eth = { path = "../mm2_eth" }
+mm2_metamask = { path = "../mm2_metamask" }
+wasm-bindgen-test = { version = "0.3.2" }
+web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.19.0", default-features = false }
diff --git a/mm2src/crypto/src/crypto_ctx.rs b/mm2src/crypto/src/crypto_ctx.rs
index 67de032cc2..4e2391e362 100644
--- a/mm2src/crypto/src/crypto_ctx.rs
+++ b/mm2src/crypto/src/crypto_ctx.rs
@@ -1,11 +1,18 @@
-use crate::hw_client::{HwError, HwProcessingError, TrezorConnectProcessor};
+use crate::global_hd_ctx::{GlobalHDAccountArc, GlobalHDAccountCtx};
+use crate::hw_client::{HwDeviceInfo, HwProcessingError, HwPubkey, TrezorConnectProcessor};
 use crate::hw_ctx::{HardwareWalletArc, HardwareWalletCtx};
-use crate::key_pair_ctx::IguanaArc;
+use crate::hw_error::HwError;
+#[cfg(target_arch = "wasm32")]
+use crate::metamask_ctx::{MetamaskArc, MetamaskCtx, MetamaskError};
 use crate::privkey::{key_pair_from_seed, PrivKeyError};
+use crate::shared_db_id::{shared_db_id_from_seed, SharedDbIdError};
+use arrayref::array_ref;
+use common::bits256;
+use common::log::info;
 use derive_more::Display;
-use hw_common::primitives::EcdsaCurve;
-use keys::Public as PublicKey;
+use keys::{KeyPair, Public as PublicKey, Secret as Secp256k1Secret};
 use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::common_errors::InternalError;
 use mm2_err_handle::prelude::*;
 use parking_lot::RwLock;
 use primitives::hash::H160;
@@ -14,24 +21,19 @@ 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 = "Passphrase cannot be an empty string")]
+    EmptyPassphrase,
     #[display(fmt = "Invalid passphrase: '{}'", _0)]
     InvalidPassphrase(PrivKeyError),
+    #[display(fmt = "Invalid 'hd_account_id' = {}: {}", hd_account_id, error)]
+    InvalidHdAccount {
+        hd_account_id: u64,
+        error: String,
+    },
     Internal(String),
 }
 
@@ -39,10 +41,30 @@ impl From<PrivKeyError> for CryptoInitError {
     fn from(e: PrivKeyError) -> Self { CryptoInitError::InvalidPassphrase(e) }
 }
 
+impl From<SharedDbIdError> for CryptoInitError {
+    fn from(e: SharedDbIdError) -> Self {
+        match e {
+            SharedDbIdError::EmptyPassphrase => CryptoInitError::EmptyPassphrase,
+            SharedDbIdError::Internal(internal) => CryptoInitError::Internal(internal),
+        }
+    }
+}
+
+#[derive(Debug, Display)]
+pub enum CryptoCtxError {
+    #[display(fmt = "'CryptoCtx' is not initialized")]
+    NotInitialized,
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
 #[derive(Debug)]
 pub enum HwCtxInitError<ProcessorError> {
     InitializingAlready,
-    InitializedAlready,
+    UnexpectedPubkey {
+        actual_pubkey: HwPubkey,
+        expected_pubkey: HwPubkey,
+    },
     HwError(HwError),
     ProcessorError(ProcessorError),
 }
@@ -59,39 +81,222 @@ impl<ProcessorError> From<HwProcessingError<ProcessorError>> for HwCtxInitError<
 /// This is required for converting `MmError<HwProcessingError<E>>` into `MmError<InitHwCtxError<E>>`.
 impl<E> NotEqual for HwCtxInitError<E> {}
 
+#[cfg(target_arch = "wasm32")]
+#[derive(Debug)]
+pub enum MetamaskCtxInitError {
+    InitializingAlready,
+    MetamaskError(MetamaskError),
+}
+
+#[cfg(target_arch = "wasm32")]
+impl From<MetamaskError> for MetamaskCtxInitError {
+    fn from(value: MetamaskError) -> Self { MetamaskCtxInitError::MetamaskError(value) }
+}
+
 pub struct CryptoCtx {
-    iguana_ctx: IguanaArc,
+    /// secp256k1 key pair derived from either:
+    /// * Iguana passphrase,
+    ///   cf. `key_pair_from_seed`;
+    /// * BIP39 passphrase at `mm2_internal_der_path`,
+    ///   cf. [`GlobalHDAccountCtx::new`].
+    secp256k1_key_pair: KeyPair,
+    key_pair_policy: KeyPairPolicy,
     /// Can be initialized on [`CryptoCtx::init_hw_ctx_with_trezor`].
-    hw_ctx: RwLock<HardwareWalletCtxState>,
+    hw_ctx: RwLock<InitializationState<HardwareWalletArc>>,
+    #[cfg(target_arch = "wasm32")]
+    metamask_ctx: RwLock<InitializationState<MetamaskArc>>,
 }
 
 impl CryptoCtx {
-    pub fn from_ctx(ctx: &MmArc) -> CryptoInitResult<Arc<CryptoCtx>> {
+    pub fn is_init(ctx: &MmArc) -> MmResult<bool, InternalError> {
+        match CryptoCtx::from_ctx(ctx).split_mm() {
+            Ok(_) => Ok(true),
+            Err((CryptoCtxError::NotInitialized, _trace)) => Ok(false),
+            Err((other, trace)) => MmError::err_with_trace(InternalError(other.to_string()), trace),
+        }
+    }
+
+    pub fn from_ctx(ctx: &MmArc) -> MmResult<Arc<CryptoCtx>, CryptoCtxError> {
         let ctx_field = ctx
             .crypto_ctx
             .lock()
-            .map_to_mm(|poison| CryptoInitError::Internal(poison.to_string()))?;
+            .map_to_mm(|poison| CryptoCtxError::Internal(poison.to_string()))?;
         let ctx = match ctx_field.deref() {
             Some(ctx) => ctx,
-            None => return MmError::err(CryptoInitError::NotInitialized),
+            None => return MmError::err(CryptoCtxError::NotInitialized),
         };
         ctx.clone()
             .downcast()
-            .map_err(|_| MmError::new(CryptoInitError::Internal("Error casting the context field".to_owned())))
+            .map_err(|_| MmError::new(CryptoCtxError::Internal("Error casting the context field".to_owned())))
     }
 
-    pub fn iguana_ctx(&self) -> &IguanaArc { &self.iguana_ctx }
+    #[inline]
+    pub fn key_pair_policy(&self) -> &KeyPairPolicy { &self.key_pair_policy }
 
-    pub fn secp256k1_pubkey(&self) -> PublicKey { self.iguana_ctx.secp256k1_pubkey() }
+    /// 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 P2P message verification.
+    #[inline]
+    pub fn mm2_internal_public_id(&self) -> bits256 {
+        // Compressed public key is going to be 33 bytes.
+        let public = self.mm2_internal_pubkey();
+        // First byte is a prefix, https://davidederosa.com/basic-blockchain-programming/elliptic-curve-keys/.
+        bits256 {
+            bytes: *array_ref!(public, 1, 32),
+        }
+    }
+
+    /// Returns `secp256k1` key-pair.
+    /// It can be used for mm2 internal purposes such as signing P2P messages.
+    ///
+    /// To activate coins, consider matching [`CryptoCtx::key_pair_ctx`] manually.
+    ///
+    /// # Security
+    ///
+    /// If [`CryptoCtx::key_pair_ctx`] is `Iguana`, then the returning key-pair is used to activate coins.
+    /// Please use this method carefully.
+    #[inline]
+    pub fn mm2_internal_key_pair(&self) -> &KeyPair { &self.secp256k1_key_pair }
+
+    /// Returns `secp256k1` public key.
+    /// It can be used for mm2 internal purposes such as P2P peer ID.
+    ///
+    /// To activate coins, consider matching [`CryptoCtx::key_pair_ctx`] manually.
+    ///
+    /// # Security
+    ///
+    /// If [`CryptoCtx::key_pair_ctx`] is `Iguana`, then the returning key-pair can be also used
+    /// at the activated coins.
+    /// Please use this method carefully.
+    #[inline]
+    pub fn mm2_internal_pubkey(&self) -> PublicKey { *self.secp256k1_key_pair.public() }
+
+    /// Returns `secp256k1` public key hex.
+    /// It can be used for mm2 internal purposes such as P2P peer ID.
+    ///
+    /// To activate coins, consider matching [`CryptoCtx::key_pair_ctx`] manually.
+    ///
+    /// # Security
+    ///
+    /// If [`CryptoCtx::key_pair_ctx`] is `Iguana`, then the returning public key can be also used
+    /// at the activated coins.
+    /// Please use this method carefully.
+    #[inline]
+    pub fn mm2_internal_pubkey_hex(&self) -> String { hex::encode(&*self.mm2_internal_pubkey()) }
+
+    /// Returns `secp256k1` private key as `H256` bytes.
+    /// It can be used for mm2 internal purposes such as signing P2P messages.
+    ///
+    /// To activate coins, consider matching [`CryptoCtx::key_pair_ctx`] manually.
+    ///
+    /// # Security
+    ///
+    /// If [`CryptoCtx::key_pair_ctx`] is `Iguana`, then the returning private is used to activate coins.
+    /// Please use this method carefully.
+    #[inline]
+    pub fn mm2_internal_privkey_secret(&self) -> Secp256k1Secret { self.secp256k1_key_pair.private().secret }
 
-    pub fn secp256k1_pubkey_hex(&self) -> String { hex::encode(&*self.secp256k1_pubkey()) }
+    /// Returns `secp256k1` private key as `[u8]` slice.
+    /// It can be used for mm2 internal purposes such as signing P2P messages.
+    /// Please consider using [`CryptoCtx::mm2_internal_privkey_bytes`] instead.
+    ///
+    /// If you don't need to borrow the secret bytes, consider using [`CryptoCtx::mm2_internal_privkey_bytes`] instead.
+    /// To activate coins, consider matching [`CryptoCtx::key_pair_ctx`] manually.
+    ///
+    /// # Security
+    ///
+    /// If [`CryptoCtx::key_pair_ctx`] is `Iguana`, then the returning private is used to activate coins.
+    /// Please use this method carefully.
+    #[inline]
+    pub fn mm2_internal_privkey_slice(&self) -> &[u8] { self.secp256k1_key_pair.private().secret.as_slice() }
 
+    #[inline]
     pub fn hw_ctx(&self) -> Option<HardwareWalletArc> { self.hw_ctx.read().to_option().cloned() }
 
+    #[cfg(target_arch = "wasm32")]
+    pub fn metamask_ctx(&self) -> Option<MetamaskArc> { self.metamask_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()) }
+    #[inline]
+    pub fn hw_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<Arc<CryptoCtx>> {
+        Self::init_crypto_ctx_with_policy_builder(ctx, passphrase, KeyPairPolicyBuilder::Iguana)
+    }
+
+    pub fn init_with_global_hd_account(
+        ctx: MmArc,
+        passphrase: &str,
+        hd_account_id: u64,
+    ) -> CryptoInitResult<Arc<CryptoCtx>> {
+        let builder = KeyPairPolicyBuilder::GlobalHDAccount { hd_account_id };
+        Self::init_crypto_ctx_with_policy_builder(ctx, passphrase, builder)
+    }
+
+    pub async fn init_hw_ctx_with_trezor<Processor>(
+        &self,
+        processor: &Processor,
+        expected_pubkey: Option<HwPubkey>,
+    ) -> MmResult<(HwDeviceInfo, HardwareWalletArc), HwCtxInitError<Processor::Error>>
+    where
+        Processor: TrezorConnectProcessor + Sync,
+    {
+        {
+            let mut state = self.hw_ctx.write();
+            if let InitializationState::Initializing = state.deref() {
+                return MmError::err(HwCtxInitError::InitializingAlready);
+            }
 
-    pub fn init_with_iguana_passphrase(ctx: MmArc, passphrase: &str) -> CryptoInitResult<()> {
+            *state = InitializationState::Initializing;
+        }
+
+        let result = init_check_hw_ctx_with_trezor(processor, expected_pubkey).await;
+        let new_state = match result {
+            Ok((_, ref hw_ctx)) => InitializationState::Ready(hw_ctx.clone()),
+            Err(_) => InitializationState::NotInitialized,
+        };
+
+        *self.hw_ctx.write() = new_state;
+        result.mm_err(HwCtxInitError::from)
+    }
+
+    /// # Todo
+    ///
+    /// Consider taking `processor: Processor` and `expected_address: Option<String>`
+    /// the same way as `CryptoCtx::init_hw_ctx_with_trezor`.
+    #[cfg(target_arch = "wasm32")]
+    pub async fn init_metamask_ctx(&self, project_name: String) -> MmResult<MetamaskArc, MetamaskCtxInitError> {
+        {
+            let mut state = self.metamask_ctx.write();
+            if let InitializationState::Initializing = state.deref() {
+                return MmError::err(MetamaskCtxInitError::InitializingAlready);
+            }
+
+            *state = InitializationState::Initializing;
+        }
+
+        let metamask_ctx = MetamaskCtx::init(project_name).await?;
+        let metamask_arc = MetamaskArc::new(metamask_ctx);
+
+        *self.metamask_ctx.write() = InitializationState::Ready(metamask_arc.clone());
+        Ok(metamask_arc)
+    }
+
+    pub fn reset_hw_ctx(&self) {
+        let mut state = self.hw_ctx.write();
+        *state = InitializationState::NotInitialized;
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn reset_metamask_ctx(&self) {
+        let mut state = self.metamask_ctx.write();
+        *state = InitializationState::NotInitialized;
+    }
+
+    fn init_crypto_ctx_with_policy_builder(
+        ctx: MmArc,
+        passphrase: &str,
+        policy_builder: KeyPairPolicyBuilder,
+    ) -> CryptoInitResult<Arc<CryptoCtx>> {
         let mut ctx_field = ctx
             .crypto_ctx
             .lock()
@@ -101,67 +306,98 @@ impl CryptoCtx {
         }
 
         if passphrase.is_empty() {
-            return MmError::err(CryptoInitError::NullStringPassphrase);
+            return MmError::err(CryptoInitError::EmptyPassphrase);
         }
 
-        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 (secp256k1_key_pair, key_pair_policy) = policy_builder.build(passphrase)?;
         let rmd160 = secp256k1_key_pair.public().address_hash();
+        let shared_db_id = shared_db_id_from_seed(passphrase)?;
+
         let crypto_ctx = CryptoCtx {
-            iguana_ctx: IguanaArc::from(secp256k1_key_pair),
-            hw_ctx: RwLock::new(HardwareWalletCtxState::NotInitialized),
+            secp256k1_key_pair,
+            key_pair_policy,
+            hw_ctx: RwLock::new(InitializationState::NotInitialized),
+            #[cfg(target_arch = "wasm32")]
+            metamask_ctx: RwLock::new(InitializationState::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)?;
+        let result = Arc::new(crypto_ctx);
+        *ctx_field = Some(result.clone());
+        drop(ctx_field);
+
         ctx.rmd160.pin(rmd160).map_to_mm(CryptoInitError::Internal)?;
+        ctx.shared_db_id
+            .pin(shared_db_id)
+            .map_to_mm(CryptoInitError::Internal)?;
 
-        Ok(())
+        info!("Public key hash: {rmd160}");
+        info!("Shared Database ID: {shared_db_id}");
+        Ok(result)
     }
+}
 
-    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),
-            }
+enum KeyPairPolicyBuilder {
+    Iguana,
+    GlobalHDAccount { hd_account_id: u64 },
+}
 
-            *state = HardwareWalletCtxState::Initializing;
+impl KeyPairPolicyBuilder {
+    /// [`KeyPairPolicyBuilder::build`] is fired if all checks pass **only**.
+    fn build(self, passphrase: &str) -> CryptoInitResult<(KeyPair, KeyPairPolicy)> {
+        match self {
+            KeyPairPolicyBuilder::Iguana => {
+                let secp256k1_key_pair = key_pair_from_seed(passphrase)?;
+                Ok((secp256k1_key_pair, KeyPairPolicy::Iguana))
+            },
+            KeyPairPolicyBuilder::GlobalHDAccount { hd_account_id } => {
+                let (mm2_internal_key_pair, global_hd_ctx) = GlobalHDAccountCtx::new(passphrase, hd_account_id)?;
+                let key_pair_policy = KeyPairPolicy::GlobalHDAccount(global_hd_ctx.into_arc());
+                Ok((mm2_internal_key_pair, key_pair_policy))
+            },
         }
+    }
+}
 
-        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),
-        };
+#[derive(Clone)]
+pub enum KeyPairPolicy {
+    Iguana,
+    GlobalHDAccount(GlobalHDAccountArc),
+}
 
-        *self.hw_ctx.write() = new_state;
-        res.mm_err(HwCtxInitError::from)
+async fn init_check_hw_ctx_with_trezor<Processor>(
+    processor: &Processor,
+    expected_pubkey: Option<HwPubkey>,
+) -> MmResult<(HwDeviceInfo, HardwareWalletArc), HwCtxInitError<Processor::Error>>
+where
+    Processor: TrezorConnectProcessor + Sync,
+{
+    let (hw_device_info, hw_ctx) = HardwareWalletCtx::init_with_trezor(processor).await?;
+    let expected_pubkey = match expected_pubkey {
+        Some(expected) => expected,
+        None => return Ok((hw_device_info, hw_ctx)),
+    };
+    let actual_pubkey = hw_ctx.hw_pubkey();
+
+    // Check whether the connected Trezor device has an expected pubkey.
+    if actual_pubkey != expected_pubkey {
+        return MmError::err(HwCtxInitError::UnexpectedPubkey {
+            actual_pubkey,
+            expected_pubkey,
+        });
     }
+    Ok((hw_device_info, hw_ctx))
 }
 
-enum HardwareWalletCtxState {
+enum InitializationState<Feature> {
     NotInitialized,
     Initializing,
-    Ready(HardwareWalletArc),
+    Ready(Feature),
 }
 
-impl HardwareWalletCtxState {
-    fn to_option(&self) -> Option<&HardwareWalletArc> {
+impl<Feature> InitializationState<Feature> {
+    fn to_option(&self) -> Option<&Feature> {
         match self {
-            HardwareWalletCtxState::Ready(hw_ctx) => Some(hw_ctx),
+            InitializationState::Ready(feature) => Some(feature),
             _ => None,
         }
     }
diff --git a/mm2src/crypto/src/global_hd_ctx.rs b/mm2src/crypto/src/global_hd_ctx.rs
new file mode 100644
index 0000000000..13b2736f41
--- /dev/null
+++ b/mm2src/crypto/src/global_hd_ctx.rs
@@ -0,0 +1,112 @@
+use crate::privkey::{bip39_seed_from_passphrase, key_pair_from_secret, PrivKeyError};
+use crate::{mm2_internal_der_path, Bip32DerPathOps, Bip32Error, CryptoInitError, CryptoInitResult,
+            StandardHDPathToCoin};
+use bip32::{ChildNumber, ExtendedPrivateKey};
+use keys::{KeyPair, Secret as Secp256k1Secret};
+use mm2_err_handle::prelude::*;
+use std::convert::TryInto;
+use std::num::TryFromIntError;
+use std::ops::Deref;
+use std::sync::Arc;
+
+const HARDENED: bool = true;
+const NON_HARDENED: bool = false;
+
+pub(super) type Mm2InternalKeyPair = KeyPair;
+
+#[derive(Clone)]
+pub struct GlobalHDAccountArc(Arc<GlobalHDAccountCtx>);
+
+impl Deref for GlobalHDAccountArc {
+    type Target = GlobalHDAccountCtx;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+pub struct GlobalHDAccountCtx {
+    bip39_seed: bip39::Seed,
+    bip39_secp_priv_key: ExtendedPrivateKey<secp256k1::SecretKey>,
+    /// This account is set globally for every activated coin.
+    hd_account: ChildNumber,
+}
+
+impl GlobalHDAccountCtx {
+    pub fn new(passphrase: &str, hd_account_id: u64) -> CryptoInitResult<(Mm2InternalKeyPair, GlobalHDAccountCtx)> {
+        let bip39_seed = bip39_seed_from_passphrase(passphrase)?;
+        let bip39_secp_priv_key: ExtendedPrivateKey<secp256k1::SecretKey> =
+            ExtendedPrivateKey::new(bip39_seed.as_bytes())
+                .map_to_mm(|e| PrivKeyError::InvalidPrivKey(e.to_string()))?;
+
+        let hd_account_id =
+            hd_account_id
+                .try_into()
+                .map_to_mm(|e: TryFromIntError| CryptoInitError::InvalidHdAccount {
+                    hd_account_id,
+                    error: e.to_string(),
+                })?;
+        let hd_account =
+            ChildNumber::new(hd_account_id, NON_HARDENED).map_to_mm(|e| CryptoInitError::InvalidHdAccount {
+                hd_account_id: hd_account_id as u64,
+                error: e.to_string(),
+            })?;
+
+        let derivation_path = mm2_internal_der_path(Some(hd_account));
+
+        let mut internal_priv_key = bip39_secp_priv_key.clone();
+        for child in derivation_path {
+            internal_priv_key = internal_priv_key
+                .derive_child(child)
+                .map_to_mm(|e| CryptoInitError::InvalidPassphrase(PrivKeyError::InvalidPrivKey(e.to_string())))?;
+        }
+
+        let mm2_internal_key_pair = key_pair_from_secret(internal_priv_key.private_key().as_ref())?;
+
+        let global_hd_ctx = GlobalHDAccountCtx {
+            bip39_seed,
+            bip39_secp_priv_key,
+            hd_account,
+        };
+        Ok((mm2_internal_key_pair, global_hd_ctx))
+    }
+
+    #[inline]
+    pub fn into_arc(self) -> GlobalHDAccountArc { GlobalHDAccountArc(Arc::new(self)) }
+
+    /// Returns an identifier of the selected HD account.
+    pub fn account_id(&self) -> u32 { self.hd_account.index() }
+
+    /// Returns the root BIP39 seed.
+    pub fn root_seed(&self) -> &bip39::Seed { &self.bip39_seed }
+
+    /// Returns the root BIP39 seed as bytes.
+    pub fn root_seed_bytes(&self) -> &[u8] { self.bip39_seed.as_bytes() }
+
+    /// Derives a `secp256k1::SecretKey` from [`HDAccountCtx::bip39_secp_priv_key`]
+    /// at the given `m/purpose'/coin_type'/account_id'/chain/address_id` derivation path,
+    /// where:
+    /// * `m/purpose'/coin_type'` is specified by `derivation_path`.
+    /// * `account_id = 0`, `chain = 0`.
+    /// * `address_id = HDAccountCtx::hd_account`.
+    ///
+    /// Returns the `secp256k1::Private` Secret 256-bit key
+    pub fn derive_secp256k1_secret(
+        &self,
+        derivation_path: &StandardHDPathToCoin,
+    ) -> MmResult<Secp256k1Secret, Bip32Error> {
+        const ACCOUNT_ID: u32 = 0;
+        const CHAIN_ID: u32 = 0;
+
+        let mut account_der_path = derivation_path.to_derivation_path();
+        account_der_path.push(ChildNumber::new(ACCOUNT_ID, HARDENED).unwrap());
+        account_der_path.push(ChildNumber::new(CHAIN_ID, NON_HARDENED).unwrap());
+        account_der_path.push(self.hd_account);
+
+        let mut priv_key = self.bip39_secp_priv_key.clone();
+        for child in account_der_path {
+            priv_key = priv_key.derive_child(child)?;
+        }
+
+        let secret = *priv_key.private_key().as_ref();
+        Ok(Secp256k1Secret::from(secret))
+    }
+}
diff --git a/mm2src/crypto/src/hw_client.rs b/mm2src/crypto/src/hw_client.rs
index 29772ac300..cec4f104c1 100644
--- a/mm2src/crypto/src/hw_client.rs
+++ b/mm2src/crypto/src/hw_client.rs
@@ -1,71 +1,19 @@
+use crate::hw_error::HwError;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::hw_error::HwResult;
 use async_trait::async_trait;
 #[cfg(not(target_os = "ios"))]
-use common::custom_futures::FutureTimerExt;
+use common::custom_futures::timeout::FutureTimerExt;
 use derive_more::Display;
-#[cfg(not(target_os = "ios"))] use futures::FutureExt;
-use hw_common::primitives::Bip32Error;
+use futures::FutureExt;
 use mm2_err_handle::prelude::*;
-use primitives::hash::H264;
+use rpc::v1::types::H160 as H160Json;
 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),
-}
+use trezor::device_info::TrezorDeviceInfo;
+use trezor::{TrezorError, TrezorProcessingError, TrezorRequestProcessor};
 
-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) }
-}
+pub type HwPubkey = H160Json;
 
 #[derive(Display)]
 pub enum HwProcessingError<E> {
@@ -98,6 +46,20 @@ pub enum HwWalletType {
     Trezor,
 }
 
+#[derive(Clone, Debug, Serialize)]
+#[serde(tag = "type")]
+pub enum HwDeviceInfo {
+    Trezor(TrezorDeviceInfo),
+}
+
+#[derive(Debug, Serialize)]
+pub enum HwConnectionStatus {
+    Connected,
+    /// `Unreachable` means that the device is either disconnected or is in an incorrect state,
+    /// so it should be reinitialized.
+    Unreachable,
+}
+
 #[async_trait]
 pub trait TrezorConnectProcessor: TrezorRequestProcessor {
     async fn on_connect(&self) -> MmResult<Duration, HwProcessingError<Self::Error>>;
@@ -160,7 +122,7 @@ impl HwClient {
     pub(crate) async fn trezor<Processor: TrezorConnectProcessor>(
         processor: &Processor,
     ) -> MmResult<TrezorClient, HwProcessingError<Processor::Error>> {
-        use common::custom_futures::TimeoutError;
+        use common::custom_futures::timeout::TimeoutError;
         use common::executor::Timer;
 
         async fn try_to_connect() -> HwResult<Option<TrezorClient>> {
diff --git a/mm2src/crypto/src/hw_ctx.rs b/mm2src/crypto/src/hw_ctx.rs
index 1120af5034..50a8c6a6a9 100644
--- a/mm2src/crypto/src/hw_ctx.rs
+++ b/mm2src/crypto/src/hw_ctx.rs
@@ -1,22 +1,25 @@
-use crate::crypto_ctx::{MM2_INTERNAL_DERIVATION_PATH, MM2_INTERNAL_ECDSA_CURVE};
-use crate::hw_client::{HwClient, HwError, HwProcessingError, TrezorConnectProcessor};
+use crate::hw_client::{HwClient, HwConnectionStatus, HwDeviceInfo, HwProcessingError, HwPubkey, TrezorConnectProcessor};
+use crate::hw_error::HwError;
 use crate::trezor::TrezorSession;
-use crate::HwWalletType;
+use crate::{mm2_internal_der_path, HwWalletType};
+use bip32::ChildNumber;
 use bitcrypto::dhash160;
 use common::log::warn;
-use futures::lock::Mutex as AsyncMutex;
-use hw_common::primitives::{DerivationPath, Secp256k1ExtendedPublicKey};
+use hw_common::primitives::{EcdsaCurve, Secp256k1ExtendedPublicKey};
 use keys::Public as PublicKey;
 use mm2_err_handle::prelude::*;
 use primitives::hash::{H160, H264};
+use std::fmt;
 use std::ops::Deref;
 use std::str::FromStr;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
-use trezor::client::TrezorClient;
-use trezor::utxo::TrezorUtxoCoin;
+use trezor::utxo::IGNORE_XPUB_MAGIC;
 use trezor::{ProcessTrezorResponse, TrezorRequestProcessor};
 
-pub(crate) const MM2_TREZOR_INTERNAL_COIN: TrezorUtxoCoin = TrezorUtxoCoin::Komodo;
+const MM2_INTERNAL_ECDSA_CURVE: EcdsaCurve = EcdsaCurve::Secp256k1;
+const MM2_TREZOR_INTERNAL_COIN: &str = "Komodo";
+const SHOW_PUBKEY_ON_DISPLAY: bool = false;
 
 #[derive(Clone)]
 pub struct HardwareWalletArc(Arc<HardwareWalletCtx>);
@@ -32,69 +35,82 @@ impl HardwareWalletArc {
 }
 
 pub struct HardwareWalletCtx {
-    /// The pubkey derived from `MM2_INTERNAL_DERIVATION_PATH`.
+    /// The pubkey derived from `mm2_internal_der_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>>,
+    pub(crate) hw_wallet: HwClient,
+    /// Whether the Hardware Wallet is connected.
+    pub(crate) hw_wallet_connected: AtomicBool,
 }
 
 impl HardwareWalletCtx {
     pub(crate) async fn init_with_trezor<Processor>(
         processor: &Processor,
-    ) -> MmResult<HardwareWalletArc, HwProcessingError<Processor::Error>>
+    ) -> MmResult<(HwDeviceInfo, 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_device_info, hw_internal_pubkey) = {
+            let (device_info, mut session) = trezor.init_new_session().await?;
+            let hw_internal_pubkey = HardwareWalletCtx::trezor_mm_internal_pubkey(&mut session, processor).await?;
+            (HwDeviceInfo::Trezor(device_info), hw_internal_pubkey)
         };
-        let hw_client = HwClient::Trezor(trezor);
-        Ok(HardwareWalletArc::new(HardwareWalletCtx {
+
+        let hw_wallet = HwClient::Trezor(trezor);
+        let hw_ctx = HardwareWalletArc::new(HardwareWalletCtx {
             hw_internal_pubkey,
-            hw_wallet_type: hw_client.hw_wallet_type(),
-            hw_wallet: AsyncMutex::new(Some(hw_client)),
-        }))
+            hw_wallet_type: hw_wallet.hw_wallet_type(),
+            hw_wallet,
+            hw_wallet_connected: AtomicBool::new(true),
+        });
+        Ok((hw_device_info, hw_ctx))
     }
 
     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),
-            }
+    /// Returns a Trezor session.
+    pub async fn trezor(&self) -> MmResult<TrezorSession<'_>, HwError> {
+        if !self.hw_wallet_connected.load(Ordering::Relaxed) {
+            return MmError::err(HwError::DeviceDisconnected);
         }
-        // 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()));
+        let HwClient::Trezor(ref trezor) = self.hw_wallet;
+        let session = trezor.session().await;
+        self.check_if_connected(session).await
+    }
+
+    pub async fn trezor_connection_status(&self) -> HwConnectionStatus {
+        if !self.hw_wallet_connected.load(Ordering::Relaxed) {
+            return HwConnectionStatus::Unreachable;
+        }
 
-        Ok(trezor)
+        let HwClient::Trezor(ref trezor) = self.hw_wallet;
+        let session = match trezor.try_session_if_not_occupied() {
+            Some(session) => session,
+            // If we got `None`, the session mutex is occupied by another task,
+            // so for now we can consider the Trezor device as connected.
+            None => return HwConnectionStatus::Connected,
+        };
+
+        match self.check_if_connected(session).await {
+            Ok(_session) => HwConnectionStatus::Connected,
+            Err(_) => HwConnectionStatus::Unreachable,
+        }
     }
 
     pub fn secp256k1_pubkey(&self) -> PublicKey { PublicKey::Compressed(self.hw_internal_pubkey) }
 
-    pub fn rmd160(&self) -> H160 { dhash160(self.hw_internal_pubkey.as_slice()) }
+    /// Returns `RIPEMD160(SHA256(x))` where x is a pubkey extracted from the Hardware wallet.
+    pub fn rmd160(&self) -> H160 { h160_from_h264(&self.hw_internal_pubkey) }
+
+    /// Returns serializable/deserializable Hardware wallet pubkey.
+    pub fn hw_pubkey(&self) -> HwPubkey { hw_pubkey_from_h264(&self.hw_internal_pubkey) }
 
     pub(crate) async fn trezor_mm_internal_pubkey<Processor>(
         trezor: &mut TrezorSession<'_>,
@@ -103,10 +119,17 @@ impl HardwareWalletCtx {
     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");
+        const ADDRESS_INDEX: Option<ChildNumber> = None;
+
+        let path = mm2_internal_der_path(ADDRESS_INDEX);
         let mm2_internal_xpub = trezor
-            .get_public_key(path, MM2_TREZOR_INTERNAL_COIN, MM2_INTERNAL_ECDSA_CURVE)
+            .get_public_key(
+                path,
+                MM2_TREZOR_INTERNAL_COIN.to_string(),
+                MM2_INTERNAL_ECDSA_CURVE,
+                SHOW_PUBKEY_ON_DISPLAY,
+                IGNORE_XPUB_MAGIC,
+            )
             .await?
             .process(processor)
             .await?;
@@ -114,22 +137,51 @@ impl HardwareWalletCtx {
         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,
-            }));
+    #[cfg(target_arch = "wasm32")]
+    async fn check_if_connected<'a>(&self, mut session: TrezorSession<'a>) -> MmResult<TrezorSession<'a>, HwError> {
+        match session.is_connected().await {
+            Ok(true) => Ok(session),
+            Ok(false) => {
+                self.handle_hw_error(&HwError::DeviceDisconnected);
+                MmError::err(HwError::DeviceDisconnected)
+            },
+            Err(e) => {
+                self.handle_hw_error(&e);
+                Err(e.map(HwError::from))
+            },
         }
-        Ok(())
+    }
+
+    /// Currently, we use the heavy [`TrezorSession::ping`] method although it may lead
+    /// to the Button/PIN press request if the device is **locked**.
+    /// So even if we cancel the Button/PIN request,
+    /// the display will have time to draw something, that is, blink.
+    ///
+    /// TODO figure out how to implement [`Transport::is_connected`] for the native `UsbTransport`.
+    #[cfg(not(target_arch = "wasm32"))]
+    async fn check_if_connected<'a>(&self, mut session: TrezorSession<'a>) -> MmResult<TrezorSession<'a>, HwError> {
+        match session.ping().await {
+            Ok(resp) => {
+                resp.cancel_if_not_ready().await;
+                Ok(session)
+            },
+            Err(e) => {
+                self.handle_hw_error(&e);
+                Err(e.map(HwError::from))
+            },
+        }
+    }
+
+    /// If either the [`HardwareWalletCtx::hw_wallet`] client failed on a connection check,
+    /// we can't use it anymore.
+    fn handle_hw_error(&self, error: &dyn fmt::Display) {
+        warn!("Error checking Trezor device status. The device is no longer available: '{error}'");
+        self.hw_wallet_connected.store(false, Ordering::Relaxed);
     }
 }
+
+/// Applies `RIPEMD160(SHA256(h264))` to the given `h264`.
+fn h160_from_h264(h264: &H264) -> H160 { dhash160(h264.as_slice()) }
+
+/// Converts `H264` into a serializable/deserializable Hardware wallet pubkey.
+fn hw_pubkey_from_h264(h264: &H264) -> HwPubkey { HwPubkey::from(h160_from_h264(h264).as_slice()) }
diff --git a/mm2src/crypto/src/hw_error.rs b/mm2src/crypto/src/hw_error.rs
new file mode 100644
index 0000000000..d9e7b03610
--- /dev/null
+++ b/mm2src/crypto/src/hw_error.rs
@@ -0,0 +1,95 @@
+use derive_more::Display;
+use hw_common::primitives::Bip32Error;
+use mm2_err_handle::prelude::*;
+use serde::Serialize;
+use std::time::Duration;
+use trezor::{TrezorError, TrezorUserInteraction};
+
+pub type HwResult<T> = Result<T, MmError<HwError>>;
+
+#[derive(Clone, Debug, Display)]
+pub enum HwError {
+    #[display(fmt = "No Trezor device available")]
+    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 = "Found unexpected Hardware Wallet device")]
+    FoundUnexpectedDevice,
+    DeviceDisconnected,
+    #[display(fmt = "'{}' transport not supported", transport)]
+    TransportNotSupported {
+        transport: String,
+    },
+    #[display(fmt = "Invalid xpub received from a device: '{}'", _0)]
+    InvalidXpub(String),
+    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.to_string()) }
+}
+
+/// This error enumeration is involved to be used as a part of another RPC error.
+/// This enum consists of error types that cli/GUI must handle correctly,
+/// so please extend it if it's required **only**.
+///
+/// Please also note that this enum is fieldless.
+#[derive(Clone, Debug, Display, Serialize, PartialEq)]
+pub enum HwRpcError {
+    #[display(fmt = "No Trezor device available")]
+    NoTrezorDeviceAvailable = 0,
+    #[display(fmt = "Found multiple devices. Please unplug unused devices")]
+    FoundMultipleDevices,
+    #[display(fmt = "Found unexpected device. Please re-initialize Hardware wallet")]
+    FoundUnexpectedDevice,
+}
+
+/// The trait is implemented for those error enumerations that have `HwRpcError` variant.
+pub trait WithHwRpcError {
+    fn hw_rpc_error(hw_rpc_error: HwRpcError) -> Self;
+}
+
+/// Unfortunately, it's not possible to implementing `From<HwError>` for every type
+/// that implements `WithHwRpcError`, `WithTimeout` and `WithInternal`.
+/// So this function should be called from the `From<HwError>` implementation.
+pub fn from_hw_error<T>(hw_error: HwError) -> T
+where
+    T: WithHwRpcError + WithTimeout + WithInternal,
+{
+    match hw_error {
+        HwError::NoTrezorDeviceAvailable | HwError::DeviceDisconnected => {
+            T::hw_rpc_error(HwRpcError::NoTrezorDeviceAvailable)
+        },
+        HwError::CannotChooseDevice { .. } => T::hw_rpc_error(HwRpcError::FoundMultipleDevices),
+        HwError::ConnectionTimedOut { timeout } => T::timeout(timeout),
+        HwError::FoundUnexpectedDevice => T::hw_rpc_error(HwRpcError::FoundUnexpectedDevice),
+        other => T::internal(other.to_string()),
+    }
+}
diff --git a/mm2src/crypto/src/hw_rpc_task.rs b/mm2src/crypto/src/hw_rpc_task.rs
index 1928ff1270..41a0516ab6 100644
--- a/mm2src/crypto/src/hw_rpc_task.rs
+++ b/mm2src/crypto/src/hw_rpc_task.rs
@@ -4,12 +4,14 @@ 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::convert::TryFrom;
 use std::time::Duration;
-use trezor::trezor_rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, TrezorRequestStatuses, TrezorRpcTaskProcessor};
+use trezor::trezor_rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, TrezorRequestStatuses, TrezorRpcTaskProcessor,
+                              TryIntoUserAction};
+use trezor::user_interaction::TrezorPassphraseResponse;
 use trezor::{TrezorProcessingError, TrezorRequestProcessor};
 
-const CONNECT_DEFAULT_TIMEOUT: Duration = Duration::from_secs(60);
+const CONNECT_DEFAULT_TIMEOUT: Duration = Duration::from_secs(300);
 
 pub type HwRpcTaskUserActionRequest = RpcTaskUserActionRequest<HwRpcTaskUserAction>;
 
@@ -17,7 +19,8 @@ pub type HwRpcTaskUserActionRequest = RpcTaskUserActionRequest<HwRpcTaskUserActi
 /// 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,
+    EnterTrezorPin,
+    EnterTrezorPassphrase,
 }
 
 /// When it comes to interacting with a HW device,
@@ -26,6 +29,7 @@ pub enum HwRpcTaskAwaitingStatus {
 #[serde(tag = "action_type")]
 pub enum HwRpcTaskUserAction {
     TrezorPin(TrezorPinMatrix3x3Response),
+    TrezorPassphrase(TrezorPassphraseResponse),
 }
 
 impl TryFrom<HwRpcTaskUserAction> for TrezorPinMatrix3x3Response {
@@ -34,6 +38,22 @@ impl TryFrom<HwRpcTaskUserAction> for TrezorPinMatrix3x3Response {
     fn try_from(value: HwRpcTaskUserAction) -> Result<Self, Self::Error> {
         match value {
             HwRpcTaskUserAction::TrezorPin(pin) => Ok(pin),
+            HwRpcTaskUserAction::TrezorPassphrase(_) => Err(RpcTaskError::UnexpectedUserAction {
+                expected: "TrezorPin".to_string(),
+            }),
+        }
+    }
+}
+
+impl TryFrom<HwRpcTaskUserAction> for TrezorPassphraseResponse {
+    type Error = RpcTaskError;
+
+    fn try_from(value: HwRpcTaskUserAction) -> Result<Self, Self::Error> {
+        match value {
+            HwRpcTaskUserAction::TrezorPin(_) => Err(RpcTaskError::UnexpectedUserAction {
+                expected: "TrezorPassphrase".to_string(),
+            }),
+            HwRpcTaskUserAction::TrezorPassphrase(passphrase) => Ok(passphrase),
         }
     }
 }
@@ -45,6 +65,7 @@ pub struct HwConnectStatuses<InProgressStatus, AwaitingStatus> {
     pub on_connection_failed: InProgressStatus,
     pub on_button_request: InProgressStatus,
     pub on_pin_request: AwaitingStatus,
+    pub on_passphrase_request: AwaitingStatus,
     pub on_ready: InProgressStatus,
 }
 
@@ -57,6 +78,7 @@ where
         TrezorRequestStatuses {
             on_button_request: self.on_button_request.clone(),
             on_pin_request: self.on_pin_request.clone(),
+            on_passphrase_request: self.on_passphrase_request.clone(),
             on_ready: self.on_ready.clone(),
         }
     }
@@ -74,7 +96,7 @@ pub struct TrezorRpcTaskConnectProcessor<'a, Task: RpcTask> {
 impl<'a, Task> TrezorRequestProcessor for TrezorRpcTaskConnectProcessor<'a, Task>
 where
     Task: RpcTask,
-    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>,
+    Task::UserAction: TryIntoUserAction + Send,
 {
     type Error = RpcTaskError;
 
@@ -86,6 +108,10 @@ where
         self.request_processor.on_pin_request().await
     }
 
+    async fn on_passphrase_request(&self) -> MmResult<TrezorPassphraseResponse, TrezorProcessingError<Self::Error>> {
+        self.request_processor.on_passphrase_request().await
+    }
+
     async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<Self::Error>> {
         self.request_processor.on_ready().await
     }
@@ -95,7 +121,7 @@ where
 impl<'a, Task> TrezorConnectProcessor for TrezorRpcTaskConnectProcessor<'a, Task>
 where
     Task: RpcTask,
-    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>,
+    Task::UserAction: TryIntoUserAction,
 {
     async fn on_connect(&self) -> MmResult<Duration, HwProcessingError<RpcTaskError>> {
         self.request_processor
@@ -124,6 +150,7 @@ impl<'a, Task: RpcTask> TrezorRpcTaskConnectProcessor<'a, Task> {
         let request_statuses = TrezorRequestStatuses {
             on_button_request: statuses.on_button_request,
             on_pin_request: statuses.on_pin_request,
+            on_passphrase_request: statuses.on_passphrase_request,
             on_ready: statuses.on_ready,
         };
         let request_processor = TrezorRpcTaskProcessor::new(task_handle, request_statuses);
@@ -137,7 +164,7 @@ impl<'a, Task: RpcTask> TrezorRpcTaskConnectProcessor<'a, Task> {
     }
 
     pub fn with_pin_timeout(mut self, pin_timeout: Duration) -> Self {
-        self.request_processor = self.request_processor.with_pin_timeout(pin_timeout);
+        self.request_processor = self.request_processor.with_user_action_timeout(pin_timeout);
         self
     }
 
diff --git a/mm2src/crypto/src/key_pair_ctx.rs b/mm2src/crypto/src/key_pair_ctx.rs
deleted file mode 100644
index 8026b6b9a8..0000000000
--- a/mm2src/crypto/src/key_pair_ctx.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-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
index 4a5c1e3b35..65be730906 100644
--- a/mm2src/crypto/src/lib.rs
+++ b/mm2src/crypto/src/lib.rs
@@ -1,30 +1,60 @@
 #[macro_use] extern crate serde_derive;
 
 mod bip32_child;
-mod bip44;
 mod crypto_ctx;
+mod global_hd_ctx;
 mod hw_client;
 mod hw_ctx;
+mod hw_error;
 pub mod hw_rpc_task;
-mod key_pair_ctx;
 pub mod privkey;
+mod shared_db_id;
+mod standard_hd_path;
+mod xpub;
+
+#[cfg(target_arch = "wasm32")] mod metamask_ctx;
+// Uncomment this to finish MetaMask login.
+#[cfg(target_arch = "wasm32")] mod metamask_login;
 
 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 crypto_ctx::{CryptoCtx, CryptoCtxError, CryptoInitError, CryptoInitResult, HwCtxInitError, KeyPairPolicy};
+pub use global_hd_ctx::GlobalHDAccountArc;
+pub use hw_client::{HwClient, HwConnectionStatus, HwDeviceInfo, HwProcessingError, HwPubkey, HwWalletType,
+                    TrezorConnectProcessor};
 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 hw_error::{from_hw_error, HwError, HwResult, HwRpcError, WithHwRpcError};
+pub use keys::Secret as Secp256k1Secret;
+pub use standard_hd_path::{Bip44Chain, StandardHDPath, StandardHDPathError, StandardHDPathToAccount,
+                           StandardHDPathToCoin, UnknownChainError};
 pub use trezor;
+pub use xpub::{XPubConverter, XpubError};
+
+#[cfg(target_arch = "wasm32")]
+pub use crypto_ctx::MetamaskCtxInitError;
+#[cfg(target_arch = "wasm32")]
+pub use metamask_ctx::{MetamaskArc, MetamaskError, MetamaskResult, MetamaskWeak};
+#[cfg(target_arch = "wasm32")] pub use mm2_metamask as metamask;
 
 use serde::de::Error;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::str::FromStr;
 
+/// 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` - nothing special.
+/// * `address_index` - is ether specified by the config or default `0`.
+pub(crate) fn mm2_internal_der_path(address_index: Option<ChildNumber>) -> DerivationPath {
+    let mut der_path = DerivationPath::from_str("m/44'/141'/2147483647/0").expect("valid derivation path");
+    der_path.push(address_index.unwrap_or_default());
+    der_path
+}
+
 #[derive(Clone, Debug, PartialEq)]
 pub struct RpcDerivationPath(pub DerivationPath);
 
diff --git a/mm2src/crypto/src/metamask_ctx.rs b/mm2src/crypto/src/metamask_ctx.rs
new file mode 100644
index 0000000000..4c9e0e681e
--- /dev/null
+++ b/mm2src/crypto/src/metamask_ctx.rs
@@ -0,0 +1,112 @@
+use crate::metamask_login::{adex_eip712_request, AtomicDEXDomain, AtomicDEXLoginRequest};
+use mm2_err_handle::prelude::*;
+use mm2_eth::address::{address_from_pubkey_uncompressed, Address};
+use mm2_eth::recovery::{recover_pubkey, Signature};
+use mm2_metamask::{Eip1193Provider, MetamaskSession};
+use std::ops::Deref;
+use std::str::FromStr;
+use std::sync::{Arc, Weak};
+use web3::types::H520;
+use web3::Web3;
+
+pub use mm2_metamask::{MetamaskError, MetamaskResult};
+
+#[derive(Clone)]
+pub struct MetamaskArc(Arc<MetamaskCtx>);
+
+impl MetamaskArc {
+    pub fn new(metamask_ctx: MetamaskCtx) -> MetamaskArc { MetamaskArc(Arc::new(metamask_ctx)) }
+
+    pub fn downgrade(&self) -> MetamaskWeak { MetamaskWeak(Arc::downgrade(&self.0)) }
+}
+
+impl Deref for MetamaskArc {
+    type Target = MetamaskCtx;
+
+    fn deref(&self) -> &Self::Target { &self.0 }
+}
+
+#[derive(Clone)]
+pub struct MetamaskWeak(Weak<MetamaskCtx>);
+
+impl MetamaskWeak {
+    pub fn upgrade(&self) -> Option<MetamaskArc> { self.0.upgrade().map(MetamaskArc) }
+}
+
+pub struct MetamaskCtx {
+    eth_account: Address,
+    eth_account_str: String,
+    /// Please note that this is a normal version of public key (uncompressed).
+    eth_account_pubkey: H520,
+    web3: Web3<Eip1193Provider>,
+}
+
+impl MetamaskCtx {
+    pub async fn init(project_name: String) -> MetamaskResult<MetamaskCtx> {
+        let eip_transport = Eip1193Provider::detect().or_mm_err(|| MetamaskError::EthProviderNotFound)?;
+
+        let (eth_account, eth_account_str, eth_account_pubkey) = {
+            let metamask_session = MetamaskSession::lock(&eip_transport).await;
+            let eth_account_str = metamask_session.eth_request_account().await?;
+            let eth_account = Address::from_str(&eth_account_str)
+                .map_to_mm(|e| MetamaskError::ErrorDeserializingMethodResult(e.to_string()))?;
+
+            let domain = AtomicDEXDomain::new(project_name.clone());
+            let request = AtomicDEXLoginRequest::new(project_name);
+            let (hash, sig) = metamask_session
+                .sign_typed_data_v4(eth_account_str.clone(), adex_eip712_request(domain, request))
+                .await?;
+
+            let sig = sig.strip_prefix("0x").unwrap_or(&sig);
+            let signature = Signature::from_str(&sig)
+                .map_to_mm(|_| MetamaskError::Internal(format!("'{sig}' signature is invalid")))?;
+            let pubkey = recover_pubkey(hash, signature).mm_err(|_| {
+                let error = format!("Couldn't recover a public key from the signature: '{sig}'");
+                MetamaskError::Internal(error)
+            })?;
+
+            let recovered_address = address_from_pubkey_uncompressed(pubkey);
+            if eth_account != recovered_address {
+                let error =
+                    format!("Recovered address '{recovered_address:?}' should be the same as '{eth_account:?}'");
+                return MmError::err(MetamaskError::Internal(error));
+            }
+
+            (eth_account, eth_account_str, pubkey)
+        };
+
+        let web3 = Web3::new(eip_transport);
+        Ok(MetamaskCtx {
+            eth_account,
+            eth_account_str,
+            eth_account_pubkey,
+            web3,
+        })
+    }
+
+    #[inline]
+    pub fn eth_account(&self) -> Address { self.eth_account }
+
+    #[inline]
+    pub fn eth_account_str(&self) -> &str { &self.eth_account_str }
+
+    #[inline]
+    pub fn eth_account_pubkey_uncompressed(&self) -> H520 { self.eth_account_pubkey }
+
+    /// Checks if the `MetamaskCtx::eth_account` is still active.
+    /// This is required to check before sending transactions.
+    pub async fn check_active_eth_account(&self) -> MetamaskResult<&Address> {
+        let current_account = self.get_current_eth_account().await?;
+        if current_account == self.eth_account_str {
+            Ok(&self.eth_account)
+        } else {
+            MmError::err(MetamaskError::UnexpectedAccountSelected)
+        }
+    }
+
+    /// Returns an active ETH account.
+    pub async fn get_current_eth_account(&self) -> MetamaskResult<String> {
+        let metamask_session = MetamaskSession::lock(self.web3.transport()).await;
+        metamask_session.eth_request_account().await
+    }
+}
diff --git a/mm2src/crypto/src/metamask_login.rs b/mm2src/crypto/src/metamask_login.rs
new file mode 100644
index 0000000000..aa156af294
--- /dev/null
+++ b/mm2src/crypto/src/metamask_login.rs
@@ -0,0 +1,81 @@
+use lazy_static::lazy_static;
+use mm2_metamask::{Eip712, ObjectType, PropertyType};
+
+const ADEX_LOGIN_TYPE: &str = "AtomicDEXLogin";
+
+lazy_static! {
+    static ref ADEX_TYPES: [ObjectType; 2] = adex_login_types();
+}
+
+pub(crate) fn adex_eip712_request(
+    domain: AtomicDEXDomain,
+    req: AtomicDEXLoginRequest,
+) -> Eip712<AtomicDEXDomain, AtomicDEXLoginRequest> {
+    let types = ADEX_TYPES
+        .iter()
+        .map(|object_type| (object_type.name.clone(), object_type.properties.clone()))
+        .collect();
+    Eip712 {
+        types,
+        domain,
+        primary_type: ADEX_LOGIN_TYPE.to_string(),
+        message: req,
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub(crate) struct AtomicDEXDomain {
+    name: String,
+}
+
+impl AtomicDEXDomain {
+    pub fn new(name: String) -> AtomicDEXDomain { AtomicDEXDomain { name } }
+}
+
+#[derive(Debug, Serialize)]
+pub(crate) struct AtomicDEXLoginRequest {
+    message: String,
+}
+
+impl AtomicDEXLoginRequest {
+    pub fn new(project_name: String) -> AtomicDEXLoginRequest {
+        AtomicDEXLoginRequest {
+            message: format!("Login to {project_name}"),
+        }
+    }
+}
+
+fn adex_login_types() -> [ObjectType; 2] {
+    let mut domain = ObjectType::domain();
+    domain.property("name", PropertyType::String);
+
+    let mut login_request = ObjectType::new(ADEX_LOGIN_TYPE);
+    login_request.property("message", PropertyType::String);
+
+    [domain, login_request]
+}
+
+mod tests {
+    use super::*;
+    use mm2_metamask::hash_typed_data;
+    use std::str::FromStr;
+    use wasm_bindgen_test::*;
+    use web3::types::H256;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_hash_adex_login_request() {
+        const PROJECT: &str = "AtomicDEX";
+
+        let domain = AtomicDEXDomain {
+            name: PROJECT.to_string(),
+        };
+        let request = AtomicDEXLoginRequest::new(PROJECT.to_string());
+        let adex_req = adex_eip712_request(domain, request);
+
+        let actual = hash_typed_data(adex_req).unwrap();
+        let expected = H256::from_str("0xad90ea2902042ebef413d66f56cfb2b37d313342ec6622ee589eda314fd782d5").unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/mm2src/crypto/src/privkey.rs b/mm2src/crypto/src/privkey.rs
index cfbc82c8a6..48ca098c20 100644
--- a/mm2src/crypto/src/privkey.rs
+++ b/mm2src/crypto/src/privkey.rs
@@ -21,9 +21,8 @@
 
 use bitcrypto::{sha256, ChecksumType};
 use derive_more::Display;
-use keys::{Error as KeysError, KeyPair, Private};
+use keys::{Error as KeysError, KeyPair, Private, Secret as Secp256k1Secret};
 use mm2_err_handle::prelude::*;
-use primitives::hash::H256;
 use rustc_hex::FromHexError;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
@@ -36,7 +35,7 @@ pub enum PrivKeyError {
     #[display(fmt = "Error parsing passphrase: {}", _0)]
     ErrorParsingPassphrase(String),
     #[display(fmt = "Invalid private key: {}", _0)]
-    InvalidPrivKey(KeysError),
+    InvalidPrivKey(String),
     #[display(fmt = "We only support compressed keys at the moment")]
     ExpectedCompressedKeys,
 }
@@ -46,7 +45,7 @@ impl From<FromHexError> for PrivKeyError {
 }
 
 impl From<KeysError> for PrivKeyError {
-    fn from(e: KeysError) -> Self { PrivKeyError::InvalidPrivKey(e) }
+    fn from(e: KeysError) -> Self { PrivKeyError::InvalidPrivKey(e.to_string()) }
 }
 
 fn private_from_seed(seed: &str) -> PrivKeyResult<Private> {
@@ -61,7 +60,7 @@ fn private_from_seed(seed: &str) -> PrivKeyResult<Private> {
 
     match seed.strip_prefix("0x") {
         Some(stripped) => {
-            let hash: H256 = stripped.parse()?;
+            let hash: Secp256k1Secret = stripped.parse()?;
             Ok(Private {
                 prefix: 0,
                 secret: hash,
@@ -69,21 +68,22 @@ fn private_from_seed(seed: &str) -> PrivKeyResult<Private> {
                 checksum_type: ChecksumType::DSHA256,
             })
         },
-        None => {
-            let hash = sha256(seed.as_bytes());
+        None => Ok(private_from_seed_hash(seed)),
+    }
+}
 
-            Ok(Private {
-                prefix: 0,
-                secret: secp_privkey_from_hash(hash),
-                compressed: true,
-                checksum_type: ChecksumType::DSHA256,
-            })
-        },
+pub(crate) fn private_from_seed_hash(seed: &str) -> Private {
+    let hash = sha256(seed.as_bytes());
+    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 {
+pub fn secp_privkey_from_hash(mut hash: Secp256k1Secret) -> Secp256k1Secret {
     hash[0] &= 248;
     hash[31] &= 127;
     hash[31] |= 64;
@@ -103,18 +103,24 @@ pub fn key_pair_from_seed(seed: &str) -> PrivKeyResult<KeyPair> {
 
 pub fn key_pair_from_secret(secret: &[u8]) -> PrivKeyResult<KeyPair> {
     if secret.len() != 32 {
-        return MmError::err(PrivKeyError::InvalidPrivKey(KeysError::InvalidPrivate));
+        return MmError::err(PrivKeyError::InvalidPrivKey(KeysError::InvalidPrivate.to_string()));
     }
 
     let private = Private {
         prefix: 0,
         secret: secret.into(),
         compressed: true,
-        checksum_type: Default::default(),
+        checksum_type: ChecksumType::DSHA256,
     };
     Ok(KeyPair::from_private(private)?)
 }
 
+pub fn bip39_seed_from_passphrase(passphrase: &str) -> PrivKeyResult<bip39::Seed> {
+    let mnemonic = bip39::Mnemonic::from_phrase(passphrase, bip39::Language::English)
+        .map_to_mm(|e| PrivKeyError::ErrorParsingPassphrase(e.to_string()))?;
+    Ok(bip39::Seed::new(&mnemonic, ""))
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct SerializableSecp256k1Keypair {
     inner: KeyPair,
diff --git a/mm2src/crypto/src/shared_db_id.rs b/mm2src/crypto/src/shared_db_id.rs
new file mode 100644
index 0000000000..1aff809ca9
--- /dev/null
+++ b/mm2src/crypto/src/shared_db_id.rs
@@ -0,0 +1,33 @@
+use crate::privkey::private_from_seed_hash;
+use derive_more::Display;
+use enum_from::EnumFromStringify;
+use keys::{Error as KeysError, KeyPair};
+use mm2_err_handle::prelude::*;
+use primitives::hash::H160;
+
+/// This magic string is used to change the input mnemonic passphrase the way
+/// so `sha256(mnemonic + SHARED_DB_MAGIC_SALT)`
+const SHARED_DB_MAGIC_SALT: &str = "uVa*6pcnpc9ki+VBX.6_L.";
+
+pub type SharedDbId = H160;
+
+#[derive(Display, EnumFromStringify)]
+pub enum SharedDbIdError {
+    #[display(fmt = "Passphrase cannot be an empty string")]
+    EmptyPassphrase,
+    #[from_stringify("KeysError")]
+    #[display(fmt = "Internal error: {_0}")]
+    Internal(String),
+}
+
+pub fn shared_db_id_from_seed(passphrase: &str) -> MmResult<SharedDbId, SharedDbIdError> {
+    let stripped_passphrase = passphrase.strip_prefix("0x").unwrap_or(passphrase);
+    if stripped_passphrase.is_empty() {
+        return MmError::err(SharedDbIdError::EmptyPassphrase);
+    }
+
+    let changed_passphrase = format!("{stripped_passphrase} {SHARED_DB_MAGIC_SALT}");
+    let private = private_from_seed_hash(&changed_passphrase);
+    let key_pair = KeyPair::from_private(private)?;
+    Ok(key_pair.public().address_hash())
+}
diff --git a/mm2src/crypto/src/bip44.rs b/mm2src/crypto/src/standard_hd_path.rs
similarity index 57%
rename from mm2src/crypto/src/bip44.rs
rename to mm2src/crypto/src/standard_hd_path.rs
index d473094ae9..4d13456b1a 100644
--- a/mm2src/crypto/src/bip44.rs
+++ b/mm2src/crypto/src/standard_hd_path.rs
@@ -6,29 +6,34 @@ use hw_common::primitives::Bip32Error;
 use num_traits::FromPrimitive;
 use std::convert::TryFrom;
 
-pub const BIP44_PURPOSE: u32 = 44;
-
+/// Standard HD Path for [BIP-44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki),
+/// [BIP-49](https://github.com/bitcoin/bips/blob/master/bip-0049.mediawiki),
+/// [BIP-84](https://github.com/bitcoin/bips/blob/master/bip-0084.mediawiki)
+/// and similar.
+/// For path as `m/purpose'/coin_type'/account'/change/address_index`.
 #[rustfmt::skip]
-pub type Bip44DerivationPath =
-    Bip32Child<Bip44PurposeValue, // `purpose`
+pub type StandardHDPath =
+    Bip32Child<Bip32PurposeValue, // `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`
+pub type StandardHDPathToCoin =
+    Bip32Child<Bip32PurposeValue, // `purpose`
     Bip32Child<HardenedValue, // `coin_type`
     Bip44Tail>>;
 #[rustfmt::skip]
-pub type Bip44PathToAccount =
-    Bip32Child<Bip44PurposeValue, // `purpose`
+pub type StandardHDPathToAccount =
+    Bip32Child<Bip32PurposeValue, // `purpose`
     Bip32Child<HardenedValue, // `coin_type`
     Bip32Child<HardenedValue, // `account_id`
     Bip44Tail>>>;
 
-impl Bip44DerivationPath {
+impl StandardHDPath {
+    pub fn purpose(&self) -> Bip43Purpose { self.value() }
+
     pub fn coin_type(&self) -> u32 { self.child().value() }
 
     pub fn account_id(&self) -> u32 { self.child().child().value() }
@@ -38,22 +43,27 @@ impl Bip44DerivationPath {
     pub fn address_id(&self) -> u32 { self.child().child().child().child().value() }
 }
 
-impl Bip44PathToCoin {
+impl StandardHDPathToCoin {
+    pub fn purpose(&self) -> Bip43Purpose { self.value() }
+
     pub fn coin_type(&self) -> u32 { self.child().value() }
 }
 
-impl Bip44PathToAccount {
+impl StandardHDPathToAccount {
+    pub fn purpose(&self) -> Bip43Purpose { self.value() }
+
     pub fn coin_type(&self) -> u32 { self.child().value() }
 
     pub fn account_id(&self) -> u32 { self.child().child().value() }
 }
 
-pub struct UnkownBip44ChainError {
+#[derive(Debug)]
+pub struct UnknownChainError {
     pub chain: u32,
 }
 
 #[derive(Debug, Display, Eq, PartialEq)]
-pub enum Bip44DerPathError {
+pub enum StandardHDPathError {
     #[display(fmt = "Invalid derivation path length '{}', expected '{}'", found, expected)]
     InvalidDerivationPathLength { expected: usize, found: usize },
     #[display(fmt = "Child '{}' is expected to be hardened", child)]
@@ -70,42 +80,42 @@ pub enum Bip44DerPathError {
     Bip32Error(Bip32Error),
 }
 
-impl From<Bip32DerPathError> for Bip44DerPathError {
+impl From<Bip32DerPathError> for StandardHDPathError {
     fn from(e: Bip32DerPathError) -> Self {
         fn display_child_at(child_at: usize) -> String {
-            Bip44Index::from_usize(child_at)
+            StandardHDIndex::from_usize(child_at)
                 .map(|index| format!("{:?}", index))
                 .unwrap_or_else(|| "UNKNOWN".to_owned())
         }
 
         match e {
             Bip32DerPathError::InvalidDerivationPathLength { expected, found } => {
-                Bip44DerPathError::InvalidDerivationPathLength { expected, found }
+                StandardHDPathError::InvalidDerivationPathLength { expected, found }
             },
-            Bip32DerPathError::ChildIsNotHardened { child_at } => Bip44DerPathError::ChildIsNotHardened {
+            Bip32DerPathError::ChildIsNotHardened { child_at } => StandardHDPathError::ChildIsNotHardened {
                 child: display_child_at(child_at),
             },
-            Bip32DerPathError::ChildIsHardened { child_at } => Bip44DerPathError::ChildIsHardened {
+            Bip32DerPathError::ChildIsHardened { child_at } => StandardHDPathError::ChildIsHardened {
                 child: display_child_at(child_at),
             },
             Bip32DerPathError::UnexpectedChildValue {
                 child_at,
                 actual,
                 expected,
-            } => Bip44DerPathError::UnexpectedChildValue {
+            } => StandardHDPathError::UnexpectedChildValue {
                 child: display_child_at(child_at),
                 value: actual,
                 expected,
             },
-            Bip32DerPathError::Bip32Error(bip32) => Bip44DerPathError::Bip32Error(bip32),
+            Bip32DerPathError::Bip32Error(bip32) => StandardHDPathError::Bip32Error(bip32),
         }
     }
 }
 
-impl From<UnkownBip44ChainError> for Bip32DerPathError {
-    fn from(e: UnkownBip44ChainError) -> Self {
+impl From<UnknownChainError> for Bip32DerPathError {
+    fn from(e: UnknownChainError) -> Self {
         Bip32DerPathError::UnexpectedChildValue {
-            child_at: Bip44Index::Chain as usize,
+            child_at: StandardHDIndex::Chain as usize,
             actual: e.chain,
             expected: "0 or 1 chain".to_owned(),
         }
@@ -113,7 +123,7 @@ impl From<UnkownBip44ChainError> for Bip32DerPathError {
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Primitive)]
-pub enum Bip44Index {
+pub enum StandardHDIndex {
     Purpose = 0,
     CoinType = 1,
     AccountId = 2,
@@ -121,20 +131,21 @@ pub enum Bip44Index {
     AddressId = 4,
 }
 
-#[derive(Debug, Copy, Clone, Deserialize, PartialEq, Serialize)]
+#[derive(Debug, Copy, Clone, Deserialize, Eq, Hash, PartialEq, Serialize)]
+#[repr(u32)]
 pub enum Bip44Chain {
     External = 0,
     Internal = 1,
 }
 
 impl TryFrom<u32> for Bip44Chain {
-    type Error = UnkownBip44ChainError;
+    type Error = UnknownChainError;
 
     fn try_from(value: u32) -> Result<Self, Self::Error> {
         match value {
             0 => Ok(Bip44Chain::External),
             1 => Ok(Bip44Chain::Internal),
-            chain => Err(UnkownBip44ChainError { chain }),
+            chain => Err(UnknownChainError { chain }),
         }
     }
 }
@@ -168,32 +179,50 @@ impl Bip32ChildValue for Bip44ChainValue {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[repr(u32)]
+pub enum Bip43Purpose {
+    Bip32 = 32,
+    Bip44 = 44,
+    Bip49 = 49,
+    Bip84 = 84,
+}
+
 #[derive(Clone, PartialEq)]
-pub struct Bip44PurposeValue;
+pub struct Bip32PurposeValue {
+    purpose: Bip43Purpose,
+}
 
-impl Bip32ChildValue for Bip44PurposeValue {
-    type Value = u32;
+impl Bip32ChildValue for Bip32PurposeValue {
+    type Value = Bip43Purpose;
 
-    /// `purpose` is always a hardened child as it's described in the BIP44 standard.
+    /// `purpose` is always a hardened child as it's described in the BIP44/BIP49/BIP84 standards.
     fn hardened() -> bool { true }
 
-    fn number(&self) -> u32 { BIP44_PURPOSE }
+    fn number(&self) -> u32 { self.purpose as u32 }
 
-    fn value(&self) -> u32 { BIP44_PURPOSE }
+    fn value(&self) -> Bip43Purpose { self.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),
-            });
+        if !child_number.is_hardened() {
+            return Err(Bip32DerPathError::ChildIsNotHardened { child_at });
         }
-        Ok(Bip44PurposeValue)
+
+        let purpose = match child_number.index() {
+            32 => Bip43Purpose::Bip32,
+            44 => Bip43Purpose::Bip44,
+            49 => Bip43Purpose::Bip49,
+            84 => Bip43Purpose::Bip84,
+            _chain => {
+                return Err(Bip32DerPathError::UnexpectedChildValue {
+                    child_at,
+                    actual: child_number.0,
+                    expected: "one of the following: 32, 44, 49, 84".to_string(),
+                })
+            },
+        };
+
+        Ok(Bip32PurposeValue { purpose })
     }
 }
 
@@ -206,7 +235,7 @@ mod tests {
 
     #[test]
     fn test_from_str() {
-        let der_path = Bip44DerivationPath::from_str("m/44'/141'/1'/0/10").unwrap();
+        let der_path = StandardHDPath::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);
@@ -215,15 +244,15 @@ mod tests {
 
     #[test]
     fn test_display() {
-        let der_path = Bip44PathToAccount::from_str("m/44'/141'/1'").unwrap();
+        let der_path = StandardHDPathToAccount::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 =
+        let der_path_to_coin = StandardHDPathToCoin::from_str("m/44'/141'").unwrap();
+        let der_path_to_account: StandardHDPathToAccount =
             der_path_to_coin.derive(ChildNumber::new(10, true).unwrap()).unwrap();
         assert_eq!(
             der_path_to_account.to_derivation_path(),
@@ -233,14 +262,14 @@ mod tests {
 
     #[test]
     fn test_from_invalid_length() {
-        let error = Bip44DerivationPath::from_str("m/44'/141'/0'").expect_err("derivation path is too short");
+        let error = StandardHDPath::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");
+        let error =
+            StandardHDPath::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
@@ -249,11 +278,26 @@ mod tests {
 
     #[test]
     fn test_from_unexpected_child_value() {
-        let error = Bip44PathToAccount::from_str("m/44'/141'/0").expect_err("'account_id' is not hardened");
+        let error = StandardHDPathToAccount::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 {
+        let error = StandardHDPathError::from(error);
+        assert_eq!(error, StandardHDPathError::ChildIsNotHardened {
             child: "AccountId".to_owned()
         });
     }
+
+    #[test]
+    fn test_purposes() {
+        let path = StandardHDPath::from_str("m/32'/141'/0'/0/0").unwrap();
+        assert_eq!(path.purpose(), Bip43Purpose::Bip32);
+
+        let path = StandardHDPath::from_str("m/44'/141'/0'/0/0").unwrap();
+        assert_eq!(path.purpose(), Bip43Purpose::Bip44);
+
+        let path = StandardHDPath::from_str("m/49'/141'/0'/0/0").unwrap();
+        assert_eq!(path.purpose(), Bip43Purpose::Bip49);
+
+        let path = StandardHDPath::from_str("m/84'/141'/0'/0/0").unwrap();
+        assert_eq!(path.purpose(), Bip43Purpose::Bip84);
+    }
 }
diff --git a/mm2src/crypto/src/xpub.rs b/mm2src/crypto/src/xpub.rs
new file mode 100644
index 0000000000..3d97168975
--- /dev/null
+++ b/mm2src/crypto/src/xpub.rs
@@ -0,0 +1,95 @@
+//! This module is inspired by the [xpub-converter](https://jlopp.github.io/xpub-converter/).
+//! The source code https://github.com/jlopp/xpub-converter/blob/master/js/xpubConvert.js
+
+use bs58::decode::Error as Base58Error;
+use derive_more::Display;
+use hw_common::primitives::XPub;
+use mm2_err_handle::prelude::*;
+
+/// `xpub` prefix is the `[4, 136, 178, 30]` bytes encoded into `base58`.
+/// The result of `Buffer.from('0488b21e','hex')`.
+/// https://github.com/jlopp/xpub-converter/blob/master/js/xpubConvert.js#L11
+const XPUB_PREFIX_RAW: [u8; 4] = [4, 136, 178, 30];
+
+#[derive(Debug, Display)]
+pub enum XpubError {
+    #[display(fmt = "Unknown prefix")]
+    UnknownPrefix,
+    #[display(fmt = "base58 error: {}", _0)]
+    Base58Error(Base58Error),
+}
+
+impl From<Base58Error> for XpubError {
+    fn from(e: Base58Error) -> Self { XpubError::Base58Error(e) }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct XPubConverter;
+
+impl XPubConverter {
+    /// Checks if the given string is a standard Xpub public key.
+    /// The input string must start with the standard `xpub` prefix and contain a valid checksum.
+    pub fn is_standard_xpub(xpub: &str) -> MmResult<(), XpubError> {
+        let bytes = bs58::decode(&xpub).with_check(None).into_vec()?;
+        if has_xpub_prefix(&bytes)? {
+            Ok(())
+        } else {
+            MmError::err(XpubError::UnknownPrefix)
+        }
+    }
+
+    /// Replaces a magic prefix (like `dgub`, `ypub` etc) with the standard `xpub` prefix.
+    /// List of magic prefixes: https://github.com/satoshilabs/slips/blob/master/slip-0132.md
+    pub fn replace_magic_prefix(xpub: XPub) -> MmResult<XPub, XpubError> {
+        let mut bytes = bs58::decode(&xpub).with_check(None).into_vec()?;
+
+        if has_xpub_prefix(&bytes)? {
+            return Ok(xpub);
+        }
+
+        // Replace the magic prefix (first 4 bytes) with the `xpub` prefix.
+        // `has_xpub_prefix` checks if the buffer is longer than 4 bytes.
+        bytes.splice(0..4, XPUB_PREFIX_RAW);
+
+        // Encode the bytes into a `base58` string.
+        Ok(bs58::encode(bytes).with_check().into_string())
+    }
+}
+
+fn has_xpub_prefix(bytes: &[u8]) -> MmResult<bool, Base58Error> {
+    if bytes.len() < 4 {
+        return MmError::err(Base58Error::BufferTooSmall);
+    }
+    Ok(bytes[0..4] == XPUB_PREFIX_RAW)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::mem;
+
+    #[test]
+    fn test_xpub_check() {
+        XPubConverter::is_standard_xpub("xpub6FZD3nMbn98RuBforZLU7N4zArVkmM2m9UwjLX4vtdmmgq8YXPyHeAhCUxFS8wuqoQ9GwSuoSyGdHNv58ZyT5a3wXwYAq83PRyWHgoaA85M").unwrap();
+
+        // Must fail with an invalid checksum error.
+        let error = XPubConverter::is_standard_xpub("xpub6DUpU8UQuf4KL15Mc3tYPTTCb44K16q4u7E76iB7FyCvMLmuypkZ9a2UpDGSCN1e2LswKnyov9bbjiXn1oh6FkekAwaEzp7wJAoBBawBwMB").unwrap_err();
+        match error.into_inner() {
+            XpubError::Base58Error(Base58Error::InvalidChecksum { .. }) => (),
+            other => panic!("Expected 'InvalidChecksum' error, found {:?}", other),
+        }
+
+        let error = XPubConverter::is_standard_xpub("dgub8sze3tX1SkRjWEwiuLhVpYk7qMCp4fyawZRdg2BLaBzeuYBNvVGupd7BBHmRaLR725Ppmgg7X9oYkSqoaYLqFaWJCdykX5u3em5nu7kmxtZ").unwrap_err();
+        // The error variant should equal to `UnknownPrefix`
+        assert_eq!(
+            mem::discriminant(&error.into_inner()),
+            mem::discriminant(&XpubError::UnknownPrefix)
+        );
+    }
+
+    #[test]
+    fn test_xpub_replace_magic_prefix() {
+        let xpub = XPubConverter::replace_magic_prefix("dgub8sze3tX1SkRjWEwiuLhVpYk7qMCp4fyawZRdg2BLaBzeuYBNvVGupd7BBHmRaLR725Ppmgg7X9oYkSqoaYLqFaWJCdykX5u3em5nu7kmxtZ".to_string()).unwrap();
+        assert_eq!(xpub, "xpub6DUpU8UQuf4KL15Mc3tYPTTCb44K16q4u7E76iB7FyCvMLmuypkZ9a2UpDGSCN1e2LswKnyov9bbjiXn1oh6FkekAwaEzp7wJAoBBY6GsKm");
+    }
+}
diff --git a/mm2src/db_common/Cargo.toml b/mm2src/db_common/Cargo.toml
index f1c0e32921..87d16bbbc5 100644
--- a/mm2src/db_common/Cargo.toml
+++ b/mm2src/db_common/Cargo.toml
@@ -3,9 +3,11 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
+common = { path = "../common" }
 hex = "0.4.2"
 log = "0.4.8"
 uuid = { version = "0.7", features = ["serde", "v4"] }
diff --git a/mm2src/db_common/src/lib.rs b/mm2src/db_common/src/lib.rs
index 644887e563..bd34839ae7 100644
--- a/mm2src/db_common/src/lib.rs
+++ b/mm2src/db_common/src/lib.rs
@@ -1,2 +1,21 @@
-#[cfg(not(target_arch = "wasm32"))] pub mod sql_query;
+#[cfg(not(target_arch = "wasm32"))] mod sql_condition;
+#[cfg(not(target_arch = "wasm32"))] mod sql_constraint;
+#[cfg(not(target_arch = "wasm32"))] mod sql_create;
+#[cfg(not(target_arch = "wasm32"))] mod sql_delete;
+#[cfg(not(target_arch = "wasm32"))] mod sql_insert;
+#[cfg(not(target_arch = "wasm32"))] mod sql_query;
+#[cfg(not(target_arch = "wasm32"))] mod sql_update;
+#[cfg(not(target_arch = "wasm32"))] mod sql_value;
 #[cfg(not(target_arch = "wasm32"))] pub mod sqlite;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub mod sql_build {
+    pub use crate::sql_condition::SqlCondition;
+    pub use crate::sql_constraint::{foreign_key, ForeignKey, PrimaryKey, SqlConstraint, Unique};
+    pub use crate::sql_create::{SqlColumn, SqlCreateTable, SqlType, TableKey};
+    pub use crate::sql_delete::SqlDelete;
+    pub use crate::sql_insert::SqlInsert;
+    pub use crate::sql_query::{SqlQuery, SqlSubquery};
+    pub use crate::sql_update::SqlUpdate;
+    pub use crate::sql_value::{FromQuoted, SqlValue, SqlValueOptional};
+}
diff --git a/mm2src/db_common/src/sql_condition.rs b/mm2src/db_common/src/sql_condition.rs
new file mode 100644
index 0000000000..af645df6c3
--- /dev/null
+++ b/mm2src/db_common/src/sql_condition.rs
@@ -0,0 +1,187 @@
+use crate::sql_value::{FromQuoted, SqlValue, SqlValueOptional, SqlValueToString, SqlValuesToStrings};
+use crate::sqlite::{OwnedSqlParam, SqlParamsBuilder, ToValidSqlIdent};
+use rusqlite::Result as SqlResult;
+use sql_builder::SqlBuilder;
+
+/// An SQL condition builder.
+pub trait SqlCondition: Sized {
+    fn sql_builder(&mut self) -> &mut SqlBuilder;
+
+    fn sql_params(&mut self) -> &mut SqlParamsBuilder;
+
+    /// Add WHERE condition for equal parts.
+    /// For more details see [`SqlBuilder::and_where_eq`] and [`SqlBuilder::and_where_is_null`].
+    ///
+    /// Please note the function validates the given `field` name,
+    /// and `value` is considered a valid as it's able to be converted into `SqlValue`.
+    fn and_where_eq<S, T>(&mut self, field: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: From<T>,
+    {
+        let field = field.to_valid_sql_ident()?;
+        match SqlValueOptional::from(value) {
+            SqlValueOptional::Some(value) => self.sql_builder().and_where_eq(field, SqlValue::value_to_string(value)),
+            SqlValueOptional::Null => self.sql_builder().and_where_is_null(field),
+        };
+        Ok(self)
+    }
+
+    /// Add WHERE condition for equal parts.
+    /// For more details see [`SqlBuilder::and_where_eq`].
+    ///
+    /// Please note the function validates the given `field`.
+    fn and_where_eq_param<S, T>(&mut self, field: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        let field = field.to_valid_sql_ident()?;
+        match OwnedSqlParam::from(param) {
+            OwnedSqlParam::Null => self.sql_builder().and_where_is_null(field),
+            not_null => {
+                let param_id = self.sql_params().push_owned_param(not_null);
+                self.sql_builder().and_where_eq(field, param_id)
+            },
+        };
+        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]
+    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]
+    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: FromQuoted<T>,
+    {
+        let values = SqlValue::quoted_values_to_strings(values);
+        self.sql_builder().and_where_in(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`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    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>,
+    {
+        let param_ids = self.sql_params().push_params(params);
+        self.sql_builder().and_where_in(field.to_valid_sql_ident()?, &param_ids);
+        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`.
+    fn or_where_eq<S, T>(&mut self, field: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: From<T>,
+    {
+        let field = field.to_valid_sql_ident()?;
+        match SqlValueOptional::from(value) {
+            SqlValueOptional::Some(value) => self.sql_builder().or_where_eq(field, SqlValue::value_to_string(value)),
+            SqlValueOptional::Null => self.sql_builder().or_where_is_null(field),
+        };
+        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`.
+    fn or_where_eq_param<S, T>(&mut self, field: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        let field = field.to_valid_sql_ident()?;
+        match OwnedSqlParam::from(param) {
+            OwnedSqlParam::Null => self.sql_builder().or_where_is_null(field),
+            not_null => {
+                let param_id = self.sql_params().push_owned_param(not_null);
+                self.sql_builder().or_where_eq(field, param_id)
+            },
+        };
+        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]
+    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`].
+    ///
+    /// Please note the function validates the given `field`,
+    /// and `values` are considered valid as they're able to be converted into `SqlValue`.
+    #[inline]
+    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: FromQuoted<T>,
+    {
+        let values: Vec<_> = values.into_iter().map(SqlValue::quoted_value_to_string).collect();
+        self.sql_builder().or_where_in(field.to_valid_sql_ident()?, &values);
+        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`.
+    #[inline]
+    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>,
+    {
+        let param_ids = self.sql_params().push_params(params);
+        self.sql_builder().or_where_in(field.to_valid_sql_ident()?, &param_ids);
+        Ok(self)
+    }
+}
diff --git a/mm2src/db_common/src/sql_constraint.rs b/mm2src/db_common/src/sql_constraint.rs
new file mode 100644
index 0000000000..ed4d44eafe
--- /dev/null
+++ b/mm2src/db_common/src/sql_constraint.rs
@@ -0,0 +1,313 @@
+use crate::sqlite::StringError;
+use common::fmt::WriteJoin;
+use rusqlite::{Error as SqlError, Result as SqlResult};
+use std::collections::BTreeMap;
+use std::fmt;
+
+pub use foreign_key::ForeignKey;
+
+macro_rules! named_constraint {
+    ($constraint_ident:ident, $constraint_str:literal) => {
+        #[derive(Debug)]
+        pub struct $constraint_ident {
+            name: &'static str,
+            columns: Vec<&'static str>,
+        }
+
+        impl $constraint_ident {
+            const CONSTRAINT: &'static str = $constraint_str;
+
+            pub fn new<I>(constraint_name: &'static str, columns: I) -> SqlResult<$constraint_ident>
+            where
+                I: IntoIterator<Item = &'static str>,
+            {
+                let columns: Vec<_> = columns.into_iter().collect();
+                if columns.is_empty() {
+                    return Err(no_columns_error(Self::CONSTRAINT));
+                }
+                Ok($constraint_ident {
+                    name: constraint_name,
+                    columns,
+                })
+            }
+        }
+
+        impl From<$constraint_ident> for SqlConstraint {
+            fn from(constraint: $constraint_ident) -> Self { SqlConstraint::$constraint_ident(constraint) }
+        }
+
+        impl fmt::Display for $constraint_ident {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                assert!(
+                    !self.columns.is_empty(),
+                    "{}::new must check if no columns were passed",
+                    stringify!($constraint_ident)
+                );
+                write!(f, "CONSTRAINT {} {} (", self.name, Self::CONSTRAINT)?;
+
+                self.columns.iter().write_join(f, ", ")?;
+                write!(f, ")")
+            }
+        }
+    };
+}
+
+pub enum SqlConstraint {
+    Unique(Unique),
+    PrimaryKey(PrimaryKey),
+    ForeignKey(ForeignKey),
+}
+
+impl fmt::Display for SqlConstraint {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SqlConstraint::Unique(unique) => write!(f, "{}", unique),
+            SqlConstraint::PrimaryKey(prim_key) => write!(f, "{}", prim_key),
+            SqlConstraint::ForeignKey(foreign_key) => write!(f, "{}", foreign_key),
+        }
+    }
+}
+
+// This type is used to define a UNIQUE constraint on multiple columns.
+// https://www.w3schools.com/sql/sql_unique.asp
+named_constraint!(Unique, "UNIQUE");
+
+// This type is used to define a PRIMARY KEY constraint on multiple columns.
+// https://www.w3schools.com/sql/sql_primarykey.asp
+named_constraint!(PrimaryKey, "PRIMARY KEY");
+
+pub mod foreign_key {
+    use super::*;
+    use std::fmt;
+
+    #[macro_export]
+    macro_rules! foreign_columns {
+        ($($referenced_col:expr => $parent_col:expr),+ $(,)?) => {
+            [
+                $((
+                    $crate::sql_build::foreign_key::ReferencedColumn($referenced_col),
+                    $crate::sql_build::foreign_key::ParentColumn($parent_col),
+                )),+
+            ]
+        };
+    }
+
+    /// The parent table name.
+    pub struct ParentTable(pub &'static str);
+
+    /// The column name in a referenced table.
+    pub struct ReferencedColumn(pub &'static str);
+
+    /// The column name in a parent table.
+    pub struct ParentColumn(pub &'static str);
+
+    /// Foreign key `ON DELETE` and `ON UPDATE` clauses are used to configure actions that take place
+    /// when deleting rows from the parent table (`ON DELETE`),
+    /// or modifying the parent key values of existing rows (`ON UPDATE`).
+    /// https://www.sqlite.org/foreignkeys.html
+    #[derive(Eq, Ord, PartialEq, PartialOrd)]
+    pub enum Event {
+        OnUpdate,
+        OnDelete,
+    }
+
+    impl fmt::Display for Event {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self {
+                Event::OnUpdate => write!(f, "ON UPDATE"),
+                Event::OnDelete => write!(f, "ON DELETE"),
+            }
+        }
+    }
+
+    /// The `ON DELETE` and `ON UPDATE` action associated with each foreign key in an SQLite database
+    /// is one of `NO ACTION`, `RESTRICT`, `SET NULL`, `SET DEFAULT` or `CASCADE`.
+    /// If an action is not explicitly specified, it defaults to `NO ACTION`.
+    pub enum Action {
+        /// Configuring `NO ACTION` means just that:
+        /// when a parent key is modified or deleted from the database, no special action is taken.
+        NoAction,
+        /// The `RESTRICT` action means that the application is prohibited from deleting (for `ON DELETE` RESTRICT)
+        /// or modifying (for `ON UPDATE RESTRICT`) a parent key when there exists one or more child keys mapped to it.
+        Restrict,
+        /// If the configured action is `SET NULL`, then when a parent key is deleted (for `ON DELETE SET NULL`)
+        /// or modified (for `ON UPDATE SET NULL`), the child key columns of all rows in the child table
+        /// that mapped to the parent key are set to contain SQL NULL values.
+        SetNull,
+        /// The `SET DEFAULT` actions are similar to `SET NULL`,
+        /// except that each of the child key columns is set to contain the column's default value instead of NULL.
+        SetDefault,
+        /// A `CASCADE` action propagates the delete or update operation on the parent key to each dependent child key.
+        /// For an `ON DELETE CASCADE` action,
+        /// this means that each row in the child table that was associated with the deleted parent row is also deleted.
+        /// For an `ON UPDATE CASCADE` action,
+        /// it means that the values stored in each dependent child key are modified to match the new parent key values.
+        Cascade,
+    }
+
+    impl fmt::Display for Action {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            match self {
+                Action::NoAction => write!(f, "NO ACTION"),
+                Action::Restrict => write!(f, "RESTRICT"),
+                Action::SetNull => write!(f, "SET NULL"),
+                Action::SetDefault => write!(f, "SET DEFAULT"),
+                Action::Cascade => write!(f, "CASCADE"),
+            }
+        }
+    }
+
+    /// This type is used to define a FOREIGN KEY constraint on multiple columns.
+    /// https://www.w3schools.com/sql/sql_foreignkey.asp
+    pub struct ForeignKey {
+        parent_table_name: &'static str,
+        columns: Vec<(ReferencedColumn, ParentColumn)>,
+        on_events: BTreeMap<Event, Action>,
+    }
+
+    impl ForeignKey {
+        const CONSTRAINT: &'static str = "FOREIGN KEY";
+
+        pub fn new<I>(parent_table_name: ParentTable, columns: I) -> SqlResult<ForeignKey>
+        where
+            I: IntoIterator<Item = (ReferencedColumn, ParentColumn)>,
+        {
+            let columns: Vec<_> = columns.into_iter().collect();
+            if columns.is_empty() {
+                return Err(no_columns_error(Self::CONSTRAINT));
+            }
+
+            Ok(ForeignKey {
+                parent_table_name: parent_table_name.0,
+                columns,
+                on_events: BTreeMap::new(),
+            })
+        }
+
+        pub fn on_event(mut self, event: Event, action: Action) -> ForeignKey {
+            self.on_events.insert(event, action);
+            self
+        }
+    }
+
+    impl From<ForeignKey> for SqlConstraint {
+        fn from(foreign: ForeignKey) -> Self { SqlConstraint::ForeignKey(foreign) }
+    }
+
+    impl fmt::Display for ForeignKey {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            assert!(
+                !self.columns.is_empty(),
+                "'{}::new' must check if no columns were passed",
+                Self::CONSTRAINT
+            );
+
+            // Write "FOREIGN KEY (".
+            write!(f, "{} (", Self::CONSTRAINT)?;
+            // Write columns of the child table.
+            self.columns
+                .iter()
+                .map(|(referenced_col, _parent_col)| referenced_col.0)
+                .write_join(f, ", ")?;
+
+            write!(f, ") REFERENCES {}(", self.parent_table_name)?;
+            // Write columns of the parent table.
+            self.columns
+                .iter()
+                .map(|(_referenced_col, parent_col)| parent_col.0)
+                .write_join(f, ", ")?;
+
+            write!(f, ")")?;
+
+            if !self.on_events.is_empty() {
+                write!(f, " ")?;
+                // Write events and corresponding actions.
+                self.on_events
+                    .iter()
+                    .map(|(event, action)| ActionOnEvent { event, action })
+                    .write_join(f, " ")?;
+            }
+            Ok(())
+        }
+    }
+
+    /// This helper is used to display `BTreeMap<Event, Action>` pairs.
+    struct ActionOnEvent<'a> {
+        event: &'a Event,
+        action: &'a Action,
+    }
+
+    impl<'a> fmt::Display for ActionOnEvent<'a> {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{} {}", self.event, self.action) }
+    }
+}
+
+fn no_columns_error(constraint: &str) -> SqlError {
+    let error = format!("SQL {} CONSTRAINT must contain columns", constraint);
+    SqlError::ToSqlConversionFailure(StringError::from(error).into_boxed())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::foreign_key::*;
+    use super::*;
+    use crate::foreign_columns;
+
+    macro_rules! test_named_constraint {
+        ($test_name:ident, $constraint_ident:ident, $constraint_str:literal) => {
+            #[test]
+            fn $test_name() {
+                let constraint = $constraint_ident::new("id_type_constraint", vec!["id", "type"]).unwrap();
+                let actual = constraint.to_string();
+                let expected = format!("CONSTRAINT id_type_constraint {} (id, type)", $constraint_str);
+                assert_eq!(actual, expected);
+
+                let constraint = $constraint_ident::new("id_constraint", vec!["id"]).unwrap();
+                let actual = constraint.to_string();
+                let expected = format!("CONSTRAINT id_constraint {} (id)", $constraint_str);
+                assert_eq!(actual, expected);
+
+                $constraint_ident::new("a_constraint_name", std::iter::empty())
+                    .expect_err("Expected an error on creating SQL UNIQUE CONSTRAINT without columns");
+            }
+        };
+    }
+
+    test_named_constraint!(test_unique_constraint, Unique, "UNIQUE");
+    test_named_constraint!(test_primary_key, PrimaryKey, "PRIMARY KEY");
+
+    #[test]
+    fn test_foreign_key() {
+        let constraint = ForeignKey::new(
+            ParentTable("user"),
+            foreign_columns!["user_id" => "id", "user_login" => "login"],
+        )
+        .unwrap();
+        let actual = constraint.to_string();
+        let expected = "FOREIGN KEY (user_id, user_login) REFERENCES user(id, login)";
+        assert_eq!(actual, expected);
+
+        let constraint = ForeignKey::new(ParentTable("client"), foreign_columns!["client_id" => "id"]).unwrap();
+        let actual = constraint.to_string();
+        let expected = "FOREIGN KEY (client_id) REFERENCES client(id)";
+        assert_eq!(actual, expected);
+
+        let constraint = ForeignKey::new(ParentTable("client"), foreign_columns!["client_id" => "id"])
+            .unwrap()
+            .on_event(Event::OnDelete, Action::Cascade);
+        let actual = constraint.to_string();
+        let expected = "FOREIGN KEY (client_id) REFERENCES client(id) ON DELETE CASCADE";
+        assert_eq!(actual, expected);
+
+        let constraint = ForeignKey::new(ParentTable("client"), foreign_columns!["client_id" => "id"])
+            .unwrap()
+            .on_event(Event::OnDelete, Action::Cascade)
+            .on_event(Event::OnUpdate, Action::Restrict);
+        let actual = constraint.to_string();
+        let expected = "FOREIGN KEY (client_id) REFERENCES client(id) ON UPDATE RESTRICT ON DELETE CASCADE";
+        assert_eq!(actual, expected);
+
+        PrimaryKey::new("a_table", std::iter::empty())
+            .expect_err("Expected an error on creating SQL FOREIGN KEY CONSTRAINT without columns");
+    }
+}
diff --git a/mm2src/db_common/src/sql_create.rs b/mm2src/db_common/src/sql_create.rs
new file mode 100644
index 0000000000..f4fe557c69
--- /dev/null
+++ b/mm2src/db_common/src/sql_create.rs
@@ -0,0 +1,260 @@
+use crate::sql_constraint::SqlConstraint;
+use crate::sql_value::{FromQuoted, SqlValue};
+use crate::sqlite::StringError;
+use common::fmt::{WriteSafe, WriteSafeJoin};
+use common::write_safe;
+use rusqlite::{Connection, Error as SqlError, Result as SqlResult, NO_PARAMS};
+use std::fmt;
+
+pub enum SqlType {
+    Varchar(usize),
+    Integer,
+    Text,
+    Real,
+    Blob,
+}
+
+impl fmt::Display for SqlType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SqlType::Varchar(len) => write!(f, "VARCHAR({})", len),
+            SqlType::Integer => write!(f, "INTEGER"),
+            SqlType::Text => write!(f, "TEXT"),
+            SqlType::Real => write!(f, "REAL"),
+            SqlType::Blob => write!(f, "BLOB"),
+        }
+    }
+}
+
+pub enum TableKey {
+    Primary,
+}
+
+pub struct SqlColumn {
+    name: &'static str,
+    column_type: SqlType,
+    unique: bool,
+    not_null: bool,
+    default: Option<SqlValue>,
+    key: Option<TableKey>,
+}
+
+impl SqlColumn {
+    const COLUMN_CAPACITY: usize = 100;
+
+    pub fn new(name: &'static str, column_type: SqlType) -> SqlColumn {
+        SqlColumn {
+            name,
+            column_type,
+            unique: false,
+            not_null: false,
+            default: None,
+            key: None,
+        }
+    }
+
+    pub fn unique(mut self) -> SqlColumn {
+        self.unique = true;
+        self
+    }
+
+    pub fn not_null(mut self) -> SqlColumn {
+        self.not_null = true;
+        self
+    }
+
+    pub fn default<T>(mut self, default: T) -> SqlColumn
+    where
+        SqlValue: From<T>,
+    {
+        self.default = Some(SqlValue::from(default));
+        self
+    }
+
+    pub fn default_quoted<T>(mut self, default: T) -> SqlColumn
+    where
+        SqlValue: FromQuoted<T>,
+    {
+        self.default = Some(SqlValue::from_quoted(default));
+        self
+    }
+
+    pub fn primary(mut self) -> SqlColumn {
+        self.key = Some(TableKey::Primary);
+        self
+    }
+}
+
+impl fmt::Display for SqlColumn {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} {}", self.name, self.column_type)?;
+        if let Some(ref default) = self.default {
+            write!(f, " DEFAULT {}", default)?;
+        }
+        if self.not_null {
+            write!(f, " NOT NULL")?;
+        }
+        if self.unique {
+            write!(f, " UNIQUE")?;
+        }
+        if let Some(TableKey::Primary) = self.key {
+            write!(f, " PRIMARY KEY")?;
+        }
+        Ok(())
+    }
+}
+
+pub struct SqlCreateTable<'a> {
+    conn: &'a Connection,
+    table_name: &'static str,
+    columns: Vec<SqlColumn>,
+    constraint: Vec<SqlConstraint>,
+    if_not_exist: bool,
+}
+
+impl<'a> SqlCreateTable<'a> {
+    const CREATE_CAPACITY: usize = 200;
+
+    pub fn new(conn: &'a Connection, table_name: &'static str) -> Self {
+        SqlCreateTable {
+            conn,
+            table_name,
+            columns: Vec::new(),
+            constraint: Vec::new(),
+            if_not_exist: false,
+        }
+    }
+
+    pub fn if_not_exist(&mut self) -> &mut Self {
+        self.if_not_exist = true;
+        self
+    }
+
+    pub fn column(&mut self, column: SqlColumn) -> &mut Self {
+        self.columns.push(column);
+        self
+    }
+
+    pub fn constraint<C>(&mut self, constraint: C) -> &mut Self
+    where
+        SqlConstraint: From<C>,
+    {
+        self.constraint.push(SqlConstraint::from(constraint));
+        self
+    }
+
+    pub fn create(self) -> SqlResult<()> {
+        self.conn.execute(&self.sql()?, NO_PARAMS)?;
+        Ok(())
+    }
+
+    /// Generates a string SQL request.
+    pub fn sql(&self) -> SqlResult<String> {
+        if self.columns.is_empty() {
+            let error = "SQL CREATE TABLE columns must be specified before `SqlQuery::create` is called";
+            return Err(SqlError::ToSqlConversionFailure(StringError::from(error).into_boxed()));
+        }
+
+        let mut sql = String::with_capacity(Self::CREATE_CAPACITY + self.columns.len() * SqlColumn::COLUMN_CAPACITY);
+
+        write_safe!(sql, "CREATE TABLE");
+        if self.if_not_exist {
+            write_safe!(sql, " IF NOT EXISTS");
+        }
+        write_safe!(sql, " {} (", self.table_name);
+
+        self.columns
+            .iter()
+            .map(|column| column as &dyn fmt::Display)
+            .chain(self.constraint.iter().map(|constraint| constraint as &dyn fmt::Display))
+            .write_safe_join(&mut sql, ", ");
+
+        write_safe!(sql, ");");
+        Ok(sql)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::sql_constraint::Unique;
+
+    #[test]
+    fn test_sql_create() {
+        let conn = Connection::open_in_memory().unwrap();
+
+        let mut create = SqlCreateTable::new(&conn, "my_swaps");
+        create
+            .if_not_exist()
+            .column(SqlColumn::new("id", SqlType::Integer).not_null().primary())
+            .column(SqlColumn::new("my_coin", SqlType::Varchar(255)))
+            .column(SqlColumn::new("other_coin", SqlType::Varchar(255)))
+            .column(SqlColumn::new("uuid", SqlType::Varchar(255)).not_null().unique())
+            .column(
+                SqlColumn::new("started_at", SqlType::Integer)
+                    .not_null()
+                    .default("CURRENT_TIMESTAMP"),
+            )
+            .column(SqlColumn::new("about", SqlType::Text).default_quoted(""))
+            .column(SqlColumn::new("changed_balance", SqlType::Real))
+            .column(SqlColumn::new("raw_data", SqlType::Blob));
+
+        let actual = create.sql().unwrap();
+        let expected = "CREATE TABLE IF NOT EXISTS my_swaps (\
+            id INTEGER NOT NULL PRIMARY KEY, \
+            my_coin VARCHAR(255), \
+            other_coin VARCHAR(255), \
+            uuid VARCHAR(255) NOT NULL UNIQUE, \
+            started_at INTEGER DEFAULT CURRENT_TIMESTAMP NOT NULL, \
+            about TEXT DEFAULT '', \
+            changed_balance REAL, \
+            raw_data BLOB\
+        );";
+        assert_eq!(actual, expected);
+
+        create.create().unwrap();
+    }
+
+    #[test]
+    fn test_sql_create_one_column() {
+        let conn = Connection::open_in_memory().unwrap();
+
+        let mut create = SqlCreateTable::new(&conn, "my_swaps");
+        create.column(SqlColumn::new("id", SqlType::Integer).not_null().primary());
+
+        let actual = create.sql().unwrap();
+        let expected = "CREATE TABLE my_swaps (id INTEGER NOT NULL PRIMARY KEY);";
+        assert_eq!(actual, expected);
+
+        create.create().unwrap();
+    }
+
+    #[test]
+    fn test_sql_create_no_columns() {
+        let conn = Connection::open_in_memory().unwrap();
+
+        SqlCreateTable::new(&conn, "my_swaps")
+            .sql()
+            .expect_err("SQL CREATE TABLE must contain columns");
+    }
+
+    #[test]
+    fn test_sql_create_with_constraints() {
+        let conn = Connection::open_in_memory().unwrap();
+
+        let mut create = SqlCreateTable::new(&conn, "my_swaps");
+        create
+            .column(SqlColumn::new("id", SqlType::Integer).not_null().primary())
+            .column(SqlColumn::new("uuid", SqlType::Varchar(255)).not_null())
+            .constraint(Unique::new("id_uuid_constraint", ["id", "uuid"]).unwrap());
+        let actual = create.sql().unwrap();
+        let expected = "CREATE TABLE my_swaps (\
+            id INTEGER NOT NULL PRIMARY KEY, \
+            uuid VARCHAR(255) NOT NULL, \
+            CONSTRAINT id_uuid_constraint UNIQUE (id, uuid)\
+        );";
+        assert_eq!(actual, expected);
+
+        create.create().unwrap();
+    }
+}
diff --git a/mm2src/db_common/src/sql_delete.rs b/mm2src/db_common/src/sql_delete.rs
new file mode 100644
index 0000000000..fe6436fd61
--- /dev/null
+++ b/mm2src/db_common/src/sql_delete.rs
@@ -0,0 +1,118 @@
+use crate::sql_condition::SqlCondition;
+use crate::sqlite::{validate_table_name, OwnedSqlParams, SqlParamsBuilder};
+use common::log::debug;
+use rusqlite::{Connection, Error as SqlError, Result as SqlResult};
+use sql_builder::SqlBuilder;
+
+/// A `DELETE` SQL request builder.
+pub struct SqlDelete<'a> {
+    conn: &'a Connection,
+    sql_builder: SqlBuilder,
+    params: SqlParamsBuilder,
+}
+
+impl<'a> SqlDelete<'a> {
+    /// Creates `DELETE` request builder.
+    /// Please note the function validates the given `table` name.
+    #[inline]
+    pub fn new(conn: &'a Connection, table: &str) -> SqlResult<Self> {
+        validate_table_name(table)?;
+        Ok(SqlDelete {
+            conn,
+            sql_builder: SqlBuilder::delete_from(table),
+            params: SqlParamsBuilder::default(),
+        })
+    }
+
+    /// Returns a reference to the SQL params of the request.
+    #[inline]
+    pub fn params(&self) -> &OwnedSqlParams { self.params.params() }
+
+    /// Convenience method to execute the `DELETE` request.
+    /// Returns a number of deleted records.
+    /// For more details see [`SqlBuilder::execute`].
+    pub fn delete(self) -> SqlResult<usize> {
+        let sql = self.sql()?;
+
+        let params = self.params();
+        debug!("Trying to execute SQL query {} with params {:?}", sql, params);
+        self.conn.execute(&sql, params)
+    }
+
+    /// Generates a string SQL request.
+    #[inline]
+    pub fn sql(&self) -> SqlResult<String> {
+        self.sql_builder
+            .sql()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))
+    }
+}
+
+/// `SqlCondition` implements the following methods by default:
+/// - [`SqlQuery::and_where_eq`]
+/// - [`SqlQuery::and_where_eq_param`]
+/// - [`SqlQuery::and_where_in`]
+/// - [`SqlQuery::and_where_in_quoted`]
+/// - [`SqlQuery::and_where_in_params`]
+/// - [`SqlQuery::or_where_eq`]
+/// - [`SqlQuery::or_where_eq_param`]
+/// - [`SqlQuery::or_where_in`]
+/// - [`SqlQuery::or_where_in_quoted`]
+/// - [`SqlQuery::or_where_in_params`]
+impl<'a> SqlCondition for SqlDelete<'a> {
+    fn sql_builder(&mut self) -> &mut SqlBuilder { &mut self.sql_builder }
+
+    fn sql_params(&mut self) -> &mut SqlParamsBuilder { &mut self.params }
+}
+
+#[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,
+        from_address VARCHAR(255) NOT NULL,
+        height INTEGER NOT NULL,
+        description TEXT
+    );";
+
+    fn init_table_for_test(conn: &Connection) { conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap(); }
+
+    #[test]
+    fn test_delete_all_sql() {
+        let conn = Connection::open_in_memory().unwrap();
+        println!("{}", CREATE_TX_HISTORY_TABLE);
+        init_table_for_test(&conn);
+
+        let sql_delete = SqlDelete::new(&conn, "tx_history").unwrap();
+
+        let actual = sql_delete.sql().unwrap();
+        assert_eq!(actual, "DELETE FROM tx_history;");
+
+        sql_delete.delete().unwrap();
+    }
+
+    #[test]
+    fn test_delete_where_sql() {
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut sql_delete = SqlDelete::new(&conn, "tx_history").unwrap();
+        sql_delete
+            .and_where_eq("height", 100)
+            .unwrap()
+            .or_where_eq_param("description", Some("My 100th TX".to_string()))
+            .unwrap()
+            .and_where_in_quoted("from_address", ["3MqZh9ips9W5ekHbzLaRxs8xZZTbJzTLwd"])
+            .unwrap();
+
+        let actual = sql_delete.sql().unwrap();
+        assert_eq!(
+            actual,
+            "DELETE FROM tx_history WHERE (height = 100 OR description = :1) AND (from_address IN ('3MqZh9ips9W5ekHbzLaRxs8xZZTbJzTLwd'));"
+        );
+
+        sql_delete.delete().unwrap();
+    }
+}
diff --git a/mm2src/db_common/src/sql_insert.rs b/mm2src/db_common/src/sql_insert.rs
new file mode 100644
index 0000000000..b5aa5f461b
--- /dev/null
+++ b/mm2src/db_common/src/sql_insert.rs
@@ -0,0 +1,326 @@
+use crate::sql_value::{FromQuoted, SqlValueOptional, SqlValueToString};
+use crate::sqlite::{OwnedSqlParam, OwnedSqlParams, SqlParamsBuilder, ToValidSqlIdent};
+use common::fmt::{WriteSafe, WriteSafeJoin};
+use common::write_safe;
+use log::debug;
+use rusqlite::{Connection, Result as SqlResult};
+use std::fmt;
+
+enum InsertMode {
+    OrReplace,
+    OrIgnore,
+}
+
+impl fmt::Display for InsertMode {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            InsertMode::OrReplace => write!(f, "OR REPLACE"),
+            InsertMode::OrIgnore => write!(f, "OR IGNORE"),
+        }
+    }
+}
+
+/// An `INSERT` SQL request builder.
+pub struct SqlInsert<'a> {
+    conn: &'a Connection,
+    table_name: &'static str,
+    columns: Vec<String>,
+    values: Vec<String>,
+    params: SqlParamsBuilder,
+    mode: Option<InsertMode>,
+}
+
+impl<'a> SqlInsert<'a> {
+    const INSERT_CAPACITY: usize = 200;
+    const VALUE_CAPACITY: usize = 80;
+
+    /// Creates a new instance of `SqlInsert` builder.
+    #[inline]
+    pub fn new(conn: &'a Connection, table_name: &'static str) -> Self {
+        SqlInsert {
+            conn,
+            table_name,
+            columns: Vec::new(),
+            values: Vec::new(),
+            params: SqlParamsBuilder::default(),
+            mode: None,
+        }
+    }
+
+    /// Allows replacing the record if it's present in the table already.
+    #[inline]
+    pub fn or_replace(&mut self) -> &mut Self {
+        self.mode = Some(InsertMode::OrReplace);
+        self
+    }
+
+    /// Allows ignoring the `INSERT` request if it's present in the table already.
+    #[inline]
+    pub fn or_ignore(&mut self) -> &mut Self {
+        self.mode = Some(InsertMode::OrIgnore);
+        self
+    }
+
+    /// Adds the `value` of the specified `column` to the `INSERT` request.
+    ///
+    /// Please note the function validates the given `column` name,
+    /// and `value` is considered an valid optional value as it's able to be converted into `SqlValueOptional`.
+    #[inline]
+    pub fn column<S, T>(&mut self, column: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: From<T>,
+    {
+        self.columns.push(column.to_valid_sql_ident()?);
+        self.values.push(SqlValueOptional::from(value).to_string());
+        Ok(self)
+    }
+
+    /// Adds the quoted `value` of the specified `column` to the `INSERT` request.
+    ///
+    /// Please note the function validates the given `column` name,
+    /// and `value` is considered a valid optional value as it's able to be converted into `SqlValueOptional`.
+    #[inline]
+    pub fn column_quoted<S, T>(&mut self, column: S, value: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: FromQuoted<T>,
+    {
+        self.columns.push(column.to_valid_sql_ident()?);
+        self.values.push(SqlValueOptional::quoted_value_to_string(value));
+        Ok(self)
+    }
+
+    /// Adds the `value` of the specified `column` to the `INSERT` request.
+    ///
+    /// Please note the function validates the given `column` name.
+    #[inline]
+    pub fn column_param<S, T>(&mut self, column: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        self.columns.push(column.to_valid_sql_ident()?);
+        self.values.push(self.params.push_param(param));
+        Ok(self)
+    }
+
+    /// Convenience method to execute an insertion.
+    /// Returns a number of inserted records.
+    pub fn insert(&self) -> SqlResult<usize> {
+        let sql = self.sql()?;
+
+        debug!("Trying to execute SQL query {} with params {:?}", sql, self.params());
+        let mut stmt = self.conn.prepare(&sql)?;
+        stmt.execute(self.params())
+    }
+
+    /// Returns the reference to the specified SQL parameters.
+    #[inline]
+    pub fn params(&self) -> &OwnedSqlParams { self.params.params() }
+
+    /// Generates a string SQL request.
+    pub fn sql(&self) -> SqlResult<String> {
+        let mut sql = String::with_capacity(Self::INSERT_CAPACITY + self.columns.len() * Self::VALUE_CAPACITY);
+
+        write_safe!(sql, "INSERT");
+        if let Some(ref mode) = self.mode {
+            write_safe!(sql, " {}", mode);
+        }
+        write_safe!(sql, " INTO {}", self.table_name);
+
+        if self.columns.is_empty() {
+            write_safe!(sql, " DEFAULT VALUES;");
+        } else {
+            write_safe!(sql, " (");
+            self.columns.iter().write_safe_join(&mut sql, ", ");
+            write_safe!(sql, ") VALUES (");
+            self.values.iter().write_safe_join(&mut sql, ", ");
+            write_safe!(sql, ");");
+        }
+
+        Ok(sql)
+    }
+}
+
+#[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,
+        description TEXT,
+        tx_hex BLOB,
+        height INTEGER,
+        total_amount DECIMAL
+    );";
+    const CREATE_ID_TABLE: &str = "CREATE TABLE id (identifier INTEGER NOT NULL PRIMARY KEY)";
+    const SELECT_FROM_TX_HISTORY: &str = "SELECT * FROM tx_history;";
+    const SELECT_FROM_ID_TABLE: &str = "SELECT * FROM id;";
+
+    #[derive(Debug, PartialEq)]
+    struct TxHistoryItem {
+        tx_hash: String,
+        description: Option<String>,
+        tx_hex: Option<Vec<u8>>,
+        height: Option<i64>,
+        total_amount: Option<f64>,
+    }
+
+    fn select_from_tx_history(conn: &Connection) -> Vec<TxHistoryItem> {
+        let mut stmt = conn.prepare(SELECT_FROM_TX_HISTORY).unwrap();
+        stmt.query_map(NO_PARAMS, |row| {
+            Ok(TxHistoryItem {
+                tx_hash: row.get(0)?,
+                description: row.get(1)?,
+                tx_hex: row.get(2)?,
+                height: row.get(3)?,
+                total_amount: row.get(4)?,
+            })
+        })
+        .unwrap()
+        .collect::<SqlResult<Vec<_>>>()
+        .unwrap()
+    }
+
+    fn select_from_id_table(conn: &Connection) -> Vec<i64> {
+        let mut stmt = conn.prepare(SELECT_FROM_ID_TABLE).unwrap();
+        stmt.query_map(NO_PARAMS, |row| row.get(0))
+            .unwrap()
+            .collect::<SqlResult<_>>()
+            .unwrap()
+    }
+
+    #[test]
+    fn test_sql_insert() {
+        let conn = Connection::open_in_memory().unwrap();
+        conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap();
+
+        let mut insert = SqlInsert::new(&conn, "tx_history");
+        insert
+            .column_quoted("tx_hash", "tx_hash_1")
+            .unwrap()
+            .column_quoted("description", "any description")
+            .unwrap()
+            .column_param("tx_hex", vec![1, 2, 3, 4, 5])
+            .unwrap()
+            .column("height", 102030)
+            .unwrap()
+            .column("total_amount", 0.3)
+            .unwrap();
+
+        let actual_sql = insert.sql().unwrap();
+        let expected_sql = "INSERT INTO tx_history (tx_hash, description, tx_hex, height, total_amount) \
+            VALUES ('tx_hash_1', 'any description', :1, 102030, 0.3);";
+        assert_eq!(actual_sql, expected_sql);
+
+        insert.insert().unwrap();
+
+        let mut insert_or_replace = SqlInsert::new(&conn, "tx_history");
+        insert_or_replace
+            .or_replace()
+            .column_quoted("tx_hash", "tx_hash_1")
+            .unwrap()
+            .column_quoted("description", "another description")
+            .unwrap();
+
+        let actual_or_replace = insert_or_replace.sql().unwrap();
+        let expected_or_replace = "INSERT OR REPLACE INTO tx_history (tx_hash, description) \
+            VALUES ('tx_hash_1', 'another description');";
+        assert_eq!(actual_or_replace, expected_or_replace);
+
+        let actual_items = select_from_tx_history(&conn);
+        let expected_items = vec![TxHistoryItem {
+            tx_hash: "tx_hash_1".to_string(),
+            description: Some("any description".to_string()),
+            tx_hex: Some(vec![1, 2, 3, 4, 5]),
+            height: Some(102030),
+            total_amount: Some(0.3),
+        }];
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[test]
+    fn test_sql_insert_nulls() {
+        let conn = Connection::open_in_memory().unwrap();
+        conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap();
+
+        let description: Option<&'static str> = None;
+        let tx_hex: Option<Vec<u8>> = None;
+        let height: Option<i64> = None;
+        let total_amount: Option<f64> = None;
+
+        let mut insert = SqlInsert::new(&conn, "tx_history");
+        insert
+            .column_quoted("tx_hash", "tx_hash_1")
+            .unwrap()
+            .column_quoted("description", description)
+            .unwrap()
+            .column_param("tx_hex", tx_hex)
+            .unwrap()
+            .column("height", height)
+            .unwrap()
+            .column("total_amount", total_amount)
+            .unwrap();
+
+        let actual = insert.sql().unwrap();
+        let expected = "INSERT INTO tx_history (tx_hash, description, tx_hex, height, total_amount) \
+            VALUES ('tx_hash_1', NULL, :1, NULL, NULL);";
+        assert_eq!(actual, expected);
+
+        insert.insert().unwrap();
+
+        let actual_items = select_from_tx_history(&conn);
+        let expected_items = vec![TxHistoryItem {
+            tx_hash: "tx_hash_1".to_string(),
+            description: None,
+            tx_hex: None,
+            height: None,
+            total_amount: None,
+        }];
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[test]
+    fn test_sql_insert_one_column() {
+        let conn = Connection::open_in_memory().unwrap();
+        conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap();
+
+        let mut insert = SqlInsert::new(&conn, "tx_history");
+        insert.column_quoted("tx_hash", "tx_hash_1").unwrap();
+
+        let actual = insert.sql().unwrap();
+        let expected = "INSERT INTO tx_history (tx_hash) VALUES ('tx_hash_1');";
+        assert_eq!(actual, expected);
+
+        insert.insert().unwrap();
+
+        let actual_items = select_from_tx_history(&conn);
+        let expected_items = vec![TxHistoryItem {
+            tx_hash: "tx_hash_1".to_string(),
+            description: None,
+            tx_hex: None,
+            height: None,
+            total_amount: None,
+        }];
+        assert_eq!(actual_items, expected_items);
+    }
+
+    #[test]
+    fn test_sql_create_no_columns() {
+        let conn = Connection::open_in_memory().unwrap();
+        conn.execute(CREATE_ID_TABLE, NO_PARAMS).unwrap();
+
+        let insert = SqlInsert::new(&conn, "id");
+
+        let actual = insert.sql().unwrap();
+        let expected = r#"INSERT INTO id DEFAULT VALUES;"#;
+        assert_eq!(actual, expected);
+
+        insert.insert().unwrap();
+
+        let actual_items = select_from_id_table(&conn);
+        assert_eq!(actual_items, vec![1]);
+    }
+}
diff --git a/mm2src/db_common/src/sql_query.rs b/mm2src/db_common/src/sql_query.rs
index a8ed13db36..287bd8db47 100644
--- a/mm2src/db_common/src/sql_query.rs
+++ b/mm2src/db_common/src/sql_query.rs
@@ -1,11 +1,12 @@
+use crate::sql_condition::SqlCondition;
+use crate::sql_value::{SqlValue, SqlValueToString};
 use crate::sqlite::{query_single_row, validate_ident, validate_table_name, OwnedSqlParam, OwnedSqlParams,
-                    SqlParamsBuilder, SqlValue, ToValidSqlIdent, ToValidSqlTable};
+                    SqlParamsBuilder, StringError, 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;
 
+/// A `SELECT` SQL query builder.
 #[derive(Clone)]
 pub struct SqlQuery<'a> {
     conn: &'a Connection,
@@ -68,6 +69,17 @@ impl<'a> SqlQuery<'a> {
         Ok(self)
     }
 
+    /// Add COUNT(DISTINCT field).
+    /// For more details see [`SqlBuilder::count`].
+    ///
+    /// Please note the function validates the given `field`.
+    #[inline]
+    pub fn count_distinct<S: ToValidSqlIdent>(&mut self, field: S) -> SqlResult<&mut Self> {
+        let field = field.to_valid_sql_ident()?;
+        self.sql_builder.count(format!("DISTINCT {}", field));
+        Ok(self)
+    }
+
     /// Add field.
     /// For more details see [`SqlBuilder::field`].
     ///
@@ -174,169 +186,6 @@ impl<'a> SqlQuery<'a> {
         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();
@@ -469,6 +318,23 @@ impl<'a> SqlQuery<'a> {
     }
 }
 
+/// `SqlCondition` implements the following methods by default:
+/// - [`SqlQuery::and_where_eq`]
+/// - [`SqlQuery::and_where_eq_param`]
+/// - [`SqlQuery::and_where_in`]
+/// - [`SqlQuery::and_where_in_quoted`]
+/// - [`SqlQuery::and_where_in_params`]
+/// - [`SqlQuery::or_where_eq`]
+/// - [`SqlQuery::or_where_eq_param`]
+/// - [`SqlQuery::or_where_in`]
+/// - [`SqlQuery::or_where_in_quoted`]
+/// - [`SqlQuery::or_where_in_params`]
+impl<'a> SqlCondition for SqlQuery<'a> {
+    fn sql_builder(&mut self) -> &mut SqlBuilder { &mut self.sql_builder }
+
+    fn sql_params(&mut self) -> &mut SqlParamsBuilder { &mut self.params }
+}
+
 /// An instance of this structure is returned by [`SqlQuery::subquery`].
 pub struct SqlSubquery<'a>(SqlQuery<'a>);
 
@@ -487,59 +353,47 @@ impl SqlOrdering {
     }
 }
 
-#[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 crate::sql_insert::SqlInsert;
     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
+        total_amount INTEGER NOT NULL,
+        kmd_rewards INTEGER
     );";
     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),
+            ("tx_hash_1", 699545, 23, Some(0.5)),
+            ("tx_hash_2", 699547, 10, Some(0.2)),
+            ("tx_hash_3", 699547, 11, None),
+            ("tx_hash_4", 699530, 100, Some(1.01)),
+            ("tx_hash_5", 699532, 19, None),
         ];
-        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();
+
+        for (tx_hash, height, total_amount, kmd_rewards) in history_items {
+            let mut insert_sql = SqlInsert::new(conn, "tx_history");
+            insert_sql
+                .column_quoted("tx_hash", tx_hash)
+                .unwrap()
+                .column("height", height)
+                .unwrap()
+                .column("total_amount", total_amount)
+                .unwrap()
+                .column("kmd_rewards", kmd_rewards)
+                .unwrap();
+            insert_sql.insert().unwrap();
         }
 
         let address_table_items = vec![
@@ -554,8 +408,13 @@ mod tests {
             ("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()])
+            let mut insert_sql = SqlInsert::new(conn, "tx_address");
+            insert_sql
+                .column_quoted("tx_hash", tx_hash)
+                .unwrap()
+                .column_quoted("address", address)
                 .unwrap();
+            insert_sql.insert().unwrap();
         }
     }
 
@@ -611,6 +470,40 @@ mod tests {
         assert_eq!(actual, expected);
     }
 
+    #[test]
+    fn test_query_where_eq_null() {
+        const NO_KMD_REWARDS: Option<f64> = None;
+
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        macro_rules! run_test {
+            ($fun: ident) => {{
+                let mut query = SqlQuery::select_from(&conn, "tx_history").unwrap();
+                query
+                    .field("tx_hash")
+                    .unwrap()
+                    .$fun("kmd_rewards", NO_KMD_REWARDS)
+                    .unwrap();
+
+                // Check if the `kmd_rewards IS NULL` instead of `kmd_rewards = NULL` or `kmd_rewards = :1`.
+                assert_eq!(
+                    query.clone().sql().unwrap(),
+                    "SELECT tx_hash FROM tx_history WHERE kmd_rewards IS NULL;"
+                );
+
+                let actual: Vec<String> = query.query(|row| row.get(0)).unwrap();
+                let expected = vec!["tx_hash_3".to_owned(), "tx_hash_5".to_owned()];
+                assert_eq!(actual, expected);
+            }};
+        }
+
+        run_test!(and_where_eq);
+        run_test!(or_where_eq);
+        run_test!(and_where_eq_param);
+        run_test!(or_where_eq_param);
+    }
+
     #[test]
     fn test_query_offset_by_id() {
         let conn = Connection::open_in_memory().unwrap();
diff --git a/mm2src/db_common/src/sql_update.rs b/mm2src/db_common/src/sql_update.rs
new file mode 100644
index 0000000000..7c38ec6ea4
--- /dev/null
+++ b/mm2src/db_common/src/sql_update.rs
@@ -0,0 +1,167 @@
+use crate::sql_condition::SqlCondition;
+use crate::sql_value::{FromQuoted, SqlValueOptional, SqlValueToString};
+use crate::sqlite::{validate_table_name, OwnedSqlParam, OwnedSqlParams, SqlParamsBuilder, ToValidSqlIdent};
+use common::log::debug;
+use rusqlite::{Connection, Error as SqlError, Result as SqlResult};
+use sql_builder::SqlBuilder;
+
+/// An `UPDATE` SQL request builder.
+pub struct SqlUpdate<'a> {
+    conn: &'a Connection,
+    sql_builder: SqlBuilder,
+    params: SqlParamsBuilder,
+}
+
+impl<'a> SqlUpdate<'a> {
+    /// Create `UPDATE` request builder.
+    /// Please note the function validates the given `table` name.
+    #[inline]
+    pub fn new(conn: &'a Connection, table: &str) -> SqlResult<SqlUpdate<'a>> {
+        validate_table_name(table)?;
+        Ok(SqlUpdate {
+            conn,
+            sql_builder: SqlBuilder::update_table(table),
+            params: SqlParamsBuilder::default(),
+        })
+    }
+
+    /// Adds the `value` of the specified `column` to the `UPDATE` request.
+    /// For more details see [`SqlBuilder::set`].
+    ///
+    /// Please note the function validates the given `column` name,
+    /// and `value` is considered an valid optional value as it's able to be converted into `SqlValueOptional`.
+    #[inline]
+    pub fn set<S, V>(&mut self, column: S, value: V) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: From<V>,
+    {
+        let value = SqlValueOptional::from(value).to_string();
+        self.sql_builder.set(column.to_valid_sql_ident()?, value);
+        Ok(self)
+    }
+
+    /// Adds the quoted `value` of the specified `column` to the `UPDATE` request.
+    /// For more details see [`SqlBuilder::set`].
+    ///
+    /// Please note the function validates the given `column` name,
+    /// and `value` is considered a valid optional value as it's able to be converted into `SqlValueOptional`.
+    #[inline]
+    pub fn set_quoted<S, V>(&mut self, column: S, value: V) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        SqlValueOptional: FromQuoted<V>,
+    {
+        let value = SqlValueOptional::quoted_value_to_string(value);
+        self.sql_builder.set(column.to_valid_sql_ident()?, value);
+        Ok(self)
+    }
+
+    /// Adds the `value` of the specified `column` to the `UPDATE` request.
+    ///
+    /// Please note the function validates the given `column` name.
+    #[inline]
+    pub fn set_param<S, T>(&mut self, column: S, param: T) -> SqlResult<&mut Self>
+    where
+        S: ToValidSqlIdent,
+        OwnedSqlParam: From<T>,
+    {
+        let param_id = self.params.push_param(param);
+        self.sql_builder.set(column.to_valid_sql_ident()?, param_id);
+        Ok(self)
+    }
+
+    /// Generates a string SQL request.
+    #[inline]
+    pub fn sql(&self) -> SqlResult<String> {
+        self.sql_builder
+            .sql()
+            .map_err(|e| SqlError::ToSqlConversionFailure(e.into()))
+    }
+
+    /// Returns the reference to the specified SQL parameters.
+    #[inline]
+    pub fn params(&self) -> &OwnedSqlParams { self.params.params() }
+
+    /// Convenience method to execute the `UPDATE` request.
+    /// Returns a number of updated records.
+    /// For more details see [`SqlBuilder::execute`].
+    pub fn update(self) -> SqlResult<usize> {
+        let sql = self.sql()?;
+
+        let params = self.params();
+        debug!("Trying to execute SQL query {} with params {:?}", sql, params);
+        self.conn.execute(&sql, params)
+    }
+}
+
+/// `SqlCondition` implements the following methods by default:
+/// - [`SqlUpdate::and_where_eq`]
+/// - [`SqlUpdate::and_where_eq_param`]
+/// - [`SqlUpdate::and_where_in`]
+/// - [`SqlUpdate::and_where_in_quoted`]
+/// - [`SqlUpdate::and_where_in_params`]
+/// - [`SqlUpdate::or_where_eq`]
+/// - [`SqlUpdate::or_where_eq_param`]
+/// - [`SqlUpdate::or_where_in`]
+/// - [`SqlUpdate::or_where_in_quoted`]
+/// - [`SqlUpdate::or_where_in_params`]
+impl<'a> SqlCondition for SqlUpdate<'a> {
+    fn sql_builder(&mut self) -> &mut SqlBuilder { &mut self.sql_builder }
+
+    fn sql_params(&mut self) -> &mut SqlParamsBuilder { &mut self.params }
+}
+
+#[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,
+        total_amount REAL NOT NULL,
+        height INTEGER NOT NULL,
+        kmd_rewards REAL
+    );";
+
+    fn init_table_for_test(conn: &Connection) { conn.execute(CREATE_TX_HISTORY_TABLE, NO_PARAMS).unwrap(); }
+
+    #[test]
+    fn test_update_all_records() {
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut sql_update = SqlUpdate::new(&conn, "tx_history").unwrap();
+        sql_update.set("total_amount", 300).unwrap();
+
+        let actual = sql_update.sql().unwrap();
+        assert_eq!(actual, "UPDATE tx_history SET total_amount = 300;");
+
+        sql_update.update().unwrap();
+    }
+
+    #[test]
+    fn test_update_where_eq() {
+        const NO_KMD_REWARDS: Option<i64> = None;
+
+        let conn = Connection::open_in_memory().unwrap();
+        init_table_for_test(&conn);
+
+        let mut sql_update = SqlUpdate::new(&conn, "tx_history").unwrap();
+        sql_update
+            .set("total_amount", 300)
+            .unwrap()
+            .and_where_eq("height", 699545)
+            .unwrap()
+            .or_where_eq("kmd_rewards", NO_KMD_REWARDS)
+            .unwrap();
+
+        let actual = sql_update.sql().unwrap();
+        assert_eq!(
+            actual,
+            "UPDATE tx_history SET total_amount = 300 WHERE height = 699545 OR kmd_rewards IS NULL;"
+        );
+
+        sql_update.update().unwrap();
+    }
+}
diff --git a/mm2src/db_common/src/sql_value.rs b/mm2src/db_common/src/sql_value.rs
new file mode 100644
index 0000000000..30d424972d
--- /dev/null
+++ b/mm2src/db_common/src/sql_value.rs
@@ -0,0 +1,149 @@
+use std::fmt;
+
+pub trait FromQuoted<T> {
+    fn from_quoted(t: T) -> Self;
+}
+
+/// A valid SQL value that can be passed as an argument to the `SqlQuery`, `SqlCreate`, `SqlInsert` safely.
+///
+/// Please note that any static string passed into [`SqlValue::from`] will not be quoted.
+/// To quote the string use [`SqlValue::from_quoted`].
+pub enum SqlValue {
+    String(&'static str),
+    StringQuoted(&'static str),
+    Integer(i64),
+    Real(f64),
+}
+
+impl fmt::Display for SqlValue {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SqlValue::String(string) => write!(f, "{}", string),
+            SqlValue::StringQuoted(string) => write!(f, "'{}'", string),
+            SqlValue::Integer(decimal) => write!(f, "{}", decimal),
+            SqlValue::Real(real) => write!(f, "{}", real),
+        }
+    }
+}
+
+impl From<&'static str> for SqlValue {
+    fn from(string: &'static str) -> Self { SqlValue::String(string) }
+}
+
+impl FromQuoted<&'static str> for SqlValue {
+    fn from_quoted(string: &'static str) -> Self { SqlValue::StringQuoted(string) }
+}
+
+impl From<i64> for SqlValue {
+    fn from(decimal: i64) -> Self { SqlValue::Integer(decimal) }
+}
+
+impl From<f64> for SqlValue {
+    fn from(real: f64) -> Self { SqlValue::Real(real) }
+}
+
+/// A valid SQL optional value that can be passed as an argument to the `SqlQuery`, `SqlCreate`, `SqlInsert` safely.
+///
+/// Please note that any static string passed into [`SqlValueOptional::from`] will not be quoted.
+/// To quote the string use [`SqlValueOptional::from_quoted`].
+pub enum SqlValueOptional {
+    Some(SqlValue),
+    Null,
+}
+
+impl fmt::Display for SqlValueOptional {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            SqlValueOptional::Some(value) => write!(f, "{}", value),
+            SqlValueOptional::Null => write!(f, "NULL"),
+        }
+    }
+}
+
+impl<T> From<T> for SqlValueOptional
+where
+    SqlValue: From<T>,
+{
+    fn from(value: T) -> Self { SqlValueOptional::Some(SqlValue::from(value)) }
+}
+
+impl<T> From<Option<T>> for SqlValueOptional
+where
+    SqlValue: From<T>,
+{
+    fn from(opt: Option<T>) -> Self {
+        match opt {
+            Some(v) => SqlValueOptional::Some(SqlValue::from(v)),
+            None => SqlValueOptional::Null,
+        }
+    }
+}
+
+impl<T> FromQuoted<T> for SqlValueOptional
+where
+    SqlValue: FromQuoted<T>,
+{
+    fn from_quoted(value: T) -> Self { SqlValueOptional::Some(SqlValue::from_quoted(value)) }
+}
+
+impl<T> FromQuoted<Option<T>> for SqlValueOptional
+where
+    SqlValue: FromQuoted<T>,
+{
+    fn from_quoted(opt: Option<T>) -> Self {
+        match opt {
+            Some(v) => SqlValueOptional::Some(SqlValue::from_quoted(v)),
+            None => SqlValueOptional::Null,
+        }
+    }
+}
+
+pub(crate) trait SqlValueToString: fmt::Display + Sized {
+    /// Converts the given `value` to string if it implements `Into<SqlValue>`.
+    /// The resulting string is considered a safe SQL value.
+    fn value_to_string<S>(value: S) -> String
+    where
+        Self: From<S>,
+    {
+        Self::from(value).to_string()
+    }
+
+    /// Converts the given `value` to string if `Self` implements `FromQuoted<S>`.
+    /// The resulting string is considered a safe SQL value.
+    fn quoted_value_to_string<S>(value: S) -> String
+    where
+        Self: FromQuoted<S>,
+    {
+        Self::from_quoted(value).to_string()
+    }
+}
+
+impl SqlValueToString for SqlValue {}
+
+impl SqlValueToString for SqlValueOptional {}
+
+pub(crate) trait SqlValuesToStrings: SqlValueToString {
+    /// Converts the given `values` to `Vec<String>` if they implement `Into<SqlValue>`.
+    /// The resulting strings are considered safe SQL values.
+    fn values_to_strings<I, S>(values: I) -> Vec<String>
+    where
+        I: IntoIterator<Item = S>,
+        Self: From<S>,
+    {
+        values.into_iter().map(Self::value_to_string).collect()
+    }
+
+    /// Converts the given `values` to `Vec<String>` if `Self` implements `FromQuoted<S>`.
+    /// The resulting strings are considered safe SQL values.
+    fn quoted_values_to_strings<I, S>(values: I) -> Vec<String>
+    where
+        I: IntoIterator<Item = S>,
+        Self: FromQuoted<S>,
+    {
+        values.into_iter().map(Self::quoted_value_to_string).collect()
+    }
+}
+
+impl SqlValuesToStrings for SqlValue {}
+
+impl SqlValuesToStrings for SqlValueOptional {}
diff --git a/mm2src/db_common/src/sqlite.rs b/mm2src/db_common/src/sqlite.rs
index 8cb351f1db..4c3f2a610b 100644
--- a/mm2src/db_common/src/sqlite.rs
+++ b/mm2src/db_common/src/sqlite.rs
@@ -1,11 +1,12 @@
 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::error::Error as StdError;
+use std::fmt;
 use std::sync::{Arc, Mutex, Weak};
 use uuid::Uuid;
 
@@ -18,7 +19,7 @@ macro_rules! owned_named_params {
         Vec::new()
     };
     ($($param_name:literal: $param_val:expr),+ $(,)?) => {
-        vec![$(($param_name, Value::from($param_val))),+]
+        vec![$(($param_name, $crate::sqlite::rusqlite::types::Value::from($param_val))),+]
     };
 }
 
@@ -31,7 +32,7 @@ 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>>;
+pub type SqlNamedParams<'a> = Vec<SqlNamedParam<'a>>;
 type OwnedSqlNamedParam = (&'static str, Value);
 pub type OwnedSqlNamedParams = Vec<OwnedSqlNamedParam>;
 
@@ -62,6 +63,24 @@ where
     Ok(Some(result))
 }
 
+pub fn query_single_row_with_named_params<T, F>(
+    conn: &Connection,
+    query: &str,
+    params: &SqlNamedParams<'_>,
+    map_fn: F,
+) -> Result<Option<T>, SqlError>
+where
+    F: FnOnce(&Row<'_>) -> Result<T, SqlError>,
+{
+    let maybe_result = conn.query_row_named(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 == '.')
 }
@@ -126,7 +145,7 @@ pub fn offset_by_id<P>(
     where_id: &str,
 ) -> SqlResult<Option<usize>>
 where
-    P: IntoIterator + std::fmt::Debug,
+    P: IntoIterator + fmt::Debug,
     P::Item: ToSql,
 {
     let row_number = format!("ROW_NUMBER() OVER (ORDER BY {}) AS row", order_by);
@@ -199,6 +218,7 @@ 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)?;
+    conn.execute("pragma foreign_keys = ON;", NO_PARAMS)?;
     Ok(())
 }
 
@@ -206,6 +226,13 @@ pub fn execute_batch(statement: &'static [&str]) -> Vec<(&'static str, Vec<Strin
     statement.iter().map(|sql| (*sql, vec![])).collect()
 }
 
+pub fn is_constraint_error(error: &SqlError) -> bool {
+    match error {
+        SqlError::SqliteFailure(failure, _error) => failure.code == rusqlite::ErrorCode::ConstraintViolation,
+        _ => false,
+    }
+}
+
 pub trait ToValidSqlTable {
     /// Converts `self` to a valid SQL table name or returns an error.
     fn to_valid_sql_table(&self) -> SqlResult<String>;
@@ -232,53 +259,9 @@ impl<S: ToString> ToValidSqlIdent for S {
     }
 }
 
-/// 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 {
+pub struct SqlParamsBuilder {
     next_param_id: usize,
     params: OwnedSqlParams,
 }
@@ -289,7 +272,12 @@ impl SqlParamsBuilder {
     where
         OwnedSqlParam: From<P>,
     {
-        self.params.push(OwnedSqlParam::from(param));
+        self.push_owned_param(OwnedSqlParam::from(param))
+    }
+
+    /// Pushes the given `param` and returns its `:<IDX>` identifier.
+    pub(crate) fn push_owned_param(&mut self, param: OwnedSqlParam) -> ParamId {
+        self.params.push(param);
         self.next_param_id += 1;
         format!(":{}", self.next_param_id)
     }
@@ -306,6 +294,28 @@ impl SqlParamsBuilder {
     pub(crate) fn params(&self) -> &OwnedSqlParams { &self.params }
 }
 
+/// TODO move it to `mm2_err_handle::common_errors` when it's merged.
+#[derive(Debug)]
+pub 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 From<String> for StringError {
+    fn from(s: String) -> Self { StringError(s) }
+}
+
+impl StringError {
+    pub fn into_boxed(self) -> Box<StringError> { Box::new(self) }
+}
+
 fn validate_ident_impl<F>(ident: &str, is_valid: F) -> SqlResult<()>
 where
     F: Fn(char) -> bool,
diff --git a/mm2src/derives/enum_from/Cargo.toml b/mm2src/derives/enum_from/Cargo.toml
new file mode 100644
index 0000000000..5a1c58c1fb
--- /dev/null
+++ b/mm2src/derives/enum_from/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "enum_from"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+doctest = false
+
+[dependencies]
+syn = { version = "1.0", features = ["full"] }
+quote = "1.0"
+proc-macro2 = "1.0"
+itertools = "0.10"
diff --git a/mm2src/derives/enum_from/src/from_inner.rs b/mm2src/derives/enum_from/src/from_inner.rs
new file mode 100644
index 0000000000..8fb76172db
--- /dev/null
+++ b/mm2src/derives/enum_from/src/from_inner.rs
@@ -0,0 +1,41 @@
+use crate::{CompileError, IdentCtx, MacroAttr, UnnamedInnerField};
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::Variant;
+
+/// Implement `From<Inner>` trait for the given enumeration `variant`.
+pub(crate) fn impl_from_inner(ctx: &IdentCtx<'_>, variant: &Variant) -> Result<Option<TokenStream2>, CompileError> {
+    let attr_count = variant
+        .attrs
+        .iter()
+        .filter(|attr| attr.path.is_ident(&MacroAttr::FromInner.to_string()))
+        .count();
+    match attr_count {
+        // There is no `#[from_inner]` attribute.
+        0 => return Ok(None),
+        1 => (),
+        // There are more than one `#[from_inner]` attributes.
+        _ => return Err(CompileError::expected_one_attr_on_variant(MacroAttr::FromInner)),
+    }
+
+    let inner_field = UnnamedInnerField::try_from_variant(variant, MacroAttr::FromInner)?;
+    let inner_type = &inner_field.ty();
+
+    let variant_ident = &variant.ident;
+    let IdentCtx {
+        ident,
+        impl_generics,
+        type_generics,
+        where_clause,
+    } = ctx;
+
+    let output = quote! {
+        #[automatically_derived]
+        impl #impl_generics From<#inner_type> for #ident #type_generics #where_clause {
+            fn from(inner: #inner_type) -> Self {
+                Self::#variant_ident(inner)
+            }
+        }
+    };
+    Ok(Some(output))
+}
diff --git a/mm2src/derives/enum_from/src/from_stringify.rs b/mm2src/derives/enum_from/src/from_stringify.rs
new file mode 100644
index 0000000000..464cb216ad
--- /dev/null
+++ b/mm2src/derives/enum_from/src/from_stringify.rs
@@ -0,0 +1,87 @@
+use crate::{get_attr_meta, CompileError, IdentCtx, MacroAttr};
+use proc_macro2::{Ident, TokenStream};
+use quote::__private::ext::RepToTokensExt;
+use quote::quote;
+use syn::NestedMeta::Lit;
+use syn::__private::TokenStream2;
+use syn::{ExprPath, NestedMeta, Variant};
+
+impl CompileError {
+    /// This error constructor is involved to be used on `EnumFromStringify` macro.
+    fn expected_literal_inner() -> CompileError {
+        CompileError(format!(
+            "'{}' attribute must consist of string Literal. For example, #[from_stringify(\"String\")]",
+            MacroAttr::FromStringify,
+        ))
+    }
+}
+
+fn check_inner_ident_type(ident: Option<Ident>) -> Result<(), CompileError> {
+    if let Some(ident) = ident {
+        if ident.to_string().as_str() == "String" {
+            return Ok(());
+        }
+    };
+
+    Err(CompileError::expected_string_inner_ident(MacroAttr::FromStringify))
+}
+
+fn get_variant_unnamed_ident(fields: syn::Fields) -> Option<Ident> {
+    if let syn::Fields::Unnamed(syn::FieldsUnnamed { unnamed, .. }) = fields {
+        if let Some(field) = unnamed.iter().next() {
+            if let Some(syn::Type::Path(type_path, ..)) = field.ty.next().cloned() {
+                let type_path = type_path.path.segments.iter().next().cloned()?.ident;
+                return Some(type_path);
+            };
+        };
+    }
+    None
+}
+
+/// The `#[from_stringify(..)]` attribute value.
+struct AttrIdentToken(ExprPath);
+
+impl TryFrom<NestedMeta> for AttrIdentToken {
+    type Error = CompileError;
+
+    /// Try to get an Ident name from an attribute value.
+    fn try_from(attr: NestedMeta) -> Result<Self, Self::Error> {
+        let path_str = match attr {
+            Lit(syn::Lit::Str(lit)) => lit.value(),
+            _ => return Err(CompileError::expected_literal_inner()),
+        };
+        let path_stream = syn::parse_str(&path_str)
+            .map_err(|err| CompileError::parsing_error(MacroAttr::FromStringify, err.to_string()))?;
+        let path = syn::parse2(path_stream)
+            .map_err(|err| CompileError::parsing_error(MacroAttr::FromStringify, err.to_string()))?;
+
+        Ok(AttrIdentToken(path))
+    }
+}
+
+pub(crate) fn impl_from_stringify(ctx: &IdentCtx<'_>, variant: &Variant) -> Result<Option<TokenStream2>, CompileError> {
+    let enum_name = &ctx.ident;
+    let variant_ident = &variant.ident;
+    let inner_ident = get_variant_unnamed_ident(variant.fields.to_owned());
+    let maybe_attr = variant
+        .attrs
+        .iter()
+        .flat_map(|attr| get_attr_meta(attr, MacroAttr::FromStringify))
+        .collect::<Vec<_>>();
+
+    let mut stream = TokenStream::new();
+    for meta in maybe_attr {
+        let AttrIdentToken(attr_path_id) = AttrIdentToken::try_from(meta)?;
+        check_inner_ident_type(inner_ident.clone())?;
+
+        stream.extend(quote! {
+            impl From<#attr_path_id> for #enum_name {
+                fn from(err: #attr_path_id) -> #enum_name {
+                    #enum_name::#variant_ident(err.to_string())
+                }
+            }
+        })
+    }
+
+    Ok(Some(stream))
+}
diff --git a/mm2src/derives/enum_from/src/from_trait.rs b/mm2src/derives/enum_from/src/from_trait.rs
new file mode 100644
index 0000000000..4179324cb9
--- /dev/null
+++ b/mm2src/derives/enum_from/src/from_trait.rs
@@ -0,0 +1,80 @@
+use crate::{get_attr_meta, CompileError, IdentCtx, MacroAttr, UnnamedInnerField};
+use itertools::Itertools;
+use proc_macro2::{Ident, TokenStream as TokenStream2};
+use quote::quote;
+use syn::Meta::Path;
+use syn::{NestedMeta, Variant};
+
+impl CompileError {
+    /// This error constructor is involved to be used on `EnumFromTrait` macro.
+    pub(crate) fn expected_trait_method_path() -> CompileError {
+        CompileError(format!(
+            "'{}' attribute must consist of two parts: 'Trait::method'. For example, #[{}(Default::default)]",
+            MacroAttr::FromTrait,
+            MacroAttr::FromTrait
+        ))
+    }
+}
+
+/// Implement a given trait-constructor for the given enumeration `variant`.
+pub(crate) fn impl_from_trait(ctx: &IdentCtx<'_>, variant: &Variant) -> Result<Option<TokenStream2>, CompileError> {
+    let maybe_attr = variant
+        .attrs
+        .iter()
+        .flat_map(|attr| get_attr_meta(attr, MacroAttr::FromTrait))
+        .at_most_one()
+        .map_err(|_| CompileError::expected_one_attr_on_variant(MacroAttr::FromTrait))?;
+    let attr = match maybe_attr {
+        Some(attr) => attr,
+        None => return Ok(None),
+    };
+
+    let TraitIdentMethod {
+        ident: trait_ident,
+        method: trait_method,
+    } = TraitIdentMethod::try_from(&attr)?;
+
+    let inner_field = UnnamedInnerField::try_from_variant(variant, MacroAttr::FromTrait)?;
+    let inner_type = inner_field.ty();
+
+    let variant_ident = &variant.ident;
+    let IdentCtx {
+        ident,
+        impl_generics,
+        type_generics,
+        where_clause,
+    } = ctx;
+
+    let output = quote! {
+        #[automatically_derived]
+        impl #impl_generics #trait_ident for #ident #type_generics #where_clause {
+            fn #trait_method(inner: #inner_type) -> Self {
+                Self::#variant_ident(inner)
+            }
+        }
+    };
+    Ok(Some(output))
+}
+
+/// The `Trait::method` attribute value.
+struct TraitIdentMethod<'a> {
+    /// The trait name.
+    ident: &'a Ident,
+    /// The trait method.
+    method: &'a Ident,
+}
+
+impl<'a> TryFrom<&'a NestedMeta> for TraitIdentMethod<'a> {
+    type Error = CompileError;
+
+    /// Try to get a trait name and the method from an attribute value `Trait::method`.
+    fn try_from(attr: &'a NestedMeta) -> Result<Self, Self::Error> {
+        match attr {
+            NestedMeta::Meta(Path(path)) if path.segments.len() == 2 => Ok(TraitIdentMethod {
+                ident: &path.segments[0].ident,
+                method: &path.segments[1].ident,
+            }),
+            _ => Err(CompileError::expected_trait_method_path()),
+        }
+    }
+}
diff --git a/mm2src/derives/enum_from/src/lib.rs b/mm2src/derives/enum_from/src/lib.rs
new file mode 100644
index 0000000000..83aef6f6f0
--- /dev/null
+++ b/mm2src/derives/enum_from/src/lib.rs
@@ -0,0 +1,282 @@
+use proc_macro::{self, TokenStream};
+use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
+use quote::quote;
+use std::fmt;
+use syn::Meta::List;
+use syn::{parse_macro_input, Data, DeriveInput, Error, Field, Fields, ImplGenerics, Type, TypeGenerics, WhereClause};
+use syn::{Attribute, NestedMeta, Variant};
+
+mod from_inner;
+mod from_stringify;
+mod from_trait;
+
+const MACRO_IDENT: &str = "EnumFromInner";
+
+/// Implements `From<Inner>` trait for the given enumeration.
+///
+/// # Usage
+///
+/// ```rust
+/// use enum_from::EnumFromInner;
+///
+/// #[derive(EnumFromInner)]
+/// enum FooBar {
+///     #[from_inner]
+///     Foo(i32),
+///     #[from_inner]
+///     Bar(&'static str),
+/// }
+///
+/// match FooBar::from(10i32) {
+///     FooBar::Foo(10) => (),
+///     _ => panic!(),
+/// }
+/// match FooBar::from("Hello, world") {
+///     FooBar::Bar("Hello, world") => (),
+///     _ => panic!(),
+/// }
+/// ```
+#[proc_macro_derive(EnumFromInner, attributes(from_inner))]
+pub fn enum_from_inner(input: TokenStream) -> TokenStream {
+    let input: DeriveInput = parse_macro_input!(input);
+    match derive_enum_from_macro(input, MacroAttr::FromInner) {
+        Ok(output) => output,
+        Err(e) => e.into(),
+    }
+}
+
+/// Implements `From<Inner>` trait for the given enumeration.
+///
+/// # Usage
+///
+/// ```rust
+/// use enum_from::EnumFromTrait;
+///
+/// #[derive(EnumFromTrait)]
+/// enum FooBar {
+///     #[from_trait(Foo::foo)]
+///     Foo(i32),
+///     #[from_trait(Bar::bar)]
+///     Bar(&'static str),
+/// }
+///
+/// trait Foo {
+///     fn foo(num: i32) -> Self;
+/// }
+///
+/// trait Bar {
+///     fn bar(str: &'static str) -> Self;
+/// }
+///
+/// match FooBar::foo(10) {
+///     FooBar::Foo(10) => (),
+///     _ => panic!(),
+/// }
+/// match FooBar::bar("Hello, world") {
+///     FooBar::Bar("Hello, world") => (),
+///     _ => panic!(),
+/// }
+/// ```
+#[proc_macro_derive(EnumFromTrait, attributes(from_trait))]
+pub fn enum_from_trait(input: TokenStream) -> TokenStream {
+    let input: DeriveInput = parse_macro_input!(input);
+    match derive_enum_from_macro(input, MacroAttr::FromTrait) {
+        Ok(output) => output,
+        Err(e) => e.into(),
+    }
+}
+
+/// `EnumFromStringify` is very useful for generating `From<T>` trait from one enum to another enum,
+/// this procedural macro is used to convert any type that implements `Display` trait to a enum variant with the `String` inner type only.
+///
+/// ### USAGE:
+///
+/// ```rust
+/// use enum_from::EnumFromStringify;
+/// use std::fmt::{Display, Formatter};
+/// use std::io::{Error, ErrorKind};
+///
+/// // E.G, this converts from Bar, Man to FooBar::Bar(String)
+/// #[derive(Debug, EnumFromStringify, PartialEq, Eq)]
+/// pub enum FooBar {
+///     #[from_stringify("u64", "std::io::Error")]
+///     Bar(String),
+/// }
+///
+/// #[test]
+/// fn test_from_stringify() {
+/// let num = 6500u64;
+/// let expected: FooBar = num.into();
+/// assert_eq!(FooBar::Bar(num.to_string()), expected);
+///
+/// let err = Error::new(ErrorKind::Other, "oh no!");
+/// let actual = FooBar::Bar(err.to_string());
+/// let expected: FooBar = err.into();
+/// assert_eq!(actual, expected);
+/// }
+///  ```
+#[proc_macro_derive(EnumFromStringify, attributes(from_stringify))]
+pub fn derive(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+    match derive_enum_from_macro(ast, MacroAttr::FromStringify) {
+        Ok(output) => output,
+        Err(e) => e.into(),
+    }
+}
+
+#[allow(clippy::enum_variant_names)]
+#[derive(Clone, Copy)]
+enum MacroAttr {
+    /// `from_inner` attribute of the `EnumFromInner` derive macro.
+    FromInner,
+    /// `from_trait` attribute of the `EnumFromTrait` derive macro.
+    FromTrait,
+    /// `from_stringify` attribute of the `EnumFromStringify` derive macro.
+    FromStringify,
+}
+
+impl fmt::Display for MacroAttr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            MacroAttr::FromInner => write!(f, "from_inner"),
+            MacroAttr::FromTrait => write!(f, "from_trait"),
+            MacroAttr::FromStringify => write!(f, "from_stringify"),
+        }
+    }
+}
+
+struct CompileError(String);
+
+impl CompileError {
+    fn expected_enum(found: &str) -> CompileError {
+        CompileError(format!("'{}' cannot be implement for a {}", MACRO_IDENT, found))
+    }
+
+    fn expected_unnamed_inner(attr: MacroAttr) -> CompileError {
+        CompileError(format!(
+            "'{}' attribute must be used for a variant with one unnamed inner type",
+            attr
+        ))
+    }
+
+    fn expected_one_attr_on_variant(attr: MacroAttr) -> CompileError {
+        CompileError(format!("An enum variant can have only one '{}' attribute", attr))
+    }
+
+    fn attr_must_be_used(attr: MacroAttr) -> CompileError {
+        CompileError(format!("'{}' must be used at least once", attr))
+    }
+
+    fn expected_string_inner_ident(attr: MacroAttr) -> CompileError {
+        CompileError(format!("'{attr}' Expected String as inner ident"))
+    }
+
+    fn parsing_error(attr: MacroAttr, err: String) -> CompileError {
+        CompileError(format!("'{attr}' Error occured while parsing str. Error: {err}"))
+    }
+}
+
+impl From<CompileError> for TokenStream {
+    fn from(e: CompileError) -> Self { TokenStream2::from(e).into() }
+}
+
+impl From<CompileError> for TokenStream2 {
+    fn from(e: CompileError) -> Self { Error::new(Span::call_site(), e.0).to_compile_error() }
+}
+
+/// An information about the derive ident.
+struct IdentCtx<'a> {
+    ident: &'a Ident,
+    impl_generics: ImplGenerics<'a>,
+    type_generics: TypeGenerics<'a>,
+    where_clause: Option<&'a WhereClause>,
+}
+
+impl<'a> From<&'a DeriveInput> for IdentCtx<'a> {
+    fn from(input: &'a DeriveInput) -> Self {
+        let (impl_generics, type_generics, where_clause) = input.generics.split_for_impl();
+        IdentCtx {
+            ident: &input.ident,
+            impl_generics,
+            type_generics,
+            where_clause,
+        }
+    }
+}
+
+/// Represents an unnamed inner field aka `new type`.
+struct UnnamedInnerField<'a> {
+    field: &'a Field,
+}
+
+impl<'a> UnnamedInnerField<'a> {
+    /// Try to get an unnamed inner field of the given `variant`.
+    /// `attr` is an attribute identifier that is used to generate correct error message.
+    fn try_from_variant(variant: &'a Variant, attr: MacroAttr) -> Result<Self, CompileError> {
+        match variant.fields {
+            Fields::Unnamed(ref fields) if fields.unnamed.len() == 1 => Ok(UnnamedInnerField {
+                field: &fields.unnamed[0],
+            }),
+            _ => Err(CompileError::expected_unnamed_inner(attr)),
+        }
+    }
+
+    /// Get a type of the field.
+    fn ty(&self) -> &Type { &self.field.ty }
+}
+
+/// An implementation of `EnumFromInner` and `EnumFromTrait` macros.
+fn derive_enum_from_macro(input: DeriveInput, attr: MacroAttr) -> Result<TokenStream, CompileError> {
+    let enumeration = match input.data {
+        Data::Enum(ref enumeration) => enumeration,
+        Data::Struct(_) => return Err(CompileError::expected_enum("struct")),
+        Data::Union(_) => return Err(CompileError::expected_enum("union")),
+    };
+
+    let ctx = IdentCtx::from(&input);
+
+    let mut impls = Vec::with_capacity(enumeration.variants.len());
+    for variant in enumeration.variants.iter() {
+        let maybe_impl = match attr {
+            MacroAttr::FromInner => from_inner::impl_from_inner(&ctx, variant)?,
+            MacroAttr::FromTrait => from_trait::impl_from_trait(&ctx, variant)?,
+            MacroAttr::FromStringify => from_stringify::impl_from_stringify(&ctx, variant)?,
+        };
+        if let Some(variant_impl) = maybe_impl {
+            impls.push(variant_impl);
+        }
+    }
+
+    if impls.is_empty() {
+        return Err(CompileError::attr_must_be_used(attr));
+    }
+
+    let output = quote! {
+        #(#impls)*
+    };
+
+    Ok(wrap_const(output))
+}
+
+fn wrap_const(code: TokenStream2) -> TokenStream {
+    let output = quote! {
+        const _: () = {
+            #code
+        };
+    };
+    output.into()
+}
+
+/// Get the meta information about the given `attr`.
+pub(crate) fn get_attr_meta(attr: &Attribute, attr_ident: MacroAttr) -> Vec<NestedMeta> {
+    if !attr.path.is_ident(&attr_ident.to_string()) {
+        return Vec::new();
+    }
+
+    match attr.parse_meta() {
+        // A meta list is like the `serde(tag = "...")` in `#[serde(tag = "...")]`
+        // or `serde(untagged)` in `#[serde(untagged)]`
+        Ok(List(meta)) => meta.nested.into_iter().collect(),
+        _ => Vec::new(),
+    }
+}
diff --git a/mm2src/derives/ser_error/Cargo.toml b/mm2src/derives/ser_error/Cargo.toml
index abdccb2fba..ace2ba57fd 100644
--- a/mm2src/derives/ser_error/Cargo.toml
+++ b/mm2src/derives/ser_error/Cargo.toml
@@ -4,5 +4,8 @@ version = "0.1.0"
 authors = ["Sergey O. Boyko <sergey.boyko0791@gmail.com>"]
 edition = "2018"
 
+[lib]
+doctest = false
+
 [dependencies]
 serde = "1.0"
diff --git a/mm2src/derives/ser_error_derive/Cargo.toml b/mm2src/derives/ser_error_derive/Cargo.toml
index b53e6b26c5..640becbeed 100644
--- a/mm2src/derives/ser_error_derive/Cargo.toml
+++ b/mm2src/derives/ser_error_derive/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 
 [lib]
 proc-macro = true
+doctest = false
 
 [dependencies]
 proc-macro2 = "1.0"
diff --git a/mm2src/floodsub/Cargo.toml b/mm2src/floodsub/Cargo.toml
index 864cc0f0a4..614cdd9b30 100644
--- a/mm2src/floodsub/Cargo.toml
+++ b/mm2src/floodsub/Cargo.toml
@@ -9,11 +9,14 @@ repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
+[lib]
+doctest = false
+
 [dependencies]
 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" }
+libp2p-core = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
+libp2p-swarm = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
 prost = "0.10"
 rand = "0.7"
 smallvec = "1.0"
diff --git a/mm2src/gossipsub/Cargo.toml b/mm2src/gossipsub/Cargo.toml
index 5cdd94dcfb..7df4785fc1 100644
--- a/mm2src/gossipsub/Cargo.toml
+++ b/mm2src/gossipsub/Cargo.toml
@@ -9,6 +9,9 @@ repository = "https://github.com/libp2p/rust-libp2p"
 keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
+[lib]
+doctest = false
+
 [dependencies]
 base64 = "0.11.0"
 bytes = "0.5.4"
@@ -17,8 +20,8 @@ common = { path = "../common" }
 fnv = "1.0.6"
 futures = "0.3.1"
 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" }
+libp2p-swarm = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
+libp2p-core = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
 log = "0.4.8"
 prost = "0.10"
 rand = "0.7"
@@ -30,8 +33,8 @@ wasm-timer = "0.2.4"
 [dev-dependencies]
 async-std = "1.6.2"
 env_logger = "0.7.1"
-libp2p-plaintext = { git = "https://github.com/libp2p/rust-libp2p.git" }
-libp2p-yamux = { git = "https://github.com/libp2p/rust-libp2p.git" }
+libp2p-plaintext = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
+libp2p-yamux = { git = "https://github.com/libp2p/rust-libp2p.git", tag ="v0.45.1" }
 quickcheck = "0.9.2"
 
 [build-dependencies]
diff --git a/mm2src/gossipsub/src/behaviour.rs b/mm2src/gossipsub/src/behaviour.rs
index 75742febfd..19eb7a2627 100644
--- a/mm2src/gossipsub/src/behaviour.rs
+++ b/mm2src/gossipsub/src/behaviour.rs
@@ -163,7 +163,7 @@ impl Gossipsub {
             return false;
         }
 
-        let peers: Vec<_> = self.peer_topics.iter().map(|(peer_id, _)| *peer_id).collect();
+        let peers: Vec<_> = self.peer_topics.keys().copied().collect();
         for peer_id in peers {
             let mut fixed_event = None; // initialise the event once if needed
             if fixed_event.is_none() {
@@ -954,7 +954,7 @@ impl Gossipsub {
                 control_msgs: Vec::new(),
             });
 
-            let relays: Vec<_> = self.relays_mesh.iter().map(|(relay, _)| *relay).collect();
+            let relays: Vec<_> = self.relays_mesh.keys().copied().collect();
             for relay in relays {
                 if let Some(received_from_peers) = self.received.get(&msg_id) {
                     if received_from_peers.contains(&relay) {
@@ -1065,7 +1065,7 @@ impl Gossipsub {
 
     pub fn get_mesh(&self) -> &HashMap<TopicHash, Vec<PeerId>> { &self.mesh }
 
-    pub fn get_relay_mesh(&self) -> Vec<PeerId> { self.relays_mesh.iter().map(|(peer, _)| peer).cloned().collect() }
+    pub fn get_relay_mesh(&self) -> Vec<PeerId> { self.relays_mesh.keys().cloned().collect() }
 
     pub fn relay_mesh_len(&self) -> usize { self.relays_mesh.len() }
 
@@ -1336,7 +1336,7 @@ impl NetworkBehaviour for Gossipsub {
         debug!("Peer disconnected: {:?}", peer_id);
         {
             let topics = match self.peer_topics.get(peer_id) {
-                Some(topics) => (topics),
+                Some(topics) => topics,
                 None => {
                     warn!("Disconnected node, not in connected nodes");
                     return;
diff --git a/mm2src/gossipsub/src/protocol.rs b/mm2src/gossipsub/src/protocol.rs
index ea7f549345..1173a89b22 100644
--- a/mm2src/gossipsub/src/protocol.rs
+++ b/mm2src/gossipsub/src/protocol.rs
@@ -24,6 +24,7 @@ use crate::topic::TopicHash;
 use byteorder::{BigEndian, ByteOrder};
 use bytes::Bytes;
 use bytes::BytesMut;
+use common::some_or_return_ok_none;
 use futures::future;
 use futures::prelude::*;
 use futures_codec::{Decoder, Encoder, Framed};
@@ -211,10 +212,7 @@ impl Decoder for GossipsubCodec {
     type Error = io::Error;
 
     fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-        let packet = match self.length_codec.decode(src)? {
-            Some(p) => p,
-            None => return Ok(None),
-        };
+        let packet = some_or_return_ok_none!(self.length_codec.decode(src)?);
 
         let rpc = rpc_proto::Rpc::decode(&packet[..])?;
 
diff --git a/mm2src/hw_common/Cargo.toml b/mm2src/hw_common/Cargo.toml
index 527ef0698e..06e9383b73 100644
--- a/mm2src/hw_common/Cargo.toml
+++ b/mm2src/hw_common/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 async-trait = "0.1"
diff --git a/mm2src/hw_common/src/transport/libusb.rs b/mm2src/hw_common/src/transport/libusb.rs
index ac9351b99c..da33494dc5 100644
--- a/mm2src/hw_common/src/transport/libusb.rs
+++ b/mm2src/hw_common/src/transport/libusb.rs
@@ -2,8 +2,8 @@
 //! 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 common::{block_on, some_or_return_ok_none};
 use derive_more::Display;
 use futures::channel::{mpsc, oneshot};
 use futures::StreamExt;
@@ -102,28 +102,17 @@ impl UsbContext {
         let config_descriptor = device
             .config_descriptor(filters.config_id)
             .map_to_mm(UsbError::ErrorGettingDevices)?;
-        let interface = match config_descriptor
+        let interface = some_or_return_ok_none!(config_descriptor
             .interfaces()
-            .find(|i| i.number() == filters.interface_id)
-        {
-            Some(interface) => interface,
-            None => return Ok(None),
-        };
-        let descriptor = match interface
+            .find(|i| i.number() == filters.interface_id));
+        let descriptor = some_or_return_ok_none!(interface
             .descriptors()
-            .find(|d| d.setting_number() == filters.interface_descriptor)
-        {
-            Some(descriptor) => descriptor,
-            None => return Ok(None),
-        };
+            .find(|d| d.setting_number() == filters.interface_descriptor));
         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),
-        };
+        let endpoint = some_or_return_ok_none!(descriptor.endpoint_descriptors().next());
         Ok(Some(UsbDeviceInterfaceInfo {
             interface_number: filters.interface_id,
             endpoint_number: endpoint.number(),
diff --git a/mm2src/hw_common/src/transport/webusb_driver.rs b/mm2src/hw_common/src/transport/webusb_driver.rs
index 23497795df..14e6ad6cd8 100644
--- a/mm2src/hw_common/src/transport/webusb_driver.rs
+++ b/mm2src/hw_common/src/transport/webusb_driver.rs
@@ -1,5 +1,5 @@
 use crate::transport::{send_event_recv_response, InternalError};
-use common::executor::spawn_local;
+use common::executor::{spawn_local_abortable, AbortOnDropHandle};
 use common::{deserialize_from_js, log::error, serialize_to_js, stringify_js_error};
 use derive_more::Display;
 use futures::channel::{mpsc, oneshot};
@@ -115,6 +115,8 @@ pub struct DeviceInterfaceInfo {
 
 pub struct WebUsbWrapper {
     event_tx: WebUsbEventSender,
+    /// This abort handle is needed to drop the spawned future at [`WebUsbWrapper::new`] immediately.
+    _abort_handle: AbortOnDropHandle,
 }
 
 impl WebUsbWrapper {
@@ -135,8 +137,12 @@ impl WebUsbWrapper {
                 }
             }
         };
-        spawn_local(fut);
-        Ok(WebUsbWrapper { event_tx })
+
+        let abort_handle = spawn_local_abortable(fut);
+        Ok(WebUsbWrapper {
+            event_tx,
+            _abort_handle: abort_handle,
+        })
     }
 
     pub async fn request_device(&self, filters: Vec<DeviceFilter>) -> WebUsbResult<()> {
@@ -183,12 +189,13 @@ impl WebUsbWrapper {
             let device_info = WebUsbDeviceInfo::from_usb_device(&device);
 
             let (device_event_tx, device_event_rx) = mpsc::unbounded();
+            let abort_handle = spawn_local_abortable(WebUsbDevice::event_loop(device, device_event_rx));
+
             result_devices.push(WebUsbDevice {
                 event_tx: device_event_tx,
                 device_info,
+                _abort_handle: abort_handle,
             });
-
-            spawn_local(WebUsbDevice::event_loop(device, device_event_rx));
         }
         Ok(result_devices)
     }
@@ -197,6 +204,8 @@ impl WebUsbWrapper {
 pub struct WebUsbDevice {
     pub event_tx: DeviceEventSender,
     pub device_info: WebUsbDeviceInfo,
+    /// This abort handle is needed to drop the spawned future at [`WebUsbWrapper::on_get_devices`] immediately.
+    _abort_handle: AbortOnDropHandle,
 }
 
 impl WebUsbDevice {
diff --git a/mm2src/ledger/Cargo.toml b/mm2src/ledger/Cargo.toml
index 7f44a2c3a8..2fbdbe3a67 100644
--- a/mm2src/ledger/Cargo.toml
+++ b/mm2src/ledger/Cargo.toml
@@ -3,8 +3,6 @@ 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"
diff --git a/mm2src/mm2_bin_lib/Cargo.toml b/mm2src/mm2_bin_lib/Cargo.toml
new file mode 100644
index 0000000000..c2788a80c3
--- /dev/null
+++ b/mm2src/mm2_bin_lib/Cargo.toml
@@ -0,0 +1,63 @@
+# 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_bin_lib"
+version = "1.0.0-beta"
+authors = ["James Lee", "Artem Pikulin", "Artem Grinblat", "Omar S.", "Onur Ozkan", "Alina Sharon", "Caglar Kaya", "Cipi", "Sergey Boiko", "Samuel Onoja", "Roman Sztergbaum", "Kadan Stadelmann <ca333@komodoplatform.com>"]
+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]
+custom-swap-locktime = ["mm2_main/custom-swap-locktime"] # only for testing purposes, should never be activated on release builds.
+native = ["mm2_main/native"] # Deprecated
+track-ctx-pointer = ["mm2_main/track-ctx-pointer"]
+zhtlc-native-tests = ["mm2_main/zhtlc-native-tests"]
+
+[[bin]]
+name = "mm2"
+path = "src/mm2_bin.rs"
+test = false
+doctest = false
+bench = false
+
+[lib]
+name = "mm2lib"
+crate-type = ["cdylib"]
+test = false
+doctest = false
+bench = false
+
+[dependencies]
+common = { path = "../common" }
+enum-primitive-derive = "0.2"
+libc = "0.2"
+mm2_core = { path = "../mm2_core" }
+mm2_main = { path = "../mm2_main" }
+num-traits = "0.2"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+gstuff = { version = "0.7", features = ["nightly"] }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = { version = "0.3.27" }
+mm2_rpc = { path = "../mm2_rpc" }
+serde = "1.0"
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+
+[target.x86_64-unknown-linux-gnu.dependencies]
+jemallocator = "0.5.0"
+
+[build-dependencies]
+chrono = "0.4"
+gstuff = { version = "0.7", features = ["nightly"] }
+regex = "1"
diff --git a/mm2src/mm2_main/build.rs b/mm2src/mm2_bin_lib/build.rs
similarity index 68%
rename from mm2src/mm2_main/build.rs
rename to mm2src/mm2_bin_lib/build.rs
index 3c071ecb58..c05c39a364 100644
--- a/mm2src/mm2_main/build.rs
+++ b/mm2src/mm2_bin_lib/build.rs
@@ -46,36 +46,29 @@ fn root() -> PathBuf {
 /// we might skip synchronizing the Git repository there),
 /// but if it is, then we're going to check if the “MM_DATETIME” and the Git data match.
 fn mm_version() -> String {
-    // We fetch the actual git version here,
-    // with `git log '--pretty=format:%h' -n 1` for the nightlies,
-    // and a release tag when building from some kind of a stable branch,
-    // though we should keep the ability for the tooling to provide the “MM_VERSION”
-    // externally, because moving the entire ".git" around is not always practical.
-    let mut version = "UNKNOWN".to_string();
-    let mut command = Command::new("git");
-    command.arg("log").arg("--pretty=format:%h").arg("-n1");
-    if let Ok(go) = command.output() {
-        if go.status.success() {
-            version = from_utf8(&go.stdout).unwrap().trim().to_string();
-            if !Regex::new(r"^\w+$").unwrap().is_match(&version) {
-                panic!("{}", version)
-            }
-        }
-    }
+    // Reading version of `mm2_bin_lib` from cargo manifest
+    let mut version = env!("CARGO_PKG_VERSION").to_owned();
 
     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
+
+    // if there is MM_VERSION file, that means CI wants to put a tag to version
     if !v_file.is_empty() {
-        if !v_file.contains(&version) {
-            // If the file doesn't contain the latest commit hash then this is a local build
-            // and the env version variable should be "v_file"_"version" as "v_file" is the version from the local file
-            // and "version" is the latest commit hash
-            version = format!("{}_{}", v_file, version);
-        } else {
-            // If the file contains the latest commit hash then this is a CI build and the version generated by CI should be written to env
-            version = v_file;
+        version = format!("{}_{}", version, v_file.trim());
+    }
+    // put commit tag to the version
+    else {
+        let mut command = Command::new("git");
+        command.arg("log").arg("--pretty=format:%h").arg("-n1");
+        if let Ok(go) = command.output() {
+            if go.status.success() {
+                let commit_hash = from_utf8(&go.stdout).unwrap().trim().to_string();
+                if !Regex::new(r"^\w+$").unwrap().is_match(&commit_hash) {
+                    panic!("{}", commit_hash)
+                }
+
+                version = format!("{version}_{commit_hash}");
+            }
         }
     }
 
@@ -111,8 +104,8 @@ fn mm_version() -> String {
 
 fn main() {
     println!("cargo:rerun-if-env-changed=MANUAL_MM_VERSION");
-    println!("cargo:rerun-if-changed=MM_VERSION");
-    println!("cargo:rerun-if-changed=MM_DATETIME");
+    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");
diff --git a/mm2src/mm2_bin_lib/src/lib.rs b/mm2src/mm2_bin_lib/src/lib.rs
new file mode 100644
index 0000000000..008f0d775c
--- /dev/null
+++ b/mm2src/mm2_bin_lib/src/lib.rs
@@ -0,0 +1,103 @@
+use enum_primitive_derive::Primitive;
+use mm2_core::mm_ctx::MmArc;
+use mm2_main::mm2::lp_dispatcher::{dispatch_lp_event, StopCtxEvent};
+use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
+#[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*;
+
+#[cfg(not(target_arch = "wasm32"))] mod mm2_native_lib;
+#[cfg(target_arch = "wasm32")] mod mm2_wasm_lib;
+
+const MM_VERSION: &str = env!("MM_VERSION");
+const MM_DATETIME: &str = env!("MM_DATETIME");
+
+static LP_MAIN_RUNNING: AtomicBool = AtomicBool::new(false);
+static CTX: AtomicU32 = AtomicU32::new(0);
+
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
+pub enum MainStatus {
+    /// MM2 is not running yet.
+    NotRunning = 0,
+    /// MM2 is running, but no context yet.
+    NoContext = 1,
+    /// MM2 is running, but no RPC yet.
+    NoRpc = 2,
+    /// MM2's RPC is up.
+    RpcIsUp = 3,
+}
+
+/// Checks if the MM2 singleton thread is currently running or not.
+fn mm2_status() -> MainStatus {
+    if !LP_MAIN_RUNNING.load(Ordering::Relaxed) {
+        return MainStatus::NotRunning;
+    }
+
+    let ctx = CTX.load(Ordering::Relaxed);
+    if ctx == 0 {
+        return MainStatus::NoContext;
+    }
+
+    let ctx = match MmArc::from_ffi_handle(ctx) {
+        Ok(ctx) => ctx,
+        Err(_) => return MainStatus::NoRpc,
+    };
+
+    if ctx.rpc_started.copy_or(false) {
+        MainStatus::RpcIsUp
+    } else {
+        MainStatus::NoRpc
+    }
+}
+
+enum PrepareForStopResult {
+    CanBeStopped(MmArc),
+    /// Please note that the status is not always an error.
+    /// [`StopStatus::Ok`] means that the global state was incorrect (`mm2_run` didn't work, although it should have),
+    /// and there is no need to stop an mm2 instance manually.
+    ReadyStopStatus(StopStatus),
+}
+
+#[derive(Debug, PartialEq, Primitive)]
+pub enum StopStatus {
+    Ok = 0,
+    NotRunning = 1,
+    ErrorStopping = 2,
+    StoppingAlready = 3,
+}
+
+/// Checks if we can stop a MarketMaker2 instance.
+fn prepare_for_mm2_stop() -> PrepareForStopResult {
+    // The log callback might be initialized already, so try to use the common logs.
+    use common::log::warn;
+
+    if !LP_MAIN_RUNNING.load(Ordering::Relaxed) {
+        return PrepareForStopResult::ReadyStopStatus(StopStatus::NotRunning);
+    }
+
+    let ctx = CTX.load(Ordering::Relaxed);
+    if ctx == 0 {
+        warn!("mm2_stop] lp_main is running without ctx");
+        LP_MAIN_RUNNING.store(false, Ordering::Relaxed);
+        return PrepareForStopResult::ReadyStopStatus(StopStatus::Ok);
+    }
+
+    let ctx = match MmArc::from_ffi_handle(ctx) {
+        Ok(ctx) => ctx,
+        Err(_) => {
+            warn!("mm2_stop] lp_main is still running, although ctx has already been dropped");
+            LP_MAIN_RUNNING.store(false, Ordering::Relaxed);
+            // There is no need to rewrite the `CTX`, because it will be removed on `mm2_main`.
+            return PrepareForStopResult::ReadyStopStatus(StopStatus::Ok);
+        },
+    };
+
+    if ctx.is_stopping() {
+        return PrepareForStopResult::ReadyStopStatus(StopStatus::StoppingAlready);
+    }
+
+    PrepareForStopResult::CanBeStopped(ctx)
+}
+
+async fn finalize_mm2_stop(ctx: MmArc) {
+    dispatch_lp_event(ctx.clone(), StopCtxEvent.into()).await;
+    let _ = ctx.stop();
+}
diff --git a/mm2src/mm2_bin_lib/src/mm2_bin.rs b/mm2src/mm2_bin_lib/src/mm2_bin.rs
new file mode 100644
index 0000000000..cad9e8be88
--- /dev/null
+++ b/mm2src/mm2_bin_lib/src/mm2_bin.rs
@@ -0,0 +1,15 @@
+#[cfg(not(target_arch = "wasm32"))] use mm2_main::mm2::mm2_main;
+
+const MM_VERSION: &str = env!("MM_VERSION");
+const MM_DATETIME: &str = env!("MM_DATETIME");
+
+#[cfg(all(target_os = "linux", target_arch = "x86_64", target_env = "gnu"))]
+#[global_allocator]
+static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+fn main() {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        mm2_main(MM_VERSION.into(), MM_DATETIME.into())
+    }
+}
diff --git a/mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs b/mm2src/mm2_bin_lib/src/mm2_native_lib.rs
similarity index 84%
rename from mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs
rename to mm2src/mm2_bin_lib/src/mm2_native_lib.rs
index a181889b7d..5f85596311 100644
--- a/mm2src/mm2_main/src/mm2_lib/mm2_native_lib.rs
+++ b/mm2src/mm2_bin_lib/src/mm2_native_lib.rs
@@ -1,10 +1,9 @@
 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::executor::SpawnFuture;
 use common::log::{register_callback, FfiCallback};
-use common::{block_on, now_float};
+use common::{block_on, log, now_float};
+use enum_primitive_derive::Primitive;
 use gstuff::any_to_str;
 use libc::c_char;
 use mm2_core::mm_ctx::MmArc;
@@ -71,7 +70,9 @@ pub unsafe extern "C" fn mm2_main(conf: *const c_char, log_cb: extern "C" fn(lin
             return;
         }
         let ctx_cb = &|ctx| CTX.store(ctx, Ordering::Relaxed);
-        match catch_unwind(move || mm2::run_lp_main(Some(&conf), ctx_cb)) {
+        match catch_unwind(move || {
+            mm2_main::mm2::run_lp_main(Some(&conf), ctx_cb, MM_VERSION.into(), MM_DATETIME.into())
+        }) {
             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)),
@@ -124,7 +125,7 @@ pub extern "C" fn mm2_test(torch: i32, log_cb: extern "C" fn(line: *const c_char
             },
         };
         let conf = json::to_string(&ctx.conf).unwrap();
-        let hy_res = mm2::rpc::lp_commands_legacy::stop(ctx);
+        let hy_res = mm2_main::mm2::rpc::lp_commands_legacy::stop(ctx);
         let r = match block_on(hy_res) {
             Ok(r) => r,
             Err(err) => {
@@ -220,38 +221,14 @@ enum StopErr {
 /// 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::warn;
-
-    if !LP_MAIN_RUNNING.load(Ordering::Relaxed) {
-        return StopErr::NotRunning as i8;
-    }
-
-    let ctx = CTX.load(Ordering::Relaxed);
-    if ctx == 0 {
-        warn!("mm2_stop] lp_main is running without ctx");
-        LP_MAIN_RUNNING.store(false, Ordering::Relaxed);
-        return StopErr::Ok as i8;
-    }
-
-    let ctx = match MmArc::from_ffi_handle(ctx) {
-        Ok(ctx) => ctx,
-        Err(_) => {
-            warn!("mm2_stop] lp_main is still running, although ctx has already been dropped");
-            LP_MAIN_RUNNING.store(false, Ordering::Relaxed);
-            // there is no need to rewrite the `CTX`, because it will be removed on `mm2_main`
-            return StopErr::Ok as i8;
-        },
+    let ctx = match prepare_for_mm2_stop() {
+        PrepareForStopResult::CanBeStopped(ctx) => ctx,
+        PrepareForStopResult::ReadyStopStatus(res) => return res 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();
-    });
+    let spawner = ctx.spawner();
+    let fut = finalize_mm2_stop(ctx);
+    spawner.spawn(fut);
 
     StopErr::Ok as i8
 }
diff --git a/mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs b/mm2src/mm2_bin_lib/src/mm2_wasm_lib.rs
similarity index 80%
rename from mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs
rename to mm2src/mm2_bin_lib/src/mm2_wasm_lib.rs
index 4200e70fe1..ad133685c3 100644
--- a/mm2src/mm2_main/src/mm2_lib/mm2_wasm_lib.rs
+++ b/mm2src/mm2_bin_lib/src/mm2_wasm_lib.rs
@@ -13,19 +13,13 @@
 //! [blogpost]: https://rustwasm.github.io/2018/10/24/multithreading-rust-and-wasm.html
 
 use super::*;
-use crate::mm2::{LpMainParams, MmVersionResult};
 use common::log::{register_callback, LogLevel, WasmCallback};
-use common::{deserialize_from_js, executor, serialize_to_js, set_panic_hook};
-use gstuff::any_to_str;
-use js_sys::Array;
+use common::{console_err, console_info, deserialize_from_js, executor, serialize_to_js, set_panic_hook};
+use enum_primitive_derive::Primitive;
+use mm2_main::mm2::{LpMainParams, MmVersionResult};
 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;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
 
 /// The errors can be thrown when using the `mm2_main` function incorrectly.
 #[wasm_bindgen]
@@ -50,7 +44,7 @@ impl From<MainParams> for LpMainParams {
     fn from(orig: MainParams) -> Self { LpMainParams::with_conf(orig.conf).log_filter(Some(orig.log_level)) }
 }
 
-/// Run the MarketMaker2.
+/// Runs a MarketMaker2 instance.
 ///
 /// # Parameters
 ///
@@ -120,18 +114,19 @@ pub fn mm2_main(params: JsValue, log_cb: js_sys::Function) -> Result<(), JsValue
         //     Ok(Err(err)) => console_err!("run_lp_main error: {}", err),
         //     Err(err) => console_err!("run_lp_main panic: {:?}", any_to_str(&*err)),
         // };
-        match mm2::lp_main(params, &ctx_cb).await {
+        match mm2_main::mm2::lp_main(params, &ctx_cb, MM_VERSION.into(), MM_DATETIME.into()).await {
             Ok(()) => console_info!("run_lp_main finished"),
             Err(err) => console_err!("run_lp_main error: {}", err),
         };
         LP_MAIN_RUNNING.store(false, Ordering::Relaxed)
     };
-    executor::spawn_local(fut);
 
+    // At this moment we still don't have `MmCtx` context to use its `MmCtx::abortable_system` spawner.
+    executor::spawn_local(fut);
     Ok(())
 }
 
-/// Get the MarketMaker2 status.
+/// Returns the MarketMaker2 instance status.
 #[wasm_bindgen]
 pub fn mm2_main_status() -> MainStatus { mm2_status() }
 
@@ -164,7 +159,7 @@ impl From<Mm2RpcErr> for JsValue {
     fn from(e: Mm2RpcErr) -> Self { JsValue::from(e as i32) }
 }
 
-/// Invoke an RPC request.
+/// Invokes an RPC request.
 ///
 /// # Parameters
 ///
@@ -181,7 +176,7 @@ impl From<Mm2RpcErr> for JsValue {
 ///             "userpass": "test123",
 ///             "method": "version",
 ///         };
-///         const response = mm2_rpc(payload).await;
+///         const response = await mm2_rpc(payload);
 ///         return response.result;
 ///     } catch (e) {
 ///         switch (e) {
@@ -244,4 +239,42 @@ pub async fn mm2_rpc(payload: JsValue) -> Result<JsValue, JsValue> {
 /// }
 /// ```
 #[wasm_bindgen]
-pub fn mm2_version() -> JsValue { serialize_to_js(&MmVersionResult::new()).expect("expected serialization to succeed") }
+pub fn mm2_version() -> JsValue {
+    serialize_to_js(&MmVersionResult::new(MM_VERSION.into(), MM_DATETIME.into()))
+        .expect("expected serialization to succeed")
+}
+
+/// Stops the MarketMaker2 instance.
+///
+/// # Usage
+///
+/// ```javascript
+/// import init, {mm2_stop} from "./path/to/mm2.js";
+///
+/// async function stop () {
+///     try {
+///         await mm2_stop();
+///     } catch (e) {
+///         switch (e) {
+///             case Mm2RpcErr.NotRunning:
+///                 alert("MarketMaker2 not running yet...");
+///                 break;
+///             // handle other errors...
+///             default:
+///                 alert(`Unexpected error: ${e}`);
+///                 break;
+///         }
+///     }
+/// }
+/// ```
+#[wasm_bindgen]
+pub async fn mm2_stop() -> Result<(), JsValue> {
+    let ctx = match prepare_for_mm2_stop() {
+        PrepareForStopResult::CanBeStopped(ctx) => ctx,
+        PrepareForStopResult::ReadyStopStatus(StopStatus::Ok) => return Ok(()),
+        PrepareForStopResult::ReadyStopStatus(err) => return Err(JsValue::from(err as i32)),
+    };
+
+    finalize_mm2_stop(ctx).await;
+    Ok(())
+}
diff --git a/mm2src/mm2_bitcoin/chain/Cargo.toml b/mm2src/mm2_bitcoin/chain/Cargo.toml
index 4263b584cb..a107cf6735 100644
--- a/mm2src/mm2_bitcoin/chain/Cargo.toml
+++ b/mm2src/mm2_bitcoin/chain/Cargo.toml
@@ -3,10 +3,15 @@ name = "chain"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 rustc-hex = "2"
-bitcoin = "0.27.1"
 bitcrypto = { path = "../crypto" }
 primitives = { path = "../primitives" }
 serialization = { path = "../serialization" }
 serialization_derive = { path = "../serialization_derive" }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+bitcoin = "0.28.1"
diff --git a/mm2src/mm2_bitcoin/chain/src/block_header.rs b/mm2src/mm2_bitcoin/chain/src/block_header.rs
index 611977d52e..639670c7c7 100644
--- a/mm2src/mm2_bitcoin/chain/src/block_header.rs
+++ b/mm2src/mm2_bitcoin/chain/src/block_header.rs
@@ -1,10 +1,14 @@
 use compact::Compact;
 use crypto::dhash256;
+#[cfg(not(target_arch = "wasm32"))]
+use ext_bitcoin::blockdata::block::BlockHeader as ExtBlockHeader;
+#[cfg(not(target_arch = "wasm32"))]
+use ext_bitcoin::hash_types::{BlockHash as ExtBlockHash, TxMerkleNode as ExtTxMerkleNode};
 use hash::H256;
 use hex::FromHex;
 use primitives::bytes::Bytes;
 use primitives::U256;
-use ser::{deserialize, serialize, Deserializable, Reader, Serializable, Stream};
+use ser::{deserialize, serialize, CoinVariant, Deserializable, Reader, Serializable, Stream};
 use std::io;
 use transaction::{deserialize_tx, TxType};
 use {OutPoint, Transaction};
@@ -39,7 +43,26 @@ impl Serializable for BlockHeaderBits {
     }
 }
 
+impl From<BlockHeaderBits> for u32 {
+    fn from(bits: BlockHeaderBits) -> Self {
+        match bits {
+            BlockHeaderBits::Compact(c) => c.into(),
+            BlockHeaderBits::U32(n) => n,
+        }
+    }
+}
+
+impl From<BlockHeaderBits> for Compact {
+    fn from(bits: BlockHeaderBits) -> Self {
+        match bits {
+            BlockHeaderBits::Compact(c) => c,
+            BlockHeaderBits::U32(n) => Compact::new(n),
+        }
+    }
+}
+
 const AUX_POW_VERSION_DOGE: u32 = 6422788;
+const AUX_POW_VERSION_NMC: u32 = 65796;
 const AUX_POW_VERSION_SYS: u32 = 537919744;
 const MTP_POW_VERSION: u32 = 0x20001000u32;
 const PROG_POW_SWITCH_TIME: u32 = 1635228000;
@@ -142,7 +165,8 @@ impl Serializable for BlockHeader {
         };
         s.append(&self.time);
         s.append(&self.bits);
-        if !self.is_prog_pow() && self.version != KAWPOW_VERSION {
+        // If a BTC header uses KAWPOW_VERSION, the nonce can't be zero
+        if !self.is_prog_pow() && (self.version != KAWPOW_VERSION || self.nonce != BlockHeaderNonce::U32(0)) {
             s.append(&self.nonce);
         }
         if let Some(sol) = &self.solution {
@@ -210,24 +234,31 @@ impl Deserializable for BlockHeader {
             None
         };
 
-        let hash_final_sapling_root = if version == 4 { Some(reader.read()?) } else { None };
+        let is_zcash = (version == 4 && !reader.coin_variant().is_btc() && !reader.coin_variant().is_ppc())
+            || reader.coin_variant().is_kmd_assetchain();
+        let hash_final_sapling_root = if is_zcash { Some(reader.read()?) } else { None };
         let time = reader.read()?;
-        let bits = if version == 4 {
+        let bits = if is_zcash {
             BlockHeaderBits::U32(reader.read()?)
         } else {
             BlockHeaderBits::Compact(reader.read()?)
         };
-        let nonce = if version == 4 {
+        let nonce = if is_zcash {
             BlockHeaderNonce::H256(reader.read()?)
-        } else if version == KAWPOW_VERSION || version == MTP_POW_VERSION && time >= PROG_POW_SWITCH_TIME {
+        } else if (version == KAWPOW_VERSION && !reader.coin_variant().is_btc())
+            || version == MTP_POW_VERSION && time >= PROG_POW_SWITCH_TIME
+        {
             BlockHeaderNonce::U32(0)
         } else {
             BlockHeaderNonce::U32(reader.read()?)
         };
-        let solution = if version == 4 { Some(reader.read_list()?) } else { None };
+        let solution = if is_zcash { Some(reader.read_list()?) } else { None };
 
         // https://en.bitcoin.it/wiki/Merged_mining_specification#Merged_mining_coinbase
-        let aux_pow = if version == AUX_POW_VERSION_DOGE || version == AUX_POW_VERSION_SYS {
+        let aux_pow = if matches!(
+            version,
+            AUX_POW_VERSION_DOGE | AUX_POW_VERSION_SYS | AUX_POW_VERSION_NMC
+        ) {
             let coinbase_tx = deserialize_tx(reader, TxType::StandardWithWitness)?;
             let parent_block_hash = reader.read()?;
             let coinbase_branch = reader.read()?;
@@ -269,7 +300,7 @@ impl Deserializable for BlockHeader {
             };
 
         // https://github.com/RavenProject/Ravencoin/blob/61c790447a5afe150d9892705ac421d595a2df60/src/primitives/block.h#L67
-        let (n_height, n_nonce_u64, mix_hash) = if version == KAWPOW_VERSION {
+        let (n_height, n_nonce_u64, mix_hash) = if version == KAWPOW_VERSION && !reader.coin_variant().is_btc() {
             (Some(reader.read()?), Some(reader.read()?), Some(reader.read()?))
         } else {
             (None, None, None)
@@ -301,6 +332,14 @@ impl Deserializable for BlockHeader {
 }
 
 impl BlockHeader {
+    pub fn try_from_string_with_coin_variant(header: String, coin_variant: CoinVariant) -> Result<Self, ser::Error> {
+        let buffer = &header
+            .from_hex::<Vec<u8>>()
+            .map_err(|e| ser::Error::Custom(e.to_string()))? as &[u8];
+        let mut reader = Reader::new_with_coin_variant(buffer, coin_variant);
+        reader.read::<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 }
@@ -317,11 +356,35 @@ impl From<&'static str> for BlockHeader {
     fn from(s: &'static str) -> Self { deserialize(&s.from_hex::<Vec<u8>>().unwrap() as &[u8]).unwrap() }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<BlockHeader> for ExtBlockHeader {
+    fn from(header: BlockHeader) -> Self {
+        let prev_blockhash = ExtBlockHash::from_hash(header.previous_header_hash.to_sha256d());
+        let merkle_root = ExtTxMerkleNode::from_hash(header.merkle_root_hash.to_sha256d());
+        // note: H256 nonce is not supported for bitcoin, we will just set nonce to 0 in this case since this will never happen
+        let nonce = match header.nonce {
+            BlockHeaderNonce::U32(n) => n,
+            _ => 0,
+        };
+        ExtBlockHeader {
+            version: header.version as i32,
+            prev_blockhash,
+            merkle_root,
+            time: header.time,
+            bits: header.bits.into(),
+            nonce,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, AUX_POW_VERSION_DOGE, AUX_POW_VERSION_SYS,
-                       BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION, KAWPOW_VERSION, MTP_POW_VERSION, PROG_POW_SWITCH_TIME};
+    use super::ExtBlockHeader;
+    use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, AUX_POW_VERSION_DOGE, AUX_POW_VERSION_NMC,
+                       AUX_POW_VERSION_SYS, BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION, KAWPOW_VERSION, MTP_POW_VERSION,
+                       PROG_POW_SWITCH_TIME};
     use hex::FromHex;
+    use primitives::bytes::Bytes;
     use ser::{deserialize, serialize, serialize_list, CoinVariant, Error as ReaderError, Reader, Stream};
 
     #[test]
@@ -982,6 +1045,24 @@ mod tests {
         assert_eq!(serialized.take(), headers_bytes);
     }
 
+    #[test]
+    fn test_nmc_block_headers_serde_11() {
+        // NMC block headers
+        // start - #622807
+        // end - #622796
+        // Ref: https://chainz.cryptoid.info/nmc/block.dws?622807.htm
+        let headers_bytes: Bytes = include_str!("for_tests/nmc_block_headers_hex").into();
+        let headers_bytes = headers_bytes.as_slice();
+        let mut reader = Reader::new(headers_bytes);
+        let headers = reader.read_list::<BlockHeader>().unwrap();
+        for header in headers.iter() {
+            assert_eq!(header.version, AUX_POW_VERSION_NMC);
+            assert!(header.aux_pow.is_some());
+        }
+        let serialized = serialize_list(&headers);
+        assert_eq!(serialized.take(), headers_bytes);
+    }
+
     #[test]
     fn test_verus_block_headers_serde_11() {
         let headers_bytes: &[u8] = &[
@@ -2387,4 +2468,395 @@ mod tests {
         let serialized = serialize_list(&headers);
         assert_eq!(serialized.take(), headers_bytes);
     }
+
+    #[test]
+    fn test_btc_v4_block_headers_serde_11() {
+        // https://live.blockcypher.com/btc/block/0000000000000000097336f8439779072501753e2f48b8798c66188139f2d9cf/
+        let header = "04000000462a79dfa51b541648ee55df74cdc14b9ea7feb932e912060000000000000000374c1707a72691be50070bc5029d586e9200d672c6c3dfd29d267bf6b2b01b9e0ace395654a91118923bd9d5";
+        let header_bytes = &header.from_hex::<Vec<u8>>().unwrap() as &[u8];
+        let mut reader = Reader::new_with_coin_variant(header_bytes, CoinVariant::BTC);
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, 4);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
+
+    #[test]
+    fn test_btc_kow_pow_version_block_headers_serde_11() {
+        // https://live.blockcypher.com/btc/block/000000000000000006e35d6675fb0fec767a5f3b346261a5160f6e2a8d258070/
+        let header = "00000030af7e7389ca428b05d8902fcdc148e70974524d39cb56bc0100000000000000007ce0cd0c9c648d1b585d29b9ab23ebc987619d43925b3c768d7cb4bc097cfb821441c05614a107187aef1ee1";
+        let header_bytes = &header.from_hex::<Vec<u8>>().unwrap() as &[u8];
+        let mut reader = Reader::new_with_coin_variant(header_bytes, CoinVariant::BTC);
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, KAWPOW_VERSION);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
+
+    #[test]
+    fn test_from_blockheader_to_ext_blockheader() {
+        // https://live.blockcypher.com/btc/block/00000000000000000020cf2bdc6563fb25c424af588d5fb7223461e72715e4a9/
+        let header: BlockHeader = "0200000066720b99e07d284bd4fe67ff8c49a5db1dd8514fcdab610000000000000000007829844f4c3a41a537b3131ca992643eaa9d093b2383e4cdc060ad7dc548118751eb505ac1910018de19b302".into();
+        let ext_header = ExtBlockHeader::from(header.clone());
+        assert_eq!(
+            header.hash().reversed().to_string(),
+            ext_header.block_hash().to_string()
+        );
+    }
+
+    #[test]
+    fn test_ppc_block_headers() {
+        // PeerCoin block 659052 has version 4, but it doesn't use Zcash format
+        // https://chainz.cryptoid.info/ppc/block.dws?5a25b9f21589539d55e1ddf7c103fe8e466ce54f79054a0991943ba43651110f.htm
+        let serialized_headers = [
+            11, 3, 0, 0, 0, 170, 140, 242, 85, 87, 6, 202, 247, 184, 135, 155, 111, 244, 7, 250, 105, 75, 131, 174, 4,
+            68, 10, 106, 137, 90, 28, 4, 96, 181, 143, 104, 84, 73, 165, 123, 22, 178, 86, 249, 78, 33, 244, 192, 200,
+            2, 183, 125, 71, 54, 15, 96, 186, 191, 46, 215, 152, 60, 167, 94, 166, 182, 242, 94, 107, 43, 41, 162, 99,
+            91, 235, 12, 28, 0, 0, 0, 0, 3, 0, 0, 0, 60, 147, 16, 89, 128, 81, 253, 79, 190, 212, 190, 221, 218, 157,
+            229, 16, 245, 67, 18, 1, 66, 18, 223, 157, 166, 112, 129, 243, 52, 159, 49, 220, 232, 7, 49, 243, 79, 108,
+            233, 206, 255, 34, 84, 189, 216, 195, 24, 51, 82, 26, 120, 248, 241, 209, 149, 58, 197, 242, 247, 155, 4,
+            107, 232, 40, 3, 43, 162, 99, 110, 241, 12, 28, 0, 0, 0, 0, 3, 0, 244, 1, 61, 94, 238, 109, 77, 96, 208,
+            33, 232, 235, 188, 45, 37, 209, 123, 164, 70, 208, 9, 90, 255, 232, 106, 210, 145, 159, 90, 139, 194, 33,
+            48, 83, 36, 246, 212, 171, 113, 69, 163, 220, 189, 156, 20, 156, 170, 75, 50, 63, 213, 108, 106, 210, 166,
+            132, 73, 223, 30, 33, 34, 172, 100, 195, 96, 223, 111, 44, 162, 99, 42, 227, 0, 25, 104, 157, 248, 189, 3,
+            0, 0, 0, 158, 127, 227, 143, 52, 181, 82, 70, 130, 219, 103, 4, 12, 154, 127, 247, 44, 118, 114, 147, 175,
+            128, 70, 195, 0, 0, 0, 0, 0, 0, 0, 0, 25, 21, 28, 189, 23, 44, 136, 69, 26, 212, 166, 23, 21, 62, 51, 232,
+            27, 89, 127, 183, 48, 140, 50, 189, 16, 112, 169, 208, 253, 253, 226, 202, 121, 46, 162, 99, 7, 240, 12,
+            28, 0, 0, 0, 0, 3, 0, 0, 0, 119, 48, 233, 42, 176, 54, 147, 19, 154, 100, 166, 71, 125, 179, 17, 228, 237,
+            97, 166, 70, 104, 199, 231, 5, 213, 86, 190, 233, 96, 123, 71, 205, 89, 169, 110, 206, 201, 104, 90, 164,
+            242, 7, 167, 8, 97, 48, 192, 154, 91, 243, 131, 128, 49, 237, 132, 250, 244, 76, 87, 125, 244, 80, 89, 159,
+            140, 49, 162, 99, 40, 243, 12, 28, 0, 0, 0, 0, 3, 0, 0, 0, 96, 162, 150, 174, 178, 72, 227, 162, 16, 64,
+            16, 68, 13, 184, 177, 217, 9, 29, 8, 238, 106, 37, 230, 205, 211, 113, 255, 234, 160, 249, 57, 175, 165,
+            63, 215, 82, 194, 170, 131, 11, 206, 154, 94, 196, 150, 229, 231, 34, 194, 229, 69, 211, 54, 121, 189, 212,
+            80, 3, 36, 171, 133, 237, 170, 87, 15, 53, 162, 99, 52, 245, 12, 28, 0, 0, 0, 0, 3, 0, 0, 0, 70, 5, 106,
+            135, 225, 93, 205, 85, 243, 111, 204, 51, 76, 26, 188, 4, 66, 146, 196, 202, 107, 173, 22, 155, 40, 88,
+            250, 240, 228, 200, 72, 65, 152, 164, 228, 76, 113, 62, 236, 192, 36, 75, 188, 13, 230, 207, 213, 216, 249,
+            119, 94, 3, 149, 212, 25, 244, 160, 188, 121, 223, 96, 67, 70, 149, 45, 53, 162, 99, 122, 248, 12, 28, 0,
+            0, 0, 0, 3, 0, 0, 0, 251, 222, 167, 109, 77, 158, 185, 21, 151, 167, 84, 246, 45, 202, 184, 247, 174, 45,
+            233, 187, 120, 144, 135, 102, 230, 252, 243, 183, 211, 86, 136, 112, 121, 79, 60, 217, 208, 58, 95, 249,
+            230, 74, 182, 253, 231, 46, 206, 48, 11, 43, 251, 60, 166, 119, 192, 121, 226, 125, 113, 136, 150, 192, 4,
+            77, 231, 53, 162, 99, 57, 242, 12, 28, 0, 0, 0, 0, 3, 0, 0, 0, 222, 159, 64, 62, 117, 52, 203, 195, 40, 60,
+            183, 13, 66, 177, 106, 251, 41, 145, 128, 156, 141, 166, 128, 89, 161, 124, 153, 194, 1, 198, 153, 255, 43,
+            16, 241, 125, 110, 84, 130, 214, 2, 235, 242, 190, 229, 210, 21, 65, 114, 23, 255, 58, 252, 35, 107, 16,
+            194, 22, 98, 9, 125, 223, 242, 236, 74, 56, 162, 99, 176, 237, 12, 28, 0, 0, 0, 0, 3, 0, 0, 0, 216, 24,
+            144, 128, 67, 125, 152, 252, 140, 131, 29, 130, 32, 94, 202, 17, 221, 161, 250, 195, 8, 211, 36, 43, 144,
+            152, 52, 113, 155, 71, 225, 7, 78, 158, 15, 190, 68, 106, 75, 245, 149, 116, 42, 233, 64, 193, 140, 100,
+            117, 43, 232, 172, 120, 75, 39, 111, 184, 74, 205, 69, 246, 191, 7, 231, 251, 56, 162, 99, 206, 237, 12,
+            28, 0, 0, 0, 0, 4, 0, 0, 0, 233, 77, 140, 50, 73, 4, 68, 207, 105, 49, 245, 61, 211, 154, 138, 215, 242,
+            181, 232, 126, 200, 159, 164, 87, 64, 192, 115, 48, 54, 13, 132, 225, 158, 218, 135, 111, 168, 192, 173,
+            53, 161, 162, 247, 132, 187, 50, 235, 188, 174, 70, 185, 245, 211, 141, 119, 79, 178, 153, 254, 11, 140,
+            176, 126, 250, 146, 57, 162, 99, 45, 233, 12, 28, 0, 0, 0, 0,
+        ];
+        let mut reader = Reader::new_with_coin_variant(&serialized_headers, CoinVariant::PPC);
+        let headers = reader.read_list::<BlockHeader>().unwrap();
+        let serialized_from_deserialized = serialize_list(&headers);
+        assert_eq!(serialized_from_deserialized.take(), serialized_headers);
+    }
+
+    #[test]
+    fn test_rick_v1_block_header_des() {
+        // RICK Block header 0 bytes.
+        // https://rick.explorer.dexstats.info/block/027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71
+        let header_bytes = [
+            1, 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,
+            59, 163, 237, 253, 122, 123, 18, 178, 122, 199, 44, 62, 103, 118, 143, 97, 127, 200, 27, 195, 136, 138, 81,
+            50, 58, 159, 184, 170, 75, 30, 94, 74, 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, 41, 171, 95, 73, 15, 15, 15, 32, 11, 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, 253, 64, 5, 0, 13, 91, 167, 205, 165, 212, 115, 148,
+            114, 99, 191, 25, 66, 133, 49, 113, 121, 210, 176, 211, 7, 17, 156, 46, 124, 196, 189, 138, 196, 86, 240,
+            119, 75, 213, 43, 12, 217, 36, 155, 233, 212, 7, 24, 182, 57, 122, 76, 123, 189, 143, 43, 50, 114, 254,
+            210, 130, 60, 210, 175, 75, 209, 99, 34, 0, 186, 75, 247, 150, 114, 125, 99, 71, 178, 37, 246, 112, 242,
+            146, 52, 50, 116, 204, 53, 9, 148, 102, 245, 251, 95, 12, 209, 193, 5, 18, 27, 40, 33, 61, 21, 219, 46,
+            215, 189, 186, 73, 11, 76, 237, 198, 151, 66, 165, 123, 124, 37, 175, 36, 72, 94, 82, 58, 173, 187, 119,
+            160, 20, 79, 199, 111, 121, 239, 115, 189, 133, 48, 212, 43, 159, 59, 155, 237, 28, 19, 90, 209, 254, 21,
+            41, 35, 250, 254, 152, 249, 95, 118, 241, 97, 94, 100, 196, 171, 177, 19, 127, 76, 49, 178, 24, 186, 39,
+            130, 188, 21, 83, 71, 136, 221, 162, 204, 8, 160, 238, 41, 135, 200, 178, 127, 244, 27, 212, 227, 28, 213,
+            251, 86, 67, 223, 232, 98, 201, 160, 44, 169, 249, 12, 140, 81, 166, 103, 29, 104, 29, 4, 173, 71, 228,
+            181, 59, 21, 24, 212, 190, 250, 254, 254, 140, 173, 251, 145, 47, 61, 3, 5, 27, 30, 251, 241, 223, 227,
+            123, 86, 233, 58, 116, 29, 141, 253, 128, 213, 118, 202, 37, 11, 238, 85, 250, 177, 49, 31, 199, 179, 37,
+            89, 119, 85, 140, 221, 166, 247, 214, 248, 117, 48, 110, 67, 161, 68, 19, 250, 205, 174, 210, 244, 96, 147,
+            224, 239, 30, 143, 138, 150, 62, 22, 50, 220, 190, 235, 216, 228, 159, 209, 107, 87, 212, 155, 8, 249, 118,
+            45, 232, 145, 87, 198, 82, 51, 246, 12, 142, 56, 161, 245, 3, 164, 140, 85, 95, 142, 196, 93, 237, 236,
+            213, 116, 163, 118, 1, 50, 60, 39, 190, 89, 123, 149, 99, 67, 16, 127, 139, 216, 15, 58, 146, 90, 250, 243,
+            8, 17, 223, 131, 196, 2, 17, 107, 185, 193, 229, 35, 28, 112, 255, 248, 153, 167, 200, 47, 115, 201, 2,
+            186, 84, 218, 83, 204, 69, 155, 123, 241, 17, 61, 182, 92, 200, 246, 145, 77, 54, 24, 86, 14, 166, 154,
+            189, 19, 101, 143, 167, 182, 175, 146, 211, 116, 214, 236, 169, 82, 159, 139, 213, 101, 22, 110, 79, 203,
+            242, 168, 223, 179, 201, 182, 149, 57, 212, 210, 238, 46, 147, 33, 184, 91, 51, 25, 37, 223, 25, 89, 21,
+            242, 117, 118, 55, 194, 128, 94, 29, 65, 49, 225, 173, 158, 249, 188, 27, 177, 199, 50, 216, 219, 164, 115,
+            135, 22, 211, 81, 171, 48, 201, 150, 200, 101, 123, 171, 57, 86, 126, 227, 178, 156, 109, 5, 75, 113, 20,
+            149, 192, 213, 46, 28, 213, 216, 229, 91, 79, 15, 3, 37, 185, 115, 105, 40, 7, 85, 180, 106, 2, 175, 213,
+            75, 228, 221, 217, 247, 124, 34, 39, 43, 139, 187, 23, 255, 81, 24, 254, 219, 174, 37, 100, 82, 78, 121,
+            123, 210, 139, 95, 116, 247, 7, 157, 83, 44, 204, 5, 152, 7, 152, 159, 148, 210, 103, 244, 126, 114, 75,
+            63, 30, 207, 224, 14, 201, 230, 84, 28, 150, 16, 128, 216, 137, 18, 81, 184, 75, 68, 128, 188, 41, 47, 106,
+            24, 11, 234, 8, 159, 239, 91, 189, 165, 110, 30, 65, 57, 13, 124, 14, 133, 186, 14, 245, 48, 247, 23, 116,
+            19, 72, 26, 34, 100, 101, 163, 110, 246, 175, 225, 226, 188, 166, 157, 32, 120, 113, 43, 57, 18, 187, 161,
+            169, 155, 31, 191, 240, 211, 85, 214, 255, 231, 38, 210, 187, 111, 188, 16, 60, 74, 197, 117, 110, 91, 238,
+            110, 71, 225, 116, 36, 235, 203, 241, 182, 61, 140, 185, 12, 226, 228, 1, 152, 180, 244, 25, 134, 137, 218,
+            234, 37, 67, 7, 229, 42, 37, 86, 47, 76, 20, 85, 52, 15, 15, 254, 177, 15, 157, 142, 145, 71, 117, 227,
+            125, 14, 220, 160, 25, 251, 27, 156, 110, 248, 18, 85, 237, 134, 188, 81, 197, 57, 30, 5, 145, 72, 15, 102,
+            226, 216, 140, 95, 79, 215, 39, 118, 151, 150, 134, 86, 169, 177, 19, 171, 151, 248, 116, 253, 213, 242,
+            70, 94, 85, 89, 83, 62, 1, 186, 19, 239, 74, 143, 122, 33, 208, 44, 48, 200, 222, 214, 142, 140, 84, 96,
+            58, 185, 200, 8, 78, 246, 217, 235, 78, 146, 199, 91, 7, 133, 57, 226, 174, 120, 110, 186, 182, 218, 183,
+            58, 9, 224, 170, 154, 197, 117, 188, 239, 178, 158, 147, 10, 230, 86, 229, 139, 203, 81, 63, 126, 60, 23,
+            224, 121, 220, 228, 240, 91, 93, 188, 24, 194, 168, 114, 178, 37, 9, 116, 14, 190, 106, 57, 3, 224, 10,
+            209, 171, 197, 80, 118, 68, 24, 98, 100, 63, 147, 96, 110, 61, 195, 94, 141, 159, 44, 174, 243, 238, 107,
+            225, 77, 81, 59, 46, 6, 43, 33, 208, 6, 29, 227, 189, 86, 136, 23, 19, 161, 165, 193, 127, 90, 206, 5, 225,
+            236, 9, 218, 83, 249, 148, 66, 223, 23, 90, 73, 189, 21, 74, 169, 110, 73, 73, 222, 205, 82, 254, 215, 156,
+            207, 124, 203, 206, 50, 148, 20, 25, 195, 20, 227, 116, 228, 163, 150, 172, 85, 62, 23, 181, 52, 3, 54,
+            161, 162, 92, 34, 249, 228, 42, 36, 59, 165, 64, 68, 80, 182, 80, 172, 252, 130, 106, 110, 67, 41, 113,
+            172, 231, 118, 225, 87, 25, 81, 94, 22, 52, 206, 185, 164, 163, 80, 97, 182, 104, 199, 73, 152, 211, 223,
+            181, 130, 127, 98, 56, 236, 1, 83, 119, 230, 249, 201, 79, 56, 16, 135, 104, 207, 110, 92, 139, 19, 46, 3,
+            3, 251, 90, 32, 3, 104, 248, 69, 173, 157, 70, 52, 48, 53, 166, 255, 148, 3, 29, 248, 216, 48, 148, 21,
+            187, 63, 108, 213, 237, 233, 193, 53, 253, 171, 204, 3, 5, 153, 133, 141, 128, 60, 15, 133, 190, 118, 97,
+            200, 137, 132, 216, 143, 170, 61, 38, 251, 14, 154, 172, 0, 86, 165, 63, 27, 93, 11, 174, 215, 19, 200, 83,
+            196, 162, 114, 104, 105, 160, 161, 36, 168, 165, 187, 192, 252, 14, 248, 12, 138, 228, 203, 83, 99, 106,
+            160, 37, 3, 184, 106, 30, 185, 131, 111, 204, 37, 152, 35, 226, 105, 45, 146, 29, 136, 225, 255, 193, 230,
+            203, 43, 222, 67, 147, 156, 235, 63, 50, 166, 17, 104, 111, 83, 159, 143, 124, 159, 11, 240, 3, 129, 247,
+            67, 96, 125, 64, 150, 15, 6, 211, 71, 209, 205, 138, 200, 165, 25, 105, 194, 94, 55, 21, 14, 253, 247, 170,
+            76, 32, 55, 162, 253, 5, 22, 251, 68, 69, 37, 171, 21, 122, 14, 208, 167, 65, 43, 47, 166, 155, 33, 127,
+            227, 151, 38, 49, 83, 120, 44, 15, 100, 53, 31, 189, 242, 103, 143, 160, 220, 133, 105, 145, 45, 205, 142,
+            60, 202, 211, 143, 52, 242, 59, 187, 206, 20, 198, 162, 106, 194, 73, 17, 179, 8, 184, 44, 126, 67, 6, 45,
+            24, 11, 174, 172, 75, 167, 21, 56, 88, 54, 92, 114, 198, 61, 207, 95, 106, 91, 8, 7, 11, 115, 10, 219, 1,
+            122, 234, 233, 37, 183, 208, 67, 153, 121, 226, 103, 159, 69, 237, 47, 37, 167, 237, 207, 210, 251, 119,
+            168, 121, 70, 48, 40, 92, 203, 10, 7, 31, 92, 206, 65, 11, 70, 219, 249, 117, 11, 3, 84, 170, 232, 182, 85,
+            116, 80, 28, 198, 158, 251, 91, 106, 67, 68, 64, 116, 254, 225, 22, 100, 27, 178, 157, 165, 108, 43, 74,
+            127, 69, 105, 145, 252, 146, 178,
+        ];
+        let mut reader = Reader::new_with_coin_variant(&header_bytes, "RICK".into());
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, 1);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
+
+    #[test]
+    fn test_rick_v4_block_header_des() {
+        // RICK Block header 1 bytes.
+        // https://rick.explorer.dexstats.info/block/027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71
+        let header_bytes = [
+            4, 0, 0, 0, 113, 174, 170, 125, 251, 92, 108, 245, 151, 120, 50, 174, 190, 161, 191, 99, 10, 109, 72, 43,
+            70, 70, 16, 170, 18, 91, 166, 195, 88, 55, 126, 2, 194, 29, 71, 248, 246, 242, 7, 112, 124, 147, 83, 57,
+            42, 168, 11, 219, 126, 193, 43, 185, 130, 203, 144, 55, 29, 176, 71, 96, 191, 113, 242, 146, 251, 194, 244,
+            48, 12, 1, 240, 183, 130, 13, 0, 227, 52, 124, 141, 164, 238, 97, 70, 116, 55, 108, 188, 69, 53, 157, 170,
+            84, 249, 181, 73, 62, 77, 26, 64, 93, 15, 15, 15, 32, 3, 0, 126, 43, 89, 14, 131, 200, 63, 244, 88, 32,
+            110, 251, 196, 31, 34, 78, 14, 187, 253, 190, 176, 188, 22, 99, 91, 146, 255, 244, 0, 0, 253, 64, 5, 0, 12,
+            186, 229, 59, 82, 42, 159, 171, 130, 1, 115, 22, 85, 192, 57, 113, 206, 186, 138, 31, 36, 22, 28, 176, 192,
+            16, 57, 183, 3, 138, 197, 18, 222, 93, 10, 250, 1, 51, 217, 78, 106, 3, 118, 233, 158, 30, 14, 236, 18,
+            177, 236, 240, 153, 219, 121, 174, 108, 139, 17, 165, 186, 202, 24, 121, 228, 130, 173, 87, 175, 197, 87,
+            129, 52, 171, 140, 105, 113, 69, 71, 104, 87, 191, 67, 0, 16, 171, 80, 86, 154, 131, 153, 191, 215, 102,
+            28, 59, 244, 71, 185, 183, 220, 80, 8, 203, 14, 21, 60, 152, 170, 116, 45, 13, 226, 75, 227, 207, 92, 113,
+            155, 221, 248, 219, 55, 35, 18, 1, 113, 143, 5, 125, 200, 23, 248, 108, 210, 241, 104, 253, 104, 254, 213,
+            238, 111, 211, 135, 46, 16, 122, 250, 202, 163, 20, 61, 109, 161, 183, 50, 48, 11, 37, 182, 197, 255, 201,
+            251, 126, 229, 1, 188, 206, 238, 28, 143, 117, 165, 239, 142, 65, 145, 13, 34, 21, 252, 184, 27, 24, 97,
+            87, 36, 107, 2, 13, 244, 84, 242, 183, 75, 142, 68, 25, 25, 221, 75, 185, 44, 191, 142, 143, 78, 9, 63,
+            119, 107, 99, 130, 132, 94, 39, 41, 16, 175, 203, 106, 133, 48, 183, 160, 73, 30, 79, 12, 141, 177, 19,
+            237, 108, 68, 79, 232, 83, 213, 174, 193, 231, 164, 134, 244, 133, 187, 167, 92, 18, 119, 141, 220, 191,
+            147, 51, 125, 27, 148, 213, 136, 222, 55, 90, 174, 185, 89, 60, 22, 117, 24, 202, 63, 40, 155, 157, 6, 111,
+            136, 131, 65, 250, 107, 48, 167, 133, 180, 182, 150, 17, 5, 40, 199, 190, 14, 225, 23, 219, 211, 50, 237,
+            214, 53, 71, 223, 93, 157, 194, 206, 51, 192, 6, 41, 236, 31, 184, 74, 252, 69, 85, 234, 246, 36, 213, 218,
+            93, 76, 125, 226, 255, 222, 17, 243, 3, 57, 7, 16, 150, 9, 6, 137, 238, 44, 144, 191, 7, 14, 164, 200, 180,
+            60, 76, 210, 232, 11, 249, 251, 69, 151, 117, 29, 31, 184, 23, 247, 95, 184, 82, 49, 234, 165, 188, 152,
+            238, 195, 24, 74, 124, 137, 198, 213, 191, 197, 225, 2, 101, 213, 130, 195, 13, 189, 148, 38, 90, 232, 107,
+            36, 63, 139, 62, 156, 17, 11, 11, 173, 236, 50, 182, 69, 121, 53, 210, 115, 72, 253, 14, 152, 6, 155, 76,
+            67, 255, 67, 149, 128, 197, 132, 162, 223, 111, 245, 221, 149, 222, 74, 112, 2, 31, 28, 181, 57, 232, 68,
+            233, 247, 105, 181, 20, 51, 21, 181, 124, 65, 38, 86, 159, 28, 115, 124, 9, 103, 244, 209, 251, 230, 24,
+            109, 182, 129, 119, 181, 228, 244, 238, 241, 239, 153, 59, 120, 53, 23, 151, 227, 111, 10, 71, 100, 67,
+            176, 93, 55, 54, 218, 210, 54, 54, 253, 150, 94, 121, 124, 3, 252, 232, 111, 52, 98, 168, 145, 158, 14,
+            183, 84, 23, 237, 13, 170, 233, 255, 249, 248, 231, 4, 167, 22, 124, 181, 171, 43, 47, 116, 44, 161, 25,
+            26, 95, 59, 216, 133, 129, 113, 250, 77, 25, 87, 114, 170, 27, 70, 104, 137, 72, 244, 2, 25, 209, 204, 234,
+            140, 236, 217, 212, 63, 206, 69, 45, 226, 206, 125, 27, 6, 237, 118, 31, 9, 99, 57, 217, 13, 214, 118, 6,
+            125, 244, 73, 6, 169, 55, 35, 85, 15, 220, 34, 221, 112, 195, 139, 180, 219, 123, 217, 123, 95, 159, 249,
+            242, 8, 209, 222, 29, 162, 160, 218, 239, 224, 88, 194, 52, 86, 60, 194, 85, 158, 245, 253, 18, 90, 19,
+            184, 68, 182, 103, 151, 247, 119, 215, 5, 117, 170, 251, 179, 8, 237, 135, 99, 78, 162, 173, 35, 125, 101,
+            132, 238, 174, 102, 7, 232, 39, 52, 29, 193, 250, 243, 1, 201, 138, 175, 164, 24, 8, 1, 142, 4, 149, 90,
+            102, 59, 195, 93, 198, 210, 221, 254, 87, 85, 217, 131, 191, 192, 246, 17, 84, 173, 114, 88, 199, 243, 189,
+            215, 161, 195, 70, 49, 125, 176, 1, 108, 122, 59, 132, 95, 24, 6, 9, 222, 199, 222, 181, 107, 22, 229, 147,
+            93, 170, 240, 23, 93, 174, 184, 15, 182, 122, 32, 32, 146, 149, 173, 19, 62, 107, 126, 206, 52, 155, 58,
+            248, 110, 133, 154, 225, 143, 73, 199, 12, 21, 239, 50, 143, 9, 13, 164, 106, 237, 217, 105, 247, 207, 237,
+            166, 151, 124, 186, 214, 47, 36, 152, 79, 51, 74, 91, 178, 93, 5, 222, 132, 103, 172, 87, 134, 59, 68, 62,
+            159, 94, 91, 24, 32, 154, 35, 11, 12, 247, 144, 188, 247, 209, 149, 26, 155, 18, 13, 220, 124, 220, 213,
+            24, 46, 50, 221, 115, 2, 208, 79, 123, 18, 173, 115, 106, 244, 59, 134, 46, 157, 203, 85, 52, 23, 13, 130,
+            57, 121, 108, 232, 231, 63, 162, 70, 244, 78, 130, 239, 59, 253, 82, 92, 190, 241, 108, 111, 226, 6, 239,
+            48, 166, 25, 139, 168, 251, 137, 94, 143, 110, 43, 79, 48, 167, 92, 235, 14, 55, 252, 63, 255, 43, 149, 16,
+            175, 239, 160, 244, 49, 234, 93, 59, 185, 86, 100, 82, 201, 23, 64, 247, 125, 245, 94, 21, 43, 111, 39,
+            160, 180, 255, 21, 73, 122, 42, 125, 50, 190, 83, 83, 28, 43, 121, 114, 213, 94, 45, 11, 8, 9, 75, 68, 74,
+            234, 153, 175, 70, 254, 123, 238, 7, 50, 22, 151, 217, 30, 153, 249, 91, 203, 122, 203, 44, 182, 115, 255,
+            27, 82, 38, 157, 51, 59, 31, 159, 62, 22, 249, 87, 105, 134, 203, 141, 162, 126, 112, 153, 133, 83, 90,
+            177, 188, 88, 126, 36, 93, 7, 218, 138, 218, 191, 147, 4, 118, 135, 155, 87, 118, 211, 35, 150, 189, 30,
+            122, 165, 8, 213, 109, 193, 178, 156, 180, 25, 251, 229, 116, 217, 55, 102, 233, 65, 162, 82, 208, 134, 76,
+            85, 62, 223, 110, 237, 233, 179, 149, 244, 92, 203, 197, 51, 114, 135, 31, 74, 209, 92, 32, 27, 53, 195,
+            134, 58, 203, 172, 250, 35, 205, 8, 197, 125, 167, 229, 61, 22, 200, 163, 60, 178, 21, 73, 9, 11, 55, 15,
+            147, 239, 85, 237, 141, 151, 111, 101, 75, 24, 166, 57, 81, 222, 190, 137, 9, 242, 157, 142, 205, 237, 49,
+            155, 169, 140, 130, 96, 102, 29, 27, 249, 61, 166, 84, 213, 104, 16, 100, 187, 68, 88, 172, 116, 53, 170,
+            161, 195, 253, 149, 211, 153, 129, 41, 50, 144, 214, 85, 20, 251, 15, 42, 108, 237, 156, 15, 201, 109, 50,
+            136, 244, 197, 147, 99, 63, 135, 93, 52, 100, 27, 125, 199, 228, 105, 122, 130, 29, 229, 110, 117, 26, 210,
+            202, 81, 199, 35, 192, 155, 80, 238, 10, 49, 6, 53, 124, 93, 150, 106, 242, 15, 234, 106, 255, 215, 162,
+            203, 44, 99, 186, 73, 24, 19, 14, 130, 5, 243, 226, 211, 87, 164, 100, 129, 254, 123, 241, 245, 133, 160,
+            99, 111, 88, 212, 12, 136, 8, 219, 131, 22, 10, 69, 22, 69, 193, 163, 123, 44, 152, 216, 241, 107, 211, 83,
+            110, 95, 107, 251, 242, 119, 229, 106, 201, 202, 244, 168, 236, 66, 85, 220, 14, 63, 3, 154, 31, 138, 11,
+            221, 112, 246, 74, 19, 37, 121, 215, 57, 68, 75, 52, 105, 144, 206, 173, 67, 183, 54, 6, 17, 182, 39, 164,
+            14, 198, 181, 134, 94, 192, 35, 12, 213, 100, 205, 226, 173, 186, 218, 40, 42, 12, 251, 180, 148, 18, 18,
+            177, 201, 167, 14, 130, 112, 23, 34, 136, 129, 229, 62, 122, 148, 56, 32, 94, 62, 254, 254, 207, 15, 102,
+            197, 30, 99, 165, 167, 45, 90, 134, 148, 30, 190, 180, 68,
+        ];
+        let mut reader = Reader::new_with_coin_variant(&header_bytes, "RICK".into());
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, 4);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
+
+    #[test]
+    fn test_morty_v1_block_header_des() {
+        // MORTY Block header 0 bytes.
+        // https://morty.explorer.dexstats.info/block/027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71
+        let header_bytes = [
+            1, 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,
+            59, 163, 237, 253, 122, 123, 18, 178, 122, 199, 44, 62, 103, 118, 143, 97, 127, 200, 27, 195, 136, 138, 81,
+            50, 58, 159, 184, 170, 75, 30, 94, 74, 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, 41, 171, 95, 73, 15, 15, 15, 32, 11, 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, 253, 64, 5, 0, 13, 91, 167, 205, 165, 212, 115, 148,
+            114, 99, 191, 25, 66, 133, 49, 113, 121, 210, 176, 211, 7, 17, 156, 46, 124, 196, 189, 138, 196, 86, 240,
+            119, 75, 213, 43, 12, 217, 36, 155, 233, 212, 7, 24, 182, 57, 122, 76, 123, 189, 143, 43, 50, 114, 254,
+            210, 130, 60, 210, 175, 75, 209, 99, 34, 0, 186, 75, 247, 150, 114, 125, 99, 71, 178, 37, 246, 112, 242,
+            146, 52, 50, 116, 204, 53, 9, 148, 102, 245, 251, 95, 12, 209, 193, 5, 18, 27, 40, 33, 61, 21, 219, 46,
+            215, 189, 186, 73, 11, 76, 237, 198, 151, 66, 165, 123, 124, 37, 175, 36, 72, 94, 82, 58, 173, 187, 119,
+            160, 20, 79, 199, 111, 121, 239, 115, 189, 133, 48, 212, 43, 159, 59, 155, 237, 28, 19, 90, 209, 254, 21,
+            41, 35, 250, 254, 152, 249, 95, 118, 241, 97, 94, 100, 196, 171, 177, 19, 127, 76, 49, 178, 24, 186, 39,
+            130, 188, 21, 83, 71, 136, 221, 162, 204, 8, 160, 238, 41, 135, 200, 178, 127, 244, 27, 212, 227, 28, 213,
+            251, 86, 67, 223, 232, 98, 201, 160, 44, 169, 249, 12, 140, 81, 166, 103, 29, 104, 29, 4, 173, 71, 228,
+            181, 59, 21, 24, 212, 190, 250, 254, 254, 140, 173, 251, 145, 47, 61, 3, 5, 27, 30, 251, 241, 223, 227,
+            123, 86, 233, 58, 116, 29, 141, 253, 128, 213, 118, 202, 37, 11, 238, 85, 250, 177, 49, 31, 199, 179, 37,
+            89, 119, 85, 140, 221, 166, 247, 214, 248, 117, 48, 110, 67, 161, 68, 19, 250, 205, 174, 210, 244, 96, 147,
+            224, 239, 30, 143, 138, 150, 62, 22, 50, 220, 190, 235, 216, 228, 159, 209, 107, 87, 212, 155, 8, 249, 118,
+            45, 232, 145, 87, 198, 82, 51, 246, 12, 142, 56, 161, 245, 3, 164, 140, 85, 95, 142, 196, 93, 237, 236,
+            213, 116, 163, 118, 1, 50, 60, 39, 190, 89, 123, 149, 99, 67, 16, 127, 139, 216, 15, 58, 146, 90, 250, 243,
+            8, 17, 223, 131, 196, 2, 17, 107, 185, 193, 229, 35, 28, 112, 255, 248, 153, 167, 200, 47, 115, 201, 2,
+            186, 84, 218, 83, 204, 69, 155, 123, 241, 17, 61, 182, 92, 200, 246, 145, 77, 54, 24, 86, 14, 166, 154,
+            189, 19, 101, 143, 167, 182, 175, 146, 211, 116, 214, 236, 169, 82, 159, 139, 213, 101, 22, 110, 79, 203,
+            242, 168, 223, 179, 201, 182, 149, 57, 212, 210, 238, 46, 147, 33, 184, 91, 51, 25, 37, 223, 25, 89, 21,
+            242, 117, 118, 55, 194, 128, 94, 29, 65, 49, 225, 173, 158, 249, 188, 27, 177, 199, 50, 216, 219, 164, 115,
+            135, 22, 211, 81, 171, 48, 201, 150, 200, 101, 123, 171, 57, 86, 126, 227, 178, 156, 109, 5, 75, 113, 20,
+            149, 192, 213, 46, 28, 213, 216, 229, 91, 79, 15, 3, 37, 185, 115, 105, 40, 7, 85, 180, 106, 2, 175, 213,
+            75, 228, 221, 217, 247, 124, 34, 39, 43, 139, 187, 23, 255, 81, 24, 254, 219, 174, 37, 100, 82, 78, 121,
+            123, 210, 139, 95, 116, 247, 7, 157, 83, 44, 204, 5, 152, 7, 152, 159, 148, 210, 103, 244, 126, 114, 75,
+            63, 30, 207, 224, 14, 201, 230, 84, 28, 150, 16, 128, 216, 137, 18, 81, 184, 75, 68, 128, 188, 41, 47, 106,
+            24, 11, 234, 8, 159, 239, 91, 189, 165, 110, 30, 65, 57, 13, 124, 14, 133, 186, 14, 245, 48, 247, 23, 116,
+            19, 72, 26, 34, 100, 101, 163, 110, 246, 175, 225, 226, 188, 166, 157, 32, 120, 113, 43, 57, 18, 187, 161,
+            169, 155, 31, 191, 240, 211, 85, 214, 255, 231, 38, 210, 187, 111, 188, 16, 60, 74, 197, 117, 110, 91, 238,
+            110, 71, 225, 116, 36, 235, 203, 241, 182, 61, 140, 185, 12, 226, 228, 1, 152, 180, 244, 25, 134, 137, 218,
+            234, 37, 67, 7, 229, 42, 37, 86, 47, 76, 20, 85, 52, 15, 15, 254, 177, 15, 157, 142, 145, 71, 117, 227,
+            125, 14, 220, 160, 25, 251, 27, 156, 110, 248, 18, 85, 237, 134, 188, 81, 197, 57, 30, 5, 145, 72, 15, 102,
+            226, 216, 140, 95, 79, 215, 39, 118, 151, 150, 134, 86, 169, 177, 19, 171, 151, 248, 116, 253, 213, 242,
+            70, 94, 85, 89, 83, 62, 1, 186, 19, 239, 74, 143, 122, 33, 208, 44, 48, 200, 222, 214, 142, 140, 84, 96,
+            58, 185, 200, 8, 78, 246, 217, 235, 78, 146, 199, 91, 7, 133, 57, 226, 174, 120, 110, 186, 182, 218, 183,
+            58, 9, 224, 170, 154, 197, 117, 188, 239, 178, 158, 147, 10, 230, 86, 229, 139, 203, 81, 63, 126, 60, 23,
+            224, 121, 220, 228, 240, 91, 93, 188, 24, 194, 168, 114, 178, 37, 9, 116, 14, 190, 106, 57, 3, 224, 10,
+            209, 171, 197, 80, 118, 68, 24, 98, 100, 63, 147, 96, 110, 61, 195, 94, 141, 159, 44, 174, 243, 238, 107,
+            225, 77, 81, 59, 46, 6, 43, 33, 208, 6, 29, 227, 189, 86, 136, 23, 19, 161, 165, 193, 127, 90, 206, 5, 225,
+            236, 9, 218, 83, 249, 148, 66, 223, 23, 90, 73, 189, 21, 74, 169, 110, 73, 73, 222, 205, 82, 254, 215, 156,
+            207, 124, 203, 206, 50, 148, 20, 25, 195, 20, 227, 116, 228, 163, 150, 172, 85, 62, 23, 181, 52, 3, 54,
+            161, 162, 92, 34, 249, 228, 42, 36, 59, 165, 64, 68, 80, 182, 80, 172, 252, 130, 106, 110, 67, 41, 113,
+            172, 231, 118, 225, 87, 25, 81, 94, 22, 52, 206, 185, 164, 163, 80, 97, 182, 104, 199, 73, 152, 211, 223,
+            181, 130, 127, 98, 56, 236, 1, 83, 119, 230, 249, 201, 79, 56, 16, 135, 104, 207, 110, 92, 139, 19, 46, 3,
+            3, 251, 90, 32, 3, 104, 248, 69, 173, 157, 70, 52, 48, 53, 166, 255, 148, 3, 29, 248, 216, 48, 148, 21,
+            187, 63, 108, 213, 237, 233, 193, 53, 253, 171, 204, 3, 5, 153, 133, 141, 128, 60, 15, 133, 190, 118, 97,
+            200, 137, 132, 216, 143, 170, 61, 38, 251, 14, 154, 172, 0, 86, 165, 63, 27, 93, 11, 174, 215, 19, 200, 83,
+            196, 162, 114, 104, 105, 160, 161, 36, 168, 165, 187, 192, 252, 14, 248, 12, 138, 228, 203, 83, 99, 106,
+            160, 37, 3, 184, 106, 30, 185, 131, 111, 204, 37, 152, 35, 226, 105, 45, 146, 29, 136, 225, 255, 193, 230,
+            203, 43, 222, 67, 147, 156, 235, 63, 50, 166, 17, 104, 111, 83, 159, 143, 124, 159, 11, 240, 3, 129, 247,
+            67, 96, 125, 64, 150, 15, 6, 211, 71, 209, 205, 138, 200, 165, 25, 105, 194, 94, 55, 21, 14, 253, 247, 170,
+            76, 32, 55, 162, 253, 5, 22, 251, 68, 69, 37, 171, 21, 122, 14, 208, 167, 65, 43, 47, 166, 155, 33, 127,
+            227, 151, 38, 49, 83, 120, 44, 15, 100, 53, 31, 189, 242, 103, 143, 160, 220, 133, 105, 145, 45, 205, 142,
+            60, 202, 211, 143, 52, 242, 59, 187, 206, 20, 198, 162, 106, 194, 73, 17, 179, 8, 184, 44, 126, 67, 6, 45,
+            24, 11, 174, 172, 75, 167, 21, 56, 88, 54, 92, 114, 198, 61, 207, 95, 106, 91, 8, 7, 11, 115, 10, 219, 1,
+            122, 234, 233, 37, 183, 208, 67, 153, 121, 226, 103, 159, 69, 237, 47, 37, 167, 237, 207, 210, 251, 119,
+            168, 121, 70, 48, 40, 92, 203, 10, 7, 31, 92, 206, 65, 11, 70, 219, 249, 117, 11, 3, 84, 170, 232, 182, 85,
+            116, 80, 28, 198, 158, 251, 91, 106, 67, 68, 64, 116, 254, 225, 22, 100, 27, 178, 157, 165, 108, 43, 74,
+            127, 69, 105, 145, 252, 146, 178,
+        ];
+        let mut reader = Reader::new_with_coin_variant(&header_bytes, "MORTY".into());
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, 1);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
+
+    #[test]
+    fn test_morty_v4_block_header_des() {
+        // MORTY Block header 0 bytes.
+        // https://morty.explorer.dexstats.info/block/027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71
+        let header_bytes = [
+            4, 0, 0, 0, 113, 174, 170, 125, 251, 92, 108, 245, 151, 120, 50, 174, 190, 161, 191, 99, 10, 109, 72, 43,
+            70, 70, 16, 170, 18, 91, 166, 195, 88, 55, 126, 2, 151, 199, 90, 42, 33, 212, 194, 188, 209, 116, 36, 128,
+            91, 2, 174, 229, 185, 93, 183, 2, 179, 206, 206, 175, 86, 80, 11, 96, 37, 196, 9, 164, 251, 194, 244, 48,
+            12, 1, 240, 183, 130, 13, 0, 227, 52, 124, 141, 164, 238, 97, 70, 116, 55, 108, 188, 69, 53, 157, 170, 84,
+            249, 181, 73, 62, 9, 28, 64, 93, 15, 15, 15, 32, 14, 0, 253, 84, 160, 204, 64, 38, 208, 250, 142, 84, 16,
+            96, 7, 47, 42, 82, 199, 204, 159, 177, 5, 61, 174, 22, 236, 47, 153, 181, 0, 0, 253, 64, 5, 0, 120, 233,
+            249, 24, 200, 221, 174, 207, 128, 194, 81, 54, 187, 214, 14, 169, 15, 56, 52, 72, 59, 218, 242, 180, 5,
+            181, 105, 111, 216, 85, 87, 238, 68, 91, 32, 187, 117, 194, 94, 221, 176, 36, 56, 100, 163, 232, 91, 25,
+            200, 226, 110, 166, 99, 252, 208, 200, 219, 139, 38, 220, 253, 33, 64, 148, 229, 11, 33, 97, 160, 165, 47,
+            58, 148, 106, 112, 172, 177, 43, 38, 140, 251, 17, 115, 5, 143, 218, 114, 172, 144, 228, 162, 209, 154,
+            160, 151, 45, 145, 60, 6, 99, 48, 55, 176, 198, 31, 100, 235, 237, 214, 101, 10, 175, 50, 87, 71, 81, 76,
+            96, 247, 251, 30, 92, 255, 82, 244, 14, 95, 109, 79, 96, 225, 112, 253, 165, 16, 97, 146, 109, 220, 81,
+            234, 156, 158, 54, 68, 58, 22, 252, 90, 161, 18, 174, 179, 233, 125, 59, 243, 84, 30, 39, 86, 74, 64, 214,
+            54, 192, 250, 8, 191, 189, 121, 70, 207, 204, 176, 187, 252, 80, 252, 163, 235, 190, 96, 96, 125, 213, 246,
+            210, 9, 37, 230, 27, 125, 27, 88, 11, 144, 215, 197, 92, 189, 75, 172, 150, 237, 15, 120, 223, 247, 17,
+            151, 63, 235, 148, 206, 253, 223, 97, 194, 72, 67, 140, 241, 129, 35, 117, 135, 30, 42, 141, 44, 226, 34,
+            145, 115, 114, 210, 17, 184, 178, 66, 240, 66, 252, 236, 208, 204, 104, 214, 132, 15, 33, 209, 97, 116,
+            231, 53, 189, 21, 250, 70, 178, 235, 235, 248, 252, 197, 85, 118, 241, 66, 200, 69, 17, 196, 179, 100, 90,
+            112, 247, 220, 19, 120, 10, 245, 236, 93, 98, 249, 129, 186, 154, 85, 42, 56, 198, 221, 179, 77, 199, 165,
+            192, 60, 116, 202, 106, 190, 159, 50, 94, 246, 219, 141, 162, 83, 216, 59, 75, 110, 85, 31, 31, 81, 53,
+            214, 10, 3, 202, 54, 121, 234, 50, 126, 148, 125, 9, 161, 137, 3, 164, 67, 250, 0, 117, 118, 17, 80, 85,
+            220, 251, 196, 217, 141, 23, 124, 159, 10, 46, 44, 122, 31, 99, 188, 97, 33, 191, 161, 27, 51, 148, 157,
+            208, 175, 102, 148, 152, 100, 11, 205, 241, 189, 151, 135, 53, 137, 39, 238, 180, 45, 178, 93, 108, 130,
+            105, 75, 217, 62, 215, 70, 61, 51, 21, 171, 248, 166, 27, 205, 111, 117, 36, 184, 73, 187, 230, 11, 244,
+            31, 23, 175, 20, 178, 235, 182, 224, 89, 8, 169, 87, 175, 51, 74, 37, 170, 10, 1, 19, 101, 148, 241, 89,
+            33, 174, 43, 137, 187, 215, 223, 147, 248, 67, 214, 180, 40, 244, 178, 163, 134, 131, 220, 91, 151, 24,
+            169, 86, 244, 179, 83, 220, 125, 180, 69, 162, 216, 32, 207, 65, 36, 219, 176, 231, 48, 154, 24, 217, 154,
+            215, 178, 29, 201, 9, 239, 49, 100, 25, 220, 234, 178, 85, 62, 38, 154, 213, 35, 12, 156, 98, 15, 33, 71,
+            42, 64, 65, 178, 100, 202, 55, 204, 100, 241, 224, 46, 95, 21, 177, 63, 119, 247, 224, 113, 146, 172, 171,
+            103, 71, 68, 138, 67, 84, 122, 250, 236, 172, 125, 194, 90, 23, 57, 71, 107, 17, 177, 154, 15, 192, 175,
+            66, 46, 109, 110, 110, 182, 111, 61, 244, 182, 27, 96, 29, 101, 39, 240, 95, 30, 101, 43, 83, 247, 122,
+            194, 89, 148, 146, 150, 180, 218, 250, 196, 13, 113, 92, 174, 0, 45, 101, 35, 209, 254, 7, 94, 240, 253,
+            11, 250, 190, 54, 125, 88, 67, 57, 32, 109, 228, 186, 175, 45, 119, 177, 181, 51, 255, 66, 225, 252, 73,
+            98, 178, 123, 82, 18, 13, 193, 84, 229, 197, 209, 56, 25, 70, 4, 40, 142, 243, 235, 170, 138, 178, 152,
+            153, 123, 88, 23, 115, 205, 215, 50, 220, 204, 95, 135, 5, 193, 219, 145, 171, 182, 234, 9, 181, 147, 180,
+            42, 0, 161, 173, 225, 52, 71, 243, 170, 128, 252, 178, 249, 149, 54, 62, 238, 126, 25, 29, 114, 30, 30,
+            217, 86, 254, 58, 164, 125, 111, 95, 220, 114, 126, 172, 243, 154, 165, 143, 117, 187, 180, 3, 11, 45, 196,
+            149, 179, 117, 164, 201, 238, 197, 164, 56, 215, 104, 109, 25, 229, 64, 153, 183, 232, 28, 67, 33, 243, 35,
+            78, 222, 254, 241, 203, 193, 217, 53, 162, 127, 237, 231, 179, 156, 212, 198, 1, 12, 212, 199, 26, 243, 41,
+            229, 165, 107, 150, 218, 71, 92, 209, 171, 29, 36, 157, 219, 179, 29, 93, 52, 244, 170, 158, 83, 111, 52,
+            228, 194, 25, 93, 249, 6, 91, 5, 242, 121, 165, 58, 29, 202, 71, 177, 210, 15, 115, 163, 32, 175, 151, 43,
+            139, 78, 67, 5, 213, 200, 59, 191, 130, 54, 85, 239, 82, 29, 126, 61, 63, 244, 52, 21, 242, 44, 241, 26,
+            202, 115, 237, 90, 110, 2, 0, 176, 205, 88, 137, 87, 163, 69, 89, 70, 193, 97, 171, 205, 175, 208, 255,
+            129, 139, 49, 15, 35, 224, 53, 106, 215, 82, 181, 253, 42, 177, 18, 217, 127, 192, 69, 241, 165, 81, 77,
+            235, 139, 8, 229, 153, 53, 242, 195, 65, 110, 241, 128, 146, 224, 194, 104, 242, 10, 187, 65, 94, 160, 123,
+            28, 82, 221, 134, 222, 91, 69, 201, 41, 31, 70, 53, 27, 221, 10, 191, 107, 90, 29, 52, 187, 0, 219, 198,
+            104, 87, 73, 118, 8, 105, 226, 176, 209, 108, 16, 233, 116, 231, 149, 23, 59, 246, 36, 194, 190, 129, 166,
+            164, 197, 105, 194, 239, 227, 252, 125, 203, 206, 13, 49, 123, 180, 219, 117, 2, 133, 221, 153, 79, 135,
+            146, 194, 161, 191, 225, 24, 243, 145, 47, 25, 23, 87, 17, 219, 91, 35, 13, 185, 78, 136, 205, 153, 62,
+            174, 92, 57, 86, 180, 230, 38, 147, 40, 11, 61, 101, 180, 1, 206, 196, 194, 120, 88, 177, 251, 43, 148,
+            131, 198, 41, 244, 35, 201, 27, 212, 248, 121, 194, 7, 218, 98, 8, 32, 4, 139, 208, 173, 49, 192, 203, 155,
+            147, 201, 250, 124, 118, 244, 160, 65, 4, 114, 231, 198, 184, 129, 131, 142, 124, 150, 132, 103, 163, 247,
+            125, 214, 110, 229, 215, 139, 245, 55, 90, 155, 212, 26, 31, 77, 47, 126, 219, 21, 74, 22, 204, 12, 93,
+            253, 127, 145, 118, 156, 15, 103, 122, 219, 2, 228, 48, 37, 87, 206, 2, 93, 86, 74, 106, 24, 231, 202, 221,
+            237, 232, 47, 162, 195, 114, 16, 20, 214, 151, 38, 212, 198, 33, 36, 75, 233, 98, 139, 203, 28, 23, 55, 21,
+            69, 74, 238, 226, 26, 201, 205, 22, 137, 35, 248, 13, 79, 174, 88, 254, 50, 149, 155, 146, 92, 123, 53, 88,
+            148, 219, 226, 172, 223, 226, 5, 238, 106, 223, 20, 146, 173, 133, 54, 179, 132, 5, 186, 40, 177, 227, 15,
+            114, 16, 240, 192, 86, 56, 197, 247, 231, 169, 251, 216, 208, 48, 166, 26, 200, 193, 46, 192, 165, 206,
+            237, 103, 176, 148, 88, 166, 46, 137, 37, 31, 203, 241, 187, 229, 34, 99, 6, 241, 51, 182, 172, 105, 205,
+            216, 131, 231, 117, 49, 145, 83, 135, 96, 60, 239, 227, 40, 86, 164, 104, 218, 81, 238, 242, 212, 213, 52,
+            19, 143, 213, 69, 245, 94, 198, 149, 46, 127, 13, 142, 74, 11, 212, 179, 48, 71, 197, 234, 177, 160, 43,
+            150, 17, 242, 127, 195, 249, 125, 236, 27, 157, 254, 146, 96, 230, 138, 133, 199, 232, 225, 251, 248, 92,
+            159, 41, 168, 137, 250, 119, 111, 19, 156, 63, 1, 145, 242, 254, 191, 198, 39, 50, 135, 1, 206, 153, 173,
+            18, 144, 31, 139, 113, 34, 195, 127, 249, 240, 148, 137, 108, 183, 210, 82, 68, 79, 47, 159, 196, 184, 61,
+            124, 219, 155,
+        ];
+        let mut reader = Reader::new_with_coin_variant(&header_bytes, "MORTY".into());
+        let header = reader.read::<BlockHeader>().unwrap();
+        assert_eq!(header.version, 4);
+        let serialized = serialize(&header);
+        assert_eq!(serialized.take(), header_bytes);
+    }
 }
diff --git a/mm2src/mm2_bitcoin/chain/src/for_tests/nmc_block_headers_hex b/mm2src/mm2_bitcoin/chain/src/for_tests/nmc_block_headers_hex
new file mode 100644
index 0000000000..fd65ece313
--- /dev/null
+++ b/mm2src/mm2_bitcoin/chain/src/for_tests/nmc_block_headers_hex
@@ -0,0 +1 @@
+0b04010100bd65295ddea6b517952aae84e780821e48ae4b90df5ae468433ad303c8c14743730cb3a2eb6873b3d4cb251e56b22cc31c278f0d564b6be3a118b8656171b93e51efe2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5003e4650b1362696e616e63652f383830830051008bcf8d34fabe6d6d95d15236fdfef0683abfee5e8a29d8d269f0e856c54b23e3638a9db0fb55d36a020000000000000000004ac63202000000000000ffffffff043c487c260000000017a914ca35b1f4d02907314852f09935b9604507f8d700870000000000000000266a24aa21a9ed7a5342a844c8908a9b16a282c8cf9afbb2b7c0d31ce2d243a21956bcafb8bc970000000000000000266a24b9e11b6d5eaf625eff26cdafd60e7211b0dc8de8a667d525c435e15da1923876e3aef9e900000000000000002b6a2952534b424c4f434b3acd45760a51e2cd7618617b99c52c27e09539fe03439d9090e90924310044c88a0000000000000000000000000000000000000000000000000000000000000000000000000cffa78c3d161c2399b74898000ff9b8459006f24da6f18638af52dea4ad5afe4fff3f55a6be345fbbdd69a770d1620221d8f243def67925a68f57afc246cf81a0a2ee7d95f439a4e822f3297c4aed42906c698a915912ccae1fe7fb007e8bc9a93cc071673acfcee0ff21e939e80904478f769afd9b88edd9130eca1eef93b815dabe624dc19f16ae205e6564962703bfc782ec46ff9d8144fc4241b4f0a9429f9fb4182177c66de9dc4d9184749796a37c3f3c9f39212454725bd2fa124ee37d89884403ddf3c2479a57c9bd71ef9202c89696c64f786c90e70684c488f4eb3b918d18c2e344b4acd295a9a5384277bf6bcfe88128f767a9f1a06d02d720c10fcfa4c45146b602f140bdb5576c2682f0b1a48279e4137541ddecf1e5e42717edaa9d11bba79cae71995c484ad864f9181577c2abf921cd275c009ee95042b70ffde1568cca919213e6708543fcaff75f61d23db1558b2392c4709b8a212e58813fb8b76b98a67a45b000487a5e179bbc8718e0d6efb99347c392cdb06e60949000000000018a2249f13197634cc312abca01fa020d858d7bca5c779b19582f4ece4329c19e0100000000c090235572fd088b3e6a5ad1b3e11de3a20f62d761955ba54e0700000000000000000012729dbf0d5e35fd7a0f68855dd3e99d31a551e48e79b4b85bef93e87005b467d9f2e262042a0a174d2cff6704010100784394378bdcfed4cc37ef4ac19927b912ca64078c80beda433061418ad1c3b80a2e7044d156bb37c625e93e276b8bdf459400b003db161ce1570ad6601b3333f3f2e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5003e4650b1362696e616e63652f383231a20033028d4222b1fabe6d6da632f86c3775ae17f408504bd19abc60712a7eae42b29fee449bac8bd84efb7102000000000000000000963482ae000000000000ffffffff04548691260000000017a914ca35b1f4d02907314852f09935b9604507f8d700870000000000000000266a24aa21a9edd693b1d53c945be5c316f19589c14d4cf8544652471bbad393bbd7785271c3b40000000000000000266a24b9e11b6dc351150573992f6d091c6d9a00c3bbb98a08aca4cd594971ef8f3e93569878f400000000000000002b6a2952534b424c4f434b3af473c1329d189bb7a65ec5452297540a5fe57ec03a846e623d62bc5a002cd2a90000000000000000000000000000000000000000000000000000000000000000000000000cffa78c3d161c2399b74898000ff9b8459006f24da6f18638af52dea4ad5afe4fff3f55a6be345fbbdd69a770d1620221d8f243def67925a68f57afc246cf81a0a2ee7d95f439a4e822f3297c4aed42906c698a915912ccae1fe7fb007e8bc9a9ba09de4b3dc0b27e0191355fefbc5fa027fe1f3f31621478218678fc5fa68039f8ca0b2274839b749f6ffe720fe538dd2904cf0a5c348584ec89d0f350a242041c7f9002e4520984a2dea6ed0014321c9b56010b4f2aab5fb1e85e6d208991f87f83e7e46ab349dc01e650e6ab3a250e082678d8db55bd7bfc0d148b598355c0e9d27c379a4692d592aa68595c520fe767cc055eb8815c4d7608a93c59ca2a0f2e7f99689ff91532701bffa1116d0715352c02b5e70adea472daec6bafa2bf536591ebb8e9799c072ac14c822d06853df089b35e8ab769d34e3b4d5caabd8881bdfa88a00bac39df50ef7183ba3e515b06f7b80a357e64844e1b366bb4dd4c1d11c926b2eb95ca3044b41459cb8fe8d71f8307fea328e47c9b1d1258b035dc96000000000148df91357ea2d02e907eea2224b46558b230364c505e004666277742e8edfd5701000000000000205572fd088b3e6a5ad1b3e11de3a20f62d761955ba54e070000000000000000009f3670d749895c2445b5777f1b8d668745fdc663291b14af40e7ef02129b53dfd3f3e262042a0a17d613017604010100347ce808fcdb28c72279e44adf1345ae5495cd001e52dbd62ef6eefeb25bad67df99af82f36da3d39df8cdebfd2e07238a611e64c70840bd480be4da578fcf2411f5e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5803e5650b1b4d696e656420627920416e74506f6f6c383530830047008f912b22fabe6d6d8fe16ba2aadf48f0abe6689a035bcbee97a611c7de38942d7bb871d2faf079110200000000000000000042ad2fdb000000000000ffffffff047fdf3a260000000017a9144b09d828dfc8baaba5d04ee77397e04b1050cc73870000000000000000266a24aa21a9edd0525a55ab9c08f1895d3ac1181a5e44d8bae0772ce91745de853f409338c7f30000000000000000266a24b9e11b6d244d67954abcde4c7997c0c39e9087524e76469ea28785d515deb4d0c55265ac00000000000000002b6a2952534b424c4f434b3a9e9943e0efecf96d25a5be922528f1d6e8e8b3e9439d9090e90924310044c89e0000000000000000000000000000000000000000000000000000000000000000000000000c7c52ac539f279edcaf80368bf63b510b6b2a72d311c37c95d9f0776984d097c3a552c40545bfa44f384f2d168520a775767ef603027cb704cd32e535f8dcee8e36a9ddb8f28006bda1d07c172b1cf5e687456ff365613d64bf3d5020c077b0dd2c02223ae1bb5ea4b99b7d9bb75dadf966f6ebc7a17bb88b2b8af1036e434a12c59e8828790333b9a336a084147e2d4d2a9ee6dba85640482edf9572131653b8e59e7dccc985ff90e6f4e1305f5caa1a64ce6d61a9bb5cb679897cda681dc3b2359c05f5d9dacbb5d9a763d88899d1630543e77e5affd024bbd0a535ffbfaac2114f07e725f90e0c5dd5643e4b955d2dcd508d1324b13ab7b73de2ef4fbcaa87ba8c92a963ee05ee4c425bff4f8ea107d2885212e5de16c0f1ba9f7d2165a04fa6689c7b9b4d0ae77e0862e311712617b027810c28fd0ff04cfba761c18ed3ca77eaa24b9524f8b21796884395618a73812de4ab8070f3cfe320a2a2d3b909391d6b882c4826634a3b17e0e3c23720fbfdf14743d65ac63cd9153a5187acba700000000001825a3f19f53fc7aef752bd182ea4e1860cafc71c370bd946f78a7131e12db242010000000060c623b870ff67b695c3aa35d483e33731aa7733d03da984a3000000000000000000000cca4a8b0c1cde651136902afc5c1dcc2d5b40f22c04e638b41eccad82c290a04ff5e262042a0a1736c659a50401010059c1d6142875cfb8802695cb8f99a6d63974f7fcbd8782bfc307fd2c27a5231564954ad4f6994674fa64fae528cf761018f991aa4cdce761daa8e8e365d5585653f5e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5803e6650b1b4d696e656420627920416e74506f6f6c38353256000b0091be2d83fabe6d6de207b64fb28790024b22bad4eff1aba882576743fb952d35984ce4f6bff1e9340200000000000000765e0000b70a480000000000ffffffff043b0031260000000017a9144b09d828dfc8baaba5d04ee77397e04b1050cc73870000000000000000266a24aa21a9ed4085cbb1d2f74bbfe8b2be2ce2c71b5cd63a5658e8a40e48335e9ec86d7194de0000000000000000266a24b9e11b6df4ea9086cdaa435cf044fbb20d8f3a0d8632c9cf26bb37a3b6503867fafeab8d00000000000000002b6a2952534b424c4f434b3ab7f448c2e8e2227bb4b59f1674ad5802c58a0a5b439d9090e90924260044c8a80000000000000000000000000000000000000000000000000000000000000000000000000baddf9d14bafc742f2d2fb23ee2c124957fd5440cf1f08325b6a19d28c9a979a78c22f409fe9d706f36fddbc2533cd62ea4dba13c8cea83577d7728bed3b08cd3c799d454334688a8e7be05b4c7a20f882162a393b02bbae2d51545af0787f5e6336ec17cb41e3aeb92e9a483c5c73ada6ecce11406035eb03e5d8ef68374b7d9198194cc7fa170a7185e2c816542a3be9eed3cfb5aedb49d5ef8b8a5fa18ac592e85bb43deba7010e597ca42f3acd387021fe1d67080da9755687a995e16e022064e06e914ccf4af545525024330fc9728aa783112df34ba33d5d7c481b6481aa6fc9bdcf9a2d575f8f5c71ffd7924f07898854bce2bd8df9148dfce17fb25914ea50e5504dd4adc1cb25398e25ad1052546351bb08d62bd76b496e4bf4cd80c0ce8a4da6dd3cc99c2cac95bae31c549bfc633f3c9228def0074b683bc235392dd15920ae3458681cc3f7cc0e4b50834ac1d68f33c59218feddbdddfde51a24f0000000001df92770964b52c3e82c9f61c7039fc8b38f32a1c76773a4ea28a74514ed3acd50100000000a00020ef3dc0bd1000ab15f5d1587fb66ff3581c78ffc66ad4010000000000000000000a704a92eda1c41d450c834539b7302162b86cb07709dccdd3d298162e5f3da1bdf6e262042a0a17a4fdcc62040101005f37d7e7be6748c90ca1c1637ce086b77b59ddae4e319687bff078b867950e2c4f1ec30713341ff5349cc7e718f15efcaa930be42702c33ab92309c4baf97ae1d7f6e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5803e8650b1b4d696e656420627920416e74506f6f6c383439830015009359371ffabe6d6dfe9c0a5a7ef03cb3d26b28d07165bfd8efc240dff762084ce165c8e7c2425f100200000000000000fc5d00005d00000000000000ffffffff049dd0dc250000000017a9144b09d828dfc8baaba5d04ee77397e04b1050cc73870000000000000000266a24aa21a9ed6c3a5d30a4594631d68b66f2687d8d5e606806c24815b156ad8f2b78a57342380000000000000000266a24b9e11b6d06625ed9ccad67db986df1d7cbcd1ee87dc951a1acddb5d02010d46c5aeda85700000000000000002b6a2952534b424c4f434b3a3c8bcc66e20c903f42f330605b99d178478b1367439d9090e90924220044c8af0000000000000000000000000000000000000000000000000000000000000000000000000c0b76176714239881d2a5d9b2a6d6b5d045a3b15d9150ab5df35e7a6d0f9185d4b61890cba438f224b9d97f02dd3f73e2d05a649295fccb05683b8a77ae15136d56263d7cb41689fef6abbe1fecdf47f79629af94034dfdaf37e2512dff870aedca057d8b5cb4605e53fd5b86cf794824d6d903e01e6a78696cc23bb5fbf49450a7f2c10505ef021b17e02e943a2a0b2659a57a483109ab4f9f6febe6de69f3a4c4713996cf9dc27de52da6d5b938f211051018263e1cbfba389efa212c92c9691d5b089e45200c032469532f9024f34079bbd3c691b4dd97a7ea9418e4396b84afe024ef040ff62524bc2aaf777afe07c1890bee44de120190067dcc7ed2e7dbf871b79aa682b0c2779f5dc455bac3943db314d283534c060065f89c8c2f4b967225ae3b83838a7d278c39378f57fbaa71269655cdcf9a054ae49653e34b1a2bcaff76bfb8fd6615b1980b6e0d1f86ec5253110e0236ecad23ae03bc3c0c443117684c41f9455c0a1c789145bb43807ee2e2e2747d15c3906f16c189d5a46db400000000018be1918133b53dfde7db203b719c73359b83ba87fc8f1d9a43c6b3b0ffad4a3c0100000000a090294e2e7270b0e290d1b205415ca4cce3eadab6b9d3c82e0200000000000000000046e0f7030a15b9f34e203d8d0e355f94b0ae22762b390141c852d4ee85975c93caf7e262042a0a1729a6bb0404010100411f3b93b24c75079fe9d4f7e966c27572cf6f697f9d51ac7a08f0b0970308e63968ab8c2ee0e410bb151e45407371be7b14ab72deacfd05435a897476934af5cdf7e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4c03e8650b1362696e616e63652f3738390a000101949d9da2fabe6d6d0ffd38c2d3a69a7a6f5fbb09d53803c4c4e2938e714c3bc7fe9d7d85d40a030c04000000000000002f8f000003010000ffffffff04f85606260000000017a914ca35b1f4d02907314852f09935b9604507f8d700870000000000000000266a24aa21a9edc6a4291f06c078dd52ddc03d931bbb79d1d1d911de16f94153160ec2c0c51e3e0000000000000000266a24b9e11b6d2c7dfda4f77a3655e5e76b4653b1ea1f0f556558d99cfdaa687c4720e45b4c9900000000000000002b6a2952534b424c4f434b3a5b7e48f291f543cb8025f5ef36c1d6c1eef0e7d0439d9090e90924280044c8b50000000000000000000000000000000000000000000000000000000000000000000000000c1477adf36dc91c2d9adf90d69a784b0c3e2cbf82bf6d3794af6ac20eed5ee03b27f613ddcb9cd3ce7f6a221ceefdc37936acebe5e1868f4252033659648b267604216a401929dd35aa726ffb984736a65b89fbd3433b63726a4cc1ab716463cf87c127cb7aa8e5293f3615adf1d0379ff8fb0604875a9a91a2bb7764b14268610e69aa133830bf63a6491211d3b9bfdb8a6daae7ee4efbdc8dbc185d07c4f9c9086ba1424068a75bd22b902889d84fb3fb25c48329784a6ddfc3bcd5277265add47711599ada55d98a082ac91e681aaba6dd597bb9545624cca1720a45d1dedc1a1613c9c407fd1fbecfc5405c487f28e410979e66cd27dc167071ae67f5b461131988537024c29f928573a24f3d17df47d0f514a2d74fcde0a2329893d32bf906e1f058e4380adf85c4827af5b1a33c5b600ae46eafe85ca05682b35eecbc074cd1fa8e937510255c1fafdecb1b83609fc8ccb599adc7d68855e5f823a55d5f5947859e33b7d9a2c8d836c095e833a3d298c57e8df40bdf5fa066b5891b25b500000000027ba5a3e5e1c903b84fff7d96417798e6f9f30b0472b247051716142ade0f67c3c2c25db0c08244d3eba88658a8fdfa01ecf1a5d52c5e787bcd95af626e02bfc20300000000e0eb2d4e2e7270b0e290d1b205415ca4cce3eadab6b9d3c82e02000000000000000000cbe1847eb856c3ff2428961043c216fe01d5cff768f7a282bec19b9886a170059ff8e262042a0a177439d3f404010100fa9570c0c365b1002f655edae7f3628147e784c68825a9e6c790476403fd4dc2b2ce81a728c09f9ad1225330af023be35a01ee993a9a70fe93d5862557de50abbef8e2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff6203e8650b1b2f5669614254432f4d696e6564206279206665646f72323030302f2cfabe6d6d6a020a218aee4ac78fda2f7214d957ac81d5565fbf6c3820f0bc64f3f9b70096100000000000000010d7ee2f01b0197cee7fc38ca5b758510000000000ffffffff0335202e26000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac00000000000000002b6a2952534b424c4f434b3ab7f4aecc5ce4333c3432ccfaf87097f1fe15f308439d9090e90924230044c8ba0000000000000000266a24aa21a9edb2b738224f1dee4274b0164b79ce92d39c0f532b7a742741c38ad60a8f0919080000000000000000000000000000000000000000000000000000000000000000000000000ce167ad00067f3a697538f00bf858f5b334b41b4bede78b5c1cc2d8d5ac6f0d8d494d90d21450c9234906cd90464732b35486c2cdc413d3a9560f37fa5c62596483496d9806c721d8bfbf9989c28e47df6bd4fcb58dc008884b4a54049f0dfeaa7f7a9e1ee6090244c4262022701285e0ee51f39ac0de39d26367a087432b6a1ab2f849bcd6678b00e8f6e80c3399e45836eca62e09f9116e3cdf410957c41ffb78c1e18d6830ed86525a0a4cb44fbaab39180afc28c023f8783ca17c227e862816d776b622060bebe37d9c9744badba9ebd9c3e0625250a8de936502a01f034b1faa9c9a7272933e01d9171e35574a3506a230391aae455f78eef53f3c40f75271787dd4d45be4f3e784a983705a1b9389280afbf0db66a67665f8f6f49e15fc424e29e466367c70d3f3d6c6b65458c01f0d9ca0f2d8b1eadee2e2beeda36d2ac180be8f1fedba7184d6e407f3ea81e98d8f3ec35ec35213d16375faaa15964b3be6f8a78360984d50baf5973608bc871cd9c860f4c041bc8cc646c160af11c700000000040000000000000000000000000000000000000000000000000000000000000000e2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf92f50330438ef6e93ddec9b1f11f60d53d2ed09264571734b938b4c089ddabe0c77e4e3c6dbe6fe892ec544b365d714eaaf53deb45d75e87354dbe359fda07ebb0b00000000e0ff374e2e7270b0e290d1b205415ca4cce3eadab6b9d3c82e020000000000000000008ede65a75bf395045d002da16521e66a710409d8c955b7d4e2435463975b120f60f9e262042a0a17a751a50604010100d842802bb1e4818932e0f6e2be59ba13d0f0df84706e6cdea658423943f6d122c27af2779b778a02a33f317c1fe6f340873dbbf71413ae0c688071f00b4c1001f8fae2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5903e9650b122f5669614254432f5472757374706f6f6c2f2cfabe6d6dc08873851dd43ab379dd131add8032284436ef7e86fa17eba99ee523c8f2a587100000000000000010cf358b137c6a2dd54b0f5fc709b12e0000000000ffffffff02ec780526000000001976a914536ffa992491508dca0354e52f32a3a7a679a53a88ac0000000000000000266a24aa21a9edebccbac84aa8243b2e20a0f991866288f21660c751c8406e702333af9ac4fc250000000000000000000000000000000000000000000000000000000000000000000000000ce167ad00067f3a697538f00bf858f5b334b41b4bede78b5c1cc2d8d5ac6f0d8d0b7ccc370c9742b7c60f92941bb0189d697475224d5dc760eaabb5a0a6c51cfd81ebedca0a208e16310dba3da1f01c179cebe755fef39bc718c1d66cec553ab020f5dfc71d9321bc21df96cdc1d3d0e831fe8a9461c73f57a4317fbfc7011d8307f102401506dc6e8685a0228b9e137f27a3fa2721ab44b40694c91f10d424827e41bf25ee4a160db4780d5220dc18d2132ace267947b4991b924f8e9327d8f7c9445ccaf40c860caf8169e4b7520d75b74674a4e97cd0440401bcd4c899f6f37b44fc664733a48f341ef517efba3673fca6a752bedc39572757a9c8c8206eff076c2229a93ca3ea9b961971cce6fd2590010a9520ecd03cf8118716628207363fc29ee1cc25b00d7f9f9dd0bef8bcb5f7dc7daf6a29f2a0a6cd5f786454cf20b8df7de2067dbc3f0c10ddec6befbde39bebe023ed8629f03e2b2ccde5caebb5967bfd3c03321b1a35ce446cba00a4b576462297bc867e487b704647ccb05d5400000000040000000000000000000000000000000000000000000000000000000000000000e2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf9b8f91ff0e34a5a017f09219b82f53f9cbe2ca87e0ef35862f2bc4809847970445b7ad1e43bd648bf060643ea31dc552e0f45b9871bdb5328c07fba669c64a0c50b00000000000020ade54dedf6332447e6041448658384cfe94f41572e8d09000000000000000000cf7b3f0f5bff49f4f9c0765ce49e2aa9c044ff1fdda86033aba2bf3106917de5e4fbe262042a0a17d1a12cdb0401010052a78c8351b2f7ab73351f56162525c5aefcc89f816bea88ac5db289f95fd900afc781f20d41b8e90d42602f5756bc0d8f4b80d118810ee226b6fb6715199bf8f8fbe2624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4b03ec650bfabe6d6d5733586ab53a7fcf24206c6f0378d345d34fd6b723aa108c1cd3ec6eb78d12f601000000000000000165070115a52c1758020000000000927119d6092f736c7573682f00000000035e621126000000001976a9147c154ed1dc59609e3d26abb2df2ea3d587cd8c4188ac00000000000000002c6a4c2952534b424c4f434b3a015c4b8820a5612d7b431c886a61e86267950f4676439d9090e909230044c8ea0000000000000000266a24aa21a9edb529710f967d21c83b357c7994a09fe25347f9ff021034bb2c6b984a4ef450660000000000000000000000000000000000000000000000000000000000000000000000000c78107899584aaf20b62a702e0f8d8cca5159e9ca7291bb56a3ab901913b19b5335de1dfecb20ca4cb241012f35a884c9216d8723b81c02012caabbc92a8809ee15f822daac100ea71290c6cf23aca323f17f804afb634049879bcab55726e430b5ad2e5db815955ac62930c1f9cfc9206cf9cdb9175d10a0e0e7a819a4de083ff2e0a402b840f0de846e507ec9e076596c3dc6ad7f675da716cb2c7debfed6ff977dd0a62529b0dcfe6852309c86d87d9bec0ecbd776c7c55d448644da2c4cc4e5912a14f4efb60c7424c9607e4f20263798b19e376e95591aeabbc4bf806477c33556c87dd59f791acffbbf458b3cd4e27d5b251e1058ed21bbeef3d27e64376c6b3f34fe4143e14e11a8e7a787bf2c94c771a4e3e0edcd819e43129176fd072f5d149de4c8e65ab756a99d839a9ee4ee88bd5c03529e8bd2bec64090155fa70134f599d401ecc64228e5b273f80019211694cb78a1eea0620aa24208776b68aaac48ac46f358e800a2775c3ae6f21c9e983e6f11e627e0f01f5d7ff0d7e2bb0000000000000000000400c020bca16773458316713a5fe770f0ea9a2e8a6a8b544d7203000000000000000000c201d56b81b5585c5c06e11aadd6b5b743eeb0e5d3bc1031fa4befa3e72d9b591d00e362042a0a172584c42a04010100f6128db76eecd31c8c10aa23b7d64fd345d378036f6c2024cf7f3ab56a583357f7597b71086230267b86c30fc07505579b558d90e801355ba1a4075c76e6a91c3900e3624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5803ed650b1b4d696e656420627920416e74506f6f6c38343983001501a17a55bffabe6d6d280947719d0934c5932c380903ca6f54bab2536236c984f40fd4521d6cf9a4570200000000000000000032198700000000000000ffffffff048842b1250000000017a9144b09d828dfc8baaba5d04ee77397e04b1050cc73870000000000000000266a24aa21a9edbdfa808cf96a6763b797141c5dd79a0baa501dbddfa75b0a343a35f30e4643480000000000000000266a24b9e11b6dc3d6977c24cbf4bdcc85978a00f06d0c45a181856b9c2d8775e04f28f6bb3b4b00000000000000002b6a2952534b424c4f434b3a537124e38d84a87a7614ac01b527fcb2e6bbedcc76439d9090e909250044c8ef0000000000000000000000000000000000000000000000000000000000000000000000000b50358f2aecb56cb29eb065d8456759aefa0519c791c8858af3e2250baba104a9eabd4aeee101b5391df22f245ec2300baae8de8ed6cc7fd44be8f331f287e1287fbac00308f43b916725574cad26d88f2339f1a8a4c358ec44c2c453fc743d620a99c32a588bccbe252b34626de6f1de071de7609e85cd9ddd29bb247625be58f7d9f9f721c81c3aa15b4605d23241743d67ac43598dff37615c3bf2230e09623e5c455230dc25e98ce35fc6c9b7fdb1e4926daf9a4112cf7f235c75711680d42ede7b4174260898d68e170011f5b52252542cc80e551f76f5b2e131666be7778282b6df2c32cd6dd4a84e63a022d43c862d756d73fb627d428d99e67f59dba7ce1974049953f58e97107c411d59bad2388c818a209b12ecbd52cfcf34399d2548e949498b2f671e703bcb0e28722768f8b7502e27c63ea4388dc084cd96566a3ceca4167f56dc9ae820e4212bccda426ab0bc3239c3e48922f3795e16f4175600000000012f78f18a85bc33a9f4f252ca9e9734cc4dd1b5dd68fc2817a9385970ae65ec14010000000080752fd8123c977f78f482acedd51597e4148d39bd9304e41b040000000000000000001427b0961457f8c2cf76cdbf999dbd8c5bc95122fba89d4cb740b28a9779acb70c01e362042a0a177054d96c040101002a9587d95446638d0f1dca28e87c0e7c76e056c38a9137963f1b6b84a9aa8c7503f8a9647d3004dae6f417003e2c83af0aa6df109e3a575aed940ccc79db6a2a1301e3624e770e170000000001000000010000000000000000000000000000000000000000000000000000000000000000ffffffff5803ed650b1b4d696e656420627920416e74506f6f6c38373149006502a681ae93fabe6d6d81e824528ffecd9f10b3de3db3eb54419cb75ad93669f7d2390329547262b53c02000000000000007d9b00005324000000000000ffffffff04ed9c68260000000017a9144b09d828dfc8baaba5d04ee77397e04b1050cc73870000000000000000266a24aa21a9edfce95784c9cdd7055100bb0d567adb3f3efa86311ff3a07d4459f6deb40664ac0000000000000000266a24b9e11b6dd855536032345a3362375968b0130cf2af13ff47bb1538930c603b84877e610900000000000000002b6a2952534b424c4f434b3a2b1edb75f3855884e8db45ebe944dfc638431aeac676439d9090e9220044c9080000000000000000000000000000000000000000000000000000000000000000000000000c8b561f2545da3e47389f819fe1b53c5b5603b07368faa65fb3ce1200ebb7a4ef8ddff6da9a81ccc9662f86feb45b70c6af57fae5d3419f33fb9d06161936a22ab188f24577e972f7bb49c4167a319e3199b649c3234d172e2a9045613f2b6a29a97da92682ef9c73d45abe7c690002c50857ab476be4657d986e48811582adf1cf1e2f0e6b2a301f9f65d8af330358d8a1fd05444c6ec2932a72ecd2bfddf27768c8ba8165a32db5050f9b1e8126b1f5dfb5a1f59186af8ea3bac909a5f7a0736663801ac99e0a0e9f3ccd2be0c64d4acff9fff7e791ef311df8db7e6a51d139a8c1e9af781eac2f8e6b16b1ead0590116b33935df9f318a84b8cfa223053447660e7678cc7bff3b9f09dc676a69fc3654818ab6c42f31fac8dd39fd7f5cf72522deedc729329a209eeaee8da7c1e965da6c00920fdfc770f0fed8a1bd031f7a7183c82d20ed947ab62d9dcc1eea6045e9d5fb1fb996cd03a5ac0b3b49d0e1bca93d3965f9d261dd3b5bbf615713eddaaab290b004b342b7e84c82d026e6eabe0000000001da246d5cb69c49426d52341280adeabdc59bc709e1eb432cb79a5f6e1b639f9d010000000000ff3fd8123c977f78f482acedd51597e4148d39bd9304e41b0400000000000000000024932fa74ca1343531162fa7ef5f4ca202d8505852fa30c859e85e8f03c199716204e362042a0a177d972039
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/chain/src/lib.rs b/mm2src/mm2_bitcoin/chain/src/lib.rs
index b3f474fd49..58133355bf 100644
--- a/mm2src/mm2_bitcoin/chain/src/lib.rs
+++ b/mm2src/mm2_bitcoin/chain/src/lib.rs
@@ -1,3 +1,4 @@
+#[cfg(not(target_arch = "wasm32"))]
 extern crate bitcoin as ext_bitcoin;
 extern crate bitcrypto as crypto;
 extern crate primitives;
diff --git a/mm2src/mm2_bitcoin/chain/src/raw_block.rs b/mm2src/mm2_bitcoin/chain/src/raw_block.rs
index 075d15ad6a..c50e4c1e31 100644
--- a/mm2src/mm2_bitcoin/chain/src/raw_block.rs
+++ b/mm2src/mm2_bitcoin/chain/src/raw_block.rs
@@ -8,7 +8,7 @@ pub const MIN_RAW_HEADER_SIZE: usize = 80_usize;
 
 /// Hex-encoded block
 #[derive(Default, PartialEq, Clone, Eq, Hash)]
-pub struct RawBlockHeader(Bytes);
+pub struct RawBlockHeader(pub Bytes);
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum RawHeaderError {
diff --git a/mm2src/mm2_bitcoin/chain/src/transaction.rs b/mm2src/mm2_bitcoin/chain/src/transaction.rs
index 37d84e09db..8d250a583a 100644
--- a/mm2src/mm2_bitcoin/chain/src/transaction.rs
+++ b/mm2src/mm2_bitcoin/chain/src/transaction.rs
@@ -4,13 +4,15 @@
 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};
+#[cfg(not(target_arch = "wasm32"))]
+use ext_bitcoin::blockdata::transaction::{OutPoint as ExtOutpoint, Transaction as ExtTransaction, TxIn, TxOut};
+#[cfg(not(target_arch = "wasm32"))]
+use ext_bitcoin::hash_types::Txid;
+#[cfg(not(target_arch = "wasm32"))] use ext_bitcoin::Witness;
 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;
 
@@ -38,6 +40,16 @@ impl OutPoint {
     pub fn is_null(&self) -> bool { self.hash.is_zero() && self.index == u32::MAX }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<OutPoint> for ExtOutpoint {
+    fn from(outpoint: OutPoint) -> Self {
+        ExtOutpoint {
+            txid: Txid::from_hash(outpoint.hash.to_sha256d()),
+            vout: outpoint.index,
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Default, Clone)]
 pub struct TransactionInput {
     pub previous_output: OutPoint,
@@ -61,6 +73,18 @@ impl TransactionInput {
     pub fn has_witness(&self) -> bool { !self.script_witness.is_empty() }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<TransactionInput> for TxIn {
+    fn from(txin: TransactionInput) -> Self {
+        TxIn {
+            previous_output: txin.previous_output.into(),
+            script_sig: txin.script_sig.take().into(),
+            sequence: txin.sequence,
+            witness: Witness::from_vec(txin.script_witness.into_iter().map(|s| s.take()).collect()),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Serializable, Deserializable)]
 pub struct TransactionOutput {
     pub value: u64,
@@ -76,6 +100,16 @@ impl Default for TransactionOutput {
     }
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+impl From<TransactionOutput> for TxOut {
+    fn from(txout: TransactionOutput) -> Self {
+        TxOut {
+            value: txout.value,
+            script_pubkey: txout.script_pubkey.take().into(),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Serializable, Deserializable)]
 pub struct ShieldedSpend {
     pub cv: H256,
@@ -198,16 +232,15 @@ 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())
+#[cfg(not(target_arch = "wasm32"))]
+impl From<Transaction> for ExtTransaction {
+    fn from(tx: Transaction) -> Self {
+        ExtTransaction {
+            version: tx.version,
+            lock_time: tx.lock_time,
+            input: tx.inputs.into_iter().map(|i| i.into()).collect(),
+            output: tx.outputs.into_iter().map(|o| o.into()).collect(),
+        }
     }
 }
 
@@ -527,7 +560,6 @@ mod tests {
     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
@@ -995,10 +1027,10 @@ mod tests {
     }
 
     #[test]
-    fn test_try_from_tx_to_ext_tx() {
+    fn test_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();
+        let ext_tx = ExtTransaction::from(tx.clone());
         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 d0e89b0504..fba1c0851f 100644
--- a/mm2src/mm2_bitcoin/crypto/Cargo.toml
+++ b/mm2src/mm2_bitcoin/crypto/Cargo.toml
@@ -3,6 +3,9 @@ name = "bitcrypto"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 groestl = "0.9"
 primitives = { path = "../primitives" }
diff --git a/mm2src/mm2_bitcoin/keys/Cargo.toml b/mm2src/mm2_bitcoin/keys/Cargo.toml
index ad024e60cb..3569f9ed84 100644
--- a/mm2src/mm2_bitcoin/keys/Cargo.toml
+++ b/mm2src/mm2_bitcoin/keys/Cargo.toml
@@ -3,6 +3,9 @@ name = "keys"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 rustc-hex = "2"
 base58 = "0.2"
@@ -12,6 +15,6 @@ derive_more = "0.99"
 lazy_static = "1.4"
 rand = "0.6"
 primitives = { path = "../primitives" }
-secp256k1 = { version = "0.20", features = ["rand"] }
+secp256k1 = { version = "0.20", features = ["rand", "recovery"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
diff --git a/mm2src/mm2_bitcoin/keys/src/private.rs b/mm2src/mm2_bitcoin/keys/src/private.rs
index cb9a4ac44b..c60d9e7af1 100644
--- a/mm2src/mm2_bitcoin/keys/src/private.rs
+++ b/mm2src/mm2_bitcoin/keys/src/private.rs
@@ -51,7 +51,7 @@ impl DisplayLayout for Private {
 
     fn layout(&self) -> Self::Target {
         let mut result = vec![self.prefix];
-        result.extend(&*self.secret);
+        result.extend(*self.secret);
         if self.compressed {
             result.push(1);
         }
diff --git a/mm2src/mm2_bitcoin/keys/src/public.rs b/mm2src/mm2_bitcoin/keys/src/public.rs
index 7ba0b9a27e..b57f376ee9 100644
--- a/mm2src/mm2_bitcoin/keys/src/public.rs
+++ b/mm2src/mm2_bitcoin/keys/src/public.rs
@@ -69,6 +69,17 @@ impl Public {
         };
         Ok(public)
     }
+
+    pub fn compressed_unprefixed(&self) -> Option<[u8; 32]> {
+        let mut res = [0; 32];
+        match self {
+            Public::Compressed(pubkey) => {
+                res.copy_from_slice(&pubkey.as_slice()[1..33]);
+                Some(res)
+            },
+            Public::Normal(_) => None,
+        }
+    }
 }
 
 impl ops::Deref for Public {
diff --git a/mm2src/mm2_bitcoin/primitives/Cargo.toml b/mm2src/mm2_bitcoin/primitives/Cargo.toml
index ef679deeb8..568ee6aba0 100644
--- a/mm2src/mm2_bitcoin/primitives/Cargo.toml
+++ b/mm2src/mm2_bitcoin/primitives/Cargo.toml
@@ -3,7 +3,11 @@ name = "primitives"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 rustc-hex = "2"
+bitcoin_hashes = "0.10.0"
 byteorder = "1.0"
-uint = "0.9.1"
+uint = "0.9.3"
diff --git a/mm2src/mm2_bitcoin/primitives/src/bytes.rs b/mm2src/mm2_bitcoin/primitives/src/bytes.rs
index a491f3c074..95f249e431 100644
--- a/mm2src/mm2_bitcoin/primitives/src/bytes.rs
+++ b/mm2src/mm2_bitcoin/primitives/src/bytes.rs
@@ -14,6 +14,8 @@ impl Bytes {
 
     pub fn take(self) -> Vec<u8> { self.0 }
 
+    pub fn as_slice(&self) -> &[u8] { &self.0 }
+
     pub fn len(&self) -> usize { self.0.len() }
 
     pub fn is_empty(&self) -> bool { self.0.is_empty() }
diff --git a/mm2src/mm2_bitcoin/primitives/src/hash.rs b/mm2src/mm2_bitcoin/primitives/src/hash.rs
index 785653a980..46f86df4d4 100644
--- a/mm2src/mm2_bitcoin/primitives/src/hash.rs
+++ b/mm2src/mm2_bitcoin/primitives/src/hash.rs
@@ -1,5 +1,6 @@
 //! Fixed-size hashes
 
+use bitcoin_hashes::{sha256d, Hash as ExtHash};
 use hex::{FromHex, FromHexError, ToHex};
 use std::hash::{Hash, Hasher};
 use std::{cmp, fmt, ops, str};
@@ -18,6 +19,10 @@ macro_rules! impl_hash {
             fn as_ref(&self) -> &$name { self }
         }
 
+        impl AsRef<[u8]> for $name {
+            fn as_ref(&self) -> &[u8] { &self.0 }
+        }
+
         impl Clone for $name {
             fn clone(&self) -> Self {
                 let mut result = Self::default();
@@ -165,4 +170,7 @@ impl H256 {
 
     #[inline]
     pub fn to_reversed_str(self) -> String { self.reversed().to_string() }
+
+    #[inline]
+    pub fn to_sha256d(self) -> sha256d::Hash { sha256d::Hash::from_inner(self.take()) }
 }
diff --git a/mm2src/mm2_bitcoin/primitives/src/lib.rs b/mm2src/mm2_bitcoin/primitives/src/lib.rs
index 9e07a813c7..78dc7330e7 100644
--- a/mm2src/mm2_bitcoin/primitives/src/lib.rs
+++ b/mm2src/mm2_bitcoin/primitives/src/lib.rs
@@ -1,6 +1,7 @@
 #![allow(clippy::assign_op_pattern)]
 #![allow(clippy::ptr_offset_with_cast)]
 
+extern crate bitcoin_hashes;
 extern crate byteorder;
 extern crate rustc_hex as hex;
 extern crate uint;
diff --git a/mm2src/mm2_bitcoin/rpc/Cargo.toml b/mm2src/mm2_bitcoin/rpc/Cargo.toml
index cc87abf852..c50689b9ea 100644
--- a/mm2src/mm2_bitcoin/rpc/Cargo.toml
+++ b/mm2src/mm2_bitcoin/rpc/Cargo.toml
@@ -4,11 +4,12 @@ version = "0.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [lib]
+doctest = false
 
 [dependencies]
 log = "0.4"
 serde = "1.0"
-serde_json = "1.0"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 serde_derive = "1.0"
 rustc-hex = "2"
 
@@ -16,4 +17,7 @@ serialization = { path = "../serialization" }
 chain = { path = "../chain" }
 primitives = { path = "../primitives" }
 keys = { path = "../keys" }
-script = { path = "../script" }
\ No newline at end of file
+script = { path = "../script" }
+
+[dev-dependencies]
+lazy_static = "1.4"
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/rpc/src/for_tests/txTestVectors.json b/mm2src/mm2_bitcoin/rpc/src/for_tests/txTestVectors.json
new file mode 100644
index 0000000000..924c984777
--- /dev/null
+++ b/mm2src/mm2_bitcoin/rpc/src/for_tests/txTestVectors.json
@@ -0,0 +1,1438 @@
+{
+  "btc_4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e": {
+    "txid": "4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e",
+    "hash": "89f9ae508f67ce79181f43cd4823e9899ef3116d658457c992b8411674f80c5c",
+    "version": 2,
+    "size": 3316,
+    "vsize": 3231,
+    "weight": 12922,
+    "locktime": 582070,
+    "vin": [
+      {
+        "txid": "bc1cac1354e18195bbcb56e9b6212bc7ceb481ea46d18ed39493fbe028af370e",
+        "vout": 0,
+        "scriptSig": {
+          "asm": "3045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
+          "hex": "483045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
+        },
+        "sequence": 4294967294
+      },
+      {
+        "txid": "40bbaf2e6f209fd798c5d4dbbb53059b1b3fbe74d1bdd4defda3041a67d72122",
+        "vout": 0,
+        "scriptSig": {
+          "asm": "3045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
+          "hex": "483045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
+        },
+        "sequence": 4294967294
+      },
+      {
+        "txid": "f5abe9270190bb39a1b45ff8229913c7edc684e896df86033d2d0994e67fcb6b",
+        "vout": 0,
+        "scriptSig": {
+          "asm": "30440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
+          "hex": "4730440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
+        },
+        "sequence": 4294967294
+      },
+      {
+        "txid": "7cdd760d5d4ce952c9d25128a1f475b1a058cd71506cb7af956f2ab933b4d8a8",
+        "vout": 1,
+        "scriptSig": {
+          "asm": "30450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
+          "hex": "4830450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
+        },
+        "sequence": 4294967294
+      },
+      {
+        "txid": "73a7faa14c4e654f327d6be4f685f91234a6682b97bf0f5384e90bff861786ce",
+        "vout": 45,
+        "scriptSig": {
+          "asm": "",
+          "hex": ""
+        },
+        "txinwitness": [
+          "3045022100b7b6368e45383b2da463ba56397a1966b94be5ef860ac95f1067e62a4531e75a022077bc58f3ea606219fe086f291d39b805faec10c848b525f4997f32979bab5aca01",
+          "0253a13bae39c5604dc4e9634c10e87e33d0c2d1a618efc0726af5a4a4ea81f7ab"
+        ],
+        "sequence": 4294967294
+      }
+    ],
+    "vout": [
+      {
+        "value": 0.0095,
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 66f8da41c6bb10975f565bde68b5df07003c59cb OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91466f8da41c6bb10975f565bde68b5df07003c59cb88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1APU39UZbmpV3RB2EXQmKikKEgovLVoXzv"
+          ]
+        }
+      },
+      {
+        "value": 0.56054866,
+        "n": 1,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 46e14b4a4ff41785017080cd63aa5d17513e1854 OP_EQUAL",
+          "hex": "a91446e14b4a4ff41785017080cd63aa5d17513e185487",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "389o7gRfw13GnRYg4yuhsATJ1iiJ8QFiBv"
+          ]
+        }
+      },
+      {
+        "value": 1.9995,
+        "n": 2,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 99bbebbdf7f2dc038b904103237765a77282b42b OP_EQUAL",
+          "hex": "a91499bbebbdf7f2dc038b904103237765a77282b42b87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3FhtRs6hwos3uS62XhfkoP9PwnGFb9u9AT"
+          ]
+        }
+      },
+      {
+        "value": 0.04788773,
+        "n": 3,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 c78ac0df6b8241075d66f7f986653604a2c6a6fc OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914c78ac0df6b8241075d66f7f986653604a2c6a6fc88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1KC5gvwy5SSarNgL7pVcEdrB7Gj1upeni9"
+          ]
+        }
+      },
+      {
+        "value": 0.137,
+        "n": 4,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 79f1db0274de574d49f9fc794b349ef81529fb18 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91479f1db0274de574d49f9fc794b349ef81529fb1888ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1C7nVdM4vYjSE23SnyEEbdEhzp3LXAwssr"
+          ]
+        }
+      },
+      {
+        "value": 0.55,
+        "n": 5,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 840f4d27071f400c5674b1a686235cb641ef34b8 OP_EQUAL",
+          "hex": "a914840f4d27071f400c5674b1a686235cb641ef34b887",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3DjHT2Ks4bmJUQh8exeQYcGpXuHe4deVy8"
+          ]
+        }
+      },
+      {
+        "value": 2.87351761,
+        "n": 6,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe92 OP_EQUAL",
+          "hex": "a914c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe9287",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3KTnese7izLxXTSBe86fY7Cg2tHyApdsV5"
+          ]
+        }
+      },
+      {
+        "value": 0.00343558,
+        "n": 7,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 d58ee5f1a2bc153ce58145676a679d7b31a1a5ae OP_EQUAL",
+          "hex": "a914d58ee5f1a2bc153ce58145676a679d7b31a1a5ae87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3MAD39R5NPANmrbgybN93jMsiTWd9sgB7A"
+          ]
+        }
+      },
+      {
+        "value": 0.0345,
+        "n": 8,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 a61b218139c3cd63abbfc6d221f28019d86837d6 OP_EQUAL",
+          "hex": "a914a61b218139c3cd63abbfc6d221f28019d86837d687",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3GqJbUSzTZomr9Jjz9Rj4Kb3idbaA7FwvA"
+          ]
+        }
+      },
+      {
+        "value": 0.04904543,
+        "n": 9,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 8aeadc4ab5fbdf6fba1396405388868395cf4f1b OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9148aeadc4ab5fbdf6fba1396405388868395cf4f1b88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1DfXbsJTxDuhtbBNz5njZdSZcGGBcerYPr"
+          ]
+        }
+      },
+      {
+        "value": 0.0355541,
+        "n": 10,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 f9e4dab5529cda97fe7d0ea9c6dfd828c9160c82 OP_EQUAL",
+          "hex": "a914f9e4dab5529cda97fe7d0ea9c6dfd828c9160c8287",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3QULLPQRcFmQNCUyR66wSgJm8YAFBAq7Yg"
+          ]
+        }
+      },
+      {
+        "value": 0.0085,
+        "n": 11,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 551343b34a385e392562ead50b2588ee97307c37 OP_EQUAL",
+          "hex": "a914551343b34a385e392562ead50b2588ee97307c3787",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "39SrSNFBzzMqZw1mAaLwotixK4oRQymBw2"
+          ]
+        }
+      },
+      {
+        "value": 0.00991826,
+        "n": 12,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 633a3cd7a6ce04165619539a87ee5671d0537e4e OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914633a3cd7a6ce04165619539a87ee5671d0537e4e88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1A3ffR5ag9iJM8jrkYdF4ohx9E87RkLBGt"
+          ]
+        }
+      },
+      {
+        "value": 0.02,
+        "n": 13,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 9f59e0163f592c3de094bc12ae338d8140c77c54 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9149f59e0163f592c3de094bc12ae338d8140c77c5488ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1FXa79ea27eR92vxSiVGnwtjRNjSMLkHzx"
+          ]
+        }
+      },
+      {
+        "value": 0.2495,
+        "n": 14,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 7b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee2 OP_EQUAL",
+          "hex": "a9147b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee287",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3Cx1u9nW5Q585bBqkVz1ETjogZZB67d1KZ"
+          ]
+        }
+      },
+      {
+        "value": 0.47461784,
+        "n": 15,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 221a6189701ce0874c4ba6fc0f91579f68f05895 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914221a6189701ce0874c4ba6fc0f91579f68f0589588ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "147KaWNp6T7BRBhWkwKaYobPXX7ydyuo3S"
+          ]
+        }
+      },
+      {
+        "value": 0.029,
+        "n": 16,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 1e5f0577643f2c17ecd5037034824e6b55f2f37f OP_EQUAL",
+          "hex": "a9141e5f0577643f2c17ecd5037034824e6b55f2f37f87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "34Tc2Vqb4xC2UanZaDUBRWvGXrETVrSmiY"
+          ]
+        }
+      },
+      {
+        "value": 0.0495,
+        "n": 17,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 a70f43b2b0bded27e58ba7997e15936d86b5b4cd OP_EQUAL",
+          "hex": "a914a70f43b2b0bded27e58ba7997e15936d86b5b4cd87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3GvM4AupUGYA5asAZWcR88qBbRepyd8VE4"
+          ]
+        }
+      },
+      {
+        "value": 0.018,
+        "n": 18,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 2388eb0f84b2ec9d0e35ceda9019e389aee2243f OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9142388eb0f84b2ec9d0e35ceda9019e389aee2243f88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "14EtfxYvGBbCMDZGCW2sp7NB2qDwFZBB8L"
+          ]
+        }
+      },
+      {
+        "value": 0.26611821,
+        "n": 19,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 e0a8d9fe6832f56524ad51e40c6b34cc212dad4c OP_EQUAL",
+          "hex": "a914e0a8d9fe6832f56524ad51e40c6b34cc212dad4c87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3NAuZXN4HCHnAubDpcXHJBQXJsShuER2Rs"
+          ]
+        }
+      },
+      {
+        "value": 0.0295,
+        "n": 20,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 97dfc57e73ab8a3b9bda027b79a28bc2e9fc1931 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91497dfc57e73ab8a3b9bda027b79a28bc2e9fc193188ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1Er36t3XCRycpJYZ4J4FH5jQFSu8K9VVyU"
+          ]
+        }
+      },
+      {
+        "value": 0.0314192,
+        "n": 21,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 be3d917f8b403b3e6b1cf900e29d686bddc8ce64 OP_EQUAL",
+          "hex": "a914be3d917f8b403b3e6b1cf900e29d686bddc8ce6487",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3K2v4qRPzHD2J2VRwwXtUf5BpFtTB8HfRj"
+          ]
+        }
+      },
+      {
+        "value": 0.00322,
+        "n": 22,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f7 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1NubvtWw5ZfcFaKNAgg199wpuvFcnP4BoD"
+          ]
+        }
+      },
+      {
+        "value": 1.9995,
+        "n": 23,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 e366f89679d01a89599c9794a35872e5f3cb3d29 OP_EQUAL",
+          "hex": "a914e366f89679d01a89599c9794a35872e5f3cb3d2987",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3NRQfeFCWG3SqbK1ATfsZTVXS6ZD33i6Rr"
+          ]
+        }
+      },
+      {
+        "value": 0.15653823,
+        "n": 24,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 af5c84f9b702a4c60611b6272c6670c4e9614741 OP_EQUAL",
+          "hex": "a914af5c84f9b702a4c60611b6272c6670c4e961474187",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3HgF1UdMmdgv1kmTc8BZVBhGMXmywny2qL"
+          ]
+        }
+      },
+      {
+        "value": 0.026613,
+        "n": 25,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 2a80328a0c51051bf0e76eddbf5342178128096f OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9142a80328a0c51051bf0e76eddbf5342178128096f88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "14sixNSgFLN9zEmtcTtWAX7WsAWiwfiRir"
+          ]
+        }
+      },
+      {
+        "value": 0.00707306,
+        "n": 26,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 370628b7101a7ff461de2ab0a80a8703317c7811 OP_EQUAL",
+          "hex": "a914370628b7101a7ff461de2ab0a80a8703317c781187",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "36hxU2pmkkU1TnHn7wdrDYSkYpdm7bQ5Co"
+          ]
+        }
+      },
+      {
+        "value": 0.00880634,
+        "n": 27,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 166c9a23dc39fbd57e58ff794069d083933cbc4c OP_EQUAL",
+          "hex": "a914166c9a23dc39fbd57e58ff794069d083933cbc4c87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "33jata4jJH1a4tnpvSGzmNwfd4yQvKigEB"
+          ]
+        }
+      },
+      {
+        "value": 1.657691,
+        "n": 28,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 6f4bceafb26023db265d9abc763ab2ccbd0213ae OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9146f4bceafb26023db265d9abc763ab2ccbd0213ae88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1B9UpUvgSNEqCJZPWGCTQj9Veg21jkvaGR"
+          ]
+        }
+      },
+      {
+        "value": 0.00593755,
+        "n": 29,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 fc8d98b2a4ea22f24e50261fd065afd99a8274a0 OP_EQUAL",
+          "hex": "a914fc8d98b2a4ea22f24e50261fd065afd99a8274a087",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3QiPqBRvzvVQYpVAJtuwjNY4bsLX1CF6F5"
+          ]
+        }
+      },
+      {
+        "value": 0.00308227,
+        "n": 30,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 d1803af27bed138379b501e91f368d500b0b49e7 OP_EQUAL",
+          "hex": "a914d1803af27bed138379b501e91f368d500b0b49e787",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3LnkmEMq99eLSSJRH3q1UickE2nKq5QH3C"
+          ]
+        }
+      },
+      {
+        "value": 0.01524004,
+        "n": 31,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 e39546887c31afee7a067432902239f44e644067 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914e39546887c31afee7a067432902239f44e64406788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1MkMDPeYqNL4UytZCQt9QQnWYiuDwdxqom"
+          ]
+        }
+      },
+      {
+        "value": 0.00320799,
+        "n": 32,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 62830624a7d20d6c86ceeeac5a3e7bdea6773927 OP_EQUAL",
+          "hex": "a91462830624a7d20d6c86ceeeac5a3e7bdea677392787",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3Afu73rZdGhcuvZXLy868Q45ZfNmuwsJqC"
+          ]
+        }
+      },
+      {
+        "value": 0.16818798,
+        "n": 33,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 66b967a217fc91d260025d46c9c9eacb746b5f9d OP_EQUAL",
+          "hex": "a91466b967a217fc91d260025d46c9c9eacb746b5f9d87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3B4AxGCwpojNPr6o2VFkqjSadnrMzDseqX"
+          ]
+        }
+      },
+      {
+        "value": 0.02369191,
+        "n": 34,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 0f530ba894b185be3fd809e3992145f533e99536 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9140f530ba894b185be3fd809e3992145f533e9953688ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "12Q2cz1AcyMrcttBrVTyQLaJpWjoEjyQQ7"
+          ]
+        }
+      },
+      {
+        "value": 0.001815,
+        "n": 35,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 df9443d2b7b497d1e7a950379f95be6ba9ea5628 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914df9443d2b7b497d1e7a950379f95be6ba9ea562888ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1MPBJQa8fCy8ieQicaFRVj965uTdi6Ax9z"
+          ]
+        }
+      },
+      {
+        "value": 0.0015,
+        "n": 36,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a OP_EQUAL",
+          "hex": "a914ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3LNtc6TnCNaYQE2s5tm3CXsBxzS1GvSGLD"
+          ]
+        }
+      },
+      {
+        "value": 0.23089985,
+        "n": 37,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 1fec4449c7ba080cf0c85eb87ab0c855f0c3959d OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9141fec4449c7ba080cf0c85eb87ab0c855f0c3959d88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "13unz3oktsAkNXiopiCGQV1X8E4z35CAKo"
+          ]
+        }
+      },
+      {
+        "value": 0.04740793,
+        "n": 38,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 e5527898cbf243993a8b5b967120cc9a9a96d092 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914e5527898cbf243993a8b5b967120cc9a9a96d09288ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1MuYY7yugviXBcFY7i9ikFxjZ6hDVCkLHC"
+          ]
+        }
+      },
+      {
+        "value": 0.00610039,
+        "n": 39,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 34f2329553b026ee1aa0c02dc0743ae0cf0062a7 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91434f2329553b026ee1aa0c02dc0743ae0cf0062a788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "15pxHADHoN45jPxjNyxxgE3Lw8cTEDEQNF"
+          ]
+        }
+      },
+      {
+        "value": 0.11053671,
+        "n": 40,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 9f2ad2868872be8c065cc9e2e20adf31e0cc44d5 OP_EQUAL",
+          "hex": "a9149f2ad2868872be8c065cc9e2e20adf31e0cc44d587",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3GCcfPrgAAqpE9vLPeNcUHdUUFMkNh2jX7"
+          ]
+        }
+      },
+      {
+        "value": 0.03754281,
+        "n": 41,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 50c4073088d9ecfa0791033d17a992e8b779f127 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91450c4073088d9ecfa0791033d17a992e8b779f12788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "18N3tckwus8UXADPJEYzmxBMZ5m8JbG9hU"
+          ]
+        }
+      },
+      {
+        "value": 0.06452373,
+        "n": 42,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 2a27eb2171827358522c29a659aaea0f50b77579 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9142a27eb2171827358522c29a659aaea0f50b7757988ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "14quCeCm2ngSgU2HqZpcdDtCQDT8rsCFMm"
+          ]
+        }
+      },
+      {
+        "value": 0.30842538,
+        "n": 43,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 b8d0465ed10eac76fc86646ace6fa64b64cf357e OP_EQUAL",
+          "hex": "a914b8d0465ed10eac76fc86646ace6fa64b64cf357e87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3JYDm2sy128oyvENgtXhE1YUfugo8Ym3qd"
+          ]
+        }
+      },
+      {
+        "value": 0.0311296,
+        "n": 44,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 faecf0266209f760f5d5ec498f74a0ecca351a62 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914faecf0266209f760f5d5ec498f74a0ecca351a6288ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1Psmmhrdg3FSPdq57ApmkMyVpbrjTBWctt"
+          ]
+        }
+      },
+      {
+        "value": 0.01411207,
+        "n": 45,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 2e30c6bb9396a24c4cdd56f20c74f7681d812d2b OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9142e30c6bb9396a24c4cdd56f20c74f7681d812d2b88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "15DEWrw7xzinkHAarjHo33cNrfyAvj87mg"
+          ]
+        }
+      },
+      {
+        "value": 1.2005,
+        "n": 46,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 69f3751d9b18b84c15ddb3d1a5349657585c61a7 OP_EQUAL",
+          "hex": "a91469f3751d9b18b84c15ddb3d1a5349657585c61a787",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3BMEXQeB9Mr5hpgYdpnJLC1MQKHQ1NfYtM"
+          ]
+        }
+      },
+      {
+        "value": 0.04702,
+        "n": 47,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 65a11389f21ba13527b1c7629e999719f3241259 OP_EQUAL",
+          "hex": "a91465a11389f21ba13527b1c7629e999719f324125987",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3AxP8hReJhzjozXfaY34gDeYbGQp6LSbJh"
+          ]
+        }
+      },
+      {
+        "value": 0.9995,
+        "n": 48,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 dd005ce549e1a57453dfcb8fef3522d83f069432 OP_EQUAL",
+          "hex": "a914dd005ce549e1a57453dfcb8fef3522d83f06943287",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3MqZh9ips9W5ekHbzLaRxs8xZZTbJzTLwd"
+          ]
+        }
+      },
+      {
+        "value": 0.0023939,
+        "n": 49,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 3ab72a89b9706691ac4de3871e0f63efaeed880b OP_EQUAL",
+          "hex": "a9143ab72a89b9706691ac4de3871e0f63efaeed880b87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "373UYH5oSBagXbohkbVDiT45bvM9ARVJiN"
+          ]
+        }
+      },
+      {
+        "value": 0.15724136,
+        "n": 50,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 b5022f11a874eea98b9f7e34c80d143f3b036789 OP_EQUAL",
+          "hex": "a914b5022f11a874eea98b9f7e34c80d143f3b03678987",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3JC6r16n98UKgR5urase5cpYExr4eJtKBn"
+          ]
+        }
+      },
+      {
+        "value": 1.4145,
+        "n": 51,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 87db0ef6cde94004fabec6bb7dfb675fd691b670 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91487db0ef6cde94004fabec6bb7dfb675fd691b67088ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1DPLeM2Xzr9aW5qxSX1TaN8MYVwm2nFtgU"
+          ]
+        }
+      },
+      {
+        "value": 0.04914942,
+        "n": 52,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 b827bbd222b251930da17d0a86ba0c5e19e3b27c OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914b827bbd222b251930da17d0a86ba0c5e19e3b27c88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1Hniw3NkC35q2N9J2ZKAgQtiCcJdo1HMom"
+          ]
+        }
+      },
+      {
+        "value": 0.00990259,
+        "n": 53,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 a0c63d441be7fd967ae9ef4af028092b446a43cb OP_EQUAL",
+          "hex": "a914a0c63d441be7fd967ae9ef4af028092b446a43cb87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3GM7X9RgBkBL2TvbfmAzLfzVVxaEoBfSkY"
+          ]
+        }
+      },
+      {
+        "value": 0.0015,
+        "n": 54,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 cf8df73caf54d7a8e54b1247c51b2566ae128fc1 OP_EQUAL",
+          "hex": "a914cf8df73caf54d7a8e54b1247c51b2566ae128fc187",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3LcTsCyUCfNmkoZ3Jvr1cnnq27A4AjAEqj"
+          ]
+        }
+      },
+      {
+        "value": 0.0368,
+        "n": 55,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 de796fa9d384058fcaab5b37c45803af4a739931 OP_EQUAL",
+          "hex": "a914de796fa9d384058fcaab5b37c45803af4a73993187",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3MyMQfUWdbrcokj7A4AKFLZqDBMq3gsbjx"
+          ]
+        }
+      },
+      {
+        "value": 0.13156522,
+        "n": 56,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 04308a751559f8af188dc67a0dac238447e91416 OP_EQUAL",
+          "hex": "a91404308a751559f8af188dc67a0dac238447e9141687",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "325AmzHDJ7XaTPiuudj8iBCnJiUsiZVpwM"
+          ]
+        }
+      },
+      {
+        "value": 0.15517116,
+        "n": 57,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 28c28ea4ab911d65d2568fe2a2ade143f1804b15 OP_EQUAL",
+          "hex": "a91428c28ea4ab911d65d2568fe2a2ade143f1804b1587",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "35QY2HfqzscoKuMWR9GRqyELcRvguNYvdm"
+          ]
+        }
+      },
+      {
+        "value": 0.02739512,
+        "n": 58,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 6e9f5b3aefdd8b079e2d77a682a6276640b5a779 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9146e9f5b3aefdd8b079e2d77a682a6276640b5a77988ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1B5vENoZK1VAEt5xfuQLZ5cApGoyjNspWB"
+          ]
+        }
+      },
+      {
+        "value": 0.024003,
+        "n": 59,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 185f5481e1c5ab6d9926207fbfd86d85d51d7bdc OP_EQUAL",
+          "hex": "a914185f5481e1c5ab6d9926207fbfd86d85d51d7bdc87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "33utLoLCbf2WwccKyvpfRYdCncQUWGLBXK"
+          ]
+        }
+      },
+      {
+        "value": 0.0995,
+        "n": 60,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 f4761ebdd81b9b7e06a207a7a3d55332d016db3e OP_EQUAL",
+          "hex": "a914f4761ebdd81b9b7e06a207a7a3d55332d016db3e87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3PycJUfHHBZmGehQUGbSTmD9Pdz2s61CtY"
+          ]
+        }
+      },
+      {
+        "value": 0.33990654,
+        "n": 61,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 9841711ba7b69aa821e5e4e78b07013789c0f1cf OP_EQUAL",
+          "hex": "a9149841711ba7b69aa821e5e4e78b07013789c0f1cf87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3Fa52gPVesWsG66JZGqRyjY3Pu8jPYPSYA"
+          ]
+        }
+      },
+      {
+        "value": 0.0095,
+        "n": 62,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 54d1d3982910165eddd607622cf2aa2518cf5405 OP_EQUAL",
+          "hex": "a91454d1d3982910165eddd607622cf2aa2518cf540587",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "39RW3fJJXZHaikDoJHWaHSGPYeVGuCSngD"
+          ]
+        }
+      },
+      {
+        "value": 0.3791111,
+        "n": 63,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 0ac0973483473fc700352483d72211ef74b7f77a OP_EQUAL",
+          "hex": "a9140ac0973483473fc700352483d72211ef74b7f77a87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "32fsPtquwdaAJXaWUhAHfmJZUmSo4iUkBT"
+          ]
+        }
+      },
+      {
+        "value": 0.0344179,
+        "n": 64,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 05da50df6705f7528c0de919a87a02ca74b635fc OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91405da50df6705f7528c0de919a87a02ca74b635fc88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1XwupEjUAd8frdAFMSUaRATgXUhQM2u1y"
+          ]
+        }
+      },
+      {
+        "value": 0.07881161,
+        "n": 65,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 69f37547d53a98c778289f01066ab23b41680905 OP_EQUAL",
+          "hex": "a91469f37547d53a98c778289f01066ab23b4168090587",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3BMEXTEn8uR2utJUEAQxEG2mare7KeZKxt"
+          ]
+        }
+      },
+      {
+        "value": 0.00247,
+        "n": 66,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 2889396473e1709927065dc363210386afd99407 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9142889396473e1709927065dc363210386afd9940788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "14hLRBGW8gRCX8vUPLeBzE6T8cQ2A8zNhz"
+          ]
+        }
+      },
+      {
+        "value": 1.0,
+        "n": 67,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 c625e5f34f3b2617326adbae2e73a1bb0a6be371 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914c625e5f34f3b2617326adbae2e73a1bb0a6be37188ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1K4iCCWzLgawbAJbYbDG9v81z6n6y72KNq"
+          ]
+        }
+      },
+      {
+        "value": 2.08197368,
+        "n": 68,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 2d717f7aa62e57ba6eaceca169cd7f63a54d679b OP_EQUAL",
+          "hex": "a9142d717f7aa62e57ba6eaceca169cd7f63a54d679b87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "35qJJ9pwEoEwdnbfnsN1L1jdFRiyZKBEAK"
+          ]
+        }
+      },
+      {
+        "value": 0.01,
+        "n": 69,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 f4f89313803d610fa472a5849d2389ca6df3b900 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914f4f89313803d610fa472a5849d2389ca6df3b90088ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1PLHf4siiNLC61LXZswQUznuMUCWcRa3e7"
+          ]
+        }
+      },
+      {
+        "value": 0.1995,
+        "n": 70,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 f63784063000439d873f12041e8799d0252db89e OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914f63784063000439d873f12041e8799d0252db89e88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "1PSsjVRff6QpkJfDLyi3jVAePTSh4t4WdL"
+          ]
+        }
+      },
+      {
+        "value": 0.03005473,
+        "n": 71,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 4b098f67e04f711baa310758169f129cbda6385f OP_EQUAL",
+          "hex": "a9144b098f67e04f711baa310758169f129cbda6385f87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "38Xn4Bcu6A6u9ShKDRhLoVTG8tkmC9aMSp"
+          ]
+        }
+      },
+      {
+        "value": 0.00190118,
+        "n": 72,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 494ee9282fb208d60a6765c11310a09524280137 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914494ee9282fb208d60a6765c11310a0952428013788ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "17gcrpZVCmvdH3o3H1orsRaQ7wDAyNQ39j"
+          ]
+        }
+      },
+      {
+        "value": 0.03079627,
+        "n": 73,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 69d1a07e7d5fcb62a322c8fb24ae76ebe3c88374 OP_EQUAL",
+          "hex": "a91469d1a07e7d5fcb62a322c8fb24ae76ebe3c8837487",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3BLXzpY4LN5mSXpBfkoMsAABNLRqdQ8EKM"
+          ]
+        }
+      },
+      {
+        "value": 0.0995,
+        "n": 74,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 ffe19b0c48d473db72ca2d243476183b64b4f5d4 OP_EQUAL",
+          "hex": "a914ffe19b0c48d473db72ca2d243476183b64b4f5d487",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3R1zVpJKgvxKXuqL2bYm9xS8gwLWAiL9uC"
+          ]
+        }
+      },
+      {
+        "value": 0.01924206,
+        "n": 75,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 816b46471ee03653597995a2dfa65f0f39eaaf0a OP_EQUAL",
+          "hex": "a914816b46471ee03653597995a2dfa65f0f39eaaf0a87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3DVKbrWQbiLMuaaWRJzsHAfMMHiC1uj5f5"
+          ]
+        }
+      },
+      {
+        "value": 0.01392176,
+        "n": 76,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 88d8d90979c558004f248cfcf0ae6efa3061100f OP_EQUAL",
+          "hex": "a91488d8d90979c558004f248cfcf0ae6efa3061100f87",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "3EAbbUup1nBgprztckGgKJRyB7rCiSWBPP"
+          ]
+        }
+      },
+      {
+        "value": 0.0134,
+        "n": 77,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 1302fb1cdc92135634e69f69feba89070a1c1b2f OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9141302fb1cdc92135634e69f69feba89070a1c1b2f88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "12jXQmCHi93zKH1HQgc5fsn11beeKdMwL7"
+          ]
+        }
+      }
+    ],
+    "hex": "020000000001050e37af28e0fb9394d38ed146ea81b4cec72b21b6e956cbbb9581e15413ac1cbc000000006b483045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffff2221d7671a04a3fdded4bdd174be3f1b9b0553bbdbd4c598d79f206f2eafbb40000000006b483045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffff6bcb7fe694092d3d0386df96e884c6edc7139922f85fb4a139bb900127e9abf5000000006a4730440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffffa8d8b433b92a6f95afb76c5071cd58a0b175f4a12851d2c952e94c5d0d76dd7c010000006b4830450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffffce861786ff0be984530fbf972b68a63412f985f6e46b7d324f654e4ca1faa7732d00000000feffffff4ef07e0e00000000001976a91466f8da41c6bb10975f565bde68b5df07003c59cb88ac525457030000000017a91446e14b4a4ff41785017080cd63aa5d17513e185487b0feea0b0000000017a91499bbebbdf7f2dc038b904103237765a77282b42b8725124900000000001976a914c78ac0df6b8241075d66f7f986653604a2c6a6fc88aca00bd100000000001976a91479f1db0274de574d49f9fc794b349ef81529fb1888acc03b47030000000017a914840f4d27071f400c5674b1a686235cb641ef34b887d1a320110000000017a914c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe9287063e05000000000017a914d58ee5f1a2bc153ce58145676a679d7b31a1a5ae8790a434000000000017a914a61b218139c3cd63abbfc6d221f28019d86837d6875fd64a00000000001976a9148aeadc4ab5fbdf6fba1396405388868395cf4f1b88ac524036000000000017a914f9e4dab5529cda97fe7d0ea9c6dfd828c9160c828750f80c000000000017a914551343b34a385e392562ead50b2588ee97307c378752220f00000000001976a914633a3cd7a6ce04165619539a87ee5671d0537e4e88ac80841e00000000001976a9149f59e0163f592c3de094bc12ae338d8140c77c5488acf0b47c010000000017a9147b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee2879835d402000000001976a914221a6189701ce0874c4ba6fc0f91579f68f0589588ac20402c000000000017a9141e5f0577643f2c17ecd5037034824e6b55f2f37f87f0874b000000000017a914a70f43b2b0bded27e58ba7997e15936d86b5b4cd8740771b00000000001976a9142388eb0f84b2ec9d0e35ceda9019e389aee2243f88ac6d1096010000000017a914e0a8d9fe6832f56524ad51e40c6b34cc212dad4c8770032d00000000001976a91497dfc57e73ab8a3b9bda027b79a28bc2e9fc193188ac20f12f000000000017a914be3d917f8b403b3e6b1cf900e29d686bddc8ce6487d0e90400000000001976a914f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f788acb0feea0b0000000017a914e366f89679d01a89599c9794a35872e5f3cb3d2987bfdbee000000000017a914af5c84f9b702a4c60611b6272c6670c4e961474187b49b2800000000001976a9142a80328a0c51051bf0e76eddbf5342178128096f88aceaca0a000000000017a914370628b7101a7ff461de2ab0a80a8703317c781187fa6f0d000000000017a914166c9a23dc39fbd57e58ff794069d083933cbc4c878c6fe109000000001976a9146f4bceafb26023db265d9abc763ab2ccbd0213ae88ac5b0f09000000000017a914fc8d98b2a4ea22f24e50261fd065afd99a8274a08703b404000000000017a914d1803af27bed138379b501e91f368d500b0b49e78724411700000000001976a914e39546887c31afee7a067432902239f44e64406788ac1fe504000000000017a91462830624a7d20d6c86ceeeac5a3e7bdea6773927876ea200010000000017a91466b967a217fc91d260025d46c9c9eacb746b5f9d87a7262400000000001976a9140f530ba894b185be3fd809e3992145f533e9953688acfcc40200000000001976a914df9443d2b7b497d1e7a950379f95be6ba9ea562888acf04902000000000017a914ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a8741536001000000001976a9141fec4449c7ba080cf0c85eb87ab0c855f0c3959d88acb9564800000000001976a914e5527898cbf243993a8b5b967120cc9a9a96d09288acf74e0900000000001976a91434f2329553b026ee1aa0c02dc0743ae0cf0062a788ac67aaa8000000000017a9149f2ad2868872be8c065cc9e2e20adf31e0cc44d58729493900000000001976a91450c4073088d9ecfa0791033d17a992e8b779f12788ac95746200000000001976a9142a27eb2171827358522c29a659aaea0f50b7757988acaa9ed6010000000017a914b8d0465ed10eac76fc86646ace6fa64b64cf357e8700802f00000000001976a914faecf0266209f760f5d5ec498f74a0ecca351a6288ac87881500000000001976a9142e30c6bb9396a24c4cdd56f20c74f7681d812d2b88ac50d127070000000017a91469f3751d9b18b84c15ddb3d1a5349657585c61a78730bf47000000000017a91465a11389f21ba13527b1c7629e999719f324125987b01df5050000000017a914dd005ce549e1a57453dfcb8fef3522d83f069432871ea703000000000017a9143ab72a89b9706691ac4de3871e0f63efaeed880b8768eeef000000000017a914b5022f11a874eea98b9f7e34c80d143f3b03678987105b6e08000000001976a91487db0ef6cde94004fabec6bb7dfb675fd691b67088acfefe4a00000000001976a914b827bbd222b251930da17d0a86ba0c5e19e3b27c88ac331c0f000000000017a914a0c63d441be7fd967ae9ef4af028092b446a43cb87f04902000000000017a914cf8df73caf54d7a8e54b1247c51b2566ae128fc187002738000000000017a914de796fa9d384058fcaab5b37c45803af4a73993187aac0c8000000000017a91404308a751559f8af188dc67a0dac238447e9141687bcc5ec000000000017a91428c28ea4ab911d65d2568fe2a2ade143f1804b158738cd2900000000001976a9146e9f5b3aefdd8b079e2d77a682a6276640b5a77988ac2ca024000000000017a914185f5481e1c5ab6d9926207fbfd86d85d51d7bdc8730d397000000000017a914f4761ebdd81b9b7e06a207a7a3d55332d016db3e87fea706020000000017a9149841711ba7b69aa821e5e4e78b07013789c0f1cf87f07e0e000000000017a91454d1d3982910165eddd607622cf2aa2518cf540587467a42020000000017a9140ac0973483473fc700352483d72211ef74b7f77a877e843400000000001976a91405da50df6705f7528c0de919a87a02ca74b635fc88acc94178000000000017a91469f37547d53a98c778289f01066ab23b4168090587d8c40300000000001976a9142889396473e1709927065dc363210386afd9940788ac00e1f505000000001976a914c625e5f34f3b2617326adbae2e73a1bb0a6be37188acf8d6680c0000000017a9142d717f7aa62e57ba6eaceca169cd7f63a54d679b8740420f00000000001976a914f4f89313803d610fa472a5849d2389ca6df3b90088acb0693001000000001976a914f63784063000439d873f12041e8799d0252db89e88ac21dc2d000000000017a9144b098f67e04f711baa310758169f129cbda6385f87a6e60200000000001976a914494ee9282fb208d60a6765c11310a0952428013788accbfd2e000000000017a91469d1a07e7d5fcb62a322c8fb24ae76ebe3c883748730d397000000000017a914ffe19b0c48d473db72ca2d243476183b64b4f5d4876e5c1d000000000017a914816b46471ee03653597995a2dfa65f0f39eaaf0a87303e15000000000017a91488d8d90979c558004f248cfcf0ae6efa3061100f8760721400000000001976a9141302fb1cdc92135634e69f69feba89070a1c1b2f88ac0000000002483045022100b7b6368e45383b2da463ba56397a1966b94be5ef860ac95f1067e62a4531e75a022077bc58f3ea606219fe086f291d39b805faec10c848b525f4997f32979bab5aca01210253a13bae39c5604dc4e9634c10e87e33d0c2d1a618efc0726af5a4a4ea81f7abb6e10800",
+    "blockhash": "0000000000000000000ae5f893bc9156bf24938ff6ee1d5a1555a6b7d82ce176",
+    "confirmations": 13533,
+    "time": 1561311885,
+    "blocktime": 1561311885
+  },
+  "firo_sigmaspend": {
+    "hex": "0100000006000000000000000000000000000000000000000000000000000000000000000001000000fd2805c4aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c42c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3bffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c4e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c477c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5effffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c47252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c451f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703ffffffff01a8ff327a0a0000001976a914d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d88acd7000500",
+    "txid": "d4b9f5a01a43b1d592999f9fd6fe64aa8f63ac42abab43090938321064c1ec1f",
+    "hash": "d4b9f5a01a43b1d592999f9fd6fe64aa8f63ac42abab43090938321064c1ec1f",
+    "size": 8222,
+    "vsize": 8222,
+    "version": 1,
+    "locktime": 327895,
+    "type": 0,
+    "vin": [
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182",
+          "hex": "c4aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182"
+        },
+        "value": 100.0,
+        "valueSat": 10000000000,
+        "sequence": 4294967295
+      },
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND 2c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3b",
+          "hex": "c42c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3b"
+        },
+        "value": 100.0,
+        "valueSat": 10000000000,
+        "sequence": 4294967295
+      },
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831",
+          "hex": "c4e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831"
+        },
+        "value": 100.0,
+        "valueSat": 10000000000,
+        "sequence": 4294967295
+      },
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND 77c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5e",
+          "hex": "c477c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5e"
+        },
+        "value": 100.0,
+        "valueSat": 10000000000,
+        "sequence": 4294967295
+      },
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND 7252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1",
+          "hex": "c47252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1"
+        },
+        "value": 25.0,
+        "valueSat": 2500000000,
+        "sequence": 4294967295
+      },
+      {
+        "anonymityGroup": 1,
+        "scriptSig": {
+          "asm": "OP_SIGMASPEND 51f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703",
+          "hex": "c451f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703"
+        },
+        "value": 25.0,
+        "valueSat": 2500000000,
+        "sequence": 4294967295
+      }
+    ],
+    "vout": [
+      {
+        "value": 449.9983556,
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a914d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "aLU95oKBFMSc7RWwtsGEBuK3ihFkcgKbfL"
+          ]
+        },
+        "spentTxId": "7a3f13c9e5088f64abbff0bfd8b95886b17659018972f643e3ee25c69b852928",
+        "spentIndex": 0,
+        "spentHeight": 328253
+      }
+    ],
+    "blockhash": "c06c3a20c46614e13d0c6b449b4abc42ebfab26172fafc4e00105dd68dce9305",
+    "height": 327896,
+    "confirmations": 13521,
+    "time": 1607820997,
+    "blocktime": 1607820997
+  },
+  "kmd_coinbase_transaction": {
+    "hex": "0400008085202f89010000000000000000000000000000000000000000000000000000000000000000ffffffff06030a4b020101ffffffff0178e600000000000023210388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2dac1ad92f5d000000000000000000000000000000",
+    "txid": "6f173d96987e765b0fd8a47fdb976e8edc767207f3c0028e17a224380d9a14a3",
+    "overwintered": true,
+    "version": 4,
+    "versiongroupid": "892f2085",
+    "locktime": 1563416858,
+    "expiryheight": 0,
+    "vin": [
+      {
+        "coinbase": "030a4b020101",
+        "sequence": 4294967295
+      }
+    ],
+    "vout": [
+      {
+        "value": 0.00059000,
+        "valueSat": 59000,
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "0388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2d OP_CHECKSIG",
+          "hex": "210388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2dac",
+          "reqSigs": 1,
+          "type": "pubkey",
+          "addresses": [
+            "RM5wffThEVKQdG98uLa2gc8Nk4CzX9Fq4q"
+          ]
+        }
+      }
+    ],
+    "vjoinsplit": [
+    ],
+    "valueBalance": 0.00000000,
+    "vShieldedSpend": [
+    ],
+    "vShieldedOutput": [
+    ],
+    "blockhash": "04b08f77065a70c86fd47e92cbff2cd73b1768428da7c8e328d903d76e8dc37e",
+    "height": 150282,
+    "confirmations": 1,
+    "rawconfirmations": 6,
+    "time": 1563416858,
+    "blocktime": 1563416858
+  },
+  "kmd_parse_fail": {
+    "hex": "0100000001ebca38fa14b1ec029c3e08a2e87940c1f796b1588674b4c386f09626ee702576010000006a4730440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e012103668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998ffffffff03e87006060000000017a914fef59ae800bb89050d25f67be432b231097e1849878758c100000000001976a91473122bcec852f394e51496e39fca5111c3d7ae5688ac00000000000000000a6a08303764643135633400000000",
+    "txid": "88893f05764f5a781f2e555a5b492c064f2269a4a44c51afdbe98fab54361bb5",
+    "overwintered": false,
+    "version": 1,
+    "last_notarized_height": 1415230,
+    "locktime": 0,
+    "vin": [
+      {
+        "txid": "762570ee2696f086c3b4748658b196f7c14079e8a2083e9c02ecb114fa38caeb",
+        "vout": 1,
+        "address": "RKmdZ8QA7XbJ4JGUAvtHtWEogKxfgaQuqv",
+        "scriptSig": {
+          "asm": "30440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e[ALL] 03668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998",
+          "hex": "4730440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e012103668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998"
+        },
+        "value": 1.13766527,
+        "valueSat": 113766527,
+        "sequence": 4294967295
+      }
+    ],
+    "vout": [
+      {
+        "value": 1.01085416,
+        "valueSat": 101085416,
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "OP_HASH160 fef59ae800bb89050d25f67be432b231097e1849 OP_EQUAL",
+          "hex": "a914fef59ae800bb89050d25f67be432b231097e184987",
+          "reqSigs": 1,
+          "type": "scripthash",
+          "addresses": [
+            "bbyNYu11Qs3PowiPr1Su4ozQk7hsVmv821"
+          ]
+        }
+      },
+      {
+        "value": 0.12671111,
+        "valueSat": 12671111,
+        "n": 1,
+        "scriptPubKey": {
+          "asm": "OP_DUP OP_HASH160 73122bcec852f394e51496e39fca5111c3d7ae56 OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a91473122bcec852f394e51496e39fca5111c3d7ae5688ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash",
+          "addresses": [
+            "RKmdZ8QA7XbJ4JGUAvtHtWEogKxfgaQuqv"
+          ]
+        }
+      },
+      {
+        "value": 0.0,
+        "valueSat": 0,
+        "n": 2,
+        "scriptPubKey": {
+          "asm": "OP_RETURN 3037646431356334",
+          "hex": "6a083037646431356334",
+          "type": "nulldata"
+        }
+      }
+    ],
+    "vjoinsplit": [
+    ],
+    "blockhash": "086c0807a67d8411743f7eaf0a687721eadaa6c8190dfd36f4de9d939c796e82",
+    "height": 865648,
+    "confirmations": 549608,
+    "rawconfirmations": 549608,
+    "time": 1528215344,
+    "blocktime": 1528215344
+  },
+  "kmd_raw_confirmations": {
+    "hex": "0400008085202f89010000000000000000000000000000000000000000000000000000000000000000ffffffff0603aed11a0101ffffffff0188b6e11100000000232103fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351ac3b5e4e5e000000000000000000000000000000",
+    "txid": "1b1a413c7205dc07f23ef60ca04d29ca33d72e9f6c473ddd8b02aaac53fb8e7a",
+    "overwintered": true,
+    "version": 4,
+    "last_notarized_height": 1757600,
+    "versiongroupid": "892f2085",
+    "locktime": 1582194235,
+    "expiryheight": 0,
+    "vin": [
+      {
+        "coinbase": "03aed11a0101",
+        "sequence": 4294967295
+      }
+    ],
+    "vout": [
+      {
+        "value": 3.00005,
+        "interest": 0.0,
+        "valueSat": 300005000,
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "03fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351 OP_CHECKSIG",
+          "hex": "2103fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351ac",
+          "reqSigs": 1,
+          "type": "pubkey",
+          "addresses": [
+            "RTPBi5hpdSUARnh9gGahv6tr4ppHDwAkxD"
+          ]
+        }
+      }
+    ],
+    "vjoinsplit": [
+    ],
+    "valueBalance": 0.0,
+    "vShieldedSpend": [
+    ],
+    "vShieldedOutput": [
+    ],
+    "blockhash": "059ad2e93f92de1ff80432ba1227c83739ed76bc78f41630dd6a773dc6595dc8",
+    "height": 1757614,
+    "confirmations": 1,
+    "rawconfirmations": 8,
+    "time": 1582194235,
+    "blocktime": 1582194235
+  },
+  "nav_cold_staking_vout": [
+    {
+      "value": 10,
+      "valuesat": 1000000000,
+      "n": 0,
+      "scriptPubKey": {
+        "asm": "OP_DUP OP_HASH160 e6761d199b7a3137c98056e49b7339b9a7ab3f5e OP_EQUALVERIFY OP_CHECKSIG",
+        "hex": "76a914e6761d199b7a3137c98056e49b7339b9a7ab3f5e88ac",
+        "reqSigs": 1,
+        "type": "pubkeyhash",
+        "addresses": [
+          "NgvY6ZMtLoo2Zseh9MBgTTHN2Uvt6R5XsB"
+        ]
+      },
+      "spentTxId": "4cc8e8ff9b4128f8c013c6bea74d756b44f5f2c7faf9a6303acf9ffc1c4cdb46",
+      "spentHeight": 6506904
+    },
+    {
+      "value": 11403.679,
+      "valuesat": 1140367900000,
+      "n": 1,
+      "scriptPubKey": {
+        "asm": "OP_COINSTAKE OP_IF OP_DUP OP_HASH160 d5169fad89fc585816fb53615440b4cec510e460 OP_EQUALVERIFY OP_CHECKSIG OP_ELSE OP_DUP OP_HASH160 2523d5cf81a07f0a7591af6733ea582da3643069 OP_EQUALVERIFY OP_CHECKSIG OP_ENDIF",
+        "hex": "c66376a914d5169fad89fc585816fb53615440b4cec510e46088ac6776a9142523d5cf81a07f0a7591af6733ea582da364306988ac68",
+        "reqSigs": 1,
+        "type": "cold_staking",
+        "addresses": [
+          "NfLgDYL4C3KKXDS8tLRAFM7spvLykV8v9A",
+          "NPJM7j7P9VhChdXCKRWFto1feWPYcAPQqW"
+        ]
+      }
+    }
+  ],
+  "qtum_call_script": {
+    "blockhash": "b81f26a919bc9d792aeb056d6eea5340b7e334aa3f21144cd0f3c663286ff870",
+    "blocktime": 1589537936,
+    "confirmations": 2457,
+    "hash": "fad39a18206633258a0e77cc59d4606553bab374d05bb3d56cf3f0a701bacfaf",
+    "hex": "0100000003b6eec8104d23c90a0061b3b4aef7c16bab8fb11e2a3764540716e8207dc356eb0b0000006a4730440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff9561b9a318c5021e0ad76ea51a97ceb0a7ea8217ff5bea92c2249484ebc412380c0000006b483045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffffdef6489dee6cd3c88f267176d4aa07cff600c034148b1f2726ebd785c8cee951010000006b483045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff0200ca9a3b00000000625403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c215c80b80000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acdb6bbe5e",
+    "locktime": 1589537755,
+    "size": 594,
+    "time": 1589537936,
+    "txid": "fad39a18206633258a0e77cc59d4606553bab374d05bb3d56cf3f0a701bacfaf",
+    "version": 1,
+    "vin": [
+      {
+        "scriptSig": {
+          "asm": "30440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
+          "hex": "4730440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
+        },
+        "sequence": 4294967295,
+        "txid": "eb56c37d20e816075464372a1eb18fab6bc1f7aeb4b361000ac9234d10c8eeb6",
+        "vout": 11
+      },
+      {
+        "scriptSig": {
+          "asm": "3045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
+          "hex": "483045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
+        },
+        "sequence": 4294967295,
+        "txid": "3812c4eb849424c292ea5bff1782eaa7b0ce971aa56ed70a1e02c518a3b96195",
+        "vout": 12
+      },
+      {
+        "scriptSig": {
+          "asm": "3045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
+          "hex": "483045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
+        },
+        "sequence": 4294967295,
+        "txid": "51e9cec885d7eb26271f8b1434c000f6cf07aad47671268fc8d36cee9d48f6de",
+        "vout": 1
+      }
+    ],
+    "vout": [
+      {
+        "n": 0,
+        "scriptPubKey": {
+          "asm": "4 2500000 40 a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca00 d362e096e873eb7907e205fadc6175c6fec7bc44 OP_CALL",
+          "hex": "5403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c2",
+          "type": "call"
+        },
+        "value": 10.0
+      },
+      {
+        "n": 1,
+        "scriptPubKey": {
+          "addresses": [
+            "qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG"
+          ],
+          "asm": "OP_DUP OP_HASH160 9e032d4b0090a11dc40fe6c47601499a35d55fbb OP_EQUALVERIFY OP_CHECKSIG",
+          "hex": "76a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88ac",
+          "reqSigs": 1,
+          "type": "pubkeyhash"
+        },
+        "value": 21.48255765
+      }
+    ],
+    "vsize": 594,
+    "weight": 2376
+  }
+}
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/rpc/src/lib.rs b/mm2src/mm2_bitcoin/rpc/src/lib.rs
index efbe494421..d901dbdb22 100644
--- a/mm2src/mm2_bitcoin/rpc/src/lib.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/lib.rs
@@ -1,4 +1,5 @@
 extern crate core;
+#[cfg(test)] extern crate lazy_static;
 extern crate log;
 extern crate rustc_hex as hex;
 extern crate serde;
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/get_block_response.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/get_block_response.rs
index bebfd32878..ba29704208 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/get_block_response.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/get_block_response.rs
@@ -124,7 +124,7 @@ mod tests {
         let block = VerboseBlock::default();
         assert_eq!(
             serde_json::to_string(&block).unwrap(),
-            r#"{"hash":"0000000000000000000000000000000000000000000000000000000000000000","confirmations":0,"size":0,"strippedsize":0,"weight":0,"height":null,"version":0,"versionHex":"","merkleroot":"0000000000000000000000000000000000000000000000000000000000000000","tx":[],"time":0,"mediantime":null,"nonce":0,"bits":0,"difficulty":0.0,"chainwork":"0","previousblockhash":null,"nextblockhash":null}"#
+            r#"{"hash":"0000000000000000000000000000000000000000000000000000000000000000","confirmations":0,"size":0,"strippedsize":0,"weight":0,"height":null,"version":0,"versionHex":"","merkleroot":"0000000000000000000000000000000000000000000000000000000000000000","tx":[],"time":0,"mediantime":null,"nonce":0,"bits":0,"difficulty":0.0,"chainwork":"00","previousblockhash":null,"nextblockhash":null}"#
         );
 
         let block = VerboseBlock {
@@ -149,7 +149,7 @@ mod tests {
         };
         assert_eq!(
             serde_json::to_string(&block).unwrap(),
-            r#"{"hash":"0100000000000000000000000000000000000000000000000000000000000000","confirmations":-1,"size":500000,"strippedsize":444444,"weight":5236235,"height":3513513,"version":1,"versionHex":"01","merkleroot":"0200000000000000000000000000000000000000000000000000000000000000","tx":["0300000000000000000000000000000000000000000000000000000000000000","0400000000000000000000000000000000000000000000000000000000000000"],"time":111,"mediantime":100,"nonce":124,"bits":13513,"difficulty":555.555,"chainwork":"3","previousblockhash":"0400000000000000000000000000000000000000000000000000000000000000","nextblockhash":"0500000000000000000000000000000000000000000000000000000000000000"}"#
+            r#"{"hash":"0100000000000000000000000000000000000000000000000000000000000000","confirmations":-1,"size":500000,"strippedsize":444444,"weight":5236235,"height":3513513,"version":1,"versionHex":"01","merkleroot":"0200000000000000000000000000000000000000000000000000000000000000","tx":["0300000000000000000000000000000000000000000000000000000000000000","0400000000000000000000000000000000000000000000000000000000000000"],"time":111,"mediantime":100,"nonce":124,"bits":13513,"difficulty":555.555,"chainwork":"03","previousblockhash":"0400000000000000000000000000000000000000000000000000000000000000","nextblockhash":"0500000000000000000000000000000000000000000000000000000000000000"}"#
         );
     }
 
@@ -197,7 +197,7 @@ mod tests {
         let verbose_response = GetBlockResponse::Verbose(Box::new(block));
         assert_eq!(
             serde_json::to_string(&verbose_response).unwrap(),
-            r#"{"hash":"0000000000000000000000000000000000000000000000000000000000000000","confirmations":0,"size":0,"strippedsize":0,"weight":0,"height":null,"version":0,"versionHex":"","merkleroot":"0000000000000000000000000000000000000000000000000000000000000000","tx":[],"time":0,"mediantime":null,"nonce":0,"bits":0,"difficulty":0.0,"chainwork":"0","previousblockhash":null,"nextblockhash":null}"#
+            r#"{"hash":"0000000000000000000000000000000000000000000000000000000000000000","confirmations":0,"size":0,"strippedsize":0,"weight":0,"height":null,"version":0,"versionHex":"","merkleroot":"0000000000000000000000000000000000000000000000000000000000000000","tx":[],"time":0,"mediantime":null,"nonce":0,"bits":0,"difficulty":0.0,"chainwork":"00","previousblockhash":null,"nextblockhash":null}"#
         );
     }
 }
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
index 74971f8362..30402a9396 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/hash.rs
@@ -15,8 +15,12 @@ macro_rules! impl_hash {
         #[derive(Clone, Copy)]
         pub struct $name(pub [u8; $size]);
 
+        impl $name {
+            pub const fn const_default() -> $name { $name([0; $size]) }
+        }
+
         impl Default for $name {
-            fn default() -> Self { $name([0; $size]) }
+            fn default() -> Self { $name::const_default() }
         }
 
         impl fmt::Display for $name {
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/script.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/script.rs
index d01d8980f2..dfc51b8866 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/script.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/script.rs
@@ -19,6 +19,7 @@ pub enum ScriptType {
     Call,
     Create,
     LelantusMint,
+    ColdStaking,
 }
 
 impl From<GlobalScriptType> for ScriptType {
@@ -36,6 +37,7 @@ impl From<GlobalScriptType> for ScriptType {
             GlobalScriptType::CreateSender => ScriptType::CreateSender,
             GlobalScriptType::Call => ScriptType::Call,
             GlobalScriptType::Create => ScriptType::Create,
+            GlobalScriptType::ColdStaking => ScriptType::ColdStaking,
         }
     }
 }
@@ -59,6 +61,7 @@ impl Serialize for ScriptType {
             ScriptType::Call => "call".serialize(serializer),
             ScriptType::Create => "create".serialize(serializer),
             ScriptType::LelantusMint => "lelantusmint".serialize(serializer),
+            ScriptType::ColdStaking => "cold_staking".serialize(serializer),
         }
     }
 }
@@ -95,6 +98,7 @@ impl<'a> Deserialize<'a> for ScriptType {
                     "call" => Ok(ScriptType::Call),
                     "create" => Ok(ScriptType::Create),
                     "lelantusmint" => Ok(ScriptType::LelantusMint),
+                    "cold_staking" => Ok(ScriptType::ColdStaking),
                     _ => Err(E::invalid_value(Unexpected::Str(value), &self)),
                 }
             }
@@ -144,6 +148,10 @@ mod tests {
         );
         assert_eq!(serde_json::to_string(&ScriptType::Call).unwrap(), r#""call""#);
         assert_eq!(serde_json::to_string(&ScriptType::Create).unwrap(), r#""create""#);
+        assert_eq!(
+            serde_json::to_string(&ScriptType::ColdStaking).unwrap(),
+            r#""cold_staking""#
+        );
     }
 
     #[test]
@@ -196,5 +204,9 @@ mod tests {
             serde_json::from_str::<ScriptType>(r#""create""#).unwrap(),
             ScriptType::Create
         );
+        assert_eq!(
+            serde_json::from_str::<ScriptType>(r#""cold_staking""#).unwrap(),
+            ScriptType::ColdStaking
+        );
     }
 }
diff --git a/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs b/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
index ee2c6316c2..89bc7d3e01 100644
--- a/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
+++ b/mm2src/mm2_bitcoin/rpc/src/v1/types/transaction.rs
@@ -321,7 +321,19 @@ mod tests {
     use super::super::hash::H256;
     use super::super::script::ScriptType;
     use super::*;
+    use lazy_static::lazy_static;
     use serde_json;
+    use std::collections::HashMap;
+
+    const TRANSACTIONS_STR: &str = include_str!("../../for_tests/txTestVectors.json");
+
+    lazy_static! {
+        static ref TRANSACTIONS_MAP: HashMap<String, serde_json::Value> = parse_transactions();
+    }
+
+    fn parse_transactions() -> HashMap<String, serde_json::Value> { serde_json::from_str(TRANSACTIONS_STR).unwrap() }
+
+    fn get_transaction_json(key: &str) -> serde_json::Value { TRANSACTIONS_MAP.get(key).cloned().unwrap() }
 
     #[test]
     fn transaction_input_serialize() {
@@ -595,1448 +607,48 @@ mod tests {
     #[test]
     // https://kmdexplorer.io/tx/88893f05764f5a781f2e555a5b492c064f2269a4a44c51afdbe98fab54361bb5
     fn test_kmd_json_transaction_parse_fail() {
-        let tx_str = r#"{
-			"hex":"0100000001ebca38fa14b1ec029c3e08a2e87940c1f796b1588674b4c386f09626ee702576010000006a4730440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e012103668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998ffffffff03e87006060000000017a914fef59ae800bb89050d25f67be432b231097e1849878758c100000000001976a91473122bcec852f394e51496e39fca5111c3d7ae5688ac00000000000000000a6a08303764643135633400000000",
-			"txid":"88893f05764f5a781f2e555a5b492c064f2269a4a44c51afdbe98fab54361bb5",
-			"overwintered":false,
-			"version":1,
-			"last_notarized_height":1415230,
-			"locktime":0,
-			"vin":[
-				{
-					"txid":"762570ee2696f086c3b4748658b196f7c14079e8a2083e9c02ecb114fa38caeb",
-					"vout":1,
-					"address":"RKmdZ8QA7XbJ4JGUAvtHtWEogKxfgaQuqv",
-					"scriptSig":{
-					"asm":"30440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e[ALL] 03668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998",
-					"hex":"4730440220070963b9460d9bafe7865563574594fc3f823e5cdf7c49a5642dade76502547f022023fd90d41e34e514237f4b5967f83c9af27673d6de2eae3d88079a988fa5be3e012103668e3368c9fb67d8fc808a5fe74d5a8d21b6eed726838122d5f7716fb3328998"
-				},
-					"value":1.13766527,
-					"valueSat":113766527,
-					"sequence":4294967295
-				}
-			],
-			"vout":[
-				{
-					"value":1.01085416,
-					"valueSat":101085416,
-					"n":0,
-					"scriptPubKey":{
-					"asm":"OP_HASH160 fef59ae800bb89050d25f67be432b231097e1849 OP_EQUAL",
-					"hex":"a914fef59ae800bb89050d25f67be432b231097e184987",
-					"reqSigs":1,
-					"type":"scripthash",
-					"addresses":[
-						"bbyNYu11Qs3PowiPr1Su4ozQk7hsVmv821"
-					]
-				}
-				},
-				{
-					"value":0.12671111,
-					"valueSat":12671111,
-					"n":1,
-					"scriptPubKey":{
-					"asm":"OP_DUP OP_HASH160 73122bcec852f394e51496e39fca5111c3d7ae56 OP_EQUALVERIFY OP_CHECKSIG",
-					"hex":"76a91473122bcec852f394e51496e39fca5111c3d7ae5688ac",
-					"reqSigs":1,
-					"type":"pubkeyhash",
-					"addresses":[
-						"RKmdZ8QA7XbJ4JGUAvtHtWEogKxfgaQuqv"
-					]
-				}
-				},
-				{
-					"value":0.0,
-					"valueSat":0,
-					"n":2,
-					"scriptPubKey":{
-					"asm":"OP_RETURN 3037646431356334",
-					"hex":"6a083037646431356334",
-					"type":"nulldata"
-				}
-				}
-			],
-			"vjoinsplit":[
-
-			],
-			"blockhash":"086c0807a67d8411743f7eaf0a687721eadaa6c8190dfd36f4de9d939c796e82",
-			"height":865648,
-			"confirmations":549608,
-			"rawconfirmations":549608,
-			"time":1528215344,
-			"blocktime":1528215344
-		}"#;
-
-        let _tx: Transaction = serde_json::from_str(tx_str).unwrap();
+        let tx_json = get_transaction_json("kmd_parse_fail");
+        let _tx: Transaction = serde_json::from_value(tx_json).unwrap();
     }
 
     #[test]
     fn test_kmd_coinbase_transaction_parse() {
-        let tx_str = r#"{
-			"hex": "0400008085202f89010000000000000000000000000000000000000000000000000000000000000000ffffffff06030a4b020101ffffffff0178e600000000000023210388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2dac1ad92f5d000000000000000000000000000000",
-			"txid": "6f173d96987e765b0fd8a47fdb976e8edc767207f3c0028e17a224380d9a14a3",
-			"overwintered": true,
-			"version": 4,
-			"versiongroupid": "892f2085",
-			"locktime": 1563416858,
-			"expiryheight": 0,
-			"vin": [
-				{
-				  "coinbase": "030a4b020101",
-				  "sequence": 4294967295
-				}
-			],
-			"vout": [
-				{
-				  "value": 0.00059000,
-				  "valueSat": 59000,
-				  "n": 0,
-				  "scriptPubKey": {
-					"asm": "0388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2d OP_CHECKSIG",
-					"hex": "210388392e0885e449ea9745ce7ad2631fdca5288f9d790cee1b696e67c75ad54a2dac",
-					"reqSigs": 1,
-					"type": "pubkey",
-					"addresses": [
-					  "RM5wffThEVKQdG98uLa2gc8Nk4CzX9Fq4q"
-					]
-				  }
-				}
-			],
-			"vjoinsplit": [
-			],
-			"valueBalance": 0.00000000,
-			"vShieldedSpend": [
-			],
-			"vShieldedOutput": [
-			],
-			"blockhash": "04b08f77065a70c86fd47e92cbff2cd73b1768428da7c8e328d903d76e8dc37e",
-			"height": 150282,
-			"confirmations": 1,
-			"rawconfirmations": 6,
-			"time": 1563416858,
-			"blocktime": 1563416858
-		}"#;
-
-        let _tx: Transaction = serde_json::from_str(tx_str).unwrap();
+        let tx_json = get_transaction_json("kmd_coinbase_transaction");
+        let _tx: Transaction = serde_json::from_value(tx_json).unwrap();
     }
 
     // https://live.blockcypher.com/btc/tx/4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e/
     #[test]
     fn test_btc_4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e() {
-        let tx_str = r#"{
-			"txid":"4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e",
-			"hash":"89f9ae508f67ce79181f43cd4823e9899ef3116d658457c992b8411674f80c5c",
-			"version":2,
-			"size":3316,
-			"vsize":3231,
-			"weight":12922,
-			"locktime":582070,
-			"vin":[
-				{
-					"txid":"bc1cac1354e18195bbcb56e9b6212bc7ceb481ea46d18ed39493fbe028af370e",
-					"vout":0,
-					"scriptSig":{
-						"asm":"3045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
-						"hex":"483045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
-					},
-					"sequence":4294967294
-				},
-				{
-					"txid":"40bbaf2e6f209fd798c5d4dbbb53059b1b3fbe74d1bdd4defda3041a67d72122",
-					"vout":0,
-					"scriptSig":{
-						"asm":"3045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
-						"hex":"483045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
-					},
-					"sequence":4294967294
-				},
-				{
-					"txid":"f5abe9270190bb39a1b45ff8229913c7edc684e896df86033d2d0994e67fcb6b",
-					"vout":0,
-					"scriptSig":{
-						"asm":"30440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
-						"hex":"4730440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
-					},
-					"sequence":4294967294
-				},
-				{
-					"txid":"7cdd760d5d4ce952c9d25128a1f475b1a058cd71506cb7af956f2ab933b4d8a8",
-					"vout":1,
-					"scriptSig":{
-						"asm":"30450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf[ALL] 02679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67",
-						"hex":"4830450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67"
-					},
-					"sequence":4294967294
-				},
-				{
-					"txid":"73a7faa14c4e654f327d6be4f685f91234a6682b97bf0f5384e90bff861786ce",
-					"vout":45,
-					"scriptSig":{
-						"asm":"",
-						"hex":""
-					},
-					"txinwitness":[
-						"3045022100b7b6368e45383b2da463ba56397a1966b94be5ef860ac95f1067e62a4531e75a022077bc58f3ea606219fe086f291d39b805faec10c848b525f4997f32979bab5aca01",
-						"0253a13bae39c5604dc4e9634c10e87e33d0c2d1a618efc0726af5a4a4ea81f7ab"
-					],
-					"sequence":4294967294
-				}
-			],
-			"vout":[
-				{
-					"value":0.0095,
-					"n":0,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 66f8da41c6bb10975f565bde68b5df07003c59cb OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91466f8da41c6bb10975f565bde68b5df07003c59cb88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1APU39UZbmpV3RB2EXQmKikKEgovLVoXzv"
-						]
-					}
-				},
-				{
-					"value":0.56054866,
-					"n":1,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 46e14b4a4ff41785017080cd63aa5d17513e1854 OP_EQUAL",
-						"hex":"a91446e14b4a4ff41785017080cd63aa5d17513e185487",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"389o7gRfw13GnRYg4yuhsATJ1iiJ8QFiBv"
-						]
-					}
-				},
-				{
-					"value":1.9995,
-					"n":2,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 99bbebbdf7f2dc038b904103237765a77282b42b OP_EQUAL",
-						"hex":"a91499bbebbdf7f2dc038b904103237765a77282b42b87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3FhtRs6hwos3uS62XhfkoP9PwnGFb9u9AT"
-						]
-					}
-				},
-				{
-					"value":0.04788773,
-					"n":3,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 c78ac0df6b8241075d66f7f986653604a2c6a6fc OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914c78ac0df6b8241075d66f7f986653604a2c6a6fc88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1KC5gvwy5SSarNgL7pVcEdrB7Gj1upeni9"
-						]
-					}
-				},
-				{
-					"value":0.137,
-					"n":4,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 79f1db0274de574d49f9fc794b349ef81529fb18 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91479f1db0274de574d49f9fc794b349ef81529fb1888ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1C7nVdM4vYjSE23SnyEEbdEhzp3LXAwssr"
-						]
-					}
-				},
-				{
-					"value":0.55,
-					"n":5,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 840f4d27071f400c5674b1a686235cb641ef34b8 OP_EQUAL",
-						"hex":"a914840f4d27071f400c5674b1a686235cb641ef34b887",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3DjHT2Ks4bmJUQh8exeQYcGpXuHe4deVy8"
-						]
-					}
-				},
-				{
-					"value":2.87351761,
-					"n":6,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe92 OP_EQUAL",
-						"hex":"a914c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe9287",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3KTnese7izLxXTSBe86fY7Cg2tHyApdsV5"
-						]
-					}
-				},
-				{
-					"value":0.00343558,
-					"n":7,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 d58ee5f1a2bc153ce58145676a679d7b31a1a5ae OP_EQUAL",
-						"hex":"a914d58ee5f1a2bc153ce58145676a679d7b31a1a5ae87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3MAD39R5NPANmrbgybN93jMsiTWd9sgB7A"
-						]
-					}
-				},
-				{
-					"value":0.0345,
-					"n":8,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 a61b218139c3cd63abbfc6d221f28019d86837d6 OP_EQUAL",
-						"hex":"a914a61b218139c3cd63abbfc6d221f28019d86837d687",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3GqJbUSzTZomr9Jjz9Rj4Kb3idbaA7FwvA"
-						]
-					}
-				},
-				{
-					"value":0.04904543,
-					"n":9,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 8aeadc4ab5fbdf6fba1396405388868395cf4f1b OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9148aeadc4ab5fbdf6fba1396405388868395cf4f1b88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1DfXbsJTxDuhtbBNz5njZdSZcGGBcerYPr"
-						]
-					}
-				},
-				{
-					"value":0.0355541,
-					"n":10,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 f9e4dab5529cda97fe7d0ea9c6dfd828c9160c82 OP_EQUAL",
-						"hex":"a914f9e4dab5529cda97fe7d0ea9c6dfd828c9160c8287",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3QULLPQRcFmQNCUyR66wSgJm8YAFBAq7Yg"
-						]
-					}
-				},
-				{
-					"value":0.0085,
-					"n":11,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 551343b34a385e392562ead50b2588ee97307c37 OP_EQUAL",
-						"hex":"a914551343b34a385e392562ead50b2588ee97307c3787",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"39SrSNFBzzMqZw1mAaLwotixK4oRQymBw2"
-						]
-					}
-				},
-				{
-					"value":0.00991826,
-					"n":12,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 633a3cd7a6ce04165619539a87ee5671d0537e4e OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914633a3cd7a6ce04165619539a87ee5671d0537e4e88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1A3ffR5ag9iJM8jrkYdF4ohx9E87RkLBGt"
-						]
-					}
-				},
-				{
-					"value":0.02,
-					"n":13,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 9f59e0163f592c3de094bc12ae338d8140c77c54 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9149f59e0163f592c3de094bc12ae338d8140c77c5488ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1FXa79ea27eR92vxSiVGnwtjRNjSMLkHzx"
-						]
-					}
-				},
-				{
-					"value":0.2495,
-					"n":14,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 7b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee2 OP_EQUAL",
-						"hex":"a9147b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee287",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3Cx1u9nW5Q585bBqkVz1ETjogZZB67d1KZ"
-						]
-					}
-				},
-				{
-					"value":0.47461784,
-					"n":15,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 221a6189701ce0874c4ba6fc0f91579f68f05895 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914221a6189701ce0874c4ba6fc0f91579f68f0589588ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"147KaWNp6T7BRBhWkwKaYobPXX7ydyuo3S"
-						]
-					}
-				},
-				{
-					"value":0.029,
-					"n":16,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 1e5f0577643f2c17ecd5037034824e6b55f2f37f OP_EQUAL",
-						"hex":"a9141e5f0577643f2c17ecd5037034824e6b55f2f37f87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"34Tc2Vqb4xC2UanZaDUBRWvGXrETVrSmiY"
-						]
-					}
-				},
-				{
-					"value":0.0495,
-					"n":17,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 a70f43b2b0bded27e58ba7997e15936d86b5b4cd OP_EQUAL",
-						"hex":"a914a70f43b2b0bded27e58ba7997e15936d86b5b4cd87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3GvM4AupUGYA5asAZWcR88qBbRepyd8VE4"
-						]
-					}
-				},
-				{
-					"value":0.018,
-					"n":18,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 2388eb0f84b2ec9d0e35ceda9019e389aee2243f OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9142388eb0f84b2ec9d0e35ceda9019e389aee2243f88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"14EtfxYvGBbCMDZGCW2sp7NB2qDwFZBB8L"
-						]
-					}
-				},
-				{
-					"value":0.26611821,
-					"n":19,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 e0a8d9fe6832f56524ad51e40c6b34cc212dad4c OP_EQUAL",
-						"hex":"a914e0a8d9fe6832f56524ad51e40c6b34cc212dad4c87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3NAuZXN4HCHnAubDpcXHJBQXJsShuER2Rs"
-						]
-					}
-				},
-				{
-					"value":0.0295,
-					"n":20,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 97dfc57e73ab8a3b9bda027b79a28bc2e9fc1931 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91497dfc57e73ab8a3b9bda027b79a28bc2e9fc193188ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1Er36t3XCRycpJYZ4J4FH5jQFSu8K9VVyU"
-						]
-					}
-				},
-				{
-					"value":0.0314192,
-					"n":21,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 be3d917f8b403b3e6b1cf900e29d686bddc8ce64 OP_EQUAL",
-						"hex":"a914be3d917f8b403b3e6b1cf900e29d686bddc8ce6487",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3K2v4qRPzHD2J2VRwwXtUf5BpFtTB8HfRj"
-						]
-					}
-				},
-				{
-					"value":0.00322,
-					"n":22,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f7 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1NubvtWw5ZfcFaKNAgg199wpuvFcnP4BoD"
-						]
-					}
-				},
-				{
-					"value":1.9995,
-					"n":23,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 e366f89679d01a89599c9794a35872e5f3cb3d29 OP_EQUAL",
-						"hex":"a914e366f89679d01a89599c9794a35872e5f3cb3d2987",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3NRQfeFCWG3SqbK1ATfsZTVXS6ZD33i6Rr"
-						]
-					}
-				},
-				{
-					"value":0.15653823,
-					"n":24,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 af5c84f9b702a4c60611b6272c6670c4e9614741 OP_EQUAL",
-						"hex":"a914af5c84f9b702a4c60611b6272c6670c4e961474187",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3HgF1UdMmdgv1kmTc8BZVBhGMXmywny2qL"
-						]
-					}
-				},
-				{
-					"value":0.026613,
-					"n":25,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 2a80328a0c51051bf0e76eddbf5342178128096f OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9142a80328a0c51051bf0e76eddbf5342178128096f88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"14sixNSgFLN9zEmtcTtWAX7WsAWiwfiRir"
-						]
-					}
-				},
-				{
-					"value":0.00707306,
-					"n":26,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 370628b7101a7ff461de2ab0a80a8703317c7811 OP_EQUAL",
-						"hex":"a914370628b7101a7ff461de2ab0a80a8703317c781187",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"36hxU2pmkkU1TnHn7wdrDYSkYpdm7bQ5Co"
-						]
-					}
-				},
-				{
-					"value":0.00880634,
-					"n":27,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 166c9a23dc39fbd57e58ff794069d083933cbc4c OP_EQUAL",
-						"hex":"a914166c9a23dc39fbd57e58ff794069d083933cbc4c87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"33jata4jJH1a4tnpvSGzmNwfd4yQvKigEB"
-						]
-					}
-				},
-				{
-					"value":1.657691,
-					"n":28,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 6f4bceafb26023db265d9abc763ab2ccbd0213ae OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9146f4bceafb26023db265d9abc763ab2ccbd0213ae88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1B9UpUvgSNEqCJZPWGCTQj9Veg21jkvaGR"
-						]
-					}
-				},
-				{
-					"value":0.00593755,
-					"n":29,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 fc8d98b2a4ea22f24e50261fd065afd99a8274a0 OP_EQUAL",
-						"hex":"a914fc8d98b2a4ea22f24e50261fd065afd99a8274a087",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3QiPqBRvzvVQYpVAJtuwjNY4bsLX1CF6F5"
-						]
-					}
-				},
-				{
-					"value":0.00308227,
-					"n":30,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 d1803af27bed138379b501e91f368d500b0b49e7 OP_EQUAL",
-						"hex":"a914d1803af27bed138379b501e91f368d500b0b49e787",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3LnkmEMq99eLSSJRH3q1UickE2nKq5QH3C"
-						]
-					}
-				},
-				{
-					"value":0.01524004,
-					"n":31,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 e39546887c31afee7a067432902239f44e644067 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914e39546887c31afee7a067432902239f44e64406788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1MkMDPeYqNL4UytZCQt9QQnWYiuDwdxqom"
-						]
-					}
-				},
-				{
-					"value":0.00320799,
-					"n":32,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 62830624a7d20d6c86ceeeac5a3e7bdea6773927 OP_EQUAL",
-						"hex":"a91462830624a7d20d6c86ceeeac5a3e7bdea677392787",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3Afu73rZdGhcuvZXLy868Q45ZfNmuwsJqC"
-						]
-					}
-				},
-				{
-					"value":0.16818798,
-					"n":33,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 66b967a217fc91d260025d46c9c9eacb746b5f9d OP_EQUAL",
-						"hex":"a91466b967a217fc91d260025d46c9c9eacb746b5f9d87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3B4AxGCwpojNPr6o2VFkqjSadnrMzDseqX"
-						]
-					}
-				},
-				{
-					"value":0.02369191,
-					"n":34,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 0f530ba894b185be3fd809e3992145f533e99536 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9140f530ba894b185be3fd809e3992145f533e9953688ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"12Q2cz1AcyMrcttBrVTyQLaJpWjoEjyQQ7"
-						]
-					}
-				},
-				{
-					"value":0.001815,
-					"n":35,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 df9443d2b7b497d1e7a950379f95be6ba9ea5628 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914df9443d2b7b497d1e7a950379f95be6ba9ea562888ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1MPBJQa8fCy8ieQicaFRVj965uTdi6Ax9z"
-						]
-					}
-				},
-				{
-					"value":0.0015,
-					"n":36,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a OP_EQUAL",
-						"hex":"a914ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3LNtc6TnCNaYQE2s5tm3CXsBxzS1GvSGLD"
-						]
-					}
-				},
-				{
-					"value":0.23089985,
-					"n":37,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 1fec4449c7ba080cf0c85eb87ab0c855f0c3959d OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9141fec4449c7ba080cf0c85eb87ab0c855f0c3959d88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"13unz3oktsAkNXiopiCGQV1X8E4z35CAKo"
-						]
-					}
-				},
-				{
-					"value":0.04740793,
-					"n":38,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 e5527898cbf243993a8b5b967120cc9a9a96d092 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914e5527898cbf243993a8b5b967120cc9a9a96d09288ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1MuYY7yugviXBcFY7i9ikFxjZ6hDVCkLHC"
-						]
-					}
-				},
-				{
-					"value":0.00610039,
-					"n":39,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 34f2329553b026ee1aa0c02dc0743ae0cf0062a7 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91434f2329553b026ee1aa0c02dc0743ae0cf0062a788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"15pxHADHoN45jPxjNyxxgE3Lw8cTEDEQNF"
-						]
-					}
-				},
-				{
-					"value":0.11053671,
-					"n":40,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 9f2ad2868872be8c065cc9e2e20adf31e0cc44d5 OP_EQUAL",
-						"hex":"a9149f2ad2868872be8c065cc9e2e20adf31e0cc44d587",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3GCcfPrgAAqpE9vLPeNcUHdUUFMkNh2jX7"
-						]
-					}
-				},
-				{
-					"value":0.03754281,
-					"n":41,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 50c4073088d9ecfa0791033d17a992e8b779f127 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91450c4073088d9ecfa0791033d17a992e8b779f12788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"18N3tckwus8UXADPJEYzmxBMZ5m8JbG9hU"
-						]
-					}
-				},
-				{
-					"value":0.06452373,
-					"n":42,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 2a27eb2171827358522c29a659aaea0f50b77579 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9142a27eb2171827358522c29a659aaea0f50b7757988ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"14quCeCm2ngSgU2HqZpcdDtCQDT8rsCFMm"
-						]
-					}
-				},
-				{
-					"value":0.30842538,
-					"n":43,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 b8d0465ed10eac76fc86646ace6fa64b64cf357e OP_EQUAL",
-						"hex":"a914b8d0465ed10eac76fc86646ace6fa64b64cf357e87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3JYDm2sy128oyvENgtXhE1YUfugo8Ym3qd"
-						]
-					}
-				},
-				{
-					"value":0.0311296,
-					"n":44,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 faecf0266209f760f5d5ec498f74a0ecca351a62 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914faecf0266209f760f5d5ec498f74a0ecca351a6288ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1Psmmhrdg3FSPdq57ApmkMyVpbrjTBWctt"
-						]
-					}
-				},
-				{
-					"value":0.01411207,
-					"n":45,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 2e30c6bb9396a24c4cdd56f20c74f7681d812d2b OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9142e30c6bb9396a24c4cdd56f20c74f7681d812d2b88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"15DEWrw7xzinkHAarjHo33cNrfyAvj87mg"
-						]
-					}
-				},
-				{
-					"value":1.2005,
-					"n":46,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 69f3751d9b18b84c15ddb3d1a5349657585c61a7 OP_EQUAL",
-						"hex":"a91469f3751d9b18b84c15ddb3d1a5349657585c61a787",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3BMEXQeB9Mr5hpgYdpnJLC1MQKHQ1NfYtM"
-						]
-					}
-				},
-				{
-					"value":0.04702,
-					"n":47,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 65a11389f21ba13527b1c7629e999719f3241259 OP_EQUAL",
-						"hex":"a91465a11389f21ba13527b1c7629e999719f324125987",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3AxP8hReJhzjozXfaY34gDeYbGQp6LSbJh"
-						]
-					}
-				},
-				{
-					"value":0.9995,
-					"n":48,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 dd005ce549e1a57453dfcb8fef3522d83f069432 OP_EQUAL",
-						"hex":"a914dd005ce549e1a57453dfcb8fef3522d83f06943287",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3MqZh9ips9W5ekHbzLaRxs8xZZTbJzTLwd"
-						]
-					}
-				},
-				{
-					"value":0.0023939,
-					"n":49,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 3ab72a89b9706691ac4de3871e0f63efaeed880b OP_EQUAL",
-						"hex":"a9143ab72a89b9706691ac4de3871e0f63efaeed880b87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"373UYH5oSBagXbohkbVDiT45bvM9ARVJiN"
-						]
-					}
-				},
-				{
-					"value":0.15724136,
-					"n":50,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 b5022f11a874eea98b9f7e34c80d143f3b036789 OP_EQUAL",
-						"hex":"a914b5022f11a874eea98b9f7e34c80d143f3b03678987",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3JC6r16n98UKgR5urase5cpYExr4eJtKBn"
-						]
-					}
-				},
-				{
-					"value":1.4145,
-					"n":51,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 87db0ef6cde94004fabec6bb7dfb675fd691b670 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91487db0ef6cde94004fabec6bb7dfb675fd691b67088ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1DPLeM2Xzr9aW5qxSX1TaN8MYVwm2nFtgU"
-						]
-					}
-				},
-				{
-					"value":0.04914942,
-					"n":52,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 b827bbd222b251930da17d0a86ba0c5e19e3b27c OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914b827bbd222b251930da17d0a86ba0c5e19e3b27c88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1Hniw3NkC35q2N9J2ZKAgQtiCcJdo1HMom"
-						]
-					}
-				},
-				{
-					"value":0.00990259,
-					"n":53,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 a0c63d441be7fd967ae9ef4af028092b446a43cb OP_EQUAL",
-						"hex":"a914a0c63d441be7fd967ae9ef4af028092b446a43cb87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3GM7X9RgBkBL2TvbfmAzLfzVVxaEoBfSkY"
-						]
-					}
-				},
-				{
-					"value":0.0015,
-					"n":54,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 cf8df73caf54d7a8e54b1247c51b2566ae128fc1 OP_EQUAL",
-						"hex":"a914cf8df73caf54d7a8e54b1247c51b2566ae128fc187",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3LcTsCyUCfNmkoZ3Jvr1cnnq27A4AjAEqj"
-						]
-					}
-				},
-				{
-					"value":0.0368,
-					"n":55,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 de796fa9d384058fcaab5b37c45803af4a739931 OP_EQUAL",
-						"hex":"a914de796fa9d384058fcaab5b37c45803af4a73993187",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3MyMQfUWdbrcokj7A4AKFLZqDBMq3gsbjx"
-						]
-					}
-				},
-				{
-					"value":0.13156522,
-					"n":56,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 04308a751559f8af188dc67a0dac238447e91416 OP_EQUAL",
-						"hex":"a91404308a751559f8af188dc67a0dac238447e9141687",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"325AmzHDJ7XaTPiuudj8iBCnJiUsiZVpwM"
-						]
-					}
-				},
-				{
-					"value":0.15517116,
-					"n":57,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 28c28ea4ab911d65d2568fe2a2ade143f1804b15 OP_EQUAL",
-						"hex":"a91428c28ea4ab911d65d2568fe2a2ade143f1804b1587",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"35QY2HfqzscoKuMWR9GRqyELcRvguNYvdm"
-						]
-					}
-				},
-				{
-					"value":0.02739512,
-					"n":58,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 6e9f5b3aefdd8b079e2d77a682a6276640b5a779 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9146e9f5b3aefdd8b079e2d77a682a6276640b5a77988ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1B5vENoZK1VAEt5xfuQLZ5cApGoyjNspWB"
-						]
-					}
-				},
-				{
-					"value":0.024003,
-					"n":59,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 185f5481e1c5ab6d9926207fbfd86d85d51d7bdc OP_EQUAL",
-						"hex":"a914185f5481e1c5ab6d9926207fbfd86d85d51d7bdc87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"33utLoLCbf2WwccKyvpfRYdCncQUWGLBXK"
-						]
-					}
-				},
-				{
-					"value":0.0995,
-					"n":60,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 f4761ebdd81b9b7e06a207a7a3d55332d016db3e OP_EQUAL",
-						"hex":"a914f4761ebdd81b9b7e06a207a7a3d55332d016db3e87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3PycJUfHHBZmGehQUGbSTmD9Pdz2s61CtY"
-						]
-					}
-				},
-				{
-					"value":0.33990654,
-					"n":61,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 9841711ba7b69aa821e5e4e78b07013789c0f1cf OP_EQUAL",
-						"hex":"a9149841711ba7b69aa821e5e4e78b07013789c0f1cf87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3Fa52gPVesWsG66JZGqRyjY3Pu8jPYPSYA"
-						]
-					}
-				},
-				{
-					"value":0.0095,
-					"n":62,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 54d1d3982910165eddd607622cf2aa2518cf5405 OP_EQUAL",
-						"hex":"a91454d1d3982910165eddd607622cf2aa2518cf540587",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"39RW3fJJXZHaikDoJHWaHSGPYeVGuCSngD"
-						]
-					}
-				},
-				{
-					"value":0.3791111,
-					"n":63,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 0ac0973483473fc700352483d72211ef74b7f77a OP_EQUAL",
-						"hex":"a9140ac0973483473fc700352483d72211ef74b7f77a87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"32fsPtquwdaAJXaWUhAHfmJZUmSo4iUkBT"
-						]
-					}
-				},
-				{
-					"value":0.0344179,
-					"n":64,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 05da50df6705f7528c0de919a87a02ca74b635fc OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a91405da50df6705f7528c0de919a87a02ca74b635fc88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1XwupEjUAd8frdAFMSUaRATgXUhQM2u1y"
-						]
-					}
-				},
-				{
-					"value":0.07881161,
-					"n":65,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 69f37547d53a98c778289f01066ab23b41680905 OP_EQUAL",
-						"hex":"a91469f37547d53a98c778289f01066ab23b4168090587",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3BMEXTEn8uR2utJUEAQxEG2mare7KeZKxt"
-						]
-					}
-				},
-				{
-					"value":0.00247,
-					"n":66,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 2889396473e1709927065dc363210386afd99407 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9142889396473e1709927065dc363210386afd9940788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"14hLRBGW8gRCX8vUPLeBzE6T8cQ2A8zNhz"
-						]
-					}
-				},
-				{
-					"value":1.0,
-					"n":67,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 c625e5f34f3b2617326adbae2e73a1bb0a6be371 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914c625e5f34f3b2617326adbae2e73a1bb0a6be37188ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1K4iCCWzLgawbAJbYbDG9v81z6n6y72KNq"
-						]
-					}
-				},
-				{
-					"value":2.08197368,
-					"n":68,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 2d717f7aa62e57ba6eaceca169cd7f63a54d679b OP_EQUAL",
-						"hex":"a9142d717f7aa62e57ba6eaceca169cd7f63a54d679b87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"35qJJ9pwEoEwdnbfnsN1L1jdFRiyZKBEAK"
-						]
-					}
-				},
-				{
-					"value":0.01,
-					"n":69,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 f4f89313803d610fa472a5849d2389ca6df3b900 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914f4f89313803d610fa472a5849d2389ca6df3b90088ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1PLHf4siiNLC61LXZswQUznuMUCWcRa3e7"
-						]
-					}
-				},
-				{
-					"value":0.1995,
-					"n":70,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 f63784063000439d873f12041e8799d0252db89e OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914f63784063000439d873f12041e8799d0252db89e88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"1PSsjVRff6QpkJfDLyi3jVAePTSh4t4WdL"
-						]
-					}
-				},
-				{
-					"value":0.03005473,
-					"n":71,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 4b098f67e04f711baa310758169f129cbda6385f OP_EQUAL",
-						"hex":"a9144b098f67e04f711baa310758169f129cbda6385f87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"38Xn4Bcu6A6u9ShKDRhLoVTG8tkmC9aMSp"
-						]
-					}
-				},
-				{
-					"value":0.00190118,
-					"n":72,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 494ee9282fb208d60a6765c11310a09524280137 OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a914494ee9282fb208d60a6765c11310a0952428013788ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"17gcrpZVCmvdH3o3H1orsRaQ7wDAyNQ39j"
-						]
-					}
-				},
-				{
-					"value":0.03079627,
-					"n":73,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 69d1a07e7d5fcb62a322c8fb24ae76ebe3c88374 OP_EQUAL",
-						"hex":"a91469d1a07e7d5fcb62a322c8fb24ae76ebe3c8837487",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3BLXzpY4LN5mSXpBfkoMsAABNLRqdQ8EKM"
-						]
-					}
-				},
-				{
-					"value":0.0995,
-					"n":74,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 ffe19b0c48d473db72ca2d243476183b64b4f5d4 OP_EQUAL",
-						"hex":"a914ffe19b0c48d473db72ca2d243476183b64b4f5d487",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3R1zVpJKgvxKXuqL2bYm9xS8gwLWAiL9uC"
-						]
-					}
-				},
-				{
-					"value":0.01924206,
-					"n":75,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 816b46471ee03653597995a2dfa65f0f39eaaf0a OP_EQUAL",
-						"hex":"a914816b46471ee03653597995a2dfa65f0f39eaaf0a87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3DVKbrWQbiLMuaaWRJzsHAfMMHiC1uj5f5"
-						]
-					}
-				},
-				{
-					"value":0.01392176,
-					"n":76,
-					"scriptPubKey":{
-						"asm":"OP_HASH160 88d8d90979c558004f248cfcf0ae6efa3061100f OP_EQUAL",
-						"hex":"a91488d8d90979c558004f248cfcf0ae6efa3061100f87",
-						"reqSigs":1,
-						"type":"scripthash",
-						"addresses":[
-							"3EAbbUup1nBgprztckGgKJRyB7rCiSWBPP"
-						]
-					}
-				},
-				{
-					"value":0.0134,
-					"n":77,
-					"scriptPubKey":{
-						"asm":"OP_DUP OP_HASH160 1302fb1cdc92135634e69f69feba89070a1c1b2f OP_EQUALVERIFY OP_CHECKSIG",
-						"hex":"76a9141302fb1cdc92135634e69f69feba89070a1c1b2f88ac",
-						"reqSigs":1,
-						"type":"pubkeyhash",
-						"addresses":[
-							"12jXQmCHi93zKH1HQgc5fsn11beeKdMwL7"
-						]
-					}
-				}
-			],
-			"hex":"020000000001050e37af28e0fb9394d38ed146ea81b4cec72b21b6e956cbbb9581e15413ac1cbc000000006b483045022100a8fdfac02ecba2cfa25d74f76dcfba41791563d9aac29063dab7f9865009212002200a79c035e48f675c0527f33926ebdbb8dbae89c0a77f1e7ba229126b9fa97cc6012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffff2221d7671a04a3fdded4bdd174be3f1b9b0553bbdbd4c598d79f206f2eafbb40000000006b483045022100913d8dd7fc3e2114bec634886b0189cc400cba036c168228b9423f5526a9d361022008b3b02d3c0270911def718c1859aba34233e2e3c7327e2f5ac7d1a7fd65b9eb012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffff6bcb7fe694092d3d0386df96e884c6edc7139922f85fb4a139bb900127e9abf5000000006a4730440220103bac3e985912b388f48cc979f82821cb637f690fdd497efe4fceb86e00122f022026173b0e6a5e5eef7483b94f7589e78810eae8f8249ff7b03876f6ae24faa19b012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffffa8d8b433b92a6f95afb76c5071cd58a0b175f4a12851d2c952e94c5d0d76dd7c010000006b4830450221009f9188ef194366c3bb4cd520eb9d8a68c3f2fb6ea591f671a00039f05f67b9420220579874562e721bf8d07a34adc1ac587b6b48609100c43ba8e8bf180c86763adf012102679a681d9b5bf5c672e0413997762664a17009038674b806bf27dd6b368d9b67feffffffce861786ff0be984530fbf972b68a63412f985f6e46b7d324f654e4ca1faa7732d00000000feffffff4ef07e0e00000000001976a91466f8da41c6bb10975f565bde68b5df07003c59cb88ac525457030000000017a91446e14b4a4ff41785017080cd63aa5d17513e185487b0feea0b0000000017a91499bbebbdf7f2dc038b904103237765a77282b42b8725124900000000001976a914c78ac0df6b8241075d66f7f986653604a2c6a6fc88aca00bd100000000001976a91479f1db0274de574d49f9fc794b349ef81529fb1888acc03b47030000000017a914840f4d27071f400c5674b1a686235cb641ef34b887d1a320110000000017a914c2f1c77b4ab921d9a2b7a36b250e4ac5a29afe9287063e05000000000017a914d58ee5f1a2bc153ce58145676a679d7b31a1a5ae8790a434000000000017a914a61b218139c3cd63abbfc6d221f28019d86837d6875fd64a00000000001976a9148aeadc4ab5fbdf6fba1396405388868395cf4f1b88ac524036000000000017a914f9e4dab5529cda97fe7d0ea9c6dfd828c9160c828750f80c000000000017a914551343b34a385e392562ead50b2588ee97307c378752220f00000000001976a914633a3cd7a6ce04165619539a87ee5671d0537e4e88ac80841e00000000001976a9149f59e0163f592c3de094bc12ae338d8140c77c5488acf0b47c010000000017a9147b7f9a5fa10a45fc828d6a47ee6dbbbb2364cee2879835d402000000001976a914221a6189701ce0874c4ba6fc0f91579f68f0589588ac20402c000000000017a9141e5f0577643f2c17ecd5037034824e6b55f2f37f87f0874b000000000017a914a70f43b2b0bded27e58ba7997e15936d86b5b4cd8740771b00000000001976a9142388eb0f84b2ec9d0e35ceda9019e389aee2243f88ac6d1096010000000017a914e0a8d9fe6832f56524ad51e40c6b34cc212dad4c8770032d00000000001976a91497dfc57e73ab8a3b9bda027b79a28bc2e9fc193188ac20f12f000000000017a914be3d917f8b403b3e6b1cf900e29d686bddc8ce6487d0e90400000000001976a914f04d6dc750f0b2d3e648ab5afcc5b1c2cedb36f788acb0feea0b0000000017a914e366f89679d01a89599c9794a35872e5f3cb3d2987bfdbee000000000017a914af5c84f9b702a4c60611b6272c6670c4e961474187b49b2800000000001976a9142a80328a0c51051bf0e76eddbf5342178128096f88aceaca0a000000000017a914370628b7101a7ff461de2ab0a80a8703317c781187fa6f0d000000000017a914166c9a23dc39fbd57e58ff794069d083933cbc4c878c6fe109000000001976a9146f4bceafb26023db265d9abc763ab2ccbd0213ae88ac5b0f09000000000017a914fc8d98b2a4ea22f24e50261fd065afd99a8274a08703b404000000000017a914d1803af27bed138379b501e91f368d500b0b49e78724411700000000001976a914e39546887c31afee7a067432902239f44e64406788ac1fe504000000000017a91462830624a7d20d6c86ceeeac5a3e7bdea6773927876ea200010000000017a91466b967a217fc91d260025d46c9c9eacb746b5f9d87a7262400000000001976a9140f530ba894b185be3fd809e3992145f533e9953688acfcc40200000000001976a914df9443d2b7b497d1e7a950379f95be6ba9ea562888acf04902000000000017a914ccfccb33575cfe97d39b6d0d0fad8f09cce2fe1a8741536001000000001976a9141fec4449c7ba080cf0c85eb87ab0c855f0c3959d88acb9564800000000001976a914e5527898cbf243993a8b5b967120cc9a9a96d09288acf74e0900000000001976a91434f2329553b026ee1aa0c02dc0743ae0cf0062a788ac67aaa8000000000017a9149f2ad2868872be8c065cc9e2e20adf31e0cc44d58729493900000000001976a91450c4073088d9ecfa0791033d17a992e8b779f12788ac95746200000000001976a9142a27eb2171827358522c29a659aaea0f50b7757988acaa9ed6010000000017a914b8d0465ed10eac76fc86646ace6fa64b64cf357e8700802f00000000001976a914faecf0266209f760f5d5ec498f74a0ecca351a6288ac87881500000000001976a9142e30c6bb9396a24c4cdd56f20c74f7681d812d2b88ac50d127070000000017a91469f3751d9b18b84c15ddb3d1a5349657585c61a78730bf47000000000017a91465a11389f21ba13527b1c7629e999719f324125987b01df5050000000017a914dd005ce549e1a57453dfcb8fef3522d83f069432871ea703000000000017a9143ab72a89b9706691ac4de3871e0f63efaeed880b8768eeef000000000017a914b5022f11a874eea98b9f7e34c80d143f3b03678987105b6e08000000001976a91487db0ef6cde94004fabec6bb7dfb675fd691b67088acfefe4a00000000001976a914b827bbd222b251930da17d0a86ba0c5e19e3b27c88ac331c0f000000000017a914a0c63d441be7fd967ae9ef4af028092b446a43cb87f04902000000000017a914cf8df73caf54d7a8e54b1247c51b2566ae128fc187002738000000000017a914de796fa9d384058fcaab5b37c45803af4a73993187aac0c8000000000017a91404308a751559f8af188dc67a0dac238447e9141687bcc5ec000000000017a91428c28ea4ab911d65d2568fe2a2ade143f1804b158738cd2900000000001976a9146e9f5b3aefdd8b079e2d77a682a6276640b5a77988ac2ca024000000000017a914185f5481e1c5ab6d9926207fbfd86d85d51d7bdc8730d397000000000017a914f4761ebdd81b9b7e06a207a7a3d55332d016db3e87fea706020000000017a9149841711ba7b69aa821e5e4e78b07013789c0f1cf87f07e0e000000000017a91454d1d3982910165eddd607622cf2aa2518cf540587467a42020000000017a9140ac0973483473fc700352483d72211ef74b7f77a877e843400000000001976a91405da50df6705f7528c0de919a87a02ca74b635fc88acc94178000000000017a91469f37547d53a98c778289f01066ab23b4168090587d8c40300000000001976a9142889396473e1709927065dc363210386afd9940788ac00e1f505000000001976a914c625e5f34f3b2617326adbae2e73a1bb0a6be37188acf8d6680c0000000017a9142d717f7aa62e57ba6eaceca169cd7f63a54d679b8740420f00000000001976a914f4f89313803d610fa472a5849d2389ca6df3b90088acb0693001000000001976a914f63784063000439d873f12041e8799d0252db89e88ac21dc2d000000000017a9144b098f67e04f711baa310758169f129cbda6385f87a6e60200000000001976a914494ee9282fb208d60a6765c11310a0952428013788accbfd2e000000000017a91469d1a07e7d5fcb62a322c8fb24ae76ebe3c883748730d397000000000017a914ffe19b0c48d473db72ca2d243476183b64b4f5d4876e5c1d000000000017a914816b46471ee03653597995a2dfa65f0f39eaaf0a87303e15000000000017a91488d8d90979c558004f248cfcf0ae6efa3061100f8760721400000000001976a9141302fb1cdc92135634e69f69feba89070a1c1b2f88ac0000000002483045022100b7b6368e45383b2da463ba56397a1966b94be5ef860ac95f1067e62a4531e75a022077bc58f3ea606219fe086f291d39b805faec10c848b525f4997f32979bab5aca01210253a13bae39c5604dc4e9634c10e87e33d0c2d1a618efc0726af5a4a4ea81f7abb6e10800",
-			"blockhash":"0000000000000000000ae5f893bc9156bf24938ff6ee1d5a1555a6b7d82ce176",
-			"confirmations":13533,
-			"time":1561311885,
-			"blocktime":1561311885
-		}"#;
-
-        let _tx: Transaction = serde_json::from_str(tx_str).unwrap();
+        let json = get_transaction_json("btc_4ab5828480046524afa3fac5eb7f93f768c3eeeaeb5d4d6b6ff22801d3dc521e");
+        let _tx: Transaction = serde_json::from_value(json).unwrap();
     }
 
     #[allow(dead_code)]
     fn test_kmd_raw_confirmations() {
-        let json_str = r#"{
-			"hex":"0400008085202f89010000000000000000000000000000000000000000000000000000000000000000ffffffff0603aed11a0101ffffffff0188b6e11100000000232103fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351ac3b5e4e5e000000000000000000000000000000",
-			"txid":"1b1a413c7205dc07f23ef60ca04d29ca33d72e9f6c473ddd8b02aaac53fb8e7a",
-			"overwintered":true,
-			"version":4,
-			"last_notarized_height":1757600,
-			"versiongroupid":"892f2085",
-			"locktime":1582194235,
-			"expiryheight":0,
-			"vin":[
-				{
-					"coinbase":"03aed11a0101",
-					"sequence":4294967295
-				}
-			],
-			"vout":[
-				{
-					"value":3.00005,
-					"interest":0.0,
-					"valueSat":300005000,
-					"n":0,
-					"scriptPubKey":{
-					"asm":"03fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351 OP_CHECKSIG",
-					"hex":"2103fff24efd5648870a23badf46e26510e96d9e79ce281b27cfe963993039dd1351ac",
-					"reqSigs":1,
-					"type":"pubkey",
-					"addresses":[
-						"RTPBi5hpdSUARnh9gGahv6tr4ppHDwAkxD"
-					]
-				}
-				}
-			],
-			"vjoinsplit":[
-
-			],
-			"valueBalance":0.0,
-			"vShieldedSpend":[
-
-			],
-			"vShieldedOutput":[
-
-			],
-			"blockhash":"059ad2e93f92de1ff80432ba1227c83739ed76bc78f41630dd6a773dc6595dc8",
-			"height":1757614,
-			"confirmations":1,
-			"rawconfirmations":8,
-			"time":1582194235,
-			"blocktime":1582194235
-		}"#;
-
-        let tx: Transaction = serde_json::from_str(json_str).unwrap();
+        let json = get_transaction_json("kmd_raw_confirmations");
+        let tx: Transaction = serde_json::from_value(json).unwrap();
         assert_eq!(tx.rawconfirmations, Some(8));
     }
 
     #[test]
     fn test_qtum_call_script_pubkey() {
-        let json_str = r#"{
-			"blockhash":"b81f26a919bc9d792aeb056d6eea5340b7e334aa3f21144cd0f3c663286ff870",
-			"blocktime":1589537936,
-			"confirmations":2457,
-			"hash":"fad39a18206633258a0e77cc59d4606553bab374d05bb3d56cf3f0a701bacfaf",
-			"hex":"0100000003b6eec8104d23c90a0061b3b4aef7c16bab8fb11e2a3764540716e8207dc356eb0b0000006a4730440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff9561b9a318c5021e0ad76ea51a97ceb0a7ea8217ff5bea92c2249484ebc412380c0000006b483045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffffdef6489dee6cd3c88f267176d4aa07cff600c034148b1f2726ebd785c8cee951010000006b483045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9ffffffff0200ca9a3b00000000625403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c215c80b80000000001976a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88acdb6bbe5e",
-			"locktime":1589537755,
-			"size":594,
-			"time":1589537936,
-			"txid":"fad39a18206633258a0e77cc59d4606553bab374d05bb3d56cf3f0a701bacfaf",
-			"version":1,
-			"vin":[
-			  {
-				 "scriptSig":{
-					"asm":"30440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
-					"hex":"4730440220409ebe0309a14cca0761b52594b3e4d5c52ad997f0e7f3b918416f9a1ebdb28b022005f2e391350ae36cce3a28b0ab393b38760918f5d9843e9f06126a011f2fc6c5012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
-				 },
-				 "sequence":4294967295,
-				 "txid":"eb56c37d20e816075464372a1eb18fab6bc1f7aeb4b361000ac9234d10c8eeb6",
-				 "vout":11
-			  },
-			  {
-				 "scriptSig":{
-					"asm":"3045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
-					"hex":"483045022100f753ec48e19a84768905970689a9166dffa4ae4202e0d7aac61025b739f990d002201bbdf4226c969747600b802fa14c1480eb0667b7c7d9b76867b2fb9f2ab11e94012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
-				 },
-				 "sequence":4294967295,
-				 "txid":"3812c4eb849424c292ea5bff1782eaa7b0ce971aa56ed70a1e02c518a3b96195",
-				 "vout":12
-			  },
-			  {
-				 "scriptSig":{
-					"asm":"3045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f[ALL] 03693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9",
-					"hex":"483045022100e128b8380c02e76826cce1db03f9d661a68c5ef2198d34e4557455dd2ee3a035022015b66c6b8c44803b2c8c61f8a65ef57d727043582d431377edbbdf7466a38d8f012103693bff1b39e8b5a306810023c29b95397eb395530b106b1820ea235fd81d9ce9"
-				 },
-				 "sequence":4294967295,
-				 "txid":"51e9cec885d7eb26271f8b1434c000f6cf07aad47671268fc8d36cee9d48f6de",
-				 "vout":1
-			  }
-			],
-			"vout":[
-			  {
-				 "n":0,
-				 "scriptPubKey":{
-					"asm":"4 2500000 40 a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca00 d362e096e873eb7907e205fadc6175c6fec7bc44 OP_CALL",
-					"hex":"5403a02526012844a9059cbb0000000000000000000000000240b898276ad2cc0d2fe6f527e8e31104e7fde3000000000000000000000000000000000000000000000000000000003b9aca0014d362e096e873eb7907e205fadc6175c6fec7bc44c2",
-					"type":"call"
-				 },
-				 "value":10.0
-			  },
-			  {
-				 "n":1,
-				 "scriptPubKey":{
-					"addresses":[
-					   "qXxsj5RtciAby9T7m98AgAATL4zTi4UwDG"
-					],
-					"asm":"OP_DUP OP_HASH160 9e032d4b0090a11dc40fe6c47601499a35d55fbb OP_EQUALVERIFY OP_CHECKSIG",
-					"hex":"76a9149e032d4b0090a11dc40fe6c47601499a35d55fbb88ac",
-					"reqSigs":1,
-					"type":"pubkeyhash"
-				 },
-				 "value":21.48255765
-			  }
-			],
-			"vsize":594,
-			"weight":2376
-		}"#;
-
-        let tx: Transaction = serde_json::from_str(json_str).unwrap();
+        let json = get_transaction_json("qtum_call_script");
+        let tx: Transaction = serde_json::from_value(json).unwrap();
         assert_eq!(tx.vout[0].script.script_type, ScriptType::Call);
     }
 
     #[test]
     fn test_firo_sigmaspend_input() {
         // https://explorer.firo.org/tx/d4b9f5a01a43b1d592999f9fd6fe64aa8f63ac42abab43090938321064c1ec1f
-        let json_str = r#"{
-		  "hex":"0100000006000000000000000000000000000000000000000000000000000000000000000001000000fd2805c4aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c42c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3bffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c4e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c477c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5effffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c47252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1ffffffff000000000000000000000000000000000000000000000000000000000000000001000000fd2805c451f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703ffffffff01a8ff327a0a0000001976a914d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d88acd7000500",
-		  "txid":"d4b9f5a01a43b1d592999f9fd6fe64aa8f63ac42abab43090938321064c1ec1f",
-		  "hash":"d4b9f5a01a43b1d592999f9fd6fe64aa8f63ac42abab43090938321064c1ec1f",
-		  "size":8222,
-		  "vsize":8222,
-		  "version":1,
-		  "locktime":327895,
-		  "type":0,
-		  "vin":[
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182",
-				"hex":"c4aed78fbc5b719b0887d2c96005214b5e6d82852e4cc189bcd5fa1860caee2b700100dc1b2cd57ba6a72246fd3935c2930e8b8465860b8fbb6ee55957433a31ba705f00005586b9add2ab0301cb65dfa154ddea1ae2cfd352a4a9959f8f0956050b167e7a00007c294578d92c7ab5dccd2379461618124af985b5c3c1890a762d3b9bdf562cc2000015bea1119f1177726d155ebb2f2f4fa7e1bbc42e7e063e6d8780f4fba17bf74aaa907e1e669bf60fb97f87fc45f6d432a39a01119717bd35f9c64d0430e8a5544026656243aff1f1fdbc491c0ce01d63969e488265bc938c60efd0214b8e40b231ae85d87a3e7ca99080b850ff5c0c2e8171534132a0ad32fe8892347cb920a7768f58a963e3604b6ddd02c282c20bdea658b7dea637494af9b3619ed2e11c2ad28cd870fc1bf9a9fecdee794fdc9001a6e06330ff834f87d5de64ef5c9aae0e26916946fcd6668f6c12ac7c705c38470ad572ea71fb596b5149e982bffd0c238865a693aab5c8dd0f91143eb3b314f283379e3c7a708ea4faf4430137fe71453995ecc3cad8a3816b28bda1c866821cc389748a62a8edb4f2a3493dcc5b166c37a0cd8390fb41f21e9464dedafe54d2b3b4a3bf5881584c96ed537f00cf5c6dee475c6b8a252c07fb5f6c822547c4299db862653e3ed20c867eef508043f5580b404bc111f14d5839789c774d71a5adb14efe8b97b6124f084f22fde1728d483ffa60365e517187e9891404cdcb41f3823e3c8fec84112d54ab9537db9d0c66ce681ed18a3025b0982d06ce00c1a0db670936ef7aa4ec3059296f7a56e5618da52e155ef91cf3ce952431c00a3c5fbc422133f09ee5a76d7df34081fee9e0e574bee1cdfe83e964341813fcb7b219024f2a2606b7306ea9c61330752915c459bb5d9b1969f64be1878814ad39b41eff50c60e495472ee628929d22d468343c162a7f033e1fa0ebf039c529739a5f071d86f1bda27fe9b4dee8ed7faf8e6e9ff1d78a6f74498ea3326c05cf3d3850e807269cb073776bb8dd34f6fce30307e8330265ec89112bf48861a122df7bdd203af1cf776ae4353ae09e176eeaaeaad98f82eb2a9277fa9795954590d29c8c0ba84aca16850800ba1950b16430af7cfa81add4b225de680e9c5690418f70851295161bd3c2c91ae366531c62991a73fcd9c3b31fa8261fe29761538de5ddf38f6163c9eb57609888bd6d177f395ea12593807acd32a8d9247ab5aa8db8af62d0a28c376c7d096c02ff9799d4e5818abda986a00002548ea29cc77d2aa5cb91850528fd7f1e209686a3cab3c8f8965818d0063e4f600003e12c6dd83593e2303cca9b712b69d121b2feeb19a6d070cb06e465cce92653b0000ab18e8decb34fb0cecd0600ca124786f133401ac197d9615e4dc646ae750b2db0100c40a4788e12bac6c26e3ca1d72925f7764f72dbde8d487d657707e880849b7bf0100ed6189ae534e3d8de39f2e4046a43486f348065a85d12860c39cb85fefa6fb4c01001049602903683e070a3fcbfe160bfcf5c21094185cb9fdba4262020860b12b2800004cd9d1ed019992afdb63ba2644017ac9938ff11f665ff57279d507fe90de5be6f56d5554349f7d637ce0d0365a0cc056de61cb9a6fb10cfdfbb83d927911018b1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2103a2e831904e261074139899446af2298307f7c5a59c2ff9f7d691b66c5f78a3e840c2e23decf2e8f845e8a8e9d18cd81d9eb4a5d0e7d53624d34c0f1cbdbb2e05697b427bd7004c14ba20370d2384a5967a8bd5921202dfa382e99c1c49db9d3182"
-			  },
-			  "value":100.0,
-			  "valueSat":10000000000,
-			  "sequence":4294967295
-			},
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND 2c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3b",
-				"hex":"c42c0bb28d0e52f8f3d0a139446fe7e4da31cd195f7c3058d8e6cffea3b155dc32000092f7d2a8a1a4892c983da5a20fdd657957fcdc0ebd86485e7ac1c7aa62a92dfe010023353a1603f1d14720d48a80ad139a400862ecba29637b38f9f1162e0d556ee3010095defe584076981c1c6fc020d842a87711fec85b01aecf288282a564dcde2c2c01001597a0147c89ed6f0961dfa572909bccc58eeadaf646ce7ac29a6e0fffba2201e2450eb859d4560a7c1aaa18971cf9610f5b361c97207c97d947b808f08f8767f950b817d1e653b582638fc69da3725d78a0c0d41262288ef5c9e06a2c6412165b0818786e2d5d821f707a59226a2fa2cdd009a60b91742956d315601b8390537c636f5a0f523546f283f0860ee7c495020e2cce56c8b9814e3997a0d0ae224b17e8b464565f91a16fa722546ea707eb73f16613cd1a204491c6590652f2df7876253d3f4c315f6a2481bb70f42095dc54237e9d1cffb49072762af07ee6cdaa82daf8f85039756da027621e3b4dc67596450aeb638894c0cca4ab69a0bdd1fff7a2fb4abacf33351dd0046d0a29608be1fe6fc91f3a349b0b6940f33e1232af2099ad97a2e05442261c3f25c2e5d241203eb7f983df4714f016692748d1aea107b3a71013092143cb4f4085bbf4f23064af7250151b6f7fea5c08933fae00353dfe11966731377d839e89aef9dda76c46a2238af18a7932c247ee78bcf0400938428e1c6c368b9af88891b40f07b836a7abaa6c638a9fa6ad2f7add6f2ded013a3a838dbe5c81f4dad69c98df205dc507004471b9f7ed6ce5eefd20a58db720e2479f198654e385254e32dfbd0161f63b8a3d3c8e81b9660d78626190acdc6a43b70bcc32c8b7cf3420323c43cf415ca852eb529f931c428c8f3e7e42a70474d0690c6c24d4f5840672804b4208a1ad756772dd80e9e90379b7da72c8ec8729f75c152b1fa5705fb894f187b6d3d2c855ee9538e4c58f6d15cc39698a7075164de691658d865797faf88703cd59b51cea8b96a6027546ebfe3007a0356d14b8480f30481ac74fa635199cd87c2f597245de45b412d32e57a9d0c67f10e384da8e1b6f125ab62691788151432a7701dd31ba4b4c6d7276217f1ddcd26b42d2320d8e8b81c8c845d6333b009b29633ad2afccf37f4259ef5eef236a6b399134aee916327c44f591866e7392110597e63490fd43f743f2f227b7284d991a484a3bb307db65821fa9747af6cc277b465c5f524a650188d8421681c3a631c0e964cf9ac500004cdadf027a224a6746819329ac51c4c7a295ed9d4e75f081e8c590718e0a762c0100c448a2bba9efe5a4e1473a1ad9217bc28f7a628f64920d400b7b37097f7e7b1f00002304ea4f401f1c08e6d2dfad3e53de99062563c5232cbfb7cd97660177798df90000d315be7ae3d127a96f680db963d23c0f8759ebf0d7e1b5db573851ea7974d3d000009faa7df3c9c87ea2be077274952505173477e7c927fa5433e5a508ba2b8851a800004737d94352d548efc6479596ea413b523384f839715479295fba94928334dfdc000001bb5aa89712cb71b90006fd545ad4295ef4e0e8f0d9362f73fb53e32d1806d8102e4c4cbfdcce690e04dcad8f8354c90d6a65ac2cff03c5dd76c6f06f770ab01f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd2102d9cd799a2267321b8109204c87e638e5e040bb9a2101a0ea12e43af4ed7586754046a5fca18239564d3bed40328a7b1472e1d0941337b68b6a7d82d62d5023278b7f6e3573a22627c0a30269ddee7059968b0aa957dbd041e6d762af2fed06de3b"
-			  },
-			  "value":100.0,
-			  "valueSat":10000000000,
-			  "sequence":4294967295
-			},
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831",
-				"hex":"c4e9fcfb78b81f1cdfb53c62417cc1b362f52532ccdf055190787c826a84de3e9b0100779985d4b1b1c5e701a008666aec2c65400a1d0fd684cebfc8e77439d5362c16000097bfb9c79218528bf2515a6c3edb70428999afd348fb1ae6d4a053cf85b3e28c0100cd6eaeec888a2f971fceddbff518a2cad03f66d28cdd084b7f406d5fef84eb150000151ca45f20ef7e7b95cae35c6b08af8c95965b156dac5eb748dbe9db067c63ebfed427fb0a30e422bfee913ac7106877ab2838db36e992e7ac9b6cfc746e3954d172708b64a6ed0c94a460dbba986ecf0592d0a289baa3369fa7d9d8181973d92a5a6f1615a5c4a27377739fc172af3ca83c8d2bfe1f4c4163851c0cf7776773f29a4fcad864e11eb7572e13fb02dfda4613035a2df00ae21aca80c6c5e345deac538a4b4a8c5c9998f35176a68de0ef38eb25b036810d440976d556e4e6acee2772bc0c8961dd140b857ecb53a029930600267aec1f7c2358b9a874ebb15fa3a2f14afa1645921409f50a6b3d9f38e841e580b460f90c3c77cf764a77a6b65c657af753c54e27ed849a03a2394c99548a46d9719dc563a2f6e19bf909845b38c028f70ca802d96ff47eb3540ded69554df3c0e75da124c737c97d36590762f6264f2b131301e997a05b6871f3797ea7e0e59db4cdea0688681e8df62341cee745d8ad9defcfafa8338ff0b7d477ddd93b9b7b1d805decb3329334f4a7990d1766887c346a10677a54ddaf57f7f81e004a972af7281173f521d6970b145294fb9a0d83281ded291a6aa00caefc2ffe6a66d7c77d5701037ed012192bb4423c4631fc08d89f4f8d25ce3be9b88dfe051e6653a18b7af859d83bc222bf413a4a024a8023040e11485b4a70e2d0e7763d601c9532d27e02483f640c0a5c3179a12d53d8200d00cb0fe4c1cbe2edc06f36c278af77a095eb8a11c9aa7f0f53d88832464262876af5a2b3f1b4ca357e8f7a8cddd9b4d3d6a698590560eb5dfe1209056fa8758145f419175aefe73b36296c2e3d762ca03337f180a879d7edadec45682f02f36dd464a6e049d05c05f6ead47a0da6fc62673891d3d01e08adc0c88a5fc029ef342384e051e69c451202340f8e3e72f78060c645413c8653c07c0d08ed3a337f02eb92677960181d43b58e0808136a846400bef3bc34e18e5e09c3fb2b0073bca169884bed4592740c61b3d5ffb49fee0df0bca7b52024df3dcaa00f4d28077364db9b252cc06aa85f66f996d19569dd8f961fc4289ff32088ace04d75c18b00001030f2a9882d3aca1cf5a84bda8ac7c92c5bdcaf492295e8cf6080104063ca180000925eda046bbc24b27d4651dd2809de2747885f63d9ebdac1143e574462d4b69801001d7422d3ebaa9401f97c489a85086a3b48d09c7a69208ee7d7e6a7f0cb8e32cc0000d2cfb0d15de941e0025f65f0161d55685f05e4ce8cabe6f5b660800a4efb15950000490929b68bf5e1bd01adcc522b71aa949f6e1393703b25124b82d5f568a2aeea00003d2af0ca26d08f44ed80c43281aed6dab6d491fa6b2b4739c06c86855e5cb8ea010015cd819b456a851192b8caf923e76daee4db3cb38b3cc488796a151d0ff5d9a1630423e3e068c1ad988794671918f63ffda1ed627801c22a72ca7be0085d7e9f1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210305a48450bcb57d448832a95486c294d89834523760e74f90e682500b67c9064640fed06a1a2b65d15bdb4ef65c33c804d480b0217c505d59c71b7efdc9b189f4ac2e6ce945df1c37f2241a972e8da09ff119c14e27629d6a026f2316d427860831"
-			  },
-			  "value":100.0,
-			  "valueSat":10000000000,
-			  "sequence":4294967295
-			},
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND 77c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5e",
-				"hex":"c477c1f4013508aadcb047c5d4d073df0533956739522240935e1aed3339c761a1000071c754b9b34da3ee5b83ca6a0c3b834569ba5bdd3af42207cf2348e02b6f50860000812fc9b026abfc1975a96f0b09b4f16c2a07aea16563e0b2f80d4c3bf1403df50100293dc3b5bf1168aa661bf2e94e9a56862e1225f592c38c5c11042be03e92f83601001517ad2d049e8812e5d3dfae275ca406b224b6c71ee7746f69e2ebba478c0ebbf78f1a93d9ac05744c1c250b5163939c528e8cedb57371f12527caf67a184c99cb32b67f380ed6e91da76cdba1091e912250e3a2a7d6c3adc1066bb037ade7e3b3f61a6a2ba0330a9e4dee6dde7755be5a7474cc951949ac8a21090bc77f7289d0b1fc3e9c059732fe96083a1a73081d9557a17c4e1a6ddfdc72efe694680131bd3ca8ee9360b0fbfd45f3d60f516aaa22da398d1e4368f1928fdc366120ff01ff9d50257cab74a2ca473914827b2237b20eb07fd13afd0fbdcdef467e92558f93b202860d019976ab8d226ee1bd4e92a029e60c72f952b791d8addcfb11f2b66b06219cecb229d0d74d07e57e3dd9caacc0f0e57478e313e84149f4aaef47c8bc5d1a6efc51546696a5eb34b4b8f46f140dd84764b53d273286f5f49cb85988695526de83b387fafdab97ccad5377009fa94f11c5690f7a7750785ad0cc5125f7755e7569aa9d66e92b6f902fbfea559b79a666f2c8486a4b60a69ba497fe3f45976e2f6f62b496e7bc22615d43a201485e52b7647887fbc13522192aa6089a9673ce11dde3873b0dc4fe44536d7530e5324a3eac95f3eb05b27eaa5ef72e808aa6808c5e972b7cea71ab5cdaf281d7ddf7ce9053ba62c60d10c7f61aad56ad36728a2056da78183cc19ee9d8974b4c6a7421e6c18fca89bd5608aa1744be2710fe5224ce3a1f451884c74ce3146917ec81c8a798cabd890981f74c631d25dacb79190a283fdb5cc6373c828893411b3b547ac764702bb3b4244ed4c37f470de98ca67fff063060c302d65cce3ba3b7898766959d893017963adfa8c8381a3235e3a8fd00ec4ca603dcbae1eb8041eb3f8d0819cfcc746459331e62cb512ca7a4439ebf7af619febd05170947b176ed12391a0b5f8fa4b913e8782dbd31073450558c5be1a289fc636d6522953c0ea8a6e8c1f62ce1f1f80626154c7a4ddbfb3d4a5f71b20a3da47b350d275c5c6c5a67b6e78a5bc1169a67d5caec220b13e1ec076f60364dbef9636d1643cc02b6a758e77b58bfc1f435f33df5d22d57feb31125000009374f988af7ba8879cadb00e7c35a34acb87c2d59bb2fae4d4b5387bf27fb890100defc344c95c73ed397d059bcf49c8cea57055f4b7651f656658a7d3ef1f4f8b90000570b35d424e33c4d77784b2db0c056bc6e66fa3c60dc2e2398049efb8a41165d00003e3e88eed2cdc564914637bc2c37f4f53faf2ed1023003b947cad66b2fdc151901002dbe998be1456b6bedbf57cf1107dcc67fa3efd21def15c453ac8d08526b04fa000099b04830e653d1dc6b65011a5bcb50adee726c424f4e44d54bf1fd79b83315270100412f9b1ff15bdbaa0100586183f67ce6e0e89ae3404e212da84978e8341d8d789c0bb429717bfb484b50743743d9276cbec48c32fe82d14994257af48d85f5ec1f00000000e40b540200000080590526dd52f8c321fa49589ca1611724fc9572336b3983c8fb4e83e55863dd210310931a8798da56262c681a28d09329bbc7862a91a3688fd90a90956c188bc9ad40fdfd16a2b5cbc85335acc017bad488f829e321e7ba27f33e51ce1118cd835086542751f4b85da667bb365b3f53fa5c84827482c077c550d32079cad2965d9a5e"
-			  },
-			  "value":100.0,
-			  "valueSat":10000000000,
-			  "sequence":4294967295
-			},
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND 7252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1",
-				"hex":"c47252d557c36f45288f287d81c1f31f5d51b778f905b41b79b9ab15554a0e3b5f010036ea61b6cc59ffd61c2b7a6599c344a7e259e0f67b2a42940fef260fac7619df0000731f2649a28ec62446524273557bbd5a9377684d50288a244c1738a8587148ea00007cd2836bf9359994dc2cd9267ebc42414d8d807852c62ce2523551fb4f2f30b900001548c989ab140a3ace02c4cc4560cb7770593c3a1576262d7b3e6700098fbc5420748d3ce99f1ce057b928b280f85a93a0b08b5aa7eff9922bf79c5447d8ee6af172c99743ffdb4b5d21daf1014150c3f9014c242b3f6707d272089bfdce87c51b34e6d46bfb5d4452a7a9d16deaf15c11f44e112a885fe07770df9c959cc77ca53a6b7ca2a883fb1fb040e423a06e79bc534e21f243f92a25d59094b195f1a02bf3348105e720edd1bfbad05ed97845c9f346340c1aa06d4983d14d5a5b08f19be2dea8ac9425d0d2a69ee9918ba5eb0273287b83f97360833180805987703ab123ebc6e5f099e2a4857f34913f06cd609fa717b2d3047a148189046484b88460ae7f572a3f213f375a3d7d2177e231f0a3c0145dfa60be0cc761785d290e69d154407019e2429d69729374638c5ae06147e7499dbae31fe3a1684c901ee12b27398201a7916397b6cacb6b6972db15117288122ba01ec9c68d78bfe0e8515525f2534d8401a92faffbe44f886406f2e2ae077c779803d197de1bca5a94abdfe85862f685c7158e1fb1cdc1ce6abd7384c1443b93e9984779c8d0d7167d350fd4c1b9abe1be6ae136612ff23a4c7830df1e034f544fcbeb54c7a1d0885ebb53d0123ac0e30b93ee4f3533da7ba808b848c677bda4c86542c360dad96fb6829e2197a07c108ee339436ef26f352703d6353c803522e57beeecd79abebd7d6bab9c4e8c4d6cc92421a93f977cc353e23fca5eb91dc87958e14e69b52afb8dae1f70972456c8be70ae86c28ca1798cb09d93732559a259e858fa157b39fc022215d829aca9841f07a99f4f40f66b55d0b96f7f1cb87467ae6003c8b258cbe9af7b2d2765bd420b905f9b0e5096b750bf156526174532aa43f6e7304521d44e330488f99fb124280cf863020332bc8cea92cc71eca67855d42da5d6ce58875139d23d1317dd04085bd331a383542993fb8cd83f9e73c9becebb7c7b840f097461b0386459992d4077bfe3118f8be2e47c1539f088a97457b7013ba7d7e68f398eb55c075997c8c67d9087aa8d9c9f44c42eff98f67c4f45f9c4d7d13315aebc67fd0ebc00003363076abf579ecf927734e9bcb843037f684278c659e183c0f6235d22dab8180000d36084ae243828756d54f3b6908891e5fdd8deb6368e9d4941407dcaf019ff0e000092c21af2d0bb0c506454fb6f6cfd789649facef1238c8e6a137fe9570cd2562701007ea89f8a2c2d587a3cd445de70303e65444e4924031726690c4a8f8bba3683c400002596a772df3afc96d64955a1cbdc1e8c4b67c85d9ac010b83c2f8141f6ba63410000103b07d9089f0aee1d25631385a0d00b30f10ac7ecc991e5910afee6bc6c7fbc000082c08c24863ec43bef2fabe1ff8aa5b6acd37dc2bacfaf2e819078820b78e80fc03a7226372e5074f2b83ccf4aaa92e89225888f4e35bd79760881376f34e4a21f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c21034bc9bc3f623ba555a6abceb0d5a491abb9d067ad76993f6b3544a21b34a2237a40e4e3733e1191bb6731897c6b691a00dbf86c94a163047b61bd4b24e6250c3f1c6828ab5a1d6266f09323e2838e304fdfb636eaee1ec3e90a535debde88e31ba1"
-			  },
-			  "value":25.0,
-			  "valueSat":2500000000,
-			  "sequence":4294967295
-			},
-			{
-			  "anonymityGroup":1,
-			  "scriptSig":{
-				"asm":"OP_SIGMASPEND 51f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703",
-				"hex":"c451f9b4d6931827686e1c5ed60d09fbd7050c093e7424aaab9c84e3d11ec3349d00005a582a32d0fedb32b3f7fa0ef118bf7325a95fd46ef846a89c155fc6ac4271130000c6b4a8a988c610dda27c92102db5575f4b6f42d8f32d8ec253b25427f784a2490100f5e5e8e590818e013b67f5c52b5cebf59cf73b2a03912bcd0f94d3c4380be27d000015e48f758a84da02e0a57fdae68e0341bfda81dc42461ed7789cc05c2a47f2c1750b980e17e873bc8ef4b9b07e05118f4d9fdfff6577e65540b9a2a1bd687e6e8ff0364281cbfc246f7700f7ee22eefc3525ccb2e77f64d63a92273649ffb0072430b4cfdd301aa900271f3da4375165fcd6a86445a20b93846fc0642bc6c268e8f9b3bd40d6768cdf11aa6cfe07c6c1c5cdc01edffa97f36b0130b4d359f33572cfaedbd7fd310d30bab86e429e8aecf8d196fc2715c12548962c8ed14ef097d5c92092d6727a0a5c12d64bc60c65764cd7463c7c5e40f35cbcfd8848e33b4e23c2c9dbf8378954a54361e8ad3c133ca4cdf8ecc519d6c45e4a0bd7bf9b99303478f9ae9c66de8a412f06011d34f536687940e9c547c89be9adce8985c395f4c72b1141d2ae124f1413ad0d067e572a3d711ab7eead482154ce01eb36cf9d8f62b60c75920df93b8921b14fe5b870a06829976e246b2db5fcd104574261dae094b86830b697ced626000abcb58ae6d4bd3dea0717fe6dd7cddec1c67ae4c0e246cf150d4ad5922f91d40f5b02b27376d46e8b9380f0d0b58d7b7eeea1a21e722bfd3295ca469e1f256eb97e9716a0371a4dd4cf0dd0e2ec38692a228b4378fc9a41b449a2b9d6c32cd47918bd47fc24be8566e43227f7ed1f870110bef20443ccb434e46cc3b6d8feee8e31b8da2cdccdcd74bd656cd94d59c26fabed0b85e6f15cacd09ae91b64fb8fc061e0ebe4dc4d270962120caa24e5c84290d994fe2410840149b4921d41b76f837d1a29da04ecaeb01a695df8e633f91105af7f6fe5a26a05fee03a19c5033453c11a710cfc84ce413457be9775c1957533fdfd817f2a99590d10ddceec7fded39a09ef9e9ef08d8f38d15dccee88f219e15301fa6eac574f9ddbc812f5a0a3a629750e48a3e868a90f39e63755e1b46c4eb5c94f4059572f0c05fae3e9d0e3271f0989f013fc5184c236f8c9b9ab05146683156c9a2b11bb0f7a0da3627c0bac58c194498a673801870a3958d3a0582a5ccbeb9ca554071ea446325603e67d876eeb1a05e1342649309ff58f618ea0a21f0cb02a766e3c01003eb745c4933d0f52ee02aaef2a16cb6c52bd164928673edb0f51c7214fa7bf2b010064c7d3b6a7aa59a310eda829e7ac9075ff1e96e01ea1719ee7fc4a5bdb0e9b9b01002763566e427b69e5646cf25048eda2e5806dcc6b7a5e5cdb59702d556840bf7201003c2ee321c25bfdea2ec3df0886c8b165dbf5b6902de7c39682e872ec9cd7b2a500001b3c159cef5dae965c86db605792ace3d987c9559a1be5388acaecb2c753da8f010075cf5f030c222e7dbd81b07096a20a1dc1958211f5327d60e7a499ae7c549188010014de0bbc9bf0798fbbf3255270b7b93ab1e70d76761fb74226653c47b3fd5e6c9f2d757029c6f2a8aa2e73bbebe51287c5a34d6f129a69e0ef7bbd2c13f477e51f00000000f9029500000000e244028be6278500ede0782231c1664f6a40f5b01d82c83b21bd50248a717a0c2102eb2aa581203121be475e55e67299a1aa8715a7602c538421240a2b91b5475e624018b406db4445bf718f2ddb175f83c73f6a1a17dbeefcfaf281fac6750a090a0e7a5ee40dd360279af0f85056341de416b426b79b48bea5bad6b06a2be6277703"
-			  },
-			  "value":25.0,
-			  "valueSat":2500000000,
-			  "sequence":4294967295
-			}
-		  ],
-		  "vout":[
-			{
-			  "value":449.9983556,
-			  "n":0,
-			  "scriptPubKey":{
-				"asm":"OP_DUP OP_HASH160 d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d OP_EQUALVERIFY OP_CHECKSIG",
-				"hex":"76a914d8ad1e3e2a57c3fe88d241337b0cbabed117bd6d88ac",
-				"reqSigs":1,
-				"type":"pubkeyhash",
-				"addresses":[
-				  "aLU95oKBFMSc7RWwtsGEBuK3ihFkcgKbfL"
-				]
-			  },
-			  "spentTxId":"7a3f13c9e5088f64abbff0bfd8b95886b17659018972f643e3ee25c69b852928",
-			  "spentIndex":0,
-			  "spentHeight":328253
-			}
-		  ],
-		  "blockhash":"c06c3a20c46614e13d0c6b449b4abc42ebfab26172fafc4e00105dd68dce9305",
-		  "height":327896,
-		  "confirmations":13521,
-		  "time":1607820997,
-		  "blocktime":1607820997
-		}"#;
+        let json = get_transaction_json("firo_sigmaspend");
+        let _tx: Transaction = serde_json::from_value(json).unwrap();
+    }
 
-        let _tx: Transaction = serde_json::from_str(json_str).unwrap();
+    #[test]
+    fn test_nav_cold_staking_script_pubkey() {
+        let nav_cold_staking_vout = get_transaction_json("nav_cold_staking_vout");
+        let vout: Vec<SignedTransactionOutput> = serde_json::from_value(nav_cold_staking_vout).unwrap();
+        assert_eq!(vout[1].script.script_type, ScriptType::ColdStaking);
     }
 }
diff --git a/mm2src/mm2_bitcoin/script/Cargo.toml b/mm2src/mm2_bitcoin/script/Cargo.toml
index 26f7ab57b8..5a4303561f 100644
--- a/mm2src/mm2_bitcoin/script/Cargo.toml
+++ b/mm2src/mm2_bitcoin/script/Cargo.toml
@@ -3,6 +3,9 @@ name = "script"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 bitcrypto = { path = "../crypto" }
 chain = { path = "../chain" }
diff --git a/mm2src/mm2_bitcoin/script/src/builder.rs b/mm2src/mm2_bitcoin/script/src/builder.rs
index 29bcef65fb..4dfc3e4d07 100644
--- a/mm2src/mm2_bitcoin/script/src/builder.rs
+++ b/mm2src/mm2_bitcoin/script/src/builder.rs
@@ -25,7 +25,7 @@ impl Builder {
     /// Builds p2pk script pubkey
     pub fn build_p2pk(pubkey: &Public) -> Script {
         Builder::default()
-            .push_bytes(&*pubkey)
+            .push_bytes(pubkey)
             .push_opcode(Opcode::OP_CHECKSIG)
             .into_script()
     }
diff --git a/mm2src/mm2_bitcoin/script/src/num.rs b/mm2src/mm2_bitcoin/script/src/num.rs
index 3175270391..5d98826a93 100644
--- a/mm2src/mm2_bitcoin/script/src/num.rs
+++ b/mm2src/mm2_bitcoin/script/src/num.rs
@@ -18,10 +18,7 @@ pub struct Num {
 }
 
 impl From<bool> for Num {
-    fn from(i: bool) -> Self {
-        let v = if i { 1 } else { 0 };
-        Num { value: v }
-    }
+    fn from(i: bool) -> Self { Num { value: i.into() } }
 }
 
 impl From<u8> for Num {
diff --git a/mm2src/mm2_bitcoin/script/src/script.rs b/mm2src/mm2_bitcoin/script/src/script.rs
index d27181ef6e..a644f00ed4 100644
--- a/mm2src/mm2_bitcoin/script/src/script.rs
+++ b/mm2src/mm2_bitcoin/script/src/script.rs
@@ -24,6 +24,7 @@ pub enum ScriptType {
     CreateSender,
     Call,
     Create,
+    ColdStaking,
 }
 
 /// Address from Script
@@ -97,6 +98,8 @@ impl Script {
 
     pub fn to_bytes(&self) -> Bytes { self.data.clone() }
 
+    pub fn as_slice(&self) -> &[u8] { self.data.as_slice() }
+
     /// Is empty script
     pub fn is_empty(&self) -> bool { self.data.len() == 0 }
 
@@ -461,6 +464,9 @@ impl Script {
             ScriptType::Create => {
                 Ok(vec![]) // TODO
             },
+            ScriptType::ColdStaking => {
+                Ok(vec![]) // TODO
+            },
         }
     }
 
diff --git a/mm2src/mm2_bitcoin/script/src/sign.rs b/mm2src/mm2_bitcoin/script/src/sign.rs
index 8a654576ad..d0309ef605 100644
--- a/mm2src/mm2_bitcoin/script/src/sign.rs
+++ b/mm2src/mm2_bitcoin/script/src/sign.rs
@@ -392,7 +392,7 @@ impl TransactionInputSigner {
         stream.append(&hash_prevouts);
         stream.append(&hash_sequence);
         stream.append(&self.inputs[input_index].previous_output);
-        stream.append_list(&**script_pubkey);
+        stream.append_list(script_pubkey);
         stream.append(&input_amount);
         stream.append(&self.inputs[input_index].sequence);
         stream.append(&hash_outputs);
diff --git a/mm2src/mm2_bitcoin/serialization/Cargo.toml b/mm2src/mm2_bitcoin/serialization/Cargo.toml
index 4dfe63cd51..590b18296b 100644
--- a/mm2src/mm2_bitcoin/serialization/Cargo.toml
+++ b/mm2src/mm2_bitcoin/serialization/Cargo.toml
@@ -3,6 +3,9 @@ name = "serialization"
 version = "0.1.0"
 authors = ["debris <marek.kotewicz@gmail.com>"]
 
+[lib]
+doctest = false
+
 [dependencies]
 byteorder = "1.0"
 primitives = { path = "../primitives" }
diff --git a/mm2src/mm2_bitcoin/serialization/src/lib.rs b/mm2src/mm2_bitcoin/serialization/src/lib.rs
index 22e806516d..389c28f072 100644
--- a/mm2src/mm2_bitcoin/serialization/src/lib.rs
+++ b/mm2src/mm2_bitcoin/serialization/src/lib.rs
@@ -13,7 +13,6 @@ pub use primitives::{bytes, compact, hash};
 
 pub use compact_integer::{parse_compact_int, CompactInteger};
 pub use list::List;
-pub use reader::{coin_variant_by_ticker, deserialize, deserialize_iterator, CoinVariant, Deserializable, Error,
-                 ReadIterator, Reader};
+pub use reader::{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 6b9045431d..453baa26a7 100644
--- a/mm2src/mm2_bitcoin/serialization/src/reader.rs
+++ b/mm2src/mm2_bitcoin/serialization/src/reader.rs
@@ -51,21 +51,48 @@ pub trait Deserializable {
 
 #[derive(Debug)]
 pub enum CoinVariant {
+    // Todo: https://github.com/KomodoPlatform/atomicDEX-API/issues/1345
+    BTC,
+    Qtum,
     LBC,
     Standard,
-    Qtum,
+    PPC,
+    /// Needed to deserialize `RICK` block headers correctly as it's genesis header is `version 1` while all other
+    /// block headers are `version 4`.
+    RICK,
+    /// Same reason as RICK.
+    MORTY,
 }
 
 impl CoinVariant {
+    pub fn is_btc(&self) -> bool { matches!(self, CoinVariant::BTC) }
     pub fn is_qtum(&self) -> bool { matches!(self, CoinVariant::Qtum) }
-
     pub fn is_lbc(&self) -> bool { matches!(self, CoinVariant::LBC) }
+    pub fn is_ppc(&self) -> bool { matches!(self, CoinVariant::PPC) }
+    pub fn is_kmd_assetchain(&self) -> bool { matches!(self, CoinVariant::RICK | CoinVariant::MORTY) }
 }
 
-pub fn coin_variant_by_ticker(ticker: &str) -> CoinVariant {
-    match ticker {
-        "LBC" => CoinVariant::LBC,
-        _ => CoinVariant::Standard,
+fn ticker_matches(ticker: &str, with: &str) -> bool {
+    ticker == with || ticker.contains(&format!("{with}-")) || ticker.contains(&format!("{with}_"))
+}
+
+impl From<&str> for CoinVariant {
+    fn from(ticker: &str) -> Self {
+        match ticker {
+            // "BTC", "BTC-segwit", "tBTC", "tBTC-segwit", etc..
+            t if ticker_matches(t, "BTC") => CoinVariant::BTC,
+            // "QTUM", "QTUM-segwit", "tQTUM", "tQTUM-segwit", etc..
+            t if ticker_matches(t, "QTUM") => CoinVariant::Qtum,
+            // "LBC", "LBC-segwit", etc..
+            t if ticker_matches(t, "LBC") => CoinVariant::LBC,
+            // "PPC", "PPC-segwit", etc..
+            t if ticker_matches(t, "PPC") => CoinVariant::PPC,
+            // "RICK"
+            t if ticker_matches(t, "RICK") => CoinVariant::RICK,
+            // "MORTY
+            t if ticker_matches(t, "MORTY") => CoinVariant::MORTY,
+            _ => CoinVariant::Standard,
+        }
     }
 }
 
diff --git a/mm2src/mm2_bitcoin/serialization_derive/Cargo.toml b/mm2src/mm2_bitcoin/serialization_derive/Cargo.toml
index 3e0395927e..a220338026 100644
--- a/mm2src/mm2_bitcoin/serialization_derive/Cargo.toml
+++ b/mm2src/mm2_bitcoin/serialization_derive/Cargo.toml
@@ -6,6 +6,7 @@ authors = ["debris <marek.kotewicz@gmail.com>"]
 [lib]
 name = "serialization_derive"
 proc-macro = true
+doctest = false
 
 [dependencies]
 syn = "0.11.11"
diff --git a/mm2src/mm2_bitcoin/spv_validation/Cargo.toml b/mm2src/mm2_bitcoin/spv_validation/Cargo.toml
index ccf46b61ae..8da3026ea9 100644
--- a/mm2src/mm2_bitcoin/spv_validation/Cargo.toml
+++ b/mm2src/mm2_bitcoin/spv_validation/Cargo.toml
@@ -2,16 +2,26 @@
 name = "spv_validation"
 version = "0.1.0"
 authors = ["Roman Sztergbaum <rmscastle@gmail.com>"]
+edition = "2018"
+
+[lib]
+doctest = false
 
 [dependencies]
+async-trait = "0.1"
 chain = {path = "../chain"}
+derive_more = "0.99"
+keys = {path = "../keys"}
 primitives = { path = "../primitives" }
 ripemd160 = "0.9.0"
 rustc-hex = "2"
+serde = "1.0"
 serialization = { path = "../serialization" }
 sha2 = "0.9"
 test_helpers = { path = "../test_helpers" }
 
 [dev-dependencies]
+common = { path = "../../common" }
+lazy_static = "1.4"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
\ No newline at end of file
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/conf.rs b/mm2src/mm2_bitcoin/spv_validation/src/conf.rs
new file mode 100644
index 0000000000..7fe6425ee9
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/conf.rs
@@ -0,0 +1,148 @@
+use crate::helpers_validation::SPVError;
+use crate::work::{DifficultyAlgorithm, RETARGETING_INTERVAL};
+use chain::{BlockHeader, BlockHeaderBits};
+use primitives::hash::H256;
+use serde::de::Error;
+use serde::{Deserialize, Deserializer};
+use std::num::NonZeroU64;
+use std::str::FromStr;
+
+fn from_hash_str<'de, D>(deserializer: D) -> Result<H256, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let hash: String = Deserialize::deserialize(deserializer)?;
+    let hash = H256::from_str(&hash).map_err(Error::custom)?;
+    Ok(hash.reversed())
+}
+
+fn from_bit_u32<'de, D>(deserializer: D) -> Result<BlockHeaderBits, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let bits: u32 = Deserialize::deserialize(deserializer)?;
+    Ok(BlockHeaderBits::Compact(bits.into()))
+}
+
+/// Custom SPV starting block header configuration
+#[derive(Debug, Clone, Deserialize)]
+pub struct SPVBlockHeader {
+    /// Valid `u32` representation of the block `height`.
+    pub height: u64,
+    /// Valid block header `hash`.
+    #[serde(deserialize_with = "from_hash_str")]
+    pub hash: H256,
+    /// Valid `u32` representation of the `date` the block is mined in epoch.
+    pub time: u32,
+    /// Valid block header `bits`.
+    #[serde(deserialize_with = "from_bit_u32")]
+    pub bits: BlockHeaderBits,
+}
+
+impl SPVBlockHeader {
+    pub(crate) fn from_block_header_and_height(header: &BlockHeader, height: u64) -> Self {
+        Self {
+            height,
+            hash: header.hash(),
+            time: header.time,
+            bits: header.bits.clone(),
+        }
+    }
+}
+
+/// Validate that `max_stored_headers_value` is always greater than `retarget interval`.
+fn validate_btc_max_stored_headers_value(max_stored_block_headers: u64) -> Result<(), SPVError> {
+    if RETARGETING_INTERVAL > max_stored_block_headers as u32 {
+        return Err(SPVError::InitialValidationError(format!(
+            "max_stored_block_headers {max_stored_block_headers} must be greater than retargeting interval {RETARGETING_INTERVAL}",
+        )));
+    }
+
+    Ok(())
+}
+
+/// Validate that starting block header is a retarget header.
+fn validate_btc_spv_header_height(coin: &str, height: u64) -> Result<(), SPVError> {
+    let is_retarget = height % RETARGETING_INTERVAL as u64;
+    if is_retarget != 0 {
+        return Err(SPVError::WrongRetargetHeight {
+            coin: coin.to_string(),
+            expected_height: height - is_retarget,
+        });
+    }
+
+    Ok(())
+}
+
+/// Custom SPV block header configuration
+#[derive(Clone, Debug, Deserialize)]
+pub struct BlockHeaderValidationParams {
+    pub difficulty_check: bool,
+    pub constant_difficulty: bool,
+    pub difficulty_algorithm: Option<DifficultyAlgorithm>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct SPVConf {
+    /// Where to start block headers sync from.
+    pub starting_block_header: SPVBlockHeader,
+    /// Max number of block headers to be stored in db, when reached, excessive headers will be deleted.
+    pub max_stored_block_headers: Option<NonZeroU64>,
+    /// The parameters that specify how the coin block headers should be validated. If None,
+    /// headers will be saved in DB without validation, can be none if the coin's RPC server is trusted.
+    pub validation_params: Option<BlockHeaderValidationParams>,
+}
+
+impl SPVConf {
+    pub fn validate(&self, coin: &str) -> Result<(), SPVError> {
+        if let Some(params) = &self.validation_params {
+            if let Some(algo) = &params.difficulty_algorithm {
+                match algo {
+                    DifficultyAlgorithm::BitcoinMainnet => {
+                        validate_btc_spv_header_height(coin, self.starting_block_header.height)?;
+                        if let Some(max) = self.max_stored_block_headers {
+                            validate_btc_max_stored_headers_value(max.into())?;
+                        }
+                    },
+                    DifficultyAlgorithm::BitcoinTestnet => {
+                        return Err(SPVError::Internal("Bitcoin Testnet is not supported yet.".to_string()))
+                    },
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Validate Starting block header from `RPC` against [`SPVConf::SPVBlockHeader`]
+    pub fn validate_rpc_starting_header(&self, height: u64, rpc_header: &BlockHeader) -> Result<(), SPVError> {
+        let rpc_header = SPVBlockHeader::from_block_header_and_height(rpc_header, height);
+        let spv_header = &self.starting_block_header;
+
+        // Currently, BlockHeader::Compact is used in spv block header validation but some coins from rpc will return
+        // BlockHeader::U32, therefore, we need only the inner value in this case to validate the header bits.
+        let rpc_header_bits: u32 = rpc_header.bits.into();
+        let spv_header_bits: u32 = spv_header.bits.clone().into();
+        if rpc_header_bits != spv_header_bits {
+            return Err(SPVError::InitialValidationError(format!(
+                "Starting block header bits not acceptable - expected: {spv_header_bits} - found: {rpc_header_bits}"
+            )));
+        };
+
+        if rpc_header.hash != spv_header.hash {
+            return Err(SPVError::InitialValidationError(format!(
+                "Starting block header hash not acceptable - expected: {} - found: {}",
+                spv_header.hash, rpc_header.hash,
+            )));
+        };
+
+        if rpc_header.time != spv_header.time {
+            return Err(SPVError::InitialValidationError(format!(
+                "Starting block header time not acceptable - expected: {} - found: {}",
+                spv_header.time, rpc_header.time,
+            )));
+        };
+
+        Ok(())
+    }
+}
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/for_tests/workTestVectors.json b/mm2src/mm2_bitcoin/spv_validation/src/for_tests/workTestVectors.json
new file mode 100644
index 0000000000..28bf5bec75
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/for_tests/workTestVectors.json
@@ -0,0 +1,40 @@
+{
+  "BTC": [
+    {
+      "height": 2016,
+      "hex": "010000006397bb6abd4fc521c0d3f6071b5650389f0b4551bc40b4e6b067306900000000ace470aecda9c8818c8fe57688cd2a772b5a57954a00df0420a7dd546b6d2c576b0e7f49ffff001d33f0192f"
+    },
+    {
+      "height": 604800,
+      "hex": "000000208e244d2c55bc403caa5d6eaf0f922170e413eb1e02fb02000000000000000000e03b4d9df72d8db232a20bb2ff35c433a99f1467f391f75b5f62180d96f06d6aa4c4d65d3eb215179ef91633"
+    },
+    {
+      "height": 724608,
+      "hex": "00c0d933bd3c3dcf14027754c7c8f7190a79b699188c8b24f49204000000000000000000ce2b1e4dc6cb44fae781df459428382d4b5be52766f67a42725cc0d78e00784d352e166278100a173d95ee89"
+    }
+  ],
+  "tBTC": [
+    {
+      "height": 199584,
+      "hex": "0200000097f2b61897ba2bed756cca30058bcc1c2dfbb4ed0e962f47f749dc03000000006b80079a1eda8071424e294fa56849370e331c8ff7e95034576c9789c8db0fa6da551153ab80011c9bdaca25"
+    },
+    {
+      "height": 201594,
+      "hex": "02000000cbed7fd98f1f06e85c47e13ff956533642056be45e7e6b532d4d768f00000000f2680982f333fcc9afa7f9a5e2a84dc54b7fe10605cd187362980b3aa882e9683be21353ab80011c813e1fc0"
+    },
+    {
+      "height": 201595,
+      "hex": "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0"
+    },
+    {
+      "height": 201596,
+      "hex": "02000000303505969a1df329e5fccdf69b847a201772e116e557eb7f119d1a9600000000469267f52f43b8799e72f0726ba2e56432059a8ad02b84d4fff84b9476e95f7716e41353ab80011c168cb471"
+    }
+  ],
+  "MORTY": [
+    {
+      "height": 1330480,
+      "hex": "04000000bb496ba8d09f8f98b15cdaf5798163bdd70676eb1c8b538f53ab4f83da4a27000db352177c6b5ad2499a906cec33b843fb17fc1ec298cd06c7e7ceb7b62e144232d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca473de614625be6071f09006c286bc5ec73dd27a09bf687700c06fb04d0b9a063c0aa0746c9db170000fd40050053b27dad1f5a858b78f3154039759e985ed57db10ecb772810d7f158c55083a14b9f2ba26ae9fcb82012186e2528f67c45b7b216a69fe26232ad2d179a141b1b10e4d5f108c7b920b49348f6eef2d70b7f02cb01d8d9992f8f2d7b6608806b10ff329846b188de200aa37c73ac03f6c9b79cf5613c71b7969b4abafdbc1165ad955a049269584c83b36f36a3e9becf2fe81f3b1917475eb13ecfed3813ecc32206078d8c1e2797013dfc6f6a55e06f1c06a07959ef94d53ca0fc81d03cb6f614761156ed4ff1a8e5c9f0b96f3c8c3eeb9a0720cf4ed10397330f49b83439c5083eea1d1785a10d86ca2866d0da4ca746c49118b780c55aa6cd5b4c0491cefa258ecf129307d15e001415b203e89c008f4444b236aa556dbf4f6d05e0c57642cfa142df2f8546f1d37a6b2feaf98496892b41caefbe7dc7bcbb2755752df3dbf00ac1fc558896f14541aea4cc78ec5d00bbe5398fac4a658b1ae3399777f15117c0f3de3c63bc5b3edf6543d172cfc66907f9cf8706e97b14281daeb427801dfb0910743873265ae6bae71dbf22353c321f726e68f747965858f488dd507b7e6adee42509e5720373dce5b111b420c906b0f2cb391cfb9d581e2509da3829d6718469f383e07043694db87db0ce1196449a6c9cd941a8bde507e553c0ca534238dcc93633631926102c87cd0f83720ccff60de8b05b103e086a2c2cb7943f21033a5658235fc52708907e1ea722e726808db0270bf898c51e9dd0745614857783dc11a6dcd7760d4a07ddbd83a2e02b23fa789b79eed22dc411b9b48f71c54f12387065e3ff0638701e0f6a0dd56d0ce395d150b237b60c166352e69b92173b884446d7660f5857458b97c6d4ee54f8a1f60113aff30e54c1f7c572b85dcb7a2419d2f736a9b0a6d99ea549bd74e546251c0b8be7975e9a6d96aa3467b1dc6b024745fdef43b37cf21a657a3247d9adf8c252ef210d9a4e9c7191f698ccc9b10103b8bb811cdcf1a62903786476db8195ffb3cd004c57ad07a7a3c41eee391f66a7697e69409d7a78558720f6a1b9804d72de820b7b6165b8e14a2b1316576022423f22bb82fab16127be7173ddcd43fa7ea5c4474f79321a8c4b792caf12320c3047d026b7d63216a022e83655c2d811d2bd2a559970e9155b979953f9801ce918f690f43f5e3f07f7ce27a6837bf33b2490d9add8549f1e603a750c114bb92740cc3987cb9f948a6229f175a7b577b0b60d885a0a7ef05debe921376a7acdb25eaa8bb72e120e529cd775175012efb454cf41d240a946bf140af20d9a5dbed2e196d91a7ff33c2769f140fa0bb968111e1602221deae8d162e7a471354c2051acb43ec31015aaefa0b08bf1bddbb282e86a1caf45f3b63e4c6427ba9e99aed28ef79711794511511c52daf13b735e02b9833d3467bfd16886606d5555b7cc95ff2fea3b03c82cfe60e8602d9f70a3870f5b755573b955bb300bd3733b5ddf9a61fd3cd281af39520d6dfd8b7e2b165ec91749614a3b5241e2ea12470f91b58cf6163e02dfe79392db70cd17db9497cf59c89ac8377dbd02042f6ed270c8c2bc717623b203b74676890f5f4cd905b25772a25292d76b6f42a094c27eed13793d189e395ed3f28c5731976a7b45184acee45b3cf05a9c62045644dfe39f79cd331e282edae99cea652eb82819415ac2a5c21539cdd636fb835063ace3b6befffaf50bf6866e9b1a2b35037a330faeb18ca1696693dafd26b5f5da8dcd3e50ff09249bdda695f576d25024560b643d873d07293a80fe71998ef6ccd88c0cf9f69326b463c26fe4906faaf454ae68accd7ef3edffefdd2ede23a822a2267332f0791f1c4e6d5ab4661f279f5039b36a4476e56fd5b0461e585ff30a7c661b93f1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs b/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs
index a91ff91289..40b5e7fdc3 100644
--- a/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs
+++ b/mm2src/mm2_bitcoin/spv_validation/src/helpers_validation.rs
@@ -1,51 +1,66 @@
-use chain::{BlockHeader, RawBlockHeader, RawHeaderError};
+use crate::conf::{SPVBlockHeader, SPVConf};
+use crate::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use crate::work::{next_block_bits, NextBlockBitsError};
+use chain::{BlockHeader, RawHeaderError};
+use derive_more::Display;
 use primitives::hash::H256;
-use primitives::U256;
 use ripemd160::Digest;
 use serialization::parse_compact_int;
 use sha2::Sha256;
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug, Display, Eq, PartialEq)]
 pub enum SPVError {
-    /// Overran a checked read on a slice
+    #[display(fmt = "Error validating initial spv parameters: {_0}")]
+    InitialValidationError(String),
+    #[display(fmt = "Overran a checked read on a slice")]
     ReadOverrun,
-    /// Attempted to parse a CompactInt without enough bytes
+    #[display(fmt = "Attempted to parse a CompactInt without enough bytes")]
     BadCompactInt,
-    /// `extract_hash` could not identify the output type.
+    #[display(fmt = "`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.
+    #[display(fmt = "Unable to get block header from network or storage: {}", _0)]
+    UnableToGetHeader(String),
+    #[display(fmt = "Header not exactly 80 bytes")]
     WrongLengthHeader,
-    /// Header chain changed difficulties unexpectedly
+    #[display(fmt = "Header chain changed difficulties unexpectedly")]
     UnexpectedDifficultyChange,
-    /// Header does not meet its own difficulty target.
+    #[display(fmt = "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.
+    #[display(fmt = "Couldn't calculate the required difficulty for the block: {}", _0)]
+    DifficultyCalculationError(NextBlockBitsError),
+    #[display(fmt = "Header {height} in chain does not correctly reference parent header, coin: {coin}")]
+    InvalidChain { coin: String, height: u64 },
+    #[display(fmt = "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.
+    #[display(
+        fmt = "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.
+    #[display(
+        fmt = "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.
+    #[display(fmt = "A `vin` (transaction input vector) is malformatted")]
     InvalidVin,
-    /// A `vout` (transaction output vector) is malformatted or empty.
+    #[display(fmt = "A `vout` (transaction output vector) is malformatted or empty")]
     InvalidVout,
-    /// merkle proof connecting the `tx_id_le` to the `confirming_header`.
+    #[display(fmt = "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
+    #[display(fmt = "Unable to get merkle tree from network or storage for {coin}: {err}")]
+    UnableToGetMerkle { coin: String, err: String },
+    #[display(fmt = "Unable to retrieve block height / block height is zero: {}", _0)]
+    InvalidHeight(String),
+    #[display(fmt = "Raises during validation loop")]
     Timeout,
+    #[display(fmt = "Block headers storage error: {}", _0)]
+    HeaderStorageError(BlockHeaderStorageError),
+    #[display(
+        fmt = "Wrong retarget block header height in config for: {coin} expected block header height :
+        {expected_height}."
+    )]
+    WrongRetargetHeight { coin: String, expected_height: u64 },
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
 }
 
 impl From<RawHeaderError> for SPVError {
@@ -56,6 +71,14 @@ impl From<RawHeaderError> for SPVError {
     }
 }
 
+impl From<NextBlockBitsError> for SPVError {
+    fn from(e: NextBlockBitsError) -> Self { SPVError::DifficultyCalculationError(e) }
+}
+
+impl From<BlockHeaderStorageError> for SPVError {
+    fn from(e: BlockHeaderStorageError) -> Self { SPVError::HeaderStorageError(e) }
+}
+
 /// A slice of `H256`s for use in a merkle array
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct MerkleArray<'a>(&'a [u8]);
@@ -120,6 +143,7 @@ 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())
@@ -152,8 +176,8 @@ pub(crate) fn validate_vin(vin: &[u8]) -> bool {
         if offset >= vin_length {
             return false;
         }
-        match determine_input_length(&vin[offset as usize..]) {
-            Ok(v) => offset += v as usize,
+        match determine_input_length(&vin[offset..]) {
+            Ok(v) => offset += v,
             Err(_) => return false,
         };
     }
@@ -184,8 +208,8 @@ pub(crate) fn validate_vout(vout: &[u8]) -> bool {
         if offset >= vout_length {
             return false;
         }
-        match determine_output_length(&vout[offset as usize..]) {
-            Ok(v) => offset += v as usize,
+        match determine_output_length(&vout[offset..]) {
+            Ok(v) => offset += v,
             Err(_) => return false,
         };
     }
@@ -289,16 +313,6 @@ pub(crate) fn merkle_prove(
 
 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.
 ///
@@ -316,35 +330,57 @@ fn validate_header_work(digest: H256, target: &U256) -> bool {
 ///
 /// # Notes
 /// Wrapper inspired by `bitcoin_spv::validatespv::validate_header_chain`
-pub fn validate_headers(
+pub async fn validate_headers(
+    coin: &str,
+    previous_height: u64,
     headers: Vec<BlockHeader>,
-    difficulty_check: bool,
-    constant_difficulty: bool,
+    storage: &dyn BlockHeaderStorageOps,
+    conf: &SPVConf,
 ) -> 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),
+    let mut previous_header =
+        if previous_height == conf.starting_block_header.height {
+            conf.starting_block_header.clone()
+        } else {
+            let header = storage.get_block_header(previous_height).await?.ok_or(
+                BlockHeaderStorageError::GetFromStorageError {
+                    coin: coin.to_string(),
+                    reason: format!("Header with height {} is not found in storage", previous_height),
+                },
+            )?;
+            SPVBlockHeader::from_block_header_and_height(&header, previous_height)
         };
-        if (!constant_difficulty && difficulty_check) && cur_target != target {
-            return Err(SPVError::UnexpectedDifficultyChange);
+    let mut previous_height = previous_height;
+    let mut previous_hash = previous_header.hash;
+    let mut prev_bits = previous_header.bits.clone();
+
+    for header in headers.into_iter() {
+        if !validate_header_prev_hash(&header.previous_header_hash, &previous_hash) {
+            return Err(SPVError::InvalidChain {
+                coin: coin.to_string(),
+                height: previous_height + 1,
+            });
         }
-        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);
+
+        let current_block_bits = header.bits.clone();
+        if let Some(params) = &conf.validation_params {
+            if params.constant_difficulty && params.difficulty_check && current_block_bits != prev_bits {
+                return Err(SPVError::UnexpectedDifficultyChange);
+            }
+
+            if let Some(algorithm) = &params.difficulty_algorithm {
+                let next_block_bits =
+                    next_block_bits(coin, header.time, previous_header.clone(), storage, algorithm).await?;
+
+                if !params.constant_difficulty && params.difficulty_check && current_block_bits != next_block_bits {
+                    return Err(SPVError::InsufficientWork);
+                }
+            }
         }
-        previous_hash = raw_header.digest();
+
+        prev_bits = current_block_bits;
+        previous_header = SPVBlockHeader::from_block_header_and_height(&header, previous_height + 1);
+        previous_hash = previous_header.hash;
+        previous_height += 1;
     }
     Ok(())
 }
@@ -354,7 +390,12 @@ mod tests {
     extern crate std;
 
     use super::*;
+    use crate::conf::{BlockHeaderValidationParams, SPVBlockHeader};
     use crate::test_utils::{self};
+    use crate::work::tests::TestBlockHeadersStorage;
+    use crate::work::DifficultyAlgorithm;
+    use chain::BlockHeaderBits;
+    use common::block_on;
     use std::{println, vec};
     use test_helpers::hex::force_deserialize_hex;
 
@@ -538,13 +579,34 @@ mod tests {
 
     #[test]
     fn test_block_headers_no_difficulty_check() {
-        // morty: 1330480, 1330481, 1330482
+        // morty: 1330481, 1330482
         let headers: Vec<BlockHeader> = vec![
-            "04000000bb496ba8d09f8f98b15cdaf5798163bdd70676eb1c8b538f53ab4f83da4a27000db352177c6b5ad2499a906cec33b843fb17fc1ec298cd06c7e7ceb7b62e144232d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca473de614625be6071f09006c286bc5ec73dd27a09bf687700c06fb04d0b9a063c0aa0746c9db170000fd40050053b27dad1f5a858b78f3154039759e985ed57db10ecb772810d7f158c55083a14b9f2ba26ae9fcb82012186e2528f67c45b7b216a69fe26232ad2d179a141b1b10e4d5f108c7b920b49348f6eef2d70b7f02cb01d8d9992f8f2d7b6608806b10ff329846b188de200aa37c73ac03f6c9b79cf5613c71b7969b4abafdbc1165ad955a049269584c83b36f36a3e9becf2fe81f3b1917475eb13ecfed3813ecc32206078d8c1e2797013dfc6f6a55e06f1c06a07959ef94d53ca0fc81d03cb6f614761156ed4ff1a8e5c9f0b96f3c8c3eeb9a0720cf4ed10397330f49b83439c5083eea1d1785a10d86ca2866d0da4ca746c49118b780c55aa6cd5b4c0491cefa258ecf129307d15e001415b203e89c008f4444b236aa556dbf4f6d05e0c57642cfa142df2f8546f1d37a6b2feaf98496892b41caefbe7dc7bcbb2755752df3dbf00ac1fc558896f14541aea4cc78ec5d00bbe5398fac4a658b1ae3399777f15117c0f3de3c63bc5b3edf6543d172cfc66907f9cf8706e97b14281daeb427801dfb0910743873265ae6bae71dbf22353c321f726e68f747965858f488dd507b7e6adee42509e5720373dce5b111b420c906b0f2cb391cfb9d581e2509da3829d6718469f383e07043694db87db0ce1196449a6c9cd941a8bde507e553c0ca534238dcc93633631926102c87cd0f83720ccff60de8b05b103e086a2c2cb7943f21033a5658235fc52708907e1ea722e726808db0270bf898c51e9dd0745614857783dc11a6dcd7760d4a07ddbd83a2e02b23fa789b79eed22dc411b9b48f71c54f12387065e3ff0638701e0f6a0dd56d0ce395d150b237b60c166352e69b92173b884446d7660f5857458b97c6d4ee54f8a1f60113aff30e54c1f7c572b85dcb7a2419d2f736a9b0a6d99ea549bd74e546251c0b8be7975e9a6d96aa3467b1dc6b024745fdef43b37cf21a657a3247d9adf8c252ef210d9a4e9c7191f698ccc9b10103b8bb811cdcf1a62903786476db8195ffb3cd004c57ad07a7a3c41eee391f66a7697e69409d7a78558720f6a1b9804d72de820b7b6165b8e14a2b1316576022423f22bb82fab16127be7173ddcd43fa7ea5c4474f79321a8c4b792caf12320c3047d026b7d63216a022e83655c2d811d2bd2a559970e9155b979953f9801ce918f690f43f5e3f07f7ce27a6837bf33b2490d9add8549f1e603a750c114bb92740cc3987cb9f948a6229f175a7b577b0b60d885a0a7ef05debe921376a7acdb25eaa8bb72e120e529cd775175012efb454cf41d240a946bf140af20d9a5dbed2e196d91a7ff33c2769f140fa0bb968111e1602221deae8d162e7a471354c2051acb43ec31015aaefa0b08bf1bddbb282e86a1caf45f3b63e4c6427ba9e99aed28ef79711794511511c52daf13b735e02b9833d3467bfd16886606d5555b7cc95ff2fea3b03c82cfe60e8602d9f70a3870f5b755573b955bb300bd3733b5ddf9a61fd3cd281af39520d6dfd8b7e2b165ec91749614a3b5241e2ea12470f91b58cf6163e02dfe79392db70cd17db9497cf59c89ac8377dbd02042f6ed270c8c2bc717623b203b74676890f5f4cd905b25772a25292d76b6f42a094c27eed13793d189e395ed3f28c5731976a7b45184acee45b3cf05a9c62045644dfe39f79cd331e282edae99cea652eb82819415ac2a5c21539cdd636fb835063ace3b6befffaf50bf6866e9b1a2b35037a330faeb18ca1696693dafd26b5f5da8dcd3e50ff09249bdda695f576d25024560b643d873d07293a80fe71998ef6ccd88c0cf9f69326b463c26fe4906faaf454ae68accd7ef3edffefdd2ede23a822a2267332f0791f1c4e6d5ab4661f279f5039b36a4476e56fd5b0461e585ff30a7c661b93f1".into(),
             "04000000001f22e1bc88c53b1554f8fdcf261fdb09f4cae6ef5e5032b788515f4a60d30d67d1b35fda68abc05f5af39e5ade224a5312b8dcd1f3629a7ff33355bb7ca93e32d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca478be6146220bb071f49000b055b22a7a4bbafd6b52efb90f963d5f80126c27e437005fb47720e0000fd4005004d9875d71c540f558813142e263f597243bdd8d8105ff3d1ffd62ae51ccf22729debe510f97ab0631701dbd34b73e570597dc8825be6bd669e693037fb701040c273b44745f4e850c2d8aeca7ccab6ef7f462206a16d75358f2e8fddf9d0dbc6333ff55b1813a37f0ba240bd2d897fbd6cfdb1989ac8f3ec93b15ae4360edf84088ac9a4ea7d3d71290532bb51675e7310be1210aa33c184d693f6f7c15c5be1e89356ae3d663d0c548fceac0974fe4cb6c6559f50643280df9508460fd04f9cde55521b4c6d61c644c6c7b7473f9e39b412e3776f5e47b6c466aaf1dc76ff2114e716eb6b9614d0c93cdc229ec13b07057a7f7446c1aac51ef0950d4361fa2d20f22f29ff490bf6d6a2a267c45d88d3152d9f5291695f2f4fba65ca9763cb4176506c73b8162611b6004af7ec8d1ea55a225cca2576e4ac84ac333b663693a2f19f7786340ad9d2212d576a0b4e7700bd7d60de88940dce1f01481f9c41350eefd7b496218bcf70c4c8922dfd18d666d37d10cb0f14dd38e1225ec179dcab5501a4434674d6f9ff9f23c4df5f445cc2accf43189fc99ac56693df373a4207b0dc991009fae4796fd7e49cea4dd139ee72264dfd47f4e1ad2420d635c7a1f37950d022ffdcccc7651b645db0ba0ce94c18dcc902279b4601806beefe05016f1f85411e6562b584da0854db2e36f602d8c4974d385aee4a01d1132082c8cd7c71443162f7d7487c73d8a46f830f72a0d352d957bef5afc33c4447ef33b2491e28000d1f4687e95ffc2b9532d28ae4c48f8551bf527dbe18c672204495f2bd546566fd5770189e28c2de0974130a492ccd8737a8c6e971d02a23c4f9f27410348d1f666f93385bdc81bad8e9a9d1dbffdfa2609ebae52740b457ecd67a3bf0db02a14f5bdf3e25b35b2d3d303094e46e0e3daef559d9f0e074e512bcaf9fcc9d035083eec16806af8a93d27b4ad46754a425b6a02b1ac22f682e48f214d66b379d7042aa39f2c5f3448d05ca4b6360e162f31f197225f4ad579d69207c666711fb3f6ca814efcf430899360cced1168cd69ec0e809a89cf2cf2015f9f895a3dadd4ced6d94793e98201b1da6a0a5d90be5d06925e3ad60b9227f84b9c3060a6db6e7857d8731f975d4a993abf10d84590da02b114625109d864de070813179b651d528f66036c30a0700ee84fc5e59757a509745b64e76fa3396f3c8b01a7724cd434e6d774dad36be8a73ad29f6859352aa15236e7825947396cb98e26b912b19ddc127590e59200c4334d1d96d7585a0e349b920f2e4e59cdedac911214c42c0894f72c8a7423d7aef3ea5ef9a5b650821f46537c65509ad8dcf6558c16c04f9877c737ff81875d9fbe01d23d37e937444cf257b0b57bc1c2a774f2e2bf5f3b0881be0e2282ba97ef6aad797f8fdb4053da4e478575805c7a93076c09847544a8e89f1cb3838df7870bcf61deb2144c6f6349c966b67545703058f9227965b97835b049538fb428431a8461586b022368626d20e9b6bfdd7232a5cc6a0aa214319cb440c45443a2446d1e17713c0e1049f0fd759d1dbff493302140376cfb153330ed455a043189260cb7d2d90333a37d3584f2d907d0a73dccee299ad14141d60d1409cda688464a13b5dab37476641741717d599a60c0ac84d85869ed449f83933ad30e2591157fd1f07b73ecf26f34e91bc00f1ca86ae34ca8231b372cdc2ed18d463ac42f92859d6f0e2c483dbb23d785f1233db2033458af9d7c1e7029ac5cc33ca7d25b2b49fd71b1ae5f5ce969b6e77333bf5fbb5e6645dd0a4d0c6e82eb534ac264ddbe28513e4b82b3578c1a6cbfaa2522aa50985fe2cce43cf3363eaacca0e09c721fd603d43c3a4fdf8dde0c9ff2c054910b16aeef7c4d86b31".into(),
             "04000000fcead9a1b425124f11aa97e0614120ce87bdddcad655672916f9c4564dc057002bd3df07a4602620282b276359529114ba89b59b16bec235d584c3cf5cc6b2d132d719d14c15e565c05e84ead95a2f101a1b658ee2f36eb7ca65206e27cfca47bfe61462d5b9071f1a001daf299c51afbd74fd75a98ba49a6e40ae8ad92b3afdc1cf215fd6190000fd40050044b5e035b02d138a9704f9513c0865f2733b7c09294ee504c155c283f4895559b6ac39828eac98ad393a642330589e8849040f55ce44f8f2197529d0b0ed57ccdda41f1971e153ec28ac5b4eba968741db374104d65ee234580a83bea1c0cdb67b8bc207057486eb1d90e21ba0cd4f5e9fd834821fafc1517c5d1fceb50ba6f6b102a9b4edac46f2359aec795a4e2458f51114a41289634b3b1cf250e3e38f3689f951278dfa7202a7dfe311cc098fd4a8d02c8f8a74e4a5010b18ee2e60578d5e9f1c094433a73f26e6546e20a574fc261baaa79e9910ab86ed607786a1cc88e7de51ff928d434e26eaef1437f7068c743f26d7c0eea6791e869b101fee8ab41b50af6174c5e6b731a1719f31ee3e6529efef49f31665baedc9382e9665278a84467d479f139fc7a8ef66fef9bd2fd17f7779ee315d458f691a290fa7c2179de8bb91a78458c5290d4aa45b163254006800ba2fce7479511f744fd7de96495c39be93413d8b0b187fe092537e1a7646a66a125b33333f6ecd10085e23ad168b24ee7be69d01ea021a39401e4bd41d818499e7174dd9b85542076c78cb89eeec1c190301b4709dbc963d47926e31bb0235ba6a7029d49458150f6491ac9c973b8a2c893258f907baf4bcb7c39f12b900ba2b2382cd5dd84314ee504ade835ad9a1cb13a7f5928a483ebc9415429810fd99893f2f8f83970b8b47143d617e6f9853e4d86ff378be664218f1c32531143e209f171590dd48216fec879a6b9cbf04432bf4f1a3734b69b6a9f1a358a259a0f9082cfb6c1f3d9d2d9e4522ad651ccce565f06b30c1c0b27252270c2f6608cf4f3288a7e7d4b174e646de05341f7db62b00b5ccb295f058d34b87201148828e9b3f7e08f60e100f810be27eb7f4c471cda7621106fe78bc69ec2bd27acabd55dc094b8626913b7d24d9b60939754700f32574a733a195f8b0220d56f6797de0bcd7b80d561896b816586593409f76e85a7a1035f821dee32a02fdbc26bc4cca375bed418b9d678ac589249a1a5a5b24447ee9b42e33f817066caf3d4e17d0347f6acf0cbf426d4df49413b3d12350edec2681ab9cfecd0825ccfb2649a57391d3f153050dfb4350d60e5e464229ddd6e49ece95557b8ef48c18cbffbe9fc8d7700f611a4b33a2a254afcec638c485e36daf0364da7d4302e488db7b6c41297571048cfea5452e324abb9f9e1043e625fd0853b7e03063d1c3a43aa1ee62d45d890b5e4d10640e775cff6852b6d1acd4a503b3ece3b319cbcf33ff9fdf17b8f852d748db1e05af80507f5d0e1bc44444b155d7da20f7f0b4d6d83368c3bb9e1321b39472a8677ea1d3aca43b453d35edca37b7536d19c26b764958b3c7c30f3211d7b7bb7f6a6d7fd7bf2dda6e7d7b1e533556863549bbe1394a3828596f25029b7e30495e1235f084e5edd133bc29fce4f1e5e514eb1d1cb19fd8dfbb0d130fbec4e288f23dae86311ffd6f4afbaacc2ffe1cc8811a455ba6f5659f82515b56c6ac84277bff5bef98fefc74e002e4a11866a417a429541f8a62df4108e4730d3045f92984bcf1ab2f7d03f8bb1767e91791530cd8eec412919e1f2e341e66a1588a8f485f7aa005787af946b9cb10f6685420b7e1663f66374fddc5e70720507ee2134f3b02df042fcf6db4a5bdd74cc5010793634816fe447cc68e076b225cc1ca872929ef246ce356dc8d8964ff6d7119d071eccb6dc37f75b932c44cdc30723b8357a2761c6de6ab2713e6f6a782538cb731b07950d3f459760a00cc0af406d6848014746b02653636f479d952b46fdeff976e1d159ba46ae7363d5b0042d3905a0bda12aaa6eaae1a5a0d55d4c1930aa1c004cd610866853a247239366aa20f8968ea9ca3d5d6d7321a5d0f2c".into()
         ];
-        validate_headers(headers, false, false).unwrap()
+        let params = BlockHeaderValidationParams {
+            difficulty_check: false,
+            constant_difficulty: false,
+            difficulty_algorithm: None,
+        };
+        let conf = SPVConf {
+            starting_block_header: SPVBlockHeader {
+                height: 0,
+                hash: "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f".into(),
+                time: 486604799,
+                bits: BlockHeaderBits::Compact(1231006505.into()),
+            },
+            max_stored_block_headers: None,
+            validation_params: Some(params),
+        };
+        block_on(validate_headers(
+            "MORTY",
+            1330480,
+            headers,
+            &TestBlockHeadersStorage { ticker: "MORTY".into() },
+            &conf,
+        ))
+        .unwrap()
     }
 
     #[test]
@@ -553,6 +615,28 @@ mod tests {
         let headers: Vec<BlockHeader> = vec!["00200020eab6fa183da8f9e4c761b31a67a76fa6a7658eb84c760200000000000000000063cd9585d434ec0db25894ec4b1f03735f10e31709c4395ea67c50c8378f134b972f166278100a17bfd87203".into(), 
                                              "0000402045c698413fbe8b5bf10635658d2a1cec72062798e51200000000000000000000869617420a4c95b1d3d6d012419d2b6c199cff9b68dd9a790892a4da8466fb056033166278100a1743ac4d5b".into(), 
                                              "0400e02019d733c1fd76a1fa5950de7bee9d80f107276b93a67204000000000000000000a0d1dee718f5f732c041800e9aa2c25e92be3f6de28278545388db8a6ae27df64c37166278100a170a970c19".into()];
-        validate_headers(headers, true, true).unwrap()
+        let params = BlockHeaderValidationParams {
+            difficulty_check: true,
+            constant_difficulty: false,
+            difficulty_algorithm: Some(DifficultyAlgorithm::BitcoinTestnet),
+        };
+        let conf = SPVConf {
+            starting_block_header: SPVBlockHeader {
+                height: 0,
+                hash: "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f".into(),
+                time: 486604799,
+                bits: BlockHeaderBits::Compact(1231006505.into()),
+            },
+            max_stored_block_headers: None,
+            validation_params: Some(params),
+        };
+        block_on(validate_headers(
+            "BTC",
+            724608,
+            headers,
+            &TestBlockHeadersStorage { ticker: "BTC".into() },
+            &conf,
+        ))
+        .unwrap()
     }
 }
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/lib.rs b/mm2src/mm2_bitcoin/spv_validation/src/lib.rs
index 1c30005769..4abc7e6466 100644
--- a/mm2src/mm2_bitcoin/spv_validation/src/lib.rs
+++ b/mm2src/mm2_bitcoin/spv_validation/src/lib.rs
@@ -1,17 +1,29 @@
 extern crate chain;
+extern crate derive_more;
+extern crate keys;
 extern crate primitives;
 extern crate ripemd160;
 extern crate rustc_hex as hex;
+extern crate serde;
 extern crate serialization;
 extern crate sha2;
 extern crate test_helpers;
 
+/// `conf` Contains SPV configuration structures and logics for validating [`SPVConf::starting_block_header`].
+pub mod conf;
+
 /// `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
+/// `spv_proof` Contains spv proof validation logic and data structure.
 pub mod spv_proof;
 
+/// `storage` Contains traits that can be implemented to provide the storage needed for spv validation.
+pub mod storage;
+
+/// `work` Contains functions that can be used to calculate proof of work difficulty, target, bits, etc...
+pub mod work;
+
 #[cfg(test)]
 pub(crate) mod test_utils {
     extern crate serde;
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs b/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs
index 10df7433dd..396417e6d1 100644
--- a/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs
+++ b/mm2src/mm2_bitcoin/spv_validation/src/spv_proof.rs
@@ -1,6 +1,5 @@
+use crate::helpers_validation::{merkle_prove, validate_vin, validate_vout, SPVError};
 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;
@@ -15,15 +14,11 @@ pub struct SPVProof {
     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
+/// Checks validity of an entire SPV Proof against a previously validated UTXO header retrieved from storage
 ///
 /// # Arguments
 ///
@@ -36,30 +31,16 @@ pub struct SPVProof {
 /// # 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> {
+    pub fn validate(&self, validated_header: &BlockHeader) -> 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,
+            validated_header.merkle_root_hash,
             self.intermediate_nodes.clone(),
             self.index,
         )
@@ -68,26 +49,38 @@ impl SPVProof {
 
 #[cfg(test)]
 mod spv_proof_tests {
-    use chain::BlockHeader;
-    use chain::RawBlockHeader;
+    use crate::spv_proof::SPVProof;
+    use chain::{BlockHeader, Transaction};
     use hex::FromHex;
-    use serialization::deserialize;
-    use spv_proof::SPVProof;
+    use primitives::hash::H256;
+    use serialization::{deserialize, serialize_list};
 
     #[test]
-    fn test_block_header() {
-        let header_hex = "040000008e4e7283b71dd1572d220935db0a1654d1042e92378579f8abab67b143f93a02fa026610d2634b72ff729b9ea7850c0d2c25eeaf7a82878ca42a8e9912028863a2d8a734eb73a4dc734072dbfd12406f1e7121bfe0e3d6c10922495c44e5cc1c91185d5ee519011d0400b9caaf41d4b63a6ab55bb4e6925d46fc3adea7be37b713d3a615e7cf0000fd40050001a80fa65b9a46fdb1506a7a4d26f43e7995d69902489b9f6c4599c88f9c169605cc135258953da0d6299ada4ff81a76ad63c943261078d5dd1918f91cea68b65b7fc362e9df49ba57c2ea5c6dba91591c85eb0d59a1905ac66e2295b7a291a1695301489a3cc7310fd45f2b94e3b8d94f3051e9bbaada1e0641fcec6e0d6230e76753aa9574a3f3e28eaa085959beffd3231dbe1aeea3955328f3a973650a38e31632a4ffc7ec007a3345124c0b99114e2444b3ef0ada75adbd077b247bbf3229adcffbe95bc62daac88f96317d5768540b5db636f8c39a8529a736465ed830ab2c1bbddf523587abe14397a6f1835d248092c4b5b691a955572607093177a5911e317739187b41f4aa662aa6bca0401f1a0a77915ebb6947db686cff549c5f4e7b9dd93123b00a1ae8d411cfb13fa7674de21cbee8e9fc74e12aa6753b261eab3d9256c7c32cc9b16219dad73c61014e7d88d74d5e218f12e11bc47557347ff49a9ab4490647418d2a5c2da1df24d16dfb611173608fe4b10a357b0fa7a1918b9f2d7836c84bf05f384e1e678b2fdd47af0d8e66e739fe45209ede151a180aba1188058a0db093e30bc9851980cf6fbfa5adb612d1146905da662c3347d7e7e569a1041641049d951ab867bc0c6a3863c7667d43f596a849434958cee2b63dc8fa11bd0f38aa96df86ed66461993f64736345313053508c4e939506c08a766f5b6ed0950759f3901bbc4db3dc97e05bf20b9dda4ff242083db304a4e487ac2101b823998371542354e5d534b5b6ae6420cc19b11512108b61208f4d9a5a97263d2c060da893544dea6251bcadc682d2238af35f2b1c2f65a73b89a4e194f9e1eef6f0e5948ef8d0d2862f48fd3356126b00c6a2d3770ecd0d1a78fa34974b454f270b23d461e357c9356c19496522b59ff9d5b4608c542ff89e558798324021704b2cfe9f6c1a70906c43c7a690f16615f198d29fa647d84ce8461fa570b33e3eada2ed7d77e1f280a0d2e9f03c2e1db535d922b1759a191b417595f3c15d8e8b7f810527ff942e18443a3860e67ccba356809ecedc31c5d8db59c7e039dae4b53d126679e8ffa20cc26e8b9d229c8f6ee434ad053f5f4f5a94e249a13afb995aad82b4d90890187e516e114b168fc7c7e291b9738ea578a7bab0ba31030b14ba90b772b577806ea2d17856b0cb9e74254ba582a9f2638ea7ed2ca23be898c6108ff8f466b443537ed9ec56b8771bfbf0f2f6e1092a28a7fd182f111e1dbdd155ea82c6cb72d5f9e6518cc667b8226b5f5c6646125fc851e97cf125f48949f988ed37c4283072fc03dd1da3e35161e17f44c0e22c76f708bb66405737ef24176e291b4fc2eadab876115dc62d48e053a85f0ad132ef07ad5175b036fe39e1ad14fcdcdc6ac5b3daabe05161a72a50545dd812e0f9af133d061b726f491e904d89ee57811ef58d3bda151f577aed381963a30d91fb98dc49413300d132a7021a5e834e266b4ac982d76e00f43f5336b8e8028a0cacfa11813b01e50f71236a73a4c0d0757c1832b0680ada56c80edf070f438ab2bc587542f926ff8d3644b8b8a56c78576f127dec7aed9cb3e1bc2442f978a9df1dc3056a63e653132d0f419213d3cb86e7b61720de1aa3af4b3757a58156970da27560c6629257158452b9d5e4283dc6fe7df42d2fda3352d5b62ce5a984d912777c3b01837df8968a4d494db1b663e0e68197dbf196f21ea11a77095263dec548e2010460840231329d83978885ee2423e8b327785970e27c6c6d436157fb5b56119b19239edbb730ebae013d82c35df4a6e70818a74d1ef7a2e87c090ff90e32939f58ed24e85b492b5750fd2cd14b9b8517136b76b1cc6ccc6f6f027f65f1967a0eb4f32cd6e5d5315";
+    fn test_validate() {
+        // https://live.blockcypher.com/btc-testnet/block/000000000000004d36632fda8180ff16855d606e5515aab0750d9d4fe55fe7d6/
+        let header_hex = "0000602002bf77bbb098f90f149430c314e71ef4e2671ea5e04a2503e0000000000000000406ffb54f2925360aae81bd3199f456928bbe6ae83a877902da9d9ffb08215da0ba3161ffff001a545a850b";
         let header_bytes: Vec<u8> = header_hex.from_hex().unwrap();
-        let header: BlockHeader = deserialize(header_bytes.as_slice()).unwrap();
+        let validated_header: BlockHeader = deserialize(header_bytes.as_slice()).unwrap();
+        //https://live.blockcypher.com/btc-testnet/tx/eefbafa4006e77099db059eebe14687965813283e5754d317431d9984554735d/
+        let tx: Transaction = "0200000000010146c398e70cceaf9d8f734e603bc53e4c4c0605ab46cb1b5807a62c90f5aed50d0100000000feffffff023c0fc10c010000001600145033f65b590f2065fe55414213f1d25ab20b6c4f487d1700000000001600144b812d5ef41fc433654d186463d41b458821ff740247304402202438dc18801919baa64eb18f7e925ab6acdedc3751ea58ea164a26723b79fd39022060b46c1d277714c640cdc8512c36c862ffc646e7ff62438ef5cc847a5990bbf801210247b49d9e6b0089a1663668829e573c629c936eb430c043af9634aa57cf97a33cbee81f00".into();
+        let intermediate_nodes: Vec<H256> = vec![
+            "434d6b93388ab077aa12d6257253cc036fd6122e9e88465a86f4fd682fc6e006".into(),
+            "bd9af28e56cf6731e78ee1503a65d9cc9b15c148daa474e71e085176f48996ac".into(),
+            "605f6f83423ef3b86623927ef2d9dcb0f8d9e40a8132217c2fa0910b84488ec7".into(),
+            "10b7ef06ef0756823dbf39dea717be397e7ccb49bbefc5cfc45e6f9d58793baf".into(),
+            "19183ceae11796a9b1d0893e0561870bbce4d060c9547b1e91ad8b34eb3d5001".into(),
+            "1b16723739522955422b4286b4d8620d2a704b6997e6bbd809d151b8d8d64611".into(),
+            "6f8496469b19dd35871684332dfd3fc0205d83d2c58c44ebdae068542bc951f6".into(),
+            "e0d2733bd7bce4e5690b71bc8f7cedb1edbc49a5ff85c3678ecdec894ea1c023".into(),
+        ];
+        let intermediate_nodes = intermediate_nodes.into_iter().map(|hash| hash.reversed()).collect();
         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![],
+            tx_id: tx.hash(),
+            vin: serialize_list(&tx.inputs).take(),
+            vout: serialize_list(&tx.outputs).take(),
+            index: 1,
+            intermediate_nodes,
         };
-        spv_proof.validate_block_header().unwrap()
+        spv_proof.validate(&validated_header).unwrap()
     }
 }
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/storage.rs b/mm2src/mm2_bitcoin/spv_validation/src/storage.rs
new file mode 100644
index 0000000000..e971ae05d5
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/storage.rs
@@ -0,0 +1,119 @@
+use async_trait::async_trait;
+use chain::BlockHeader;
+use derive_more::Display;
+use primitives::hash::H256;
+use std::collections::HashMap;
+
+#[derive(Clone, Debug, Display, Eq, PartialEq)]
+pub enum BlockHeaderStorageError {
+    #[display(fmt = "Can't add to the storage for {} - reason: {}", coin, reason)]
+    AddToStorageError {
+        coin: String,
+        reason: String,
+    },
+    #[display(fmt = "Can't get from the storage for {} - reason: {}", coin, reason)]
+    GetFromStorageError {
+        coin: String,
+        reason: String,
+    },
+    #[display(fmt = "Can't retrieve the table from the storage for {} - reason: {}", coin, reason)]
+    CantRetrieveTableError {
+        coin: String,
+        reason: String,
+    },
+    #[display(fmt = "Unable to delete block headers <= {to_height} from storage for {coin} - reason: {reason}")]
+    UnableToDeleteHeaders {
+        to_height: u64,
+        coin: 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 - coin: {} - reason: {}", coin, reason)]
+    InitializationError {
+        coin: String,
+        reason: String,
+    },
+    #[display(fmt = "Can't decode/deserialize from storage for {} - reason: {}", coin, reason)]
+    DecodeError {
+        coin: String,
+        reason: String,
+    },
+    Internal(String),
+}
+
+impl BlockHeaderStorageError {
+    pub fn init_err(ticker: &str, reason: String) -> BlockHeaderStorageError {
+        BlockHeaderStorageError::InitializationError {
+            coin: ticker.to_string(),
+            reason,
+        }
+    }
+
+    pub fn add_err(ticker: &str, reason: String) -> BlockHeaderStorageError {
+        BlockHeaderStorageError::AddToStorageError {
+            coin: ticker.to_string(),
+            reason,
+        }
+    }
+
+    pub fn table_err(ticker: &str, reason: String) -> BlockHeaderStorageError {
+        BlockHeaderStorageError::CantRetrieveTableError {
+            coin: ticker.to_string(),
+            reason,
+        }
+    }
+
+    pub fn get_err(ticker: &str, reason: String) -> BlockHeaderStorageError {
+        BlockHeaderStorageError::GetFromStorageError {
+            coin: ticker.to_string(),
+            reason,
+        }
+    }
+
+    pub fn delete_err(ticker: &str, reason: String, to_height: u64) -> BlockHeaderStorageError {
+        BlockHeaderStorageError::UnableToDeleteHeaders {
+            to_height,
+            coin: ticker.to_string(),
+            reason,
+        }
+    }
+}
+
+#[async_trait]
+pub trait BlockHeaderStorageOps: Send + Sync + 'static {
+    /// Initializes collection/tables in storage for a specified coin
+    async fn init(&self) -> Result<(), BlockHeaderStorageError>;
+
+    async fn is_initialized_for(&self) -> Result<bool, BlockHeaderStorageError>;
+
+    // Adds multiple block headers to the selected coin's header storage
+    // Should store it as `COIN_HEIGHT=hex_string`
+    // use this function for headers that comes from `blockchain_block_headers`
+    async fn add_block_headers_to_storage(
+        &self,
+        headers: HashMap<u64, BlockHeader>,
+    ) -> Result<(), BlockHeaderStorageError>;
+
+    /// Gets the block header by height from the selected coin's storage as BlockHeader
+    async fn get_block_header(&self, height: u64) -> Result<Option<BlockHeader>, BlockHeaderStorageError>;
+
+    /// Gets the block header by height from the selected coin's storage as hex
+    async fn get_block_header_raw(&self, height: u64) -> Result<Option<String>, BlockHeaderStorageError>;
+
+    async fn get_last_block_height(&self) -> Result<Option<u64>, BlockHeaderStorageError>;
+
+    async fn get_last_block_header_with_non_max_bits(
+        &self,
+        max_bits: u32,
+    ) -> Result<Option<BlockHeader>, BlockHeaderStorageError>;
+
+    async fn get_block_height_by_hash(&self, hash: H256) -> Result<Option<i64>, BlockHeaderStorageError>;
+
+    async fn remove_headers_up_to_height(&self, to_height: u64) -> Result<(), BlockHeaderStorageError>;
+
+    async fn is_table_empty(&self) -> Result<(), BlockHeaderStorageError>;
+}
diff --git a/mm2src/mm2_bitcoin/spv_validation/src/work.rs b/mm2src/mm2_bitcoin/spv_validation/src/work.rs
new file mode 100644
index 0000000000..11a148e1a7
--- /dev/null
+++ b/mm2src/mm2_bitcoin/spv_validation/src/work.rs
@@ -0,0 +1,338 @@
+use crate::conf::SPVBlockHeader;
+use crate::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+use chain::BlockHeaderBits;
+use derive_more::Display;
+use primitives::compact::Compact;
+use primitives::U256;
+use serde::{Deserialize, Serialize};
+use std::cmp;
+
+const RETARGETING_FACTOR: u32 = 4;
+const TARGET_SPACING_SECONDS: u32 = 10 * 60;
+const TARGET_TIMESPAN_SECONDS: u32 = 2 * 7 * 24 * 60 * 60;
+
+/// The Target number of blocks equals to 2 weeks or 2016 blocks
+pub(crate) const RETARGETING_INTERVAL: u32 = TARGET_TIMESPAN_SECONDS / TARGET_SPACING_SECONDS;
+
+/// The upper and lower bounds for retargeting timespan
+const MIN_TIMESPAN: u32 = TARGET_TIMESPAN_SECONDS / RETARGETING_FACTOR;
+const MAX_TIMESPAN: u32 = TARGET_TIMESPAN_SECONDS * RETARGETING_FACTOR;
+
+/// The maximum value for bits corresponding to lowest difficulty of 1
+pub const MAX_BITS_BTC: u32 = 486604799;
+
+fn is_retarget_height(height: u64) -> bool { height % RETARGETING_INTERVAL as u64 == 0 }
+
+#[derive(Clone, Debug, Display, Eq, PartialEq)]
+pub enum NextBlockBitsError {
+    #[display(fmt = "Block headers storage error: {}", _0)]
+    StorageError(BlockHeaderStorageError),
+    #[display(fmt = "Can't find Block header for {} with height {}", coin, height)]
+    NoSuchBlockHeader { coin: String, height: u64 },
+    #[display(fmt = "Can't find a Block header for {} with no max bits", coin)]
+    NoBlockHeaderWithNoMaxBits { coin: String },
+}
+
+impl From<BlockHeaderStorageError> for NextBlockBitsError {
+    fn from(e: BlockHeaderStorageError) -> Self { NextBlockBitsError::StorageError(e) }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum DifficultyAlgorithm {
+    #[serde(rename = "Bitcoin Mainnet")]
+    BitcoinMainnet,
+    #[serde(rename = "Bitcoin Testnet")]
+    BitcoinTestnet,
+}
+
+pub async fn next_block_bits(
+    coin: &str,
+    current_block_timestamp: u32,
+    last_block_header: SPVBlockHeader,
+    storage: &dyn BlockHeaderStorageOps,
+    algorithm: &DifficultyAlgorithm,
+) -> Result<BlockHeaderBits, NextBlockBitsError> {
+    match algorithm {
+        DifficultyAlgorithm::BitcoinMainnet => btc_mainnet_next_block_bits(coin, last_block_header, storage).await,
+        DifficultyAlgorithm::BitcoinTestnet => {
+            btc_testnet_next_block_bits(coin, current_block_timestamp, last_block_header, storage).await
+        },
+    }
+}
+
+fn range_constrain(value: i64, min: i64, max: i64) -> i64 { cmp::min(cmp::max(value, min), max) }
+
+/// Returns constrained number of seconds since last retarget
+fn retarget_timespan(retarget_timestamp: u32, last_timestamp: u32) -> u32 {
+    // subtract unsigned 32 bit numbers in signed 64 bit space in
+    // order to prevent underflow before applying the range constraint.
+    let timespan = last_timestamp as i64 - retarget_timestamp as i64;
+    range_constrain(timespan, MIN_TIMESPAN as i64, MAX_TIMESPAN as i64) as u32
+}
+
+async fn btc_retarget_bits(
+    coin: &str,
+    last_block_header: SPVBlockHeader,
+    storage: &dyn BlockHeaderStorageOps,
+) -> Result<BlockHeaderBits, NextBlockBitsError> {
+    let max_bits_compact: Compact = MAX_BITS_BTC.into();
+
+    let retarget_ref = last_block_header.height + 1 - RETARGETING_INTERVAL as u64;
+    if retarget_ref == 0 {
+        return Ok(BlockHeaderBits::Compact(max_bits_compact));
+    }
+
+    let retarget_header = storage
+        .get_block_header(retarget_ref)
+        .await?
+        .map(|h| SPVBlockHeader::from_block_header_and_height(&h, retarget_ref))
+        .ok_or(NextBlockBitsError::NoSuchBlockHeader {
+            coin: coin.into(),
+            height: retarget_ref,
+        })?;
+
+    // timestamp of block(height - RETARGETING_INTERVAL)
+    let retarget_timestamp = retarget_header.time;
+    // timestamp of last block
+    let last_timestamp = last_block_header.time;
+
+    let retarget: Compact = last_block_header.bits.into();
+    let retarget: U256 = retarget.into();
+    let retarget_timespan: U256 = retarget_timespan(retarget_timestamp, last_timestamp).into();
+    let retarget: U256 = retarget * retarget_timespan;
+    let target_timespan_seconds: U256 = TARGET_TIMESPAN_SECONDS.into();
+    let retarget = retarget / target_timespan_seconds;
+
+    let max_bits: U256 = max_bits_compact.into();
+    if retarget > max_bits {
+        Ok(BlockHeaderBits::Compact(max_bits_compact))
+    } else {
+        Ok(BlockHeaderBits::Compact(retarget.into()))
+    }
+}
+
+async fn btc_mainnet_next_block_bits(
+    coin: &str,
+    last_block_header: SPVBlockHeader,
+    storage: &dyn BlockHeaderStorageOps,
+) -> Result<BlockHeaderBits, NextBlockBitsError> {
+    if last_block_header.height == 0 {
+        return Ok(BlockHeaderBits::Compact(MAX_BITS_BTC.into()));
+    }
+
+    let next_height = last_block_header.height + 1;
+    let last_block_bits = last_block_header.bits.clone();
+
+    if is_retarget_height(next_height) {
+        btc_retarget_bits(coin, last_block_header, storage).await
+    } else {
+        Ok(last_block_bits)
+    }
+}
+
+async fn btc_testnet_next_block_bits(
+    coin: &str,
+    current_block_timestamp: u32,
+    last_block_header: SPVBlockHeader,
+    storage: &dyn BlockHeaderStorageOps,
+) -> Result<BlockHeaderBits, NextBlockBitsError> {
+    let max_bits = BlockHeaderBits::Compact(MAX_BITS_BTC.into());
+    if last_block_header.height == 0 {
+        return Ok(max_bits);
+    }
+
+    let next_height = last_block_header.height + 1;
+    let last_block_bits = last_block_header.bits.clone();
+    let max_time_gap = last_block_header.time + 2 * TARGET_SPACING_SECONDS;
+
+    if is_retarget_height(next_height) {
+        btc_retarget_bits(coin, last_block_header, storage).await
+    } else if current_block_timestamp > max_time_gap {
+        Ok(max_bits)
+    } else if last_block_bits != max_bits {
+        Ok(last_block_bits.clone())
+    } else {
+        let last_non_max_bits = storage
+            .get_last_block_header_with_non_max_bits(MAX_BITS_BTC)
+            .await?
+            .map(|header| header.bits)
+            .unwrap_or(max_bits);
+        Ok(last_non_max_bits)
+    }
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::storage::{BlockHeaderStorageError, BlockHeaderStorageOps};
+    use async_trait::async_trait;
+    use chain::BlockHeader;
+    use common::block_on;
+    use lazy_static::lazy_static;
+    use primitives::hash::H256;
+    use serde::Deserialize;
+    use std::collections::HashMap;
+
+    const BLOCK_HEADERS_STR: &str = include_str!("./for_tests/workTestVectors.json");
+
+    #[derive(Deserialize)]
+    struct TestRawHeader {
+        height: u64,
+        hex: String,
+    }
+
+    lazy_static! {
+        static ref BLOCK_HEADERS_MAP: HashMap<String, Vec<TestRawHeader>> = parse_block_headers();
+    }
+
+    fn parse_block_headers() -> HashMap<String, Vec<TestRawHeader>> { serde_json::from_str(BLOCK_HEADERS_STR).unwrap() }
+
+    fn get_block_headers_for_coin(coin: &str) -> HashMap<u64, BlockHeader> {
+        BLOCK_HEADERS_MAP
+            .get(coin)
+            .unwrap()
+            .into_iter()
+            .map(|h| (h.height, h.hex.as_str().into()))
+            .collect()
+    }
+
+    pub struct TestBlockHeadersStorage {
+        pub(crate) ticker: String,
+    }
+
+    #[async_trait]
+    impl BlockHeaderStorageOps for TestBlockHeadersStorage {
+        async fn init(&self) -> Result<(), BlockHeaderStorageError> { Ok(()) }
+
+        async fn is_initialized_for(&self) -> Result<bool, BlockHeaderStorageError> { Ok(true) }
+
+        async fn add_block_headers_to_storage(
+            &self,
+            _headers: HashMap<u64, BlockHeader>,
+        ) -> Result<(), BlockHeaderStorageError> {
+            Ok(())
+        }
+
+        async fn get_block_header(&self, height: u64) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+            Ok(get_block_headers_for_coin(&self.ticker).get(&height).cloned())
+        }
+
+        async fn get_block_header_raw(&self, _height: u64) -> Result<Option<String>, BlockHeaderStorageError> {
+            Ok(None)
+        }
+
+        async fn get_last_block_height(&self) -> Result<Option<u64>, BlockHeaderStorageError> {
+            Ok(Some(
+                get_block_headers_for_coin(&self.ticker)
+                    .into_keys()
+                    .max_by(|a, b| a.cmp(b))
+                    .unwrap(),
+            ))
+        }
+
+        async fn get_last_block_header_with_non_max_bits(
+            &self,
+            max_bits: u32,
+        ) -> Result<Option<BlockHeader>, BlockHeaderStorageError> {
+            let mut headers = get_block_headers_for_coin(&self.ticker);
+            headers.retain(|_, h| h.bits != BlockHeaderBits::Compact(max_bits.into()));
+            let header = headers.into_iter().max_by(|a, b| a.0.cmp(&b.0));
+            Ok(header.map(|(_, h)| h))
+        }
+
+        async fn get_block_height_by_hash(&self, _hash: H256) -> Result<Option<i64>, BlockHeaderStorageError> {
+            Ok(None)
+        }
+
+        async fn remove_headers_up_to_height(&self, _height: u64) -> Result<(), BlockHeaderStorageError> { Ok(()) }
+
+        async fn is_table_empty(&self) -> Result<(), BlockHeaderStorageError> { Ok(()) }
+    }
+
+    #[test]
+    fn test_btc_mainnet_next_block_bits() {
+        let storage = TestBlockHeadersStorage { ticker: "BTC".into() };
+
+        let last_header: BlockHeader = "000000201d758432ecd495a2177b44d3fe6c22af183461a0b9ea0d0000000000000000008283a1dfa795d9b68bd8c18601e443368265072cbf8c76bfe58de46edd303798035de95d3eb2151756fdb0e8".into();
+
+        let next_block_bits = block_on(btc_mainnet_next_block_bits(
+            "BTC",
+            SPVBlockHeader::from_block_header_and_height(&last_header, 606815),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(387308498.into()));
+
+        // check that bits for very early blocks that didn't change difficulty because of low hashrate is calculated correctly.
+        let last_header: BlockHeader = "010000000d9c8c96715756b619116cc2160937fb26c655a2f8e28e3a0aff59c0000000007676252e8434de408ea31920d986aba297bd6f7c6f20756be08748713f7c135962719449ffff001df8c1cb01".into();
+
+        let next_block_bits = block_on(btc_mainnet_next_block_bits(
+            "BTC",
+            SPVBlockHeader::from_block_header_and_height(&last_header, 4031),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(486604799.into()));
+
+        // check that bits stay the same when the next block is not a retarget block
+        // https://live.blockcypher.com/btc/block/00000000000000000002622f52b6afe70a5bb139c788e67f221ffc67a762a1e0/
+        let last_header: BlockHeader = "00e0ff2f44d953fe12a047129bbc7164668c6d96f3e7a553528b02000000000000000000d0b950384cd23ab0854d1c8f23fa7a97411a6ffd92347c0a3aea4466621e4093ec09c762afa7091705dad220".into();
+
+        let next_block_bits = block_on(btc_mainnet_next_block_bits(
+            "BTC",
+            SPVBlockHeader::from_block_header_and_height(&last_header, 744014),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(386508719.into()));
+    }
+
+    #[test]
+    fn test_btc_testnet_next_block_bits() {
+        let storage = TestBlockHeadersStorage { ticker: "tBTC".into() };
+
+        // https://live.blockcypher.com/btc-testnet/block/000000000057db3806384e2ec1b02b2c86bd928206ff8dff98f54d616b7fa5f2/
+        let current_header: BlockHeader = "02000000303505969a1df329e5fccdf69b847a201772e116e557eb7f119d1a9600000000469267f52f43b8799e72f0726ba2e56432059a8ad02b84d4fff84b9476e95f7716e41353ab80011c168cb471".into();
+        // https://live.blockcypher.com/btc-testnet/block/00000000961a9d117feb57e516e17217207a849bf6cdfce529f31d9a96053530/
+        let last_header: BlockHeader = "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0".into();
+
+        let next_block_bits = block_on(btc_testnet_next_block_bits(
+            "tBTC",
+            current_header.time,
+            SPVBlockHeader::from_block_header_and_height(&last_header, 201595),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(469860523.into()));
+
+        // https://live.blockcypher.com/btc-testnet/block/00000000961a9d117feb57e516e17217207a849bf6cdfce529f31d9a96053530/
+        let current_header: BlockHeader = "02000000ea01a61a2d7420a1b23875e40eb5eb4ca18b378902c8e6384514ad0000000000c0c5a1ae80582b3fe319d8543307fa67befc2a734b8eddb84b1780dfdf11fa2b20e71353ffff001d00805fe0".into();
+        // https://live.blockcypher.com/btc-testnet/block/0000000000ad144538e6c80289378ba14cebb50ee47538b2a120742d1aa601ea/
+        let last_header: BlockHeader = "02000000cbed7fd98f1f06e85c47e13ff956533642056be45e7e6b532d4d768f00000000f2680982f333fcc9afa7f9a5e2a84dc54b7fe10605cd187362980b3aa882e9683be21353ab80011c813e1fc0".into();
+
+        let next_block_bits = block_on(btc_testnet_next_block_bits(
+            "tBTC",
+            current_header.time,
+            SPVBlockHeader::from_block_header_and_height(&last_header, 201594),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(486604799.into()));
+
+        // test testnet retarget bits
+
+        // https://live.blockcypher.com/btc-testnet/block/0000000000376bb71314321c45de3015fe958543afcbada242a3b1b072498e38/
+        let current_header: BlockHeader = "02000000ee689e4dcdc3c7dac591b98e1e4dc83aae03ff9fb9d469d704a64c0100000000bfffaded2a67821eb5729b362d613747e898d08d6c83b5704646c26c13146f4c6de91353c02a601b3a817f87".into();
+        // https://live.blockcypher.com/btc-testnet/block/00000000014ca604d769d4b99fff03ae3ac84d1e8eb991c5dac7c3cd4d9e68ee/
+        let last_header: BlockHeader = "02000000a9dccfcf372d6ce6ae784786ea94d20ce174e093520d779348e5a9000000000077c037863a0134ac05a8c19d258d6c03c225043a08687c90813e8352a144d68035e81353ab80011ca71f3849".into();
+
+        let next_block_bits = block_on(btc_testnet_next_block_bits(
+            "tBTC",
+            current_header.time,
+            SPVBlockHeader::from_block_header_and_height(&last_header, 201599),
+            &storage,
+        ))
+        .unwrap();
+        assert_eq!(next_block_bits, BlockHeaderBits::Compact(459287232.into()));
+    }
+}
diff --git a/mm2src/mm2_bitcoin/test_helpers/Cargo.toml b/mm2src/mm2_bitcoin/test_helpers/Cargo.toml
index b059f530dc..1528506ab5 100644
--- a/mm2src/mm2_bitcoin/test_helpers/Cargo.toml
+++ b/mm2src/mm2_bitcoin/test_helpers/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [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
index 971bac4142..a40df006ec 100644
--- a/mm2src/mm2_bitcoin/test_helpers/src/hex.rs
+++ b/mm2src/mm2_bitcoin/test_helpers/src/hex.rs
@@ -16,7 +16,7 @@ fn strip_0x_prefix(s: &str) -> &str {
 /// # Arguments
 ///
 /// * `s` - The hex string
-fn deserialize_hex(s: &str) -> Result<Vec<u8>, hex::FromHexError> { hex::decode(&strip_0x_prefix(s)) }
+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.
diff --git a/mm2src/mm2_core/Cargo.toml b/mm2src/mm2_core/Cargo.toml
index 0624806623..10d1cd1611 100644
--- a/mm2src/mm2_core/Cargo.toml
+++ b/mm2src/mm2_core/Cargo.toml
@@ -15,13 +15,12 @@ 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"
+mm2_metrics = { path = "../mm2_metrics" }
 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"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 shared_ref_counter = { path = "../common/shared_ref_counter" }
 uuid = { version = "0.7", features = ["serde", "v4"] }
 
diff --git a/mm2src/mm2_core/src/mm_ctx.rs b/mm2src/mm2_core/src/mm_ctx.rs
index cff1011622..4b61c68724 100644
--- a/mm2src/mm2_core/src/mm_ctx.rs
+++ b/mm2src/mm2_core/src/mm_ctx.rs
@@ -1,25 +1,22 @@
-use arrayref::array_ref;
-#[cfg(any(not(target_arch = "wasm32"), feature = "track-ctx-pointer"))]
+#[cfg(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 common::executor::{abortable_queue::{AbortableQueue, WeakSpawner},
+                       graceful_shutdown, AbortSettings, AbortableSystem, SpawnAbortable, SpawnFuture};
+use common::log::{self, LogLevel, LogOnError, LogState};
+use common::{cfg_native, cfg_wasm32, small_rng};
 use gstuff::{try_s, Constructible, ERR, ERRL};
-use keys::KeyPair;
 use lazy_static::lazy_static;
+use mm2_metrics::{MetricsArc, MetricsOps};
 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::future::Future;
 use std::ops::Deref;
-use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
 cfg_wasm32! {
@@ -28,17 +25,17 @@ cfg_wasm32! {
 }
 
 cfg_native! {
-    use common::mm_metrics::prometheus;
     use db_common::sqlite::rusqlite::Connection;
-    use std::net::{IpAddr, SocketAddr};
+    use mm2_metrics::prometheus;
+    use mm2_metrics::MmMetricsError;
+    use std::net::{IpAddr, SocketAddr, AddrParseError};
+    use std::path::{Path, PathBuf};
     use std::sync::MutexGuard;
 }
 
 /// Default interval to export and record metrics to log.
 const EXPORT_METRICS_INTERVAL: f64 = 5. * 60.;
 
-type StopListenerCallback = Box<dyn FnMut() -> Result<(), String>>;
-
 /// MarketMaker state, shared between the various MarketMaker threads.
 ///
 /// Every MarketMaker has one and only one instance of `MmCtx`.
@@ -78,8 +75,6 @@ pub struct MmCtx {
     /// Unique context identifier, allowing us to more easily pass the context through the FFI boundaries.  
     /// 0 if the handler ID is allocated yet.
     pub ffi_handle: Constructible<u32>,
-    /// Callbacks to invoke from `fn stop`.
-    pub stop_listeners: Mutex<Vec<StopListenerCallback>>,
     /// 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>>>,
@@ -88,15 +83,17 @@ pub struct MmCtx {
     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>,
+    pub account_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
     /// 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.
+    /// This hash is **unique** among Iguana and each HD accounts derived from the same passphrase.
     pub rmd160: Constructible<H160>,
-    /// secp256k1 key pair derived from passphrase.
-    /// cf. `key_pair_from_seed`.
-    pub secp256k1_key_pair: Constructible<KeyPair>,
+    /// A shared DB identifier - RIPEMD160(SHA256(x)) where x is secp256k1 pubkey derived from (passphrase + magic salt).
+    /// This hash is **the same** for Iguana and all HD accounts derived from the same passphrase.
+    pub shared_db_id: Constructible<H160>,
     /// Coins that should be enabled to kick start the interrupted swaps and orders.
     pub coins_needed_for_kick_start: Mutex<HashSet<String>>,
     /// The context belonging to the `lp_swap` mod: `SwapsContext`.
@@ -108,9 +105,18 @@ pub struct MmCtx {
     pub wasm_rpc: Constructible<WasmRpcSender>,
     #[cfg(not(target_arch = "wasm32"))]
     pub sqlite_connection: Constructible<Arc<Mutex<Connection>>>,
+    #[cfg(not(target_arch = "wasm32"))]
+    pub shared_sqlite_conn: Constructible<Arc<Mutex<Connection>>>,
     pub mm_version: String,
+    pub datetime: String,
     pub mm_init_ctx: Mutex<Option<Arc<dyn Any + 'static + Send + Sync>>>,
-    pub abort_handlers: Mutex<Vec<AbortHandle>>,
+    /// The abortable system is pinned to the `MmCtx` context.
+    /// It's used to spawn futures that can be aborted immediately or after a timeout
+    /// on the [`MmArc::stop`] function call.
+    pub abortable_system: AbortableQueue,
+    /// The abortable system is pinned to the `MmCtx` context.
+    /// It's used to register listeners that will wait for graceful shutdown.
+    pub graceful_shutdown_registry: graceful_shutdown::GracefulShutdownRegistry,
     #[cfg(target_arch = "wasm32")]
     pub db_namespace: DbNamespaceId,
 }
@@ -125,7 +131,6 @@ impl MmCtx {
             rpc_started: Constructible::default(),
             stop: Constructible::default(),
             ffi_handle: Constructible::default(),
-            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),
@@ -133,11 +138,12 @@ impl MmCtx {
             message_service_ctx: Mutex::new(None),
             p2p_ctx: Mutex::new(None),
             peer_id: Constructible::default(),
+            account_ctx: Mutex::new(None),
             coins_ctx: Mutex::new(None),
             coins_activation_ctx: Mutex::new(None),
             crypto_ctx: Mutex::new(None),
             rmd160: Constructible::default(),
-            secp256k1_key_pair: Constructible::default(),
+            shared_db_id: Constructible::default(),
             coins_needed_for_kick_start: Mutex::new(HashSet::new()),
             swaps_ctx: Mutex::new(None),
             stats_ctx: Mutex::new(None),
@@ -145,9 +151,13 @@ impl MmCtx {
             wasm_rpc: Constructible::default(),
             #[cfg(not(target_arch = "wasm32"))]
             sqlite_connection: Constructible::default(),
+            #[cfg(not(target_arch = "wasm32"))]
+            shared_sqlite_conn: Constructible::default(),
             mm_version: "".into(),
+            datetime: "".into(),
             mm_init_ctx: Mutex::new(None),
-            abort_handlers: Mutex::new(Vec::new()),
+            abortable_system: AbortableQueue::default(),
+            graceful_shutdown_registry: graceful_shutdown::GracefulShutdownRegistry::default(),
             #[cfg(target_arch = "wasm32")]
             db_namespace: DbNamespaceId::Main,
         }
@@ -160,6 +170,13 @@ impl MmCtx {
         self.rmd160.or(&|| &*DEFAULT)
     }
 
+    pub fn shared_db_id(&self) -> &H160 {
+        lazy_static! {
+            static ref DEFAULT: H160 = [0; 20].into();
+        }
+        self.shared_db_id.or(&|| &*DEFAULT)
+    }
+
     #[cfg(not(target_arch = "wasm32"))]
     pub fn rpc_ip_port(&self) -> Result<SocketAddr, String> {
         let port = self.conf["rpcport"].as_u64().unwrap_or(7783);
@@ -188,19 +205,23 @@ impl MmCtx {
     ///     "dbdir": "c:/Users/mm2user/.mm2-db"
     ///
     /// No checks in this method, the paths should be checked in the `fn fix_directories` instead.
-    pub fn dbdir(&self) -> PathBuf {
-        let path = if let Some(dbdir) = self.conf["dbdir"].as_str() {
-            let dbdir = dbdir.trim();
-            if !dbdir.is_empty() {
-                Path::new(dbdir)
-            } else {
-                Path::new("DB")
-            }
-        } else {
-            Path::new("DB")
-        };
-        path.join(hex::encode(&**self.rmd160()))
-    }
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn dbdir(&self) -> PathBuf { path_to_dbdir(self.conf["dbdir"].as_str(), self.rmd160()) }
+
+    /// MM shared database path.
+    /// Defaults to a relative "DB".
+    ///
+    /// Can be changed via the "dbdir" configuration field, for example:
+    ///
+    ///     "dbdir": "c:/Users/mm2user/.mm2-db"
+    ///
+    /// No checks in this method, the paths should be checked in the `fn fix_directories` instead.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn shared_dbdir(&self) -> PathBuf { path_to_dbdir(self.conf["dbdir"].as_str(), self.shared_db_id()) }
+
+    pub fn is_watcher(&self) -> bool { self.conf["is_watcher"].as_bool().unwrap_or_default() }
+
+    pub fn use_watchers(&self) -> bool { self.conf["use_watchers"].as_bool().unwrap_or_default() }
 
     pub fn netid(&self) -> u16 {
         let netid = self.conf["netid"].as_u64().unwrap_or(0);
@@ -214,49 +235,12 @@ impl MmCtx {
 
     pub fn p2p_in_memory_port(&self) -> Option<u64> { self.conf["p2p_in_memory_port"].as_u64() }
 
+    /// Returns the cloneable `MmFutSpawner`.
+    pub fn spawner(&self) -> MmFutSpawner { MmFutSpawner::new(&self.abortable_system) }
+
     /// True if the MarketMaker instance needs to stop.
     pub fn is_stopping(&self) -> bool { self.stop.copy_or(false) }
 
-    /// Register a callback to be invoked when the MM receives the "stop" request.  
-    /// The callback is invoked immediately if the MM is stopped already.
-    pub fn on_stop(&self, mut cb: Box<dyn FnMut() -> Result<(), String>>) {
-        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::error!("MmCtx::on_stop] Listener error: {}", err)
-            }
-        } else {
-            stop_listeners.push(cb)
-        }
-    }
-
-    /// Get a reference to the secp256k1 key pair.
-    /// Panics if the key pair is not available.
-    pub fn secp256k1_key_pair(&self) -> &KeyPair {
-        match self.secp256k1_key_pair.as_option() {
-            Some(pair) => pair,
-            None => panic!("secp256k1_key_pair not available"),
-        }
-    }
-
-    /// 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> {
-        self.secp256k1_key_pair
-            .ok_or(ERRL!("Public ID is not yet available"))
-            .map(|keypair| {
-                let public = keypair.public(); // Compressed public key is going to be 33 bytes.
-                                               // First byte is a prefix, https://davidederosa.com/basic-blockchain-programming/elliptic-curve-keys/.
-                bits256 {
-                    bytes: *array_ref!(public, 1, 32),
-                }
-            })
-    }
-
     pub fn gui(&self) -> Option<&str> { self.conf["gui"].as_str() }
 
     pub fn mm_version(&self) -> &str { &self.mm_version }
@@ -270,6 +254,20 @@ impl MmCtx {
         Ok(())
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn init_shared_sqlite_conn(&self) -> Result<(), String> {
+        let sqlite_file_path = self.shared_dbdir().join("MM2-shared.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.shared_sqlite_conn.pin(Arc::new(Mutex::new(connection))));
+        Ok(())
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn sqlite_conn_opt(&self) -> Option<MutexGuard<Connection>> {
+        self.sqlite_connection.as_option().map(|conn| conn.lock().unwrap())
+    }
+
     #[cfg(not(target_arch = "wasm32"))]
     pub fn sqlite_connection(&self) -> MutexGuard<Connection> {
         self.sqlite_connection
@@ -277,6 +275,14 @@ impl MmCtx {
             .lock()
             .unwrap()
     }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn shared_sqlite_conn(&self) -> MutexGuard<Connection> {
+        self.shared_sqlite_conn
+            .or(&|| panic!("shared_sqlite_conn is not initialized"))
+            .lock()
+            .unwrap()
+    }
 }
 
 impl Default for MmCtx {
@@ -294,6 +300,19 @@ impl Drop for MmCtx {
     }
 }
 
+/// This function can be used later by an FFI function to open a GUI storage.
+#[cfg(not(target_arch = "wasm32"))]
+pub fn path_to_dbdir(db_root: Option<&str>, db_id: &H160) -> PathBuf {
+    const DEFAULT_ROOT: &str = "DB";
+
+    let path = match db_root {
+        Some(dbdir) if !dbdir.is_empty() => Path::new(dbdir),
+        _ => Path::new(DEFAULT_ROOT),
+    };
+
+    path.join(hex::encode(db_id.as_slice()))
+}
+
 // 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`.
@@ -352,39 +371,16 @@ lazy_static! {
     pub static ref MM_CTX_FFI: Mutex<HashMap<u32, MmWeak>> = Mutex::new (HashMap::default());
 }
 
-/// Portable core sharing its context with the native helpers.
-///
-/// In the integration tests we're using this to create new native contexts.
-#[derive(Serialize, Deserialize)]
-struct PortableCtx {
-    // Sending the `conf` as a string in order for bencode not to mess with JSON, and for wire readability.
-    conf: String,
-    secp256k1_key_pair: ByteBuf,
-    ffi_handle: Option<u32>,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-struct NativeCtx {
-    ffi_handle: u32,
-}
-
 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)
-            }
-        }
+
+        // Notify shutdown listeners.
+        self.graceful_shutdown_registry.abort_all().warn_log();
+        // Abort spawned futures.
+        self.abortable_system.abort_all().warn_log();
 
         #[cfg(feature = "track-ctx-pointer")]
         self.track_ctx_pointer();
@@ -408,7 +404,7 @@ impl MmArc {
                 }
             }
         };
-        crate::executor::spawn(fut);
+        self.spawner().spawn(fut);
     }
 
     #[cfg(feature = "track-ctx-pointer")]
@@ -474,9 +470,11 @@ impl MmArc {
             .unwrap_or(EXPORT_METRICS_INTERVAL);
 
         if interval == 0.0 {
-            try_s!(self.metrics.init());
+            self.metrics.init();
         } else {
-            try_s!(self.metrics.init_with_dashboard(self.log.weak(), interval));
+            try_s!(self
+                .metrics
+                .init_with_dashboard(&self.spawner(), self.log.weak(), interval));
         }
 
         #[cfg(not(target_arch = "wasm32"))]
@@ -486,13 +484,15 @@ impl MmArc {
     }
 
     #[cfg(not(target_arch = "wasm32"))]
-    fn spawn_prometheus_exporter(&self) -> Result<(), String> {
+    fn spawn_prometheus_exporter(&self) -> Result<(), MmMetricsError> {
         let prometheusport = match self.conf["prometheusport"].as_u64() {
             Some(port) => port,
             _ => return Ok(()),
         };
 
-        let address: SocketAddr = try_s!(format!("127.0.0.1:{}", prometheusport).parse());
+        let address: SocketAddr = format!("127.0.0.1:{}", prometheusport)
+            .parse()
+            .map_err(|e: AddrParseError| MmMetricsError::PrometheusServerError(e.to_string()))?;
 
         let credentials =
             self.conf["prometheus_credentials"]
@@ -501,16 +501,49 @@ impl MmArc {
                     userpass: userpass.into(),
                 });
 
-        let ctx = self.weak();
+        let shutdown_detector = self
+            .graceful_shutdown_registry
+            .register_listener()
+            .map_err(|e| MmMetricsError::Internal(e.to_string()))?;
+        prometheus::spawn_prometheus_exporter(self.metrics.weak(), address, shutdown_detector, credentials)
+    }
+}
 
-        // Make the callback. When the context will be dropped, the shutdown_detector will be executed.
-        let shutdown_detector = async move {
-            while !ctx.dropped() {
-                Timer::sleep(0.5).await
-            }
-        };
+/// The futures spawner pinned to the `MmCtx` context.
+/// It's used to spawn futures that can be aborted immediately or after a timeout
+/// on the [`MmArc::stop`] function call.
+///
+/// # Note
+///
+/// `MmFutSpawner` doesn't prevent the spawned futures from being aborted.
+#[derive(Clone)]
+pub struct MmFutSpawner {
+    inner: WeakSpawner,
+}
 
-        prometheus::spawn_prometheus_exporter(self.metrics.weak(), address, shutdown_detector, credentials)
+impl MmFutSpawner {
+    pub fn new(system: &AbortableQueue) -> MmFutSpawner {
+        MmFutSpawner {
+            inner: system.weak_spawner(),
+        }
+    }
+}
+
+impl SpawnFuture for MmFutSpawner {
+    fn spawn<F>(&self, f: F)
+    where
+        F: Future<Output = ()> + Send + 'static,
+    {
+        self.inner.spawn(f)
+    }
+}
+
+impl SpawnAbortable for MmFutSpawner {
+    fn spawn_with_settings<F>(&self, fut: F, settings: AbortSettings)
+    where
+        F: Future<Output = ()> + Send + 'static,
+    {
+        self.inner.spawn_with_settings(fut, settings)
     }
 }
 
@@ -543,8 +576,8 @@ where
 pub struct MmCtxBuilder {
     conf: Option<Json>,
     log_level: LogLevel,
-    key_pair: Option<KeyPair>,
     version: String,
+    datetime: String,
     #[cfg(target_arch = "wasm32")]
     db_namespace: DbNamespaceId,
 }
@@ -562,13 +595,13 @@ impl MmCtxBuilder {
         self
     }
 
-    pub fn with_secp256k1_key_pair(mut self, key_pair: KeyPair) -> Self {
-        self.key_pair = Some(key_pair);
+    pub fn with_version(mut self, version: String) -> Self {
+        self.version = version;
         self
     }
 
-    pub fn with_version(mut self, version: String) -> Self {
-        self.version = version;
+    pub fn with_datetime(mut self, datetime: String) -> Self {
+        self.datetime = datetime;
         self
     }
 
@@ -589,15 +622,11 @@ impl MmCtxBuilder {
         log.set_level(self.log_level);
         let mut ctx = MmCtx::with_log_state(log);
         ctx.mm_version = self.version;
+        ctx.datetime = self.datetime;
         if let Some(conf) = self.conf {
             ctx.conf = conf
         }
 
-        if let Some(key_pair) = self.key_pair {
-            ctx.rmd160.pin(key_pair.public().address_hash()).unwrap();
-            ctx.secp256k1_key_pair.pin(key_pair).unwrap();
-        }
-
         #[cfg(target_arch = "wasm32")]
         {
             ctx.db_namespace = self.db_namespace;
diff --git a/mm2src/mm2_db/Cargo.toml b/mm2src/mm2_db/Cargo.toml
index 1af5966337..5933140509 100644
--- a/mm2src/mm2_db/Cargo.toml
+++ b/mm2src/mm2_db/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 async-trait = "0.1"
@@ -21,7 +22,7 @@ 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"] }
+serde_json = { version = "1", 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" }
diff --git a/mm2src/mm2_db/src/indexed_db/be_big_uint.rs b/mm2src/mm2_db/src/indexed_db/be_big_uint.rs
index d4fe529c45..d1c94d2503 100644
--- a/mm2src/mm2_db/src/indexed_db/be_big_uint.rs
+++ b/mm2src/mm2_db/src/indexed_db/be_big_uint.rs
@@ -52,7 +52,6 @@ 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)]
@@ -117,7 +116,7 @@ impl BeBigUint {
 }
 
 impl fmt::Debug for BeBigUint {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
 }
 
 impl fmt::Display for BeBigUint {
diff --git a/mm2src/mm2_db/src/indexed_db/db_driver.rs b/mm2src/mm2_db/src/indexed_db/db_driver.rs
index 08d45de7d2..0329b9b9a0 100644
--- a/mm2src/mm2_db/src/indexed_db/db_driver.rs
+++ b/mm2src/mm2_db/src/indexed_db/db_driver.rs
@@ -35,8 +35,6 @@ 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)]
diff --git a/mm2src/mm2_db/src/indexed_db/db_lock.rs b/mm2src/mm2_db/src/indexed_db/db_lock.rs
index 6dcf10550d..b7106c252c 100644
--- a/mm2src/mm2_db/src/indexed_db/db_lock.rs
+++ b/mm2src/mm2_db/src/indexed_db/db_lock.rs
@@ -18,8 +18,10 @@ pub struct ConstructibleDb<Db> {
 }
 
 impl<Db: DbInstance> ConstructibleDb<Db> {
-    pub fn new_shared(ctx: &MmArc) -> SharedDb<Db> { Arc::new(Self::new(ctx)) }
+    pub fn into_shared(self) -> SharedDb<Db> { Arc::new(self) }
 
+    /// Creates a new uninitialized `Db` instance from other Iguana and/or HD accounts.
+    /// This can be initialized later using [`ConstructibleDb::get_or_initialize`].
     pub fn new(ctx: &MmArc) -> Self {
         ConstructibleDb {
             mutex: AsyncMutex::new(None),
@@ -28,6 +30,17 @@ impl<Db: DbInstance> ConstructibleDb<Db> {
         }
     }
 
+    /// Creates a new uninitialized `Db` instance shared between Iguana and all HD accounts
+    /// derived from the same passphrase.
+    /// This can be initialized later using [`ConstructibleDb::get_or_initialize`].
+    pub fn new_shared_db(ctx: &MmArc) -> Self {
+        ConstructibleDb {
+            mutex: AsyncMutex::new(None),
+            db_namespace: ctx.db_namespace,
+            wallet_rmd160: ctx.shared_db_id().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>> {
diff --git a/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs b/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs
index b95e175dc4..aef31a4e7d 100644
--- a/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs
+++ b/mm2src/mm2_db/src/indexed_db/drivers/transaction.rs
@@ -1,14 +1,12 @@
-use super::{construct_event_closure, IdbObjectStoreImpl, PASS_THROUGH};
+use super::IdbObjectStoreImpl;
 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 wasm_bindgen::{closure::Closure, JsCast, JsValue};
 use web_sys::IdbTransaction;
 
 pub type DbTransactionResult<T> = Result<T, MmError<DbTransactionError>>;
@@ -55,6 +53,9 @@ pub struct IdbTransactionImpl {
     transaction: IdbTransaction,
     tables: HashSet<String>,
     aborted: Arc<AtomicBool>,
+    /// It's not used directly, but we need to hold the closures in memory till `transaciton` exists.
+    #[allow(dead_code)]
+    onabort_closure: Closure<dyn FnMut(JsValue)>,
 }
 
 impl !Send for IdbTransactionImpl {}
@@ -85,29 +86,19 @@ impl IdbTransactionImpl {
     }
 
     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);
+        let onabort_closure = Closure::new(move |_: JsValue| 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);
-        };
+        // 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()));
 
-        wasm_bindgen_futures::spawn_local(fut);
         IdbTransactionImpl {
             transaction,
             tables,
             aborted,
+            onabort_closure,
         }
     }
 }
diff --git a/mm2src/mm2_db/src/indexed_db/indexed_db.rs b/mm2src/mm2_db/src/indexed_db/indexed_db.rs
index 28d499a075..897161464f 100644
--- a/mm2src/mm2_db/src/indexed_db/indexed_db.rs
+++ b/mm2src/mm2_db/src/indexed_db/indexed_db.rs
@@ -164,6 +164,8 @@ impl IndexedDbBuilder {
             // run the event loop
             IndexedDb::event_loop(event_rx, db).await;
         };
+
+        // `IndexedDb::event_loop` will finish almost immediately once the opposite `event_tx` is dropped.
         spawn_local(fut);
     }
 }
@@ -219,9 +221,12 @@ impl IndexedDb {
             },
         };
         let (transaction_event_tx, transaction_event_rx) = mpsc::unbounded();
-        // spawn the event loop
+
+        // Spawn the event loop.
         let fut = async move { DbTransaction::event_loop(transaction_event_rx, transaction).await };
+        // `DbTransaction::event_loop` will finish almost immediately once `transaction_event_rx` is dropped.
         spawn_local(fut);
+
         // ignore if the receiver is closed
         result_tx.send(Ok(transaction_event_tx)).ok();
     }
@@ -282,8 +287,11 @@ impl DbTransaction<'_> {
             },
         };
         let (table_event_tx, table_event_rx) = mpsc::unbounded();
+
         let fut = async move { table_event_loop(table_event_rx, table).await };
+        // `table_event_loop` will finish almost immediately once `table_event_tx` is dropped.
         spawn_local(fut);
+
         // ignore if the receiver is closed
         result_tx.send(Ok(table_event_tx)).ok();
     }
@@ -763,8 +771,11 @@ fn open_cursor(
         },
     };
     let (event_tx, event_rx) = mpsc::unbounded();
+
     let fut = async move { cursor_event_loop(event_rx, cursor_builder).await };
+    // `cursor_event_loop` will finish almost immediately once `event_tx` is dropped.
     spawn_local(fut);
+
     // ignore if the receiver is closed
     result_tx.send(Ok(event_tx)).ok();
 }
diff --git a/mm2src/mm2_err_handle/Cargo.toml b/mm2src/mm2_err_handle/Cargo.toml
index 9e80043bad..0e2faaa8d2 100644
--- a/mm2src/mm2_err_handle/Cargo.toml
+++ b/mm2src/mm2_err_handle/Cargo.toml
@@ -8,7 +8,7 @@ doctest = false
 
 [dependencies]
 futures01 = { version = "0.1", package = "futures" }
-serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 derive_more = "0.99"
 itertools = "0.10"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/mm2src/mm2_err_handle/src/common_errors.rs b/mm2src/mm2_err_handle/src/common_errors.rs
new file mode 100644
index 0000000000..24e3b5238a
--- /dev/null
+++ b/mm2src/mm2_err_handle/src/common_errors.rs
@@ -0,0 +1,17 @@
+use std::time::Duration;
+
+/// The trait is implemented for those error enumerations that have `Internal` variant.
+pub trait WithInternal {
+    fn internal(desc: String) -> Self;
+}
+
+/// The trait is implemented for those error enumerations that have `Timeout` variant.
+pub trait WithTimeout {
+    fn timeout(duration: Duration) -> Self;
+}
+
+pub struct InternalError(pub String);
+
+impl InternalError {
+    pub fn take(self) -> String { self.0 }
+}
diff --git a/mm2src/mm2_err_handle/src/discard_mm_trace.rs b/mm2src/mm2_err_handle/src/discard_mm_trace.rs
new file mode 100644
index 0000000000..112a66ec16
--- /dev/null
+++ b/mm2src/mm2_err_handle/src/discard_mm_trace.rs
@@ -0,0 +1,29 @@
+use crate::mm_error::{MmError, NotMmError};
+
+pub trait DiscardMmTrace<T, E>
+where
+    E: NotMmError,
+{
+    fn discard_mm_trace(self) -> Result<T, E>;
+}
+
+impl<T, E> DiscardMmTrace<T, E> for Result<T, MmError<E>>
+where
+    E: NotMmError,
+{
+    /// Discards the error trace and maps `Err(MmError<E>)` into `Err(E)`.
+    ///
+    /// This method can be used to match the inner `E` error and at the same time not to loose the trace.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// let res: Result<(), _> = MmError::err("Not found");
+    /// match res.discard_mm_trace() {
+    ///   Ok(_) => (),
+    ///   Err("Internal error") => return Err(NewErrorType {}),
+    ///   Err("Not found") => return Ok(None),
+    /// }
+    /// ```
+    fn discard_mm_trace(self) -> Result<T, E> { self.map_err(MmError::into_inner) }
+}
diff --git a/mm2src/mm2_err_handle/src/lib.rs b/mm2src/mm2_err_handle/src/lib.rs
index fe15619899..93b5030af3 100644
--- a/mm2src/mm2_err_handle/src/lib.rs
+++ b/mm2src/mm2_err_handle/src/lib.rs
@@ -1,19 +1,26 @@
 #![feature(negative_impls)]
 #![feature(auto_traits)]
+#![feature(allocator_api)]
 
+pub mod common_errors;
+pub mod discard_mm_trace;
 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 split_mm;
 
 pub mod prelude {
+    pub use crate::common_errors::{WithInternal, WithTimeout};
+    pub use crate::discard_mm_trace::DiscardMmTrace;
     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 crate::split_mm::SplitMmResult;
     pub use ser_error::SerializeErrorType;
 }
diff --git a/mm2src/mm2_err_handle/src/mm_error.rs b/mm2src/mm2_err_handle/src/mm_error.rs
index a41cbbf66b..d30075351e 100644
--- a/mm2src/mm2_err_handle/src/mm_error.rs
+++ b/mm2src/mm2_err_handle/src/mm_error.rs
@@ -90,7 +90,9 @@ use http::StatusCode;
 use itertools::Itertools;
 use ser_error::SerializeErrorType;
 use serde::{Serialize, Serializer};
+use std::alloc::Allocator;
 use std::cell::UnsafeCell;
+use std::error::Error as StdError;
 use std::fmt;
 use std::panic::Location;
 
@@ -102,7 +104,7 @@ impl<E> !NotMmError for MmError<E> {}
 
 /// This is required because an auto trait is not automatically implemented for a non-sized types,
 /// e.g for Box<dyn Trait>.
-impl<T: ?Sized> NotMmError for Box<T> {}
+impl<T: ?Sized, A: Allocator> NotMmError for Box<T, A> {}
 
 impl<T: ?Sized> NotMmError for UnsafeCell<T> {}
 
@@ -110,17 +112,34 @@ pub trait SerMmErrorType: SerializeErrorType + fmt::Display + NotMmError {}
 
 impl<E> SerMmErrorType for E where E: SerializeErrorType + fmt::Display + NotMmError {}
 
+pub auto trait NotEqual {}
+impl<X> !NotEqual for (X, X) {}
+impl<T: ?Sized, A: Allocator> NotEqual for Box<T, A> {}
+
 /// The unified error representation tracing an error path.
-#[derive(Clone, Debug, Display, Eq, PartialEq)]
-#[display(fmt = "{} {}", "trace.formatted()", etype)]
+#[derive(Clone, Eq, PartialEq)]
 pub struct MmError<E: NotMmError> {
     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> {}
+impl<E> fmt::Display for MmError<E>
+where
+    E: NotMmError + fmt::Display,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{} {}", self.trace.formatted(), self.etype) }
+}
+
+impl<E> fmt::Debug for MmError<E>
+where
+    E: NotMmError + fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{} {:?}", self.trace.formatted(), self.etype)
+    }
+}
+
+impl<E: fmt::Display + StdError + NotMmError> StdError for MmError<E> {}
 
 /// Track the location whenever `MmError<E2>::from(MmError<E1>)` is called.
 impl<E1, E2> From<MmError<E1>> for MmError<E2>
diff --git a/mm2src/mm2_err_handle/src/split_mm.rs b/mm2src/mm2_err_handle/src/split_mm.rs
new file mode 100644
index 0000000000..13eb5ab683
--- /dev/null
+++ b/mm2src/mm2_err_handle/src/split_mm.rs
@@ -0,0 +1,29 @@
+use crate::mm_error::{MmError, MmErrorTrace, NotMmError};
+
+pub trait SplitMmResult<T, E>
+where
+    E: NotMmError,
+{
+    fn split_mm(self) -> Result<T, (E, MmErrorTrace)>;
+}
+
+impl<T, E> SplitMmResult<T, E> for Result<T, MmError<E>>
+where
+    E: NotMmError,
+{
+    /// Splits the inner `Err(MmError<E>)` into inner `E` and the error trace.
+    ///
+    /// This method can be used to match the inner `E` error and at the same time not to loose the trace.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// let res: Result<(), _> = MmError::err("Not found");
+    /// match res.split_mm() {
+    ///   Ok(_) => (),
+    ///   Err("Internal", trace) => return MmError::err_with_trace(NewErrorType {}, trace),
+    ///   Err("Not found", _trace) => return Ok(None),
+    /// }
+    /// ```
+    fn split_mm(self) -> Result<T, (E, MmErrorTrace)> { self.map_err(MmError::split) }
+}
diff --git a/mm2src/mm2_eth/Cargo.toml b/mm2src/mm2_eth/Cargo.toml
new file mode 100644
index 0000000000..367b4162df
--- /dev/null
+++ b/mm2src/mm2_eth/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "mm2_eth"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+doctest = false
+
+[dependencies]
+ethabi = { version = "17.0.0" }
+ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
+hex = "0.4.2"
+indexmap = "1.7.0"
+itertools = "0.10"
+mm2_err_handle = { path = "../mm2_err_handle" }
+secp256k1 = { version = "0.20", features = ["recovery"] }
+serde = "1.0"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.19.0", default-features = false }
diff --git a/mm2src/mm2_eth/src/address.rs b/mm2src/mm2_eth/src/address.rs
new file mode 100644
index 0000000000..de517e4a2e
--- /dev/null
+++ b/mm2src/mm2_eth/src/address.rs
@@ -0,0 +1,25 @@
+use ethkey::{public_to_address, Public};
+use web3::types::H520;
+
+pub use ethkey::Address;
+
+pub fn address_from_pubkey_uncompressed(bytes: H520) -> Address {
+    // Skip the first byte of the uncompressed public key.
+    let public = Public::from_slice(&bytes[1..]);
+    public_to_address(&public)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+
+    #[test]
+    fn test_address_from_pubkey_uncompressed() {
+        let pubkey = H520::from_str("04d5f11f3cf90d165af39b17caec89162c607ddfc2d64d4eba2058c2eb8c2347cc422eaf112cb01a662f5f29924e2a6322153ae05d4e73526cb83cc1759c09fc01").unwrap();
+
+        let actual = address_from_pubkey_uncompressed(pubkey);
+        let expected = Address::from_str("0x9fd51e0930CA900B80Fa08f5F9166ce23ef44ea5").unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/mm2src/mm2_eth/src/eip712.rs b/mm2src/mm2_eth/src/eip712.rs
new file mode 100644
index 0000000000..bca185225f
--- /dev/null
+++ b/mm2src/mm2_eth/src/eip712.rs
@@ -0,0 +1,139 @@
+//! Inspired by https://github.com/openethereum/parity-ethereum/blob/v2.7.2-stable/util/EIP-712/src/eip712.rs
+
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::fmt;
+use std::str::FromStr;
+
+pub(crate) const EIP712_DOMAIN: &str = "EIP712Domain";
+
+pub(crate) type CustomTypes = HashMap<String, Vec<ObjectProperty>>;
+
+/// `ObjectType` is used to describes an object type accordingly to:
+/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-712.md#definition-of-typed-structured-data-%F0%9D%95%8A
+///
+/// # Example
+///
+/// Let's you need to describe the following types:
+///
+/// ```rust
+/// struct Mail {
+///   message: String,
+///   from: Person,
+///   to: Vec<Person>,
+/// }
+///
+/// struct Person {
+///   address: String,
+/// }
+/// ```
+///
+/// They can be described as follows:
+///
+/// ```rust
+/// # use mm2_eth::eip712::{ObjectType, PropertyType};
+///
+/// let mut mail_type = ObjectType::new("Mail");
+/// mail_type.property("message", PropertyType::String);
+/// mail_type.property("from", PropertyType::Custom("Person".into()));
+/// mail_type.property_array("to", PropertyType::Custom("Person".into()));
+///
+/// let mut person_type = ObjectType::new("Person");
+/// person_type.property("address", PropertyType::Address);
+///
+/// let types = vec![mail_type, person_type];
+/// ```
+pub struct ObjectType {
+    pub name: String,
+    pub properties: Vec<ObjectProperty>,
+}
+
+impl ObjectType {
+    /// Creates an `ObjectType` with the `EIP712Domain` name
+    /// (required to be set for a domain typed structure).
+    pub fn domain() -> ObjectType {
+        ObjectType {
+            name: EIP712_DOMAIN.to_string(),
+            properties: Vec::new(),
+        }
+    }
+
+    /// Creates an `ObjectType` with a custom `name`.
+    pub fn new(name: &str) -> ObjectType {
+        ObjectType {
+            name: name.to_string(),
+            properties: Vec::new(),
+        }
+    }
+
+    /// Describes a property.
+    pub fn property(&mut self, property_name: &str, property_type: PropertyType) -> &mut ObjectType {
+        let property = ObjectProperty {
+            name: property_name.to_string(),
+            property_type: property_type.to_string(),
+        };
+        self.properties.push(property);
+        self
+    }
+}
+
+/// Add `Int64`, `Uint64`, `Int256`, `Array` types if required.
+/// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-712.md#definition-of-typed-structured-data-%F0%9D%95%8A
+#[derive(Clone, Debug)]
+pub enum PropertyType {
+    Bool,
+    String,
+    Uint256,
+    Address,
+    Bytes32,
+    Custom(String),
+}
+
+impl fmt::Display for PropertyType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            PropertyType::Bool => write!(f, "bool"),
+            PropertyType::String => write!(f, "string"),
+            PropertyType::Uint256 => write!(f, "uint256"),
+            PropertyType::Address => write!(f, "address"),
+            PropertyType::Bytes32 => write!(f, "bytes32"),
+            PropertyType::Custom(custom) => write!(f, "{custom}"),
+        }
+    }
+}
+
+impl FromStr for PropertyType {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let property_type = match s {
+            "bool" => PropertyType::Bool,
+            "string" => PropertyType::String,
+            "uint256" => PropertyType::Uint256,
+            "address" => PropertyType::Address,
+            "bytes32" => PropertyType::Bytes32,
+            custom => PropertyType::Custom(custom.to_string()),
+        };
+        Ok(property_type)
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct ObjectProperty {
+    pub(crate) name: String,
+    #[serde(rename = "type")]
+    pub(crate) property_type: String,
+}
+
+#[derive(Debug, Serialize)]
+pub struct Eip712<Domain, SignData> {
+    /// Defines the types of the domain and data you will be signing.
+    pub types: CustomTypes,
+    /// Ensures that the signature will be unique across multiple DApps and across Blockchains.
+    pub domain: Domain,
+    /// Name of the `sign_data` structured type.
+    #[serde(rename = "primaryType")]
+    pub primary_type: String,
+    /// The message signing data content.
+    pub message: SignData,
+}
diff --git a/mm2src/mm2_eth/src/eip712_encode.rs b/mm2src/mm2_eth/src/eip712_encode.rs
new file mode 100644
index 0000000000..1d854dcb41
--- /dev/null
+++ b/mm2src/mm2_eth/src/eip712_encode.rs
@@ -0,0 +1,394 @@
+//! Inspired by https://github.com/openethereum/parity-ethereum/blob/v2.7.2-stable/util/EIP-712/src/encode.rs
+
+use crate::eip712::{CustomTypes, Eip712, PropertyType, EIP712_DOMAIN};
+use ethabi::{encode, Token};
+use indexmap::IndexSet;
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::collections::HashSet;
+use std::fmt;
+use std::str::FromStr;
+use web3::signing::keccak256;
+use web3::types::{Address, H256, U256};
+use web3::{Error, Result};
+
+type H256Bytes = Vec<u8>;
+
+pub fn hash_typed_data<Domain, SignData>(data: Eip712<Domain, SignData>) -> Result<H256>
+where
+    Domain: Serialize,
+    SignData: Serialize,
+{
+    let data_raw = Eip712Raw::try_from(data)?;
+    hash_typed_data_raw(data_raw)
+}
+
+fn hash_typed_data_raw(data: Eip712Raw) -> Result<H256> {
+    /// EIP-191 compliant.
+    const PREFIX: &[u8; 2] = b"\x19\x01";
+
+    let domain_hash = encode_data(
+        &data.types,
+        PropertyType::Custom(EIP712_DOMAIN.to_string()),
+        &data.domain,
+        None,
+    )?;
+    let data_hash = encode_data(
+        &data.types,
+        PropertyType::Custom(data.primary_type.clone()),
+        &data.message,
+        None,
+    )?;
+
+    let concat = [PREFIX.as_slice(), domain_hash.as_slice(), data_hash.as_slice()].concat();
+    Ok(H256::from(keccak256(&concat)))
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+struct Eip712Raw {
+    types: CustomTypes,
+    domain: Json,
+    #[serde(rename = "primaryType")]
+    primary_type: String,
+    message: Json,
+}
+
+impl<Domain, SignData> TryFrom<Eip712<Domain, SignData>> for Eip712Raw
+where
+    Domain: Serialize,
+    SignData: Serialize,
+{
+    type Error = Error;
+
+    fn try_from(value: Eip712<Domain, SignData>) -> std::result::Result<Self, Self::Error> {
+        Ok(Eip712Raw {
+            types: value.types,
+            domain: serde_json::to_value(value.domain)?,
+            primary_type: value.primary_type,
+            message: serde_json::to_value(value.message)?,
+        })
+    }
+}
+
+fn encode_data(
+    custom_types: &CustomTypes,
+    data_type: PropertyType,
+    data: &Json,
+    field_name: Option<&str>,
+) -> Result<Vec<u8>> {
+    match data_type {
+        PropertyType::Bool => encode_bool(data, field_name),
+        PropertyType::String => encode_string(data, field_name),
+        PropertyType::Uint256 => encode_u256(data, field_name),
+        PropertyType::Address => encode_address(data, field_name),
+        PropertyType::Bytes32 => encode_bytes32(data, field_name),
+        PropertyType::Custom(custom) => encode_custom(custom_types, &custom, data, field_name),
+    }
+}
+
+fn encode_custom(
+    custom_types: &CustomTypes,
+    data_ident: &str,
+    data: &Json,
+    field_name: Option<&str>,
+) -> Result<H256Bytes> {
+    let data_properties = custom_types
+        .get(data_ident)
+        .ok_or_else(|| decode_error(format!("Found an unknown '{data_ident}' type"), field_name))?;
+
+    let type_hash = type_hash(data_ident, custom_types)?;
+    let mut encoded_tokens = encode(&[Token::FixedBytes(type_hash)]);
+
+    for field in data_properties.iter() {
+        let field_value = &data[&field.name];
+        let field_type = PropertyType::from_str(&field.property_type)?;
+        let mut encoded = encode_data(custom_types, field_type, field_value, Some(&*field.name))?;
+        encoded_tokens.append(&mut encoded);
+    }
+
+    Ok(keccak256(&encoded_tokens).as_ref().to_vec())
+}
+
+fn encode_bytes32(value: &Json, field_name: Option<&str>) -> Result<Vec<u8>> {
+    let string = value
+        .as_str()
+        .ok_or_else(|| expected_type_error("bytes32", value, field_name))?;
+    check_hex(string, field_name)?;
+
+    let bytes = hex::decode(string).map_err(|e| decode_error(e, field_name))?;
+    let hash = keccak256(&bytes).to_vec();
+
+    Ok(encode(&[Token::FixedBytes(hash)]))
+}
+
+fn encode_string(value: &Json, field_name: Option<&str>) -> Result<Vec<u8>> {
+    let string = value
+        .as_str()
+        .ok_or_else(|| expected_type_error("string", value, field_name))?;
+    let hash = keccak256(string.as_ref()).to_vec();
+
+    Ok(encode(&[Token::FixedBytes(hash)]))
+}
+
+fn encode_bool(value: &Json, field_name: Option<&str>) -> Result<Vec<u8>> {
+    let bin = value
+        .as_bool()
+        .ok_or_else(|| expected_type_error("bool", value, field_name))?;
+    Ok(encode(&[Token::Bool(bin)]))
+}
+
+fn encode_address(value: &Json, field_name: Option<&str>) -> Result<Vec<u8>> {
+    let string = value
+        .as_str()
+        .ok_or_else(|| expected_type_error("address", value, field_name))?;
+    // "0x" - 2 chars, 40 chars are 20 hexed bytes.
+    if string.len() != 42 {
+        return Err(decode_error("Expected 0x-prefixed address (20 bytes)", field_name))?;
+    }
+    let address = Address::from_str(&string[2..]).map_err(|e| decode_error(e, field_name))?;
+    Ok(encode(&[Token::Address(address)]))
+}
+
+fn encode_u256(value: &Json, field_name: Option<&str>) -> Result<Vec<u8>> {
+    let string = value
+        .as_str()
+        .ok_or_else(|| expected_type_error("str(u256)", value, field_name))?;
+    check_hex(string, field_name)?;
+
+    let uint = U256::from_str(&string[2..]).map_err(|e| decode_error(e, field_name))?;
+    Ok(encode(&[Token::Uint(uint)]))
+}
+
+fn encode_type(custom_types: &CustomTypes, data_type: &str) -> Result<String> {
+    let deps = {
+        let mut temp = build_dependencies(data_type, custom_types).ok_or_else(|| {
+            let error = format!("'SignTypedDataV4Raw::types' doesn't contain '{data_type}'");
+            decode_error(error, None)
+        })?;
+        temp.remove(data_type);
+        let mut temp = temp.into_iter().collect::<Vec<_>>();
+        temp.sort_unstable();
+        temp.insert(0, data_type);
+        temp
+    };
+
+    let encoded = deps
+        .into_iter()
+        .filter_map(|dep| {
+            custom_types.get(dep).map(|field_types| {
+                let types = field_types
+                    .iter()
+                    .map(|value| format!("{} {}", value.property_type, value.name))
+                    .join(",");
+                format!("{}({})", dep, types)
+            })
+        })
+        .collect::<Vec<_>>()
+        .concat();
+    Ok(encoded)
+}
+
+fn type_hash(data_type: &str, custom_types: &CustomTypes) -> Result<H256Bytes> {
+    Ok(keccak256(encode_type(custom_types, data_type)?.as_ref()).to_vec())
+}
+
+/// Given a type and the set of custom types.
+/// Returns a `HashSet` of dependent types of the given type.
+fn build_dependencies<'a>(data_type: &'a str, custom_types: &'a CustomTypes) -> Option<HashSet<&'a str>> {
+    custom_types.get(data_type)?;
+
+    let mut types_stack = IndexSet::new();
+    types_stack.insert(data_type);
+    let mut deps = HashSet::new();
+
+    while let Some(item) = types_stack.pop() {
+        if let Some(fields) = custom_types.get(item) {
+            deps.insert(item);
+
+            for field in fields.iter() {
+                // check if this field is an array type
+                let field_type = if let Some(index) = field.property_type.find('[') {
+                    &field.property_type[..index]
+                } else {
+                    &field.property_type
+                };
+                // seen this type before? or not a custom type skip
+                if !deps.contains(field_type) || custom_types.contains_key(field_type) {
+                    types_stack.insert(field_type);
+                }
+            }
+        }
+    }
+
+    Some(deps)
+}
+
+fn check_hex(string: &str, field_name: Option<&str>) -> Result<()> {
+    if string.len() >= 2 && &string[..2] == "0x" {
+        return Ok(());
+    }
+
+    Err(decode_error(
+        format!(
+            "Expected a 0x-prefixed string of even length, found {} length string",
+            string.len()
+        ),
+        field_name,
+    ))
+}
+
+fn expected_type_error(expected: &str, found: &Json, field_name: Option<&str>) -> Error {
+    decode_error(format!("Expected '{expected}' type, found '{found}'"), field_name)
+}
+
+fn decode_error<E: fmt::Display>(error: E, field_name: Option<&str>) -> Error {
+    let error = match field_name {
+        Some(field_name) => format!("EIP712 '{field_name}' deserialization error: {error}"),
+        None => format!("EIP712 deserialization error: {error}"),
+    };
+    Error::Decoder(error)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_build_dependencies() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types: CustomTypes = serde_json::from_str(custom_types).unwrap();
+
+        let mail = "Mail";
+        let person = "Person";
+
+        let expected = {
+            let mut temp = HashSet::new();
+            temp.insert(mail);
+            temp.insert(person);
+            temp
+        };
+        assert_eq!(build_dependencies(mail, &custom_types), Some(expected));
+    }
+
+    #[test]
+    fn test_encode_type() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types: CustomTypes = serde_json::from_str(custom_types).expect("alas error!");
+        assert_eq!(
+            "Mail(Person from,Person to,string contents)Person(string name,address wallet)",
+            encode_type(&custom_types, "Mail").expect("alas error!")
+        )
+    }
+
+    #[test]
+    fn test_encode_type_hash() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types = serde_json::from_str::<CustomTypes>(custom_types).expect("alas error!");
+        let hash = type_hash("Mail", &custom_types).expect("alas error!");
+        let actual = hex::encode(hash);
+        assert_eq!(
+            actual,
+            "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2"
+        );
+    }
+
+    #[test]
+    fn test_hash_data() {
+        const JSON: &'static str = r#"{
+            "primaryType": "Mail",
+            "domain": {
+                "name": "Ether Mail",
+                "version": "1",
+                "chainId": "0x1",
+                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+            },
+            "message": {
+                "from": {
+                    "name": "Cow",
+                    "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                },
+                "to": {
+                    "name": "Bob",
+                    "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+                },
+                "contents": "Hello, Bob!"
+            },
+            "types": {
+                "EIP712Domain": [
+                    { "name": "name", "type": "string" },
+                    { "name": "version", "type": "string" },
+                    { "name": "chainId", "type": "uint256" },
+                    { "name": "verifyingContract", "type": "address" }
+                ],
+                "Person": [
+                    { "name": "name", "type": "string" },
+                    { "name": "wallet", "type": "address" }
+                ],
+                "Mail": [
+                    { "name": "from", "type": "Person" },
+                    { "name": "to", "type": "Person" },
+                    { "name": "contents", "type": "string" }
+                ]
+            }
+        }"#;
+
+        let typed_data = serde_json::from_str::<Eip712Raw>(JSON).expect("alas error!");
+        let hash = hash_typed_data_raw(typed_data).expect("alas error!");
+        assert_eq!(
+            format!("{:02x}", hash),
+            "be609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2",
+        );
+    }
+}
diff --git a/mm2src/mm2_eth/src/lib.rs b/mm2src/mm2_eth/src/lib.rs
new file mode 100644
index 0000000000..89ad17d924
--- /dev/null
+++ b/mm2src/mm2_eth/src/lib.rs
@@ -0,0 +1,4 @@
+pub mod address;
+pub mod eip712;
+pub mod eip712_encode;
+pub mod recovery;
diff --git a/mm2src/mm2_eth/src/recovery.rs b/mm2src/mm2_eth/src/recovery.rs
new file mode 100644
index 0000000000..1afa478e6f
--- /dev/null
+++ b/mm2src/mm2_eth/src/recovery.rs
@@ -0,0 +1,53 @@
+use mm2_err_handle::prelude::*;
+use secp256k1::recovery::{RecoverableSignature, RecoveryId};
+use secp256k1::{Message as SecpMessage, Secp256k1};
+use web3::types::{H256, H520};
+
+pub use ethkey::{Error, Signature};
+
+/// Inspired by `ethkey::recover` with the only one difference:
+/// this methods returns the full `H520` pubkey instead of unprefixed `H512`.
+pub fn recover_pubkey(message_hash: H256, mut signature: Signature) -> MmResult<H520, Error> {
+    if !(0..3).contains(&signature[64]) {
+        if signature[64] < 27 {
+            return MmError::err(Error::InvalidSignature);
+        }
+        // https://github.com/ethereum/go-ethereum/blob/55599ee95d4151a2502465e0afc7c47bd1acba77/internal/ethapi/api.go#L459
+        signature[64] -= 27;
+    }
+
+    let recovery_id = RecoveryId::from_i32(signature[64] as i32)?;
+    let sig = RecoverableSignature::from_compact(&signature[0..64], recovery_id)?;
+    let secp_message = SecpMessage::from_slice(message_hash.as_ref())?;
+    let pubkey = Secp256k1::new().recover(&secp_message, &sig)?;
+    let serialized = pubkey.serialize_uncompressed();
+
+    Ok(H520::from_slice(&serialized))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+
+    /// https://testnet.bscscan.com/tx/0xbff2c07134a32da9f96588c03502f1caf2948c529c2ce9ce067f320f7c990b81
+    #[test]
+    fn test_recover_pubkey_for_signed_tx() {
+        let msg_hash = H256::from_str("ac3a8b78342416f75a9c46252e67eb1aa41b65cd95155273e719cb39d4fd2c62").unwrap();
+        let sig = Signature::from_str("e13785abae3c72a168a95c6dfdd7bdcb1dc7db50d831bdad3b746e4a56f1e4e92a3aa057332cb8aa2ef2edb58234f3eb96d423b701f77cfbf6f5aac93b8824ae01").unwrap();
+
+        let actual_pubkey = recover_pubkey(msg_hash, sig).unwrap();
+        let expected_pubkey = H520::from_str("04d5f11f3cf90d165af39b17caec89162c607ddfc2d64d4eba2058c2eb8c2347cc422eaf112cb01a662f5f29924e2a6322153ae05d4e73526cb83cc1759c09fc01").unwrap();
+        assert_eq!(actual_pubkey, expected_pubkey);
+    }
+
+    #[test]
+    fn test_recover_pubkey_for_signed_signed_adex_login() {
+        let msg_hash = H256::from_str("dbb6305acd7a0e6c91de2c2f3da96a3ff069b40eba6d796031c72d5c15a10308").unwrap();
+        let sig = Signature::from_str("c6714ed4f85a75dd13c87a39a1ff4b33f9f42f8de159df261ade6469f316a60c2c098ce75ef91e794a4807caa0185ea1286d53df2bfb0c4a7e612715bf6b50af1b").unwrap();
+
+        let actual_pubkey = recover_pubkey(msg_hash, sig).unwrap();
+        let expected_pubkey = H520::from_str("04d5f11f3cf90d165af39b17caec89162c607ddfc2d64d4eba2058c2eb8c2347cc422eaf112cb01a662f5f29924e2a6322153ae05d4e73526cb83cc1759c09fc01").unwrap();
+        assert_eq!(actual_pubkey, expected_pubkey);
+    }
+}
diff --git a/mm2src/mm2_gui_storage/Cargo.toml b/mm2src/mm2_gui_storage/Cargo.toml
new file mode 100644
index 0000000000..8beb78b863
--- /dev/null
+++ b/mm2src/mm2_gui_storage/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "mm2_gui_storage"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+doctest = false
+
+[dependencies]
+async-trait = "0.1"
+common = { path = "../common" }
+db_common = { path = "../db_common" }
+derive_more = "0.99"
+mm2_core = { path = "../mm2_core" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_number = { path = "../mm2_number" }
+rpc = { path = "../mm2_bitcoin/rpc" }
+serde = "1.0"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+serde_repr = "0.1"
+ser_error = { path = "../derives/ser_error" }
+ser_error_derive = { path = "../derives/ser_error_derive" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+mm2_db = { path = "../mm2_db" }
+mm2_test_helpers = { path = "../mm2_test_helpers" }
+wasm-bindgen-test = { version = "0.3.2" }
+
+[dev-dependencies]
+mm2_test_helpers = { path = "../mm2_test_helpers" }
diff --git a/mm2src/mm2_gui_storage/src/account/mod.rs b/mm2src/mm2_gui_storage/src/account/mod.rs
new file mode 100644
index 0000000000..4350b0c939
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/account/mod.rs
@@ -0,0 +1,121 @@
+use crate::account::storage::AccountStorageError;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use rpc::v1::types::H160 as H160Json;
+use serde::{Deserialize, Serialize};
+use serde_repr::{Deserialize_repr, Serialize_repr};
+use std::collections::BTreeSet;
+
+pub(crate) mod storage;
+
+pub const MAX_ACCOUNT_NAME_LENGTH: usize = 255;
+pub const MAX_ACCOUNT_DESCRIPTION_LENGTH: usize = 600;
+pub const MAX_TICKER_LENGTH: usize = 255;
+
+pub(crate) type HwPubkey = H160Json;
+
+#[derive(Clone, Copy, Debug, Deserialize_repr, Serialize_repr)]
+#[repr(u8)]
+pub(crate) enum AccountType {
+    Iguana = 0,
+    HD = 1,
+    HW = 2,
+}
+
+impl TryFrom<i64> for AccountType {
+    type Error = MmError<AccountStorageError>;
+
+    fn try_from(value: i64) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(AccountType::Iguana),
+            1 => Ok(AccountType::HD),
+            2 => Ok(AccountType::HW),
+            other => {
+                let error = format!("Unknown 'account_type' value: {}", other);
+                MmError::err(AccountStorageError::ErrorDeserializing(error))
+            },
+        }
+    }
+}
+
+/// An enable account type.
+/// We should not allow the user to enable [`AccountType::HW`].
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+#[repr(u8)]
+pub(crate) enum EnabledAccountType {
+    Iguana = 0,
+    HD = 1,
+}
+
+impl TryFrom<i64> for EnabledAccountType {
+    type Error = MmError<AccountStorageError>;
+
+    fn try_from(value: i64) -> Result<Self, Self::Error> {
+        match AccountType::try_from(value)? {
+            AccountType::Iguana => Ok(EnabledAccountType::Iguana),
+            AccountType::HD => Ok(EnabledAccountType::HD),
+            AccountType::HW => MmError::err(AccountStorageError::ErrorDeserializing(
+                "HW account cannot be enabled".to_string(),
+            )),
+        }
+    }
+}
+
+impl From<EnabledAccountType> for AccountType {
+    fn from(t: EnabledAccountType) -> Self {
+        match t {
+            EnabledAccountType::Iguana => AccountType::Iguana,
+            EnabledAccountType::HD => AccountType::HD,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+#[serde(tag = "type")]
+#[serde(rename_all = "lowercase")]
+pub enum AccountId {
+    Iguana,
+    HD { account_idx: u32 },
+    HW { device_pubkey: HwPubkey },
+}
+
+#[derive(Copy, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+#[serde(tag = "type")]
+#[serde(rename_all = "lowercase")]
+pub enum EnabledAccountId {
+    Iguana,
+    HD { account_idx: u32 },
+}
+
+impl From<EnabledAccountId> for AccountId {
+    fn from(id: EnabledAccountId) -> Self {
+        match id {
+            EnabledAccountId::Iguana => AccountId::Iguana,
+            EnabledAccountId::HD { account_idx } => AccountId::HD { account_idx },
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize)]
+pub struct AccountInfo {
+    pub(crate) account_id: AccountId,
+    pub(crate) name: String,
+    pub(crate) description: String,
+    pub(crate) balance_usd: BigDecimal,
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+pub struct AccountWithEnabledFlag {
+    #[serde(flatten)]
+    account_info: AccountInfo,
+    /// Whether this account is enabled.
+    /// This flag is expected to be `true` for one account **only**.
+    enabled: bool,
+}
+
+#[derive(Debug, PartialEq, Serialize)]
+pub struct AccountWithCoins {
+    #[serde(flatten)]
+    account_info: AccountInfo,
+    coins: BTreeSet<String>,
+}
diff --git a/mm2src/mm2_gui_storage/src/account/storage/account_storage_tests.rs b/mm2src/mm2_gui_storage/src/account/storage/account_storage_tests.rs
new file mode 100644
index 0000000000..b44e83190a
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/account/storage/account_storage_tests.rs
@@ -0,0 +1,581 @@
+use crate::account::storage::{AccountStorage, AccountStorageBuilder, AccountStorageError, AccountStorageResult};
+use crate::account::{AccountId, AccountInfo, AccountWithCoins, AccountWithEnabledFlag, EnabledAccountId, HwPubkey};
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::mm_ctx_with_custom_db;
+use std::collections::{BTreeMap, BTreeSet};
+
+const HD_0_ACCOUNT: AccountId = AccountId::HD { account_idx: 0 };
+const HD_1_ACCOUNT: AccountId = AccountId::HD { account_idx: 1 };
+const HD_2_ACCOUNT: AccountId = AccountId::HD { account_idx: 2 };
+const HD_3_ACCOUNT: AccountId = AccountId::HD { account_idx: 3 };
+
+fn account_ids_for_test() -> Vec<AccountId> {
+    vec![
+        AccountId::Iguana,
+        HD_0_ACCOUNT,
+        AccountId::HW {
+            device_pubkey: HwPubkey::from("1549128bbfb33b997949b4105b6a6371c998e212"),
+        },
+        AccountId::HW {
+            device_pubkey: HwPubkey::from("f97d3a43dbea0993f1b7a6a299377d4ee164c849"),
+        },
+        AccountId::HW {
+            device_pubkey: HwPubkey::from("69a20008cea0c15ee483b5bbdff942752634aa07"),
+        },
+        HD_1_ACCOUNT,
+    ]
+}
+
+fn accounts_for_test() -> Vec<AccountInfo> {
+    account_ids_for_test()
+        .iter()
+        .enumerate()
+        .map(|(i, account_id)| AccountInfo {
+            account_id: account_id.clone(),
+            name: format!("Account {}", i),
+            description: format!("Description {}", i),
+            balance_usd: BigDecimal::from(i as u64),
+        })
+        .collect()
+}
+
+fn accounts_to_map(accounts: Vec<AccountInfo>) -> BTreeMap<AccountId, AccountInfo> {
+    accounts
+        .into_iter()
+        .map(|account| (account.account_id.clone(), account))
+        .collect()
+}
+
+fn tag_with_enabled_flag(
+    accounts: BTreeMap<AccountId, AccountInfo>,
+    enabled: AccountId,
+) -> BTreeMap<AccountId, AccountWithEnabledFlag> {
+    accounts
+        .into_iter()
+        .map(|(account_id, account_info)| {
+            (account_id.clone(), AccountWithEnabledFlag {
+                account_info,
+                enabled: account_id == enabled,
+            })
+        })
+        .collect()
+}
+
+async fn fill_storage(storage: &dyn AccountStorage, accounts: Vec<AccountInfo>) -> AccountStorageResult<()> {
+    for account in accounts {
+        storage.upload_account(account.clone()).await?;
+    }
+    Ok(())
+}
+
+async fn test_init_collection_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+
+    storage.init().await.unwrap();
+    // repetitive init must not fail
+    storage.init().await.unwrap();
+}
+
+async fn test_upload_account_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    for account in accounts_for_test() {
+        storage.upload_account(account.clone()).await.unwrap();
+
+        let account_id = account.account_id.clone();
+        let error = storage.upload_account(account).await.expect_err(&format!(
+            "Uploading should have since the account {:?} has been uploaded already",
+            account_id
+        ));
+        match error.into_inner() {
+            AccountStorageError::AccountExistsAlready(found) if found == account_id => (),
+            other => panic!("Expected 'AccountExistsAlready({:?})' found {:?}", account_id, other),
+        }
+    }
+}
+
+async fn test_enable_account_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let error = storage
+        .enable_account(EnabledAccountId::Iguana)
+        .await
+        .expect_err("'enable_account' should have failed due to the selected account is not present in the storage");
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(AccountId::Iguana) => (),
+        other => panic!("Expected 'NoSuchAccount(Iguana)', found {:?}", other),
+    }
+
+    let accounts = accounts_to_map(accounts_for_test());
+
+    let account_iguana = accounts.get(&AccountId::Iguana).unwrap().clone();
+    storage.upload_account(account_iguana).await.unwrap();
+    storage.enable_account(EnabledAccountId::Iguana).await.unwrap();
+
+    // Try to enable an unknown account and check if `Iguana` is still enabled.
+    let error = storage
+        .enable_account(EnabledAccountId::HD { account_idx: 3 })
+        .await
+        .expect_err("'enable_account' should have failed due to the selected account is not present in the storage");
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(HD_3_ACCOUNT) => (),
+        other => panic!("Expected 'NoSuchAccount(HD)', found {:?}", other),
+    }
+    let actual_enabled = storage.load_enabled_account_id().await.unwrap();
+    assert_eq!(actual_enabled, EnabledAccountId::Iguana);
+
+    // Upload new accounts.
+    let account_hd_1 = accounts.get(&HD_0_ACCOUNT).unwrap().clone();
+    storage.upload_account(account_hd_1).await.unwrap();
+
+    let account_hd_2 = accounts.get(&HD_1_ACCOUNT).unwrap().clone();
+    storage.upload_account(account_hd_2).await.unwrap();
+
+    // Check if Iguana account is still enabled.
+    let actual_enabled = storage.load_enabled_account_id().await.unwrap();
+    assert_eq!(actual_enabled, EnabledAccountId::Iguana);
+
+    // Enable HD-1 account
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 1 })
+        .await
+        .unwrap();
+    let actual_enabled = storage.load_enabled_account_id().await.unwrap();
+    assert_eq!(actual_enabled, EnabledAccountId::HD { account_idx: 1 });
+}
+
+async fn test_set_name_desc_balance_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+
+    fill_storage(storage.as_ref(), accounts.clone()).await.unwrap();
+    storage.enable_account(EnabledAccountId::Iguana).await.unwrap();
+
+    storage
+        .set_name(AccountId::Iguana, "New name".to_string())
+        .await
+        .unwrap();
+
+    storage
+        .set_description(HD_1_ACCOUNT, "New description".to_string())
+        .await
+        .unwrap();
+
+    let hw_id = AccountId::HW {
+        device_pubkey: HwPubkey::from("69a20008cea0c15ee483b5bbdff942752634aa07"),
+    };
+    storage.set_balance(hw_id.clone(), BigDecimal::from(23)).await.unwrap();
+
+    let mut expected = accounts_to_map(accounts);
+    expected.get_mut(&AccountId::Iguana).unwrap().name = "New name".to_string();
+    expected.get_mut(&HD_1_ACCOUNT).unwrap().description = "New description".to_string();
+    expected.get_mut(&hw_id).unwrap().balance_usd = BigDecimal::from(23);
+
+    let actual = storage.load_accounts().await.unwrap();
+    assert_eq!(actual, expected);
+
+    let error = storage
+        .set_name(HD_2_ACCOUNT, "New name 4".to_string())
+        .await
+        .expect_err("'AccountStorage::set_name' should have failed due to an unknown 'AccountId'");
+
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(HD_2_ACCOUNT) => (),
+        other => panic!("Expected 'NoSuchAccount(HD)' error, found: {}", other),
+    }
+}
+
+async fn test_activate_deactivate_coins_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+
+    let error = storage.load_account_coins(AccountId::Iguana).await.expect_err(
+        "'AccountStorage::load_enabled_account_with_coins' should have failed since no account was enabled",
+    );
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(AccountId::Iguana) => (),
+        other => panic!("Expected 'NoSuchAccount(Iguana)' error, found: {}", other),
+    }
+
+    fill_storage(storage.as_ref(), accounts).await.unwrap();
+
+    // Deactivating unknown coins should never fail.
+    storage
+        .deactivate_coins(AccountId::Iguana, vec!["RICK".to_string(), "MORTY".to_string()])
+        .await
+        .unwrap();
+
+    // Try to reactivate `RICK` coin, it should be ignored.
+    storage
+        .activate_coins(AccountId::Iguana, vec!["RICK".to_string()])
+        .await
+        .unwrap();
+    // Try to reactivate `MORTY` and activate `BTC` coins, `MORTY` should be ignored.
+    storage
+        .activate_coins(AccountId::Iguana, vec!["MORTY".to_string(), "BTC".to_string()])
+        .await
+        .unwrap();
+    storage
+        .activate_coins(HD_0_ACCOUNT, vec![
+            "MORTY".to_string(),
+            "QTUM".to_string(),
+            "KMD".to_string(),
+        ])
+        .await
+        .unwrap();
+
+    let actual = storage.load_account_coins(AccountId::Iguana).await.unwrap();
+    let expected = vec!["RICK".to_string(), "MORTY".to_string(), "BTC".to_string()]
+        .into_iter()
+        .collect();
+    assert_eq!(actual, expected);
+
+    let actual = storage.load_account_coins(HD_0_ACCOUNT).await.unwrap();
+    let expected = vec!["MORTY".to_string(), "QTUM".to_string(), "KMD".to_string()]
+        .into_iter()
+        .collect();
+    assert_eq!(actual, expected);
+
+    // Deactivate `QTUM` and an unknown `BCH` coins for the `HD{0}` account.
+    storage
+        .deactivate_coins(HD_0_ACCOUNT, vec!["BCH".to_string(), "QTUM".to_string()])
+        .await
+        .unwrap();
+    let actual = storage.load_account_coins(HD_0_ACCOUNT).await.unwrap();
+    let expected = vec!["MORTY".to_string(), "KMD".to_string()].into_iter().collect();
+    assert_eq!(actual, expected);
+
+    // Deactivate all `HD{0}` account's coins.
+    storage
+        .deactivate_coins(HD_0_ACCOUNT, vec!["MORTY".to_string(), "KMD".to_string()])
+        .await
+        .unwrap();
+    let actual = storage.load_account_coins(HD_0_ACCOUNT).await.unwrap();
+    assert!(actual.is_empty());
+
+    // Try to activate a coin for an unknown `HD{2}` account.
+    let error = storage
+        .activate_coins(HD_2_ACCOUNT, vec!["RICK".to_string()])
+        .await
+        .expect_err("'AccountStorage::activate_coins' should have failed due to an unknown account_id");
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(HD_2_ACCOUNT) => (),
+        other => panic!("Expected 'NoSuchAccount(HD)' error, found: {}", other),
+    }
+
+    // Try to deactivate a coin for an unknown `HD{3}` account.
+    let error = storage
+        .deactivate_coins(HD_3_ACCOUNT, vec!["MORTY".to_string()])
+        .await
+        .expect_err("'AccountStorage::deactivate_coins' should have failed due to an unknown account_id");
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(HD_3_ACCOUNT) => (),
+        other => panic!("Expected 'NoSuchAccount(HD)' error, found: {}", other),
+    }
+}
+
+async fn test_load_enabled_account_with_coins_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+    let accounts_map = accounts_to_map(accounts.clone());
+    fill_storage(storage.as_ref(), accounts).await.unwrap();
+
+    let error = storage.load_enabled_account_with_coins().await.expect_err(
+        "'AccountStorage::load_enabled_account_with_coins' should have failed since no account was enabled",
+    );
+    match error.into_inner() {
+        AccountStorageError::NoEnabledAccount => (),
+        other => panic!("Expected 'NoEnabledAccount' error, found: {}", other),
+    }
+
+    storage.enable_account(EnabledAccountId::Iguana).await.unwrap();
+
+    storage
+        .activate_coins(AccountId::Iguana, vec!["RICK".to_string(), "MORTY".to_string()])
+        .await
+        .unwrap();
+    storage
+        .activate_coins(HD_0_ACCOUNT, vec![
+            "MORTY".to_string(),
+            "QTUM".to_string(),
+            "KMD".to_string(),
+        ])
+        .await
+        .unwrap();
+
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: accounts_map.get(&AccountId::Iguana).unwrap().clone(),
+        coins: vec!["RICK".to_string(), "MORTY".to_string()].into_iter().collect(),
+    };
+    assert_eq!(actual, expected);
+
+    // Enable `HD{0}` account and load its activated coins.
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 0 })
+        .await
+        .unwrap();
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: accounts_map.get(&HD_0_ACCOUNT).unwrap().clone(),
+        coins: vec!["MORTY".to_string(), "QTUM".to_string(), "KMD".to_string()]
+            .into_iter()
+            .collect(),
+    };
+    assert_eq!(actual, expected);
+
+    // Deactivate all `HD{0}` account's coins.
+    storage
+        .deactivate_coins(HD_0_ACCOUNT, vec![
+            "MORTY".to_string(),
+            "QTUM".to_string(),
+            "KMD".to_string(),
+        ])
+        .await
+        .unwrap();
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: accounts_map.get(&HD_0_ACCOUNT).unwrap().clone(),
+        coins: BTreeSet::new(),
+    };
+    assert_eq!(actual, expected);
+}
+
+async fn test_load_accounts_with_enabled_flag_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+    let accounts_map = accounts_to_map(accounts.clone());
+
+    fill_storage(storage.as_ref(), accounts.clone()).await.unwrap();
+
+    let error = storage.load_accounts_with_enabled_flag().await.expect_err(
+        "'AccountStorage::load_accounts_with_enabled_flag' should have failed since no account was enabled",
+    );
+    match error.into_inner() {
+        AccountStorageError::NoEnabledAccount => (),
+        other => panic!("Expected 'NoEnabledAccount' error, found: {}", other),
+    }
+
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 0 })
+        .await
+        .unwrap();
+    let actual = storage.load_accounts_with_enabled_flag().await.unwrap();
+    let expected = tag_with_enabled_flag(accounts_map.clone(), HD_0_ACCOUNT);
+    assert_eq!(actual, expected);
+
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 1 })
+        .await
+        .unwrap();
+    let actual = storage.load_accounts_with_enabled_flag().await.unwrap();
+    let expected = tag_with_enabled_flag(accounts_map.clone(), HD_1_ACCOUNT);
+    assert_eq!(actual, expected);
+
+    // Try to re-enable the same `HD{1}` account.
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 1 })
+        .await
+        .unwrap();
+    let actual = storage.load_accounts_with_enabled_flag().await.unwrap();
+    let expected = tag_with_enabled_flag(accounts_map.clone(), HD_1_ACCOUNT);
+    assert_eq!(actual, expected);
+
+    storage.enable_account(EnabledAccountId::Iguana).await.unwrap();
+    let actual = storage.load_accounts_with_enabled_flag().await.unwrap();
+    let expected = tag_with_enabled_flag(accounts_map.clone(), AccountId::Iguana);
+    assert_eq!(actual, expected);
+}
+
+async fn test_delete_account_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+    let accounts_map = accounts_to_map(accounts.clone());
+
+    fill_storage(storage.as_ref(), accounts).await.unwrap();
+
+    let hw_id = AccountId::HW {
+        device_pubkey: HwPubkey::from("69a20008cea0c15ee483b5bbdff942752634aa07"),
+    };
+    storage.delete_account(hw_id.clone()).await.unwrap();
+    let actual_accounts = storage.load_accounts().await.unwrap();
+    let mut expected_accounts = accounts_map.clone();
+    expected_accounts.remove(&hw_id);
+    assert_eq!(actual_accounts, expected_accounts);
+
+    // Try to delete the same account twice.
+    let error = storage
+        .delete_account(hw_id)
+        .await
+        .expect_err("'AccountStorage::delete_account' should have failed due to unknown account");
+    match error.into_inner() {
+        AccountStorageError::NoSuchAccount(AccountId::HW { .. }) => (),
+        other => panic!("Expected 'NoSuchAccount' error, found: {}", other),
+    }
+
+    // Enable `HD{1}` account and try to remove `HD{0}` to check if `HD{1}` will stay enabled.
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 1 })
+        .await
+        .unwrap();
+    storage.delete_account(HD_0_ACCOUNT).await.unwrap();
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: accounts_map.get(&HD_1_ACCOUNT).unwrap().clone(),
+        coins: BTreeSet::new(),
+    };
+    assert_eq!(actual, expected);
+
+    // Delete `HD{1}` account, and then try to get an enabled account with coins.
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 1 })
+        .await
+        .unwrap();
+    storage.delete_account(HD_1_ACCOUNT).await.unwrap();
+    let error = storage
+        .load_enabled_account_with_coins()
+        .await
+        .expect_err("'AccountStorage::load_enabled_account_with_coins' should have failed since no enabled account");
+    match error.into_inner() {
+        AccountStorageError::NoEnabledAccount => (),
+        other => panic!("Expected 'NoEnabledAccount' error, found: {}", other),
+    }
+}
+
+async fn test_delete_account_clears_coins_impl() {
+    let ctx = mm_ctx_with_custom_db();
+    let storage = AccountStorageBuilder::new(&ctx).build().unwrap();
+    storage.init().await.unwrap();
+
+    let accounts = accounts_for_test();
+    let accounts_map = accounts_to_map(accounts.clone());
+
+    fill_storage(storage.as_ref(), accounts).await.unwrap();
+
+    // Activate coins, delete the account and re-activate it again to make sure that all associated coins were deleted.
+    storage
+        .activate_coins(AccountId::Iguana, vec!["RICK".to_string(), "MORTY".to_string()])
+        .await
+        .unwrap();
+    // Activate also coins for another account.
+    storage
+        .activate_coins(HD_0_ACCOUNT, vec!["RICK".to_string(), "KMD".to_string()])
+        .await
+        .unwrap();
+
+    storage.delete_account(AccountId::Iguana).await.unwrap();
+
+    let new_iguana = AccountInfo {
+        account_id: AccountId::Iguana,
+        name: "My iguana".to_string(),
+        description: "My description".to_string(),
+        balance_usd: BigDecimal::from(123),
+    };
+    storage.upload_account(new_iguana.clone()).await.unwrap();
+    storage.enable_account(EnabledAccountId::Iguana).await.unwrap();
+
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: new_iguana,
+        coins: BTreeSet::new(),
+    };
+    assert_eq!(actual, expected);
+
+    // Check if `HD{0}` coins haven't been cleared.
+    storage
+        .enable_account(EnabledAccountId::HD { account_idx: 0 })
+        .await
+        .unwrap();
+    let actual = storage.load_enabled_account_with_coins().await.unwrap();
+    let expected = AccountWithCoins {
+        account_info: accounts_map.get(&HD_0_ACCOUNT).unwrap().clone(),
+        coins: vec!["RICK".to_string(), "KMD".to_string()].into_iter().collect(),
+    };
+    assert_eq!(actual, expected);
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+mod native_tests {
+    use common::block_on;
+
+    #[test]
+    fn test_init_collection() { block_on(super::test_init_collection_impl()) }
+
+    #[test]
+    fn test_upload_account() { block_on(super::test_upload_account_impl()) }
+
+    #[test]
+    fn test_enable_account() { block_on(super::test_enable_account_impl()) }
+
+    #[test]
+    fn test_set_name_desc_balance() { block_on(super::test_set_name_desc_balance_impl()) }
+
+    #[test]
+    fn test_activate_deactivate_coins() { block_on(super::test_activate_deactivate_coins_impl()) }
+
+    #[test]
+    fn test_load_enabled_account_with_coins() { block_on(super::test_load_enabled_account_with_coins_impl()) }
+
+    #[test]
+    fn test_load_accounts_with_enabled_flag() { block_on(super::test_load_accounts_with_enabled_flag_impl()) }
+
+    #[test]
+    fn test_delete_account() { block_on(super::test_delete_account_impl()) }
+
+    #[test]
+    fn test_delete_account_clears_coins() { block_on(super::test_delete_account_clears_coins_impl()) }
+}
+
+#[cfg(target_arch = "wasm32")]
+mod wasm_tests {
+    use wasm_bindgen_test::*;
+
+    wasm_bindgen_test_configure!(run_in_browser);
+
+    #[wasm_bindgen_test]
+    async fn test_init_collection() { super::test_init_collection_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_upload_account() { super::test_upload_account_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_enable_account() { super::test_enable_account_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_set_name_desc_balance() { super::test_set_name_desc_balance_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_activate_deactivate_coins() { super::test_activate_deactivate_coins_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_load_enabled_account_with_coins() { super::test_load_enabled_account_with_coins_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_load_accounts_with_enabled_flag() { super::test_load_accounts_with_enabled_flag_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_delete_account() { super::test_delete_account_impl().await }
+
+    #[wasm_bindgen_test]
+    async fn test_delete_account_clears_coins() { super::test_delete_account_clears_coins_impl().await }
+}
diff --git a/mm2src/mm2_gui_storage/src/account/storage/mod.rs b/mm2src/mm2_gui_storage/src/account/storage/mod.rs
new file mode 100644
index 0000000000..a2a186d490
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/account/storage/mod.rs
@@ -0,0 +1,188 @@
+use crate::account::{AccountId, AccountInfo, AccountType, AccountWithCoins, AccountWithEnabledFlag, EnabledAccountId,
+                     EnabledAccountType, HwPubkey};
+use async_trait::async_trait;
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use std::collections::{BTreeMap, BTreeSet};
+use std::error::Error as StdError;
+
+#[cfg(any(test, target_arch = "wasm32"))]
+mod account_storage_tests;
+#[cfg(not(target_arch = "wasm32"))] mod sqlite_storage;
+#[cfg(target_arch = "wasm32")] mod wasm_storage;
+
+const DEFAULT_ACCOUNT_IDX: u32 = 0;
+const DEFAULT_DEVICE_PUB: HwPubkey = HwPubkey::const_default();
+
+pub(crate) type AccountStorageBoxed = Box<dyn AccountStorage>;
+pub type AccountStorageResult<T> = MmResult<T, AccountStorageError>;
+
+#[derive(Debug, Display)]
+pub enum AccountStorageError {
+    #[display(fmt = "No such account {:?}", _0)]
+    NoSuchAccount(AccountId),
+    #[display(fmt = "No enabled account yet")]
+    NoEnabledAccount,
+    #[display(fmt = "Account {:?} exists already", _0)]
+    AccountExistsAlready(AccountId),
+    #[display(fmt = "Error saving changes in accounts storage: {}", _0)]
+    ErrorSaving(String),
+    #[display(fmt = "Error loading account: {}", _0)]
+    ErrorLoading(String),
+    #[display(fmt = "Error deserializing an account: {}", _0)]
+    ErrorDeserializing(String),
+    #[display(fmt = "Error serializing an account: {}", _0)]
+    ErrorSerializing(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl StdError for AccountStorageError {}
+
+impl AccountStorageError {
+    pub(crate) fn unknown_account_in_enabled_table(account_id: AccountId) -> AccountStorageError {
+        let error = format!(
+            "'EnabledAccountTable' contains an account {:?} that is not in 'AccountTable'",
+            account_id
+        );
+        AccountStorageError::Internal(error)
+    }
+}
+
+impl AccountId {
+    /// Splits `AccountId` to the tuple.
+    ///
+    /// # Note
+    ///
+    // The method can return default values for `account_idx` and/or `device_pubkey`
+    // depending on `account_type`.
+    pub(crate) fn to_tuple(&self) -> (AccountType, u32, HwPubkey) {
+        match self {
+            AccountId::Iguana => (AccountType::Iguana, DEFAULT_ACCOUNT_IDX, DEFAULT_DEVICE_PUB),
+            AccountId::HD { account_idx } => (AccountType::HD, *account_idx, DEFAULT_DEVICE_PUB),
+            AccountId::HW { device_pubkey } => (AccountType::HW, DEFAULT_ACCOUNT_IDX, *device_pubkey),
+        }
+    }
+
+    /// Tries to construct `AccountId` from the tuple.
+    ///
+    /// # Note
+    ///
+    /// The function can expect default values for `account_idx` and/or `device_pubkey`
+    /// depending on `account_type`.
+    pub(crate) fn try_from_tuple(
+        account_type: AccountType,
+        account_idx: u32,
+        device_pubkey: HwPubkey,
+    ) -> AccountStorageResult<AccountId> {
+        match (account_type, account_idx) {
+            (AccountType::Iguana, DEFAULT_ACCOUNT_IDX) if device_pubkey == DEFAULT_DEVICE_PUB => Ok(AccountId::Iguana),
+            (AccountType::HD, account_idx) if device_pubkey == DEFAULT_DEVICE_PUB => Ok(AccountId::HD { account_idx }),
+            (AccountType::HW, DEFAULT_ACCOUNT_IDX) => Ok(AccountId::HW { device_pubkey }),
+            (_, _) => {
+                let error = format!(
+                    "An invalid AccountId tuple: {:?}/{:?}/{:?}",
+                    account_type, account_idx, device_pubkey
+                );
+                MmError::err(AccountStorageError::ErrorDeserializing(error))
+            },
+        }
+    }
+}
+
+impl EnabledAccountId {
+    /// # Note
+    ///
+    /// Returns a default `device_pubkey` always.
+    pub(crate) fn to_tuple(self) -> (EnabledAccountType, u32, HwPubkey) {
+        match self {
+            EnabledAccountId::Iguana => (EnabledAccountType::Iguana, DEFAULT_ACCOUNT_IDX, DEFAULT_DEVICE_PUB),
+            EnabledAccountId::HD { account_idx } => (EnabledAccountType::HD, account_idx, DEFAULT_DEVICE_PUB),
+        }
+    }
+
+    /// Tries to construct `EnabledAccountType` from the pair.
+    pub(crate) fn try_from_pair(
+        account_type: EnabledAccountType,
+        account_idx: u32,
+    ) -> AccountStorageResult<EnabledAccountId> {
+        match (account_type, account_idx) {
+            (EnabledAccountType::Iguana, DEFAULT_ACCOUNT_IDX) => Ok(EnabledAccountId::Iguana),
+            (EnabledAccountType::HD, account_idx) => Ok(EnabledAccountId::HD { account_idx }),
+            (_, _) => {
+                let error = format!("An invalid AccountId tuple: {:?}/{:?}", account_type, account_idx);
+                MmError::err(AccountStorageError::ErrorDeserializing(error))
+            },
+        }
+    }
+}
+
+/// `AccountStorageBoxed` builder.
+/// The implementation depends on the target architecture.
+pub(crate) struct AccountStorageBuilder<'a> {
+    ctx: &'a MmArc,
+}
+
+impl<'a> AccountStorageBuilder<'a> {
+    pub fn new(ctx: &'a MmArc) -> Self { AccountStorageBuilder { ctx } }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn build(self) -> AccountStorageResult<AccountStorageBoxed> {
+        sqlite_storage::SqliteAccountStorage::new(self.ctx).map(|storage| -> AccountStorageBoxed { Box::new(storage) })
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    pub fn build(self) -> AccountStorageResult<AccountStorageBoxed> {
+        Ok(Box::new(wasm_storage::WasmAccountStorage::new(self.ctx)))
+    }
+}
+
+/// An account storage interface.
+#[async_trait]
+pub(crate) trait AccountStorage: Send + Sync {
+    /// Initialize the storage.
+    async fn init(&self) -> AccountStorageResult<()>;
+
+    /// Loads activated coins of the given `account_id`.
+    async fn load_account_coins(&self, account_id: AccountId) -> AccountStorageResult<BTreeSet<String>>;
+
+    /// Loads accounts from the storage.
+    async fn load_accounts(&self) -> AccountStorageResult<BTreeMap<AccountId, AccountInfo>>;
+
+    /// Loads accounts from the storage and marks **only** one account as enabled.
+    async fn load_accounts_with_enabled_flag(
+        &self,
+    ) -> AccountStorageResult<BTreeMap<AccountId, AccountWithEnabledFlag>>;
+
+    /// Loads an enabled account ID, or returns an error if there is no enabled account yet.
+    async fn load_enabled_account_id(&self) -> AccountStorageResult<EnabledAccountId>;
+
+    /// Loads an enabled account with activated coins, or returns an error if there is no enabled account yet.
+    async fn load_enabled_account_with_coins(&self) -> AccountStorageResult<AccountWithCoins>;
+
+    /// Checks whether the given account exists in the storage and sets it as an enabled account.
+    async fn enable_account(&self, account_id: EnabledAccountId) -> AccountStorageResult<()>;
+
+    /// Checks whether the given account doesn't exist in the storage and uploads it.
+    async fn upload_account(&self, account: AccountInfo) -> AccountStorageResult<()>;
+
+    /// Checks whether the given account exists in the storage and deletes it.
+    async fn delete_account(&self, account_id: AccountId) -> AccountStorageResult<()>;
+
+    /// Sets the account name.
+    async fn set_name(&self, account_id: AccountId, name: String) -> AccountStorageResult<()>;
+
+    /// Sets the account description.
+    async fn set_description(&self, account_id: AccountId, description: String) -> AccountStorageResult<()>;
+
+    /// Sets the account balance.
+    async fn set_balance(&self, account_id: AccountId, balance_usd: BigDecimal) -> AccountStorageResult<()>;
+
+    /// Puts the given `tickers` coins to the account's activated coins in the storage.
+    async fn activate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()>;
+
+    /// Erases the given `tickers` coins from the account's activated coins in the storage.
+    async fn deactivate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()>;
+}
diff --git a/mm2src/mm2_gui_storage/src/account/storage/sqlite_storage.rs b/mm2src/mm2_gui_storage/src/account/storage/sqlite_storage.rs
new file mode 100644
index 0000000000..916854de63
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/account/storage/sqlite_storage.rs
@@ -0,0 +1,606 @@
+use crate::account::storage::{AccountStorage, AccountStorageError, AccountStorageResult};
+use crate::account::{AccountId, AccountInfo, AccountType, AccountWithCoins, AccountWithEnabledFlag, EnabledAccountId,
+                     EnabledAccountType, HwPubkey, MAX_ACCOUNT_DESCRIPTION_LENGTH, MAX_ACCOUNT_NAME_LENGTH,
+                     MAX_TICKER_LENGTH};
+use async_trait::async_trait;
+use common::some_or_return_ok_none;
+use db_common::foreign_columns;
+use db_common::sql_build::*;
+use db_common::sqlite::rusqlite::types::Type;
+use db_common::sqlite::rusqlite::{Connection, Error as SqlError, Result as SqlResult, Row};
+use db_common::sqlite::{is_constraint_error, SqliteConnShared};
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use std::collections::{BTreeMap, BTreeSet};
+use std::str::FromStr;
+use std::sync::{Arc, MutexGuard};
+
+const DEVICE_PUBKEY_MAX_LENGTH: usize = 20;
+const BALANCE_MAX_LENGTH: usize = 255;
+
+mod account_table {
+    /// The table name.
+    pub(super) const TABLE_NAME: &str = "gui_account";
+
+    // The following constants are the column names.
+    pub(super) const ACCOUNT_TYPE: &str = "account_type";
+    pub(super) const ACCOUNT_IDX: &str = "account_idx";
+    pub(super) const DEVICE_PUBKEY: &str = "device_pubkey";
+    pub(super) const NAME: &str = "name";
+    pub(super) const DESCRIPTION: &str = "description";
+    pub(super) const BALANCE_USD: &str = "balance_usd";
+
+    /// The table PRIMARY KEY name.
+    pub(super) const ACCOUNT_ID_PRIMARY_KEY: &str = "account_id_primary";
+}
+
+mod account_coins_table {
+    /// The table name.
+    pub(super) const TABLE_NAME: &str = "gui_account_coins";
+
+    // The following constants are the column names.
+    pub(super) const ACCOUNT_TYPE: &str = "account_type";
+    pub(super) const ACCOUNT_IDX: &str = "account_idx";
+    pub(super) const DEVICE_PUBKEY: &str = "device_pubkey";
+    pub(super) const COIN: &str = "coin";
+
+    /// The table UNIQUE constraint.
+    pub(super) const ACCOUNT_ID_COIN_CONSTRAINT: &str = "account_id_coin_constraint";
+}
+
+mod enabled_account_table {
+    /// The table name.
+    pub(super) const TABLE_NAME: &str = "gui_account_enabled";
+
+    // The following constants are the column names.
+    pub(super) const ACCOUNT_TYPE: &str = "account_type";
+    pub(super) const ACCOUNT_IDX: &str = "account_idx";
+    pub(super) const DEVICE_PUBKEY: &str = "device_pubkey";
+}
+
+impl From<SqlError> for AccountStorageError {
+    fn from(e: SqlError) -> Self {
+        let error = e.to_string();
+        match e {
+            SqlError::FromSqlConversionFailure(_, _, _)
+            | SqlError::IntegralValueOutOfRange(_, _)
+            | SqlError::InvalidColumnIndex(_)
+            | SqlError::InvalidColumnType(_, _, _) => AccountStorageError::ErrorDeserializing(error),
+            SqlError::Utf8Error(_) | SqlError::NulError(_) | SqlError::ToSqlConversionFailure(_) => {
+                AccountStorageError::ErrorSerializing(error)
+            },
+            _ => AccountStorageError::Internal(error),
+        }
+    }
+}
+
+impl AccountId {
+    /// An alternative to [`AccountId::to_tuple`] that returns SQL compatible types.
+    fn to_sql_tuple(&self) -> (i64, i64, String) {
+        let (account_type, account_idx, device_pubkey) = self.to_tuple();
+        (account_type as i64, account_idx as i64, device_pubkey.to_string())
+    }
+
+    /// An alternative to [`AccountId::try_from_tuple`] that takes SQL compatible types.
+    pub(crate) fn try_from_sql_tuple(
+        account_type: i64,
+        account_idx: u32,
+        device_pubkey: &str,
+    ) -> AccountStorageResult<AccountId> {
+        let account_type = AccountType::try_from(account_type)?;
+        let device_pubkey =
+            HwPubkey::from_str(device_pubkey).map_to_mm(|e| AccountStorageError::ErrorDeserializing(e.to_string()))?;
+        AccountId::try_from_tuple(account_type, account_idx, device_pubkey)
+    }
+}
+
+impl EnabledAccountId {
+    /// An alternative to [`EnabledAccountId::to_pair`] that returns SQL compatible types.
+    /// Please note `device_pubkey` is always default.
+    fn to_sql_tuple(self) -> (i64, i64, String) {
+        let (account_type, account_idx, device_pubkey) = self.to_tuple();
+        (account_type as i64, account_idx as i64, device_pubkey.to_string())
+    }
+
+    /// An alternative to [`EnabledAccountId::try_from_pair`] that takes SQL compatible types.
+    pub(crate) fn try_from_sql_pair(account_type: i64, account_idx: u32) -> AccountStorageResult<EnabledAccountId> {
+        let account_type = EnabledAccountType::try_from(account_type)?;
+        EnabledAccountId::try_from_pair(account_type, account_idx)
+    }
+}
+
+pub(crate) struct SqliteAccountStorage {
+    conn: SqliteConnShared,
+}
+
+impl SqliteAccountStorage {
+    pub(crate) fn new(ctx: &MmArc) -> AccountStorageResult<SqliteAccountStorage> {
+        let shared = ctx
+            .sqlite_connection
+            .as_option()
+            .or_mm_err(|| AccountStorageError::Internal("'MmCtx::sqlite_connection' is not initialized".to_owned()))?;
+        Ok(SqliteAccountStorage {
+            conn: Arc::clone(shared),
+        })
+    }
+
+    fn lock_conn_mutex(&self) -> AccountStorageResult<MutexGuard<Connection>> {
+        self.conn
+            .lock()
+            .map_to_mm(|e| AccountStorageError::Internal(format!("Error locking sqlite connection: {}", e)))
+    }
+
+    fn init_account_table(conn: &Connection) -> AccountStorageResult<()> {
+        let mut create_sql = SqlCreateTable::new(conn, account_table::TABLE_NAME);
+        create_sql
+            .if_not_exist()
+            .column(SqlColumn::new(account_table::ACCOUNT_TYPE, SqlType::Integer).not_null())
+            .column(SqlColumn::new(account_table::ACCOUNT_IDX, SqlType::Integer).not_null())
+            .column(SqlColumn::new(account_table::DEVICE_PUBKEY, SqlType::Varchar(DEVICE_PUBKEY_MAX_LENGTH)).not_null())
+            .column(SqlColumn::new(account_table::NAME, SqlType::Varchar(MAX_ACCOUNT_NAME_LENGTH)).not_null())
+            .column(SqlColumn::new(
+                account_table::DESCRIPTION,
+                SqlType::Varchar(MAX_ACCOUNT_DESCRIPTION_LENGTH),
+            ))
+            .column(SqlColumn::new(account_table::BALANCE_USD, SqlType::Varchar(BALANCE_MAX_LENGTH)).not_null())
+            .constraint(PrimaryKey::new(account_table::ACCOUNT_ID_PRIMARY_KEY, [
+                account_table::ACCOUNT_TYPE,
+                account_table::ACCOUNT_IDX,
+                account_table::DEVICE_PUBKEY,
+            ])?);
+        create_sql.create().map_to_mm(AccountStorageError::from)
+    }
+
+    fn init_account_coins_table(conn: &Connection) -> AccountStorageResult<()> {
+        let mut create_sql = SqlCreateTable::new(conn, account_coins_table::TABLE_NAME);
+        create_sql
+            .if_not_exist()
+            .column(SqlColumn::new(account_coins_table::ACCOUNT_TYPE, SqlType::Integer).not_null())
+            .column(SqlColumn::new(account_coins_table::ACCOUNT_IDX, SqlType::Integer).not_null())
+            .column(
+                SqlColumn::new(
+                    account_coins_table::DEVICE_PUBKEY,
+                    SqlType::Varchar(DEVICE_PUBKEY_MAX_LENGTH),
+                )
+                .not_null(),
+            )
+            .column(SqlColumn::new(account_coins_table::COIN, SqlType::Varchar(MAX_TICKER_LENGTH)).not_null())
+            .constraint(
+                ForeignKey::new(foreign_key::ParentTable(account_table::TABLE_NAME), foreign_columns![
+                    account_coins_table::ACCOUNT_TYPE => account_table::ACCOUNT_TYPE,
+                    account_coins_table::ACCOUNT_IDX => account_table::ACCOUNT_IDX,
+                    account_coins_table::DEVICE_PUBKEY => account_table::DEVICE_PUBKEY
+                ])?
+                // Delete all coins from `account_coins_table` if the corresponding `account_table` record has been deleted.
+                .on_event(foreign_key::Event::OnDelete, foreign_key::Action::Cascade),
+            )
+            .constraint(Unique::new(account_coins_table::ACCOUNT_ID_COIN_CONSTRAINT, [
+                account_coins_table::ACCOUNT_TYPE,
+                account_coins_table::ACCOUNT_IDX,
+                account_coins_table::DEVICE_PUBKEY,
+                account_coins_table::COIN,
+            ])?);
+        create_sql.create().map_to_mm(AccountStorageError::from)
+    }
+
+    fn init_enabled_account_table(conn: &Connection) -> AccountStorageResult<()> {
+        let mut create_sql = SqlCreateTable::new(conn, enabled_account_table::TABLE_NAME);
+        create_sql
+            .if_not_exist()
+            .column(SqlColumn::new(enabled_account_table::ACCOUNT_TYPE, SqlType::Integer).not_null())
+            .column(SqlColumn::new(enabled_account_table::ACCOUNT_IDX, SqlType::Integer).not_null())
+            // `device_pubkey` column is used to declare a foreign key that refers to the `account_table` primary key.
+            .column(
+                SqlColumn::new(
+                    enabled_account_table::DEVICE_PUBKEY,
+                    SqlType::Varchar(DEVICE_PUBKEY_MAX_LENGTH),
+                )
+                .not_null(),
+            )
+            .constraint(
+                ForeignKey::new(foreign_key::ParentTable(account_table::TABLE_NAME), foreign_columns![
+                    enabled_account_table::ACCOUNT_TYPE => account_table::ACCOUNT_TYPE,
+                    enabled_account_table::ACCOUNT_IDX => account_table::ACCOUNT_IDX,
+                    enabled_account_table::DEVICE_PUBKEY => account_table::DEVICE_PUBKEY,
+                ])?
+                // Delete an enabled account from `enabled_account_table` if the corresponding `account_table` record has been deleted.
+                .on_event(foreign_key::Event::OnDelete, foreign_key::Action::Cascade),
+            );
+        create_sql.create().map_to_mm(AccountStorageError::from)
+    }
+
+    /// Loads `AccountId` of an enabled account or returns an error if there is no enabled account yet.
+    fn load_enabled_account_id_or_err(conn: &Connection) -> AccountStorageResult<EnabledAccountId> {
+        let mut query = SqlQuery::select_from(conn, enabled_account_table::TABLE_NAME)?;
+        query
+            .field(enabled_account_table::ACCOUNT_TYPE)?
+            .field(enabled_account_table::ACCOUNT_IDX)?;
+        query
+            .query_single_row(enabled_account_id_from_row)?
+            .or_mm_err(|| AccountStorageError::NoEnabledAccount)
+    }
+
+    /// Loads the given `accoint_id` activated coins.
+    ///
+    /// # Note
+    ///
+    /// The function doesn't check if the account is present in `account_table`.
+    fn load_account_coins(conn: &Connection, account_id: &AccountId) -> AccountStorageResult<BTreeSet<String>> {
+        let mut query = SqlQuery::select_from(conn, account_coins_table::TABLE_NAME)?;
+
+        let (account_type, account_id, device_pubkey) = account_id.to_sql_tuple();
+        query
+            .field(account_coins_table::COIN)?
+            .and_where_eq(account_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_table::ACCOUNT_IDX, account_id)?
+            .and_where_eq_param(account_table::DEVICE_PUBKEY, device_pubkey)?;
+        let coins = query.query(|row| row.get::<_, String>(0))?.into_iter().collect();
+        Ok(coins)
+    }
+
+    /// Loads `AccountWithCoins`.
+    /// This method takes `conn` to ensure data coherence.
+    fn load_account_with_coins(
+        conn: &Connection,
+        account_id: &AccountId,
+    ) -> AccountStorageResult<Option<AccountWithCoins>> {
+        let account_info = some_or_return_ok_none!(Self::load_account(conn, account_id)?);
+
+        let coins = Self::load_account_coins(conn, account_id)?;
+        Ok(Some(AccountWithCoins { account_info, coins }))
+    }
+
+    /// Tries to load an account info.
+    /// This method takes `conn` to ensure data coherence.
+    fn load_account(conn: &Connection, account_id: &AccountId) -> AccountStorageResult<Option<AccountInfo>> {
+        let mut query = SqlQuery::select_from(conn, account_table::TABLE_NAME)?;
+        query
+            .field(account_table::ACCOUNT_TYPE)?
+            .field(account_table::ACCOUNT_IDX)?
+            .field(account_table::DEVICE_PUBKEY)?
+            .field(account_table::NAME)?
+            .field(account_table::DESCRIPTION)?
+            .field(account_table::BALANCE_USD)?;
+
+        let (account_type, account_id, device_pubkey) = account_id.to_sql_tuple();
+        query
+            .and_where_eq(account_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_table::ACCOUNT_IDX, account_id)?
+            .and_where_eq_param(account_table::DEVICE_PUBKEY, device_pubkey)?;
+        query
+            .query_single_row(account_from_row)
+            .map_to_mm(AccountStorageError::from)
+    }
+
+    fn load_accounts(conn: &Connection) -> AccountStorageResult<BTreeMap<AccountId, AccountInfo>> {
+        let mut query = SqlQuery::select_from(conn, account_table::TABLE_NAME)?;
+        query
+            .field(account_table::ACCOUNT_TYPE)?
+            .field(account_table::ACCOUNT_IDX)?
+            .field(account_table::DEVICE_PUBKEY)?
+            .field(account_table::NAME)?
+            .field(account_table::DESCRIPTION)?
+            .field(account_table::BALANCE_USD)?;
+        let accounts = query
+            .query(account_from_row)?
+            .into_iter()
+            .map(|account| (account.account_id.clone(), account))
+            .collect();
+        Ok(accounts)
+    }
+
+    fn account_exists(conn: &Connection, account_id: &AccountId) -> AccountStorageResult<bool> {
+        let mut query = SqlQuery::select_from(conn, account_table::TABLE_NAME)?;
+        query.count(account_table::NAME)?;
+
+        let (account_type, account_idx, device_pubkey) = account_id.to_sql_tuple();
+        query
+            .and_where_eq(account_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_table::ACCOUNT_IDX, account_idx)?
+            .and_where_eq_param(account_table::DEVICE_PUBKEY, device_pubkey)?;
+
+        let accounts = query
+            .query_single_row(count_from_row)?
+            .or_mm_err(|| AccountStorageError::Internal("'count' should have returned one row exactly".to_string()))?;
+
+        Ok(accounts > 0)
+    }
+
+    fn upload_account(conn: &Connection, account: AccountInfo) -> AccountStorageResult<()> {
+        let mut sql_insert = SqlInsert::new(conn, account_table::TABLE_NAME);
+
+        let (account_type, account_idx, device_pubkey) = account.account_id.to_sql_tuple();
+        sql_insert
+            .column(account_table::ACCOUNT_TYPE, account_type)?
+            .column(account_table::ACCOUNT_IDX, account_idx)?
+            .column_param(account_table::DEVICE_PUBKEY, device_pubkey)?
+            .column_param(account_table::NAME, account.name)?
+            .column_param(account_table::DESCRIPTION, account.description)?
+            .column_param(account_table::BALANCE_USD, account.balance_usd.to_string())?;
+
+        // A constraint error occurs if there is an account with the same primary key (`account_id`).
+        handle_constraint_error(sql_insert.insert(), || {
+            AccountStorageError::AccountExistsAlready(account.account_id)
+        })?;
+        Ok(())
+    }
+
+    fn delete_account(conn: &Connection, account_id: AccountId) -> AccountStorageResult<()> {
+        let (account_type, account_idx, device_pubkey) = account_id.to_sql_tuple();
+
+        // Remove the account info.
+        let mut sql_delete_account = SqlDelete::new(conn, account_table::TABLE_NAME)?;
+        sql_delete_account
+            .and_where_eq(account_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_table::ACCOUNT_IDX, account_idx)?
+            .and_where_eq_param(account_table::DEVICE_PUBKEY, device_pubkey)?;
+
+        let deleted = sql_delete_account.delete()?;
+        // The number of deleted accounts is 0 if only there is no account with the given `account_id`.
+        if deleted == 0 {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+
+        Ok(())
+    }
+
+    /// Updates the given `account_id` account by applying the `update_cb` callback to an `SqlUpdate` SQL builder.
+    fn update_account<F>(conn: &Connection, account_id: AccountId, update_cb: F) -> AccountStorageResult<()>
+    where
+        F: FnOnce(&mut SqlUpdate) -> SqlResult<()>,
+    {
+        let mut sql_update = SqlUpdate::new(conn, account_table::TABLE_NAME)?;
+        update_cb(&mut sql_update)?;
+
+        let (account_type, account_idx, device_pubkey) = account_id.to_sql_tuple();
+        sql_update
+            .and_where_eq(account_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_table::ACCOUNT_IDX, account_idx)?
+            .and_where_eq_param(account_table::DEVICE_PUBKEY, device_pubkey)?;
+
+        let updated = sql_update.update()?;
+        // The number of updated accounts is 0 if only there is no account with the given `account_id`.
+        if updated == 0 {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl AccountStorage for SqliteAccountStorage {
+    async fn init(&self) -> AccountStorageResult<()> {
+        let mut conn = self.lock_conn_mutex()?;
+        let transaction = conn.transaction()?;
+
+        SqliteAccountStorage::init_account_table(&transaction)?;
+        SqliteAccountStorage::init_account_coins_table(&transaction)?;
+        SqliteAccountStorage::init_enabled_account_table(&transaction)?;
+
+        transaction.commit()?;
+        Ok(())
+    }
+
+    async fn load_account_coins(&self, account_id: AccountId) -> AccountStorageResult<BTreeSet<String>> {
+        let conn = self.lock_conn_mutex()?;
+        let coins = Self::load_account_coins(&conn, &account_id)?;
+
+        // Check if the account is present in `account_table` if **only** there are no activated coins.
+        // Otherwise we're sure that the account exists.
+        if coins.is_empty() && !Self::account_exists(&conn, &account_id)? {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+        Ok(coins)
+    }
+
+    async fn load_accounts(&self) -> AccountStorageResult<BTreeMap<AccountId, AccountInfo>> {
+        let conn = self.lock_conn_mutex()?;
+        Self::load_accounts(&conn)
+    }
+
+    async fn load_accounts_with_enabled_flag(
+        &self,
+    ) -> AccountStorageResult<BTreeMap<AccountId, AccountWithEnabledFlag>> {
+        let conn = self.lock_conn_mutex()?;
+        let enabled_account_id = AccountId::from(Self::load_enabled_account_id_or_err(&conn)?);
+
+        let mut found_enabled = false;
+        let accounts = Self::load_accounts(&conn)?
+            .into_iter()
+            .map(|(account_id, account_info)| {
+                let enabled = account_id == enabled_account_id;
+                found_enabled |= enabled;
+                Ok((account_id, AccountWithEnabledFlag { account_info, enabled }))
+            })
+            .collect::<AccountStorageResult<BTreeMap<_, _>>>()?;
+
+        // If `AccountStorage::load_enabled_account_id_or_err` returns an `AccountId`,
+        // then corresponding account must be in `AccountTable`.
+        if !found_enabled {
+            return MmError::err(AccountStorageError::unknown_account_in_enabled_table(
+                enabled_account_id,
+            ));
+        }
+        Ok(accounts)
+    }
+
+    async fn load_enabled_account_id(&self) -> AccountStorageResult<EnabledAccountId> {
+        let conn = self.lock_conn_mutex()?;
+        Self::load_enabled_account_id_or_err(&conn)
+    }
+
+    async fn load_enabled_account_with_coins(&self) -> AccountStorageResult<AccountWithCoins> {
+        let conn = self.lock_conn_mutex()?;
+        let account_id = AccountId::from(Self::load_enabled_account_id_or_err(&conn)?);
+
+        Self::load_account_with_coins(&conn, &account_id)?
+            .or_mm_err(|| AccountStorageError::unknown_account_in_enabled_table(account_id))
+    }
+
+    async fn enable_account(&self, enabled_account_id: EnabledAccountId) -> AccountStorageResult<()> {
+        let mut conn = self.lock_conn_mutex()?;
+        let transaction = conn.transaction()?;
+
+        // Remove the previous enabled account by clearing the table.
+        SqlDelete::new(&transaction, enabled_account_table::TABLE_NAME)?.delete()?;
+
+        let mut sql_insert = SqlInsert::new(&transaction, enabled_account_table::TABLE_NAME);
+
+        let (account_type, account_idx, _device_pubkey) = enabled_account_id.to_sql_tuple();
+        sql_insert
+            .column(enabled_account_table::ACCOUNT_TYPE, account_type)?
+            .column(enabled_account_table::ACCOUNT_IDX, account_idx)?
+            .column_param(enabled_account_table::DEVICE_PUBKEY, _device_pubkey)?;
+
+        // A constraint error occurs if there is no account in `account_table` with the given `account_id`.
+        let inserted = handle_constraint_error(sql_insert.insert(), || {
+            AccountStorageError::NoSuchAccount(AccountId::from(enabled_account_id))
+        })?;
+        // The number of inserted accounts is expected to be '1'.
+        if inserted != 1 {
+            let error = format!("Expected exactly '1' inserted account, found '{}'", inserted);
+            return MmError::err(AccountStorageError::Internal(error));
+        }
+
+        transaction.commit()?;
+        Ok(())
+    }
+
+    async fn upload_account(&self, account: AccountInfo) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+        Self::upload_account(&conn, account)
+    }
+
+    async fn delete_account(&self, account_id: AccountId) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+        Self::delete_account(&conn, account_id)
+    }
+
+    async fn set_name(&self, account_id: AccountId, name: String) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+
+        Self::update_account(&conn, account_id, |sql_update| {
+            sql_update.set_param(account_table::NAME, name)?;
+            Ok(())
+        })
+    }
+
+    async fn set_description(&self, account_id: AccountId, description: String) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+
+        Self::update_account(&conn, account_id, |sql_update| {
+            sql_update.set_param(account_table::DESCRIPTION, description)?;
+            Ok(())
+        })
+    }
+
+    async fn set_balance(&self, account_id: AccountId, balance_usd: BigDecimal) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+
+        Self::update_account(&conn, account_id, |sql_update| {
+            sql_update.set_param(account_table::BALANCE_USD, balance_usd.to_string())?;
+            Ok(())
+        })
+    }
+
+    async fn activate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()> {
+        let mut conn = self.lock_conn_mutex()?;
+        let transaction = conn.transaction()?;
+
+        for ticker in tickers {
+            let mut sql_insert = SqlInsert::new(&transaction, account_coins_table::TABLE_NAME);
+
+            let (account_type, account_idx, device_pubkey) = account_id.to_sql_tuple();
+            sql_insert
+                .or_ignore()
+                .column(account_coins_table::ACCOUNT_TYPE, account_type)?
+                .column(account_coins_table::ACCOUNT_IDX, account_idx)?
+                .column_param(account_coins_table::DEVICE_PUBKEY, device_pubkey)?
+                .column_param(account_coins_table::COIN, ticker)?;
+
+            // A constraint error occurs if **only** there is no account in `account_table` with the given `account_id`.
+            // If there is the same coin for the given `account_id` already, then the insertion will be ignored.
+            handle_constraint_error(sql_insert.insert(), || {
+                AccountStorageError::NoSuchAccount(account_id.clone())
+            })?;
+        }
+
+        transaction.commit()?;
+        Ok(())
+    }
+
+    async fn deactivate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()> {
+        let conn = self.lock_conn_mutex()?;
+
+        let mut sql_delete = SqlDelete::new(&conn, account_coins_table::TABLE_NAME)?;
+
+        let (account_type, account_idx, device_pubkey) = account_id.to_sql_tuple();
+        sql_delete
+            .and_where_eq(account_coins_table::ACCOUNT_TYPE, account_type)?
+            .and_where_eq(account_coins_table::ACCOUNT_IDX, account_idx)?
+            .and_where_eq_param(account_coins_table::DEVICE_PUBKEY, device_pubkey)?
+            .and_where_in_params(account_coins_table::COIN, tickers)?;
+
+        let deleted = sql_delete.delete()?;
+        if deleted > 0 {
+            // We're sure that the account exists since there were coins associated with it.
+            return Ok(());
+        }
+
+        // Check if the account exists.
+        if Self::account_exists(&conn, &account_id)? {
+            Ok(())
+        } else {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+    }
+}
+
+fn account_id_from_row(row: &Row<'_>) -> Result<AccountId, SqlError> {
+    let account_type: i64 = row.get(0)?;
+    let account_idx: u32 = row.get(1)?;
+    let device_pubkey: String = row.get(2)?;
+    AccountId::try_from_sql_tuple(account_type, account_idx, &device_pubkey)
+        .map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))
+}
+
+fn enabled_account_id_from_row(row: &Row<'_>) -> Result<EnabledAccountId, SqlError> {
+    let account_type: i64 = row.get(0)?;
+    let account_idx: u32 = row.get(1)?;
+    EnabledAccountId::try_from_sql_pair(account_type, account_idx)
+        .map_err(|e| SqlError::FromSqlConversionFailure(0, Type::Text, Box::new(e)))
+}
+
+fn account_from_row(row: &Row<'_>) -> Result<AccountInfo, SqlError> {
+    let account_id = account_id_from_row(row)?;
+    let name = row.get(3)?;
+    let description = row.get(4)?;
+    let balance_usd = bigdecimal_from_row(row, 5)?;
+    Ok(AccountInfo {
+        account_id,
+        name,
+        description,
+        balance_usd,
+    })
+}
+
+fn count_from_row(row: &Row<'_>) -> Result<i64, SqlError> { row.get(0) }
+
+fn bigdecimal_from_row(row: &Row<'_>, idx: usize) -> Result<BigDecimal, SqlError> {
+    let decimal: String = row.get(idx)?;
+    BigDecimal::from_str(&decimal).map_err(|e| SqlError::FromSqlConversionFailure(idx, Type::Text, Box::new(e)))
+}
+
+fn handle_constraint_error<T, F>(result: SqlResult<T>, on_constraint_error: F) -> AccountStorageResult<T>
+where
+    F: FnOnce() -> AccountStorageError,
+{
+    result.map_to_mm(|e| {
+        if is_constraint_error(&e) {
+            on_constraint_error()
+        } else {
+            AccountStorageError::from(e)
+        }
+    })
+}
diff --git a/mm2src/mm2_gui_storage/src/account/storage/wasm_storage.rs b/mm2src/mm2_gui_storage/src/account/storage/wasm_storage.rs
new file mode 100644
index 0000000000..8f2d97e9f0
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/account/storage/wasm_storage.rs
@@ -0,0 +1,487 @@
+use crate::account::storage::{AccountStorage, AccountStorageError, AccountStorageResult};
+use crate::account::{AccountId, AccountInfo, AccountType, AccountWithCoins, AccountWithEnabledFlag, EnabledAccountId,
+                     EnabledAccountType, HwPubkey};
+use async_trait::async_trait;
+use mm2_core::mm_ctx::MmArc;
+use mm2_db::indexed_db::{ConstructibleDb, DbIdentifier, DbInstance, DbLocked, DbTransaction, DbTransactionError,
+                         DbUpgrader, IndexedDb, IndexedDbBuilder, InitDbError, InitDbResult, MultiIndex,
+                         OnUpgradeResult, SharedDb, TableSignature};
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, BTreeSet};
+
+const DB_NAME: &str = "gui_account_storage";
+const DB_VERSION: u32 = 1;
+
+type AccountDbLocked<'a> = DbLocked<'a, AccountDb>;
+
+impl From<DbTransactionError> for AccountStorageError {
+    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 => AccountStorageError::Internal(desc),
+            DbTransactionError::ErrorDeserializingItem(_) => AccountStorageError::ErrorDeserializing(desc),
+            DbTransactionError::ErrorSerializingItem(_) => AccountStorageError::ErrorSerializing(desc),
+            DbTransactionError::ErrorGettingItems(_) | DbTransactionError::ErrorCountingItems(_) => {
+                AccountStorageError::ErrorLoading(desc)
+            },
+            DbTransactionError::ErrorUploadingItem(_) | DbTransactionError::ErrorDeletingItems(_) => {
+                AccountStorageError::ErrorSaving(desc)
+            },
+        }
+    }
+}
+
+impl From<InitDbError> for AccountStorageError {
+    fn from(e: InitDbError) -> Self { AccountStorageError::Internal(e.to_string()) }
+}
+
+impl AccountId {
+    fn try_to_enabled(&self) -> Option<EnabledAccountId> {
+        match self {
+            AccountId::Iguana => Some(EnabledAccountId::Iguana),
+            AccountId::HD { account_idx } => Some(EnabledAccountId::HD {
+                account_idx: *account_idx,
+            }),
+            AccountId::HW { .. } => None,
+        }
+    }
+}
+
+pub(crate) struct WasmAccountStorage {
+    account_db: SharedDb<AccountDb>,
+}
+
+impl WasmAccountStorage {
+    pub fn new(ctx: &MmArc) -> Self {
+        WasmAccountStorage {
+            account_db: ConstructibleDb::new_shared_db(ctx).into_shared(),
+        }
+    }
+
+    async fn lock_db_mutex(&self) -> AccountStorageResult<AccountDbLocked<'_>> {
+        self.account_db
+            .get_or_initialize()
+            .await
+            .mm_err(AccountStorageError::from)
+    }
+
+    /// Loads accounts sorted by `AccountId`.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn load_accounts(
+        db_transaction: &DbTransaction<'_>,
+    ) -> AccountStorageResult<BTreeMap<AccountId, AccountInfo>> {
+        let table = db_transaction.table::<AccountTable>().await?;
+        table
+            .get_all_items()
+            .await?
+            .into_iter()
+            .map(|(_item_id, account)| {
+                let account_info = AccountInfo::try_from(account)?;
+                Ok((account_info.account_id.clone(), account_info))
+            })
+            .collect()
+    }
+
+    /// Loads `AccountId` of an enabled account.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn load_enabled_account_id(
+        db_transaction: &DbTransaction<'_>,
+    ) -> AccountStorageResult<Option<EnabledAccountId>> {
+        let enabled_table = db_transaction.table::<EnabledAccountTable>().await?;
+        let enabled_accounts = enabled_table.get_all_items().await?;
+        if enabled_accounts.len() > 1 {
+            let error = format!("Expected only one enabled account, found {}", enabled_accounts.len());
+            return MmError::err(AccountStorageError::Internal(error));
+        }
+        match enabled_accounts.into_iter().next() {
+            Some((_item_id, enabled_account)) => EnabledAccountId::try_from(enabled_account).map(Some),
+            None => Ok(None),
+        }
+    }
+
+    /// Loads `AccountId` of an enabled account or returns an error if there is no enabled account yet.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn load_enabled_account_id_or_err(
+        db_transaction: &DbTransaction<'_>,
+    ) -> AccountStorageResult<EnabledAccountId> {
+        let enabled_acc_id = Self::load_enabled_account_id(db_transaction)
+            .await?
+            .or_mm_err(|| AccountStorageError::NoEnabledAccount)?;
+        Ok(enabled_acc_id)
+    }
+
+    /// Loads `AccountWithCoins`.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn load_account_with_coins(
+        db_transaction: &DbTransaction<'_>,
+        account_id: &AccountId,
+    ) -> AccountStorageResult<Option<AccountWithCoins>> {
+        let table = db_transaction.table::<AccountTable>().await?;
+
+        let index_keys = AccountTable::account_id_to_index(account_id)?;
+        table
+            .get_item_by_unique_multi_index(index_keys)
+            .await?
+            .map(|(_item_id, account)| AccountWithCoins::try_from(account))
+            .transpose()
+    }
+
+    /// Checks whether an account with the given `account_id` exists.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn account_exists(db_transaction: &DbTransaction<'_>, account_id: &AccountId) -> AccountStorageResult<bool> {
+        let table = db_transaction.table::<AccountTable>().await?;
+
+        let index_keys = AccountTable::account_id_to_index(account_id)?;
+        let count = table.count_by_multi_index(index_keys).await?;
+        Ok(count > 0)
+    }
+
+    /// Disable the given account if it's enabled.
+    /// This method takes `db_transaction` to ensure data coherence.
+    async fn disable_account_if_enabled(
+        db_transaction: &DbTransaction<'_>,
+        enabled_account_id: EnabledAccountId,
+    ) -> AccountStorageResult<()> {
+        match Self::load_enabled_account_id(&db_transaction).await? {
+            // If there is an enabled account **and** its ID is the same as `enabled_account_id`.
+            Some(actual_enabled) if actual_enabled == enabled_account_id => (),
+            _ => return Ok(()),
+        }
+
+        let table = db_transaction.table::<EnabledAccountTable>().await?;
+        // Remove the account by clearing the table.
+        table.clear().await?;
+        Ok(())
+    }
+
+    /// Loads an account by `AccountId`, applies the given `f` function to it,
+    /// and uploads changes to the storage.
+    async fn update_account<F>(&self, account_id: AccountId, f: F) -> AccountStorageResult<()>
+    where
+        F: FnOnce(&mut AccountTable),
+    {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+        let table = transaction.table::<AccountTable>().await?;
+
+        let index_keys = AccountTable::account_id_to_index(&account_id)?;
+        let (item_id, mut account) = table
+            .get_item_by_unique_multi_index(index_keys)
+            .await?
+            .or_mm_err(|| AccountStorageError::NoSuchAccount(account_id))?;
+        f(&mut account);
+        table.replace_item(item_id, &account).await?;
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl AccountStorage for WasmAccountStorage {
+    /// [`WasmAccountStorage::lock_db_mutex`] initializes the database on the first call.
+    async fn init(&self) -> AccountStorageResult<()> { self.lock_db_mutex().await.map(|_locked_db| ()) }
+
+    async fn load_account_coins(&self, account_id: AccountId) -> AccountStorageResult<BTreeSet<String>> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        let account = Self::load_account_with_coins(&transaction, &account_id)
+            .await?
+            .or_mm_err(|| AccountStorageError::NoSuchAccount(account_id))?;
+        Ok(account.coins)
+    }
+
+    async fn load_accounts(&self) -> AccountStorageResult<BTreeMap<AccountId, AccountInfo>> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        Self::load_accounts(&transaction).await
+    }
+
+    async fn load_accounts_with_enabled_flag(
+        &self,
+    ) -> AccountStorageResult<BTreeMap<AccountId, AccountWithEnabledFlag>> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        let enabled_account_id = AccountId::from(Self::load_enabled_account_id_or_err(&transaction).await?);
+
+        let mut found_enabled = false;
+        let accounts = Self::load_accounts(&transaction)
+            .await?
+            .into_iter()
+            .map(|(account_id, account_info)| {
+                let enabled = account_id == enabled_account_id;
+                found_enabled |= enabled;
+                Ok((account_id, AccountWithEnabledFlag { account_info, enabled }))
+            })
+            .collect::<AccountStorageResult<BTreeMap<_, _>>>()?;
+
+        // If `AccountStorage::load_enabled_account_id` returns an `AccountId`,
+        // then corresponding account must be in `AccountTable`.
+        if !found_enabled {
+            return MmError::err(AccountStorageError::unknown_account_in_enabled_table(
+                enabled_account_id,
+            ));
+        }
+        Ok(accounts)
+    }
+
+    async fn load_enabled_account_id(&self) -> AccountStorageResult<EnabledAccountId> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+        Self::load_enabled_account_id_or_err(&transaction).await
+    }
+
+    async fn load_enabled_account_with_coins(&self) -> AccountStorageResult<AccountWithCoins> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        let account_id = AccountId::from(Self::load_enabled_account_id_or_err(&transaction).await?);
+
+        Self::load_account_with_coins(&transaction, &account_id)
+            .await?
+            .or_mm_err(|| AccountStorageError::unknown_account_in_enabled_table(account_id))
+    }
+
+    async fn enable_account(&self, enabled_account_id: EnabledAccountId) -> AccountStorageResult<()> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        let account_id = AccountId::from(enabled_account_id);
+
+        // First, check if the account exists.
+        if !Self::account_exists(&transaction, &account_id).await? {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+
+        let table = transaction.table::<EnabledAccountTable>().await?;
+        // Remove the previous enabled account by clearing the table.
+        table.clear().await?;
+
+        table.add_item(&EnabledAccountTable::from(enabled_account_id)).await?;
+        Ok(())
+    }
+
+    async fn upload_account(&self, account_info: AccountInfo) -> AccountStorageResult<()> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        // First, check if the account doesn't exist.
+        if Self::account_exists(&transaction, &account_info.account_id).await? {
+            return MmError::err(AccountStorageError::AccountExistsAlready(account_info.account_id));
+        }
+
+        let table = transaction.table::<AccountTable>().await?;
+        table.add_item(&AccountTable::from(account_info)).await?;
+        Ok(())
+    }
+
+    async fn delete_account(&self, account_id: AccountId) -> AccountStorageResult<()> {
+        let locked_db = self.lock_db_mutex().await?;
+        let transaction = locked_db.inner.transaction().await?;
+
+        // First, check if the account exists already.
+        if !Self::account_exists(&transaction, &account_id).await? {
+            return MmError::err(AccountStorageError::NoSuchAccount(account_id));
+        }
+
+        // Check if the account can be enabled.
+        if let Some(enabled_account_id) = account_id.try_to_enabled() {
+            Self::disable_account_if_enabled(&transaction, enabled_account_id).await?;
+        }
+
+        // Remove the account info.
+        let table = transaction.table::<AccountTable>().await?;
+        let index_keys = AccountTable::account_id_to_index(&account_id)?;
+        table.delete_item_by_unique_multi_index(index_keys).await?;
+        Ok(())
+    }
+
+    async fn set_name(&self, account_id: AccountId, name: String) -> AccountStorageResult<()> {
+        self.update_account(account_id, |account| account.name = name).await
+    }
+
+    async fn set_description(&self, account_id: AccountId, description: String) -> AccountStorageResult<()> {
+        self.update_account(account_id, |account| account.description = description)
+            .await
+    }
+
+    async fn set_balance(&self, account_id: AccountId, balance_usd: BigDecimal) -> AccountStorageResult<()> {
+        self.update_account(account_id, |account| account.balance_usd = balance_usd)
+            .await
+    }
+
+    async fn activate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()> {
+        self.update_account(account_id, |account| account.activated_coins.extend(tickers))
+            .await
+    }
+
+    async fn deactivate_coins(&self, account_id: AccountId, tickers: Vec<String>) -> AccountStorageResult<()> {
+        self.update_account(account_id, |account| {
+            for ticker in tickers.iter() {
+                account.activated_coins.remove(ticker);
+            }
+        })
+        .await
+    }
+}
+
+struct AccountDb {
+    inner: IndexedDb,
+}
+
+#[async_trait]
+impl DbInstance for AccountDb {
+    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::<AccountTable>()
+            .with_table::<EnabledAccountTable>()
+            .build()
+            .await?;
+        Ok(AccountDb { inner })
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+struct AccountTable {
+    account_type: AccountType,
+    /// `None` if [`AccountTable::account_type`] is [`AccountType::Iguana`] or [`AccountType::HW`].
+    account_idx: u32,
+    /// `None` if [`AccountTable::account_type`] is [`AccountType::Iguana`] or [`AccountType::HD`].
+    device_pubkey: HwPubkey,
+    name: String,
+    description: String,
+    balance_usd: BigDecimal,
+    activated_coins: BTreeSet<String>,
+}
+
+impl AccountTable {
+    /// An **unique** index that consists of the following properties:
+    /// * account_type
+    /// * account_idx
+    /// * device_pubkey
+    const ACCOUNT_ID_INDEX: &'static str = "account_id";
+
+    fn account_id_to_index(account_id: &AccountId) -> AccountStorageResult<MultiIndex> {
+        let (account_type, account_idx, device_pubkey) = account_id.to_tuple();
+
+        let multi_index = MultiIndex::new(AccountTable::ACCOUNT_ID_INDEX)
+            .with_value(account_type)?
+            .with_value(account_idx)?
+            .with_value(device_pubkey)?;
+        Ok(multi_index)
+    }
+}
+
+impl TableSignature for AccountTable {
+    fn table_name() -> &'static str { "gui_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(
+                    AccountTable::ACCOUNT_ID_INDEX,
+                    &["account_type", "account_idx", "device_pubkey"],
+                    true,
+                )?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
+
+impl From<AccountInfo> for AccountTable {
+    fn from(orig: AccountInfo) -> Self {
+        let (account_type, account_idx, device_pubkey) = orig.account_id.to_tuple();
+        AccountTable {
+            account_type,
+            account_idx,
+            device_pubkey,
+            name: orig.name,
+            description: orig.description,
+            balance_usd: orig.balance_usd,
+            activated_coins: BTreeSet::new(),
+        }
+    }
+}
+
+impl TryFrom<AccountTable> for AccountInfo {
+    type Error = MmError<AccountStorageError>;
+
+    fn try_from(value: AccountTable) -> Result<Self, Self::Error> {
+        Ok(AccountInfo {
+            account_id: AccountId::try_from_tuple(value.account_type, value.account_idx, value.device_pubkey)?,
+            name: value.name,
+            description: value.description,
+            balance_usd: value.balance_usd,
+        })
+    }
+}
+
+impl TryFrom<AccountTable> for AccountWithCoins {
+    type Error = MmError<AccountStorageError>;
+
+    fn try_from(value: AccountTable) -> Result<Self, Self::Error> {
+        let coins = value.activated_coins.clone();
+        Ok(AccountWithCoins {
+            account_info: AccountInfo::try_from(value)?,
+            coins,
+        })
+    }
+}
+
+/// The table consists of one item that points to the enabled account,
+/// or the table is empty.
+#[derive(Deserialize, Serialize)]
+struct EnabledAccountTable {
+    account_type: EnabledAccountType,
+    /// `None` if [`EnabledAccountTable::account_type`] is [`EnabledAccountTable::Iguana`].
+    account_idx: u32,
+}
+
+impl From<EnabledAccountId> for EnabledAccountTable {
+    fn from(account_id: EnabledAccountId) -> Self {
+        let (account_type, account_idx, _device_pubkey) = account_id.to_tuple();
+        EnabledAccountTable {
+            account_type,
+            account_idx,
+        }
+    }
+}
+
+impl TryFrom<EnabledAccountTable> for EnabledAccountId {
+    type Error = MmError<AccountStorageError>;
+
+    fn try_from(value: EnabledAccountTable) -> Result<Self, Self::Error> {
+        EnabledAccountId::try_from_pair(value.account_type, value.account_idx)
+    }
+}
+
+impl TableSignature for EnabledAccountTable {
+    fn table_name() -> &'static str { "gui_enabled_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())?;
+            },
+            _ => (),
+        }
+        Ok(())
+    }
+}
diff --git a/mm2src/mm2_gui_storage/src/context.rs b/mm2src/mm2_gui_storage/src/context.rs
new file mode 100644
index 0000000000..4a15f48541
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/context.rs
@@ -0,0 +1,24 @@
+use crate::account::storage::{AccountStorage, AccountStorageBoxed, AccountStorageBuilder, AccountStorageResult};
+use mm2_core::mm_ctx::{from_ctx, MmArc};
+use std::sync::Arc;
+
+pub(crate) struct AccountContext {
+    storage: AccountStorageBoxed,
+}
+
+impl AccountContext {
+    /// Obtains a reference to this crate context, creating it if necessary.
+    pub(crate) fn from_ctx(ctx: &MmArc) -> Result<Arc<AccountContext>, String> {
+        from_ctx(&ctx.account_ctx, move || {
+            Ok(AccountContext {
+                storage: AccountStorageBuilder::new(ctx).build().map_err(|e| e.to_string())?,
+            })
+        })
+    }
+
+    /// Initializes the storage and returns a reference to it.
+    pub(crate) async fn storage(&self) -> AccountStorageResult<&dyn AccountStorage> {
+        self.storage.init().await?;
+        Ok(self.storage.as_ref())
+    }
+}
diff --git a/mm2src/mm2_gui_storage/src/lib.rs b/mm2src/mm2_gui_storage/src/lib.rs
new file mode 100644
index 0000000000..16535b3782
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/lib.rs
@@ -0,0 +1,3 @@
+pub(crate) mod account;
+pub(crate) mod context;
+pub mod rpc_commands;
diff --git a/mm2src/mm2_gui_storage/src/rpc_commands.rs b/mm2src/mm2_gui_storage/src/rpc_commands.rs
new file mode 100644
index 0000000000..2c3363443c
--- /dev/null
+++ b/mm2src/mm2_gui_storage/src/rpc_commands.rs
@@ -0,0 +1,380 @@
+use crate::account::storage::AccountStorageError;
+use crate::account::{AccountId, AccountInfo, AccountWithCoins, AccountWithEnabledFlag, EnabledAccountId,
+                     MAX_ACCOUNT_DESCRIPTION_LENGTH, MAX_ACCOUNT_NAME_LENGTH, MAX_TICKER_LENGTH};
+use crate::context::AccountContext;
+use common::{HttpStatusCode, StatusCode, SuccessResponse};
+use derive_more::Display;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::BigDecimal;
+use ser_error_derive::SerializeErrorType;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeSet;
+
+#[derive(Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum AccountRpcError {
+    #[display(fmt = "Account name is too long, expected shorter or equal to {}", max_len)]
+    NameTooLong { max_len: usize },
+    #[display(fmt = "Account description is too long, expected shorter or equal to {}", max_len)]
+    DescriptionTooLong { max_len: usize },
+    #[display(fmt = "Coin ticker is too long, expected shorter or equal to {}", max_len)]
+    TickerTooLong { max_len: usize },
+    #[display(fmt = "No such account {:?}", _0)]
+    NoSuchAccount(AccountId),
+    #[display(fmt = "No enabled account yet. Consider using 'enable_account' RPC")]
+    NoEnabledAccount,
+    #[display(fmt = "Account {:?} exists already", _0)]
+    AccountExistsAlready(AccountId),
+    #[display(fmt = "Error loading account: {}", _0)]
+    ErrorLoadingAccount(String),
+    #[display(fmt = "Error saving changes in accounts storage: {}", _0)]
+    ErrorSavingAccount(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<AccountStorageError> for AccountRpcError {
+    fn from(e: AccountStorageError) -> Self {
+        match e {
+            AccountStorageError::NoSuchAccount(account_id) => AccountRpcError::NoSuchAccount(account_id),
+            AccountStorageError::NoEnabledAccount => AccountRpcError::NoEnabledAccount,
+            AccountStorageError::AccountExistsAlready(account_id) => AccountRpcError::AccountExistsAlready(account_id),
+            AccountStorageError::ErrorDeserializing(e) | AccountStorageError::ErrorLoading(e) => {
+                AccountRpcError::ErrorLoadingAccount(e)
+            },
+            AccountStorageError::ErrorSaving(e) | AccountStorageError::ErrorSerializing(e) => {
+                AccountRpcError::ErrorSavingAccount(e)
+            },
+            AccountStorageError::Internal(internal) => AccountRpcError::Internal(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for AccountRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            AccountRpcError::NameTooLong { .. }
+            | AccountRpcError::DescriptionTooLong { .. }
+            | AccountRpcError::TickerTooLong { .. }
+            | AccountRpcError::NoSuchAccount(_)
+            | AccountRpcError::NoEnabledAccount
+            | AccountRpcError::AccountExistsAlready(_) => StatusCode::BAD_REQUEST,
+            AccountRpcError::ErrorLoadingAccount(_)
+            | AccountRpcError::ErrorSavingAccount(_)
+            | AccountRpcError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct NewAccount<Id> {
+    account_id: Id,
+    name: String,
+    #[serde(default)]
+    description: String,
+    #[serde(default)]
+    balance_usd: BigDecimal,
+}
+
+impl<Id> From<NewAccount<Id>> for AccountInfo
+where
+    AccountId: From<Id>,
+{
+    fn from(orig: NewAccount<Id>) -> Self {
+        AccountInfo {
+            account_id: AccountId::from(orig.account_id),
+            name: orig.name,
+            description: orig.description,
+            balance_usd: orig.balance_usd,
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct EnableAccountRequest {
+    #[serde(flatten)]
+    policy: EnableAccountPolicy,
+}
+
+#[derive(Deserialize)]
+#[serde(tag = "policy")]
+#[serde(rename_all = "snake_case")]
+pub enum EnableAccountPolicy {
+    Existing(EnabledAccountId),
+    New(NewAccount<EnabledAccountId>),
+}
+
+#[derive(Deserialize)]
+pub struct AddAccountRequest {
+    #[serde(flatten)]
+    account: NewAccount<AccountId>,
+}
+
+#[derive(Deserialize)]
+pub struct DeleteAccountRequest {
+    account_id: AccountId,
+}
+
+#[derive(Deserialize)]
+pub struct SetAccountNameRequest {
+    account_id: AccountId,
+    name: String,
+}
+
+#[derive(Deserialize)]
+pub struct SetAccountDescriptionRequest {
+    account_id: AccountId,
+    description: String,
+}
+
+#[derive(Deserialize)]
+pub struct CoinRequest {
+    account_id: AccountId,
+    tickers: Vec<String>,
+}
+
+#[derive(Deserialize)]
+pub struct GetAccountsRequest;
+
+#[derive(Deserialize)]
+pub struct GetAccountCoinsRequest {
+    account_id: AccountId,
+}
+
+#[derive(Serialize)]
+pub struct GetAccountCoinsResponse {
+    account_id: AccountId,
+    coins: BTreeSet<String>,
+}
+
+#[derive(Deserialize)]
+pub struct GetEnabledAccountRequest;
+
+#[derive(Deserialize)]
+pub struct SetBalanceRequest {
+    account_id: AccountId,
+    balance_usd: BigDecimal,
+}
+
+/// Sets the given account as an enabled (current active account).
+/// The behaviour depends on [`EnableAccountRequest::policy`]:
+/// * [`EnableAccountPolicy::Known`] =>
+///     1) Checks whether the given account exists in the storage.
+///        Returns [`AccountRpcError::NoSuchAccount`] if there is no account with the given `AccountId`;
+///     2) Sets the account as an enabled.
+/// * [`EnableAccountPolicy::New`] =>
+///     1) Tries to upload the given account info to the storage.
+///        Returns [`AccountRpcError::AccountExistsAlready`] if there is an account with the same `AccountId` already;
+///     2) Sets the account as an enabled.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn enable_account(ctx: MmArc, req: EnableAccountRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    let account_id = match req.policy {
+        EnableAccountPolicy::Existing(account_id) => account_id,
+        EnableAccountPolicy::New(new_account) => {
+            let account_id = new_account.account_id;
+            account_ctx
+                .storage()
+                .await?
+                .upload_account(AccountInfo::from(new_account))
+                .await?;
+            account_id
+        },
+    };
+    account_ctx.storage().await?.enable_account(account_id).await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Adds the given [`AddAccountRequest::account`] to the storage.
+/// Returns [`AccountRpcError::AccountExistsAlready`] if there is an account with the same `AccountId` already.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn add_account(ctx: MmArc, req: AddAccountRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    validate_new_account(&req.account)?;
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx
+        .storage()
+        .await?
+        .upload_account(AccountInfo::from(req.account))
+        .await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Deletes the given [`AddAccountRequest::account_id`] account from the storage.
+/// Returns [`AccountRpcError::NoSuchAccount`] if there is no account with the same `AccountId`.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn delete_account(ctx: MmArc, req: DeleteAccountRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx.storage().await?.delete_account(req.account_id).await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Loads accounts from the storage and marks one account as enabled **only**.
+/// If no account has been enabled yet, this RPC returns [`AccountRpcError::NoEnabledAccount`] error.
+///
+/// # Note
+///
+/// The returned accounts are sorted by `AccountId`.
+pub async fn get_accounts(
+    ctx: MmArc,
+    _req: GetAccountsRequest,
+) -> MmResult<Vec<AccountWithEnabledFlag>, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    let accounts = account_ctx
+        .storage()
+        .await?
+        .load_accounts_with_enabled_flag()
+        .await?
+        // The given `BTreeMap<AccountId, AccountWithEnabledFlag>` accounts are sorted by `AccountId`.
+        .into_values()
+        .collect();
+    Ok(accounts)
+}
+
+/// Loads activated coins of the given `account_id` from the storage.
+///
+/// # Note
+///
+/// The returned coins are sorted.
+pub async fn get_account_coins(
+    ctx: MmArc,
+    req: GetAccountCoinsRequest,
+) -> MmResult<GetAccountCoinsResponse, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    let coins = account_ctx
+        .storage()
+        .await?
+        .load_account_coins(req.account_id.clone())
+        .await?;
+    Ok(GetAccountCoinsResponse {
+        account_id: req.account_id,
+        coins,
+    })
+}
+
+/// Loads an enabled account with activated coins from the storage.
+/// If no account has been enabled yet, this RPC returns [`AccountRpcError::NoEnabledAccount`] error.
+///
+/// # Note
+///
+/// The account coins are sorted.
+pub async fn get_enabled_account(
+    ctx: MmArc,
+    _req: GetEnabledAccountRequest,
+) -> MmResult<AccountWithCoins, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    let account = account_ctx.storage().await?.load_enabled_account_with_coins().await?;
+    Ok(account)
+}
+
+/// Sets the account name.
+pub async fn set_account_name(ctx: MmArc, req: SetAccountNameRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    validate_account_name(&req.name)?;
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx.storage().await?.set_name(req.account_id, req.name).await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Sets the account description.
+pub async fn set_account_description(
+    ctx: MmArc,
+    req: SetAccountDescriptionRequest,
+) -> MmResult<SuccessResponse, AccountRpcError> {
+    validate_account_desc(&req.description)?;
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx
+        .storage()
+        .await?
+        .set_description(req.account_id, req.description)
+        .await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Sets the account USD balance.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn set_account_balance(ctx: MmArc, req: SetBalanceRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx
+        .storage()
+        .await?
+        .set_balance(req.account_id, req.balance_usd)
+        .await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Activates the given [`CoinRequest::tickers`] for the specified [`CoinRequest::account_id`] account.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn activate_coins(ctx: MmArc, req: CoinRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    validate_tickers(&req.tickers)?;
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx
+        .storage()
+        .await?
+        .activate_coins(req.account_id, req.tickers)
+        .await?;
+    Ok(SuccessResponse::new())
+}
+
+/// Deactivates the given [`CoinRequest::tickers`] for the specified [`CoinRequest::account_id`] account.
+///
+/// # Important
+///
+/// This RPC affects the storage **only**. It doesn't affect MarketMaker.
+pub async fn deactivate_coins(ctx: MmArc, req: CoinRequest) -> MmResult<SuccessResponse, AccountRpcError> {
+    let account_ctx = AccountContext::from_ctx(&ctx).map_to_mm(AccountRpcError::Internal)?;
+    account_ctx
+        .storage()
+        .await?
+        .deactivate_coins(req.account_id, req.tickers)
+        .await?;
+    Ok(SuccessResponse::new())
+}
+
+fn validate_new_account<Id>(account: &NewAccount<Id>) -> MmResult<(), AccountRpcError> {
+    validate_account_name(&account.name)?;
+    validate_account_desc(&account.description)
+}
+
+fn validate_account_name(name: &str) -> MmResult<(), AccountRpcError> {
+    if name.len() > MAX_ACCOUNT_NAME_LENGTH {
+        return MmError::err(AccountRpcError::NameTooLong {
+            max_len: MAX_ACCOUNT_NAME_LENGTH,
+        });
+    }
+    Ok(())
+}
+
+fn validate_account_desc(description: &str) -> MmResult<(), AccountRpcError> {
+    if description.len() > MAX_ACCOUNT_DESCRIPTION_LENGTH {
+        return MmError::err(AccountRpcError::DescriptionTooLong {
+            max_len: MAX_ACCOUNT_NAME_LENGTH,
+        });
+    }
+    Ok(())
+}
+
+fn validate_tickers(tickers: &[String]) -> MmResult<(), AccountRpcError> {
+    for ticker in tickers {
+        if ticker.len() > MAX_TICKER_LENGTH {
+            return MmError::err(AccountRpcError::TickerTooLong {
+                max_len: MAX_TICKER_LENGTH,
+            });
+        }
+    }
+    Ok(())
+}
diff --git a/mm2src/mm2_io/Cargo.toml b/mm2src/mm2_io/Cargo.toml
index 767d39547c..67589d050f 100644
--- a/mm2src/mm2_io/Cargo.toml
+++ b/mm2src/mm2_io/Cargo.toml
@@ -3,13 +3,14 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 common = { path = "../common" }
 mm2_err_handle = { path = "../mm2_err_handle" }
 serde = "1"
-serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json = { version = "1", 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"
diff --git a/mm2src/mm2_io/src/fs.rs b/mm2src/mm2_io/src/fs.rs
index 76ff7e2864..e844086d89 100644
--- a/mm2src/mm2_io/src/fs.rs
+++ b/mm2src/mm2_io/src/fs.rs
@@ -25,6 +25,14 @@ pub enum FsJsonError {
     Deserializing(JsonError),
 }
 
+#[inline]
+pub fn invalid_data_err<Error>(msg: &str, err: Error) -> io::Error
+where
+    Error: std::fmt::Display,
+{
+    io::Error::new(std::io::ErrorKind::InvalidData, format!("{}: {}", msg, err))
+}
+
 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());
diff --git a/mm2src/mm2_libp2p/Cargo.toml b/mm2src/mm2_libp2p/Cargo.toml
index 77356fd1b2..8098ac9358 100644
--- a/mm2src/mm2_libp2p/Cargo.toml
+++ b/mm2src/mm2_libp2p/Cargo.toml
@@ -4,11 +4,13 @@ version = "0.1.0"
 authors = ["Artem Pikulin <ortgma@gmail.com>"]
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 async-trait = "0.1"
 atomicdex-gossipsub = { path = "../gossipsub" }
+common = { path = "../common" }
 derive_more = "0.99"
 libp2p-floodsub = { path = "../floodsub" }
 futures = { version = "0.3.1", package = "futures", features = ["compat", "async-await"] }
@@ -27,15 +29,15 @@ void = "1.0"
 wasm-timer = "0.2.4"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { version = "1.7", features = ["rt-multi-thread", "macros"] }
-libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", default-features = false, features = ["dns-tokio", "floodsub", "mplex", "noise", "ping", "request-response", "secp256k1", "tcp-tokio", "websocket"] }
+tokio = { version = "1.20", features = ["rt-multi-thread", "macros"] }
+libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", tag = "v0.45.1", default-features = false, features = ["dns-tokio", "floodsub", "mplex", "noise", "ping", "request-response", "secp256k1", "tcp-tokio", "websocket"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 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"] }
+libp2p = { git = "https://github.com/libp2p/rust-libp2p.git", tag = "v0.45.1", 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"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
index 98385c5486..da2b051bdd 100644
--- a/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
+++ b/mm2src/mm2_libp2p/src/atomicdex_behaviour.rs
@@ -3,15 +3,16 @@ use crate::{adex_ping::AdexPing,
             peers_exchange::{PeerAddresses, PeersExchange},
             request_response::{build_request_response_behaviour, PeerRequest, PeerResponse, RequestResponseBehaviour,
                                RequestResponseBehaviourEvent, RequestResponseSender},
-            runtime::{SwarmRuntimeOps, SWARM_RUNTIME},
+            runtime::SwarmRuntime,
             NetworkInfo, NetworkPorts, RelayAddress, RelayAddressError};
 use atomicdex_gossipsub::{Gossipsub, GossipsubConfigBuilder, GossipsubEvent, GossipsubMessage, MessageId, Topic,
                           TopicHash};
+use common::executor::SpawnFuture;
 use derive_more::Display;
 use futures::{channel::{mpsc::{channel, Receiver, Sender},
                         oneshot},
-              future::{abortable, join_all, poll_fn, AbortHandle},
-              Future, SinkExt, StreamExt};
+              future::{join_all, poll_fn},
+              Future, FutureExt, SinkExt, StreamExt};
 use futures_rustls::rustls;
 use libp2p::core::transport::Boxed as BoxedTransport;
 use libp2p::{core::{ConnectedPoint, Multiaddr, Transport},
@@ -240,7 +241,7 @@ pub struct AtomicDexBehaviour {
     #[behaviour(ignore)]
     event_tx: Sender<AdexBehaviourEvent>,
     #[behaviour(ignore)]
-    spawn_fn: fn(Box<dyn Future<Output = ()> + Send + Unpin + 'static>) -> (),
+    runtime: SwarmRuntime,
     #[behaviour(ignore)]
     cmd_rx: Receiver<AdexBehaviourCmd>,
     #[behaviour(ignore)]
@@ -258,7 +259,7 @@ impl AtomicDexBehaviour {
         }
     }
 
-    fn spawn(&self, fut: impl Future<Output = ()> + Send + 'static) { (self.spawn_fn)(Box::new(Box::pin(fut))) }
+    fn spawn(&self, fut: impl Future<Output = ()> + Send + 'static) { self.runtime.spawn(fut) }
 
     fn process_cmd(&mut self, cmd: AdexBehaviourCmd) {
         match cmd {
@@ -517,7 +518,7 @@ fn maintain_connection_to_relays(swarm: &mut AtomicDexSwarm, bootstrap_addresses
             .filter(|peer| !relays_mesh.contains(peer))
             .collect();
         for peer in not_in_mesh.choose_multiple(&mut rng, to_disconnect_num) {
-            if !swarm.behaviour().peers_exchange.is_reserved_peer(*peer) {
+            if !swarm.behaviour().peers_exchange.is_reserved_peer(peer) {
                 info!("Disconnecting peer {}", peer);
                 if Swarm::disconnect_peer_id(swarm, **peer).is_err() {
                     error!("Peer {} disconnect error", peer);
@@ -609,19 +610,21 @@ impl NodeType {
 pub async fn spawn_gossipsub(
     netid: u16,
     force_key: Option<[u8; 32]>,
-    spawn_fn: fn(Box<dyn Future<Output = ()> + Send + Unpin + 'static>) -> (),
+    runtime: SwarmRuntime,
     to_dial: Vec<RelayAddress>,
     node_type: NodeType,
     on_poll: impl Fn(&AtomicDexSwarm) + Send + 'static,
-) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle), AdexBehaviourError> {
-    let (result_tx, result_rx) = futures::channel::oneshot::channel();
+) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId), AdexBehaviourError> {
+    let (result_tx, result_rx) = oneshot::channel();
+
+    let runtime_c = runtime.clone();
     let fut = async move {
-        let result = start_gossipsub(netid, force_key, spawn_fn, to_dial, node_type, on_poll);
+        let result = start_gossipsub(netid, force_key, runtime, to_dial, node_type, on_poll);
         result_tx.send(result).unwrap();
     };
 
     // `Libp2p` must be spawned on the tokio runtime
-    SWARM_RUNTIME.spawn(fut);
+    runtime_c.spawn(fut);
     result_rx.await.expect("Fatal error on starting gossipsub")
 }
 
@@ -638,11 +641,11 @@ pub async fn spawn_gossipsub(
 fn start_gossipsub(
     netid: u16,
     force_key: Option<[u8; 32]>,
-    spawn_fn: fn(Box<dyn Future<Output = ()> + Send + Unpin + 'static>) -> (),
+    runtime: SwarmRuntime,
     to_dial: Vec<RelayAddress>,
     node_type: NodeType,
     on_poll: impl Fn(&AtomicDexSwarm) + Send + 'static,
-) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId, AbortHandle), AdexBehaviourError> {
+) -> Result<(Sender<AdexBehaviourCmd>, AdexEventRx, PeerId), 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);
@@ -717,7 +720,7 @@ fn start_gossipsub(
         let adex_behavior = AtomicDexBehaviour {
             floodsub,
             event_tx,
-            spawn_fn,
+            runtime: runtime.clone(),
             cmd_rx,
             netid,
             gossipsub,
@@ -726,7 +729,7 @@ fn start_gossipsub(
             ping,
         };
         libp2p::swarm::SwarmBuilder::new(transport, adex_behavior, local_peer_id)
-            .executor(Box::new(&*SWARM_RUNTIME))
+            .executor(Box::new(runtime.clone()))
             .build()
     };
     swarm
@@ -804,10 +807,8 @@ fn start_gossipsub(
         Poll::Pending
     });
 
-    let (polling_fut, abort_handle) = abortable(polling_fut);
-    SWARM_RUNTIME.spawn(polling_fut);
-
-    Ok((cmd_tx, event_rx, local_peer_id, abort_handle))
+    runtime.spawn(polling_fut.then(|_| futures::future::ready(())));
+    Ok((cmd_tx, event_rx, local_peer_id))
 }
 
 #[cfg(target_arch = "wasm32")]
@@ -827,10 +828,13 @@ fn build_dns_ws_transport(
 ) -> 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());
+    let ws_tcp = libp2p::dns::TokioDnsConfig::custom(
+        libp2p::tcp::TokioTcpConfig::new().nodelay(true),
+        libp2p::dns::ResolverConfig::google(),
+        Default::default(),
+    )
+    .unwrap();
+    let mut ws_dns_tcp = libp2p::websocket::WsConfig::new(ws_tcp);
 
     if let Some(certs) = wss_certs {
         let server_priv_key = libp2p_tls::PrivateKey::new(certs.server_priv_key.0.clone());
@@ -842,6 +846,15 @@ fn build_dns_ws_transport(
         ws_dns_tcp.set_tls_config(wss_config);
     }
 
+    // This is for preventing port reuse of dns/tcp instead of
+    // websocket ports.
+    let dns_tcp = libp2p::dns::TokioDnsConfig::custom(
+        libp2p::tcp::TokioTcpConfig::new().nodelay(true),
+        libp2p::dns::ResolverConfig::google(),
+        Default::default(),
+    )
+    .unwrap();
+
     let transport = dns_tcp.or_transport(ws_dns_tcp);
     upgrade_transport(transport, noise_keys)
 }
diff --git a/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs b/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
index 05346dc974..ea4bf4e289 100644
--- a/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
+++ b/mm2src/mm2_libp2p/src/atomicdex_behaviour/tests.rs
@@ -1,7 +1,8 @@
-use super::{spawn_gossipsub, AdexBehaviourCmd, AdexBehaviourEvent, AdexResponse, NodeType, RelayAddress};
+use super::{spawn_gossipsub, AdexBehaviourCmd, AdexBehaviourEvent, AdexResponse, NodeType, RelayAddress, SwarmRuntime};
 use async_std::task::spawn;
+use common::executor::abortable_queue::AbortableQueue;
 use futures::channel::{mpsc, oneshot};
-use futures::{Future, SinkExt, StreamExt};
+use futures::{SinkExt, StreamExt};
 use libp2p::PeerId;
 use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
@@ -9,9 +10,11 @@ use std::time::Duration;
 
 static TEST_LISTEN_PORT: AtomicU64 = AtomicU64::new(1);
 
-fn next_port() -> u64 { TEST_LISTEN_PORT.fetch_add(1, Ordering::Relaxed) }
+lazy_static! {
+    static ref SYSTEM: AbortableQueue = AbortableQueue::default();
+}
 
-fn spawn_boxed(fut: Box<dyn Future<Output = ()> + Send + Unpin + 'static>) { spawn(fut); }
+fn next_port() -> u64 { TEST_LISTEN_PORT.fetch_add(1, Ordering::Relaxed) }
 
 struct Node {
     peer_id: PeerId,
@@ -23,9 +26,10 @@ impl Node {
     where
         F: Fn(mpsc::Sender<AdexBehaviourCmd>, AdexBehaviourEvent) + Send + 'static,
     {
+        let spawner = SwarmRuntime::new(SYSTEM.weak_spawner());
         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, |_| {})
+        let (cmd_tx, mut event_rx, peer_id) = spawn_gossipsub(333, None, spawner, seednodes, node_type, |_| {})
             .await
             .expect("Error spawning AdexBehaviour");
 
diff --git a/mm2src/mm2_libp2p/src/lib.rs b/mm2src/mm2_libp2p/src/lib.rs
index 403c2909cd..8027121c8f 100644
--- a/mm2src/mm2_libp2p/src/lib.rs
+++ b/mm2src/mm2_libp2p/src/lib.rs
@@ -23,6 +23,7 @@ pub use libp2p::identity::PublicKey as Libp2pPublic;
 pub use libp2p::{Multiaddr, PeerId};
 pub use peers_exchange::PeerAddresses;
 pub use relay_address::{RelayAddress, RelayAddressError};
+pub use runtime::SwarmRuntime;
 use serde::{de, Deserialize, Serialize, Serializer};
 
 lazy_static! {
@@ -86,7 +87,7 @@ pub fn decode_signed<'de, T: de::Deserialize<'de>>(
     let helper: SignedMessageSerdeHelper = decode_message(encoded)?;
     let signature = Signature::from_compact(helper.signature)
         .map_err(|e| rmp_serde::decode::Error::Syntax(format!("Failed to parse signature {}", e)))?;
-    let sig_hash = SecpMessage::from_slice(&sha256(&helper.payload)).expect("Message::from_slice should never fail");
+    let sig_hash = SecpMessage::from_slice(&sha256(helper.payload)).expect("Message::from_slice should never fail");
     match &helper.pubkey {
         PublicKey::Secp256k1(serialized_pub) => {
             if SECP_VERIFY.verify(&sig_hash, &signature, &serialized_pub.0).is_err() {
diff --git a/mm2src/mm2_libp2p/src/network.rs b/mm2src/mm2_libp2p/src/network.rs
index dc8dd2292c..41f5cf0ae4 100644
--- a/mm2src/mm2_libp2p/src/network.rs
+++ b/mm2src/mm2_libp2p/src/network.rs
@@ -62,7 +62,7 @@ pub fn get_all_network_seednodes(netid: u16) -> Vec<(PeerId, RelayAddress)> {
     ALL_NETID_7777_SEEDNODES
         .iter()
         .map(|(peer_id, ipv4)| {
-            let peer_id = PeerId::from_str(*peer_id).expect("valid peer id");
+            let peer_id = PeerId::from_str(peer_id).expect("valid peer id");
             let address = RelayAddress::IPv4(ipv4.to_string());
             (peer_id, address)
         })
diff --git a/mm2src/mm2_libp2p/src/peers_exchange.rs b/mm2src/mm2_libp2p/src/peers_exchange.rs
index 8817b43276..2bb1fbc7db 100644
--- a/mm2src/mm2_libp2p/src/peers_exchange.rs
+++ b/mm2src/mm2_libp2p/src/peers_exchange.rs
@@ -204,9 +204,9 @@ impl PeersExchange {
     ) -> HashMap<PeerId, PeerAddresses> {
         let mut result = HashMap::with_capacity(num);
         let mut rng = rand::thread_rng();
-        let peer_ids = self.known_peers.iter().filter(|peer| filter(*peer)).collect::<Vec<_>>();
+        let peer_ids = self.known_peers.iter().filter(|peer| filter(peer)).collect::<Vec<_>>();
         for peer_id in peer_ids.choose_multiple(&mut rng, num) {
-            let addresses = self.request_response.addresses_of_peer(*peer_id).into_iter().collect();
+            let addresses = self.request_response.addresses_of_peer(peer_id).into_iter().collect();
             result.insert(**peer_id, addresses);
         }
         result
diff --git a/mm2src/mm2_libp2p/src/runtime.rs b/mm2src/mm2_libp2p/src/runtime.rs
index 95c1116add..016cf2b455 100644
--- a/mm2src/mm2_libp2p/src/runtime.rs
+++ b/mm2src/mm2_libp2p/src/runtime.rs
@@ -1,55 +1,33 @@
+use common::executor::{BoxFutureSpawner, SpawnFuture};
 use futures::Future;
-use lazy_static::lazy_static;
 use std::pin::Pin;
+use std::sync::Arc;
 
-lazy_static! {
-    pub static ref SWARM_RUNTIME: SwarmRuntime = SwarmRuntime::new();
-}
-
+#[derive(Clone)]
 pub struct SwarmRuntime {
-    #[cfg(not(target_arch = "wasm32"))]
-    inner: tokio::runtime::Runtime,
+    inner: Arc<dyn BoxFutureSpawner + Send + Sync>,
 }
 
-pub trait SwarmRuntimeOps {
-    fn new() -> Self;
-
-    fn spawn<F>(&self, future: F)
+impl SwarmRuntime {
+    pub fn new<S>(spawner: S) -> SwarmRuntime
     where
-        F: Future + Send + 'static,
-        F::Output: Send + 'static;
-}
-
-#[cfg(target_arch = "wasm32")]
-impl SwarmRuntimeOps for SwarmRuntime {
-    fn new() -> Self { SwarmRuntime {} }
-
-    fn spawn<F>(&self, future: F)
-    where
-        F: Future + futures::FutureExt + Send + 'static,
-        F::Output: Send + 'static,
+        S: BoxFutureSpawner + Send + Sync + 'static,
     {
-        wasm_bindgen_futures::spawn_local(future.map(|_| ()))
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-impl SwarmRuntimeOps for SwarmRuntime {
-    fn new() -> Self {
         SwarmRuntime {
-            inner: tokio::runtime::Runtime::new().unwrap(),
+            inner: Arc::new(spawner),
         }
     }
+}
 
-    fn spawn<F>(&self, future: F)
+impl SpawnFuture for SwarmRuntime {
+    fn spawn<F>(&self, f: F)
     where
-        F: Future + Send + 'static,
-        F::Output: Send + 'static,
+        F: Future<Output = ()> + Send + 'static,
     {
-        self.inner.spawn(future);
+        self.inner.spawn_boxed(Box::new(Box::pin(f)))
     }
 }
 
-impl libp2p::core::Executor for &SwarmRuntime {
-    fn exec(&self, future: Pin<Box<dyn Future<Output = ()> + Send>>) { self.spawn(future) }
+impl libp2p::core::Executor for SwarmRuntime {
+    fn exec(&self, future: Pin<Box<dyn Future<Output = ()> + Send>>) { self.inner.spawn_boxed(Box::new(future)) }
 }
diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml
index c62e057f60..5989c999c7 100644
--- a/mm2src/mm2_main/Cargo.toml
+++ b/mm2src/mm2_main/Cargo.toml
@@ -7,38 +7,19 @@
 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
+[lib]
+doctest = 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.
+native = [] # Deprecated
+track-ctx-pointer = ["common/track-ctx-pointer"]
 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
+# TODO
+# Remove this once the solana integration becomes stable/completed.
+disable-solana-tests = []
+default = ["disable-solana-tests"]
 
 [dependencies]
 async-std = { version = "1.5", features = ["unstable"] }
@@ -57,11 +38,13 @@ 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"] }
+ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] }
+enum_from = { path = "../derives/enum_from" }
 enum-primitive-derive = "0.2"
 futures01 = { version = "0.1", package = "futures" }
 futures = { version = "0.3.1", package = "futures", features = ["compat", "async-await"] }
 gstuff = { version = "0.7", features = ["nightly"] }
+mm2_gui_storage = { path = "../mm2_gui_storage" }
 hash256-std-hasher = "0.15.2"
 hash-db = "0.15.2"
 hex = "0.4.2"
@@ -72,11 +55,11 @@ 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_metrics = { path = "../mm2_metrics" }
 mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number" }
 mm2_rpc = { path = "../mm2_rpc" }
@@ -95,7 +78,7 @@ 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_json = { version = "1", features = ["preserve_order", "raw_value"] }
 serde_derive = "1.0"
 ser_error = { path = "../derives/ser_error" }
 ser_error_derive = { path = "../derives/ser_error_derive" }
@@ -123,15 +106,15 @@ web-sys = { version = "0.3.55", features = ["console"] }
 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"] }
+tokio = { version = "1.20", 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" }
+mocktopus = "0.8.0"
+testcontainers = { git = "https://github.com/KomodoPlatform/mm2-testcontainers-rs.git" }
 
 [build-dependencies]
 chrono = "0.4"
diff --git a/mm2src/mm2_main/src/database/stats_swaps.rs b/mm2src/mm2_main/src/database/stats_swaps.rs
index 1a125dccc0..e8b75be391 100644
--- a/mm2src/mm2_main/src/database/stats_swaps.rs
+++ b/mm2src/mm2_main/src/database/stats_swaps.rs
@@ -1,7 +1,7 @@
 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},
+                sqlite::{rusqlite::{Connection, OptionalExtension},
                          AsSqlNamedParams, OwnedSqlNamedParams}};
 use mm2_core::mm_ctx::MmArc;
 use std::collections::HashSet;
diff --git a/mm2src/mm2_main/src/docker_tests.rs b/mm2src/mm2_main/src/docker_tests.rs
deleted file mode 100644
index a55e4233b4..0000000000
--- a/mm2src/mm2_main/src/docker_tests.rs
+++ /dev/null
@@ -1,3822 +0,0 @@
-#![feature(async_closure)]
-#![feature(custom_test_frameworks)]
-#![feature(test)]
-#![test_runner(docker_tests_runner)]
-#![feature(drain_filter)]
-#![feature(hash_raw_entry)]
-#![feature(map_first_last)]
-#![recursion_limit = "512"]
-
-#[cfg(test)] use docker_tests::docker_tests_runner;
-
-#[cfg(test)]
-#[macro_use]
-extern crate common;
-#[cfg(test)]
-#[macro_use]
-extern crate gstuff;
-#[cfg(all(test, not(target_arch = "wasm32")))]
-#[macro_use]
-extern crate lazy_static;
-#[cfg(test)]
-#[macro_use]
-extern crate serde_json;
-#[cfg(test)]
-#[macro_use]
-extern crate serde_derive;
-#[cfg(test)]
-#[macro_use]
-extern crate serialization_derive;
-#[cfg(test)]
-#[macro_use]
-extern crate ser_error_derive;
-#[cfg(test)] extern crate test;
-
-#[cfg(test)]
-#[path = "mm2.rs"]
-pub mod mm2;
-
-fn main() { unimplemented!() }
-
-/// rustfmt cannot resolve the module path within docker_tests.
-/// Specify the path manually outside the docker_tests.
-#[cfg(rustfmt)]
-#[path = "docker_tests/docker_ordermatch_tests.rs"]
-mod docker_ordermatch_tests;
-
-#[cfg(rustfmt)]
-#[path = "docker_tests/swaps_confs_settings_sync_tests.rs"]
-mod swaps_confs_settings_sync_tests;
-
-#[cfg(rustfmt)]
-#[path = "docker_tests/swaps_file_lock_tests.rs"]
-mod swaps_file_lock_tests;
-
-#[cfg(rustfmt)]
-#[path = "docker_tests/qrc20_tests.rs"]
-mod qrc20_tests;
-
-#[cfg(all(test, target_arch = "wasm32"))]
-mod docker_tests {
-    use test::{test_main, StaticBenchFn, StaticTestFn, TestDescAndFn};
-
-    pub fn docker_tests_runner(tests: &[&TestDescAndFn]) {
-        let owned_tests: Vec<_> = tests
-            .iter()
-            .map(|t| match t.testfn {
-                StaticTestFn(f) => TestDescAndFn {
-                    testfn: StaticTestFn(f),
-                    desc: t.desc.clone(),
-                },
-                StaticBenchFn(f) => TestDescAndFn {
-                    testfn: StaticBenchFn(f),
-                    desc: t.desc.clone(),
-                },
-                _ => panic!("non-static tests passed to lp_coins test runner"),
-            })
-            .collect();
-        let args: Vec<String> = std::env::args().collect();
-        let _exit_code = test_main(&args, owned_tests, None);
-    }
-}
-
-#[cfg(all(test, not(target_arch = "wasm32")))]
-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 docker_tests_common::*;
-
-    use bitcrypto::ChecksumType;
-    use chain::{OutPoint, TransactionOutput};
-    use coins::eth::{eth_coin_from_conf_and_request, EthCoin};
-    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 crypto::privkey::{key_pair_from_secret, key_pair_from_seed};
-    use futures01::Future;
-    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 script::Builder;
-    use secp256k1::SecretKey;
-    use serde_json::{self as json, Value as Json};
-    use std::collections::HashMap;
-    use std::env;
-    use std::io::{BufRead, BufReader};
-    use std::process::Command;
-    use std::sync::Mutex;
-    use std::thread;
-    use std::time::Duration;
-    use test::{test_main, StaticBenchFn, StaticTestFn, TestDescAndFn};
-    use testcontainers::clients::Cli;
-
-    // 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
-    // I've tried to use static for such singleton initialization but it turned out that despite
-    // rustc allows to use Drop as static the drop fn won't ever be called
-    // NB: https://github.com/rust-lang/rfcs/issues/1111
-    // the only preparation step required is Zcash params files downloading:
-    // Windows - https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.bat
-    // Linux and MacOS - https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.sh
-    pub fn docker_tests_runner(tests: &[&TestDescAndFn]) {
-        // pretty_env_logger::try_init();
-        let docker = Cli::default();
-        let mut containers = vec![];
-        // skip Docker containers initialization if we are intended to run test_mm_start only
-        if std::env::var("_MM2_TEST_CONF").is_err() {
-            pull_docker_image(UTXO_ASSET_DOCKER_IMAGE);
-            pull_docker_image(QTUM_REGTEST_DOCKER_IMAGE);
-            remove_docker_containers(UTXO_ASSET_DOCKER_IMAGE);
-            remove_docker_containers(QTUM_REGTEST_DOCKER_IMAGE);
-
-            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(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
-        let owned_tests: Vec<_> = tests
-            .iter()
-            .map(|t| match t.testfn {
-                StaticTestFn(f) => TestDescAndFn {
-                    testfn: StaticTestFn(f),
-                    desc: t.desc.clone(),
-                },
-                StaticBenchFn(f) => TestDescAndFn {
-                    testfn: StaticBenchFn(f),
-                    desc: t.desc.clone(),
-                },
-                _ => panic!("non-static tests passed to lp_coins test runner"),
-            })
-            .collect();
-        let args: Vec<String> = std::env::args().collect();
-        let _exit_code = test_main(&args, owned_tests, None);
-    }
-
-    fn pull_docker_image(name: &str) {
-        Command::new("docker")
-            .arg("pull")
-            .arg(name)
-            .status()
-            .expect("Failed to execute docker command");
-    }
-
-    fn remove_docker_containers(name: &str) {
-        let stdout = Command::new("docker")
-            .arg("ps")
-            .arg("-f")
-            .arg(format!("ancestor={}", name))
-            .arg("-q")
-            .output()
-            .expect("Failed to execute docker command");
-
-        let reader = BufReader::new(stdout.stdout.as_slice());
-        let ids: Vec<_> = reader.lines().map(|line| line.unwrap()).collect();
-        if !ids.is_empty() {
-            Command::new("docker")
-                .arg("rm")
-                .arg("-f")
-                .args(ids)
-                .status()
-                .expect("Failed to execute docker command");
-        }
-    }
-
-    struct UtxoAssetDockerOps {
-        #[allow(dead_code)]
-        ctx: MmArc,
-        coin: UtxoStandardCoin,
-    }
-
-    impl CoinDockerOps for UtxoAssetDockerOps {
-        fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
-    }
-
-    impl UtxoAssetDockerOps {
-        fn from_ticker(ticker: &str) -> UtxoAssetDockerOps {
-            let conf = json!({"asset": ticker, "txfee": 1000, "network": "regtest"});
-            let req = json!({"method":"enable"});
-            let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
-            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, ticker, &conf, &params, &priv_key,
-            ))
-            .unwrap();
-            UtxoAssetDockerOps { ctx, coin }
-        }
-    }
-
-    struct BchDockerOps {
-        #[allow(dead_code)]
-        ctx: MmArc,
-        coin: BchCoin,
-    }
-
-    // builds the EthCoin using the external dev Parity/OpenEthereum node
-    // the address belonging to the default passphrase has million of ETH that it can distribute to
-    // random privkeys generated in tests
-    fn eth_distributor() -> EthCoin {
-        let conf = json!({"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}});
-        let req = json!({
-            "method": "enable",
-            "coin": "ETH",
-            "urls": ["http://195.201.0.6:8565"],
-            "swap_contract_address": "0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd",
-        });
-        let keypair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        block_on(eth_coin_from_conf_and_request(
-            &MM_CTX,
-            "ETH",
-            &conf,
-            &req,
-            &*keypair.private().secret,
-            CoinProtocol::ETH,
-        ))
-        .unwrap()
-    }
-
-    // pass address without 0x prefix to this fn
-    fn fill_eth(to_addr: &str) {
-        ETH_DISTRIBUTOR
-            .send_to_address(to_addr.parse().unwrap(), 1_000_000_000_000_000_000u64.into())
-            .wait()
-            .unwrap();
-    }
-
-    lazy_static! {
-        static ref COINS_LOCK: Mutex<()> = Mutex::new(());
-        static ref ETH_DISTRIBUTOR: EthCoin = eth_distributor();
-        static ref MM_CTX: MmArc = MmCtxBuilder::new().into_mm_arc();
-    }
-
-    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 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.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())
-    }
-
-    #[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_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, my_public_key, &[0; 20], 1u64.into(), &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        let refund_tx = coin
-            .send_taker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&refund_tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        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);
-    }
-
-    #[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_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, my_public_key, &[0; 20], 1u64.into(), &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        let refund_tx = coin
-            .send_maker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&refund_tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        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);
-    }
-
-    #[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_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, my_pubkey, &*dhash160(&secret), 1u64.into(), &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        let spend_tx = coin
-            .send_maker_spends_taker_payment(&tx.tx_hex(), time_lock, my_pubkey, &secret, &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&spend_tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        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);
-    }
-
-    #[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_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, my_pubkey, &*dhash160(&secret), 1u64.into(), &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        let spend_tx = coin
-            .send_taker_spends_maker_payment(&tx.tx_hex(), time_lock, my_pubkey, &secret, &None, &[])
-            .wait()
-            .unwrap();
-
-        coin.wait_for_confirmations(&spend_tx.tx_hex(), 1, false, timeout, 1)
-            .wait()
-            .unwrap();
-
-        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);
-    }
-
-    #[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_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![];
-        let mut sent_tx = vec![];
-        for i in 0..100 {
-            let tx = coin
-                .send_maker_payment(
-                    time_lock + i,
-                    my_pubkey,
-                    &*dhash160(&secret),
-                    1.into(),
-                    &coin.swap_contract_address(),
-                    &[],
-                )
-                .wait()
-                .unwrap();
-            if let TransactionEnum::UtxoTx(tx) = tx {
-                unspents.push(UnspentInfo {
-                    outpoint: OutPoint {
-                        hash: tx.hash(),
-                        index: 2,
-                    },
-                    value: tx.outputs[2].value,
-                    height: None,
-                });
-                sent_tx.push(tx);
-            }
-        }
-
-        let recently_sent = block_on(coin.as_ref().recently_spent_outpoints.lock());
-
-        unspents = recently_sent
-            .replace_spent_outputs_with_cache(unspents.into_iter().collect())
-            .into_iter()
-            .collect();
-
-        let last_tx = sent_tx.last().unwrap();
-        let expected_unspent = UnspentInfo {
-            outpoint: OutPoint {
-                hash: last_tx.hash(),
-                index: 2,
-            },
-            value: last_tx.outputs[2].value,
-            height: None,
-        };
-        assert_eq!(vec![expected_unspent], unspents);
-    }
-
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/554
-    #[test]
-    fn order_should_be_cancelled_when_entire_balance_is_withdrawn() {
-        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"}},
-        ]);
-        let mm_bob = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "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": format!("0x{}", hex::encode(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);
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "999",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
-
-        log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "withdraw",
-            "coin": "MYCOIN",
-            "max": true,
-            "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
-        })))
-        .unwrap();
-        assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
-
-        let withdraw: Json = json::from_str(&withdraw.1).unwrap();
-
-        let send_raw = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "send_raw_transaction",
-            "coin": "MYCOIN",
-            "tx_hex": withdraw["tx_hex"],
-        })))
-        .unwrap();
-        assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
-
-        thread::sleep(Duration::from_secs(32));
-
-        log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        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! ({
-            "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());
-        assert!(
-            orders["result"]["maker_orders"].as_object().unwrap().is_empty(),
-            "maker_orders must be empty"
-        );
-
-        let rmd160 = rmd160_from_priv(priv_key);
-        let order_path = mm_bob.folder.join(format!(
-            "DB/{}/ORDERS/MY/MAKER/{}.json",
-            hex::encode(rmd160.take()),
-            bob_uuid,
-        ));
-        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_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"}},
-        ]);
-        let mm_bob = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "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": format!("0x{}", hex::encode(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);
-
-        let mm_alice = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": "alice passphrase",
-                "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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "999",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "withdraw",
-            "coin": "MYCOIN",
-            "amount": "499.99998",
-            "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
-        })))
-        .unwrap();
-        assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
-
-        let withdraw: Json = json::from_str(&withdraw.1).unwrap();
-
-        let send_raw = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "send_raw_transaction",
-            "coin": "MYCOIN",
-            "tx_hex": withdraw["tx_hex"],
-        })))
-        .unwrap();
-        assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
-
-        thread::sleep(Duration::from_secs(32));
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = bob_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        let order_volume = asks[0]["maxvolume"].as_str().unwrap();
-        assert_eq!("500", order_volume);
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = alice_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        let order_volume = asks[0]["maxvolume"].as_str().unwrap();
-        assert_eq!("500", order_volume);
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn order_should_be_updated_when_balance_is_decreased_alice_subscribes_before_update() {
-        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"}},
-        ]);
-        let mm_bob = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "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": format!("0x{}", hex::encode(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);
-
-        let mm_alice = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": "alice passphrase",
-                "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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "999",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "withdraw",
-            "coin": "MYCOIN",
-            "amount": "499.99998",
-            "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
-        })))
-        .unwrap();
-        assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
-
-        let withdraw: Json = json::from_str(&withdraw.1).unwrap();
-
-        let send_raw = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "send_raw_transaction",
-            "coin": "MYCOIN",
-            "tx_hex": withdraw["tx_hex"],
-        })))
-        .unwrap();
-        assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
-
-        thread::sleep(Duration::from_secs(32));
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = bob_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        let order_volume = asks[0]["maxvolume"].as_str().unwrap();
-        assert_eq!("500", order_volume);
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = alice_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        let order_volume = asks[0]["maxvolume"].as_str().unwrap();
-        assert_eq!("500", order_volume);
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_order_should_be_updated_when_matched_partially() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "1000",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "500",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = bob_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Bob MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        let order_volume = asks[0]["maxvolume"].as_str().unwrap();
-        assert_eq!("500", order_volume);
-
-        log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        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());
-        let asks = alice_orderbook["asks"].as_array().unwrap();
-        assert_eq!(asks.len(), 1, "Alice MYCOIN/MYCOIN1 orderbook must have exactly 1 ask");
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/471
-    #[test]
-    fn test_match_and_trade_setprice_max() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
-
-        log!("Get MYCOIN/MYCOIN1 orderbook");
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "999.99999",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(3));
-
-        let rmd160 = rmd160_from_priv(bob_priv_key);
-        let order_path = mm_bob.folder.join(format!(
-            "DB/{}/ORDERS/MY/MAKER/{}.json",
-            hex::encode(rmd160.take()),
-            bob_uuid,
-        ));
-        log!("Order path {}", order_path.display());
-        assert!(!order_path.exists());
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/888
-    fn test_max_taker_vol_swap() {
-        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 = block_on(MarketMakerIt::start_with_envs(
-            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,
-            &[("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 = block_on(MarketMakerIt::start_with_envs(
-            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,
-            &[("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", &[])));
-        let price = MmNumber::from((100, 1620));
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": price,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-        log!("{}", rc.1);
-        thread::sleep(Duration::from_secs(3));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-            "trade_with": "MYCOIN",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
-        let vol: MaxTakerVolResponse = json::from_str(&rc.1).unwrap();
-        let expected_vol = MmNumber::from((647499741, 12965000));
-
-        let actual_vol = MmNumber::from(vol.result.clone());
-        assert_eq!(expected_vol, actual_vol);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": "16",
-            "volume": vol.result,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-        let sell_res: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(3));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "my_swap_status",
-            "params": {
-                "uuid": sell_res.result.uuid
-            }
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!my_swap_status: {}", rc.1);
-
-        let status_response: Json = json::from_str(&rc.1).unwrap();
-        let events_array = status_response["result"]["events"].as_array().unwrap();
-        let first_event_type = events_array[0]["event"]["type"].as_str().unwrap();
-        assert_eq!("Started", first_event_type);
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_buy_when_coins_locked_by_other_swap() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // the result of equation x + x / 777 + 0.00002 = 1
-            "volume": {
-                "numer":"77698446",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .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(6));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // it is slightly more than previous volume so it should fail
-            // because the total sum of used funds will be slightly more than available 2
-            "volume": {
-                "numer":"77698447",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "buy success, but should fail: {}", rc.1);
-        assert!(rc.1.contains("Not enough MYCOIN1 for swap"), "{}", rc.1);
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_sell_when_coins_locked_by_other_swap() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": 1,
-            // the result of equation x + x / 777 + 0.00002 = 1
-            "volume": {
-                "numer":"77698446",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .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(6));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": 1,
-            // it is slightly more than previous volume so it should fail
-            // because the total sum of used funds will be slightly more than available 2
-            "volume": {
-                "numer":"77698447",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "sell success, but should fail: {}", rc.1);
-        assert!(rc.1.contains("Not enough MYCOIN1 for swap"), "{}", rc.1);
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_buy_max() {
-        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"}},
-        ]);
-        let 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",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // the result of equation x + x / 777 + 0.00002 = 1
-            "volume": {
-                "numer":"77698446",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // it is slightly more than previous volume so it should fail
-            "volume": {
-                "numer":"77698447",
-                "denom":"77800000"
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "buy success, but should fail: {}", rc.1);
-        // assert! (rc.1.contains("MYCOIN1 balance 1 is too low"));
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_maker_trade_preimage() {
-        let priv_key = SecretKey::new(&mut rand6::thread_rng());
-
-        let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", &priv_key[..]);
-        let my_address = mycoin.my_address().expect("!my_address");
-        fill_address(&mycoin, &my_address, 10.into(), 30);
-
-        let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", &priv_key[..]);
-        let my_address = mycoin1.my_address().expect("!my_address");
-        fill_address(&mycoin1, &my_address, 20.into(), 30);
-
-        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":2000,"protocol":{"type":"UTXO"}},
-        ]);
-        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();
-        let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
-
-        log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
-        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 1,
-                "max": true,
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
-        let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", true);
-        let volume = MmNumber::from("9.99999");
-
-        let my_coin_total = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0.00001");
-        let my_coin1_total = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0");
-
-        let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
-            base_coin_fee,
-            rel_coin_fee,
-            volume: Some(volume.to_decimal()),
-            volume_rat: Some(volume.to_ratio()),
-            volume_fraction: Some(volume.to_fraction()),
-            total_fees: vec![my_coin_total, my_coin1_total],
-        });
-
-        let mut actual: RpcSuccessResponse<TradePreimageResult> = json::from_str(&rc.1).unwrap();
-        actual.result.sort_total_fees();
-        assert_eq!(expected, actual.result);
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN1",
-                "rel": "MYCOIN",
-                "swap_method": "setprice",
-                "price": 1,
-                "max": true,
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let mut actual: RpcSuccessResponse<TradePreimageResult> = json::from_str(&rc.1).unwrap();
-        actual.result.sort_total_fees();
-
-        let base_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
-        let rel_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
-        let volume = MmNumber::from("19.99998");
-
-        let my_coin_total = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
-        let my_coin1_total = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0.00002");
-        let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
-            base_coin_fee,
-            rel_coin_fee,
-            volume: Some(volume.to_decimal()),
-            volume_rat: Some(volume.to_ratio()),
-            volume_fraction: Some(volume.to_fraction()),
-            total_fees: vec![my_coin_total, my_coin1_total],
-        });
-
-        actual.result.sort_total_fees();
-        assert_eq!(expected, actual.result);
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN1",
-                "rel": "MYCOIN",
-                "swap_method": "setprice",
-                "price": 1,
-                "volume": "19.99998",
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let mut actual: RpcSuccessResponse<TradePreimageResult> = json::from_str(&rc.1).unwrap();
-        actual.result.sort_total_fees();
-
-        let base_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
-        let rel_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
-
-        let total_my_coin = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
-        let total_my_coin1 = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0.00002");
-
-        let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
-            base_coin_fee,
-            rel_coin_fee,
-            volume: None,
-            volume_rat: None,
-            volume_fraction: None,
-            total_fees: vec![total_my_coin, total_my_coin1],
-        });
-
-        actual.result.sort_total_fees();
-        assert_eq!(expected, actual.result);
-    }
-
-    #[test]
-    fn test_taker_trade_preimage() {
-        let priv_key = SecretKey::new(&mut rand6::thread_rng());
-
-        let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key.as_ref());
-        let my_address = mycoin.my_address().expect("!my_address");
-        fill_address(&mycoin, &my_address, 10.into(), 30);
-
-        let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key.as_ref());
-        let my_address = mycoin1.my_address().expect("!my_address");
-        fill_address(&mycoin1, &my_address, 20.into(), 30);
-
-        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":2000,"protocol":{"type":"UTXO"}},
-        ]);
-        let mm = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(priv_key.as_ref())),
-                "coins": coins,
-                "rpc_password": "pass",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        // `max` field is not supported for `buy/sell` swap methods
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "sell",
-                "max": true,
-                "price": 1,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-
-        let actual: RpcErrorResponse<trade_preimage_error::InvalidParam> = json::from_str(&rc.1).unwrap();
-        assert_eq!(actual.error_type, "InvalidParam", "Unexpected error_type: {}", rc.1);
-        let expected = trade_preimage_error::InvalidParam {
-            param: "max".to_owned(),
-            reason: "'max' cannot be used with 'sell' or 'buy' method".to_owned(),
-        };
-        assert_eq!(actual.error_data, Some(expected));
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "sell",
-                "volume": "7.77",
-                "price": "2",
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-
-        let mut actual: RpcSuccessResponse<TradePreimageResult> = json::from_str(&rc.1).unwrap();
-        actual.result.sort_total_fees();
-
-        let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
-        let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", true);
-        let taker_fee = TradeFeeForTest::new("MYCOIN", "0.01", false);
-        let fee_to_send_taker_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
-
-        let my_coin_total_fee = TotalTradeFeeForTest::new("MYCOIN", "0.01002", "0.01002");
-        let my_coin1_total_fee = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0");
-
-        let expected = TradePreimageResult::TakerPreimage(TakerPreimage {
-            base_coin_fee,
-            rel_coin_fee,
-            taker_fee,
-            fee_to_send_taker_fee,
-            total_fees: vec![my_coin_total_fee, my_coin1_total_fee],
-        });
-        assert_eq!(expected, actual.result);
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "buy",
-                "volume": "7.77",
-                "price": "2",
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let mut actual: RpcSuccessResponse<TradePreimageResult> = json::from_str(&rc.1).unwrap();
-        actual.result.sort_total_fees();
-
-        let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
-        let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
-        let taker_fee = TradeFeeForTest::new("MYCOIN1", "0.02", false);
-        let fee_to_send_taker_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
-
-        let my_coin_total_fee = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
-        let my_coin1_total_fee = TotalTradeFeeForTest::new("MYCOIN1", "0.02004", "0.02004");
-
-        let expected = TradePreimageResult::TakerPreimage(TakerPreimage {
-            base_coin_fee,
-            rel_coin_fee,
-            taker_fee,
-            fee_to_send_taker_fee,
-            total_fees: vec![my_coin_total_fee, my_coin1_total_fee],
-        });
-        assert_eq!(expected, actual.result);
-    }
-
-    #[test]
-    fn test_trade_preimage_not_sufficient_balance() {
-        #[track_caller]
-        fn expect_not_sufficient_balance(
-            res: &str,
-            available: BigDecimal,
-            required: BigDecimal,
-            locked_by_swaps: Option<BigDecimal>,
-        ) {
-            let actual: RpcErrorResponse<trade_preimage_error::NotSufficientBalance> = json::from_str(res).unwrap();
-            assert_eq!(actual.error_type, "NotSufficientBalance");
-            let expected = trade_preimage_error::NotSufficientBalance {
-                coin: "MYCOIN".to_owned(),
-                available,
-                required,
-                locked_by_swaps,
-            };
-            assert_eq!(actual.error_data, Some(expected));
-        }
-
-        let priv_key = SecretKey::new(&mut rand6::thread_rng());
-        let fill_balance_functor = |amount: BigDecimal| {
-            let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key.as_ref());
-            let my_address = mycoin.my_address().expect("!my_address");
-            fill_address(&mycoin, &my_address, amount, 30);
-        };
-
-        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":2000,"protocol":{"type":"UTXO"}},
-        ]);
-        let mm = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(priv_key.as_ref())),
-                "coins": coins,
-                "rpc_password": "pass",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        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!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 1,
-                "max": true,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let available = MmNumber::from("0.000015").to_decimal();
-        // Required at least 0.00002 MYCOIN to pay the transaction_fee(0.00001) and to send a value not less than dust(0.00001).
-        let required = MmNumber::from("0.00002").to_decimal();
-        expect_not_sufficient_balance(&rc.1, available, required, None);
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 1,
-                "volume": 0.1,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        // Required 0.00001 MYCOIN to pay the transaction fee and the specified 0.1 volume.
-        let available = MmNumber::from("0.000015").to_decimal();
-        let required = MmNumber::from("0.10001").to_decimal();
-        expect_not_sufficient_balance(&rc.1, available, required, None);
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 1,
-                "max": true,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        // balance(0.000015)
-        let available = MmNumber::from("0.000015").to_decimal();
-        // balance(0.000015) + transaction_fee(0.00001)
-        let required = MmNumber::from("0.00002").to_decimal();
-        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!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "sell",
-                "price": 1,
-                "volume": 7.77,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let available = MmNumber::from("7.7701").to_decimal();
-        // `required = volume + fee_to_send_taker_payment + dex_fee + fee_to_send_dex_fee`,
-        // where `volume = 7.77`, `fee_to_send_taker_payment = fee_to_send_dex_fee = 0.00001`, `dex_fee = 0.01`.
-        // Please note `dex_fee = 7.77 / 777` with dex_fee = 0.01
-        // required = 7.77 + 0.01 (dex_fee) + (0.0001 * 2) = 7.78002
-        let required = MmNumber::from("7.78002");
-        expect_not_sufficient_balance(&rc.1, available, required.to_decimal(), Some(BigDecimal::from(0)));
-    }
-
-    /// This test ensures that `trade_preimage` will not succeed on input that will fail on `buy/sell/setprice`.
-    /// https://github.com/KomodoPlatform/atomicDEX-API/issues/902
-    #[test]
-    fn test_trade_preimage_additional_validation() {
-        let priv_key = SecretKey::new(&mut rand6::thread_rng());
-
-        let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key.as_ref());
-        let my_address = mycoin1.my_address().expect("!my_address");
-        fill_address(&mycoin1, &my_address, 20.into(), 30);
-
-        let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key.as_ref());
-        let my_address = mycoin.my_address().expect("!my_address");
-        fill_address(&mycoin, &my_address, 10.into(), 30);
-
-        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":2000,"protocol":{"type":"UTXO"}},
-        ]);
-        let mm = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(priv_key.as_ref())),
-                "coins": coins,
-                "rpc_password": "pass",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        // Price is too low
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 0,
-                "volume": 0.1,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let actual: RpcErrorResponse<trade_preimage_error::PriceTooLow> = json::from_str(&rc.1).unwrap();
-        assert_eq!(actual.error_type, "PriceTooLow");
-        // currently the minimum price is 0.00000001
-        let price_threshold = BigDecimal::from(1) / BigDecimal::from(100_000_000);
-        let expected = trade_preimage_error::PriceTooLow {
-            price: BigDecimal::from(0),
-            threshold: price_threshold,
-        };
-        assert_eq!(actual.error_data, Some(expected));
-
-        // 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!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "setprice",
-                "price": 1,
-                "volume": low_volume,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = json::from_str(&rc.1).unwrap();
-        assert_eq!(actual.error_type, "VolumeTooLow");
-        // Min MYCOIN trading volume is 0.0001.
-        let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
-        let expected = trade_preimage_error::VolumeTooLow {
-            coin: "MYCOIN".to_owned(),
-            volume: low_volume.clone(),
-            threshold: volume_threshold,
-        };
-        assert_eq!(actual.error_data, Some(expected));
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "sell",
-                "price": 1,
-                "volume": low_volume,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = json::from_str(&rc.1).unwrap();
-        assert_eq!(actual.error_type, "VolumeTooLow");
-        // Min MYCOIN trading volume is 0.0001.
-        let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
-        let expected = trade_preimage_error::VolumeTooLow {
-            coin: "MYCOIN".to_owned(),
-            volume: low_volume,
-            threshold: volume_threshold,
-        };
-        assert_eq!(actual.error_data, Some(expected));
-
-        // rel volume is too low
-        // Min MYCOIN trading volume is 0.0001.
-        let volume = BigDecimal::from(1) / BigDecimal::from(10_000);
-        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!({
-            "userpass": mm.userpass,
-            "mmrpc": "2.0",
-            "method": "trade_preimage",
-            "params": {
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "swap_method": "sell",
-                "price": low_price,
-                "volume": volume,
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = json::from_str(&rc.1).unwrap();
-        assert_eq!(actual.error_type, "VolumeTooLow");
-        // Min MYCOIN1 trading volume is 0.0001.
-        let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
-        let expected = trade_preimage_error::VolumeTooLow {
-            coin: "MYCOIN1".to_owned(),
-            volume: low_rel_volume,
-            threshold: volume_threshold,
-        };
-        assert_eq!(actual.error_data, Some(expected));
-    }
-
-    #[test]
-    fn test_trade_preimage_legacy() {
-        let priv_key = SecretKey::new(&mut rand6::thread_rng());
-        let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key.as_ref());
-        let my_address = mycoin.my_address().expect("!my_address");
-        fill_address(&mycoin, &my_address, 10.into(), 30);
-        let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key.as_ref());
-        let my_address = mycoin1.my_address().expect("!my_address");
-        fill_address(&mycoin1, &my_address, 20.into(), 30);
-
-        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":2000,"protocol":{"type":"UTXO"}},
-        ]);
-        let mm = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(priv_key.as_ref())),
-                "coins": coins,
-                "rpc_password": "pass",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "method": "trade_preimage",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "swap_method": "setprice",
-            "max": true,
-            "price": "1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let _: TradePreimageResponse = json::from_str(&rc.1).unwrap();
-
-        // vvv test a taker method vvv
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "method": "trade_preimage",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "swap_method": "sell",
-            "volume": "7.77",
-            "price": "2",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
-        let _: TradePreimageResponse = json::from_str(&rc.1).unwrap();
-
-        // vvv test the error response vvv
-
-        // `max` field is not supported for `buy/sell` swap methods
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "method": "trade_preimage",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "swap_method": "sell",
-            "max": true,
-            "price": "1",
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
-        assert!(rc
-            .1
-            .contains("Incorrect use of the 'max' parameter: 'max' cannot be used with 'sell' or 'buy' method"));
-    }
-
-    #[test]
-    fn test_get_max_taker_vol() {
-        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"}},
-        ]);
-        let 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",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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! ({
-            "userpass": mm_alice.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
-        let json: MaxTakerVolResponse = json::from_str(&rc.1).unwrap();
-        // the result of equation `max_vol + max_vol / 777 + 0.00002 = 1`
-        // derived from `max_vol = balance - locked - trade_fee - fee_to_send_taker_fee - dex_fee(max_vol)`
-        // where balance = 1, locked = 0, trade_fee = fee_to_send_taker_fee = 0.00001, dex_fee = max_vol / 777
-        let expected = MmNumber::from((38849223, 38900000)).to_fraction();
-        assert_eq!(json.result, expected);
-        assert_eq!(json.coin, "MYCOIN1");
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": 1,
-            "volume": json.result,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/733
-    #[test]
-    fn test_get_max_taker_vol_dex_fee_threshold() {
-        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"}},
-        ]);
-        let 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",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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! ({
-            "userpass": mm_alice.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        // the result of equation x + 0.0001 (dex fee) + 0.0002 (miner fee * 2) = 0.05328455
-        assert_eq!(json["result"]["numer"], Json::from("1059691"));
-        assert_eq!(json["result"]["denom"], Json::from("20000000"));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": 1,
-            "volume": {
-                "numer": json["result"]["numer"],
-                "denom": json["result"]["denom"],
-            }
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    /// Test if the `max_taker_vol` cannot return a volume less than the coin's dust.
-    /// The minimum required balance for trading can be obtained by solving the equation:
-    /// `volume + taker_fee + trade_fee + fee_to_send_taker_fee = x`.
-    /// Let `dust = 0.000728` like for Qtum, `trade_fee = 0.0001`, `fee_to_send_taker_fee = 0.0001` and `taker_fee` is the `0.000728` threshold,
-    /// therefore to find a minimum required balance, we should pass the `dust` as the `volume` into the equation above:
-    /// `2 * 0.000728 + 0.0002 = x`, so `x = 0.001656`
-    #[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_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},
-        ]);
-        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();
-        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", &[])));
-
-        let rc = block_on(mm.rpc(&json!({
-            "userpass": mm.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        let result: MmNumber = json::from_value(json["result"].clone()).unwrap();
-        assert!(result.is_zero());
-
-        fill_address(&coin, &coin.my_address().unwrap(), "0.00001".parse().unwrap(), 30);
-
-        let rc = block_on(mm.rpc(&json! ({
-            "userpass": mm.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        // the result of equation x + 0.000728 (dex fee) + 0.0002 (miner fee * 2) = 0.001666
-        assert_eq!(json["result"]["numer"], Json::from("369"));
-        assert_eq!(json["result"]["denom"], Json::from("500000"));
-
-        block_on(mm.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_get_max_taker_vol_with_kmd() {
-        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"}},
-            {"coin":"KMD","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
-        ]);
-        let 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",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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 electrum = block_on(enable_electrum(&mm_alice, "KMD", false, &[
-            "electrum1.cipig.net:10001",
-            "electrum2.cipig.net:10001",
-            "electrum3.cipig.net:10001",
-        ]));
-        log!("{:?}", electrum);
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "max_taker_vol",
-            "coin": "MYCOIN1",
-            "trade_with": "KMD",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
-        let json: Json = json::from_str(&rc.1).unwrap();
-        // the result of equation x + x * 9 / 7770 + 0.0002 = 1
-        assert_eq!(json["result"]["numer"], Json::from("1294741"));
-        assert_eq!(json["result"]["denom"], Json::from("1296500"));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "KMD",
-            "price": 1,
-            "volume": {
-                "numer": json["result"]["numer"],
-                "denom": json["result"]["denom"],
-            }
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_set_price_max() {
-        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"}},
-        ]);
-        let 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",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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! ({
-            "userpass": mm_alice.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // the result of equation x + 0.00001 = 1
-            "volume": {
-                "numer":"99999",
-                "denom":"100000"
-            },
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            // it is slightly more than previous volume so it should fail
-            "volume": {
-                "numer":"100000",
-                "denom":"100000"
-            },
-        })))
-        .unwrap();
-        assert!(!rc.0.is_success(), "setprice success, but should fail: {}", rc.1);
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn swaps_should_stop_on_stop_rpc() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let mut uuids = Vec::with_capacity(3);
-
-        for _ in 0..3 {
-            let rc = block_on(mm_alice.rpc(&json! ({
-                "userpass": mm_alice.userpass,
-                "method": "buy",
-                "base": "MYCOIN",
-                "rel": "MYCOIN1",
-                "price": 1,
-                "volume": "1",
-            })))
-            .unwrap();
-            assert!(rc.0.is_success(), "!buy: {}", rc.1);
-            let buy: Json = json::from_str(&rc.1).unwrap();
-            uuids.push(buy["result"]["uuid"].as_str().unwrap().to_owned());
-        }
-        for uuid in uuids.iter() {
-            block_on(mm_bob.wait_for_log(22., |log| {
-                log.contains(&format!(
-                    "Entering the maker_swap_loop MYCOIN/MYCOIN1 with uuid: {}",
-                    uuid
-                ))
-            }))
-            .unwrap();
-            block_on(mm_alice.wait_for_log(22., |log| {
-                log.contains(&format!(
-                    "Entering the taker_swap_loop MYCOIN/MYCOIN1 with uuid: {}",
-                    uuid
-                ))
-            }))
-            .unwrap();
-        }
-        thread::sleep(Duration::from_secs(3));
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-        for uuid in uuids {
-            block_on(mm_bob.wait_for_log_after_stop(22., |log| log.contains(&format!("swap {} stopped", uuid))))
-                .unwrap();
-            block_on(mm_alice.wait_for_log_after_stop(22., |log| log.contains(&format!("swap {} stopped", uuid))))
-                .unwrap();
-        }
-    }
-
-    #[test]
-    fn test_maker_order_should_kick_start_and_appear_in_orderbook_on_restart() {
-        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"}},
-        ]);
-        let mut bob_conf = 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,
-        });
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        // mm_bob using same DB dir that should kick start the order
-        bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
-        bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
-        block_on(mm_bob.stop()).unwrap();
-
-        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", &[])));
-
-        thread::sleep(Duration::from_secs(2));
-
-        log!("Get RICK/MORTY orderbook on Bob side");
-        let rc = block_on(mm_bob_dup.rpc(&json! ({
-            "userpass": mm_bob_dup.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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_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"}},
-        ]);
-        let mut bob_conf = 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,
-        });
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let res: SetPriceResponse = json::from_str(&rc.1).unwrap();
-        let uuid = res.result.uuid;
-
-        // mm_bob using same DB dir that should kick start the order
-        bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
-        bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
-        block_on(mm_bob.stop()).unwrap();
-
-        let withdraw = coin
-            .withdraw(WithdrawRequest::new_max(
-                "MYCOIN".to_string(),
-                "RRYmiZSDo3UdHHqj1rLKf8cbJroyv9NxXw".to_string(),
-            ))
-            .wait()
-            .unwrap();
-        coin.send_raw_tx(&hex::encode(&withdraw.tx_hex.0)).wait().unwrap();
-        coin.wait_for_confirmations(&withdraw.tx_hex.0, 1, false, (now_ms() / 1000) + 10, 1)
-            .wait()
-            .unwrap();
-
-        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", &[])));
-
-        thread::sleep(Duration::from_secs(2));
-
-        log!("Get RICK/MORTY orderbook on Bob side");
-        let rc = block_on(mm_bob_dup.rpc(&json! ({
-            "userpass": mm_bob_dup.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_bob_dup.userpass,
-            "method": "my_orders",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
-
-        let res: MyOrdersRpcResult = json::from_str(&rc.1).unwrap();
-        assert!(res.result.maker_orders.is_empty(), "Bob maker orders must be empty");
-
-        let order_path = mm_bob.folder.join(format!(
-            "DB/{}/ORDERS/MY/MAKER/{}.json",
-            hex::encode(rmd160_from_priv(bob_priv_key).take()),
-            uuid
-        ));
-
-        println!("Order path {}", order_path.display());
-        assert!(!order_path.exists());
-    }
-
-    #[test]
-    fn test_maker_order_kick_start_should_trigger_subscription_and_match() {
-        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"}},
-        ]);
-
-        let relay_conf = json! ({
-            "gui": "nogui",
-            "netid": 9000,
-            "dht": "on",  // Enable DHT without delay.
-            "passphrase": "relay",
-            "coins": coins,
-            "rpc_password": "pass",
-            "i_am_seed": true,
-        });
-        let relay = MarketMakerIt::start(relay_conf, "pass".to_string(), None).unwrap();
-        let (_relay_dump_log, _relay_dump_dashboard) = mm_dump(&relay.log_path);
-
-        let mut bob_conf = json! ({
-            "gui": "nogui",
-            "netid": 9000,
-            "dht": "on",  // Enable DHT without delay.
-            "passphrase": format!("0x{}", hex::encode(bob_priv_key)),
-            "coins": coins,
-            "rpc_password": "pass",
-            "seednodes": vec![format!("{}", relay.ip)],
-            "i_am_seed": false,
-        });
-        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);
-
-        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!("{}", relay.ip)],
-            }),
-            "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! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        // mm_bob using same DB dir that should kick start the order
-        bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
-        bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
-        block_on(mm_bob.stop()).unwrap();
-
-        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!("Give restarted Bob 2 seconds to kickstart the order");
-        thread::sleep(Duration::from_secs(2));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": 1,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob_dup.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-    }
-
-    #[test]
-    fn test_orders_should_match_on_both_nodes_with_same_priv() {
-        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"}},
-        ]);
-        let 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);
-
-        let mut mm_alice_1 = 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_1_dump_log, _alice_1_dump_dashboard) = mm_dump(&mm_alice_1.log_path);
-
-        let mut mm_alice_2 = 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_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", &[])));
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice_1.rpc(&json! ({
-            "userpass": mm_alice_1.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        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! ({
-            "userpass": mm_alice_2.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_alice_2.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice_1.stop()).unwrap();
-        block_on(mm_alice_2.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_maker_and_taker_order_created_with_same_priv_should_not_match() {
-        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"}},
-            {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        ]);
-        let mut mm_bob = 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 (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
-
-        let mut mm_alice = 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",
-                "seednodes": vec![format!("{}", mm_bob.ip)],
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": "1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(5., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap_err();
-        block_on(mm_alice.wait_for_log(5., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap_err();
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_taker_order_converted_to_maker_should_cancel_properly_when_matched() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": 1,
-            "timeout": 2,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        log!("Give Bob 4 seconds to convert order to maker");
-        thread::sleep(Duration::from_secs(4));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "volume": 1,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        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! ({
-            "userpass": mm_bob.userpass,
-            "method": "my_orders",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
-        let my_orders_json: Json = json::from_str(&rc.1).unwrap();
-        let maker_orders: HashMap<String, Json> =
-            json::from_value(my_orders_json["result"]["maker_orders"].clone()).unwrap();
-        assert!(maker_orders.is_empty());
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let bob_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-
-        let alice_orderbook: Json = json::from_str(&rc.1).unwrap();
-        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");
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    fn test_utxo_merge() {
-        let timeout = 30; // timeout if test takes more than 30 seconds to run
-        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);
-        fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
-        fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
-
-        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(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(privkey)),
-                "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);
-
-        let native = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "enable",
-            "coin": "MYCOIN",
-            "mm2": 1,
-            "utxo_merge_params": {
-                "merge_at": 2,
-                "check_every": 1,
-            }
-        })))
-        .unwrap();
-        assert!(native.0.is_success(), "'enable' failed: {}", 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();
-
-        block_on(mm_bob.wait_for_log(4., |log| log.contains("Trying to merge 5 UTXOs of coin MYCOIN"))).unwrap();
-
-        block_on(mm_bob.wait_for_log(4., |log| log.contains("UTXO merge successful for coin MYCOIN, tx_hash")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(2));
-        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_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);
-        fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
-        fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
-
-        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(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(privkey)),
-                "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);
-
-        let native = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "enable",
-            "coin": "MYCOIN",
-            "mm2": 1,
-            "utxo_merge_params": {
-                "merge_at": 3,
-                "check_every": 1,
-                "max_merge_at_once": 4,
-            }
-        })))
-        .unwrap();
-        assert!(native.0.is_success(), "'enable' failed: {}", 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();
-
-        block_on(mm_bob.wait_for_log(4., |log| log.contains("Trying to merge 4 UTXOs of coin MYCOIN"))).unwrap();
-
-        block_on(mm_bob.wait_for_log(4., |log| log.contains("UTXO merge successful for coin MYCOIN, tx_hash")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(2));
-        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);
-    }
-
-    #[test]
-    fn test_withdraw_not_sufficient_balance() {
-        let privkey = SecretKey::new(&mut rand6::thread_rng());
-        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 mm = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(privkey.as_ref())),
-                "coins": coins,
-                "rpc_password": "pass",
-                "i_am_seed": true,
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .unwrap();
-        let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm.log_path);
-        log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
-
-        // balance = 0, but amount = 1
-        let amount = BigDecimal::from(1);
-        let withdraw = block_on(mm.rpc(&json! ({
-            "mmrpc": "2.0",
-            "userpass": mm.userpass,
-            "method": "withdraw",
-            "params": {
-                "coin": "MYCOIN",
-                "to": "RJTYiYeJ8eVvJ53n2YbrVmxWNNMVZjDGLh",
-                "amount": amount,
-            },
-            "id": 0,
-        })))
-        .unwrap();
-
-        assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", 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 {
-            coin: "MYCOIN".to_owned(),
-            available: 0.into(),
-            required: amount,
-        };
-        assert_eq!(error.error_type, "NotSufficientBalance");
-        assert_eq!(error.error_data, Some(expected_error));
-
-        // fill the MYCOIN balance
-        let balance = BigDecimal::from(1) / BigDecimal::from(2);
-        let (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", privkey.as_ref());
-        fill_address(&coin, &coin.my_address().unwrap(), balance.clone(), 30);
-
-        // 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! ({
-            "mmrpc": "2.0",
-            "userpass": mm.userpass,
-            "method": "withdraw",
-            "params": {
-                "coin": "MYCOIN",
-                "to": "RJTYiYeJ8eVvJ53n2YbrVmxWNNMVZjDGLh",
-                "amount": balance,
-            },
-            "id": 0,
-        })))
-        .unwrap();
-
-        assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", 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 {
-            coin: "MYCOIN".to_owned(),
-            available: balance.clone(),
-            required: balance + txfee,
-        };
-        assert_eq!(error.error_type, "NotSufficientBalance");
-        assert_eq!(error.error_data, Some(expected_error));
-    }
-
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/1053
-    #[test]
-    fn test_taker_should_match_with_best_price_buy() {
-        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"}},
-            {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        ]);
-        let 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);
-
-        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);
-
-        let mut mm_eve = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(eve_priv_key)),
-                "coins": coins,
-                "rpc_password": "pass",
-                "seednodes": vec![format!("{}", mm_bob.ip)],
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 2,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_eve.rpc(&json! ({
-            "userpass": mm_eve.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        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! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
-        log!("alice orderbook {}", rc.1);
-
-        thread::sleep(Duration::from_secs(1));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 3,
-            "volume": "1000",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-        let alice_buy: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
-
-        block_on(mm_eve.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(2));
-
-        block_on(check_my_swap_status_amounts(
-            &mm_alice,
-            alice_buy.result.uuid,
-            1000.into(),
-            1000.into(),
-        ));
-        block_on(check_my_swap_status_amounts(
-            &mm_eve,
-            alice_buy.result.uuid,
-            1000.into(),
-            1000.into(),
-        ));
-
-        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/1053
-    #[test]
-    fn test_taker_should_match_with_best_price_sell() {
-        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"}},
-            {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":1000,"protocol":{"type":"UTXO"}},
-        ]);
-        let 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);
-
-        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);
-
-        let mut mm_eve = MarketMakerIt::start(
-            json! ({
-                "gui": "nogui",
-                "netid": 9000,
-                "dht": "on",  // Enable DHT without delay.
-                "passphrase": format!("0x{}", hex::encode(eve_priv_key)),
-                "coins": coins,
-                "rpc_password": "pass",
-                "seednodes": vec![format!("{}", mm_bob.ip)],
-            }),
-            "pass".to_string(),
-            None,
-        )
-        .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", &[])));
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 2,
-            "max": true,
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_eve.rpc(&json! ({
-            "userpass": mm_eve.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-            "price": 1,
-            "max": true,
-        })))
-        .unwrap();
-        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! ({
-            "userpass": mm_alice.userpass,
-            "method": "orderbook",
-            "base": "MYCOIN",
-            "rel": "MYCOIN1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
-        log!("alice orderbook {}", rc.1);
-
-        thread::sleep(Duration::from_secs(1));
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "MYCOIN1",
-            "rel": "MYCOIN",
-            "price": "0.1",
-            "volume": "1000",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-        let alice_buy: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
-
-        block_on(mm_eve.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1")))
-            .unwrap();
-
-        thread::sleep(Duration::from_secs(2));
-
-        block_on(check_my_swap_status_amounts(
-            &mm_alice,
-            alice_buy.result.uuid,
-            1000.into(),
-            1000.into(),
-        ));
-        block_on(check_my_swap_status_amounts(
-            &mm_eve,
-            alice_buy.result.uuid,
-            1000.into(),
-            1000.into(),
-        ));
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-        block_on(mm_eve.stop()).unwrap();
-    }
-
-    #[test]
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
-    fn test_match_utxo_with_eth_taker_sell() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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
-        fill_eth(&eth_bob.address[2..]);
-
-        let eth_alice = block_on(enable_native(&mm_alice, "ETH", &["http://195.201.0.6:8565"]));
-        let eth_alice: EnableElectrumResponse = json::from_value(eth_alice).unwrap();
-        // pass without 0x
-        fill_eth(&eth_alice.address[2..]);
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "ETH",
-            "price": 1,
-            "volume": "0.1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "sell",
-            "base": "ETH",
-            "rel": "MYCOIN",
-            "price": 1,
-            "volume": "0.1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!sell: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/ETH"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/ETH"))).unwrap();
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-
-    #[test]
-    // https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
-    fn test_match_utxo_with_eth_taker_buy() {
-        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"}},
-        ]);
-        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);
-
-        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);
-
-        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
-        fill_eth(&eth_bob.address[2..]);
-
-        let eth_alice = block_on(enable_native(&mm_alice, "ETH", &["http://195.201.0.6:8565"]));
-        let eth_alice: EnableElectrumResponse = json::from_value(eth_alice).unwrap();
-        // pass without 0x
-        fill_eth(&eth_alice.address[2..]);
-
-        let rc = block_on(mm_bob.rpc(&json! ({
-            "userpass": mm_bob.userpass,
-            "method": "setprice",
-            "base": "MYCOIN",
-            "rel": "ETH",
-            "price": 1,
-            "volume": "0.1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-
-        let rc = block_on(mm_alice.rpc(&json! ({
-            "userpass": mm_alice.userpass,
-            "method": "buy",
-            "base": "MYCOIN",
-            "rel": "ETH",
-            "price": 1,
-            "volume": "0.1",
-        })))
-        .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-
-        block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/ETH"))).unwrap();
-        block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/ETH"))).unwrap();
-
-        block_on(mm_bob.stop()).unwrap();
-        block_on(mm_alice.stop()).unwrap();
-    }
-}
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_expected.json
new file mode 100644
index 0000000000..180cade8d2
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_expected.json
@@ -0,0 +1,62 @@
+{
+    "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","MakerPaymentInstructionsReceived","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],
+        "error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed","MakerPaymentRefundFinished"]
+    }
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_maker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_maker_expected.json
new file mode 100644
index 0000000000..4e95aa537a
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_maker_expected.json
@@ -0,0 +1,53 @@
+{
+    "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","MakerPaymentInstructionsReceived","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed","MakerPaymentRefundFinished"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json
new file mode 100644
index 0000000000..4be55eef01
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json
@@ -0,0 +1,54 @@
+{
+    "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","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json
new file mode 100644
index 0000000000..21760c177e
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_maker_swap_taker_saved.json
@@ -0,0 +1,66 @@
+{
+    "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","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_maker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_maker_saved.json
new file mode 100644
index 0000000000..e33610e2f1
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_maker_saved.json
@@ -0,0 +1,67 @@
+{
+  "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","MakerPaymentInstructionsReceived","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],
+      "error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json
new file mode 100644
index 0000000000..6fb8382594
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_expected.json
@@ -0,0 +1,62 @@
+{
+    "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","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+                "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_maker_saved.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_maker_saved.json
new file mode 100644
index 0000000000..3e0ab14910
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_maker_saved.json
@@ -0,0 +1,66 @@
+{
+    "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","MakerPaymentInstructionsReceived","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","MakerPaymentWaitConfirmFailed","TakerPaymentValidateFailed","TakerPaymentWaitConfirmFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentWaitRefundStarted","MakerPaymentRefunded","MakerPaymentRefundFailed"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json
new file mode 100644
index 0000000000..30c4b256aa
--- /dev/null
+++ b/mm2src/mm2_main/src/for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_taker_expected.json
@@ -0,0 +1,58 @@
+{
+    "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","TakerPaymentInstructionsReceived","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],
+    "error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","MakerPaymentWaitConfirmFailed","TakerPaymentTransactionFailed","TakerPaymentWaitConfirmFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentWaitRefundStarted","TakerPaymentRefundStarted","TakerPaymentRefunded","TakerPaymentRefundFailed","TakerPaymentRefundFinished"]
+}
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/lib.rs b/mm2src/mm2_main/src/lib.rs
new file mode 100644
index 0000000000..b72f558765
--- /dev/null
+++ b/mm2src/mm2_main/src/lib.rs
@@ -0,0 +1,12 @@
+#![feature(hash_raw_entry)]
+
+#[macro_use] extern crate common;
+#[macro_use] extern crate gstuff;
+#[macro_use] extern crate serde_json;
+#[macro_use] extern crate serde_derive;
+#[macro_use] extern crate ser_error_derive;
+#[cfg(test)] extern crate mm2_test_helpers;
+
+pub mod mm2;
+
+#[cfg(all(target_arch = "wasm32", test))] mod wasm_tests;
diff --git a/mm2src/mm2_main/src/lp_init/init_context.rs b/mm2src/mm2_main/src/lp_init/init_context.rs
index 32d8c24214..e1c045c098 100644
--- a/mm2src/mm2_main/src/lp_init/init_context.rs
+++ b/mm2src/mm2_main/src/lp_init/init_context.rs
@@ -1,10 +1,14 @@
 use crate::mm2::lp_native_dex::init_hw::InitHwTaskManagerShared;
+#[cfg(target_arch = "wasm32")]
+use crate::mm2::lp_native_dex::init_metamask::InitMetamaskManagerShared;
 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,
+    #[cfg(target_arch = "wasm32")]
+    pub init_metamask_manager: InitMetamaskManagerShared,
 }
 
 impl MmInitContext {
@@ -13,6 +17,8 @@ impl MmInitContext {
         from_ctx(&ctx.mm_init_ctx, move || {
             Ok(MmInitContext {
                 init_hw_task_manager: RpcTaskManager::new_shared(),
+                #[cfg(target_arch = "wasm32")]
+                init_metamask_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
index e5970e6174..726bea7967 100644
--- a/mm2src/mm2_main/src/lp_init/init_hw.rs
+++ b/mm2src/mm2_main/src/lp_init/init_hw.rs
@@ -3,12 +3,15 @@ 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 crypto::{from_hw_error, CryptoCtx, CryptoCtxError, HwCtxInitError, HwDeviceInfo, HwError, HwPubkey, HwRpcError,
+             HwWalletType, WithHwRpcError};
 use derive_more::Display;
+use enum_from::EnumFromTrait;
 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::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest, RpcTaskUserActionError};
 use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
 use std::time::Duration;
 
@@ -19,59 +22,54 @@ pub type InitHwAwaitingStatus = HwRpcTaskAwaitingStatus;
 pub type InitHwUserAction = HwRpcTaskUserAction;
 
 pub type InitHwTaskManagerShared = RpcTaskManagerShared<InitHwTask>;
-pub type InitHwStatus = RpcTaskStatus<SuccessResponse, InitHwError, InitHwInProgressStatus, InitHwAwaitingStatus>;
+pub type InitHwStatus = RpcTaskStatus<InitHwResponse, InitHwError, InitHwInProgressStatus, InitHwAwaitingStatus>;
 type InitHwTaskHandle = RpcTaskHandle<InitHwTask>;
 
-#[derive(Clone, Display, Serialize, SerializeErrorType)]
+#[derive(Clone, Display, EnumFromTrait, 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,
+    #[from_trait(WithHwRpcError::hw_rpc_error)]
+    #[display(fmt = "{}", _0)]
+    HwError(HwRpcError),
+    #[display(fmt = "RPC 'task' is awaiting '{}' user action", expected)]
+    UnexpectedUserAction { expected: String },
+    #[from_trait(WithTimeout::timeout)]
     #[display(fmt = "RPC timed out {:?}", _0)]
     Timeout(Duration),
+    #[from_trait(WithInternal::internal)]
     #[display(fmt = "Internal: {}", _0)]
     Internal(String),
 }
 
-impl From<CryptoInitError> for InitHwError {
-    fn from(e: CryptoInitError) -> Self { InitHwError::Internal(e.to_string()) }
+impl From<HwError> for InitHwError {
+    fn from(hw_error: HwError) -> Self { from_hw_error(hw_error) }
+}
+
+impl From<CryptoCtxError> for InitHwError {
+    fn from(e: CryptoCtxError) -> 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::UnexpectedPubkey { .. } => InitHwError::HwError(HwRpcError::FoundUnexpectedDevice),
             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::Cancelled => InitHwError::Internal("Cancelled".to_owned()),
             RpcTaskError::Timeout(timeout) => InitHwError::Timeout(timeout),
             RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => InitHwError::Internal(error),
+            RpcTaskError::UnexpectedUserAction { expected } => InitHwError::UnexpectedUserAction { expected },
             RpcTaskError::Internal(internal) => InitHwError::Internal(internal),
         }
     }
@@ -80,13 +78,12 @@ impl From<RpcTaskError> for InitHwError {
 impl HttpStatusCode for InitHwError {
     fn status_code(&self) -> StatusCode {
         match self {
-            InitHwError::HwContextInitializingAlready | InitHwError::HwContextInitializedAlready => {
+            InitHwError::HwContextInitializingAlready | InitHwError::UnexpectedUserAction { .. } => {
                 StatusCode::BAD_REQUEST
             },
+            InitHwError::HwError(_) => StatusCode::GONE,
             InitHwError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
-            InitHwError::TrezorInternal(_) | InitHwError::NoTrezorDeviceAvailable | InitHwError::Internal(_) => {
-                StatusCode::INTERNAL_SERVER_ERROR
-            },
+            InitHwError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }
@@ -95,16 +92,29 @@ impl HttpStatusCode for InitHwError {
 pub enum InitHwInProgressStatus {
     Initializing,
     WaitingForTrezorToConnect,
-    ReadPublicKeyFromTrezor,
+    FollowHwDeviceInstructions,
+}
+
+#[derive(Deserialize)]
+pub struct InitHwRequest {
+    device_pubkey: Option<HwPubkey>,
+}
+
+#[derive(Clone, Serialize)]
+pub struct InitHwResponse {
+    #[serde(flatten)]
+    device_info: HwDeviceInfo,
+    device_pubkey: HwPubkey,
 }
 
 pub struct InitHwTask {
     ctx: MmArc,
     hw_wallet_type: HwWalletType,
+    req: InitHwRequest,
 }
 
 impl RpcTaskTypes for InitHwTask {
-    type Item = SuccessResponse;
+    type Item = InitHwResponse;
     type Error = InitHwError;
     type InProgressStatus = InitHwInProgressStatus;
     type AwaitingStatus = InitHwAwaitingStatus;
@@ -115,7 +125,13 @@ impl RpcTaskTypes for InitHwTask {
 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>> {
+    async fn cancel(self) {
+        if let Ok(crypto_ctx) = CryptoCtx::from_ctx(&self.ctx) {
+            crypto_ctx.reset_hw_ctx()
+        }
+    }
+
+    async fn run(&mut self, task_handle: &InitHwTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
         let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
 
         match self.hw_wallet_type {
@@ -124,30 +140,36 @@ impl RpcTask for InitHwTask {
                     on_connect: InitHwInProgressStatus::WaitingForTrezorToConnect,
                     on_connected: InitHwInProgressStatus::Initializing,
                     on_connection_failed: InitHwInProgressStatus::Initializing,
-                    on_button_request: InitHwInProgressStatus::ReadPublicKeyFromTrezor,
-                    on_pin_request: InitHwAwaitingStatus::WaitForTrezorPin,
+                    on_button_request: InitHwInProgressStatus::FollowHwDeviceInstructions,
+                    on_pin_request: InitHwAwaitingStatus::EnterTrezorPin,
+                    on_passphrase_request: InitHwAwaitingStatus::EnterTrezorPassphrase,
                     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?;
+                let (device_info, hw_ctx) = crypto_ctx
+                    .init_hw_ctx_with_trezor(&trezor_connect_processor, self.req.device_pubkey)
+                    .await?;
+                let device_pubkey = hw_ctx.hw_pubkey();
+                Ok(InitHwResponse {
+                    device_info,
+                    device_pubkey,
+                })
             },
         }
-        Ok(SuccessResponse::new())
     }
 }
 
-#[derive(Deserialize)]
-pub struct InitTrezorRequest;
-
-pub async fn init_trezor(ctx: MmArc, _req: InitTrezorRequest) -> MmResult<InitRpcTaskResponse, InitHwError> {
+pub async fn init_trezor(ctx: MmArc, req: InitHwRequest) -> MmResult<InitRpcTaskResponse, InitHwError> {
     let init_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(InitHwError::Internal)?;
+    let spawner = ctx.spawner();
     let task = InitHwTask {
         ctx,
         hw_wallet_type: HwWalletType::Trezor,
+        req,
     };
-    let task_id = RpcTaskManager::spawn_rpc_task(&init_ctx.init_hw_task_manager, task)?;
+    let task_id = RpcTaskManager::spawn_rpc_task(&init_ctx.init_hw_task_manager, &spawner, task)?;
     Ok(InitRpcTaskResponse { task_id })
 }
 
@@ -174,3 +196,16 @@ pub async fn init_trezor_user_action(
     task_manager.on_user_action(req.task_id, req.user_action)?;
     Ok(SuccessResponse::new())
 }
+
+pub async fn cancel_init_trezor(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let coins_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = coins_ctx
+        .init_hw_task_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
diff --git a/mm2src/mm2_main/src/lp_init/init_metamask.rs b/mm2src/mm2_main/src/lp_init/init_metamask.rs
new file mode 100644
index 0000000000..b362920a54
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_init/init_metamask.rs
@@ -0,0 +1,168 @@
+use crate::mm2::lp_native_dex::init_context::MmInitContext;
+use async_trait::async_trait;
+use common::{HttpStatusCode, SerdeInfallible, SuccessResponse};
+use crypto::metamask::{from_metamask_error, MetamaskError, MetamaskRpcError, WithMetamaskRpcError};
+use crypto::{CryptoCtx, CryptoCtxError, MetamaskCtxInitError};
+use derive_more::Display;
+use enum_from::EnumFromTrait;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::common_errors::WithInternal;
+use mm2_err_handle::prelude::*;
+use rpc_task::rpc_common::{CancelRpcTaskError, CancelRpcTaskRequest, InitRpcTaskResponse, RpcTaskStatusError,
+                           RpcTaskStatusRequest};
+use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskManager, RpcTaskManagerShared, RpcTaskStatus, RpcTaskTypes};
+use std::time::Duration;
+
+pub type InitMetamaskManagerShared = RpcTaskManagerShared<InitMetamaskTask>;
+pub type InitMetamaskStatus =
+    RpcTaskStatus<InitMetamaskResponse, InitMetamaskError, InitMetamaskInProgressStatus, InitMetamaskAwaitingStatus>;
+
+type InitMetamaskUserAction = SerdeInfallible;
+type InitMetamaskAwaitingStatus = SerdeInfallible;
+type InitMetamaskTaskHandle = RpcTaskHandle<InitMetamaskTask>;
+
+#[derive(Clone, Display, EnumFromTrait, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum InitMetamaskError {
+    #[display(fmt = "MetaMask is initializing already")]
+    MetamaskInitializingAlready,
+    #[from_trait(WithMetamaskRpcError::metamask_rpc_error)]
+    MetamaskError(MetamaskRpcError),
+    #[display(fmt = "RPC timed out {:?}", _0)]
+    Timeout(Duration),
+    #[display(fmt = "Internal: {}", _0)]
+    #[from_trait(WithInternal::internal)]
+    Internal(String),
+}
+
+impl From<CryptoCtxError> for InitMetamaskError {
+    fn from(value: CryptoCtxError) -> Self { InitMetamaskError::Internal(value.to_string()) }
+}
+
+impl From<MetamaskCtxInitError> for InitMetamaskError {
+    fn from(value: MetamaskCtxInitError) -> Self {
+        match value {
+            MetamaskCtxInitError::InitializingAlready => InitMetamaskError::MetamaskInitializingAlready,
+            MetamaskCtxInitError::MetamaskError(metamask) => InitMetamaskError::from(metamask),
+        }
+    }
+}
+
+impl From<MetamaskError> for InitMetamaskError {
+    fn from(metamask: MetamaskError) -> Self { from_metamask_error(metamask) }
+}
+
+impl From<RpcTaskError> for InitMetamaskError {
+    fn from(e: RpcTaskError) -> Self {
+        let error = e.to_string();
+        match e {
+            RpcTaskError::Cancelled => InitMetamaskError::Internal("Cancelled".to_owned()),
+            RpcTaskError::Timeout(timeout) => InitMetamaskError::Timeout(timeout),
+            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => {
+                InitMetamaskError::Internal(error)
+            },
+            RpcTaskError::UnexpectedUserAction { .. } => {
+                InitMetamaskError::Internal("Unexpected user action".to_string())
+            },
+            RpcTaskError::Internal(internal) => InitMetamaskError::Internal(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for InitMetamaskError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            InitMetamaskError::MetamaskInitializingAlready => StatusCode::BAD_REQUEST,
+            InitMetamaskError::Timeout(_) => StatusCode::REQUEST_TIMEOUT,
+            InitMetamaskError::MetamaskError(_) | InitMetamaskError::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+#[derive(Clone, Deserialize, Serialize)]
+pub enum InitMetamaskInProgressStatus {
+    Initializing,
+    SigningLoginMetadata,
+}
+
+#[derive(Deserialize)]
+pub struct InitMetamaskRequest {
+    project: String,
+}
+
+#[derive(Clone, Serialize)]
+pub struct InitMetamaskResponse {
+    eth_address: String,
+}
+
+pub struct InitMetamaskTask {
+    ctx: MmArc,
+    req: InitMetamaskRequest,
+}
+
+impl RpcTaskTypes for InitMetamaskTask {
+    type Item = InitMetamaskResponse;
+    type Error = InitMetamaskError;
+    type InProgressStatus = InitMetamaskInProgressStatus;
+    type AwaitingStatus = SerdeInfallible;
+    type UserAction = SerdeInfallible;
+}
+
+#[async_trait]
+impl RpcTask for InitMetamaskTask {
+    fn initial_status(&self) -> Self::InProgressStatus { InitMetamaskInProgressStatus::Initializing }
+
+    async fn cancel(self) {
+        if let Ok(crypto_ctx) = CryptoCtx::from_ctx(&self.ctx) {
+            crypto_ctx.reset_metamask_ctx();
+        }
+    }
+
+    async fn run(&mut self, _task_handle: &InitMetamaskTaskHandle) -> Result<Self::Item, MmError<Self::Error>> {
+        let crypto_ctx = CryptoCtx::from_ctx(&self.ctx)?;
+
+        let metamask = crypto_ctx.init_metamask_ctx(self.req.project.clone()).await?;
+        Ok(InitMetamaskResponse {
+            eth_address: metamask.eth_account_str().to_string(),
+        })
+    }
+}
+
+pub async fn connect_metamask(
+    ctx: MmArc,
+    req: InitMetamaskRequest,
+) -> MmResult<InitRpcTaskResponse, InitMetamaskError> {
+    let init_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(InitMetamaskError::Internal)?;
+    let spawner = ctx.spawner();
+    let task = InitMetamaskTask { ctx, req };
+    let task_id = RpcTaskManager::spawn_rpc_task(&init_ctx.init_metamask_manager, &spawner, task)?;
+    Ok(InitRpcTaskResponse { task_id })
+}
+
+pub async fn connect_metamask_status(
+    ctx: MmArc,
+    req: RpcTaskStatusRequest,
+) -> MmResult<InitMetamaskStatus, RpcTaskStatusError> {
+    let init_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(RpcTaskStatusError::Internal)?;
+    let mut task_manager = init_ctx
+        .init_metamask_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 cancel_connect_metamask(
+    ctx: MmArc,
+    req: CancelRpcTaskRequest,
+) -> MmResult<SuccessResponse, CancelRpcTaskError> {
+    let init_ctx = MmInitContext::from_ctx(&ctx).map_to_mm(CancelRpcTaskError::Internal)?;
+    let mut task_manager = init_ctx
+        .init_metamask_manager
+        .lock()
+        .map_to_mm(|e| CancelRpcTaskError::Internal(e.to_string()))?;
+    task_manager.cancel_task(req.task_id)?;
+    Ok(SuccessResponse::new())
+}
diff --git a/mm2src/mm2_main/src/lp_native_dex.rs b/mm2src/mm2_main/src/lp_native_dex.rs
index 967f5cd413..d79b2b75cc 100644
--- a/mm2src/mm2_main/src/lp_native_dex.rs
+++ b/mm2src/mm2_main/src/lp_native_dex.rs
@@ -20,13 +20,17 @@
 
 use bitcrypto::sha256;
 use coins::register_balance_update_handler;
-use common::executor::{spawn, spawn_boxed, Timer};
+use common::executor::{SpawnFuture, Timer};
 use common::log::{info, warn};
-use crypto::{CryptoCtx, CryptoInitError, HwError, HwProcessingError};
+use crypto::{from_hw_error, CryptoCtx, CryptoInitError, HwError, HwProcessingError, HwRpcError, WithHwRpcError};
 use derive_more::Display;
+use enum_from::EnumFromTrait;
 use mm2_core::mm_ctx::{MmArc, MmCtx};
+use mm2_err_handle::common_errors::InternalError;
 use mm2_err_handle::prelude::*;
-use mm2_libp2p::{spawn_gossipsub, AdexBehaviourError, NodeType, RelayAddress, RelayAddressError, WssCerts};
+use mm2_libp2p::{spawn_gossipsub, AdexBehaviourError, NodeType, RelayAddress, RelayAddressError, SwarmRuntime,
+                 WssCerts};
+use mm2_metrics::mm_gauge;
 use rpc_task::RpcTaskError;
 use serde_json::{self as json};
 use std::fs;
@@ -44,7 +48,6 @@ use crate::mm2::lp_ordermatch::{broadcast_maker_orders_keep_alive_loop, clean_me
                                 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};
@@ -54,6 +57,9 @@ cfg_native! {
 
 #[path = "lp_init/init_context.rs"] mod init_context;
 #[path = "lp_init/init_hw.rs"] pub mod init_hw;
+#[cfg(target_arch = "wasm32")]
+#[path = "lp_init/init_metamask.rs"]
+pub mod init_metamask;
 
 const NETID_7777_SEEDNODES: [&str; 3] = ["seed1.defimania.live", "seed2.defimania.live", "seed3.defimania.live"];
 
@@ -99,10 +105,11 @@ impl From<AdexBehaviourError> for P2PInitError {
     }
 }
 
-#[derive(Clone, Debug, Display, Serialize, SerializeErrorType)]
+#[derive(Clone, Debug, Display, EnumFromTrait, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum MmInitError {
-    Canceled,
+    Cancelled,
+    #[from_trait(WithTimeout::timeout)]
     #[display(fmt = "Initialization timeout {:?}", _0)]
     Timeout(Duration),
     #[display(fmt = "Error deserializing '{}' config field: {}", field, error)]
@@ -114,6 +121,11 @@ pub enum MmInitError {
     FieldNotFoundInConfig {
         field: String,
     },
+    #[display(fmt = "The '{}' field has wrong value in the config: {}", field, error)]
+    FieldWrongValueInConfig {
+        field: String,
+        error: String,
+    },
     #[display(fmt = "P2P initializing error: '{}'", _0)]
     P2PError(P2PInitError),
     #[display(fmt = "Error creating DB director '{:?}': {}", path, error)]
@@ -137,13 +149,14 @@ pub enum MmInitError {
     SwapsKickStartError(String),
     #[display(fmt = "Order kick start error: {}", _0)]
     OrdersKickStartError(String),
-    NullStringPassphrase,
+    #[display(fmt = "Passphrase cannot be an empty string")]
+    EmptyPassphrase,
     #[display(fmt = "Invalid passphrase: {}", _0)]
     InvalidPassphrase(String),
-    #[display(fmt = "No Trezor device available")]
-    NoTrezorDeviceAvailable,
-    #[display(fmt = "Hardware Wallet error: {}", _0)]
-    HardwareWalletError(String),
+    #[from_trait(WithHwRpcError::hw_rpc_error)]
+    #[display(fmt = "{}", _0)]
+    HwError(HwRpcError),
+    #[from_trait(WithInternal::internal)]
     #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
@@ -193,30 +206,30 @@ impl From<CryptoInitError> for MmInitError {
             e @ CryptoInitError::InitializedAlready | e @ CryptoInitError::NotInitialized => {
                 MmInitError::Internal(e.to_string())
             },
-            CryptoInitError::NullStringPassphrase => MmInitError::NullStringPassphrase,
+            CryptoInitError::EmptyPassphrase => MmInitError::EmptyPassphrase,
             CryptoInitError::InvalidPassphrase(pass) => MmInitError::InvalidPassphrase(pass.to_string()),
+            CryptoInitError::InvalidHdAccount { error, .. } => MmInitError::FieldWrongValueInConfig {
+                field: "hd_account".to_string(),
+                error,
+            },
             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()),
-        }
-    }
+    fn from(e: HwError) -> Self { from_hw_error(e) }
 }
 
 impl From<RpcTaskError> for MmInitError {
     fn from(e: RpcTaskError) -> Self {
         let error = e.to_string();
         match e {
-            RpcTaskError::Canceled => MmInitError::Canceled,
+            RpcTaskError::Cancelled => MmInitError::Cancelled,
             RpcTaskError::Timeout(timeout) => MmInitError::Timeout(timeout),
-            RpcTaskError::NoSuchTask(_) | RpcTaskError::UnexpectedTaskStatus { .. } => MmInitError::Internal(error),
+            RpcTaskError::NoSuchTask(_)
+            | RpcTaskError::UnexpectedTaskStatus { .. }
+            | RpcTaskError::UnexpectedUserAction { .. } => MmInitError::Internal(error),
             RpcTaskError::Internal(internal) => MmInitError::Internal(internal),
         }
     }
@@ -231,6 +244,10 @@ impl From<HwProcessingError<RpcTaskError>> for MmInitError {
     }
 }
 
+impl From<InternalError> for MmInitError {
+    fn from(e: InternalError) -> Self { MmInitError::Internal(e.take()) }
+}
+
 impl MmInitError {
     pub fn db_directory_is_not_writable(path: &str) -> MmInitError {
         MmInitError::DbDirectoryIsNotWritable { path: path.to_owned() }
@@ -255,7 +272,7 @@ fn default_seednodes(netid: u16) -> Vec<RelayAddress> {
     if netid == 7777 {
         NETID_7777_SEEDNODES
             .iter()
-            .filter_map(|seed| addr_to_ipv4_string(*seed).ok())
+            .filter_map(|seed| addr_to_ipv4_string(seed).ok())
             .map(RelayAddress::IPv4)
             .collect()
     } else {
@@ -264,9 +281,11 @@ fn default_seednodes(netid: u16) -> Vec<RelayAddress> {
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-fn fix_directories(ctx: &MmCtx) -> MmInitResult<()> {
+pub fn fix_directories(ctx: &MmCtx) -> MmInitResult<()> {
+    fix_shared_dbdir(ctx)?;
+
     let dbdir = ctx.dbdir();
-    std::fs::create_dir_all(&dbdir).map_to_mm(|e| MmInitError::ErrorCreatingDbDir {
+    fs::create_dir_all(&dbdir).map_to_mm(|e| MmInitError::ErrorCreatingDbDir {
         path: dbdir.clone(),
         error: e.to_string(),
     })?;
@@ -322,6 +341,17 @@ fn fix_directories(ctx: &MmCtx) -> MmInitResult<()> {
     Ok(())
 }
 
+#[cfg(not(target_arch = "wasm32"))]
+fn fix_shared_dbdir(ctx: &MmCtx) -> MmInitResult<()> {
+    let shared_db = ctx.shared_dbdir();
+    fs::create_dir_all(&shared_db).map_to_mm(|e| MmInitError::ErrorCreatingDbDir {
+        path: shared_db.clone(),
+        error: e.to_string(),
+    })?;
+
+    Ok(())
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 fn migrate_db(ctx: &MmArc) -> MmInitResult<()> {
     let migration_num_path = ctx.dbdir().join(".migration");
@@ -342,7 +372,7 @@ fn migrate_db(ctx: &MmArc) -> MmInitResult<()> {
         migration_1(ctx);
         current_migration = 1;
     }
-    std::fs::write(&migration_num_path, &current_migration.to_le_bytes())
+    std::fs::write(&migration_num_path, current_migration.to_le_bytes())
         .map_to_mm(|e| MmInitError::ErrorDbMigrating(e.to_string()))?;
     Ok(())
 }
@@ -354,7 +384,7 @@ 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() {
+    if !CryptoCtx::is_init(&ctx)? {
         return Ok(());
     }
 
@@ -363,6 +393,8 @@ pub async fn lp_init_continue(ctx: MmArc) -> MmInitResult<()> {
         fix_directories(&ctx)?;
         ctx.init_sqlite_connection()
             .map_to_mm(MmInitError::ErrorSqliteInitializing)?;
+        ctx.init_shared_sqlite_conn()
+            .map_to_mm(MmInitError::ErrorSqliteInitializing)?;
         init_and_migrate_db(&ctx).await?;
         migrate_db(&ctx)?;
     }
@@ -378,18 +410,18 @@ pub async fn lp_init_continue(ctx: MmArc) -> MmInitResult<()> {
     // 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()));
+    ctx.spawner().spawn(lp_ordermatch_loop(ctx.clone()));
 
-    spawn(broadcast_maker_orders_keep_alive_loop(ctx.clone()));
+    ctx.spawner().spawn(broadcast_maker_orders_keep_alive_loop(ctx.clone()));
 
-    spawn(clean_memory_loop(ctx.weak()));
+    ctx.spawner().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);
+pub async fn lp_init(ctx: MmArc, version: String, datetime: String) -> MmInitResult<()> {
+    info!("Version: {} DT {}", version, datetime);
 
     if !ctx.conf["passphrase"].is_null() {
         let passphrase: String =
@@ -397,7 +429,11 @@ pub async fn lp_init(ctx: MmArc) -> MmInitResult<()> {
                 field: "passphrase".to_owned(),
                 error: e.to_string(),
             })?;
-        CryptoCtx::init_with_iguana_passphrase(ctx.clone(), &passphrase)?;
+
+        match ctx.conf["hd_account_id"].as_u64() {
+            Some(hd_account_id) => CryptoCtx::init_with_global_hd_account(ctx.clone(), &passphrase, hd_account_id)?,
+            None => CryptoCtx::init_with_iguana_passphrase(ctx.clone(), &passphrase)?,
+        };
     }
 
     lp_init_continue(ctx.clone()).await?;
@@ -406,7 +442,7 @@ pub async fn lp_init(ctx: MmArc) -> MmInitResult<()> {
 
     spawn_rpc(ctx_id);
     let ctx_c = ctx.clone();
-    spawn(async move {
+    ctx.spawner().spawn(async move {
         if let Err(err) = ctx_c.init_metrics() {
             warn!("Couldn't initialize metrics system: {}", err);
         }
@@ -446,7 +482,7 @@ async fn kick_start(ctx: MmArc) -> MmInitResult<()> {
     Ok(())
 }
 
-async fn init_p2p(ctx: MmArc) -> P2PResult<()> {
+pub 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();
 
@@ -454,7 +490,8 @@ async fn init_p2p(ctx: MmArc) -> P2PResult<()> {
 
     let ctx_on_poll = ctx.clone();
     let force_p2p_key = if i_am_seed {
-        let key = sha256(&*ctx.secp256k1_key_pair().private().secret);
+        let crypto_ctx = CryptoCtx::from_ctx(&ctx).mm_err(|e| P2PInitError::Internal(e.to_string()))?;
+        let key = sha256(crypto_ctx.mm2_internal_privkey_slice());
         Some(key.take())
     } else {
         None
@@ -466,48 +503,44 @@ async fn init_p2p(ctx: MmArc) -> P2PResult<()> {
         light_node_type(&ctx)?
     };
 
-    let spawn_result = spawn_gossipsub(netid, force_p2p_key, spawn_boxed, seednodes, node_type, move |swarm| {
+    let spawner = SwarmRuntime::new(ctx.spawner());
+    let spawn_result = spawn_gossipsub(netid, force_p2p_key, spawner, 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
+            behaviour.connected_relays_len() as f64
         );
         mm_gauge!(
             ctx_on_poll.metrics,
             "p2p.relay_mesh.len",
-            behaviour.relay_mesh_len() as i64
+            behaviour.relay_mesh_len() as f64
         );
         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
+            period.as_secs() as f64
         );
 
-        mm_gauge!(ctx_on_poll.metrics, "p2p.received_messages.count", received_msgs as i64);
+        mm_gauge!(ctx_on_poll.metrics, "p2p.received_messages.count", received_msgs as f64);
 
         let connected_peers_count = behaviour.connected_peers_len();
 
         mm_gauge!(
             ctx_on_poll.metrics,
             "p2p.connected_peers.count",
-            connected_peers_count as i64
+            connected_peers_count as f64
         );
     })
     .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(())
-    }));
+    let (cmd_tx, event_rx, peer_id) = spawn_result?;
     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));
+
+    let fut = p2p_event_process_loop(ctx.weak(), event_rx, i_am_seed);
+    ctx.spawner().spawn(fut);
 
     Ok(())
 }
diff --git a/mm2src/mm2_main/src/lp_network.rs b/mm2src/mm2_main/src/lp_network.rs
index b5e81360b4..ba10ee46c3 100644
--- a/mm2src/mm2_main/src/lp_network.rs
+++ b/mm2src/mm2_main/src/lp_network.rs
@@ -19,8 +19,7 @@
 //  marketmaker
 //
 use coins::lp_coinfind;
-use common::executor::spawn;
-use common::mm_metrics::{ClockOps, MetricsOps};
+use common::executor::SpawnFuture;
 use common::{log, Future01CompatExt};
 use derive_more::Display;
 use futures::{channel::oneshot, StreamExt};
@@ -32,11 +31,13 @@ use mm2_libp2p::atomicdex_behaviour::{AdexBehaviourCmd, AdexBehaviourEvent, Adex
 use mm2_libp2p::peers_exchange::PeerAddresses;
 use mm2_libp2p::{decode_message, encode_message, DecodingError, GossipsubMessage, Libp2pPublic, Libp2pSecpPublic,
                  MessageId, NetworkPorts, PeerId, TOPIC_SEPARATOR};
+use mm2_metrics::{mm_label, mm_timing};
 #[cfg(test)] use mocktopus::macros::*;
 use parking_lot::Mutex as PaMutex;
 use serde::de;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
+use wasm_timer::Instant;
 
 use crate::mm2::{lp_ordermatch, lp_stats, lp_swap};
 
@@ -112,7 +113,8 @@ pub async fn p2p_event_process_loop(ctx: MmWeak, mut rx: AdexEventRx, i_am_relay
         };
         match adex_event {
             Some(AdexBehaviourEvent::Message(peer_id, message_id, message)) => {
-                spawn(process_p2p_message(ctx, peer_id, message_id, message, i_am_relay));
+                let spawner = ctx.spawner();
+                spawner.spawn(process_p2p_message(ctx, peer_id, message_id, message, i_am_relay));
             },
             Some(AdexBehaviourEvent::PeerRequest {
                 peer_id,
@@ -133,12 +135,15 @@ async fn process_p2p_message(
     ctx: MmArc,
     peer_id: PeerId,
     message_id: MessageId,
-    message: GossipsubMessage,
+    mut message: GossipsubMessage,
     i_am_relay: bool,
 ) {
     let mut to_propagate = false;
     let mut orderbook_pairs = vec![];
 
+    message.topics.dedup();
+    drop_mutability!(message);
+
     for topic in message.topics {
         let mut split = topic.as_str().split(TOPIC_SEPARATOR);
         match split.next() {
@@ -151,13 +156,30 @@ async fn process_p2p_message(
                 lp_swap::process_msg(ctx.clone(), split.next().unwrap_or_default(), &message.data).await;
                 to_propagate = true;
             },
+            Some(lp_swap::WATCHER_PREFIX) => {
+                if ctx.is_watcher() {
+                    lp_swap::process_watcher_msg(ctx.clone(), &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),
-                        }
+                        if let Err(e) = coin.tx_enum_from_bytes(&message.data) {
+                            log::error!("Message cannot continue the process due to: {:?}", e);
+                            continue;
+                        };
+
+                        let fut = coin.send_raw_tx_bytes(&message.data);
+                        ctx.spawner().spawn(async {
+                            match fut.compat().await {
+                                Ok(id) => log::debug!("Transaction broadcasted successfully: {:?} ", id),
+                                // TODO (After https://github.com/KomodoPlatform/atomicDEX-API/pull/1433)
+                                // Maybe do not log an error if the transaction is already sent to
+                                // the blockchain
+                                Err(e) => log::error!("Broadcast transaction failed (ignore this error if the transaction already sent by another seednode). {}", e),
+                            };
+                        })
                     }
                 }
             },
@@ -326,11 +348,10 @@ pub async fn request_one_peer<T: de::DeserializeOwned>(
     req: P2PRequest,
     peer: String,
 ) -> P2PRequestResult<Option<T>> {
-    let clock = ctx.metrics.clock().expect("Metrics clock is not available");
-    let start = clock.now();
+    let start = Instant::now();
     let mut responses = request_peers::<T>(ctx.clone(), req, vec![peer.clone()]).await?;
-    let end = clock.now();
-    mm_timing!(ctx.metrics, "peer.outgoing_request.timing", start, end, "peer" => peer);
+    let elapsed = start.elapsed();
+    mm_timing!(ctx.metrics, "peer.outgoing_request.timing", elapsed, "peer" => peer);
     if responses.len() != 1 {
         return MmError::err(P2PRequestError::ExpectedSingleResponseError(responses.len()));
     }
diff --git a/mm2src/mm2_main/src/lp_ordermatch.rs b/mm2src/mm2_main/src/lp_ordermatch.rs
index 0ab47bfa60..7fa4cb69d0 100644
--- a/mm2src/mm2_main/src/lp_ordermatch.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch.rs
@@ -27,12 +27,13 @@ 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::executor::{simple_map::AbortableSimpleMap, AbortSettings, AbortableSystem, AbortedError, SpawnAbortable,
+                       SpawnFuture, Timer};
 use common::log::{error, warn, LogOnError};
 use common::time_cache::TimeCache;
-use common::{bits256, log, new_uuid, now_ms, spawn_abortable, AbortOnDropHandle};
+use common::{bits256, log, new_uuid, now_ms};
 use crypto::privkey::SerializableSecp256k1Keypair;
-use crypto::CryptoCtx;
+use crypto::{CryptoCtx, CryptoCtxError};
 use derive_more::Display;
 use futures::{compat::Future01CompatExt, lock::Mutex as AsyncMutex, TryFutureExt};
 use hash256_std_hasher::Hash256StdHasher;
@@ -42,6 +43,7 @@ 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_metrics::mm_gauge;
 use mm2_number::{construct_detailed, BigDecimal, BigRational, Fraction, MmNumber, MmNumberMultiRepr};
 #[cfg(test)] use mocktopus::macros::*;
 use num_traits::identities::Zero;
@@ -59,12 +61,13 @@ 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, Libp2pPeerId,
-                             P2PRequest};
+use crate::mm2::lp_network::{broadcast_p2p_msg, request_any_relay, request_one_peer, subscribe_to_topic, 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};
+                          check_other_coin_balance_for_swap, get_max_maker_vol, insert_new_swap_to_db,
+                          is_pubkey_banned, lp_atomic_locktime, p2p_keypair_and_peer_id_to_broadcast,
+                          p2p_private_and_peer_id_to_broadcast, run_maker_swap, run_taker_swap, AtomicLocktimeVersion,
+                          CheckBalanceError, CheckBalanceResult, CoinVolumeInfo, MakerSwap, RunMakerSwapInput,
+                          RunTakerSwapInput, SwapConfirmationsSettings, TakerSwap};
 
 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,
@@ -136,6 +139,10 @@ pub enum OrdermatchInitError {
     Internal(String),
 }
 
+impl From<AbortedError> for OrdermatchInitError {
+    fn from(e: AbortedError) -> Self { OrdermatchInitError::Internal(e.to_string()) }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct CancelAllOrdersResponse {
     cancelled: Vec<Uuid>,
@@ -313,6 +320,14 @@ fn process_maker_order_updated(ctx: MmArc, from_pubkey: String, updated_msg: new
 //     Ok(())
 // }
 
+// ZHTLC protocol coin uses random keypair to sign P2P messages per every order.
+// So, each ZHTLC order has unique «pubkey» field that doesn’t match node persistent pubkey derived from passphrase.
+// We can compare pubkeys from maker_orders and from asks or bids, to find our order.
+#[inline(always)]
+fn is_my_order(my_orders_pubkeys: &HashSet<String>, my_pub: &Option<String>, order_pubkey: &str) -> bool {
+    my_pub.as_deref() == Some(order_pubkey) || my_orders_pubkeys.contains(order_pubkey)
+}
+
 /// Request best asks and bids for the given `base` and `rel` coins from relays.
 /// Set `asks_num` and/or `bids_num` to get corresponding number of best asks and bids or None to get all of the available orders.
 ///
@@ -341,24 +356,28 @@ async fn request_and_fill_orderbook(ctx: &MmArc, base: &str, rel: &str) -> Resul
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).unwrap();
     let mut orderbook = ordermatch_ctx.orderbook.lock();
 
-    let keypair = ctx.secp256k1_key_pair_as_option();
+    let my_pubsecp = match CryptoCtx::from_ctx(ctx).discard_mm_trace() {
+        Ok(crypto_ctx) => Some(crypto_ctx.mm2_internal_pubkey_hex()),
+        Err(CryptoCtxError::NotInitialized) => None,
+        Err(other) => return ERR!("{}", other),
+    };
+
     let alb_pair = alb_ordered_pair(base, rel);
     for (pubkey, GetOrderbookPubkeyItem { orders, .. }) in pubkey_orders {
         let pubkey_bytes = match hex::decode(&pubkey) {
             Ok(b) => b,
             Err(e) => {
-                log::warn!("Error {} decoding pubkey {}", e, pubkey);
+                warn!("Error {} decoding pubkey {}", e, pubkey);
                 continue;
             },
         };
-        if let Some(keypair) = keypair {
-            if pubkey_bytes.as_slice() == keypair.public().as_ref() {
-                continue;
-            }
+
+        if is_my_order(&orderbook.my_p2p_pubkeys, &my_pubsecp, &pubkey) {
+            continue;
         }
 
         if is_pubkey_banned(ctx, &pubkey_bytes[1..].into()) {
-            log::warn!("Pubkey {} is banned", pubkey);
+            warn!("Pubkey {} is banned", pubkey);
             continue;
         }
         let params = ProcessTrieParams {
@@ -386,9 +405,18 @@ fn insert_or_update_order(ctx: &MmArc, item: OrderbookItem) {
     orderbook.insert_or_update_order_update_trie(item)
 }
 
-fn delete_order(ctx: &MmArc, pubkey: &str, uuid: Uuid) {
+// use this function when notify maker order created
+fn insert_or_update_my_order(ctx: &MmArc, item: OrderbookItem, my_order: &MakerOrder) {
     let ordermatch_ctx = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
+    let mut orderbook = ordermatch_ctx.orderbook.lock();
+    orderbook.insert_or_update_order_update_trie(item);
+    if let Some(key) = my_order.p2p_privkey {
+        orderbook.my_p2p_pubkeys.insert(hex::encode(key.public_slice()));
+    }
+}
 
+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();
     if let Some(order) = orderbook.order_set.get(&uuid) {
         if order.pubkey == pubkey {
@@ -397,10 +425,13 @@ fn delete_order(ctx: &MmArc, pubkey: &str, uuid: Uuid) {
     }
 }
 
-fn delete_my_order(ctx: &MmArc, uuid: Uuid) {
+fn delete_my_order(ctx: &MmArc, uuid: Uuid, p2p_privkey: Option<SerializableSecp256k1Keypair>) {
     let ordermatch_ctx: Arc<OrdermatchContext> = OrdermatchContext::from_ctx(ctx).expect("from_ctx failed");
     let mut orderbook = ordermatch_ctx.orderbook.lock();
     orderbook.remove_order_trie_update(uuid);
+    if let Some(key) = p2p_privkey {
+        orderbook.my_p2p_pubkeys.remove(&hex::encode(key.public_slice()));
+    }
 }
 
 fn remove_pubkey_pair_orders(orderbook: &mut Orderbook, pubkey: &str, alb_pair: &str) {
@@ -462,7 +493,8 @@ pub async fn process_msg(ctx: MmArc, _topics: Vec<String>, from_peer: String, ms
                 new_protocol::OrdermatchMessage::MakerReserved(maker_reserved) => {
                     let msg = MakerReserved::from_new_proto_and_pubkey(maker_reserved, pubkey.unprefixed().into());
                     // spawn because process_maker_reserved may take significant time to run
-                    spawn(process_maker_reserved(ctx, pubkey.unprefixed().into(), msg));
+                    let spawner = ctx.spawner();
+                    spawner.spawn(process_maker_reserved(ctx, pubkey.unprefixed().into(), msg));
                     true
                 },
                 new_protocol::OrdermatchMessage::TakerConnect(taker_connect) => {
@@ -483,7 +515,7 @@ pub async fn process_msg(ctx: MmArc, _topics: Vec<String>, from_peer: String, ms
             }
         },
         Err(e) => {
-            log::error!("Error {} while decoding signed message", e);
+            error!("Error {} while decoding signed message", e);
             false
         },
     }
@@ -807,10 +839,7 @@ fn process_sync_pubkey_orderbook_state(
 ) -> Result<Option<SyncPubkeyOrderbookStateRes>, String> {
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     let orderbook = ordermatch_ctx.orderbook.lock();
-    let pubkey_state = match orderbook.pubkeys_state.get(&pubkey) {
-        Some(s) => s,
-        None => return Ok(None),
-    };
+    let pubkey_state = some_or_return_ok_none!(orderbook.pubkeys_state.get(&pubkey));
 
     let order_getter = |uuid: &Uuid| orderbook.order_set.get(uuid).cloned();
     let pair_orders_diff: Result<HashMap<_, _>, _> = trie_roots
@@ -823,10 +852,10 @@ fn process_sync_pubkey_orderbook_state(
 
             let delta_result = match pubkey_state.order_pairs_trie_state_history.get(&pair) {
                 Some(history) => {
-                    DeltaOrFullTrie::from_history(history, root, *actual_pair_root, &orderbook.memory_db, &order_getter)
+                    DeltaOrFullTrie::from_history(history, root, *actual_pair_root, &orderbook.memory_db, order_getter)
                 },
                 None => {
-                    get_full_trie(actual_pair_root, &orderbook.memory_db, &order_getter).map(DeltaOrFullTrie::FullTrie)
+                    get_full_trie(actual_pair_root, &orderbook.memory_db, order_getter).map(DeltaOrFullTrie::FullTrie)
                 },
             };
 
@@ -891,7 +920,7 @@ fn test_alb_ordered_pair() {
 }
 
 #[allow(dead_code)]
-fn parse_orderbook_pair_from_topic(topic: &str) -> Option<(&str, &str)> {
+pub fn parse_orderbook_pair_from_topic(topic: &str) -> Option<(&str, &str)> {
     let mut split = topic.split(|maybe_sep| maybe_sep == TOPIC_SEPARATOR);
     match split.next() {
         Some(ORDERBOOK_PREFIX) => match split.next() {
@@ -943,14 +972,11 @@ fn maker_order_created_p2p_notify(
     };
 
     let to_broadcast = new_protocol::OrdermatchMessage::MakerOrderCreated(message.clone());
-    let (key_pair, peer_id) = match order.p2p_keypair() {
-        Some(k) => (k, Some(k.libp2p_peer_id())),
-        None => (ctx.secp256k1_key_pair(), None),
-    };
+    let (key_pair, peer_id) = p2p_keypair_and_peer_id_to_broadcast(&ctx, order.p2p_keypair());
 
     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);
+    let item: OrderbookItem = (message, hex::encode(key_pair.public_slice())).into();
+    insert_or_update_my_order(&ctx, item, order);
     broadcast_p2p_msg(&ctx, vec![topic], encoded_msg, peer_id);
 }
 
@@ -972,10 +998,7 @@ fn maker_order_updated_p2p_notify(
     p2p_privkey: Option<&KeyPair>,
 ) {
     let msg: new_protocol::OrdermatchMessage = message.clone().into();
-    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 (secret, peer_id) = p2p_private_and_peer_id_to_broadcast(&ctx, p2p_privkey);
     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);
@@ -987,7 +1010,7 @@ fn maker_order_cancelled_p2p_notify(ctx: MmArc, order: &MakerOrder) {
         timestamp: now_ms() / 1000,
         pair_trie_root: H64::default(),
     });
-    delete_my_order(&ctx, order.uuid);
+    delete_my_order(&ctx, order.uuid, order.p2p_privkey);
     log::debug!("maker_order_cancelled_p2p_notify called, message {:?}", message);
     broadcast_ordermatch_message(&ctx, vec![order.orderbook_topic()], message, order.p2p_keypair());
 }
@@ -1017,7 +1040,7 @@ impl BalanceTradeFeeUpdatedHandler for BalanceUpdateOrdermatchHandler {
         // 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 {
-            Ok(v) => v,
+            Ok(vol_info) => vol_info.volume,
             Err(e) if e.get_inner().not_sufficient_balance() => MmNumber::from(0),
             Err(e) => {
                 log::warn!("Couldn't handle the 'balance_updated' event: {}", e);
@@ -1340,6 +1363,7 @@ impl<'a> TakerOrderBuilder<'a> {
     }
 
     /// Validate fields and build
+    #[allow(clippy::result_large_err)]
     pub fn build(self) -> Result<TakerOrder, TakerOrderBuildError> {
         let min_base_amount = self.base_coin.min_trading_vol();
         let min_rel_amount = self.rel_coin.min_trading_vol();
@@ -1578,6 +1602,22 @@ impl TakerOrder {
 
     fn rel_orderbook_ticker(&self) -> &str { self.rel_orderbook_ticker.as_deref().unwrap_or(&self.request.rel) }
 
+    /// Returns the orderbook ticker of the taker coin
+    fn taker_orderbook_ticker(&self) -> &str {
+        match self.request.action {
+            TakerAction::Buy => self.rel_orderbook_ticker(),
+            TakerAction::Sell => self.base_orderbook_ticker(),
+        }
+    }
+
+    /// Returns the orderbook ticker of the maker coin
+    fn maker_orderbook_ticker(&self) -> &str {
+        match self.request.action {
+            TakerAction::Buy => self.base_orderbook_ticker(),
+            TakerAction::Sell => self.rel_orderbook_ticker(),
+        }
+    }
+
     fn orderbook_topic(&self) -> String {
         orderbook_topic_from_base_rel(self.base_orderbook_ticker(), self.rel_orderbook_ticker())
     }
@@ -1696,6 +1736,7 @@ impl fmt::Display for MakerOrderBuildError {
     }
 }
 
+#[allow(clippy::result_large_err)]
 fn validate_price(price: MmNumber) -> Result<(), MakerOrderBuildError> {
     let min_price = MmNumber::from(BigRational::new(1.into(), 100_000_000.into()));
 
@@ -1709,6 +1750,7 @@ fn validate_price(price: MmNumber) -> Result<(), MakerOrderBuildError> {
     Ok(())
 }
 
+#[allow(clippy::result_large_err)]
 fn validate_and_get_min_vol(
     min_base_amount: MmNumber,
     min_rel_amount: MmNumber,
@@ -1729,6 +1771,7 @@ fn validate_and_get_min_vol(
     Ok(actual_min_base_vol)
 }
 
+#[allow(clippy::result_large_err)]
 fn validate_max_vol(
     min_base_amount: MmNumber,
     min_rel_amount: MmNumber,
@@ -1811,6 +1854,7 @@ impl<'a> MakerOrderBuilder<'a> {
     }
 
     /// Build MakerOrder
+    #[allow(clippy::result_large_err)]
     pub fn build(self) -> Result<MakerOrder, MakerOrderBuildError> {
         if self.base_coin.ticker() == self.rel_coin.ticker() {
             return Err(MakerOrderBuildError::BaseEqualRel);
@@ -2194,9 +2238,10 @@ fn broadcast_keep_alive_for_pub(ctx: &MmArc, pubkey: &str, orderbook: &Orderbook
 }
 
 pub async fn broadcast_maker_orders_keep_alive_loop(ctx: MmArc) {
+    // broadcast_maker_orders_keep_alive_loop is spawned only if CryptoCtx is initialized.
     let persistent_pubsecp = CryptoCtx::from_ctx(&ctx)
         .expect("CryptoCtx not available")
-        .secp256k1_pubkey_hex();
+        .mm2_internal_pubkey_hex();
 
     while !ctx.is_stopping() {
         Timer::sleep(MIN_ORDER_KEEP_ALIVE_INTERVAL as f64).await;
@@ -2227,10 +2272,7 @@ fn broadcast_ordermatch_message(
     msg: new_protocol::OrdermatchMessage,
     p2p_privkey: Option<&KeyPair>,
 ) {
-    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 (secret, peer_id) = p2p_private_and_peer_id_to_broadcast(ctx, p2p_privkey);
     let encoded_msg = encode_and_sign(&msg, &secret).unwrap();
     broadcast_p2p_msg(ctx, topics.into_iter().collect(), encoded_msg, peer_id);
 }
@@ -2372,22 +2414,9 @@ fn collect_orderbook_metrics(_ctx: &MmArc, _orderbook: &Orderbook) {}
 fn collect_orderbook_metrics(ctx: &MmArc, orderbook: &Orderbook) {
     use parity_util_mem::malloc_size;
 
-    fn history_committed_changes(history: &TimeCache<AlbOrderedOrderbookPair, TrieOrderHistory>) -> i64 {
-        let total = history.iter().fold(0usize, |total, (_alb_pair, history)| {
-            total + history.get_element().inner.len()
-        });
-        total as i64
-    }
-
     let memory_db_size = malloc_size(&orderbook.memory_db);
-    mm_gauge!(ctx.metrics, "orderbook.len", orderbook.order_set.len() as i64);
-    mm_gauge!(ctx.metrics, "orderbook.memory_db", memory_db_size as i64);
-
-    // TODO remove metrics below after testing
-    for (pubkey, pubkey_state) in orderbook.pubkeys_state.iter() {
-        mm_gauge!(ctx.metrics, "orders_uuids", pubkey_state.orders_uuids.len() as i64, "pubkey" => pubkey.clone());
-        mm_gauge!(ctx.metrics, "history.commited_changes", history_committed_changes(&pubkey_state.order_pairs_trie_state_history), "pubkey" => pubkey.clone());
-    }
+    mm_gauge!(ctx.metrics, "orderbook.len", orderbook.order_set.len() as f64);
+    mm_gauge!(ctx.metrics, "orderbook.memory_db", memory_db_size as f64);
 }
 
 #[derive(Default)]
@@ -2406,6 +2435,7 @@ struct Orderbook {
     topics_subscribed_to: HashMap<String, OrderbookRequestingState>,
     /// MemoryDB instance to store Patricia Tries data
     memory_db: MemoryDB<Blake2Hasher64>,
+    my_p2p_pubkeys: HashSet<String>,
 }
 
 fn hashed_null_node<T: TrieConfiguration>() -> TrieHash<T> { <T::Codec as NodeCodecT>::hashed_null_node() }
@@ -2444,17 +2474,15 @@ impl Orderbook {
             let mut pair_trie = match get_trie_mut(&mut self.memory_db, pair_root) {
                 Ok(trie) => trie,
                 Err(e) => {
-                    log::error!("Error getting {} trie with root {:?}", e, prev_root);
+                    error!("Error getting {} trie with root {:?}", e, prev_root);
                     return;
                 },
             };
             let order_bytes = order.trie_state_bytes();
             if let Err(e) = pair_trie.insert(order.uuid.as_bytes(), &order_bytes) {
-                log::error!(
+                error!(
                     "Error {:?} on insertion to trie. Key {}, value {:?}",
-                    e,
-                    order.uuid,
-                    order_bytes
+                    e, order.uuid, order_bytes
                 );
                 return;
             };
@@ -2555,7 +2583,7 @@ impl Orderbook {
         )]) {
             Ok(root) => root,
             Err(_) => {
-                log::error!("Failed to get existing trie with root {:?}", pair_state);
+                error!("Failed to get existing trie with root {:?}", pair_state);
                 return Some(order);
             },
         };
@@ -2579,7 +2607,7 @@ impl Orderbook {
         i_am_relay: bool,
     ) -> Option<OrdermatchRequest> {
         let pubkey_state = pubkey_state_mut(&mut self.pubkeys_state, from_pubkey);
-
+        pubkey_state.last_keep_alive = now_ms() / 1000;
         let mut trie_roots_to_request = HashMap::new();
         for (alb_pair, trie_root) in message.trie_roots {
             let subscribed = self
@@ -2605,7 +2633,6 @@ impl Orderbook {
         }
 
         if trie_roots_to_request.is_empty() {
-            pubkey_state.last_keep_alive = message.timestamp;
             return None;
         }
 
@@ -2624,7 +2651,6 @@ impl Orderbook {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), derive(Default))]
 struct OrdermatchContext {
     pub maker_orders_ctx: PaMutex<MakerOrdersContext>,
     pub my_taker_orders: AsyncMutex<HashMap<Uuid, TakerOrder>>,
@@ -2668,7 +2694,7 @@ pub fn init_ordermatch_context(ctx: &MmArc) -> OrdermatchInitResult<()> {
     }
 
     let ordermatch_context = OrdermatchContext {
-        maker_orders_ctx: Default::default(),
+        maker_orders_ctx: PaMutex::new(MakerOrdersContext::new(ctx)?),
         my_taker_orders: Default::default(),
         orderbook: Default::default(),
         pending_maker_reserved: Default::default(),
@@ -2686,36 +2712,30 @@ pub fn init_ordermatch_context(ctx: &MmArc) -> OrdermatchInitResult<()> {
 #[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"))]
+    #[cfg(not(test))]
     fn from_ctx(ctx: &MmArc) -> Result<Arc<OrdermatchContext>, String> {
         Ok(try_s!(from_ctx(&ctx.ordermatch_ctx, move || {
-            Ok(OrdermatchContext::default())
+            ERR!("'OrdermatchContext' is not initialized")
         })))
     }
 
     /// Obtains a reference to this crate context, creating it if necessary.
-    #[cfg(target_arch = "wasm32")]
+    #[cfg(test)]
     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(),
+                maker_orders_ctx: PaMutex::new(try_s!(MakerOrdersContext::new(ctx))),
                 my_taker_orders: Default::default(),
                 orderbook: Default::default(),
                 pending_maker_reserved: Default::default(),
                 orderbook_tickers: Default::default(),
                 original_tickers: Default::default(),
+                #[cfg(target_arch = "wasm32")]
                 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> {
-        let ctx = try_s!(MmArc::from_weak(ctx_weak).ok_or("Context expired"));
-        Self::from_ctx(&ctx)
-    }
-
     fn orderbook_ticker(&self, ticker: &str) -> Option<String> { self.orderbook_tickers.get(ticker).cloned() }
 
     fn orderbook_ticker_bypass(&self, ticker: &str) -> String {
@@ -2735,19 +2755,30 @@ impl OrdermatchContext {
     }
 }
 
-#[derive(Default)]
-struct MakerOrdersContext {
+pub struct MakerOrdersContext {
     orders: HashMap<Uuid, Arc<AsyncMutex<MakerOrder>>>,
     order_tickers: HashMap<Uuid, String>,
     count_by_tickers: HashMap<String, usize>,
-    balance_loops: HashMap<String, AbortOnDropHandle>,
+    /// The `check_balance_update_loop` future abort handles associated stored by corresponding tickers.
+    balance_loops: AbortableSimpleMap<String>,
 }
 
 impl MakerOrdersContext {
+    fn new(ctx: &MmArc) -> OrdermatchInitResult<MakerOrdersContext> {
+        // Create an abortable system linked to the `MmCtx` so if the context is stopped via `MmArc::stop`,
+        // all spawned `check_balance_update_loop` futures will be aborted as well.
+        let balance_loops = ctx.abortable_system.create_subsystem()?;
+
+        Ok(MakerOrdersContext {
+            orders: HashMap::new(),
+            order_tickers: HashMap::new(),
+            count_by_tickers: HashMap::new(),
+            balance_loops,
+        })
+    }
+
     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.spawn_balance_loop_if_not_spawned(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;
@@ -2776,33 +2807,37 @@ impl MakerOrdersContext {
         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>) {
+    fn spawn_balance_loop_if_not_spawned(&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);
+        let mut balance_loops = self.balance_loops.lock();
+
+        let fut = check_balance_update_loop(ctx, ticker, balance);
+        // `SimpleMapImpl::spawn_or_ignore` won't spawn the future
+        // if the `check_balance_update_loop` loop has been spawned already.
+        balance_loops.spawn_or_ignore(order_base, fut).warn_log();
     }
 
-    fn stop_balance_loop(&mut self, ticker: &str) { self.balance_loops.remove(ticker); }
+    fn stop_balance_loop(&mut self, ticker: &str) { self.balance_loops.lock().abort_future(ticker).warn_log(); }
 
-    fn balance_loop_exists(&mut self, ticker: &str) -> bool { self.balance_loops.contains_key(ticker) }
+    #[cfg(test)]
+    fn balance_loop_exists(&mut self, ticker: &str) -> bool { self.balance_loops.lock().contains(ticker).unwrap() }
 }
 
 #[cfg_attr(test, mockable)]
 fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerOrder) {
-    spawn(async move {
+    let spawner = ctx.spawner();
+    let uuid = maker_match.request.uuid;
+
+    let fut = async move {
         // aka "maker_loop"
         let taker_coin = match lp_coinfind(&ctx, &maker_order.rel).await {
             Ok(Some(c)) => c,
             Ok(None) => {
-                log::error!("Coin {} is not found/enabled", maker_order.rel);
+                error!("Coin {} is not found/enabled", maker_order.rel);
                 return;
             },
             Err(e) => {
-                log::error!("!lp_coinfind({}): {}", maker_order.rel, e);
+                error!("!lp_coinfind({}): {}", maker_order.rel, e);
                 return;
             },
         };
@@ -2810,20 +2845,23 @@ fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerO
         let maker_coin = match lp_coinfind(&ctx, &maker_order.base).await {
             Ok(Some(c)) => c,
             Ok(None) => {
-                log::error!("Coin {} is not found/enabled", maker_order.base);
+                error!("Coin {} is not found/enabled", maker_order.base);
                 return;
             },
             Err(e) => {
-                log::error!("!lp_coinfind({}): {}", maker_order.base, e);
+                error!("!lp_coinfind({}): {}", maker_order.base, e);
                 return;
             },
         };
         let alice = bits256::from(maker_match.request.sender_pubkey.0);
         let maker_amount = maker_match.reserved.get_base_amount().to_decimal();
         let taker_amount = maker_match.reserved.get_rel_amount().to_decimal();
-        let privkey = &ctx.secp256k1_key_pair().private().secret;
-        let my_persistent_pub = compressed_pub_key_from_priv_raw(&privkey[..], ChecksumType::DSHA256).unwrap();
-        let uuid = maker_match.request.uuid;
+
+        // lp_connect_start_bob is called only from process_taker_connect, which returns if CryptoCtx is not initialized
+        let crypto_ctx = CryptoCtx::from_ctx(&ctx).expect("'CryptoCtx' must be initialized already");
+        let raw_priv = crypto_ctx.mm2_internal_privkey_secret();
+        let my_persistent_pub = compressed_pub_key_from_priv_raw(raw_priv.as_slice(), ChecksumType::DSHA256).unwrap();
+
         let my_conf_settings = choose_maker_confs_and_notas(
             maker_order.conf_settings,
             &maker_match.request,
@@ -2842,7 +2880,11 @@ 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);
+        let lock_time = lp_atomic_locktime(
+            maker_order.base_orderbook_ticker(),
+            maker_order.rel_orderbook_ticker(),
+            atomic_locktime_v,
+        );
         log_tag!(
             ctx,
             "";
@@ -2872,22 +2914,28 @@ fn lp_connect_start_bob(ctx: MmArc, maker_match: MakerMatch, maker_order: MakerO
             MakerSwap::generate_secret().into(),
         );
         run_maker_swap(RunMakerSwapInput::StartNew(maker_swap), ctx).await;
-    });
+    };
+
+    let settings = AbortSettings::info_on_abort(format!("swap {uuid} stopped!"));
+    spawner.spawn_with_settings(fut, settings);
 }
 
 fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMatch) {
-    spawn(async move {
+    let spawner = ctx.spawner();
+    let uuid = taker_match.reserved.taker_order_uuid;
+
+    let fut = async move {
         // aka "taker_loop"
         let maker = bits256::from(taker_match.reserved.sender_pubkey.0);
         let taker_coin_ticker = taker_order.taker_coin_ticker();
         let taker_coin = match lp_coinfind(&ctx, taker_coin_ticker).await {
             Ok(Some(c)) => c,
             Ok(None) => {
-                log::error!("Coin {} is not found/enabled", taker_coin_ticker);
+                error!("Coin {} is not found/enabled", taker_coin_ticker);
                 return;
             },
             Err(e) => {
-                log::error!("!lp_coinfind({}): {}", taker_coin_ticker, e);
+                error!("!lp_coinfind({}): {}", taker_coin_ticker, e);
                 return;
             },
         };
@@ -2896,20 +2944,22 @@ fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMat
         let maker_coin = match lp_coinfind(&ctx, maker_coin_ticker).await {
             Ok(Some(c)) => c,
             Ok(None) => {
-                log::error!("Coin {} is not found/enabled", maker_coin_ticker);
+                error!("Coin {} is not found/enabled", maker_coin_ticker);
                 return;
             },
             Err(e) => {
-                log::error!("!lp_coinfind({}): {}", maker_coin_ticker, e);
+                error!("!lp_coinfind({}): {}", maker_coin_ticker, e);
                 return;
             },
         };
 
-        let privkey = &ctx.secp256k1_key_pair().private().secret;
-        let my_persistent_pub = compressed_pub_key_from_priv_raw(&privkey[..], ChecksumType::DSHA256).unwrap();
+        // lp_connected_alice is called only from process_maker_connected, which returns if CryptoCtx is not initialized
+        let crypto_ctx = CryptoCtx::from_ctx(&ctx).expect("'CryptoCtx' must be initialized already");
+        let raw_priv = crypto_ctx.mm2_internal_privkey_secret();
+        let my_persistent_pub = compressed_pub_key_from_priv_raw(raw_priv.as_slice(), ChecksumType::DSHA256).unwrap();
+
         let maker_amount = taker_match.reserved.get_base_amount().clone();
         let taker_amount = taker_match.reserved.get_rel_amount().clone();
-        let uuid = taker_match.reserved.taker_order_uuid;
 
         let my_conf_settings =
             choose_taker_confs_and_notas(&taker_order.request, &taker_match.reserved, &maker_coin, &taker_coin);
@@ -2929,7 +2979,11 @@ 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);
+        let locktime = lp_atomic_locktime(
+            taker_order.maker_orderbook_ticker(),
+            taker_order.taker_orderbook_ticker(),
+            atomic_locktime_v,
+        );
         log_tag!(
             ctx,
             "";
@@ -2958,13 +3012,17 @@ fn lp_connected_alice(ctx: MmArc, taker_order: TakerOrder, taker_match: TakerMat
             taker_order.p2p_privkey.map(SerializableSecp256k1Keypair::into_inner),
         );
         run_taker_swap(RunTakerSwapInput::StartNew(taker_swap), ctx).await
-    });
+    };
+
+    let settings = AbortSettings::info_on_abort(format!("swap {uuid} stopped!"));
+    spawner.spawn_with_settings(fut, settings)
 }
 
 pub async fn lp_ordermatch_loop(ctx: MmArc) {
+    // lp_ordermatch_loop is spawned only if CryptoCtx is initialized
     let my_pubsecp = CryptoCtx::from_ctx(&ctx)
         .expect("CryptoCtx not available")
-        .secp256k1_pubkey_hex();
+        .mm2_internal_pubkey_hex();
 
     let maker_order_timeout = ctx.conf["maker_order_timeout"].as_u64().unwrap_or(MAKER_ORDER_TIMEOUT);
     loop {
@@ -3035,7 +3093,7 @@ pub async fn lp_ordermatch_loop(ctx: MmArc) {
                 };
                 let max_vol = match calc_max_maker_vol(&ctx, &base, &current_balance, FeeApproxStage::OrderIssue).await
                 {
-                    Ok(max) => max,
+                    Ok(vol_info) => vol_info.volume,
                     Err(e) => {
                         log::info!("Error {} on balance check to kickstart order {}, cancelling", e, uuid);
                         to_cancel.push(uuid);
@@ -3231,7 +3289,10 @@ async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg:
         }
     }
 
-    let our_public_id = ctx.public_id().unwrap();
+    // Taker order existence is checked previously - it can't be created if CryptoCtx is not initialized
+    let our_public_id = CryptoCtx::from_ctx(&ctx)
+        .expect("'CryptoCtx' must be initialized already")
+        .mm2_internal_public_id();
     if our_public_id.bytes == from_pubkey.0 {
         log::warn!("Skip maker reserved from our pubkey");
         return;
@@ -3305,7 +3366,12 @@ async fn process_maker_reserved(ctx: MmArc, from_pubkey: H256Json, reserved_msg:
 async fn process_maker_connected(ctx: MmArc, from_pubkey: H256Json, connected: MakerConnected) {
     log::debug!("Processing MakerConnected {:?}", connected);
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let our_public_id = ctx.public_id().unwrap();
+
+    let our_public_id = match CryptoCtx::from_ctx(&ctx) {
+        Ok(ctx) => ctx.mm2_internal_public_id(),
+        Err(_) => return,
+    };
+
     if our_public_id.bytes == from_pubkey.0 {
         log::warn!("Skip maker connected from our pubkey");
         return;
@@ -3328,7 +3394,7 @@ async fn process_maker_connected(ctx: MmArc, from_pubkey: H256Json, connected: M
     };
 
     if order_match.reserved.sender_pubkey != from_pubkey {
-        log::error!("Connected message sender pubkey != reserved message sender pubkey");
+        error!("Connected message sender pubkey != reserved message sender pubkey");
         return;
     }
     // alice
@@ -3342,7 +3408,11 @@ async fn process_maker_connected(ctx: MmArc, from_pubkey: H256Json, connected: M
 }
 
 async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request: TakerRequest) {
-    let our_public_id: H256Json = ctx.public_id().unwrap().bytes.into();
+    let our_public_id: H256Json = match CryptoCtx::from_ctx(&ctx) {
+        Ok(ctx) => ctx.mm2_internal_public_id().bytes.into(),
+        Err(_) => return,
+    };
+
     if our_public_id == from_pubkey {
         log::warn!("Skip the request originating from our pubkey");
         return;
@@ -3416,7 +3486,12 @@ async fn process_taker_request(ctx: MmArc, from_pubkey: H256Json, taker_request:
 async fn process_taker_connect(ctx: MmArc, sender_pubkey: H256Json, connect_msg: TakerConnect) {
     log::debug!("Processing TakerConnect {:?}", connect_msg);
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
-    let our_public_id = ctx.public_id().unwrap();
+
+    let our_public_id = match CryptoCtx::from_ctx(&ctx) {
+        Ok(ctx) => ctx.mm2_internal_public_id(),
+        Err(_) => return,
+    };
+
     if our_public_id.bytes == sender_pubkey.0 {
         log::warn!("Skip taker connect from our pubkey");
         return;
@@ -3659,7 +3734,7 @@ pub async fn lp_auto_buy(
     };
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
     let mut my_taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
-    let our_public_id = try_s!(ctx.public_id());
+    let our_public_id = try_s!(CryptoCtx::from_ctx(&ctx)).mm2_internal_public_id();
     let rel_volume = &input.volume * &input.price;
     let conf_settings = OrderConfirmationsSettings {
         base_confs: input.base_confs.unwrap_or_else(|| base_coin.required_confirmations()),
@@ -4328,27 +4403,17 @@ async fn cancel_orders_on_error<T, E>(ctx: &MmArc, req: &SetPriceReq, error: E)
     Err(error)
 }
 
-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!(
-        other_coin
-            .get_receiver_trade_fee(FeeApproxStage::OrderIssue)
-            .compat()
-            .await
-    );
-    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(CoinVolumeInfo {
-        volume: try_s!(calc_max_maker_vol(ctx, my_coin, &my_balance, FeeApproxStage::OrderIssue).await),
-        balance: my_balance,
-    })
+pub async fn check_other_coin_balance_for_order_issue(
+    ctx: &MmArc,
+    other_coin: &MmCoinEnum,
+    my_coin_volume: BigDecimal,
+) -> CheckBalanceResult<()> {
+    let trade_fee = other_coin
+        .get_receiver_trade_fee(my_coin_volume, FeeApproxStage::OrderIssue)
+        .compat()
+        .await
+        .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, other_coin.ticker()))?;
+    check_other_coin_balance_for_swap(ctx, other_coin, None, trade_fee).await
 }
 
 pub async fn check_balance_update_loop(ctx: MmWeak, ticker: String, balance: Option<BigDecimal>) {
@@ -4392,12 +4457,14 @@ pub async fn create_maker_order(ctx: &MmArc, req: SetPriceReq) -> Result<MakerOr
         return ERR!("Rel coin {} is wallet only", req.rel);
     }
 
-    let CoinVolumeInfo { volume, balance } = if req.max {
-        try_s!(
-            get_max_volume(ctx, &base_coin, &rel_coin)
+    let (volume, balance) = if req.max {
+        let CoinVolumeInfo { volume, balance, .. } = try_s!(
+            get_max_maker_vol(ctx, &base_coin)
                 .or_else(|e| cancel_orders_on_error(ctx, &req, e))
                 .await
-        )
+        );
+        try_s!(check_other_coin_balance_for_order_issue(ctx, &rel_coin, volume.to_decimal()).await);
+        (volume, balance.to_decimal())
     } else {
         let balance = try_s!(
             check_balance_for_maker_swap(
@@ -4412,10 +4479,7 @@ pub async fn create_maker_order(ctx: &MmArc, req: SetPriceReq) -> Result<MakerOr
             .or_else(|e| cancel_orders_on_error(ctx, &req, e))
             .await
         );
-        CoinVolumeInfo {
-            volume: req.volume.clone(),
-            balance,
-        }
+        (req.volume.clone(), balance)
     };
 
     let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
@@ -4571,7 +4635,8 @@ pub async fn update_maker_order(ctx: &MmArc, req: MakerOrderUpdateReq) -> Result
 
     // 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).volume + reserved_amount.clone();
+        let max_volume = try_s!(get_max_maker_vol(ctx, &base_coin).await).volume + reserved_amount.clone();
+        try_s!(check_other_coin_balance_for_order_issue(ctx, &rel_coin, max_volume.to_decimal()).await);
         update_msg.with_new_max_volume(max_volume.clone().into());
         max_volume
     } else if Option::is_some(&req.volume_delta) {
@@ -5092,20 +5157,26 @@ pub async fn my_orders(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
         .map_err(|e| ERRL!("{}", e))
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn my_maker_orders_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("ORDERS").join("MY").join("MAKER") }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn my_taker_orders_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("ORDERS").join("MY").join("TAKER") }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn my_orders_history_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("ORDERS").join("MY").join("HISTORY") }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn my_maker_order_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     my_maker_orders_dir(ctx).join(format!("{}.json", uuid))
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn my_taker_order_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     my_taker_orders_dir(ctx).join(format!("{}.json", uuid))
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn my_order_history_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     my_orders_history_dir(ctx).join(format!("{}.json", uuid))
 }
@@ -5161,6 +5232,29 @@ pub enum CancelBy {
     Coin { ticker: String },
 }
 
+pub async fn get_matching_orders(ctx: &MmArc, coins: &HashSet<String>) -> Result<Vec<Uuid>, String> {
+    let ordermatch_ctx = try_s!(OrdermatchContext::from_ctx(ctx));
+    let mut matching_orders = vec![];
+
+    let maker_orders = ordermatch_ctx.maker_orders_ctx.lock().orders.clone();
+    let taker_orders = ordermatch_ctx.my_taker_orders.lock().await;
+
+    for (uuid, order) in maker_orders.iter() {
+        let order = order.lock().await.clone();
+        if (coins.contains(&order.base) || coins.contains(&order.rel)) && !order.is_cancellable() {
+            matching_orders.push(*uuid);
+        }
+    }
+
+    taker_orders.iter().for_each(|(uuid, order)| {
+        if (coins.contains(&order.request.base) || coins.contains(&order.request.rel)) && !order.is_cancellable() {
+            matching_orders.push(*uuid);
+        };
+    });
+
+    Ok(matching_orders)
+}
+
 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![];
@@ -5365,7 +5459,7 @@ construct_detailed!(DetailedBaseMinVolume, base_min_volume);
 construct_detailed!(DetailedRelMaxVolume, rel_max_volume);
 construct_detailed!(DetailedRelMinVolume, rel_min_volume);
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct RpcOrderbookEntry {
     coin: String,
     address: String,
@@ -5396,7 +5490,7 @@ pub struct RpcOrderbookEntry {
     conf_settings: Option<OrderConfirmationsSettings>,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct RpcOrderbookEntryV2 {
     coin: String,
     address: OrderbookAddress,
@@ -5521,7 +5615,7 @@ fn choose_taker_confs_and_notas(
     }
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 #[serde(tag = "address_type", content = "address_data")]
 pub enum OrderbookAddress {
     Transparent(String),
@@ -5541,6 +5635,12 @@ impl From<json::Error> for OrderbookAddrErr {
     fn from(err: json::Error) -> Self { OrderbookAddrErr::DeserializationError(err) }
 }
 
+impl From<coins::tendermint::AccountIdFromPubkeyHexErr> for OrderbookAddrErr {
+    fn from(err: coins::tendermint::AccountIdFromPubkeyHexErr) -> Self {
+        OrderbookAddrErr::AddrFromPubkeyError(err.to_string())
+    }
+}
+
 fn orderbook_address(
     ctx: &MmArc,
     coin: &str,
@@ -5572,12 +5672,40 @@ fn orderbook_address(
                 _ => MmError::err(OrderbookAddrErr::InvalidPlatformCoinProtocol(platform)),
             }
         },
+        CoinProtocol::TENDERMINT(protocol) => Ok(coins::tendermint::account_id_from_pubkey_hex(
+            &protocol.account_prefix,
+            pubkey,
+        )
+        .map(|id| OrderbookAddress::Transparent(id.to_string()))?),
+        CoinProtocol::TENDERMINTTOKEN(proto) => {
+            let platform_conf = coin_conf(ctx, &proto.platform);
+            if platform_conf.is_null() {
+                return MmError::err(OrderbookAddrErr::PlatformCoinConfIsNull(proto.platform));
+            }
+            // TODO is there any way to make it better without duplicating the prefix in the IBC conf?
+            let platform_protocol: CoinProtocol = json::from_value(platform_conf["protocol"].clone())?;
+            match platform_protocol {
+                CoinProtocol::TENDERMINT(platform) => Ok(coins::tendermint::account_id_from_pubkey_hex(
+                    &platform.account_prefix,
+                    pubkey,
+                )
+                .map(|id| OrderbookAddress::Transparent(id.to_string()))?),
+                _ => MmError::err(OrderbookAddrErr::InvalidPlatformCoinProtocol(format!(
+                    "Platform protocol {:?} is not TENDERMINT",
+                    platform_protocol
+                ))),
+            }
+        },
         #[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())),
+        CoinProtocol::SOLANA | CoinProtocol::SPLTOKEN { .. } => {
+            MmError::err(OrderbookAddrErr::CoinIsNotSupported(coin.to_owned()))
+        },
         #[cfg(not(target_arch = "wasm32"))]
-        CoinProtocol::ZHTLC { .. } => Ok(OrderbookAddress::Shielded),
+        // Todo: Shielded address is used for lightning for now, the lightning node public key can be used for the orderbook entry pubkey
+        // Todo: instead of the platform coin pubkey which is used right now. But lightning payments are supposed to be private,
+        // Todo: so maybe we should hide the node address in the orderbook, only the sending node and the receiving node should know about a payment,
+        // Todo: a routing node will know about a payment it routed but not the sender or the receiver. This will require using a new keypair for every order/swap
+        // Todo: similar to how it's done for zcoin.
+        CoinProtocol::ZHTLC { .. } | CoinProtocol::LIGHTNING { .. } => 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
index 4305052699..0e841a214e 100644
--- a/mm2src/mm2_main/src/lp_ordermatch/best_orders.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/best_orders.rs
@@ -65,10 +65,7 @@ pub fn process_best_orders_p2p_request(
         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 tickers = some_or_return_ok_none!(search_pairs_in.get(&coin));
     let mut result = HashMap::new();
     let pairs = tickers.iter().map(|ticker| match action {
         BestOrdersAction::Buy => (coin.clone(), ticker.clone()),
@@ -154,10 +151,7 @@ pub fn process_best_orders_p2p_request_by_number(
         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 tickers = some_or_return_ok_none!(search_pairs_in.get(&coin));
     let mut result = HashMap::new();
     let pairs = tickers.iter().map(|ticker| match action {
         BestOrdersAction::Buy => (coin.clone(), ticker.clone()),
@@ -266,6 +260,16 @@ pub async fn best_orders_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>,
                     BestOrdersAction::Buy => order.as_rpc_best_orders_buy(address, conf_settings, false),
                     BestOrdersAction::Sell => order.as_rpc_best_orders_sell(address, conf_settings, false),
                 };
+                if let Some(original_tickers) = ordermatch_ctx.original_tickers.get(&coin) {
+                    for ticker in original_tickers {
+                        let mut original_entry = entry.clone();
+                        original_entry.coin = ticker.to_owned();
+                        response
+                            .entry(ticker.to_owned())
+                            .or_insert_with(Vec::new)
+                            .push(original_entry);
+                    }
+                }
                 response.entry(coin.clone()).or_insert_with(Vec::new).push(entry);
             }
         }
@@ -362,6 +366,16 @@ pub async fn best_orders_rpc_v2(
                     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),
                 };
+                if let Some(original_tickers) = ordermatch_ctx.original_tickers.get(&coin) {
+                    for ticker in original_tickers {
+                        let mut original_entry = entry.clone();
+                        original_entry.coin = ticker.to_owned();
+                        orders
+                            .entry(ticker.to_owned())
+                            .or_insert_with(Vec::new)
+                            .push(original_entry);
+                    }
+                }
                 orders.entry(coin.clone()).or_insert_with(Vec::new).push(entry);
             }
         }
diff --git a/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs b/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs
index 12613ffa21..77f075b083 100644
--- a/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/lp_bot.rs
@@ -177,7 +177,7 @@ pub struct ArcTradingBotContext(Arc<TradingBotContext>);
 
 impl Deref for ArcTradingBotContext {
     type Target = TradingBotContext;
-    fn deref(&self) -> &TradingBotContext { &*self.0 }
+    fn deref(&self) -> &TradingBotContext { &self.0 }
 }
 
 #[allow(clippy::single_match)]
diff --git a/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs b/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs
index 5b04afcba9..38278d88e9 100644
--- a/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/orderbook_rpc.rs
@@ -1,9 +1,9 @@
-use super::{orderbook_address, subscribe_to_orderbook_topic, OrdermatchContext, RpcOrderbookEntry};
-use crate::mm2::lp_ordermatch::{addr_format_from_protocol_info, RpcOrderbookEntryV2};
+use super::{addr_format_from_protocol_info, is_my_order, orderbook_address, subscribe_to_orderbook_topic,
+            OrdermatchContext, RpcOrderbookEntry, 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 crypto::{CryptoCtx, CryptoCtxError};
 use derive_more::Display;
 use http::{Response, StatusCode};
 use mm2_core::mm_ctx::MmArc;
@@ -107,10 +107,6 @@ fn build_aggregated_entries_v2(
     (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 {
@@ -139,13 +135,14 @@ pub async fn orderbook_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, S
     }
 
     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 my_pubsecp = match CryptoCtx::from_ctx(&ctx).discard_mm_trace() {
+        Ok(crypto_ctx) => Some(crypto_ctx.mm2_internal_pubkey_hex()),
+        Err(CryptoCtxError::NotInitialized) => None,
+        Err(other) => return ERR!("{}", other),
+    };
+
+    let orderbook = ordermatch_ctx.orderbook.lock();
     let mut asks = match orderbook.unordered.get(&(base_ticker.clone(), rel_ticker.clone())) {
         Some(uuids) => {
             let mut orderbook_entries = Vec::new();
@@ -162,7 +159,7 @@ pub async fn orderbook_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, S
                     &ask.pubkey,
                     address_format,
                 ));
-                let is_mine = is_my_order(&my_pubsecp, &ask.pubkey);
+                let is_mine = is_my_order(&orderbook.my_p2p_pubkeys, &my_pubsecp, &ask.pubkey);
                 orderbook_entries.push(ask.as_rpc_entry_ask(address, is_mine));
             }
             orderbook_entries
@@ -189,7 +186,7 @@ pub async fn orderbook_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, S
                     &bid.pubkey,
                     address_format,
                 ));
-                let is_mine = is_my_order(&my_pubsecp, &bid.pubkey);
+                let is_mine = is_my_order(&orderbook.my_p2p_pubkeys, &my_pubsecp, &bid.pubkey);
                 orderbook_entries.push(bid.as_rpc_entry_bid(address, is_mine));
             }
             orderbook_entries
@@ -227,6 +224,7 @@ pub enum OrderbookRpcError {
     CoinConfigNotFound(String),
     CoinIsWalletOnly(String),
     P2PSubscribeError(String),
+    Internal(String),
 }
 
 impl HttpStatusCode for OrderbookRpcError {
@@ -236,7 +234,9 @@ impl HttpStatusCode for OrderbookRpcError {
             | OrderbookRpcError::BaseRelSameOrderbookTickersAndProtocols
             | OrderbookRpcError::CoinConfigNotFound(_)
             | OrderbookRpcError::CoinIsWalletOnly(_) => StatusCode::BAD_REQUEST,
-            OrderbookRpcError::P2PSubscribeError(_) => StatusCode::INTERNAL_SERVER_ERROR,
+            OrderbookRpcError::P2PSubscribeError(_) | OrderbookRpcError::Internal(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
         }
     }
 }
@@ -306,11 +306,14 @@ pub async fn orderbook_rpc_v2(
         .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 my_pubsecp = match CryptoCtx::from_ctx(&ctx).split_mm() {
+        Ok(crypto_ctx) => Some(crypto_ctx.mm2_internal_pubkey_hex()),
+        Err((CryptoCtxError::NotInitialized, _trace)) => None,
+        Err((CryptoCtxError::Internal(e), trace)) => {
+            return MmError::err_with_trace(OrderbookRpcError::Internal(e), trace)
+        },
+    };
 
     let mut asks = match orderbook.unordered.get(&(base_ticker.clone(), rel_ticker.clone())) {
         Some(uuids) => {
@@ -331,7 +334,7 @@ pub async fn orderbook_rpc_v2(
                         continue;
                     },
                 };
-                let is_mine = is_my_order(&my_pubsecp, &ask.pubkey);
+                let is_mine = is_my_order(&orderbook.my_p2p_pubkeys, &my_pubsecp, &ask.pubkey);
                 orderbook_entries.push(ask.as_rpc_v2_entry_ask(address, is_mine));
             }
             orderbook_entries
@@ -361,7 +364,7 @@ pub async fn orderbook_rpc_v2(
                         continue;
                     },
                 };
-                let is_mine = is_my_order(&my_pubsecp, &bid.pubkey);
+                let is_mine = is_my_order(&orderbook.my_p2p_pubkeys, &my_pubsecp, &bid.pubkey);
                 orderbook_entries.push(bid.as_rpc_v2_entry_bid(address, is_mine));
             }
             orderbook_entries
diff --git a/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs
index d447e16302..ad2742c71c 100644
--- a/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs
+++ b/mm2src/mm2_main/src/lp_ordermatch/simple_market_maker.rs
@@ -11,10 +11,9 @@ use crate::mm2::{lp_ordermatch::{cancel_order, create_maker_order,
                                  OrdermatchContext, SetPriceReq},
                  lp_swap::{latest_swaps_for_pair, LatestSwapsErr}};
 use coins::{lp_coinfind, GetNonZeroBalance};
-use common::Future01CompatExt;
-use common::{executor::{spawn, Timer},
+use common::{executor::{SpawnFuture, Timer},
              log::{debug, error, info, warn},
-             HttpStatusCode, StatusCode};
+             Future01CompatExt, HttpStatusCode, StatusCode};
 use derive_more::Display;
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
@@ -111,7 +110,6 @@ 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,
@@ -119,24 +117,13 @@ pub struct StartSimpleMakerBotRequest {
     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 {
+    #[allow(dead_code)]
     pub fn get_result(&self) -> String { self.result.clone() }
 }
 
@@ -145,8 +132,8 @@ pub struct StartSimpleMakerBotRes {
     result: String,
 }
 
-#[cfg(test)]
 impl StartSimpleMakerBotRes {
+    #[allow(dead_code)]
     pub fn get_result(&self) -> String { self.result.clone() }
 }
 
@@ -443,12 +430,12 @@ async fn checks_order_prerequisites(
 }
 
 async fn prepare_order(
-    rates: RateInfos,
+    rates: &RateInfos,
     cfg: &SimpleCoinMarketMakerCfg,
     key_trade_pair: &str,
     ctx: &MmArc,
 ) -> OrderPreparationResult {
-    checks_order_prerequisites(&rates, cfg, key_trade_pair).await?;
+    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))?;
@@ -459,12 +446,11 @@ async fn prepare_order(
 
     debug!("balance for {} is {}", cfg.base, base_balance);
 
-    let mut calculated_price = rates.price * cfg.spread.clone();
+    let mut calculated_price = &rates.price * &cfg.spread;
     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 {
@@ -508,17 +494,16 @@ async fn prepare_order(
 }
 
 async fn update_single_order(
-    rates: RateInfos,
+    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 (min_vol, volume, calculated_price, is_max) = prepare_order(rates, &cfg, &key_trade_pair, ctx).await?;
     let req = MakerOrderUpdateReq {
         uuid,
-        new_price: Some(calculated_price),
+        new_price: Some(calculated_price.clone()),
         max: is_max.into(),
         volume_delta: None,
         min_volume: min_vol,
@@ -531,7 +516,19 @@ async fn update_single_order(
     let resp = update_maker_order(ctx, req)
         .await
         .map_to_mm(OrderProcessingError::OrderUpdateError)?;
-    info!("Successfully update order for {} - uuid: {}", key_trade_pair, resp.uuid);
+
+    let vol_info = if is_max {
+        "max volume".to_string()
+    } else {
+        format!("volume: {:.8}", volume.to_decimal())
+    };
+
+    info!(
+        "Successfully update order for {key_trade_pair} - uuid: {} - rate: ({:.8} {key_trade_pair}) - {vol_info}",
+        resp.uuid,
+        calculated_price.to_decimal()
+    );
+
     Ok(true)
 }
 
@@ -541,14 +538,14 @@ async fn execute_update_order(
     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 {
+    match update_single_order(&rates, cfg, uuid, key_trade_pair.as_combination(), &ctx).await {
         Ok(resp) => resp,
         Err(err) => {
+            let pair = key_trade_pair.as_combination();
             error!(
-                "Order with uuid: {} for {} cannot be updated - {}",
+                "Order with uuid: {} for {pair} cannot be updated - rate: ({:.8} {pair}) - err: {err:?}",
                 order.uuid,
-                key_trade_pair.as_combination(),
-                err
+                rates.price.to_decimal(),
             );
             cancel_single_order(&ctx, order.uuid).await;
             false
@@ -557,7 +554,7 @@ async fn execute_update_order(
 }
 
 async fn create_single_order(
-    rates: RateInfos,
+    rates: &RateInfos,
     cfg: SimpleCoinMarketMakerCfg,
     key_trade_pair: String,
     ctx: MmArc,
@@ -567,9 +564,9 @@ async fn create_single_order(
     let req = SetPriceReq {
         base: cfg.base.clone(),
         rel: cfg.rel.clone(),
-        price: calculated_price,
+        price: calculated_price.clone(),
         max: is_max,
-        volume,
+        volume: volume.clone(),
         min_volume: min_vol,
         cancel_previous: true,
         base_confs: cfg.base_confs,
@@ -582,7 +579,18 @@ async fn create_single_order(
     let resp = create_maker_order(&ctx, req)
         .await
         .map_to_mm(OrderProcessingError::OrderUpdateError)?;
-    info!("Successfully placed order for {} - uuid: {}", key_trade_pair, resp.uuid);
+    let vol_info = if is_max {
+        "max volume".to_string()
+    } else {
+        format!("volume: {:.8}", volume.to_decimal())
+    };
+
+    info!(
+        "Successfully update order for {key_trade_pair} - uuid: {} - rate: ({:.8} {key_trade_pair}) - {vol_info}",
+        resp.uuid,
+        calculated_price.to_decimal()
+    );
+
     Ok(true)
 }
 
@@ -592,10 +600,13 @@ async fn execute_create_single_order(
     key_trade_pair: String,
     ctx: &MmArc,
 ) -> bool {
-    match create_single_order(rates, cfg, key_trade_pair.clone(), ctx.clone()).await {
+    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);
+            error!(
+                "{err} - order cannot be created for: {key_trade_pair} - rate: ({:.8} {key_trade_pair}).",
+                rates.price.to_decimal(),
+            );
             false
         },
     }
@@ -614,12 +625,12 @@ async fn process_bot_logic(ctx: &MmArc) {
     };
     let rates_registry = match fetch_price_tickers(price_url.as_str()).await {
         Ok(model) => {
-            info!("price successfully fetched");
+            info!("price successfully fetched from {price_url}");
             model
         },
         Err(err) => {
             let nb_orders = cancel_pending_orders(ctx, &cfg).await;
-            error!("error during fetching price: {:?} - cancel {} orders", err, nb_orders);
+            error!("error fetching price: {err:?} - cancel {nb_orders} orders");
             return;
         },
     };
@@ -733,7 +744,7 @@ pub async fn start_simple_market_maker_bot(ctx: MmArc, req: StartSimpleMakerBotR
             drop(state);
             let event: TradingBotEvent = TradingBotStarted { nb_pairs }.into();
             dispatcher.dispatch_async(ctx.clone(), event.into()).await;
-            spawn(lp_bot_loop(ctx.clone()));
+            ctx.spawner().spawn(lp_bot_loop(ctx.clone()));
             Ok(StartSimpleMakerBotRes {
                 result: "Success".to_string(),
             })
@@ -764,3 +775,38 @@ pub async fn stop_simple_market_maker_bot(ctx: MmArc, _req: Json) -> StopSimpleM
         },
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{start_simple_market_maker_bot, stop_simple_market_maker_bot, StartSimpleMakerBotRequest};
+    use common::block_on;
+    use mm2_test_helpers::for_tests::mm_ctx_with_iguana;
+    use serde_json::Value as Json;
+
+    #[test]
+    fn test_start_and_stop_simple_market_maker_bot_from_ctx() {
+        let ctx = mm_ctx_with_iguana(Some(
+            "also shoot benefit prefer juice shell elder veteran woman mimic image kidney",
+        ));
+
+        let cloned_ctx = ctx.clone();
+        let another_cloned_ctx = ctx.clone();
+        let req = StartSimpleMakerBotRequest {
+            cfg: Default::default(),
+            price_url: None,
+            bot_refresh_rate: None,
+        };
+        let answer = block_on(start_simple_market_maker_bot(ctx, req)).unwrap();
+        assert_eq!(answer.get_result(), "Success");
+
+        let req = StartSimpleMakerBotRequest {
+            cfg: Default::default(),
+            price_url: None,
+            bot_refresh_rate: None,
+        };
+        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");
+    }
+}
diff --git a/mm2src/mm2_main/src/lp_stats.rs b/mm2src/mm2_main/src/lp_stats.rs
index f73500cfd9..4f1c115be4 100644
--- a/mm2src/mm2_main/src/lp_stats.rs
+++ b/mm2src/mm2_main/src/lp_stats.rs
@@ -1,6 +1,6 @@
 /// The module is responsible for mm2 network stats collection
 ///
-use common::executor::{spawn, Timer};
+use common::executor::{SpawnFuture, Timer};
 use common::{log, now_ms, HttpStatusCode};
 use derive_more::Display;
 use futures::lock::Mutex as AsyncMutex;
@@ -259,7 +259,8 @@ pub async fn start_version_stat_collection(ctx: MmArc, req: Json) -> NodeVersion
         add_reserved_peer_addresses(&ctx, peer_id, addresses);
     }
 
-    spawn(stat_collection_loop(ctx, interval));
+    let spawner = ctx.spawner();
+    spawner.spawn(stat_collection_loop(ctx, interval));
 
     Ok("success".into())
 }
diff --git a/mm2src/mm2_main/src/lp_swap.rs b/mm2src/mm2_main/src/lp_swap.rs
index cc108daab8..711dbdb064 100644
--- a/mm2src/mm2_main/src/lp_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap.rs
@@ -58,27 +58,30 @@
 //
 
 use crate::mm2::lp_network::{broadcast_p2p_msg, Libp2pPeerId};
-use async_std::sync as async_std_sync;
-use coins::{lp_coinfind, MmCoinEnum, TradeFee, TransactionEnum};
+use bitcrypto::{dhash160, sha256};
+use coins::{lp_coinfind, lp_coinfind_or_err, CoinFindError, MmCoinEnum, TradeFee, TransactionEnum};
 use common::log::{debug, warn};
+use common::time_cache::DuplicateCache;
 use common::{bits256, calc_total_pages,
-             executor::{spawn, Timer},
+             executor::{spawn_abortable, AbortOnDropHandle, SpawnFuture, Timer},
              log::{error, info},
-             now_ms, spawn_abortable, var, AbortOnDropHandle, PagingOptions};
+             now_ms, var, HttpStatusCode, PagingOptions, StatusCode};
 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 mm2_number::{BigDecimal, BigRational, MmNumber};
-use primitives::hash::{H160, H264};
+use mm2_libp2p::{decode_signed, encode_and_sign, pub_sub_topic, PeerId, TopicPrefix};
+use mm2_number::{BigDecimal, BigRational, MmNumber, MmNumberMultiRepr};
+use parking_lot::Mutex as PaMutex;
 use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json};
+use serde::Serialize;
 use serde_json::{self as json, Value as Json};
 use std::collections::{HashMap, HashSet};
 use std::num::NonZeroUsize;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex, Weak};
+use std::time::Duration;
 use uuid::Uuid;
 
 #[cfg(feature = "custom-swap-locktime")]
@@ -86,11 +89,13 @@ 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/max_maker_vol_rpc.rs"] mod max_maker_vol_rpc;
 #[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/swap_watcher.rs"] mod swap_watcher;
 #[path = "lp_swap/taker_swap.rs"] mod taker_swap;
 #[path = "lp_swap/trade_preimage.rs"] mod trade_preimage;
 
@@ -98,21 +103,26 @@ use std::sync::atomic::{AtomicU64, Ordering};
 #[path = "lp_swap/swap_wasm_db.rs"]
 mod swap_wasm_db;
 
-pub use check_balance::{check_other_coin_balance_for_swap, CheckBalanceError};
+pub use check_balance::{check_other_coin_balance_for_swap, CheckBalanceError, CheckBalanceResult};
+use crypto::CryptoCtx;
 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,
-                     MakerSavedEvent, MakerSavedSwap, MakerSwap, MakerSwapStatusChanged, MakerTradePreimage,
-                     RunMakerSwapInput};
+pub use maker_swap::{calc_max_maker_vol, check_balance_for_maker_swap, get_max_maker_vol, maker_swap_trade_preimage,
+                     run_maker_swap, CoinVolumeInfo, MakerSavedEvent, MakerSavedSwap, MakerSwap,
+                     MakerSwapStatusChanged, MakerTradePreimage, RunMakerSwapInput, MAKER_PAYMENT_SENT_LOG};
+pub use max_maker_vol_rpc::max_maker_vol;
 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};
+pub use swap_watcher::{process_watcher_msg, watcher_topic, TakerSwapWatcherData, MAKER_PAYMENT_SPEND_FOUND_LOG,
+                       MAKER_PAYMENT_SPEND_SENT_LOG, TAKER_PAYMENT_REFUND_SENT_LOG, TAKER_SWAP_ENTRY_TIMEOUT,
+                       WATCHER_PREFIX};
 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, taker_swap_trade_preimage, RunTakerSwapInput, TakerSavedSwap, TakerSwap,
-                     TakerSwapPreparedParams, TakerTradePreimage};
+                     TakerSwapData, TakerSwapPreparedParams, TakerTradePreimage, WATCHER_MESSAGE_SENT_LOG};
 pub use trade_preimage::trade_preimage_rpc;
 
 pub const SWAP_PREFIX: TopicPrefix = "swap";
@@ -126,13 +136,13 @@ cfg_wasm32! {
     pub type SwapDbLocked<'a> = DbLocked<'a, SwapDb>;
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
 pub enum SwapMsg {
     Negotiation(NegotiationDataMsg),
     NegotiationReply(NegotiationDataMsg),
     Negotiated(bool),
-    TakerFee(Vec<u8>),
-    MakerPayment(Vec<u8>),
+    TakerFee(SwapTxDataMsg),
+    MakerPayment(SwapTxDataMsg),
     TakerPayment(Vec<u8>),
 }
 
@@ -141,8 +151,8 @@ pub struct SwapMsgStore {
     negotiation: Option<NegotiationDataMsg>,
     negotiation_reply: Option<NegotiationDataMsg>,
     negotiated: Option<bool>,
-    taker_fee: Option<Vec<u8>>,
-    maker_payment: Option<Vec<u8>>,
+    taker_fee: Option<SwapTxDataMsg>,
+    maker_payment: Option<SwapTxDataMsg>,
     taker_payment: Option<Vec<u8>>,
     accept_only_from: bits256,
 }
@@ -156,12 +166,44 @@ impl SwapMsgStore {
     }
 }
 
+/// Returns key-pair for signing P2P messages and an optional `PeerId` if it should be used forcibly
+/// instead of local peer ID.
+///
+/// # Panic
+///
+/// This function panics if `CryptoCtx` hasn't been initialized yet.
+pub fn p2p_keypair_and_peer_id_to_broadcast(ctx: &MmArc, p2p_privkey: Option<&KeyPair>) -> (KeyPair, Option<PeerId>) {
+    match p2p_privkey {
+        Some(keypair) => (*keypair, Some(keypair.libp2p_peer_id())),
+        None => {
+            let crypto_ctx = CryptoCtx::from_ctx(ctx).expect("CryptoCtx must be initialized already");
+            (*crypto_ctx.mm2_internal_key_pair(), None)
+        },
+    }
+}
+
+/// Returns private key for signing P2P messages and an optional `PeerId` if it should be used forcibly
+/// instead of local peer ID.
+///
+/// # Panic
+///
+/// This function panics if `CryptoCtx` hasn't been initialized yet.
+pub fn p2p_private_and_peer_id_to_broadcast(ctx: &MmArc, p2p_privkey: Option<&KeyPair>) -> ([u8; 32], Option<PeerId>) {
+    match p2p_privkey {
+        Some(keypair) => (keypair.private_bytes(), Some(keypair.libp2p_peer_id())),
+        None => {
+            let crypto_ctx = CryptoCtx::from_ctx(ctx).expect("CryptoCtx must be initialized already");
+            (crypto_ctx.mm2_internal_privkey_secret().take(), None)
+        },
+    }
+}
+
 /// Spawns the loop that broadcasts message every `interval` seconds returning the AbortOnDropHandle
 /// to stop it
-pub fn broadcast_swap_message_every(
+pub fn broadcast_swap_message_every<T: 'static + Serialize + Clone + Send>(
     ctx: MmArc,
     topic: String,
-    msg: SwapMsg,
+    msg: T,
     interval: f64,
     p2p_privkey: Option<KeyPair>,
 ) -> AbortOnDropHandle {
@@ -175,22 +217,19 @@ pub fn broadcast_swap_message_every(
 }
 
 /// Broadcast the swap message once
-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),
-    };
+pub fn broadcast_swap_message<T: Serialize>(ctx: &MmArc, topic: String, msg: T, p2p_privkey: &Option<KeyPair>) {
+    let (p2p_private, from) = p2p_private_and_peer_id_to_broadcast(ctx, p2p_privkey.as_ref());
     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),
-    };
+    if !msg.supports_tx_helper() {
+        return;
+    }
 
+    let (p2p_private, from) = p2p_private_and_peer_id_to_broadcast(ctx, p2p_privkey.as_ref());
     let encoded_msg = encode_and_sign(&msg.tx_hex(), &p2p_private).unwrap();
     broadcast_p2p_msg(ctx, vec![topic], encoded_msg, from);
 }
@@ -200,6 +239,7 @@ pub async fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
         Ok(u) => u,
         Err(_) => return,
     };
+
     let msg = match decode_signed::<SwapMsg>(msg) {
         Ok(m) => m,
         Err(swap_msg_err) => {
@@ -231,8 +271,8 @@ pub async fn process_msg(ctx: MmArc, topic: &str, msg: &[u8]) {
                 SwapMsg::Negotiation(data) => msg_store.negotiation = Some(data),
                 SwapMsg::NegotiationReply(data) => msg_store.negotiation_reply = Some(data),
                 SwapMsg::Negotiated(negotiated) => msg_store.negotiated = Some(negotiated),
-                SwapMsg::TakerFee(taker_fee) => msg_store.taker_fee = Some(taker_fee),
-                SwapMsg::MakerPayment(maker_payment) => msg_store.maker_payment = Some(maker_payment),
+                SwapMsg::TakerFee(data) => msg_store.taker_fee = Some(data),
+                SwapMsg::MakerPayment(data) => msg_store.maker_payment = Some(data),
                 SwapMsg::TakerPayment(taker_payment) => msg_store.taker_payment = Some(taker_payment),
             }
         } else {
@@ -303,6 +343,22 @@ pub fn get_payment_locktime() -> u64 {
     PAYMENT_LOCKTIME.load(Ordering::Relaxed)
 }
 
+#[inline]
+pub fn taker_payment_spend_duration(locktime: u64) -> u64 { (locktime * 4) / 5 }
+
+#[inline]
+pub fn taker_payment_spend_deadline(swap_started_at: u64, locktime: u64) -> u64 {
+    swap_started_at + taker_payment_spend_duration(locktime)
+}
+
+#[inline]
+pub fn wait_for_maker_payment_conf_duration(locktime: u64) -> u64 { (locktime * 2) / 5 }
+
+#[inline]
+pub fn wait_for_maker_payment_conf_until(swap_started_at: u64, locktime: u64) -> u64 {
+    swap_started_at + wait_for_maker_payment_conf_duration(locktime)
+}
+
 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
@@ -359,13 +415,8 @@ impl From<TakerSwapEvent> for SwapEvent {
 struct SwapsContext {
     running_swaps: Mutex<Vec<Weak<dyn AtomicSwap>>>,
     banned_pubkeys: Mutex<HashMap<H256Json, BanReason>>,
-    /// The cloneable receiver of multi-consumer async channel awaiting for shutdown_tx.send() to be
-    /// invoked to stop all running swaps.
-    /// MM2 is used as static lib on some platforms e.g. iOS so it doesn't run as separate process.
-    /// So when stop was invoked the swaps could stay running on shared executors causing
-    /// Very unpleasant consequences
-    shutdown_rx: async_std_sync::Receiver<()>,
     swap_msgs: Mutex<HashMap<Uuid, SwapMsgStore>>,
+    taker_swap_watchers: PaMutex<DuplicateCache<Vec<u8>>>,
     #[cfg(target_arch = "wasm32")]
     swap_db: ConstructibleDb<SwapDb>,
 }
@@ -374,25 +425,11 @@ impl SwapsContext {
     /// Obtains a reference to this crate context, creating it if necessary.
     fn from_ctx(ctx: &MmArc) -> Result<Arc<SwapsContext>, String> {
         Ok(try_s!(from_ctx(&ctx.swaps_ctx, move || {
-            let (shutdown_tx, shutdown_rx) = async_std_sync::channel(1);
-            let mut shutdown_tx = Some(shutdown_tx);
-            ctx.on_stop(Box::new(move || {
-                if let Some(shutdown_tx) = shutdown_tx.take() {
-                    info!("on_stop] firing shutdown_tx!");
-                    spawn(async move {
-                        shutdown_tx.send(()).await;
-                    });
-                    Ok(())
-                } else {
-                    ERR!("on_stop callback called twice!")
-                }
-            }));
-
             Ok(SwapsContext {
                 running_swaps: Mutex::new(vec![]),
                 banned_pubkeys: Mutex::new(HashMap::new()),
-                shutdown_rx,
                 swap_msgs: Mutex::new(HashMap::new()),
+                taker_swap_watchers: PaMutex::new(DuplicateCache::new(Duration::from_secs(TAKER_SWAP_ENTRY_TIMEOUT))),
                 #[cfg(target_arch = "wasm32")]
                 swap_db: ConstructibleDb::new(ctx),
             })
@@ -408,6 +445,53 @@ impl SwapsContext {
     pub async fn swap_db(&self) -> InitDbResult<SwapDbLocked<'_>> { Ok(self.swap_db.get_or_initialize().await?) }
 }
 
+#[derive(Debug, Deserialize)]
+pub struct GetLockedAmountReq {
+    coin: String,
+}
+
+#[derive(Serialize)]
+pub struct GetLockedAmountResp {
+    coin: String,
+    locked_amount: MmNumberMultiRepr,
+}
+
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum GetLockedAmountRpcError {
+    #[display(fmt = "No such coin: {}", coin)]
+    NoSuchCoin { coin: String },
+}
+
+impl HttpStatusCode for GetLockedAmountRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            GetLockedAmountRpcError::NoSuchCoin { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+        }
+    }
+}
+
+impl From<CoinFindError> for GetLockedAmountRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => GetLockedAmountRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+pub async fn get_locked_amount_rpc(
+    ctx: MmArc,
+    req: GetLockedAmountReq,
+) -> Result<GetLockedAmountResp, MmError<GetLockedAmountRpcError>> {
+    lp_coinfind_or_err(&ctx, &req.coin).await?;
+    let locked_amount = get_locked_amount(&ctx, &req.coin);
+
+    Ok(GetLockedAmountResp {
+        coin: req.coin,
+        locked_amount: locked_amount.into(),
+    })
+}
+
 /// Get total amount of selected coin locked by all currently ongoing swaps
 pub fn get_locked_amount(ctx: &MmArc, coin: &str) -> MmNumber {
     let swap_ctx = SwapsContext::from_ctx(ctx).unwrap();
@@ -463,13 +547,13 @@ fn get_locked_amount_by_other_swaps(ctx: &MmArc, except_uuid: &Uuid, coin: &str)
         })
 }
 
-pub fn active_swaps_using_coin(ctx: &MmArc, coin: &str) -> Result<Vec<Uuid>, String> {
+pub fn active_swaps_using_coins(ctx: &MmArc, coins: &HashSet<String>) -> Result<Vec<Uuid>, String> {
     let swap_ctx = try_s!(SwapsContext::from_ctx(ctx));
     let swaps = try_s!(swap_ctx.running_swaps.lock());
     let mut uuids = vec![];
     for swap in swaps.iter() {
         if let Some(swap) = swap.upgrade() {
-            if swap.maker_coin() == coin || swap.taker_coin() == coin {
+            if coins.contains(&swap.maker_coin().to_string()) || coins.contains(&swap.taker_coin().to_string()) {
                 uuids.push(*swap.uuid())
             }
         }
@@ -528,7 +612,10 @@ pub fn lp_atomic_locktime_v2(
     my_conf_settings: &SwapConfirmationsSettings,
     other_conf_settings: &SwapConfirmationsSettings,
 ) -> u64 {
-    if maker_coin == "BTC"
+    if taker_coin.contains("-lightning") {
+        // A good value for lightning taker locktime is about 24 hours to find a good 3 hop or less path for the payment
+        get_payment_locktime() * 12
+    } else if maker_coin == "BTC"
         || taker_coin == "BTC"
         || coin_with_4x_locktime(maker_coin)
         || coin_with_4x_locktime(taker_coin)
@@ -555,6 +642,7 @@ pub fn lp_atomic_locktime(maker_coin: &str, taker_coin: &str, version: AtomicLoc
 }
 
 fn dex_fee_threshold(min_tx_amount: MmNumber) -> MmNumber {
+    // Todo: This should be reduced for lightning swaps.
     // 0.0001
     let min_fee = MmNumber::from((1, 10000));
     if min_fee < min_tx_amount {
@@ -565,7 +653,7 @@ fn dex_fee_threshold(min_tx_amount: MmNumber) -> MmNumber {
 }
 
 fn dex_fee_rate(base: &str, rel: &str) -> MmNumber {
-    let fee_discount_tickers: &[&str] = if cfg!(test) && var("MYCOIN_FEE_DISCOUNT").is_ok() {
+    let fee_discount_tickers: &[&str] = if var("MYCOIN_FEE_DISCOUNT").is_ok() {
         &["KMD", "MYCOIN"]
     } else {
         &["KMD"]
@@ -689,25 +777,63 @@ impl NegotiationDataMsg {
     }
 }
 
-/// Data to be exchanged and validated on swap start, the replacement of LP_pubkeys_data, LP_choosei_data, etc.
-#[derive(Debug, Default, Deserializable, Eq, PartialEq, Serializable)]
-struct SwapNegotiationData {
-    started_at: u64,
-    payment_locktime: u64,
-    secret_hash: H160,
-    persistent_pubkey: H264,
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+pub struct PaymentWithInstructions {
+    data: Vec<u8>,
+    // Next step instructions for the other side whether taker or maker.
+    // An example for this is a maker/taker sending the taker/maker a lightning invoice to be payed.
+    next_step_instructions: Vec<u8>,
+}
+
+#[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+#[serde(untagged)]
+pub enum SwapTxDataMsg {
+    Regular(Vec<u8>),
+    WithInstructions(PaymentWithInstructions),
+}
+
+impl SwapTxDataMsg {
+    #[inline]
+    pub fn data(&self) -> &[u8] {
+        match self {
+            SwapTxDataMsg::Regular(data) => data,
+            SwapTxDataMsg::WithInstructions(p) => &p.data,
+        }
+    }
+
+    #[inline]
+    pub fn instructions(&self) -> Option<&[u8]> {
+        match self {
+            SwapTxDataMsg::Regular(_) => None,
+            SwapTxDataMsg::WithInstructions(p) => Some(&p.next_step_instructions),
+        }
+    }
+
+    #[inline]
+    pub fn new(data: Vec<u8>, instructions: Option<Vec<u8>>) -> Self {
+        match instructions {
+            Some(next_step_instructions) => SwapTxDataMsg::WithInstructions(PaymentWithInstructions {
+                data,
+                next_step_instructions,
+            }),
+            None => SwapTxDataMsg::Regular(data),
+        }
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct TransactionIdentifier {
-    /// 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 in hexadecimal string, this should be sent as is to send_raw_transaction RPC to broadcast the transaction.
+    /// Some payments like lightning payments don't have a tx_hex, for such payments tx_hex will be equal to tx_hash.
     tx_hex: BytesJson,
     /// Transaction hash in hexadecimal format
     tx_hash: BytesJson,
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn my_swaps_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("MY") }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn my_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf { my_swaps_dir(ctx).join(format!("{}.json", uuid)) }
 
 pub async fn insert_new_swap_to_db(
@@ -725,7 +851,9 @@ pub async fn insert_new_swap_to_db(
 
 #[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)
+    if let Some(conn) = ctx.sqlite_conn_opt() {
+        crate::mm2::database::stats_swaps::add_swap_to_index(&conn, swap)
+    }
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -995,7 +1123,7 @@ pub async fn my_recent_swaps_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u
                 let swap_json = json::to_value(MySwapStatusResponse::from(swap)).unwrap();
                 swaps.push(swap_json)
             },
-            Ok(None) => error!("No such swap with the uuid '{}'", uuid),
+            Ok(None) => warn!("No such swap with the uuid '{}'", uuid),
             Err(e) => error!("Error loading a swap with the uuid '{}': {}", uuid, e),
         }
     }
@@ -1044,23 +1172,8 @@ pub async fn swap_kick_starts(ctx: MmArc) -> Result<HashSet<String>, String> {
         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
-        });
+        let fut = kickstart_thread_handler(ctx.clone(), swap, maker_coin_ticker, taker_coin_ticker);
+        ctx.spawner().spawn(fut);
     }
     Ok(coins)
 }
@@ -1227,11 +1340,60 @@ pub async fn active_swaps_rpc(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>
     Ok(try_s!(Response::builder().body(res)))
 }
 
-#[cfg(test)]
-mod lp_swap_tests {
-    use serialization::{deserialize, serialize};
+enum SecretHashAlgo {
+    /// ripemd160(sha256(secret))
+    DHASH160,
+    /// sha256(secret)
+    SHA256,
+}
+
+impl Default for SecretHashAlgo {
+    fn default() -> Self { SecretHashAlgo::DHASH160 }
+}
+
+impl SecretHashAlgo {
+    fn hash_secret(&self, secret: &[u8]) -> Vec<u8> {
+        match self {
+            SecretHashAlgo::DHASH160 => dhash160(secret).take().into(),
+            SecretHashAlgo::SHA256 => sha256(secret).take().into(),
+        }
+    }
+}
+
+// Todo: Maybe add a secret_hash_algo method to the SwapOps trait instead
+#[cfg(not(target_arch = "wasm32"))]
+fn detect_secret_hash_algo(maker_coin: &MmCoinEnum, taker_coin: &MmCoinEnum) -> SecretHashAlgo {
+    match (maker_coin, taker_coin) {
+        (MmCoinEnum::Tendermint(_) | MmCoinEnum::TendermintToken(_) | MmCoinEnum::LightningCoin(_), _) => {
+            SecretHashAlgo::SHA256
+        },
+        // If taker is lightning coin the SHA256 of the secret will be sent as part of the maker signed invoice
+        (_, MmCoinEnum::Tendermint(_) | MmCoinEnum::TendermintToken(_)) => SecretHashAlgo::SHA256,
+        (_, _) => SecretHashAlgo::DHASH160,
+    }
+}
 
+#[cfg(target_arch = "wasm32")]
+fn detect_secret_hash_algo(maker_coin: &MmCoinEnum, taker_coin: &MmCoinEnum) -> SecretHashAlgo {
+    match (maker_coin, taker_coin) {
+        (MmCoinEnum::Tendermint(_) | MmCoinEnum::TendermintToken(_), _) => SecretHashAlgo::SHA256,
+        (_, MmCoinEnum::Tendermint(_) | MmCoinEnum::TendermintToken(_)) => SecretHashAlgo::SHA256,
+        (_, _) => SecretHashAlgo::DHASH160,
+    }
+}
+
+#[cfg(all(test, not(target_arch = "wasm32")))]
+mod lp_swap_tests {
     use super::*;
+    use crate::mm2::lp_native_dex::{fix_directories, init_p2p};
+    use coins::utxo::rpc_clients::ElectrumRpcRequest;
+    use coins::utxo::utxo_standard::utxo_standard_coin_with_priv_key;
+    use coins::utxo::{UtxoActivationParams, UtxoRpcMode};
+    use coins::MarketCoinOps;
+    use coins::PrivKeyActivationPolicy;
+    use common::block_on;
+    use mm2_core::mm_ctx::MmCtxBuilder;
+    use mm2_test_helpers::for_tests::{morty_conf, rick_conf, MORTY_ELECTRUM_ADDRS, RICK_ELECTRUM_ADDRS};
 
     #[test]
     fn test_dex_fee_amount() {
@@ -1265,14 +1427,6 @@ mod lp_swap_tests {
         assert_eq!(dex_fee_threshold, actual_fee);
     }
 
-    #[test]
-    fn test_serde_swap_negotiation_data() {
-        let data = SwapNegotiationData::default();
-        let bytes = serialize(&data);
-        let deserialized = deserialize(bytes.as_slice()).unwrap();
-        assert_eq!(data, deserialized);
-    }
-
     #[test]
     fn test_lp_atomic_locktime() {
         let maker_coin = "KMD";
@@ -1524,6 +1678,255 @@ mod lp_swap_tests {
         assert_eq!(deserialized, v3);
     }
 
+    #[test]
+    fn check_payment_data_serde() {
+        const MSG_DATA_INSTRUCTIONS: [u8; 300] = [1; 300];
+
+        #[derive(Clone, Debug, Eq, Deserialize, PartialEq, Serialize)]
+        enum SwapMsgOld {
+            Negotiation(NegotiationDataMsg),
+            NegotiationReply(NegotiationDataMsg),
+            Negotiated(bool),
+            TakerFee(Vec<u8>),
+            MakerPayment(Vec<u8>),
+            TakerPayment(Vec<u8>),
+        }
+
+        // old message format should be deserialized to PaymentDataMsg::Regular
+        let old = SwapMsgOld::MakerPayment(MSG_DATA_INSTRUCTIONS.to_vec());
+
+        let expected = SwapMsg::MakerPayment(SwapTxDataMsg::Regular(MSG_DATA_INSTRUCTIONS.to_vec()));
+
+        let serialized = rmp_serde::to_vec(&old).unwrap();
+
+        let deserialized: SwapMsg = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
+
+        assert_eq!(deserialized, expected);
+
+        // PaymentDataMsg::Regular should be deserialized to old message format
+        let v1 = SwapMsg::MakerPayment(SwapTxDataMsg::Regular(MSG_DATA_INSTRUCTIONS.to_vec()));
+
+        let expected = old;
+
+        let serialized = rmp_serde::to_vec(&v1).unwrap();
+
+        let deserialized: SwapMsgOld = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
+
+        assert_eq!(deserialized, expected);
+
+        // PaymentDataMsg::Regular should be deserialized to PaymentDataMsg::Regular
+        let v1 = SwapMsg::MakerPayment(SwapTxDataMsg::Regular(MSG_DATA_INSTRUCTIONS.to_vec()));
+
+        let serialized = rmp_serde::to_vec(&v1).unwrap();
+
+        let deserialized: SwapMsg = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
+
+        assert_eq!(deserialized, v1);
+
+        // PaymentDataMsg::WithInstructions should be deserialized to PaymentDataMsg::WithInstructions
+        let v2 = SwapMsg::MakerPayment(SwapTxDataMsg::WithInstructions(PaymentWithInstructions {
+            data: MSG_DATA_INSTRUCTIONS.to_vec(),
+            next_step_instructions: MSG_DATA_INSTRUCTIONS.to_vec(),
+        }));
+
+        let serialized = rmp_serde::to_vec(&v2).unwrap();
+
+        let deserialized: SwapMsg = rmp_serde::from_read_ref(serialized.as_slice()).unwrap();
+
+        assert_eq!(deserialized, v2);
+
+        // PaymentDataMsg::WithInstructions shouldn't be deserialized to old message format, new nodes with payment instructions can't swap with old nodes without it.
+        let v2 = SwapMsg::MakerPayment(SwapTxDataMsg::WithInstructions(PaymentWithInstructions {
+            data: MSG_DATA_INSTRUCTIONS.to_vec(),
+            next_step_instructions: MSG_DATA_INSTRUCTIONS.to_vec(),
+        }));
+
+        let serialized = rmp_serde::to_vec(&v2).unwrap();
+
+        let deserialized: Result<SwapMsgOld, rmp_serde::decode::Error> =
+            rmp_serde::from_read_ref(serialized.as_slice());
+
+        assert!(deserialized.is_err());
+    }
+
+    fn utxo_activation_params(electrums: &[&str]) -> UtxoActivationParams {
+        UtxoActivationParams {
+            mode: UtxoRpcMode::Electrum {
+                servers: electrums
+                    .into_iter()
+                    .map(|url| ElectrumRpcRequest {
+                        url: url.to_string(),
+                        protocol: Default::default(),
+                        disable_cert_verification: false,
+                    })
+                    .collect(),
+            },
+            utxo_merge_params: None,
+            tx_history: false,
+            required_confirmations: Some(0),
+            requires_notarization: None,
+            address_format: None,
+            gap_limit: None,
+            enable_params: Default::default(),
+            priv_key_policy: PrivKeyActivationPolicy::ContextPrivKey,
+            check_utxo_maturity: None,
+        }
+    }
+
+    #[test]
+    #[ignore]
+    fn gen_recoverable_swap() {
+        let maker_passphrase = std::env::var("BOB_PASSPHRASE").expect("BOB_PASSPHRASE env must be set");
+        let maker_fail_at = std::env::var("MAKER_FAIL_AT").map(maker_swap::FailAt::from).ok();
+        let taker_passphrase = std::env::var("ALICE_PASSPHRASE").expect("ALICE_PASSPHRASE env must be set");
+        let taker_fail_at = std::env::var("TAKER_FAIL_AT").map(taker_swap::FailAt::from).ok();
+        let lock_duration = match std::env::var("LOCK_DURATION") {
+            Ok(maybe_num) => maybe_num.parse().expect("LOCK_DURATION must be a number of seconds"),
+            Err(_) => 30,
+        };
+
+        if maker_fail_at.is_none() && taker_fail_at.is_none() {
+            panic!("At least one of MAKER_FAIL_AT/TAKER_FAIL_AT must be provided");
+        }
+
+        let maker_ctx_conf = json!({
+            "netid": 1234,
+            "p2p_in_memory": true,
+            "p2p_in_memory_port": 777,
+            "i_am_seed": true,
+        });
+
+        let maker_ctx = MmCtxBuilder::default().with_conf(maker_ctx_conf).into_mm_arc();
+        let maker_key_pair = *CryptoCtx::init_with_iguana_passphrase(maker_ctx.clone(), &maker_passphrase)
+            .unwrap()
+            .mm2_internal_key_pair();
+
+        fix_directories(&maker_ctx).unwrap();
+        block_on(init_p2p(maker_ctx.clone())).unwrap();
+        maker_ctx.init_sqlite_connection().unwrap();
+
+        let rick_activation_params = utxo_activation_params(RICK_ELECTRUM_ADDRS);
+        let morty_activation_params = utxo_activation_params(MORTY_ELECTRUM_ADDRS);
+
+        let rick_maker = block_on(utxo_standard_coin_with_priv_key(
+            &maker_ctx,
+            "RICK",
+            &rick_conf(),
+            &rick_activation_params,
+            maker_key_pair.private().secret,
+        ))
+        .unwrap();
+
+        println!("Maker address {}", rick_maker.my_address().unwrap());
+
+        let morty_maker = block_on(utxo_standard_coin_with_priv_key(
+            &maker_ctx,
+            "MORTY",
+            &morty_conf(),
+            &morty_activation_params,
+            maker_key_pair.private().secret,
+        ))
+        .unwrap();
+
+        let taker_ctx_conf = json!({
+            "netid": 1234,
+            "p2p_in_memory": true,
+            "seednodes": vec!["/memory/777"]
+        });
+
+        let taker_ctx = MmCtxBuilder::default().with_conf(taker_ctx_conf).into_mm_arc();
+        let taker_key_pair = *CryptoCtx::init_with_iguana_passphrase(taker_ctx.clone(), &taker_passphrase)
+            .unwrap()
+            .mm2_internal_key_pair();
+
+        fix_directories(&taker_ctx).unwrap();
+        block_on(init_p2p(taker_ctx.clone())).unwrap();
+        taker_ctx.init_sqlite_connection().unwrap();
+
+        let rick_taker = block_on(utxo_standard_coin_with_priv_key(
+            &taker_ctx,
+            "RICK",
+            &rick_conf(),
+            &rick_activation_params,
+            taker_key_pair.private().secret,
+        ))
+        .unwrap();
+
+        let morty_taker = block_on(utxo_standard_coin_with_priv_key(
+            &taker_ctx,
+            "MORTY",
+            &morty_conf(),
+            &morty_activation_params,
+            taker_key_pair.private().secret,
+        ))
+        .unwrap();
+
+        println!("Taker address {}", rick_taker.my_address().unwrap());
+
+        let uuid = Uuid::new_v4();
+        let maker_amount = BigDecimal::from_str("0.1").unwrap();
+        let taker_amount = BigDecimal::from_str("0.1").unwrap();
+        let conf_settings = SwapConfirmationsSettings {
+            maker_coin_confs: 0,
+            maker_coin_nota: false,
+            taker_coin_confs: 0,
+            taker_coin_nota: false,
+        };
+
+        let mut maker_swap = MakerSwap::new(
+            maker_ctx.clone(),
+            taker_key_pair.public().compressed_unprefixed().unwrap().into(),
+            maker_amount.clone(),
+            taker_amount.clone(),
+            maker_key_pair.public_slice().into(),
+            uuid,
+            None,
+            conf_settings,
+            rick_maker.into(),
+            morty_maker.into(),
+            lock_duration,
+            None,
+            Default::default(),
+        );
+
+        maker_swap.fail_at = maker_fail_at;
+
+        let mut taker_swap = TakerSwap::new(
+            taker_ctx.clone(),
+            maker_key_pair.public().compressed_unprefixed().unwrap().into(),
+            maker_amount.into(),
+            taker_amount.into(),
+            taker_key_pair.public_slice().into(),
+            uuid,
+            None,
+            conf_settings,
+            rick_taker.into(),
+            morty_taker.into(),
+            lock_duration,
+            None,
+        );
+
+        taker_swap.fail_at = taker_fail_at;
+
+        block_on(futures::future::join(
+            run_maker_swap(RunMakerSwapInput::StartNew(maker_swap), maker_ctx.clone()),
+            run_taker_swap(RunTakerSwapInput::StartNew(taker_swap), taker_ctx.clone()),
+        ));
+
+        println!(
+            "Maker swap path {}",
+            std::fs::canonicalize(my_swap_file_path(&maker_ctx, &uuid))
+                .unwrap()
+                .display()
+        );
+        println!(
+            "Taker swap path {}",
+            std::fs::canonicalize(my_swap_file_path(&taker_ctx, &uuid))
+                .unwrap()
+                .display()
+        );
+    }
+
     #[test]
     fn test_deserialize_iris_swap_status() {
         let _: SavedSwap = json::from_str(include_str!("for_tests/iris_nimda_rick_taker_swap.json")).unwrap();
diff --git a/mm2src/mm2_main/src/lp_swap/check_balance.rs b/mm2src/mm2_main/src/lp_swap/check_balance.rs
index 6034769dd0..fb007331cc 100644
--- a/mm2src/mm2_main/src/lp_swap/check_balance.rs
+++ b/mm2src/mm2_main/src/lp_swap/check_balance.rs
@@ -170,7 +170,8 @@ pub struct TakerFeeAdditionalInfo {
     pub fee_to_send_dex_fee: TradeFee,
 }
 
-#[derive(Debug, Display)]
+#[derive(Debug, Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
 pub enum CheckBalanceError {
     #[display(
         fmt = "Not enough {} for swap: available {}, required at least {}, locked by swaps {:?}",
@@ -221,7 +222,7 @@ impl From<BalanceError> for CheckBalanceError {
             BalanceError::Transport(transport) | BalanceError::InvalidResponse(transport) => {
                 CheckBalanceError::Transport(transport)
             },
-            e @ BalanceError::UnexpectedDerivationMethod(_) | e @ BalanceError::WalletStorageError(_) => {
+            BalanceError::UnexpectedDerivationMethod(_) | BalanceError::WalletStorageError(_) => {
                 CheckBalanceError::InternalError(e.to_string())
             },
             BalanceError::Internal(internal) => CheckBalanceError::InternalError(internal),
diff --git a/mm2src/mm2_main/src/lp_swap/maker_swap.rs b/mm2src/mm2_main/src/lp_swap/maker_swap.rs
index c2319acc4c..7f12d7ec3d 100644
--- a/mm2src/mm2_main/src/lp_swap/maker_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap/maker_swap.rs
@@ -3,23 +3,26 @@ use super::check_balance::{check_base_coin_balance_for_swap, check_my_coin_balan
 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, recv_swap_msg, swap_topic, AtomicSwap, LockedAmount,
-            MySwapInfo, NegotiationDataMsg, NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction,
-            SavedSwap, SavedSwapIo, SavedTradeFee, SwapConfirmationsSettings, SwapError, SwapMsg, SwapsContext,
+use super::{broadcast_my_swap_status, broadcast_p2p_tx_msg, broadcast_swap_message_every,
+            check_other_coin_balance_for_swap, detect_secret_hash_algo, dex_fee_amount_from_taker_coin,
+            get_locked_amount, recv_swap_msg, swap_topic, taker_payment_spend_deadline, tx_helper_topic,
+            wait_for_maker_payment_conf_until, AtomicSwap, LockedAmount, MySwapInfo, NegotiationDataMsg,
+            NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction, SavedSwap, SavedSwapIo,
+            SavedTradeFee, SecretHashAlgo, SwapConfirmationsSettings, SwapError, SwapMsg, SwapTxDataMsg, 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 bitcrypto::dhash160;
-use coins::{CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, SearchForSwapTxSpendInput, TradeFee,
-            TradePreimageValue, TransactionEnum, ValidatePaymentInput};
+use crate::mm2::lp_swap::{broadcast_swap_message, taker_payment_spend_duration};
+use coins::{CanRefundHtlc, CheckIfMyPaymentSentArgs, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum,
+            PaymentInstructions, PaymentInstructionsErr, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, TradeFee, TradePreimageValue,
+            TransactionEnum, ValidateFeeArgs, 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 crypto::CryptoCtx;
 use futures::{compat::Future01CompatExt, select, FutureExt};
 use keys::KeyPair;
 use mm2_core::mm_ctx::MmArc;
@@ -35,9 +38,10 @@ use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use uuid::Uuid;
 
-pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
+pub const MAKER_SUCCESS_EVENTS: [&str; 12] = [
     "Started",
     "Negotiated",
+    "MakerPaymentInstructionsReceived",
     "TakerFeeValidated",
     "MakerPaymentSent",
     "TakerPaymentReceived",
@@ -49,7 +53,7 @@ pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
     "Finished",
 ];
 
-pub const MAKER_ERROR_EVENTS: [&str; 13] = [
+pub const MAKER_ERROR_EVENTS: [&str; 15] = [
     "StartFailed",
     "NegotiateFailed",
     "TakerFeeValidateFailed",
@@ -61,12 +65,18 @@ pub const MAKER_ERROR_EVENTS: [&str; 13] = [
     "TakerPaymentSpendFailed",
     "TakerPaymentSpendConfirmFailed",
     "MakerPaymentWaitRefundStarted",
+    "MakerPaymentRefundStarted",
     "MakerPaymentRefunded",
     "MakerPaymentRefundFailed",
+    "MakerPaymentRefundFinished",
 ];
 
+pub const MAKER_PAYMENT_SENT_LOG: &str = "Maker payment sent";
+
+#[cfg(not(target_arch = "wasm32"))]
 pub fn stats_maker_swap_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("STATS").join("MAKER") }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn stats_maker_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     stats_maker_swap_dir(ctx).join(format!("{}.json", uuid))
 }
@@ -84,7 +94,7 @@ async fn save_my_maker_swap_event(ctx: &MmArc, swap: &MakerSwap, event: MakerSav
             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()),
+            mm_version: Some(ctx.mm_version().to_owned()),
             events: vec![],
             success_events: MAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
             error_events: MAKER_ERROR_EVENTS.iter().map(|event| event.to_string()).collect(),
@@ -173,6 +183,25 @@ pub struct MakerSwapMut {
     taker_payment_spend: Option<TransactionIdentifier>,
     taker_payment_spend_confirmed: bool,
     maker_payment_refund: Option<TransactionIdentifier>,
+    payment_instructions: Option<PaymentInstructions>,
+}
+
+#[cfg(test)]
+#[derive(Eq, PartialEq)]
+pub(super) enum FailAt {
+    TakerPaymentSpend,
+    MakerPaymentRefund,
+}
+
+#[cfg(test)]
+impl From<String> for FailAt {
+    fn from(str: String) -> Self {
+        match str.as_str() {
+            "taker_payment_spend" => FailAt::TakerPaymentSpend,
+            "maker_payment_refund" => FailAt::MakerPaymentRefund,
+            _ => panic!("Invalid MAKER_FAIL_AT value"),
+        }
+    }
 }
 
 pub struct MakerSwap {
@@ -195,6 +224,9 @@ pub struct MakerSwap {
     /// Temporary privkey used to sign P2P messages when applicable
     p2p_privkey: Option<KeyPair>,
     secret: H256,
+    secret_hash_algo: SecretHashAlgo,
+    #[cfg(test)]
+    pub(super) fail_at: Option<FailAt>,
 }
 
 impl MakerSwap {
@@ -214,7 +246,7 @@ impl MakerSwap {
             .secret_hash
             .as_ref()
             .map(|bytes| bytes.0.clone())
-            .unwrap_or_else(|| dhash160(self.secret.as_slice()).as_slice().to_vec())
+            .unwrap_or_else(|| self.secret_hash_algo.hash_secret(self.secret.as_slice()))
     }
 
     #[inline]
@@ -239,6 +271,12 @@ impl MakerSwap {
         match event {
             MakerSwapEvent::Started(data) => {
                 self.w().data = data;
+                log_tag!(
+                    self.ctx,
+                    "";
+                    fmt = "Maker swap {} has successfully started",
+                    self.uuid
+                );
             },
             MakerSwapEvent::StartFailed(err) => self.errors.lock().push(err),
             MakerSwapEvent::Negotiated(data) => {
@@ -255,6 +293,9 @@ impl MakerSwap {
                 }
             },
             MakerSwapEvent::NegotiateFailed(err) => self.errors.lock().push(err),
+            MakerSwapEvent::MakerPaymentInstructionsReceived(instructions) => {
+                self.w().payment_instructions = instructions
+            },
             MakerSwapEvent::TakerFeeValidated(tx) => self.w().taker_fee = Some(tx),
             MakerSwapEvent::TakerFeeValidateFailed(err) => self.errors.lock().push(err),
             MakerSwapEvent::MakerPaymentSent(tx) => self.w().maker_payment = Some(tx),
@@ -274,8 +315,10 @@ impl MakerSwap {
             MakerSwapEvent::TakerPaymentSpendConfirmed => self.w().taker_payment_spend_confirmed = true,
             MakerSwapEvent::TakerPaymentSpendConfirmFailed(err) => self.errors.lock().push(err),
             MakerSwapEvent::MakerPaymentWaitRefundStarted { .. } => (),
-            MakerSwapEvent::MakerPaymentRefunded(tx) => self.w().maker_payment_refund = Some(tx),
+            MakerSwapEvent::MakerPaymentRefundStarted => (),
+            MakerSwapEvent::MakerPaymentRefunded(tx) => self.w().maker_payment_refund = tx,
             MakerSwapEvent::MakerPaymentRefundFailed(err) => self.errors.lock().push(err),
+            MakerSwapEvent::MakerPaymentRefundFinished => (),
             MakerSwapEvent::Finished => self.finished_at.store(now_ms() / 1000, Ordering::Relaxed),
         }
     }
@@ -293,7 +336,9 @@ impl MakerSwap {
             MakerSwapCommand::ValidateTakerPayment => self.validate_taker_payment().await,
             MakerSwapCommand::SpendTakerPayment => self.spend_taker_payment().await,
             MakerSwapCommand::ConfirmTakerPaymentSpend => self.confirm_taker_payment_spend().await,
+            MakerSwapCommand::PrepareForMakerPaymentRefund => self.prepare_for_maker_payment_refund().await,
             MakerSwapCommand::RefundMakerPayment => self.refund_maker_payment().await,
+            MakerSwapCommand::FinalizeMakerPaymentRefund => self.finalize_maker_payment_refund().await,
             MakerSwapCommand::Finish => Ok((None, vec![MakerSwapEvent::Finished])),
         }
     }
@@ -314,6 +359,7 @@ impl MakerSwap {
         p2p_privkey: Option<KeyPair>,
         secret: H256,
     ) -> Self {
+        let secret_hash_algo = detect_secret_hash_algo(&maker_coin, &taker_coin);
         MakerSwap {
             maker_coin,
             taker_coin,
@@ -340,9 +386,13 @@ impl MakerSwap {
                 taker_payment_spend: None,
                 maker_payment_refund: None,
                 taker_payment_spend_confirmed: false,
+                payment_instructions: None,
             }),
             ctx,
             secret,
+            secret_hash_algo,
+            #[cfg(test)]
+            fail_at: None,
         }
     }
 
@@ -358,28 +408,57 @@ impl MakerSwap {
             .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 {
+        let equal = r.data.maker_coin_htlc_pubkey == r.data.taker_coin_htlc_pubkey;
+        let same_as_persistent = r.data.maker_coin_htlc_pubkey == Some(r.data.my_persistent_pub);
+
+        if equal && same_as_persistent {
+            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,
-                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 {
+            NegotiationDataMsg::V3(NegotiationDataV3 {
                 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,
+                maker_coin_htlc_pub: self.my_maker_coin_htlc_pub().into(),
+                taker_coin_htlc_pub: self.my_taker_coin_htlc_pub().into(),
             })
         }
     }
 
+    async fn get_my_payment_data(&self) -> Result<SwapTxDataMsg, MmError<PaymentInstructionsErr>> {
+        // If maker payment is a lightning payment the payment hash will be sent in the message
+        // It's not really needed here unlike in TakerFee msg since the hash is included in the invoice/payment_instructions but it's kept for symmetry
+        let payment_data = self.r().maker_payment.as_ref().unwrap().tx_hex.0.clone();
+        let expires_in = taker_payment_spend_duration(self.r().data.lock_duration);
+        let instructions = self
+            .taker_coin
+            .taker_payment_instructions(
+                &SecretHashAlgo::SHA256.hash_secret(self.secret.as_slice()),
+                &self.taker_amount,
+                expires_in,
+            )
+            .await?;
+        Ok(SwapTxDataMsg::new(payment_data, instructions))
+    }
+
+    #[inline]
+    fn broadcast_negotiated_false(&self) {
+        broadcast_swap_message(
+            &self.ctx,
+            swap_topic(&self.uuid),
+            SwapMsg::Negotiated(false),
+            &self.p2p_privkey,
+        )
+    }
+
     async fn start(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
         // do not use self.r().data here as it is not initialized at this step yet
         let preimage_value = TradePreimageValue::Exact(self.maker_amount.clone());
@@ -393,7 +472,9 @@ impl MakerSwap {
                 )]))
             },
         };
-        let taker_payment_spend_trade_fee_fut = self.taker_coin.get_receiver_trade_fee(stage.clone());
+        let taker_payment_spend_trade_fee_fut = self
+            .taker_coin
+            .get_receiver_trade_fee(self.maker_amount.clone(), stage.clone());
         let taker_payment_spend_trade_fee = match taker_payment_spend_trade_fee_fut.compat().await {
             Ok(fee) => fee,
             Err(e) => {
@@ -449,8 +530,8 @@ impl MakerSwap {
         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 maker_coin_htlc_pubkey = self.maker_coin.derive_htlc_pubkey(&unique_data);
+        let taker_coin_htlc_pubkey = self.taker_coin.derive_htlc_pubkey(&unique_data);
 
         let data = MakerSwapData {
             taker_coin: self.taker_coin.ticker().to_owned(),
@@ -466,7 +547,8 @@ impl MakerSwap {
             maker_payment_requires_nota: Some(self.conf_settings.maker_coin_nota),
             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,
+            maker_payment_lock: started_at
+                + (self.payment_locktime as f64 * self.taker_coin.maker_locktime_multiplier()).ceil() as u64,
             my_persistent_pub: self.my_persistent_pub.into(),
             uuid: self.uuid,
             maker_coin_start_block,
@@ -475,8 +557,8 @@ 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()),
+            maker_coin_htlc_pubkey: Some(maker_coin_htlc_pubkey.as_slice().into()),
+            taker_coin_htlc_pubkey: Some(taker_coin_htlc_pubkey.as_slice().into()),
             p2p_privkey: self.p2p_privkey.map(SerializableSecp256k1Keypair::from),
         };
 
@@ -506,24 +588,27 @@ impl MakerSwap {
         let taker_data = match recv_fut.await {
             Ok(d) => d,
             Err(e) => {
+                self.broadcast_negotiated_false();
                 return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
                     ERRL!("{:?}", e).into(),
-                )]))
+                )]));
             },
         };
         drop(send_abort_handle);
-        let time_dif = (self.r().data.started_at as i64 - taker_data.started_at() as i64).abs();
+        let time_dif = self.r().data.started_at.abs_diff(taker_data.started_at());
         if time_dif > 60 {
+            self.broadcast_negotiated_false();
             return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
-                ERRL!("Started_at time_dif over 60 {}", time_dif).into(),
+                ERRL!("The time difference between you and the taker cannot be longer than 60 seconds. Current difference: {}. Please make sure that your system clock is synced to the correct time before starting another swap!", time_dif).into(),
             )]));
         }
 
-        let expected_lock_time = taker_data.started_at() + self.r().data.lock_duration;
-        if taker_data.payment_locktime() != expected_lock_time {
+        let expected_lock_time = taker_data.started_at().checked_add(self.r().data.lock_duration);
+        if Some(taker_data.payment_locktime()) != expected_lock_time {
+            self.broadcast_negotiated_false();
             return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
                 ERRL!(
-                    "taker_data.payment_locktime {} not equal to expected {}",
+                    "taker_data.payment_locktime {:?} not equal to expected {:?}",
                     taker_data.payment_locktime(),
                     expected_lock_time
                 )
@@ -537,9 +622,10 @@ impl MakerSwap {
         {
             Ok(addr) => addr,
             Err(e) => {
+                self.broadcast_negotiated_false();
                 return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
                     ERRL!("!maker_coin.negotiate_swap_contract_addr {}", e).into(),
-                )]))
+                )]));
             },
         };
 
@@ -549,12 +635,29 @@ impl MakerSwap {
         {
             Ok(addr) => addr,
             Err(e) => {
+                self.broadcast_negotiated_false();
                 return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
                     ERRL!("!taker_coin.negotiate_swap_contract_addr {}", e).into(),
-                )]))
+                )]));
             },
         };
 
+        // Validate maker_coin_htlc_pubkey realness
+        if let Err(err) = self.maker_coin.validate_other_pubkey(taker_data.maker_coin_htlc_pub()) {
+            self.broadcast_negotiated_false();
+            return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
+                ERRL!("!taker_data.maker_coin_htlc_pub {}", err).into(),
+            )]));
+        };
+
+        // Validate taker_coin_htlc_pubkey realness
+        if let Err(err) = self.taker_coin.validate_other_pubkey(taker_data.taker_coin_htlc_pub()) {
+            self.broadcast_negotiated_false();
+            return Ok((Some(MakerSwapCommand::Finish), vec![MakerSwapEvent::NegotiateFailed(
+                ERRL!("!taker_data.taker_coin_htlc_pub {}", err).into(),
+            )]));
+        };
+
         Ok((Some(MakerSwapCommand::WaitForTakerFee), vec![
             MakerSwapEvent::Negotiated(TakerNegotiationData {
                 taker_payment_locktime: taker_data.payment_locktime(),
@@ -595,11 +698,35 @@ impl MakerSwap {
             },
         };
         drop(send_abort_handle);
-        let taker_fee = match self.taker_coin.tx_enum_from_bytes(&payload) {
+
+        let mut swap_events = vec![];
+        let instructions = match payload.instructions() {
+            Some(instructions) => {
+                let maker_lock_duration =
+                    (self.r().data.lock_duration as f64 * self.taker_coin.maker_locktime_multiplier()).ceil() as u64;
+                match self.maker_coin.validate_maker_payment_instructions(
+                    instructions,
+                    &self.secret_hash(),
+                    self.maker_amount.clone(),
+                    maker_lock_duration,
+                ) {
+                    Ok(instructions) => Some(instructions),
+                    Err(e) => {
+                        return Ok((Some(MakerSwapCommand::Finish), vec![
+                            MakerSwapEvent::TakerFeeValidateFailed(e.to_string().into()),
+                        ]));
+                    },
+                }
+            },
+            None => None,
+        };
+        swap_events.push(MakerSwapEvent::MakerPaymentInstructionsReceived(instructions));
+
+        let taker_fee = match self.taker_coin.tx_enum_from_bytes(payload.data()) {
             Ok(tx) => tx,
             Err(e) => {
                 return Ok((Some(MakerSwapCommand::Finish), vec![
-                    MakerSwapEvent::TakerFeeValidateFailed(ERRL!("{}", e).into()),
+                    MakerSwapEvent::TakerFeeValidateFailed(ERRL!("{:?}", e).into()),
                 ]))
             },
         };
@@ -616,14 +743,14 @@ impl MakerSwap {
         loop {
             match self
                 .taker_coin
-                .validate_fee(
-                    &taker_fee,
-                    &*other_taker_coin_htlc_pub,
-                    &DEX_FEE_ADDR_RAW_PUBKEY,
-                    &fee_amount.clone().into(),
-                    taker_coin_start_block,
-                    self.uuid.as_bytes(),
-                )
+                .validate_fee(ValidateFeeArgs {
+                    fee_tx: &taker_fee,
+                    expected_sender: &*other_taker_coin_htlc_pub,
+                    fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
+                    amount: &fee_amount.clone().into(),
+                    min_block_number: taker_coin_start_block,
+                    uuid: self.uuid.as_bytes(),
+                })
                 .compat()
                 .await
             {
@@ -642,13 +769,12 @@ impl MakerSwap {
         }
 
         let fee_ident = TransactionIdentifier {
-            tx_hex: taker_fee.tx_hex().into(),
+            tx_hex: BytesJson::from(taker_fee.tx_hex()),
             tx_hash: hash,
         };
+        swap_events.push(MakerSwapEvent::TakerFeeValidated(fee_ident));
 
-        Ok((Some(MakerSwapCommand::SendPayment), vec![
-            MakerSwapEvent::TakerFeeValidated(fee_ident),
-        ]))
+        Ok((Some(MakerSwapCommand::SendPayment), swap_events))
     }
 
     async fn maker_payment(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
@@ -664,28 +790,32 @@ impl MakerSwap {
         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_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,
-            )
+            .check_if_my_payment_sent(CheckIfMyPaymentSentArgs {
+                time_lock: self.r().data.maker_payment_lock as u32,
+                other_pub: &*self.r().other_maker_coin_htlc_pub,
+                secret_hash: secret_hash.as_slice(),
+                search_from_block: self.r().data.maker_coin_start_block,
+                swap_contract_address: &self.r().data.maker_coin_swap_contract_address,
+                swap_unique_data: &unique_data,
+                amount: &self.maker_amount,
+                payment_instructions: &self.r().payment_instructions,
+            })
             .compat();
 
         let transaction = match transaction_f.await {
             Ok(res) => match res {
                 Some(tx) => tx,
                 None => {
-                    let payment_fut = self.maker_coin.send_maker_payment(
-                        self.r().data.maker_payment_lock as u32,
-                        &*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,
-                    );
+                    let payment_fut = self.maker_coin.send_maker_payment(SendMakerPaymentArgs {
+                        time_lock_duration: self.r().data.lock_duration,
+                        time_lock: self.r().data.maker_payment_lock as u32,
+                        other_pubkey: &*self.r().other_maker_coin_htlc_pub,
+                        secret_hash: secret_hash.as_slice(),
+                        amount: self.maker_amount.clone(),
+                        swap_contract_address: &self.r().data.maker_coin_swap_contract_address,
+                        swap_unique_data: &unique_data,
+                        payment_instructions: &self.r().payment_instructions,
+                    });
 
                     match payment_fut.compat().await {
                         Ok(t) => t,
@@ -707,10 +837,10 @@ impl MakerSwap {
         };
 
         let tx_hash = transaction.tx_hash();
-        info!("Maker payment tx {:02x}", tx_hash);
+        info!("{}: Maker payment tx {:02x}", MAKER_PAYMENT_SENT_LOG, tx_hash);
 
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
@@ -720,12 +850,23 @@ 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 payment_data_msg = match self.get_my_payment_data().await {
+            Ok(data) => data,
+            Err(e) => {
+                return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
+                    MakerSwapEvent::MakerPaymentDataSendFailed(e.to_string().into()),
+                    MakerSwapEvent::MakerPaymentWaitRefundStarted {
+                        wait_until: self.wait_refund_until(),
+                    },
+                ]));
+            },
+        };
+        let msg = SwapMsg::MakerPayment(payment_data_msg);
         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 maker_payment_wait_confirm =
+            wait_for_maker_payment_conf_until(self.r().data.started_at, self.r().data.lock_duration);
         let f = self.maker_coin.wait_for_confirmations(
             &self.r().maker_payment.clone().unwrap().tx_hex,
             self.r().data.maker_payment_confirmations,
@@ -734,7 +875,7 @@ impl MakerSwap {
             WAIT_CONFIRM_INTERVAL,
         );
         if let Err(err) = f.compat().await {
-            return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+            return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                 MakerSwapEvent::MakerPaymentWaitConfirmFailed(
                     ERRL!("!wait for maker payment confirmations: {}", err).into(),
                 ),
@@ -752,10 +893,11 @@ impl MakerSwap {
             &self.uuid,
             wait_duration,
         );
+        // Todo: taker_payment should be a message on lightning network not a swap message
         let payload = match recv_fut.await {
             Ok(p) => p,
             Err(e) => {
-                return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+                return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                     MakerSwapEvent::TakerPaymentValidateFailed(e.into()),
                     MakerSwapEvent::MakerPaymentWaitRefundStarted {
                         wait_until: self.wait_refund_until(),
@@ -768,8 +910,10 @@ impl MakerSwap {
         let taker_payment = match self.taker_coin.tx_enum_from_bytes(&payload) {
             Ok(tx) => tx,
             Err(err) => {
-                return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
-                    MakerSwapEvent::TakerPaymentValidateFailed(ERRL!("!taker_coin.tx_enum_from_bytes: {}", err).into()),
+                return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
+                    MakerSwapEvent::TakerPaymentValidateFailed(
+                        ERRL!("!taker_coin.tx_enum_from_bytes: {:?}", err).into(),
+                    ),
                     MakerSwapEvent::MakerPaymentWaitRefundStarted {
                         wait_until: self.wait_refund_until(),
                     },
@@ -780,7 +924,7 @@ impl MakerSwap {
         let tx_hash = taker_payment.tx_hash();
         info!("Taker payment tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: taker_payment.tx_hex().into(),
+            tx_hex: BytesJson::from(taker_payment.tx_hex()),
             tx_hash,
         };
 
@@ -791,8 +935,7 @@ 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 wait_taker_payment = taker_payment_spend_deadline(self.r().data.started_at, self.r().data.lock_duration);
         let confirmations = self.r().data.taker_payment_confirmations;
 
         let wait_f = self
@@ -806,7 +949,7 @@ impl MakerSwap {
             )
             .compat();
         if let Err(err) = wait_f.await {
-            return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+            return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                 MakerSwapEvent::TakerPaymentWaitConfirmFailed(
                     ERRL!("!taker_coin.wait_for_confirmations: {}", err).into(),
                 ),
@@ -819,6 +962,7 @@ impl MakerSwap {
         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,
+            time_lock_duration: self.r().data.lock_duration,
             other_pub: self.r().other_taker_coin_htlc_pub.to_vec(),
             unique_swap_data: self.unique_swap_data(),
             secret_hash: self.secret_hash(),
@@ -830,7 +974,7 @@ impl MakerSwap {
         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![
+            return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                 MakerSwapEvent::TakerPaymentValidateFailed(ERRL!("!taker_coin.validate_taker_payment: {}", e).into()),
                 MakerSwapEvent::MakerPaymentWaitRefundStarted {
                     wait_until: self.wait_refund_until(),
@@ -844,12 +988,17 @@ impl MakerSwap {
     }
 
     async fn spend_taker_payment(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
-        let duration = (self.r().data.lock_duration * 4) / 5;
-        let timeout = self.r().data.started_at + duration;
+        #[cfg(test)]
+        if self.fail_at == Some(FailAt::TakerPaymentSpend) {
+            return Ok((Some(MakerSwapCommand::Finish), vec![
+                MakerSwapEvent::TakerPaymentSpendFailed("explicit failure".into()),
+            ]));
+        }
 
+        let timeout = taker_payment_spend_deadline(self.r().data.started_at, self.r().data.lock_duration);
         let now = now_ms() / 1000;
         if now > timeout {
-            return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+            return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                 MakerSwapEvent::TakerPaymentSpendFailed(ERRL!("Timeout {} > {}", now, timeout).into()),
                 MakerSwapEvent::MakerPaymentWaitRefundStarted {
                     wait_until: self.wait_refund_until(),
@@ -857,14 +1006,17 @@ 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_taker_coin_htlc_pub,
-            &self.r().data.secret.0,
-            &self.r().data.taker_coin_swap_contract_address,
-            &self.unique_swap_data(),
-        );
+        let spend_fut = self
+            .taker_coin
+            .send_maker_spends_taker_payment(SendMakerSpendsTakerPaymentArgs {
+                other_payment_tx: &self.r().taker_payment.clone().unwrap().tx_hex,
+                time_lock: self.taker_payment_lock.load(Ordering::Relaxed) as u32,
+                other_pubkey: &*self.r().other_taker_coin_htlc_pub,
+                secret: &self.r().data.secret.0,
+                secret_hash: &self.secret_hash(),
+                swap_contract_address: &self.r().data.taker_coin_swap_contract_address,
+                swap_unique_data: &self.unique_swap_data(),
+            });
 
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
@@ -878,7 +1030,7 @@ impl MakerSwap {
                     );
                 }
 
-                return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+                return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                     MakerSwapEvent::TakerPaymentSpendFailed(
                         ERRL!(
                             "!taker_coin.send_maker_spends_taker_payment: {}",
@@ -903,7 +1055,7 @@ impl MakerSwap {
         let tx_hash = transaction.tx_hash();
         info!("Taker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
@@ -925,7 +1077,7 @@ impl MakerSwap {
             WAIT_CONFIRM_INTERVAL,
         );
         if let Err(err) = wait_fut.compat().await {
-            return Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+            return Ok((Some(MakerSwapCommand::PrepareForMakerPaymentRefund), vec![
                 MakerSwapEvent::TakerPaymentSpendConfirmFailed(
                     ERRL!("!wait for taker payment spend confirmations: {}", err).into(),
                 ),
@@ -940,8 +1092,44 @@ impl MakerSwap {
         ]))
     }
 
+    async fn prepare_for_maker_payment_refund(
+        &self,
+    ) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
+        let taker_payment = self.r().taker_payment.clone();
+        if let Some(payment) = taker_payment {
+            if let Err(e) = self.taker_coin.on_maker_payment_refund_start(&payment.tx_hex).await {
+                error!("Error {} on calling on_maker_payment_refund_start!", e)
+            }
+        }
+
+        Ok((Some(MakerSwapCommand::RefundMakerPayment), vec![
+            MakerSwapEvent::MakerPaymentRefundStarted,
+        ]))
+    }
+
     async fn refund_maker_payment(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
+        #[cfg(test)]
+        if self.fail_at == Some(FailAt::MakerPaymentRefund) {
+            return Ok((Some(MakerSwapCommand::Finish), vec![
+                MakerSwapEvent::MakerPaymentRefundFailed("explicit failure".into()),
+            ]));
+        }
+
+        let maker_payment = self.r().maker_payment.clone().unwrap().tx_hex;
         let locktime = self.r().data.maker_payment_lock;
+        if self.maker_coin.is_auto_refundable() {
+            return match self.maker_coin.wait_for_htlc_refund(&maker_payment, locktime).await {
+                Ok(()) => Ok((Some(MakerSwapCommand::FinalizeMakerPaymentRefund), vec![
+                    MakerSwapEvent::MakerPaymentRefunded(None),
+                ])),
+                Err(err) => Ok((Some(MakerSwapCommand::Finish), vec![
+                    MakerSwapEvent::MakerPaymentRefundFailed(
+                        ERRL!("!maker_coin.wait_for_htlc_refund: {}", err.to_string()).into(),
+                    ),
+                ])),
+            };
+        }
+
         loop {
             match self.maker_coin.can_refund_htlc(locktime).compat().await {
                 Ok(CanRefundHtlc::CanRefundNow) => break,
@@ -953,14 +1141,14 @@ 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_maker_coin_htlc_pub,
-            self.secret_hash().as_slice(),
-            &self.r().data.maker_coin_swap_contract_address,
-            &self.unique_swap_data(),
-        );
+        let spend_fut = self.maker_coin.send_maker_refunds_payment(SendMakerRefundsPaymentArgs {
+            payment_tx: &maker_payment,
+            time_lock: locktime as u32,
+            other_pubkey: &*self.r().other_maker_coin_htlc_pub,
+            secret_hash: self.secret_hash().as_slice(),
+            swap_contract_address: &self.r().data.maker_coin_swap_contract_address,
+            swap_unique_data: &self.unique_swap_data(),
+        });
 
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
@@ -996,12 +1184,25 @@ impl MakerSwap {
         let tx_hash = transaction.tx_hash();
         info!("Maker payment refund tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
+        Ok((Some(MakerSwapCommand::FinalizeMakerPaymentRefund), vec![
+            MakerSwapEvent::MakerPaymentRefunded(Some(tx_ident)),
+        ]))
+    }
+
+    async fn finalize_maker_payment_refund(&self) -> Result<(Option<MakerSwapCommand>, Vec<MakerSwapEvent>), String> {
+        let taker_payment = self.r().taker_payment.clone();
+        if let Some(payment) = taker_payment {
+            if let Err(e) = self.taker_coin.on_maker_payment_refund_success(&payment.tx_hex).await {
+                error!("Error {} on calling on_maker_payment_refund_success!", e)
+            }
+        }
+
         Ok((Some(MakerSwapCommand::Finish), vec![
-            MakerSwapEvent::MakerPaymentRefunded(tx_ident),
+            MakerSwapEvent::MakerPaymentRefundFinished,
         ]))
     }
 
@@ -1048,7 +1249,10 @@ impl MakerSwap {
 
         let mut taker = bits256::from([0; 32]);
         taker.bytes = data.taker.0;
-        let my_persistent_pub = H264::from(&**ctx.secp256k1_key_pair().public());
+
+        let crypto_ctx = try_s!(CryptoCtx::from_ctx(&ctx));
+        let my_persistent_pub = H264::from(&**crypto_ctx.mm2_internal_key_pair().public());
+
         let conf_settings = SwapConfirmationsSettings {
             maker_coin_confs: data.maker_payment_confirmations,
             maker_coin_nota: data
@@ -1132,14 +1336,15 @@ impl MakerSwap {
 
             selfi
                 .taker_coin
-                .send_maker_spends_taker_payment(
-                    taker_payment_hex,
-                    timelock,
-                    other_taker_coin_htlc_pub.as_slice(),
-                    &secret,
-                    &taker_coin_swap_contract_address,
-                    &selfi.unique_swap_data(),
-                )
+                .send_maker_spends_taker_payment(SendMakerSpendsTakerPaymentArgs {
+                    other_payment_tx: taker_payment_hex,
+                    time_lock: timelock,
+                    other_pubkey: other_taker_coin_htlc_pub.as_slice(),
+                    secret: &secret,
+                    secret_hash: &selfi.secret_hash(),
+                    swap_contract_address: &taker_coin_swap_contract_address,
+                    swap_unique_data: &selfi.unique_swap_data(),
+                })
                 .compat()
                 .await
                 .map_err(|e| ERRL!("{:?}", e))
@@ -1166,21 +1371,24 @@ impl MakerSwap {
         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 payment_instructions = self.r().payment_instructions.clone();
 
         let maybe_maker_payment = self.r().maker_payment.clone();
         let maker_payment = match maybe_maker_payment {
-            Some(tx) => tx.tx_hex.0.clone(),
+            Some(tx) => tx.tx_hex.0,
             None => {
                 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,
-                        )
+                        .check_if_my_payment_sent(CheckIfMyPaymentSentArgs {
+                            time_lock: maker_payment_lock,
+                            other_pub: other_maker_coin_htlc_pub.as_slice(),
+                            secret_hash: secret_hash.as_slice(),
+                            search_from_block: maker_coin_start_block,
+                            swap_contract_address: &maker_coin_swap_contract_address,
+                            swap_unique_data: &unique_data,
+                            amount: &self.maker_amount,
+                            payment_instructions: &payment_instructions,
+                        })
                         .compat()
                         .await
                 );
@@ -1219,22 +1427,27 @@ impl MakerSwap {
             ),
             Err(e) => ERR!("Error {} when trying to find maker payment spend", e),
             Ok(None) => {
-                // our payment is not spent, try to refund
-                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
-                    );
+                if self.maker_coin.is_auto_refundable() {
+                    return ERR!("Maker payment will be refunded automatically!");
                 }
-                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 can_refund_htlc = try_s!(
+                    self.maker_coin
+                        .can_refund_htlc(maker_payment_lock as u64)
+                        .compat()
+                        .await
                 );
+                if let CanRefundHtlc::HaveToWait(seconds_to_wait) = can_refund_htlc {
+                    return ERR!("Too early to refund, wait until {}", now_ms() / 1000 + seconds_to_wait);
+                }
+                let fut = self.maker_coin.send_maker_refunds_payment(SendMakerRefundsPaymentArgs {
+                    payment_tx: &maker_payment,
+                    time_lock: maker_payment_lock,
+                    other_pubkey: other_maker_coin_htlc_pub.as_slice(),
+                    secret_hash: secret_hash.as_slice(),
+                    swap_contract_address: &maker_coin_swap_contract_address,
+                    swap_unique_data: &unique_data,
+                });
 
                 let transaction = match fut.compat().await {
                     Ok(t) => t,
@@ -1312,7 +1525,9 @@ pub enum MakerSwapCommand {
     ValidateTakerPayment,
     SpendTakerPayment,
     ConfirmTakerPaymentSpend,
+    PrepareForMakerPaymentRefund,
     RefundMakerPayment,
+    FinalizeMakerPaymentRefund,
     Finish,
 }
 
@@ -1324,6 +1539,7 @@ pub enum MakerSwapEvent {
     StartFailed(SwapError),
     Negotiated(TakerNegotiationData),
     NegotiateFailed(SwapError),
+    MakerPaymentInstructionsReceived(Option<PaymentInstructions>),
     TakerFeeValidated(TransactionIdentifier),
     TakerFeeValidateFailed(SwapError),
     MakerPaymentSent(TransactionIdentifier),
@@ -1341,8 +1557,10 @@ pub enum MakerSwapEvent {
     TakerPaymentSpendConfirmed,
     TakerPaymentSpendConfirmFailed(SwapError),
     MakerPaymentWaitRefundStarted { wait_until: u64 },
-    MakerPaymentRefunded(TransactionIdentifier),
+    MakerPaymentRefundStarted,
+    MakerPaymentRefunded(Option<TransactionIdentifier>),
     MakerPaymentRefundFailed(SwapError),
+    MakerPaymentRefundFinished,
     Finished,
 }
 
@@ -1353,6 +1571,7 @@ impl MakerSwapEvent {
             MakerSwapEvent::StartFailed(_) => "Start failed...".to_owned(),
             MakerSwapEvent::Negotiated(_) => "Negotiated...".to_owned(),
             MakerSwapEvent::NegotiateFailed(_) => "Negotiate failed...".to_owned(),
+            MakerSwapEvent::MakerPaymentInstructionsReceived(_) => "Maker payment instructions received...".to_owned(),
             MakerSwapEvent::TakerFeeValidated(_) => "Taker fee validated...".to_owned(),
             MakerSwapEvent::TakerFeeValidateFailed(_) => "Taker fee validate failed...".to_owned(),
             MakerSwapEvent::MakerPaymentSent(_) => "Maker payment sent...".to_owned(),
@@ -1376,8 +1595,10 @@ impl MakerSwapEvent {
             MakerSwapEvent::MakerPaymentWaitRefundStarted { wait_until } => {
                 format!("Maker payment wait refund till {} started...", wait_until)
             },
+            MakerSwapEvent::MakerPaymentRefundStarted => "Maker payment refund started...".to_owned(),
             MakerSwapEvent::MakerPaymentRefunded(_) => "Maker payment refunded...".to_owned(),
             MakerSwapEvent::MakerPaymentRefundFailed(_) => "Maker payment refund failed...".to_owned(),
+            MakerSwapEvent::MakerPaymentRefundFinished => "Maker payment refund finished...".to_owned(),
             MakerSwapEvent::Finished => "Finished".to_owned(),
         }
     }
@@ -1394,6 +1615,7 @@ impl MakerSwapEvent {
             self,
             MakerSwapEvent::Started(_)
                 | MakerSwapEvent::Negotiated(_)
+                | MakerSwapEvent::MakerPaymentInstructionsReceived(_)
                 | MakerSwapEvent::TakerFeeValidated(_)
                 | MakerSwapEvent::MakerPaymentSent(_)
                 | MakerSwapEvent::TakerPaymentReceived(_)
@@ -1422,26 +1644,31 @@ impl MakerSavedEvent {
             MakerSwapEvent::Started(_) => Some(MakerSwapCommand::Negotiate),
             MakerSwapEvent::StartFailed(_) => Some(MakerSwapCommand::Finish),
             MakerSwapEvent::Negotiated(_) => Some(MakerSwapCommand::WaitForTakerFee),
+            MakerSwapEvent::MakerPaymentInstructionsReceived(_) => Some(MakerSwapCommand::WaitForTakerFee),
             MakerSwapEvent::NegotiateFailed(_) => Some(MakerSwapCommand::Finish),
             MakerSwapEvent::TakerFeeValidated(_) => Some(MakerSwapCommand::SendPayment),
             MakerSwapEvent::TakerFeeValidateFailed(_) => Some(MakerSwapCommand::Finish),
             MakerSwapEvent::MakerPaymentSent(_) => Some(MakerSwapCommand::WaitForTakerPayment),
             MakerSwapEvent::MakerPaymentTransactionFailed(_) => Some(MakerSwapCommand::Finish),
-            MakerSwapEvent::MakerPaymentDataSendFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
-            MakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
+            MakerSwapEvent::MakerPaymentDataSendFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
+            MakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
             MakerSwapEvent::TakerPaymentReceived(_) => Some(MakerSwapCommand::ValidateTakerPayment),
             MakerSwapEvent::TakerPaymentWaitConfirmStarted => Some(MakerSwapCommand::ValidateTakerPayment),
             MakerSwapEvent::TakerPaymentValidatedAndConfirmed => Some(MakerSwapCommand::SpendTakerPayment),
-            MakerSwapEvent::TakerPaymentValidateFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
-            MakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
+            MakerSwapEvent::TakerPaymentValidateFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
+            MakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
             MakerSwapEvent::TakerPaymentSpent(_) => Some(MakerSwapCommand::ConfirmTakerPaymentSpend),
-            MakerSwapEvent::TakerPaymentSpendFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
+            MakerSwapEvent::TakerPaymentSpendFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
             MakerSwapEvent::TakerPaymentSpendConfirmStarted => Some(MakerSwapCommand::ConfirmTakerPaymentSpend),
             MakerSwapEvent::TakerPaymentSpendConfirmed => Some(MakerSwapCommand::Finish),
-            MakerSwapEvent::TakerPaymentSpendConfirmFailed(_) => Some(MakerSwapCommand::RefundMakerPayment),
-            MakerSwapEvent::MakerPaymentWaitRefundStarted { .. } => Some(MakerSwapCommand::RefundMakerPayment),
-            MakerSwapEvent::MakerPaymentRefunded(_) => Some(MakerSwapCommand::Finish),
+            MakerSwapEvent::TakerPaymentSpendConfirmFailed(_) => Some(MakerSwapCommand::PrepareForMakerPaymentRefund),
+            MakerSwapEvent::MakerPaymentWaitRefundStarted { .. } => {
+                Some(MakerSwapCommand::PrepareForMakerPaymentRefund)
+            },
+            MakerSwapEvent::MakerPaymentRefundStarted => Some(MakerSwapCommand::RefundMakerPayment),
+            MakerSwapEvent::MakerPaymentRefunded(_) => Some(MakerSwapCommand::FinalizeMakerPaymentRefund),
             MakerSwapEvent::MakerPaymentRefundFailed(_) => Some(MakerSwapCommand::Finish),
+            MakerSwapEvent::MakerPaymentRefundFinished => Some(MakerSwapCommand::Finish),
             MakerSwapEvent::Finished => None,
         }
     }
@@ -1752,8 +1979,6 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
     let swap_ctx = SwapsContext::from_ctx(&ctx).unwrap();
     swap_ctx.init_msg_store(running_swap.uuid, running_swap.taker);
     swap_ctx.running_swaps.lock().unwrap().push(weak_ref);
-    let shutdown_rx = swap_ctx.shutdown_rx.clone();
-    let swap_for_log = running_swap.clone();
     let mut swap_fut = Box::pin(
         async move {
             let mut events;
@@ -1784,6 +2009,12 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
                             event.clone().into(),
                         )
                     }
+
+                    #[cfg(target_arch = "wasm32")]
+                    if event.is_error() {
+                        error!("[swap uuid={uuid_str}] {event:?}");
+                    }
+
                     status.status(swap_tags!(), &event.status_str());
                     running_swap.apply_event(event);
                 }
@@ -1804,11 +2035,8 @@ pub async fn run_maker_swap(swap: RunMakerSwapInput, ctx: MmArc) {
         }
         .fuse(),
     );
-    let mut shutdown_fut = Box::pin(shutdown_rx.recv().fuse());
-    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 => info!("swap {} stopped!", swap_for_log.uuid),
+        _swap = swap_fut => (), // swap finished normally
         _touch = touch_loop => unreachable!("Touch loop can not stop!"),
     };
 }
@@ -1839,7 +2067,7 @@ pub async fn check_balance_for_maker_swap(
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin.ticker()))?;
             let taker_payment_spend_trade_fee = other_coin
-                .get_receiver_trade_fee(stage)
+                .get_receiver_trade_fee(volume.to_decimal(), stage)
                 .compat()
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, other_coin.ticker()))?;
@@ -1872,7 +2100,9 @@ pub async fn maker_swap_trade_preimage(
     let rel_coin_ticker = rel_coin.ticker();
     let volume = if req.max {
         let balance = base_coin.my_spendable_balance().compat().await?;
-        calc_max_maker_vol(ctx, &base_coin, &balance, FeeApproxStage::TradePreimage).await?
+        calc_max_maker_vol(ctx, &base_coin, &balance, FeeApproxStage::TradePreimage)
+            .await?
+            .volume
     } else {
         let threshold = base_coin.min_trading_vol().to_decimal();
         if req.volume.is_zero() {
@@ -1891,7 +2121,7 @@ pub async fn maker_swap_trade_preimage(
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, base_coin_ticker))?;
     let rel_coin_fee = rel_coin
-        .get_receiver_trade_fee(FeeApproxStage::TradePreimage)
+        .get_receiver_trade_fee(volume.to_decimal(), FeeApproxStage::TradePreimage)
         .compat()
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, rel_coin_ticker))?;
@@ -1940,7 +2170,20 @@ pub async fn maker_swap_trade_preimage(
     })
 }
 
-/// Calculate max Maker volume.
+pub struct CoinVolumeInfo {
+    pub volume: MmNumber,
+    pub balance: MmNumber,
+    pub locked_by_swaps: MmNumber,
+}
+
+/// Requests the `coin` balance and calculates max Maker volume.
+/// Returns [`CheckBalanceError::NotSufficientBalance`] if the balance is insufficient.
+pub async fn get_max_maker_vol(ctx: &MmArc, my_coin: &MmCoinEnum) -> CheckBalanceResult<CoinVolumeInfo> {
+    let my_balance = my_coin.my_spendable_balance().compat().await?;
+    calc_max_maker_vol(ctx, my_coin, &my_balance, FeeApproxStage::OrderIssue).await
+}
+
+/// Calculates max Maker volume.
 /// Returns [`CheckBalanceError::NotSufficientBalance`] if the balance is not sufficient.
 /// Note the function checks base coin balance if the trade fee should be paid in base coin.
 pub async fn calc_max_maker_vol(
@@ -1948,13 +2191,13 @@ pub async fn calc_max_maker_vol(
     coin: &MmCoinEnum,
     balance: &BigDecimal,
     stage: FeeApproxStage,
-) -> CheckBalanceResult<MmNumber> {
+) -> CheckBalanceResult<CoinVolumeInfo> {
     let ticker = coin.ticker();
-    let locked = get_locked_amount(ctx, ticker);
-    let available = &MmNumber::from(balance.clone()) - &locked;
-    let mut vol = available.clone();
+    let locked_by_swaps = get_locked_amount(ctx, ticker);
+    let available = &MmNumber::from(balance.clone()) - &locked_by_swaps;
+    let mut volume = available.clone();
 
-    let preimage_value = TradePreimageValue::UpperBound(vol.to_decimal());
+    let preimage_value = TradePreimageValue::UpperBound(volume.to_decimal());
     let trade_fee = coin
         .get_sender_trade_fee(preimage_value, stage)
         .await
@@ -1963,23 +2206,27 @@ pub async fn calc_max_maker_vol(
     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;
+        volume = &volume - &trade_fee.amount;
         required_to_pay_fee = trade_fee.amount;
     } else {
         let base_coin_balance = coin.base_coin_balance().compat().await?;
         check_base_coin_balance_for_swap(ctx, &MmNumber::from(base_coin_balance), trade_fee.clone(), None).await?;
     }
     let min_tx_amount = MmNumber::from(coin.min_tx_amount());
-    if vol < min_tx_amount {
+    if volume < min_tx_amount {
         let required = min_tx_amount + required_to_pay_fee;
         return MmError::err(CheckBalanceError::NotSufficientBalance {
             coin: ticker.to_owned(),
             available: available.to_decimal(),
             required: required.to_decimal(),
-            locked_by_swaps: Some(locked.to_decimal()),
+            locked_by_swaps: Some(locked_by_swaps.to_decimal()),
         });
     }
-    Ok(vol)
+    Ok(CoinVolumeInfo {
+        volume,
+        balance: MmNumber::from(balance.clone()),
+        locked_by_swaps,
+    })
 }
 
 #[cfg(all(test, not(target_arch = "wasm32")))]
@@ -1988,11 +2235,13 @@ mod maker_swap_tests {
     use coins::eth::{addr_from_str, signed_eth_tx_from_bytes, SignedEthTx};
     use coins::{MarketCoinOps, MmCoin, SwapOps, TestCoin};
     use common::block_on;
-    use crypto::privkey::key_pair_from_seed;
-    use mm2_core::mm_ctx::MmCtxBuilder;
+    use mm2_test_helpers::for_tests::mm_ctx_with_iguana;
     use mocktopus::mocking::*;
     use serde_json as json;
 
+    const PASSPHRASE: Option<&str> =
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+
     fn eth_tx_for_test() -> SignedEthTx {
         // raw transaction bytes of https://etherscan.io/tx/0x0869be3e5d4456a29d488a533ad6c118620fef450f36778aecf31d356ff8b41f
         let tx_bytes = [
@@ -2012,26 +2261,27 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_swap_payment_errored_but_sent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentTransactionFailed error but the transaction is actually
         // sent, need to find it and refund
         // TODO remove TransactionDetails from json
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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 maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::CanRefundNow))));
+
         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())))
         });
@@ -2053,19 +2303,19 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_payment_refund_errored() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentRefundFailed error
         let maker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_lock":1563636475,"my_persistent_pub":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret":"0000000000000000000000000000000000000000000000000000000000000000","started_at":1563620875,"taker":"14a96292bfcd7762ece8eb08ead915da927c2619277363853572f30880d5155e","taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875062},{"event":{"data":{"taker_payment_locktime":1563628675,"taker_pubkey":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91"},"type":"Negotiated"},"timestamp":1563620915497},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeValidated"},"timestamp":1563620976060},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentSent"},"timestamp":1563620976189},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentReceived"},"timestamp":1563621268320},{"event":{"type":"TakerPaymentWaitConfirmStarted"},"timestamp":1563621268321},{"event":{"type":"TakerPaymentValidatedAndConfirmed"},"timestamp":1563621778471},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentSpendFailed"},"timestamp":1563638060583},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"MakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563621778483}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
-        static mut MAKER_REFUND_CALLED: bool = false;
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::CanRefundNow))));
 
-        TestCoin::send_maker_refunds_payment.mock_safe(|_, _, _, _, _, _, _| {
+        static mut MAKER_REFUND_CALLED: bool = false;
+        TestCoin::send_maker_refunds_payment.mock_safe(|_, _| {
             unsafe { MAKER_REFUND_CALLED = true };
             MockResult::Return(Box::new(futures01::future::ok(eth_tx_for_test().into())))
         });
@@ -2087,13 +2337,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_payment_refund_errored_already_refunded() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentRefundFailed error
         let maker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_lock":1563636475,"my_persistent_pub":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret":"0000000000000000000000000000000000000000000000000000000000000000","started_at":1563620875,"taker":"14a96292bfcd7762ece8eb08ead915da927c2619277363853572f30880d5155e","taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875062},{"event":{"data":{"taker_payment_locktime":1563628675,"taker_pubkey":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91"},"type":"Negotiated"},"timestamp":1563620915497},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeValidated"},"timestamp":1563620976060},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentSent"},"timestamp":1563620976189},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentReceived"},"timestamp":1563621268320},{"event":{"type":"TakerPaymentWaitConfirmStarted"},"timestamp":1563621268321},{"event":{"type":"TakerPaymentValidatedAndConfirmed"},"timestamp":1563621778471},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentSpendFailed"},"timestamp":1563638060583},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"MakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563621778483}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2111,13 +2359,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_payment_refund_errored_already_spent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentRefundFailed error
         let maker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_lock":1563636475,"my_persistent_pub":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret":"0000000000000000000000000000000000000000000000000000000000000000","started_at":1563620875,"taker":"14a96292bfcd7762ece8eb08ead915da927c2619277363853572f30880d5155e","taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875062},{"event":{"data":{"taker_payment_locktime":1563628675,"taker_pubkey":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91"},"type":"Negotiated"},"timestamp":1563620915497},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeValidated"},"timestamp":1563620976060},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentSent"},"timestamp":1563620976189},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentReceived"},"timestamp":1563621268320},{"event":{"type":"TakerPaymentWaitConfirmStarted"},"timestamp":1563621268321},{"event":{"type":"TakerPaymentValidatedAndConfirmed"},"timestamp":1563621778471},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentSpendFailed"},"timestamp":1563638060583},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"MakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563621778483}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2149,49 +2395,47 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_swap_payment_errored_but_too_early_to_refund() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentTransactionFailed error but the transaction is actually
         // sent, need to find it and refund, prevent refund if payment is not spendable due to locktime restrictions
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         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()))))
         });
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::HaveToWait(1000)))));
         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!(block_on(maker_swap.recover_funds()).is_err());
+        let error = block_on(maker_swap.recover_funds()).unwrap_err();
+        assert!(error.contains("Too early to refund"));
         assert!(unsafe { MY_PAYMENT_SENT_CALLED });
     }
 
     #[test]
     fn test_recover_funds_maker_swap_payment_errored_and_not_sent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the swap ends up with MakerPaymentTransactionFailed error and transaction is not sent,
         // recover must return error in this case
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         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(None)))
         });
@@ -2204,13 +2448,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_swap_not_finished() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // return error if swap is not finished
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2222,13 +2464,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_swap_taker_payment_spent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // return error if taker payment was spent by us
         let maker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"1","maker_coin":"BEER","maker_coin_start_block":154892,"maker_payment_confirmations":1,"maker_payment_lock":1563444026,"my_persistent_pub":"02631dcf1d4b1b693aa8c2751afc68e4794b1e5996566cfc701a663f8b7bbbe640","secret":"e1c9bd12a83f810813dc078ac398069b63d56bf1e94657def995c43cd1975302","started_at":1563428426,"taker":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","taker_amount":"1","taker_coin":"ETOMIC","taker_coin_start_block":150282,"taker_payment_confirmations":1,"uuid":"983ce732-62a8-4a44-b4ac-7e4271adc977"},"type":"Started"},"timestamp":1563428426510},{"event":{"data":{"taker_payment_locktime":1563436226,"taker_pubkey":"02031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3"},"type":"Negotiated"},"timestamp":1563428466880},{"event":{"data":{"tx_hash":"32f5bec2106dd3778dc32e3d856398ed0fa10b71c688672906a4fa0345cc4135","tx_hex":"0400008085202f89015ba9c8f0aec5b409bc824bcddc1a5a40148d4bd065c10169249e44ec44d62db2010000006a473044022050a213db7486e34871b9e7ef850845d55e0d53431350c16fa14fb60b81b1858302204f1042761f84e5f8d22948358b3c4103861adf5293d1d9e7f58f3b7491470b19012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff02bcf60100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac764d12ac010000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac8806305d000000000000000000000000000000"},"type":"TakerFeeValidated"},"timestamp":1563428507723},{"event":{"data":{"tx_hash":"1619d10a51925d2f3d0ef92d81cb6449b77d5dbe1f3ef5e7ae6c8bc19080cb5a","tx_hex":"0400008085202f890176ead03820bc0c4e92dba39b5d7e7a1e176b165f6cfc7a5e2c000ed62e8a8134010000006b48304502210086ca9a6ea5e787f4c3001c4ddb7b2f4732d8bb2642e9e43d0f39df4b736a4aa402206dbd17753f728d70c9631b6c2d1bba125745a5bc9be6112febf0e0c8ada786b1012102631dcf1d4b1b693aa8c2751afc68e4794b1e5996566cfc701a663f8b7bbbe640ffffffff0200e1f5050000000017a91410503cfea67f03f025c5e1eeb18524464adf77ee877f360c18c00000001976a91464ae8510aac9546d5e7704e31ce177451386455588ac9b06305d000000000000000000000000000000"},"type":"MakerPaymentSent"},"timestamp":1563428512925},{"event":{"data":{"tx_hash":"ee8b904efdee0d3bf0215d14a236489cde0b0efa92f7fa49faaa5fd97ed38ac0","tx_hex":"0400008085202f89013541cc4503faa406296788c6710ba10fed9863853d2ec38d77d36d10c2bef532010000006b483045022100a32e290d3a047ad75a512f9fd581c561c5153aa1b6be2b36915a9dd452cd0d4102204d1838b3cd15698ab424d15651d50983f0196e59b0b34abaad9cb792c97b527a012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0200e1f5050000000017a91424fc6f967eaa2751adbeb42a97c3497fbd9ddcce878e681ca6010000001976a91405aab5342166f8594baf17a7d9bef5d56744332788acbf06305d000000000000000000000000000000"},"type":"TakerPaymentReceived"},"timestamp":1563428664418},{"event":{"type":"TakerPaymentWaitConfirmStarted"},"timestamp":1563428664420},{"event":{"type":"TakerPaymentValidatedAndConfirmed"},"timestamp":1563428664824},{"event":{"data":{"tx_hash":"8b48d7452a2a1c6b1128aa83ab946e5a624037c5327b527b18c3dcadb404f139","tx_hex":"0400008085202f8901c08ad37ed95faafa49faf792fa0e0bde9c4836a2145d21f03b0deefd4e908bee00000000d747304402206ac1f2b5b856b86585b4d2147309e3a7ef9dd4c35ffd85a49c409a4acd11602902204be03e2114888fae460eaf99675bae0c834ff80be8531a5bd30ee14baf0a52e30120e1c9bd12a83f810813dc078ac398069b63d56bf1e94657def995c43cd1975302004c6b6304c224305db1752102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ac6782012088a9143501575fb9a12a689bb94adad33cc78c13b0688c882102631dcf1d4b1b693aa8c2751afc68e4794b1e5996566cfc701a663f8b7bbbe640ac68ffffffff0118ddf505000000001976a91464ae8510aac9546d5e7704e31ce177451386455588ac28f92f5d000000000000000000000000000000"},"type":"TakerPaymentSpent"},"timestamp":1563428666150},{"event":{"type":"Finished"},"timestamp":1563428666152}],"my_info":{"my_amount":"1","my_coin":"BEER","other_amount":"1","other_coin":"ETOMIC","started_at":1563428426},"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"type":"Maker","uuid":"983ce732-62a8-4a44-b4ac-7e4271adc977"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2261,13 +2501,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_maker_swap_maker_payment_refunded() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // return error if maker payment was refunded
         let maker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeValidateFailed","MakerPaymentTransactionFailed","MakerPaymentDataSendFailed","TakerPaymentValidateFailed","TakerPaymentSpendFailed","TakerPaymentSpendConfirmFailed","MakerPaymentRefunded","MakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker_amount":"9.38455187130897","maker_coin":"VRSC","maker_coin_start_block":604407,"maker_payment_confirmations":1,"maker_payment_lock":1564317372,"my_persistent_pub":"03c2e08e48e6541b3265ccd430c5ecec7efc7d0d9fc4e310a9b052f9642673fb0a","secret":"0000000000000000000000000000000000000000000000000000000000000000","started_at":1564301772,"taker":"39c4bcdb1e6bbb29a3b131c2b82eba2552f4f8a804021b2064114ab857f00848","taker_amount":"0.999999999999999880468812552729","taker_coin":"KMD","taker_coin_start_block":1462209,"taker_payment_confirmations":1,"uuid":"8f5b267a-efa8-49d6-a92d-ec0523cca891"},"type":"Started"},"timestamp":1564301773193},{"event":{"data":{"taker_payment_locktime":1564309572,"taker_pubkey":"0339c4bcdb1e6bbb29a3b131c2b82eba2552f4f8a804021b2064114ab857f00848"},"type":"Negotiated"},"timestamp":1564301813664},{"event":{"data":{"tx_hash":"cf54a5f5dfdf2eb404855eaba6a05b41f893a20327d43770c0138bb9ed2cf9eb","tx_hex":"0400008085202f89018f03a4d46831ec541279d01998be6092a98ee0f103b69ab84697cdc3eea7e93c000000006a473044022046eb76ecf610832ef063a6d210b5d07bc90fd0f3b68550fd2945ce86b317252a02202d3438d2e83df49f1c8ab741553af65a0d97e6edccbb6c4d0c769b05426c637001210339c4bcdb1e6bbb29a3b131c2b82eba2552f4f8a804021b2064114ab857f00848ffffffff0276c40100000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88acddf7bd54000000001976a9144df806990ae0197402aeaa6d9b1ec60078d9eadf88ac01573d5d000000000000000000000000000000"},"type":"TakerFeeValidated"},"timestamp":1564301864738},{"event":{"data":{"tx_hash":"2252c9929707995aff6dbb03d23b7e7eb786611d26b6ae748ca13007e71d1de6","tx_hex":"0400008085202f8901f63aed15c53b794df1a9446755f452e9fd9db250e1f608636f6172b7d795358c010000006b483045022100b5adb583fbb4b1a628b9c58ec292bb7b1319bb881c2cf018af6fe33b7a182854022020d89a2d6cbf15a117e2e1122046941f95466af7507883c4fa05955f0dfb81f2012103c2e08e48e6541b3265ccd430c5ecec7efc7d0d9fc4e310a9b052f9642673fb0affffffff0293b0ef370000000017a914ca41def369fc07d8aea10ba26cf3e64a12470d4087163149f61c0000001976a914f4f89313803d610fa472a5849d2389ca6df3b90088ac285a3d5d000000000000000000000000000000"},"type":"MakerPaymentSent"},"timestamp":1564301867675},{"event":{"data":{"error":"timeout (2690.6 > 2690.0)"},"type":"TakerPaymentValidateFailed"},"timestamp":1564304558269},{"event":{"data":{"tx_hash":"96d0b50bc2371ab88052bc4d656f1b91b3e3e64eba650eac28ebce9387d234cb","tx_hex":"0400008085202f8901e61d1de70730a18c74aeb6261d6186b77e7e3bd203bb6dff5a99079792c9522200000000b647304402207d36206295eee6c936d0204552cc5a001d4de4bbc0c5ae1c6218cf8548b4f08b02204c2a6470e06a6caf407ea8f2704fdc1b1dee39f89d145f8c0460130cb1875b2b01514c6b6304bc963d5db1752103c2e08e48e6541b3265ccd430c5ecec7efc7d0d9fc4e310a9b052f9642673fb0aac6782012088a9145f5598259da7c0c0beffcc3e9da35e553bac727388210339c4bcdb1e6bbb29a3b131c2b82eba2552f4f8a804021b2064114ab857f00848ac68feffffff01abacef37000000001976a914f4f89313803d610fa472a5849d2389ca6df3b90088ac26973d5d000000000000000000000000000000"},"type":"MakerPaymentRefunded"},"timestamp":1564321080407},{"event":{"type":"Finished"},"timestamp":1564321080409}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"8f5b267a-efa8-49d6-a92d-ec0523cca891"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2280,14 +2518,12 @@ mod maker_swap_tests {
     #[test]
     /// https://github.com/KomodoPlatform/atomicDEX-API/issues/774
     fn test_recover_funds_my_payment_spent_other_not() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // The swap ends up with TakerPaymentSpendConfirmFailed error because the TakerPaymentSpend transaction was in mempool long time and finally not mined.
         // sent, need to find it and refund, prevent refund if payment is not spendable due to locktime restrictions
         let maker_saved_json = r#"{"uuid":"7f95db1d-2ea5-4cce-b056-400e8b288042","events":[{"timestamp":1607887364672,"event":{"type":"Started","data":{"taker_coin":"KMD","maker_coin":"EMC2","taker":"ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900d","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"4a40a42a7d7192e5cbeaa3871f734612acfeaf76","my_persistent_pub":"03005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5","lock_duration":31200,"maker_amount":"24.69126200952912480678056188200573124484152642245967528226624133800833910867311611640128371388479323","taker_amount":"3.094308955034189920785740015052958239603540091262646506373605364479205057098914911707408875024042288","maker_payment_confirmations":1,"maker_payment_requires_nota":true,"taker_payment_confirmations":2,"taker_payment_requires_nota":true,"maker_payment_lock":1607949764,"uuid":"7f95db1d-2ea5-4cce-b056-400e8b288042","started_at":1607887364,"maker_coin_start_block":3526364,"taker_coin_start_block":2178701}}},{"timestamp":1607887366684,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1607918567,"taker_pubkey":"03ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900d"}}},{"timestamp":1607887367745,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f8902f02f23931783009e01b7f250234eb7b3a96bd7e7e16dd61f21988bbc7600b6f7020000006b483045022100d4610ef1f147417476877aa09b1f110f7e6773355d6dc8cae7af429707f9da4d02203f5d1890da9d6efffee55869761f9353dbd3bcafb2a560f4564eba658ae2807b012103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dffffffffb7599816287b72f939b8e6b59fe4706d7b6826e5f6c04db18e3689cb76e846ce000000006a473044022021a486a9920ff8b3d892c00c10abaf58b4509fe9d3a6f8320e198e312e220db402203fab57d7ccfda1eded606ab3de6a32f626b5904ecf9f41e4a7a4800376952d67012103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dffffffff020e780500000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac5bdb0c00000000001976a914851bf1c11fb48beecc0a0e50982b9d43357743e688ac0c62d65f000000000000000000000000000000","tx_hash":"8a7c0ddbc2a0e94e1f58c920780563eb71266d932fe9435cf66def905db91efb"}}},{"timestamp":1607887367887,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"010000000118c570eab3ec0f07a33640aff42a7b3565f4fa72561473b9f55d23b7a5360351090000006a4730440220047c5a917e7ac72b55357c657581ebf60b7281466be3dd00a92f68b85e03ae2e02204b07643faf3ae88a1775794c5afc406be4aaec87d0a98fb49a2125e02b9ed21d012103005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5ffffffff0338e02b930000000017a914e0ddc80814f50249d097c3242e355a5d6fae462b870000000000000000166a144a40a42a7d7192e5cbeaa3871f734612acfeaf76284bcb93000000001976a914b86cb58669cc65e2f880e1df5d6e11c3dcb7230988ac076ad65f","tx_hash":"aa06c1647cb0418ed6ca7666dc517bfe8de92bc163b6765f9370bb316af1c1ff"}}},{"timestamp":1607887416097,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8903fb1eb95d90ef6df65c43e92f936d2671eb63057820c9581f4ee9a0c2db0d7c8a010000006b483045022100d55c02f8536f0c1e5f10833b901adc3d2a77d7f0701371a29dcc155426b8f280022028f540607c349f9a73489801c45445f594f2552d165b2bd004af00c0297ce494012103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dffffffffe83e674cb46d0862cbc3ade7e363c5eb3a73a9ad977fff60544093efc6a2682b000000006a47304402200a324d95e7e7193a479aed48c608068f6d81ee8d7dd9b13735427e18f53bb25b0220606e075b56c675f10f6cb3332e4a28011d88428f54e3f09b016deec16c1ac41b012103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dffffffff987b47469a16aac4adaf0a47d8fbf813f8b20cf28eef82e14b74d732a263584e000000006a473044022062badf692bea3f13b5adb5cd66ff87f8f3224624762a75caaffa6fd856a0cfa602204d2477941cb781bba824d20e562f2d52a85c6c1103dccf28ddbfcadead87925b012103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dffffffff036f8a71120000000017a91415d9f7c7ad4e88b91d92c1480902fedfea92b981870000000000000000166a144a40a42a7d7192e5cbeaa3871f734612acfeaf76967e1500000000001976a914851bf1c11fb48beecc0a0e50982b9d43357743e688ac3c62d65f000000000000000000000000000000","tx_hash":"3e01651b399901192067e24f60371f640e840d240956676a416d26dec6f051f4"}}},{"timestamp":1607887416115,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1607901459795,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1607901459843,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f8901f451f0c6de266d416a675609240d840e641f37604fe26720190199391b65013e00000000d8483045022100f8a8dade217e2595d3aaa287adc6cbf895b3d9c13f28aa707873943c1412c36d022053efe8c35fefbab2b298e0e4e8b93ad05b1d98d872b656616520dee15d79ea6801202e3d520b3d396cd2fc4aaac03257d13b2c82772ffe4479b7e0841987f8f673a7004c6b6304e7e3d65fb1752103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dac6782012088a9144a40a42a7d7192e5cbeaa3871f734612acfeaf76882103005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5ac68ffffffff0187867112000000001976a914b86cb58669cc65e2f880e1df5d6e11c3dcb7230988ac1599d65f000000000000000000000000000000","tx_hash":"21cb40785f3e768c38c502be378448f33634430277360dc1c20fcdc238ebf806"}}},{"timestamp":1607901459850,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1607957899314,"event":{"type":"TakerPaymentSpendConfirmFailed","data":{"error":"maker_swap:714] !wait for taker payment spend confirmations: rpc_clients:123] Waited too long until 1607953464 for transaction Transaction { version: 4, n_time: None, overwintered: true, version_group_id: 2301567109, inputs: [TransactionInput { previous_output: OutPoint { hash: f451f0c6de266d416a675609240d840e641f37604fe26720190199391b65013e, index: 0 }, script_sig: 483045022100f8a8dade217e2595d3aaa287adc6cbf895b3d9c13f28aa707873943c1412c36d022053efe8c35fefbab2b298e0e4e8b93ad05b1d98d872b656616520dee15d79ea6801202e3d520b3d396cd2fc4aaac03257d13b2c82772ffe4479b7e0841987f8f673a7004c6b6304e7e3d65fb1752103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dac6782012088a9144a40a42a7d7192e5cbeaa3871f734612acfeaf76882103005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5ac68, sequence: 4294967295, script_witness: [] }], outputs: [TransactionOutput { value: 309429895, script_pubkey: 76a914b86cb58669cc65e2f880e1df5d6e11c3dcb7230988ac }], lock_time: 1607899413, expiry_height: 0, shielded_spends: [], shielded_outputs: [], join_splits: [], value_balance: 0, join_split_pubkey: 0000000000000000000000000000000000000000000000000000000000000000, join_split_sig: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, binding_sig: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, zcash: true, str_d_zeel: None } to be confirmed 1 times"}}},{"timestamp":1607957899319,"event":{"type":"MakerPaymentWaitRefundStarted","data":{"wait_until":1607953464}}},{"timestamp":1607957899367,"event":{"type":"MakerPaymentRefundFailed","data":{"error":"maker_swap:746] !maker_coin.send_maker_refunds_payment: utxo_common:791] rpc_clients:1440] JsonRpcError { client_info: \"coin: EMC2\", request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"8\", method: \"blockchain.transaction.broadcast\", params: [String(\"0100000001ffc1f16a31bb70935f76b663c12be98dfe7b51dc6676cad68e41b07c64c106aa00000000b6473044022029d1626dde413ecb7af09c1609a0f1f3791539aef1a5f972787db39c6b8178f302202052b6c37f2334cbee21dc8c6ceeb368cc0bb69ab254da3a8b48a27d4542d84b01514c6b6304c45dd75fb1752103005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5ac6782012088a9144a40a42a7d7192e5cbeaa3871f734612acfeaf76882103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dac68feffffff0198592a93000000001976a914b86cb58669cc65e2f880e1df5d6e11c3dcb7230988ac7b6fd75f\")] }, error: Response(electrum2.cipig.net:10062, Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\n18: bad-txns-inputs-spent\\n[0100000001ffc1f16a31bb70935f76b663c12be98dfe7b51dc6676cad68e41b07c64c106aa00000000b6473044022029d1626dde413ecb7af09c1609a0f1f3791539aef1a5f972787db39c6b8178f302202052b6c37f2334cbee21dc8c6ceeb368cc0bb69ab254da3a8b48a27d4542d84b01514c6b6304c45dd75fb1752103005e349c71a17334a3d7b712ebeb593c692e2401e611bbd829b6948c3acc15e5ac6782012088a9144a40a42a7d7192e5cbeaa3871f734612acfeaf76882103ae3cc37d2a7cc9077fb5b1baa962d1539e1ffe5fb318c99dcba43059ed97900dac68feffffff0198592a93000000001976a914b86cb58669cc65e2f880e1df5d6e11c3dcb7230988ac7b6fd75f]\")})) }"}}},{"timestamp":1607957899372,"event":{"type":"Finished"}}],"maker_amount":"24.69126200952912480678056188200573124484152642245967528226624133800833910867311611640128371388479323","maker_coin":"EMC2","taker_amount":"3.094308955034189920785740015052958239603540091262646506373605364479205057098914911707408875024042288","taker_coin":"KMD","gui":"AtomicDex Desktop 0.3.1-beta","mm_version":"2.1.2793_mm2.1_19701cc87_Windows_NT_Release","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 maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2307,7 +2543,7 @@ mod maker_swap_tests {
         });
 
         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())))
         });
@@ -2328,12 +2564,10 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recover_funds_should_not_refund_on_the_successful_swap() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let maker_saved_json = r#"{"type":"Maker","uuid":"12456076-58dd-4772-9d88-167d5fa103d2","my_order_uuid":"5ae22bf5-09cf-4828-87a7-c3aa7339ba10","events":[{"timestamp":1631695364907,"event":{"type":"Started","data":{"taker_coin":"KMD","maker_coin":"TKL","taker":"2b20b92e19e9e11b07f8309cebb1fcd1cce1606be8ab0de2c1b91f979c937996","secret":"0000000000000000000000000000000000000000000000000000000000000000","secret_hash":"65a10bd6dbdf6ebf7ec1f3bfb7451cde0582f9cb","my_persistent_pub":"03789c206e830f9e0083571f79e80eb58601d37bde8abb0c380d81127613060b74","lock_duration":31200,"maker_amount":"500","taker_amount":"140.7","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":2,"taker_payment_requires_nota":true,"maker_payment_lock":1631757764,"uuid":"12456076-58dd-4772-9d88-167d5fa103d2","started_at":1631695364,"maker_coin_start_block":61066,"taker_coin_start_block":2569118,"maker_payment_trade_fee":{"coin":"TKL","amount":"0.00001","paid_from_trading_vol":false},"taker_payment_spend_trade_fee":{"coin":"KMD","amount":"0.00001","paid_from_trading_vol":true}}}},{"timestamp":1631695366908,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1631726564,"taker_pubkey":"032b20b92e19e9e11b07f8309cebb1fcd1cce1606be8ab0de2c1b91f979c937996","maker_coin_swap_contract_addr":null,"taker_coin_swap_contract_addr":null}}},{"timestamp":1631695367917,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"0400008085202f8901562fdec6bbdac4c5c3212394e1fd439d3647ff04bdd79d51b9bbf697c9a925e7000000006a473044022074c71fcdc12654e3aa01c780b10d6c84b1d6ba28f0db476010002a1ed00e75cf022018e115923b1c1b5e872893fd6a1f270c0e8e3e84a869181c349aa78553e1423b0121032b20b92e19e9e11b07f8309cebb1fcd1cce1606be8ab0de2c1b91f979c937996ffffffff0251adf800000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac72731e4c080000001976a914dc1bea5367613f189da622e9bc5bdb2d61667e5b88ac08aa4161000000000000000000000000000000","tx_hash":"f315170aba20ff4d432b8a2d0a8fa0211444c8d27b56fc0d4fc2058e9f3c6e08"}}},{"timestamp":1631695368024,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"0400008085202f8901bc488c4e0f9a3fe9d7f5dbcc17f61e7711a75c7ed277843988f3be4d236b9a02020000006a473044022027ac57a4a34b0d8561afc1ad63f9e1fb271d58577a80f26ba519017d65d882f802200b5617f32427b86b423de6740cd134fdb8b86c511943e778c65781573224cf4a012103789c206e830f9e0083571f79e80eb58601d37bde8abb0c380d81127613060b74ffffffff0300743ba40b00000017a914022be92579878d04c80d128cdfdcba4ed29a9f9a870000000000000000166a1465a10bd6dbdf6ebf7ec1f3bfb7451cde0582f9cb6494f93503c801001976a914bde146a76acf122caf5e460d01ddaf3be714247e88ac07b24161000000000000000000000000000000","tx_hash":"8693723462ef5ee6c3014230fd4a4aefe6bcd0eaeb727e1e5b33fe1105e9f8ad"}}},{"timestamp":1631696319310,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"0400008085202f8901086e3c9f8e05c24f0dfc567bd2c8441421a08f0a2d8a2b434dff20ba0a1715f3010000006a47304402207190691940b4834394c2a9e08a32b775f1c62a47ab76737c96c08e2937173988022040229094d51acb3d948413c349e36795b888a9b425b29ed7a96ed8eb97407d050121032b20b92e19e9e11b07f8309cebb1fcd1cce1606be8ab0de2c1b91f979c937996ffffffff038029a3460300000017a9146d0db00d111fcd0b83505cb805a3255cbaa8c747870000000000000000166a1465a10bd6dbdf6ebf7ec1f3bfb7451cde0582f9cb0a467b05050000001976a914dc1bea5367613f189da622e9bc5bdb2d61667e5b88acbfad4161000000000000000000000000000000","tx_hash":"a9b97c4c12c8eb637a7016459de644eae9e307efd2d051601d7d9f615fd62461"}}},{"timestamp":1631696319310,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1631697459816,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1631697459821,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"0400008085202f89016124d65f619f7d1d6051d0d2ef07e3e9ea44e69d4516707a63ebc8124c7cb9a900000000d84830450221008c50c144382346247d7052a32e12f4d839fa22c12064b199d589cc62ead00c99022017e88f543e181fd92ebf32e1313ca6fb12f93226fd294c808b0904601102424f012068e659c506d57d94369ca520158d641ea997b0db39fdafb1e59b07867ad4be9d004c6b6304e42b4261b17521032b20b92e19e9e11b07f8309cebb1fcd1cce1606be8ab0de2c1b91f979c937996ac6782012088a91465a10bd6dbdf6ebf7ec1f3bfb7451cde0582f9cb882103789c206e830f9e0083571f79e80eb58601d37bde8abb0c380d81127613060b74ac68ffffffff019825a346030000001976a914bde146a76acf122caf5e460d01ddaf3be714247e88ace42b4261000000000000000000000000000000","tx_hash":"8a6d65518d3a01f6f659f11e0667373052ebfc2e600f80c6592dec556bee4a39"}}},{"timestamp":1631697459822,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1631697489840,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1631697489841,"event":{"type":"Finished"}}],"maker_amount":"500","maker_coin":"TKL","taker_amount":"140.7","taker_coin":"KMD","gui":"TOKEL-IDO","mm_version":"41170748d","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 maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2353,7 +2587,7 @@ mod maker_swap_tests {
         });
 
         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())))
         });
@@ -2372,12 +2606,10 @@ mod maker_swap_tests {
     fn swap_must_not_lock_funds_by_default() {
         use crate::mm2::lp_swap::get_locked_amount;
 
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2392,13 +2624,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recheck_swap_contract_address_if_none() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // swap file contains neither maker_coin_swap_contract_address nor taker_coin_swap_contract_address
         let maker_saved_json = r#"{"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":"0000000000000000000000000000000000000000000000000000000000000000","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}],"success_events":["Started","Negotiated","TakerFeeValidated","MakerPaymentSent","TakerPaymentReceived","TakerPaymentWaitConfirmStarted","TakerPaymentValidatedAndConfirmed","TakerPaymentSpent","TakerPaymentSpendConfirmStarted","TakerPaymentSpendConfirmed","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         static mut SWAP_CONTRACT_ADDRESS_CALLED: usize = 0;
@@ -2423,13 +2653,11 @@ mod maker_swap_tests {
 
     #[test]
     fn test_recheck_only_one_swap_contract_address() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // swap file contains only maker_coin_swap_contract_address
         let maker_saved_json = r#"{"type":"Maker","uuid":"c52659d7-4e13-41f5-9c1a-30cc2f646033","events":[{"timestamp":1608541830095,"event":{"type":"Started","data":{"taker_coin":"JST","maker_coin":"ETH","taker":"031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","secret":"dc45c1d22028970d8d30d1ddacbfc50eb92403b0d6076c94f2216c4c44512b41","secret_hash":"943e11f7c74e2d6493ef8ad01a06ef2ce9bd1fb3","my_persistent_pub":"03c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed","lock_duration":7800,"maker_amount":"0.1","taker_amount":"0.1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":1,"taker_payment_requires_nota":false,"maker_payment_lock":1608557429,"uuid":"c52659d7-4e13-41f5-9c1a-30cc2f646033","started_at":1608541829,"maker_coin_start_block":14353,"taker_coin_start_block":14353,"maker_coin_swap_contract_address":"a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd"}}},{"timestamp":1608541830399,"event":{"type":"Negotiated","data":{"taker_payment_locktime":1608549629,"taker_pubkey":"02031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3"}}},{"timestamp":1608541831810,"event":{"type":"TakerFeeValidated","data":{"tx_hex":"f8a7821fb58083033450942b294f029fde858b2c62184e8390591755521d8e80b844a9059cbb000000000000000000000000d8997941dd1346e9231118d5685d866294f59e5b0000000000000000000000000000000000000000000000000000750d557426e01ba06ddad2dfe6933b8d70d5739beb3005c8f367bc72eac4e5609b81c2f8e5843cd9a07fa695cc42f8c6b6a7b10f6ae9e4dca3e750e37f64a85b54dec736236790f05e","tx_hash":"b13c3428f70b46d8c1d7f5863af020a27c380a8ede0927554beabf234998bcc8"}}},{"timestamp":1608541832884,"event":{"type":"MakerPaymentSent","data":{"tx_hex":"f8ef82021980830249f094a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd88016345785d8a0000b884152cf3af7c7ce37fac65bd995eae3d58ccdc367d79f3a10e6ca55f609e6dcefac960982b000000000000000000000000bab36286672fbdc7b250804bf6d14be0df69fa29943e11f7c74e2d6493ef8ad01a06ef2ce9bd1fb3000000000000000000000000000000000000000000000000000000000000000000000000000000005fe0a3751ca03ab6306b8b8875c7d2cbaa71a3991eb8e7ae44e192dc9974cecc1f9dcfe5e4d6a04ec2808db06fe7b246134997fcce81ca201ced1257f1f8e93cacadd6554ca653","tx_hash":"ceba36dff0b2c7aec69cb2d5be7055858e09889959ba63f7957b45a15dceade4"}}},{"timestamp":1608541835207,"event":{"type":"TakerPaymentReceived","data":{"tx_hex":"f90127821fb680830249f094a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd80b8c49b415b2a64bdf61f195a1767f547bb0886ed697f3c1a063ce928ff9a47222c0b5d099200000000000000000000000000000000000000000000000000016345785d8a00000000000000000000000000002b294f029fde858b2c62184e8390591755521d8e0000000000000000000000004b2d0d6c2c785217457b69b922a2a9cea98f71e9943e11f7c74e2d6493ef8ad01a06ef2ce9bd1fb3000000000000000000000000000000000000000000000000000000000000000000000000000000005fe084fd1ba0a5b6ef54217c5a03a588d01410ef1187ce6107bdb075306ced06a06e25a50984a03f541f1f392079ae2590d0f48f2065f8721a8b46c44a060ae53f00bfb5160118","tx_hash":"1247a1be3da89f3612ca33d83d493808388775e2897036f640c0efe69c3b162f"}}},{"timestamp":1608541835208,"event":{"type":"TakerPaymentWaitConfirmStarted"}},{"timestamp":1608541836196,"event":{"type":"TakerPaymentValidatedAndConfirmed"}},{"timestamp":1608541837173,"event":{"type":"TakerPaymentSpent","data":{"tx_hex":"f9010782021a80830249f094a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd80b8a402ed292b64bdf61f195a1767f547bb0886ed697f3c1a063ce928ff9a47222c0b5d099200000000000000000000000000000000000000000000000000016345785d8a0000dc45c1d22028970d8d30d1ddacbfc50eb92403b0d6076c94f2216c4c44512b410000000000000000000000002b294f029fde858b2c62184e8390591755521d8e000000000000000000000000bab36286672fbdc7b250804bf6d14be0df69fa291ba053af89feb4ab066b26e76de9788c85ec1bf14ae6dcbdd7ff53e561e48e1b822ca043796d45bd4233500a120a1571b3fee95a34e8cc6b616c69552da4352c0d8e39","tx_hash":"d9a839c6eead3fbf538eca0a4ec39e28647104920a5c8b9c107524287dd90165"}}},{"timestamp":1608541837175,"event":{"type":"TakerPaymentSpendConfirmStarted"}},{"timestamp":1608541837612,"event":{"type":"TakerPaymentSpendConfirmed"}},{"timestamp":1608541837614,"event":{"type":"Finished"}}],"maker_amount":"0.1","maker_coin":"ETH","taker_amount":"0.1","taker_coin":"JST","gui":"nogui","mm_version":"1a6082121","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 maker_saved_swap: MakerSavedSwap = json::from_str(maker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         static mut SWAP_CONTRACT_ADDRESS_CALLED: usize = 0;
diff --git a/mm2src/mm2_main/src/lp_swap/max_maker_vol_rpc.rs b/mm2src/mm2_main/src/lp_swap/max_maker_vol_rpc.rs
new file mode 100644
index 0000000000..cceb5cb3ed
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/max_maker_vol_rpc.rs
@@ -0,0 +1,155 @@
+use crate::mm2::lp_swap::{get_max_maker_vol, CheckBalanceError, CoinVolumeInfo};
+use coins::{lp_coinfind_or_err, CoinFindError};
+use common::HttpStatusCode;
+use derive_more::Display;
+use http::StatusCode;
+use mm2_core::mm_ctx::MmArc;
+use mm2_err_handle::prelude::*;
+use mm2_number::{BigDecimal, MmNumberMultiRepr};
+use ser_error_derive::SerializeErrorType;
+
+#[derive(Display, Serialize, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum MaxMakerVolRpcError {
+    #[display(
+        fmt = "Not enough {} for swap: available {}, required at least {}, locked by swaps {:?}",
+        coin,
+        available,
+        required,
+        locked_by_swaps
+    )]
+    NotSufficientBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        locked_by_swaps: Option<BigDecimal>,
+    },
+    #[display(
+        fmt = "Not enough base coin {} balance for swap: available {}, required at least {}, locked by swaps {:?}",
+        coin,
+        available,
+        required,
+        locked_by_swaps
+    )]
+    NotSufficientBaseCoinBalance {
+        coin: String,
+        available: BigDecimal,
+        required: BigDecimal,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        locked_by_swaps: Option<BigDecimal>,
+    },
+    #[display(
+        fmt = "The volume {} of the {} coin less than minimum transaction amount {}",
+        volume,
+        coin,
+        threshold
+    )]
+    VolumeTooLow {
+        coin: String,
+        volume: BigDecimal,
+        threshold: BigDecimal,
+    },
+    #[display(fmt = "No such coin {}", coin)]
+    NoSuchCoin { coin: String },
+    #[display(fmt = "Coin {} is wallet only", coin)]
+    CoinIsWalletOnly { coin: String },
+    #[display(fmt = "Transport error: {}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    InternalError(String),
+}
+
+impl From<CoinFindError> for MaxMakerVolRpcError {
+    fn from(e: CoinFindError) -> Self {
+        match e {
+            CoinFindError::NoSuchCoin { coin } => MaxMakerVolRpcError::NoSuchCoin { coin },
+        }
+    }
+}
+
+impl From<CheckBalanceError> for MaxMakerVolRpcError {
+    fn from(e: CheckBalanceError) -> Self {
+        match e {
+            CheckBalanceError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+                locked_by_swaps,
+            } => MaxMakerVolRpcError::NotSufficientBalance {
+                coin,
+                available,
+                required,
+                locked_by_swaps,
+            },
+            CheckBalanceError::NotSufficientBaseCoinBalance {
+                coin,
+                available,
+                required,
+                locked_by_swaps,
+            } => MaxMakerVolRpcError::NotSufficientBaseCoinBalance {
+                coin,
+                available,
+                required,
+                locked_by_swaps,
+            },
+            CheckBalanceError::VolumeTooLow {
+                coin,
+                volume,
+                threshold,
+            } => MaxMakerVolRpcError::VolumeTooLow {
+                coin,
+                volume,
+                threshold,
+            },
+            CheckBalanceError::Transport(transport) => MaxMakerVolRpcError::Transport(transport),
+            CheckBalanceError::InternalError(internal) => MaxMakerVolRpcError::InternalError(internal),
+        }
+    }
+}
+
+impl HttpStatusCode for MaxMakerVolRpcError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            MaxMakerVolRpcError::NotSufficientBalance { .. }
+            | MaxMakerVolRpcError::NotSufficientBaseCoinBalance { .. }
+            | MaxMakerVolRpcError::VolumeTooLow { .. }
+            | MaxMakerVolRpcError::NoSuchCoin { .. }
+            | MaxMakerVolRpcError::CoinIsWalletOnly { .. } => StatusCode::BAD_REQUEST,
+            MaxMakerVolRpcError::Transport(_) | MaxMakerVolRpcError::InternalError(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct MaxMakerVolRequest {
+    coin: String,
+}
+
+#[derive(Debug, Serialize)]
+pub struct MaxMakerVolResponse {
+    coin: String,
+    volume: MmNumberMultiRepr,
+    balance: MmNumberMultiRepr,
+    locked_by_swaps: MmNumberMultiRepr,
+}
+
+pub async fn max_maker_vol(ctx: MmArc, req: MaxMakerVolRequest) -> MmResult<MaxMakerVolResponse, MaxMakerVolRpcError> {
+    let coin = lp_coinfind_or_err(&ctx, &req.coin).await?;
+    if coin.wallet_only(&ctx) {
+        return MmError::err(MaxMakerVolRpcError::CoinIsWalletOnly { coin: req.coin });
+    }
+    let CoinVolumeInfo {
+        volume,
+        balance,
+        locked_by_swaps,
+    } = get_max_maker_vol(&ctx, &coin).await?;
+    Ok(MaxMakerVolResponse {
+        coin: req.coin,
+        volume: MmNumberMultiRepr::from(volume),
+        balance: MmNumberMultiRepr::from(balance),
+        locked_by_swaps: MmNumberMultiRepr::from(locked_by_swaps),
+    })
+}
diff --git a/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs b/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs
index 18af44eb74..7135c13306 100644
--- a/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs
+++ b/mm2src/mm2_main/src/lp_swap/recreate_swap_data.rs
@@ -1,9 +1,9 @@
 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 crate::mm2::lp_swap::taker_swap::{MakerNegotiationData, TakerPaymentSpentData, TakerSavedEvent, TakerSwapData,
+                                      TakerSwapEvent, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
+use crate::mm2::lp_swap::{wait_for_maker_payment_conf_until, MakerSavedEvent, MakerSavedSwap, SavedSwap, SwapError,
+                          TakerSavedSwap};
 use coins::{lp_coinfind, MmCoinEnum};
 use common::{HttpStatusCode, StatusCode};
 use derive_more::Display;
@@ -260,14 +260,18 @@ fn convert_taker_to_maker_events(
             | TakerSwapEvent::StartFailed(_)
             | TakerSwapEvent::Negotiated(_)
             | TakerSwapEvent::NegotiateFailed(_)
+            | TakerSwapEvent::TakerPaymentInstructionsReceived(_)
             | 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::WatcherMessageSent(_,_)
             | TakerSwapEvent::TakerPaymentWaitRefundStarted { .. }
+            | TakerSwapEvent::TakerPaymentRefundStarted
             | TakerSwapEvent::TakerPaymentRefunded(_)
             | TakerSwapEvent::TakerPaymentRefundFailed(_)
+            | TakerSwapEvent::TakerPaymentRefundFinished
             | TakerSwapEvent::Finished => {}
         }
     }
@@ -327,7 +331,7 @@ async fn recreate_taker_swap(ctx: MmArc, maker_swap: MakerSavedSwap) -> Recreate
         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_payment_wait: wait_for_maker_payment_conf_until(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.
@@ -376,12 +380,9 @@ async fn recreate_taker_swap(ctx: MmArc, maker_swap: MakerSavedSwap) -> Recreate
 
     // 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,
-    ));
+    taker_swap
+        .events
+        .extend(convert_maker_to_taker_events(event_it, maker_coin, secret_hash, wait_refund_until).await);
 
     Ok(taker_swap)
 }
@@ -391,7 +392,7 @@ async fn recreate_taker_swap(ctx: MmArc, maker_swap: MakerSavedSwap) -> Recreate
 /// 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(
+async fn convert_maker_to_taker_events(
     event_it: impl Iterator<Item = MakerSavedEvent>,
     maker_coin: MmCoinEnum,
     secret_hash: BytesJson,
@@ -447,7 +448,7 @@ fn convert_maker_to_taker_events(
                 return events;
             },
             MakerSwapEvent::TakerPaymentSpent(tx_ident) => {
-                let secret = match maker_coin.extract_secret(&secret_hash.0, &tx_ident.tx_hex) {
+                let secret = match maker_coin.extract_secret(&secret_hash.0, &tx_ident.tx_hex).await {
                     Ok(secret) => H256Json::from(secret.as_slice()),
                     Err(e) => {
                         push_event!(TakerSwapEvent::TakerPaymentWaitForSpendFailed(ERRL!("{}", e).into()));
@@ -465,6 +466,7 @@ fn convert_maker_to_taker_events(
             | MakerSwapEvent::StartFailed(_)
             | MakerSwapEvent::Negotiated(_)
             | MakerSwapEvent::NegotiateFailed(_)
+            | MakerSwapEvent::MakerPaymentInstructionsReceived(_)
             | MakerSwapEvent::TakerPaymentWaitConfirmStarted
             | MakerSwapEvent::TakerPaymentValidatedAndConfirmed
             | MakerSwapEvent::TakerPaymentSpendConfirmStarted
@@ -473,8 +475,10 @@ fn convert_maker_to_taker_events(
             | MakerSwapEvent::TakerPaymentSpendConfirmFailed(_)
             // We don't know the reason at the moment, so we rely on the errors handling above.
             | MakerSwapEvent::MakerPaymentWaitRefundStarted { .. }
+            | MakerSwapEvent::MakerPaymentRefundStarted
             | MakerSwapEvent::MakerPaymentRefunded(_)
             | MakerSwapEvent::MakerPaymentRefundFailed(_)
+            | MakerSwapEvent::MakerPaymentRefundFinished
             | MakerSwapEvent::Finished => {}
         }
     }
@@ -484,7 +488,7 @@ fn convert_maker_to_taker_events(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use coins::{CoinsContext, SwapOps, TestCoin};
+    use coins::{CoinsContext, MarketCoinOps, SwapOps, TestCoin};
     use common::block_on;
     use mm2_core::mm_ctx::MmCtxBuilder;
     use mocktopus::mocking::{MockResult, Mockable};
@@ -492,11 +496,10 @@ mod tests {
 
     #[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 taker_saved_swap: TakerSavedSwap =
+            json::from_str(include_str!("../for_tests/recreate_maker_swap_taker_saved.json")).unwrap();
+        let maker_expected_swap: MakerSavedSwap =
+            json::from_str(include_str!("../for_tests/recreate_maker_swap_maker_expected.json")).unwrap();
 
         let ctx = MmCtxBuilder::default().into_mm_arc();
 
@@ -507,11 +510,14 @@ mod tests {
 
     #[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 taker_saved_swap: TakerSavedSwap = json::from_str(include_str!(
+            "../for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_taker_saved.json"
+        ))
+        .unwrap();
+        let maker_expected_swap: MakerSavedSwap = json::from_str(include_str!(
+            "../for_tests/recreate_maker_swap_maker_payment_wait_confirm_failed_maker_expected.json"
+        ))
+        .unwrap();
 
         let ctx = MmCtxBuilder::default().into_mm_arc();
 
@@ -524,18 +530,18 @@ mod tests {
     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))
+            MockResult::Return(Box::pin(async move { Ok(secret) }))
         });
+        TestCoin::platform_ticker.mock_safe(|_| MockResult::Return("TestCoin"));
 
-        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 maker_saved_swap: MakerSavedSwap =
+            json::from_str(include_str!("../for_tests/recreate_taker_swap_maker_saved.json")).unwrap();
+        let taker_expected_swap: TakerSavedSwap =
+            json::from_str(include_str!("../for_tests/recreate_taker_swap_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();
+        block_on(coins_ctx.add_token(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());
@@ -544,15 +550,19 @@ mod tests {
 
     #[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();
+        TestCoin::platform_ticker.mock_safe(|_| MockResult::Return("TestCoin"));
+        let maker_saved_swap: MakerSavedSwap = json::from_str(include_str!(
+            "../for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_maker_saved.json"
+        ))
+        .unwrap();
+        let taker_expected_swap: TakerSavedSwap = json::from_str(include_str!(
+            "../for_tests/recreate_taker_swap_taker_payment_wait_confirm_failed_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();
+        block_on(coins_ctx.add_token(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());
diff --git a/mm2src/mm2_main/src/lp_swap/swap_lock.rs b/mm2src/mm2_main/src/lp_swap/swap_lock.rs
index d233831b4e..f9f84a6cb7 100644
--- a/mm2src/mm2_main/src/lp_swap/swap_lock.rs
+++ b/mm2src/mm2_main/src/lp_swap/swap_lock.rs
@@ -57,10 +57,8 @@ mod native_lock {
     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),
-            };
+            let file_lock = some_or_return_ok_none!(FileLock::lock(lock_path, ttl_sec)?);
+
             Ok(Some(SwapLock { file_lock }))
         }
 
@@ -73,7 +71,7 @@ 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::executor::SpawnFuture;
     use common::log::{debug, error};
     use common::{now_float, now_ms};
 
@@ -121,7 +119,7 @@ mod wasm_lock {
                 }
                 debug!("SwapLock::drop] Finish");
             };
-            spawn(fut);
+            self.ctx.spawner().spawn(fut);
         }
     }
 
diff --git a/mm2src/mm2_main/src/lp_swap/swap_watcher.rs b/mm2src/mm2_main/src/lp_swap/swap_watcher.rs
new file mode 100644
index 0000000000..26067ae625
--- /dev/null
+++ b/mm2src/mm2_main/src/lp_swap/swap_watcher.rs
@@ -0,0 +1,630 @@
+use super::{broadcast_p2p_tx_msg, lp_coinfind, taker_payment_spend_deadline, tx_helper_topic, H256Json, SwapsContext,
+            WAIT_CONFIRM_INTERVAL};
+use crate::mm2::MmError;
+use async_trait::async_trait;
+use coins::{CanRefundHtlc, FoundSwapTxSpend, MmCoinEnum, SendMakerPaymentSpendPreimageInput,
+            SendWatcherRefundsPaymentArgs, WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput,
+            WatcherValidateTakerFeeInput};
+use common::executor::{AbortSettings, SpawnAbortable, Timer};
+use common::log::{debug, error, info};
+use common::state_machine::prelude::*;
+use common::{now_ms, DEX_FEE_ADDR_RAW_PUBKEY};
+use futures::compat::Future01CompatExt;
+use mm2_core::mm_ctx::MmArc;
+use mm2_libp2p::{decode_signed, pub_sub_topic, TopicPrefix};
+use serde::{Deserialize, Serialize};
+use serde_json as json;
+use std::cmp::min;
+use std::sync::Arc;
+use uuid::Uuid;
+
+pub const WATCHER_PREFIX: TopicPrefix = "swpwtchr";
+const TAKER_SWAP_CONFIRMATIONS: u64 = 1;
+pub const TAKER_SWAP_ENTRY_TIMEOUT: u64 = 21600;
+
+pub const MAKER_PAYMENT_SPEND_SENT_LOG: &str = "Maker payment spend sent";
+pub const MAKER_PAYMENT_SPEND_FOUND_LOG: &str = "Maker payment spend found by watcher";
+pub const TAKER_PAYMENT_REFUND_SENT_LOG: &str = "Taker payment refund sent";
+
+struct WatcherContext {
+    ctx: MmArc,
+    taker_coin: MmCoinEnum,
+    maker_coin: MmCoinEnum,
+    verified_pub: Vec<u8>,
+    data: TakerSwapWatcherData,
+    conf: WatcherConf,
+}
+
+impl WatcherContext {
+    fn taker_locktime(&self) -> u64 { self.data.swap_started_at + self.data.lock_duration }
+
+    fn wait_for_maker_payment_spend_deadline(&self) -> u64 {
+        let factor = self.conf.wait_maker_payment_spend_factor;
+        self.data.swap_started_at + (factor * self.data.lock_duration as f64) as u64
+    }
+
+    fn refund_start_time(&self) -> u64 {
+        let factor = self.conf.refund_start_factor;
+        self.data.swap_started_at + (factor * self.data.lock_duration as f64) as u64
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct WatcherConf {
+    #[serde(default = "common::sixty_f64")]
+    wait_taker_payment: f64,
+    #[serde(default = "common::one_f64")]
+    wait_maker_payment_spend_factor: f64,
+    #[serde(default = "common::one_and_half_f64")]
+    refund_start_factor: f64,
+    #[serde(default = "common::three_hundred_f64")]
+    search_interval: f64,
+}
+
+impl Default for WatcherConf {
+    fn default() -> Self {
+        WatcherConf {
+            wait_taker_payment: common::sixty_f64(),
+            wait_maker_payment_spend_factor: common::one_f64(),
+            refund_start_factor: common::one_and_half_f64(),
+            search_interval: common::three_hundred_f64(),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum SwapWatcherMsg {
+    TakerSwapWatcherMsg(TakerSwapWatcherData),
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+pub struct TakerSwapWatcherData {
+    pub uuid: Uuid,
+    pub secret_hash: Vec<u8>,
+    pub maker_payment_spend_preimage: Vec<u8>,
+    pub taker_payment_refund_preimage: Vec<u8>,
+    pub swap_started_at: u64,
+    pub lock_duration: u64,
+    pub taker_coin: String,
+    pub taker_fee_hash: Vec<u8>,
+    pub taker_payment_hash: Vec<u8>,
+    pub taker_coin_start_block: u64,
+    pub taker_payment_confirmations: u64,
+    pub taker_payment_requires_nota: Option<bool>,
+    pub maker_coin: String,
+    pub maker_pub: Vec<u8>,
+    pub maker_payment_hash: Vec<u8>,
+    pub maker_coin_start_block: u64,
+}
+
+struct ValidatePublicKeys {}
+struct ValidateTakerFee {}
+struct ValidateTakerPayment {}
+struct WaitForTakerPaymentSpend {
+    taker_payment_hex: Vec<u8>,
+}
+
+struct RefundTakerPayment {}
+
+struct SpendMakerPayment {
+    secret: H256Json,
+}
+
+impl SpendMakerPayment {
+    fn new(secret: H256Json) -> Self { SpendMakerPayment { secret } }
+}
+
+struct Stopped {
+    _stop_reason: StopReason,
+}
+
+#[derive(Debug)]
+enum StopReason {
+    Finished(WatcherSuccess),
+    Error(MmError<WatcherError>),
+}
+
+#[derive(Debug)]
+enum WatcherSuccess {
+    MakerPaymentSpent,
+    TakerPaymentRefunded,
+    MakerPaymentSpentByTaker,
+    TakerPaymentRefundedByTaker,
+}
+
+#[derive(Debug)]
+enum WatcherError {
+    InvalidTakerFee(String),
+    TakerPaymentNotConfirmed(String),
+    InvalidTakerPayment(String),
+    UnableToExtractSecret(String),
+    MakerPaymentSpendFailed(String),
+    MakerPaymentCouldNotBeFound(String),
+    TakerPaymentRefundFailed(String),
+}
+
+impl Stopped {
+    fn from_reason(stop_reason: StopReason) -> Stopped {
+        Stopped {
+            _stop_reason: stop_reason,
+        }
+    }
+}
+
+impl TransitionFrom<ValidateTakerFee> for ValidateTakerPayment {}
+impl TransitionFrom<ValidateTakerPayment> for WaitForTakerPaymentSpend {}
+impl TransitionFrom<WaitForTakerPaymentSpend> for SpendMakerPayment {}
+impl TransitionFrom<WaitForTakerPaymentSpend> for RefundTakerPayment {}
+impl TransitionFrom<ValidatePublicKeys> for Stopped {}
+impl TransitionFrom<ValidateTakerFee> for Stopped {}
+impl TransitionFrom<ValidateTakerPayment> for Stopped {}
+impl TransitionFrom<WaitForTakerPaymentSpend> for Stopped {}
+impl TransitionFrom<RefundTakerPayment> for Stopped {}
+impl TransitionFrom<SpendMakerPayment> for Stopped {}
+
+#[async_trait]
+impl State for ValidateTakerFee {
+    type Ctx = WatcherContext;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, watcher_ctx: &mut WatcherContext) -> StateResult<Self::Ctx, Self::Result> {
+        let validated_f = watcher_ctx
+            .taker_coin
+            .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+                taker_fee_hash: watcher_ctx.data.taker_fee_hash.clone(),
+                sender_pubkey: watcher_ctx.verified_pub.clone(),
+                min_block_number: watcher_ctx.data.taker_coin_start_block,
+                fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.clone(),
+                lock_duration: watcher_ctx.data.lock_duration,
+            })
+            .compat();
+
+        if let Err(err) = validated_f.await {
+            return Self::change_state(Stopped::from_reason(StopReason::Error(
+                WatcherError::InvalidTakerFee(format!("{:?}", err)).into(),
+            )));
+        };
+
+        Self::change_state(ValidateTakerPayment {})
+    }
+}
+
+#[async_trait]
+impl State for ValidateTakerPayment {
+    type Ctx = WatcherContext;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, watcher_ctx: &mut WatcherContext) -> StateResult<Self::Ctx, Self::Result> {
+        let taker_payment_spend_deadline =
+            taker_payment_spend_deadline(watcher_ctx.data.swap_started_at, watcher_ctx.data.lock_duration);
+
+        let sleep_duration = watcher_ctx.conf.wait_taker_payment;
+        Timer::sleep(sleep_duration).await;
+
+        let taker_payment_hex_fut = watcher_ctx
+            .taker_coin
+            .get_tx_hex_by_hash(watcher_ctx.data.taker_payment_hash.clone());
+
+        let taker_payment_hex = match taker_payment_hex_fut.compat().await {
+            Ok(tx_res) => tx_res.tx_hex.into_vec(),
+            Err(err) => {
+                return Self::change_state(Stopped::from_reason(StopReason::Error(
+                    WatcherError::InvalidTakerPayment(err.to_string()).into(),
+                )));
+            },
+        };
+
+        let confirmations = min(watcher_ctx.data.taker_payment_confirmations, TAKER_SWAP_CONFIRMATIONS);
+
+        let wait_fut = watcher_ctx
+            .taker_coin
+            .wait_for_confirmations(
+                &taker_payment_hex,
+                confirmations,
+                watcher_ctx.data.taker_payment_requires_nota.unwrap_or(false),
+                taker_payment_spend_deadline,
+                WAIT_CONFIRM_INTERVAL,
+            )
+            .compat();
+        if let Err(err) = wait_fut.await {
+            return Self::change_state(Stopped::from_reason(StopReason::Error(
+                WatcherError::TakerPaymentNotConfirmed(err).into(),
+            )));
+        }
+
+        let validate_input = WatcherValidatePaymentInput {
+            payment_tx: taker_payment_hex.clone(),
+            taker_payment_refund_preimage: watcher_ctx.data.taker_payment_refund_preimage.clone(),
+            time_lock: match std::env::var("REFUND_TEST") {
+                Ok(_) => watcher_ctx.data.swap_started_at as u32,
+                Err(_) => watcher_ctx.taker_locktime() as u32,
+            },
+            taker_pub: watcher_ctx.verified_pub.clone(),
+            maker_pub: watcher_ctx.data.maker_pub.clone(),
+            secret_hash: watcher_ctx.data.secret_hash.clone(),
+            try_spv_proof_until: taker_payment_spend_deadline,
+            confirmations,
+        };
+
+        let validated_f = watcher_ctx
+            .taker_coin
+            .watcher_validate_taker_payment(validate_input)
+            .compat();
+
+        if let Err(err) = validated_f.await {
+            return Self::change_state(Stopped::from_reason(StopReason::Error(
+                WatcherError::InvalidTakerPayment(err.to_string()).into(),
+            )));
+        }
+
+        Self::change_state(WaitForTakerPaymentSpend { taker_payment_hex })
+    }
+}
+
+#[async_trait]
+impl State for WaitForTakerPaymentSpend {
+    type Ctx = WatcherContext;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, watcher_ctx: &mut WatcherContext) -> StateResult<Self::Ctx, Self::Result> {
+        let payment_search_interval = watcher_ctx.conf.search_interval;
+        let wait_until = watcher_ctx.refund_start_time();
+        let search_input = WatcherSearchForSwapTxSpendInput {
+            time_lock: watcher_ctx.taker_locktime() as u32,
+            taker_pub: &watcher_ctx.verified_pub,
+            maker_pub: &watcher_ctx.data.maker_pub,
+            secret_hash: &watcher_ctx.data.secret_hash,
+            tx: &self.taker_payment_hex,
+            search_from_block: watcher_ctx.data.taker_coin_start_block,
+        };
+
+        loop {
+            if now_ms() / 1000 > wait_until {
+                info!(
+                    "Waited too long until {} for transaction {:?} to be spent",
+                    wait_until, self.taker_payment_hex
+                );
+                return Self::change_state(RefundTakerPayment {});
+            }
+
+            let f = watcher_ctx
+                .taker_coin
+                .watcher_search_for_swap_tx_spend(search_input.clone())
+                .await;
+
+            let tx = match f {
+                Ok(Some(FoundSwapTxSpend::Spent(tx))) => tx,
+                Ok(Some(FoundSwapTxSpend::Refunded(_))) => {
+                    return Self::change_state(Stopped::from_reason(StopReason::Finished(
+                        WatcherSuccess::TakerPaymentRefundedByTaker,
+                    )))
+                },
+                Ok(None) => {
+                    debug!(
+                        "Spend or refund for taker payment tx {:?} was not found",
+                        &self.taker_payment_hex
+                    );
+                    Timer::sleep(payment_search_interval).await;
+                    continue;
+                },
+                Err(err) => {
+                    error!("{}", err);
+                    Timer::sleep(payment_search_interval).await;
+                    continue;
+                },
+            };
+
+            let now = now_ms() / 1000;
+            if now < watcher_ctx.taker_locktime() {
+                let wait_until = watcher_ctx.wait_for_maker_payment_spend_deadline();
+                let maker_payment_hex_fut = watcher_ctx
+                    .maker_coin
+                    .get_tx_hex_by_hash(watcher_ctx.data.maker_payment_hash.clone());
+                let maker_payment_hex = match maker_payment_hex_fut.compat().await {
+                    Ok(tx_res) => tx_res.tx_hex.into_vec(),
+                    Err(err) => {
+                        return Self::change_state(Stopped::from_reason(StopReason::Error(
+                            WatcherError::MakerPaymentCouldNotBeFound(err.to_string()).into(),
+                        )))
+                    },
+                };
+
+                let f = watcher_ctx.maker_coin.wait_for_htlc_tx_spend(
+                    &maker_payment_hex,
+                    &watcher_ctx.data.secret_hash,
+                    wait_until,
+                    watcher_ctx.data.maker_coin_start_block,
+                    &None,
+                    payment_search_interval,
+                );
+
+                if f.compat().await.is_ok() {
+                    info!("{}", MAKER_PAYMENT_SPEND_FOUND_LOG);
+                    return Self::change_state(Stopped::from_reason(StopReason::Finished(
+                        WatcherSuccess::MakerPaymentSpentByTaker,
+                    )));
+                }
+            }
+
+            let tx_hex = tx.tx_hex();
+            let secret = match watcher_ctx
+                .taker_coin
+                .extract_secret(&watcher_ctx.data.secret_hash, &tx_hex)
+                .await
+            {
+                Ok(bytes) => H256Json::from(bytes.as_slice()),
+                Err(err) => {
+                    return Self::change_state(Stopped::from_reason(StopReason::Error(
+                        WatcherError::UnableToExtractSecret(err).into(),
+                    )))
+                },
+            };
+            return Self::change_state(SpendMakerPayment::new(secret));
+        }
+    }
+}
+
+#[async_trait]
+impl State for SpendMakerPayment {
+    type Ctx = WatcherContext;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, watcher_ctx: &mut WatcherContext) -> StateResult<Self::Ctx, Self::Result> {
+        let spend_fut = watcher_ctx
+            .maker_coin
+            .send_maker_payment_spend_preimage(SendMakerPaymentSpendPreimageInput {
+                preimage: &watcher_ctx.data.maker_payment_spend_preimage,
+                secret: &self.secret.0,
+                secret_hash: &watcher_ctx.data.secret_hash,
+                taker_pub: &watcher_ctx.verified_pub,
+            });
+
+        let transaction = match spend_fut.compat().await {
+            Ok(t) => t,
+            Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &watcher_ctx.ctx,
+                        tx_helper_topic(watcher_ctx.maker_coin.ticker()),
+                        &tx,
+                        &None,
+                    );
+                };
+                return Self::change_state(Stopped::from_reason(StopReason::Error(
+                    WatcherError::MakerPaymentSpendFailed(err.get_plain_text_format()).into(),
+                )));
+            },
+        };
+
+        broadcast_p2p_tx_msg(
+            &watcher_ctx.ctx,
+            tx_helper_topic(watcher_ctx.maker_coin.ticker()),
+            &transaction,
+            &None,
+        );
+
+        let tx_hash = transaction.tx_hash();
+        info!(
+            "{}: Maker payment spend tx {:02x} sent by watcher",
+            MAKER_PAYMENT_SPEND_SENT_LOG, tx_hash
+        );
+
+        Self::change_state(Stopped::from_reason(StopReason::Finished(
+            WatcherSuccess::MakerPaymentSpent,
+        )))
+    }
+}
+
+#[async_trait]
+impl State for RefundTakerPayment {
+    type Ctx = WatcherContext;
+    type Result = ();
+
+    async fn on_changed(self: Box<Self>, watcher_ctx: &mut WatcherContext) -> StateResult<Self::Ctx, Self::Result> {
+        if std::env::var("REFUND_TEST").is_err() {
+            loop {
+                match watcher_ctx
+                    .taker_coin
+                    .can_refund_htlc(watcher_ctx.taker_locktime())
+                    .compat()
+                    .await
+                {
+                    Ok(CanRefundHtlc::CanRefundNow) => break,
+                    Ok(CanRefundHtlc::HaveToWait(to_sleep)) => Timer::sleep(to_sleep as f64).await,
+                    Err(e) => {
+                        error!("Error {} on can_refund_htlc, retrying in 30 seconds", e);
+                        Timer::sleep(30.).await;
+                    },
+                }
+            }
+        }
+
+        let refund_fut = watcher_ctx
+            .taker_coin
+            .send_taker_payment_refund_preimage(SendWatcherRefundsPaymentArgs {
+                payment_tx: &watcher_ctx.data.taker_payment_refund_preimage,
+                swap_contract_address: &None,
+                secret_hash: &watcher_ctx.data.secret_hash,
+                other_pubkey: &watcher_ctx.verified_pub,
+                time_lock: watcher_ctx.taker_locktime() as u32,
+                swap_unique_data: &[],
+            });
+        let transaction = match refund_fut.compat().await {
+            Ok(t) => t,
+            Err(err) => {
+                if let Some(tx) = err.get_tx() {
+                    broadcast_p2p_tx_msg(
+                        &watcher_ctx.ctx,
+                        tx_helper_topic(watcher_ctx.taker_coin.ticker()),
+                        &tx,
+                        &None,
+                    );
+                }
+
+                return Self::change_state(Stopped::from_reason(StopReason::Error(
+                    WatcherError::TakerPaymentRefundFailed(err.get_plain_text_format()).into(),
+                )));
+            },
+        };
+
+        broadcast_p2p_tx_msg(
+            &watcher_ctx.ctx,
+            tx_helper_topic(watcher_ctx.taker_coin.ticker()),
+            &transaction,
+            &None,
+        );
+
+        let tx_hash = transaction.tx_hash();
+        info!(
+            "{}: Taker payment refund tx {:02x} sent by watcher",
+            TAKER_PAYMENT_REFUND_SENT_LOG, tx_hash
+        );
+        Self::change_state(Stopped::from_reason(StopReason::Finished(
+            WatcherSuccess::TakerPaymentRefunded,
+        )))
+    }
+}
+
+#[async_trait]
+impl LastState for Stopped {
+    type Ctx = WatcherContext;
+    type Result = ();
+    async fn on_changed(self: Box<Self>, _watcher_ctx: &mut Self::Ctx) -> Self::Result {}
+}
+
+pub async fn process_watcher_msg(ctx: MmArc, msg: &[u8]) {
+    let msg = match decode_signed::<SwapWatcherMsg>(msg) {
+        Ok(m) => m,
+        Err(watcher_msg_err) => {
+            error!("Couldn't deserialize 'SwapWatcherMsg': {:?}", watcher_msg_err);
+            // Drop it to avoid dead_code warning
+            drop(watcher_msg_err);
+            return;
+        },
+    };
+
+    let watcher_data = msg.0;
+    let verified_pubkey = msg.2;
+    match watcher_data {
+        SwapWatcherMsg::TakerSwapWatcherMsg(watcher_data) => {
+            spawn_taker_swap_watcher(ctx, watcher_data, verified_pubkey.to_bytes())
+        },
+    }
+}
+
+/// Currently, Taker Swap Watcher is supported only.
+enum WatcherType {
+    Taker,
+}
+
+/// The `SwapWatcherLock` is used to lock the given taker fee hash as the running Swap Watcher,
+/// (i.e. insert the fee hash into either [`SwapsContext::taker_swap_watchers`] or [`SwapsContext::maker_swap_watchers`]),
+/// and to unlock it (i.e remove the hash from corresponding watcher collection) once `SwapWatcherLock` is dropped.
+struct SwapWatcherLock {
+    swap_ctx: Arc<SwapsContext>,
+    fee_hash: Vec<u8>,
+    watcher_type: WatcherType,
+}
+
+impl SwapWatcherLock {
+    /// Locks the given taker fee hash as the running Swap Watcher,
+    /// so inserts the hash into the [`SwapsContext::taker_swap_watchers`] collection.
+    ///
+    /// Returns `None` if there is an ongoing Taker Swap Watcher already.
+    fn lock_taker(swap_ctx: Arc<SwapsContext>, fee_hash: Vec<u8>) -> Option<Self> {
+        {
+            let mut guard = swap_ctx.taker_swap_watchers.lock();
+            if !guard.insert(fee_hash.clone()) {
+                // There is the same hash already.
+                return None;
+            }
+        }
+
+        Some(SwapWatcherLock {
+            swap_ctx,
+            fee_hash,
+            watcher_type: WatcherType::Taker,
+        })
+    }
+}
+
+impl Drop for SwapWatcherLock {
+    fn drop(&mut self) {
+        match self.watcher_type {
+            WatcherType::Taker => self.swap_ctx.taker_swap_watchers.lock().remove(self.fee_hash.clone()),
+        };
+    }
+}
+
+fn spawn_taker_swap_watcher(ctx: MmArc, watcher_data: TakerSwapWatcherData, verified_pub: Vec<u8>) {
+    let swap_ctx = SwapsContext::from_ctx(&ctx).unwrap();
+    if swap_ctx.swap_msgs.lock().unwrap().contains_key(&watcher_data.uuid) {
+        return;
+    }
+    let taker_watcher_lock = match SwapWatcherLock::lock_taker(swap_ctx, watcher_data.taker_fee_hash.clone()) {
+        Some(lock) => lock,
+        // There is an ongoing Taker Swap Watcher already.
+        None => return,
+    };
+
+    let spawner = ctx.spawner();
+    let fee_hash = H256Json::from(watcher_data.taker_fee_hash.as_slice());
+
+    let fut = async move {
+        let taker_coin = match lp_coinfind(&ctx, &watcher_data.taker_coin).await {
+            Ok(Some(c)) => c,
+            Ok(None) => {
+                error!("Coin {} is not found/enabled", watcher_data.taker_coin);
+                return;
+            },
+            Err(e) => {
+                error!("!lp_coinfind({}): {}", watcher_data.taker_coin, e);
+                return;
+            },
+        };
+
+        let maker_coin = match lp_coinfind(&ctx, &watcher_data.maker_coin).await {
+            Ok(Some(c)) => c,
+            Ok(None) => {
+                error!("Coin {} is not found/enabled", watcher_data.maker_coin);
+                return;
+            },
+            Err(e) => {
+                error!("!lp_coinfind({}): {}", watcher_data.maker_coin, e);
+                return;
+            },
+        };
+
+        log_tag!(
+            ctx,
+            "";
+            fmt = "Entering the taker swap watcher loop {}/{} with taker fee hash: {}",
+            maker_coin.ticker(),
+            taker_coin.ticker(),
+            fee_hash
+        );
+
+        let conf = json::from_value::<WatcherConf>(ctx.conf["watcher_conf"].clone()).unwrap_or_default();
+        let watcher_ctx = WatcherContext {
+            ctx,
+            maker_coin,
+            taker_coin,
+            verified_pub,
+            data: watcher_data,
+            conf,
+        };
+        let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(watcher_ctx);
+        state_machine.run(ValidateTakerFee {}).await;
+
+        // This allows to move the `taker_watcher_lock` value into this async block to keep it alive
+        // until the Swap Watcher finishes.
+        drop(taker_watcher_lock);
+    };
+
+    let settings = AbortSettings::info_on_abort(format!("taker swap watcher {fee_hash} stopped!"));
+    // Please note that `taker_watcher_lock` will be dropped once `MmCtx` is stopped
+    // since this `fut` will be aborted.
+    spawner.spawn_with_settings(fut, settings);
+}
+
+pub fn watcher_topic(ticker: &str) -> String { pub_sub_topic(WATCHER_PREFIX, ticker) }
diff --git a/mm2src/mm2_main/src/lp_swap/taker_swap.rs b/mm2src/mm2_main/src/lp_swap/taker_swap.rs
index b349cc88d1..f87cfb1b5e 100644
--- a/mm2src/mm2_main/src/lp_swap/taker_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap/taker_swap.rs
@@ -2,24 +2,28 @@ use super::check_balance::{check_my_coin_balance_for_swap, CheckBalanceError, Ch
                            TakerFeeAdditionalInfo};
 use super::pubkey_banning::ban_pubkey_on_failed_swap;
 use super::swap_lock::{SwapLock, SwapLockOps};
+use super::swap_watcher::{watcher_topic, SwapWatcherMsg};
 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, 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 super::{broadcast_my_swap_status, broadcast_swap_message, 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, recv_swap_msg, swap_topic, wait_for_maker_payment_conf_until, AtomicSwap, LockedAmount,
+            MySwapInfo, NegotiationDataMsg, NegotiationDataV2, NegotiationDataV3, RecoveredSwap, RecoveredSwapAction,
+            SavedSwap, SavedSwapIo, SavedTradeFee, SwapConfirmationsSettings, SwapError, SwapMsg, SwapTxDataMsg,
+            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 coins::{lp_coinfind, CanRefundHtlc, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum, SearchForSwapTxSpendInput,
-            TradeFee, TradePreimageValue, ValidatePaymentInput};
+use crate::mm2::lp_swap::{broadcast_p2p_tx_msg, tx_helper_topic, wait_for_maker_payment_conf_duration,
+                          TakerSwapWatcherData};
+use coins::{lp_coinfind, CanRefundHtlc, CheckIfMyPaymentSentArgs, FeeApproxStage, FoundSwapTxSpend, MmCoinEnum,
+            PaymentInstructions, PaymentInstructionsErr, SearchForSwapTxSpendInput, SendSpendPaymentArgs,
+            SendTakerPaymentArgs, SendTakerRefundsPaymentArgs, SendTakerSpendsMakerPaymentArgs, TradeFee,
+            TradePreimageValue, ValidatePaymentInput};
 use common::executor::Timer;
 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 crypto::{privkey::SerializableSecp256k1Keypair, CryptoCtx};
+use futures::{compat::Future01CompatExt, future::try_join, select, FutureExt};
 use http::Response;
 use keys::KeyPair;
 use mm2_core::mm_ctx::MmArc;
@@ -29,25 +33,44 @@ use parking_lot::Mutex as PaMutex;
 use primitives::hash::H264;
 use rpc::v1::types::{Bytes as BytesJson, H256 as H256Json, H264 as H264Json};
 use serde_json::{self as json, Value as Json};
+use std::convert::TryFrom;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
 use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use uuid::Uuid;
 
-pub const TAKER_SUCCESS_EVENTS: [&str; 10] = [
+const TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 10.;
+
+pub const TAKER_SUCCESS_EVENTS: [&str; 11] = [
+    "Started",
+    "Negotiated",
+    "TakerFeeSent",
+    "TakerPaymentInstructionsReceived",
+    "MakerPaymentReceived",
+    "MakerPaymentWaitConfirmStarted",
+    "MakerPaymentValidatedAndConfirmed",
+    "TakerPaymentSent",
+    "TakerPaymentSpent",
+    "MakerPaymentSpent",
+    "Finished",
+];
+
+pub const TAKER_USING_WATCHERS_SUCCESS_EVENTS: [&str; 12] = [
     "Started",
     "Negotiated",
     "TakerFeeSent",
+    "TakerPaymentInstructionsReceived",
     "MakerPaymentReceived",
     "MakerPaymentWaitConfirmStarted",
     "MakerPaymentValidatedAndConfirmed",
     "TakerPaymentSent",
+    "WatcherMessageSent",
     "TakerPaymentSpent",
     "MakerPaymentSpent",
     "Finished",
 ];
 
-pub const TAKER_ERROR_EVENTS: [&str; 13] = [
+pub const TAKER_ERROR_EVENTS: [&str; 15] = [
     "StartFailed",
     "NegotiateFailed",
     "TakerFeeSendFailed",
@@ -59,12 +82,18 @@ pub const TAKER_ERROR_EVENTS: [&str; 13] = [
     "TakerPaymentWaitForSpendFailed",
     "MakerPaymentSpendFailed",
     "TakerPaymentWaitRefundStarted",
+    "TakerPaymentRefundStarted",
     "TakerPaymentRefunded",
     "TakerPaymentRefundFailed",
+    "TakerPaymentRefundFinished",
 ];
 
+pub const WATCHER_MESSAGE_SENT_LOG: &str = "Watcher message sent...";
+
+#[cfg(not(target_arch = "wasm32"))]
 pub fn stats_taker_swap_dir(ctx: &MmArc) -> PathBuf { ctx.dbdir().join("SWAPS").join("STATS").join("TAKER") }
 
+#[cfg(not(target_arch = "wasm32"))]
 pub fn stats_taker_swap_file_path(ctx: &MmArc, uuid: &Uuid) -> PathBuf {
     stats_taker_swap_dir(ctx).join(format!("{}.json", uuid))
 }
@@ -82,9 +111,15 @@ async fn save_my_taker_swap_event(ctx: &MmArc, swap: &TakerSwap, event: TakerSav
             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()),
+            mm_version: Some(ctx.mm_version.to_owned()),
             events: vec![],
-            success_events: TAKER_SUCCESS_EVENTS.iter().map(|event| event.to_string()).collect(),
+            success_events: match ctx.use_watchers() {
+                true => TAKER_USING_WATCHERS_SUCCESS_EVENTS
+                    .iter()
+                    .map(|event| event.to_string())
+                    .collect(),
+                false => 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),
@@ -119,22 +154,28 @@ impl TakerSavedEvent {
             TakerSwapEvent::NegotiateFailed(_) => Some(TakerSwapCommand::Finish),
             TakerSwapEvent::TakerFeeSent(_) => Some(TakerSwapCommand::WaitForMakerPayment),
             TakerSwapEvent::TakerFeeSendFailed(_) => Some(TakerSwapCommand::Finish),
+            TakerSwapEvent::TakerPaymentInstructionsReceived(_) => Some(TakerSwapCommand::ValidateMakerPayment),
             TakerSwapEvent::MakerPaymentReceived(_) => Some(TakerSwapCommand::ValidateMakerPayment),
             TakerSwapEvent::MakerPaymentWaitConfirmStarted => Some(TakerSwapCommand::ValidateMakerPayment),
             TakerSwapEvent::MakerPaymentValidatedAndConfirmed => Some(TakerSwapCommand::SendTakerPayment),
             TakerSwapEvent::MakerPaymentValidateFailed(_) => Some(TakerSwapCommand::Finish),
             TakerSwapEvent::MakerPaymentWaitConfirmFailed(_) => Some(TakerSwapCommand::Finish),
             TakerSwapEvent::TakerPaymentSent(_) => Some(TakerSwapCommand::WaitForTakerPaymentSpend),
+            TakerSwapEvent::WatcherMessageSent(_, _) => Some(TakerSwapCommand::WaitForTakerPaymentSpend),
             TakerSwapEvent::TakerPaymentTransactionFailed(_) => Some(TakerSwapCommand::Finish),
-            TakerSwapEvent::TakerPaymentDataSendFailed(_) => Some(TakerSwapCommand::RefundTakerPayment),
+            TakerSwapEvent::TakerPaymentDataSendFailed(_) => Some(TakerSwapCommand::PrepareForTakerPaymentRefund),
             TakerSwapEvent::TakerPaymentSpent(_) => Some(TakerSwapCommand::SpendMakerPayment),
-            TakerSwapEvent::TakerPaymentWaitForSpendFailed(_) => Some(TakerSwapCommand::RefundTakerPayment),
-            TakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => Some(TakerSwapCommand::RefundTakerPayment),
+            TakerSwapEvent::TakerPaymentWaitForSpendFailed(_) => Some(TakerSwapCommand::PrepareForTakerPaymentRefund),
+            TakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => Some(TakerSwapCommand::PrepareForTakerPaymentRefund),
             TakerSwapEvent::MakerPaymentSpent(_) => Some(TakerSwapCommand::Finish),
-            TakerSwapEvent::MakerPaymentSpendFailed(_) => Some(TakerSwapCommand::RefundTakerPayment),
-            TakerSwapEvent::TakerPaymentWaitRefundStarted { .. } => Some(TakerSwapCommand::RefundTakerPayment),
-            TakerSwapEvent::TakerPaymentRefunded(_) => Some(TakerSwapCommand::Finish),
+            TakerSwapEvent::MakerPaymentSpendFailed(_) => Some(TakerSwapCommand::PrepareForTakerPaymentRefund),
+            TakerSwapEvent::TakerPaymentWaitRefundStarted { .. } => {
+                Some(TakerSwapCommand::PrepareForTakerPaymentRefund)
+            },
+            TakerSwapEvent::TakerPaymentRefundStarted => Some(TakerSwapCommand::RefundTakerPayment),
+            TakerSwapEvent::TakerPaymentRefunded(_) => Some(TakerSwapCommand::FinalizeTakerPaymentRefund),
             TakerSwapEvent::TakerPaymentRefundFailed(_) => Some(TakerSwapCommand::Finish),
+            TakerSwapEvent::TakerPaymentRefundFinished => Some(TakerSwapCommand::Finish),
             TakerSwapEvent::Finished => None,
         }
     }
@@ -359,8 +400,6 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
     let swap_ctx = SwapsContext::from_ctx(&ctx).unwrap();
     swap_ctx.init_msg_store(running_swap.uuid, running_swap.maker);
     swap_ctx.running_swaps.lock().unwrap().push(weak_ref);
-    let shutdown_rx = swap_ctx.shutdown_rx.clone();
-    let swap_for_log = running_swap.clone();
 
     let mut swap_fut = Box::pin(
         async move {
@@ -385,6 +424,12 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
                             event.clone().into(),
                         )
                     }
+
+                    #[cfg(target_arch = "wasm32")]
+                    if event.is_error() {
+                        error!("[swap uuid={uuid}] {event:?}");
+                    }
+
                     status.status(&[&"swap", &("uuid", uuid.as_str())], &event.status_str());
                     running_swap.apply_event(event);
                 }
@@ -405,11 +450,8 @@ pub async fn run_taker_swap(swap: RunTakerSwapInput, ctx: MmArc) {
         }
         .fuse(),
     );
-    let mut shutdown_fut = Box::pin(shutdown_rx.recv().fuse());
-    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 => info!("swap {} stopped!", swap_for_log.uuid),
+        _swap = swap_fut => (), // swap finished normally
         _touch = touch_loop => unreachable!("Touch loop can not stop!"),
     };
 }
@@ -464,9 +506,32 @@ pub struct TakerSwapMut {
     taker_payment: Option<TransactionIdentifier>,
     maker_payment_spend: Option<TransactionIdentifier>,
     taker_payment_spend: Option<TransactionIdentifier>,
+    maker_payment_spend_preimage: Option<Vec<u8>>,
+    taker_payment_refund_preimage: Option<Vec<u8>>,
     taker_payment_refund: Option<TransactionIdentifier>,
     secret_hash: BytesJson,
     secret: H256Json,
+    payment_instructions: Option<PaymentInstructions>,
+}
+
+#[cfg(test)]
+#[derive(Eq, PartialEq)]
+pub(super) enum FailAt {
+    TakerPayment,
+    MakerPaymentSpend,
+    TakerPaymentRefund,
+}
+
+#[cfg(test)]
+impl From<String> for FailAt {
+    fn from(str: String) -> Self {
+        match str.as_str() {
+            "taker_payment" => FailAt::TakerPayment,
+            "maker_payment_spend" => FailAt::MakerPaymentSpend,
+            "taker_payment_refund" => FailAt::TakerPaymentRefund,
+            _ => panic!("Invalid TAKER_FAIL_AT value"),
+        }
+    }
 }
 
 pub struct TakerSwap {
@@ -487,6 +552,8 @@ pub struct TakerSwap {
     conf_settings: SwapConfirmationsSettings,
     payment_locktime: u64,
     p2p_privkey: Option<KeyPair>,
+    #[cfg(test)]
+    pub(super) fail_at: Option<FailAt>,
 }
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
@@ -522,12 +589,14 @@ pub enum TakerSwapEvent {
     NegotiateFailed(SwapError),
     TakerFeeSent(TransactionIdentifier),
     TakerFeeSendFailed(SwapError),
+    TakerPaymentInstructionsReceived(Option<PaymentInstructions>),
     MakerPaymentReceived(TransactionIdentifier),
     MakerPaymentWaitConfirmStarted,
     MakerPaymentValidatedAndConfirmed,
     MakerPaymentValidateFailed(SwapError),
     MakerPaymentWaitConfirmFailed(SwapError),
     TakerPaymentSent(TransactionIdentifier),
+    WatcherMessageSent(Option<Vec<u8>>, Option<Vec<u8>>),
     TakerPaymentTransactionFailed(SwapError),
     TakerPaymentDataSendFailed(SwapError),
     TakerPaymentWaitConfirmFailed(SwapError),
@@ -536,8 +605,10 @@ pub enum TakerSwapEvent {
     MakerPaymentSpent(TransactionIdentifier),
     MakerPaymentSpendFailed(SwapError),
     TakerPaymentWaitRefundStarted { wait_until: u64 },
-    TakerPaymentRefunded(TransactionIdentifier),
+    TakerPaymentRefundStarted,
+    TakerPaymentRefunded(Option<TransactionIdentifier>),
     TakerPaymentRefundFailed(SwapError),
+    TakerPaymentRefundFinished,
     Finished,
 }
 
@@ -550,6 +621,7 @@ impl TakerSwapEvent {
             TakerSwapEvent::NegotiateFailed(_) => "Negotiate failed...".to_owned(),
             TakerSwapEvent::TakerFeeSent(_) => "Taker fee sent...".to_owned(),
             TakerSwapEvent::TakerFeeSendFailed(_) => "Taker fee send failed...".to_owned(),
+            TakerSwapEvent::TakerPaymentInstructionsReceived(_) => "Taker payment instructions received...".to_owned(),
             TakerSwapEvent::MakerPaymentReceived(_) => "Maker payment received...".to_owned(),
             TakerSwapEvent::MakerPaymentWaitConfirmStarted => "Maker payment wait confirm started...".to_owned(),
             TakerSwapEvent::MakerPaymentValidatedAndConfirmed => "Maker payment validated and confirmed...".to_owned(),
@@ -558,6 +630,7 @@ impl TakerSwapEvent {
                 "Maker payment wait for confirmation failed...".to_owned()
             },
             TakerSwapEvent::TakerPaymentSent(_) => "Taker payment sent...".to_owned(),
+            TakerSwapEvent::WatcherMessageSent(_, _) => WATCHER_MESSAGE_SENT_LOG.to_owned(),
             TakerSwapEvent::TakerPaymentTransactionFailed(_) => "Taker payment transaction failed...".to_owned(),
             TakerSwapEvent::TakerPaymentDataSendFailed(_) => "Taker payment data send failed...".to_owned(),
             TakerSwapEvent::TakerPaymentWaitConfirmFailed(_) => {
@@ -570,8 +643,10 @@ impl TakerSwapEvent {
             TakerSwapEvent::TakerPaymentWaitRefundStarted { wait_until } => {
                 format!("Taker payment wait refund till {} started...", wait_until)
             },
+            TakerSwapEvent::TakerPaymentRefundStarted => "Taker payment refund started...".to_owned(),
             TakerSwapEvent::TakerPaymentRefunded(_) => "Taker payment refunded...".to_owned(),
             TakerSwapEvent::TakerPaymentRefundFailed(_) => "Taker payment refund failed...".to_owned(),
+            TakerSwapEvent::TakerPaymentRefundFinished => "Taker payment refund finished...".to_owned(),
             TakerSwapEvent::Finished => "Finished".to_owned(),
         }
     }
@@ -589,8 +664,10 @@ impl TakerSwapEvent {
             TakerSwapEvent::Started(_)
                 | TakerSwapEvent::Negotiated(_)
                 | TakerSwapEvent::TakerFeeSent(_)
+                | TakerSwapEvent::TakerPaymentInstructionsReceived(_)
                 | TakerSwapEvent::MakerPaymentReceived(_)
                 | TakerSwapEvent::MakerPaymentWaitConfirmStarted
+                | TakerSwapEvent::WatcherMessageSent(_, _)
                 | TakerSwapEvent::MakerPaymentValidatedAndConfirmed
                 | TakerSwapEvent::TakerPaymentSent(_)
                 | TakerSwapEvent::TakerPaymentSpent(_)
@@ -612,7 +689,9 @@ pub enum TakerSwapCommand {
     SendTakerPayment,
     WaitForTakerPaymentSpend,
     SpendMakerPayment,
+    PrepareForTakerPaymentRefund,
     RefundTakerPayment,
+    FinalizeTakerPaymentRefund,
     Finish,
 }
 
@@ -646,6 +725,12 @@ impl TakerSwap {
         match event {
             TakerSwapEvent::Started(data) => {
                 self.w().data = data;
+                log_tag!(
+                    self.ctx,
+                    "";
+                    fmt = "Taker swap {} has successfully started",
+                    self.uuid
+                );
             },
             TakerSwapEvent::StartFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::Negotiated(data) => {
@@ -666,6 +751,9 @@ impl TakerSwap {
             TakerSwapEvent::NegotiateFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::TakerFeeSent(tx) => self.w().taker_fee = Some(tx),
             TakerSwapEvent::TakerFeeSendFailed(err) => self.errors.lock().push(err),
+            TakerSwapEvent::TakerPaymentInstructionsReceived(instructions) => {
+                self.w().payment_instructions = instructions
+            },
             TakerSwapEvent::MakerPaymentReceived(tx) => self.w().maker_payment = Some(tx),
             TakerSwapEvent::MakerPaymentWaitConfirmStarted => (),
             TakerSwapEvent::MakerPaymentValidatedAndConfirmed => {
@@ -674,6 +762,10 @@ impl TakerSwap {
             TakerSwapEvent::MakerPaymentValidateFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::MakerPaymentWaitConfirmFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::TakerPaymentSent(tx) => self.w().taker_payment = Some(tx),
+            TakerSwapEvent::WatcherMessageSent(maker_payment_spend_preimage, taker_payment_refund_preimage) => {
+                self.w().maker_payment_spend_preimage = maker_payment_spend_preimage;
+                self.w().taker_payment_refund_preimage = taker_payment_refund_preimage;
+            },
             TakerSwapEvent::TakerPaymentTransactionFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::TakerPaymentDataSendFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::TakerPaymentWaitConfirmFailed(err) => self.errors.lock().push(err),
@@ -685,8 +777,10 @@ impl TakerSwap {
             TakerSwapEvent::MakerPaymentSpent(tx) => self.w().maker_payment_spend = Some(tx),
             TakerSwapEvent::MakerPaymentSpendFailed(err) => self.errors.lock().push(err),
             TakerSwapEvent::TakerPaymentWaitRefundStarted { .. } => (),
-            TakerSwapEvent::TakerPaymentRefunded(tx) => self.w().taker_payment_refund = Some(tx),
+            TakerSwapEvent::TakerPaymentRefundStarted => (),
+            TakerSwapEvent::TakerPaymentRefunded(tx) => self.w().taker_payment_refund = tx,
             TakerSwapEvent::TakerPaymentRefundFailed(err) => self.errors.lock().push(err),
+            TakerSwapEvent::TakerPaymentRefundFinished => (),
             TakerSwapEvent::Finished => self.finished_at.store(now_ms() / 1000, Ordering::Relaxed),
         }
     }
@@ -704,7 +798,9 @@ impl TakerSwap {
             TakerSwapCommand::SendTakerPayment => self.send_taker_payment().await,
             TakerSwapCommand::WaitForTakerPaymentSpend => self.wait_for_taker_payment_spend().await,
             TakerSwapCommand::SpendMakerPayment => self.spend_maker_payment().await,
+            TakerSwapCommand::PrepareForTakerPaymentRefund => self.prepare_for_taker_payment_refund().await,
             TakerSwapCommand::RefundTakerPayment => self.refund_taker_payment().await,
+            TakerSwapCommand::FinalizeTakerPaymentRefund => self.finalize_taker_payment_refund().await,
             TakerSwapCommand::Finish => Ok((None, vec![TakerSwapEvent::Finished])),
         }
     }
@@ -748,12 +844,17 @@ impl TakerSwap {
                 maker_payment: None,
                 taker_payment: None,
                 taker_payment_spend: None,
+                maker_payment_spend_preimage: None,
+                taker_payment_refund_preimage: None,
                 maker_payment_spend: None,
                 taker_payment_refund: None,
                 secret_hash: BytesJson::default(),
                 secret: H256Json::default(),
+                payment_instructions: None,
             }),
             ctx,
+            #[cfg(test)]
+            fail_at: None,
         }
     }
 
@@ -764,28 +865,57 @@ impl TakerSwap {
         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 {
+
+        let equal = r.data.maker_coin_htlc_pubkey == r.data.taker_coin_htlc_pubkey;
+        let same_as_persistent = r.data.maker_coin_htlc_pubkey == Some(r.data.my_persistent_pub);
+
+        if equal && same_as_persistent {
+            NegotiationDataMsg::V2(NegotiationDataV2 {
                 started_at: r.data.started_at,
-                payment_locktime: r.data.taker_payment_lock,
                 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,
-                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 {
+            NegotiationDataMsg::V3(NegotiationDataV3 {
                 started_at: r.data.started_at,
-                secret_hash,
                 payment_locktime: r.data.taker_payment_lock,
-                persistent_pubkey: self.my_persistent_pub.to_vec(),
+                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(),
             })
         }
     }
 
+    /// # Panic
+    ///
+    /// Panic if taker_fee of [`TakerSwapMut`] is [`Option::None`].
+    async fn get_taker_fee_data(&self) -> Result<SwapTxDataMsg, MmError<PaymentInstructionsErr>> {
+        // If taker fee is a lightning payment the payment hash will be sent in the message
+        let taker_fee_data = self
+            .r()
+            .taker_fee
+            .as_ref()
+            .expect("TakerSwapMut::taker_fee must be some value to use get_taker_fee_data")
+            .tx_hex
+            .0
+            .clone();
+        let secret_hash = self.r().secret_hash.0.clone();
+        let maker_amount = self.maker_amount.clone().into();
+        let maker_lock_duration =
+            (self.r().data.lock_duration as f64 * self.taker_coin.maker_locktime_multiplier()).ceil() as u64;
+        let expires_in = wait_for_maker_payment_conf_duration(self.r().data.lock_duration);
+        let instructions = self
+            .maker_coin
+            .maker_payment_instructions(&secret_hash, &maker_amount, maker_lock_duration, expires_in)
+            .await?;
+        Ok(SwapTxDataMsg::new(taker_fee_data, instructions))
+    }
+
     async fn start(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
         // do not use self.r().data here as it is not initialized at this step yet
         let stage = FeeApproxStage::StartSwap;
@@ -812,7 +942,9 @@ impl TakerSwap {
                 )]))
             },
         };
-        let maker_payment_spend_trade_fee_fut = self.maker_coin.get_receiver_trade_fee(stage.clone());
+        let maker_payment_spend_trade_fee_fut = self
+            .maker_coin
+            .get_receiver_trade_fee(self.taker_amount.to_decimal(), stage.clone());
         let maker_payment_spend_trade_fee = match maker_payment_spend_trade_fee_fut.compat().await {
             Ok(fee) => fee,
             Err(e) => {
@@ -867,8 +999,8 @@ impl TakerSwap {
         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 maker_coin_htlc_pubkey = self.maker_coin.derive_htlc_pubkey(&unique_data);
+        let taker_coin_htlc_pubkey = self.taker_coin.derive_htlc_pubkey(&unique_data);
 
         let data = TakerSwapData {
             taker_coin: self.taker_coin.ticker().to_owned(),
@@ -885,7 +1017,7 @@ impl TakerSwap {
             taker_payment_lock: started_at + self.payment_locktime,
             my_persistent_pub: self.my_persistent_pub.into(),
             uuid: self.uuid,
-            maker_payment_wait: maker_payment_wait(started_at, self.payment_locktime),
+            maker_payment_wait: wait_for_maker_payment_conf_until(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)),
@@ -893,8 +1025,8 @@ 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()),
+            maker_coin_htlc_pubkey: Some(maker_coin_htlc_pubkey.as_slice().into()),
+            taker_coin_htlc_pubkey: Some(taker_coin_htlc_pubkey.as_slice().into()),
             p2p_privkey: self.p2p_privkey.map(SerializableSecp256k1Keypair::from),
         };
 
@@ -920,18 +1052,20 @@ 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();
+        let time_dif = self.r().data.started_at.abs_diff(maker_data.started_at());
         if time_dif > 60 {
             return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
-                ERRL!("Started_at time_dif over 60 {}", time_dif).into(),
+                ERRL!("The time difference between you and the maker cannot be longer than 60 seconds. Current difference: {}. Please make sure that your system clock is synced to the correct time before starting another swap!", time_dif).into(),
             )]));
         }
 
-        let expected_lock_time = maker_data.started_at() + self.r().data.lock_duration * 2;
-        if maker_data.payment_locktime() != expected_lock_time {
+        let customized_lock_duration =
+            (self.r().data.lock_duration as f64 * self.taker_coin.maker_locktime_multiplier()).ceil() as u64;
+        let expected_lock_time = maker_data.started_at().checked_add(customized_lock_duration);
+        if Some(maker_data.payment_locktime()) != expected_lock_time {
             return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
                 ERRL!(
-                    "maker_data.payment_locktime {} not equal to expected {}",
+                    "maker_data.payment_locktime {:?} not equal to expected {:?}",
                     maker_data.payment_locktime(),
                     expected_lock_time
                 )
@@ -944,10 +1078,14 @@ impl TakerSwap {
             .negotiate_swap_contract_addr(maker_data.maker_coin_swap_contract())
         {
             Ok(addr) => addr,
-            Err(e) => {
-                return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
-                    ERRL!("!maker_coin.negotiate_swap_contract_addr {}", e).into(),
-                )]))
+            Err(e) => match self.maker_coin.fallback_swap_contract() {
+                // try to negotiate using fallback
+                Some(addr) => Some(addr),
+                None => {
+                    return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
+                        ERRL!("!maker_coin.negotiate_swap_contract_addr {}", e).into(),
+                    )]))
+                },
             },
         };
 
@@ -956,13 +1094,37 @@ impl TakerSwap {
             .negotiate_swap_contract_addr(maker_data.taker_coin_swap_contract())
         {
             Ok(addr) => addr,
-            Err(e) => {
-                return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
-                    ERRL!("!taker_coin.negotiate_swap_contract_addr {}", e).into(),
-                )]))
+            Err(e) => match self.taker_coin.fallback_swap_contract() {
+                // try to negotiate using fallback
+                Some(addr) => Some(addr),
+                None => {
+                    return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
+                        ERRL!("!taker_coin.negotiate_swap_contract_addr {}", e).into(),
+                    )]))
+                },
             },
         };
 
+        // Validate maker_coin_htlc_pubkey realness
+        if let Err(err) = self.maker_coin.validate_other_pubkey(maker_data.maker_coin_htlc_pub()) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
+                ERRL!("!maker_data.maker_coin_htlc_pub {}", err).into(),
+            )]));
+        };
+
+        // Validate taker_coin_htlc_pubkey realness
+        if let Err(err) = self.taker_coin.validate_other_pubkey(maker_data.taker_coin_htlc_pub()) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
+                ERRL!("!maker_data.taker_coin_htlc_pub {}", err).into(),
+            )]));
+        };
+
+        if !(maker_data.secret_hash().len() == 20 || maker_data.secret_hash().len() == 32) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![TakerSwapEvent::NegotiateFailed(
+                ERRL!("!maker_data.secret_hash: secret_hash validation failed").into(),
+            )]));
+        }
+
         let maker_coin_swap_contract_bytes = maker_coin_swap_contract_addr
             .clone()
             .map_or_else(Vec::new, |bytes| bytes.0);
@@ -1049,7 +1211,7 @@ impl TakerSwap {
         let tx_hash = transaction.tx_hash();
         info!("Taker fee tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
@@ -1060,8 +1222,17 @@ impl TakerSwap {
 
     async fn wait_for_maker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
         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 payment_data_msg = match self.get_taker_fee_data().await {
+            Ok(data) => data,
+            Err(e) => {
+                return Ok((Some(TakerSwapCommand::Finish), vec![
+                    TakerSwapEvent::MakerPaymentValidateFailed(e.to_string().into()),
+                ]))
+            },
+        };
+
+        let msg = SwapMsg::TakerFee(payment_data_msg);
         let abort_send_handle = broadcast_swap_message_every(
             self.ctx.clone(),
             swap_topic(&self.uuid),
@@ -1087,12 +1258,31 @@ impl TakerSwap {
             },
         };
         drop(abort_send_handle);
-        let maker_payment = match self.maker_coin.tx_enum_from_bytes(&payload) {
+
+        let mut swap_events = vec![];
+        let instructions = match payload.instructions() {
+            Some(instructions) => match self.taker_coin.validate_taker_payment_instructions(
+                instructions,
+                &self.r().secret_hash.0,
+                self.taker_amount.clone().into(),
+            ) {
+                Ok(instructions) => Some(instructions),
+                Err(e) => {
+                    return Ok((Some(TakerSwapCommand::Finish), vec![
+                        TakerSwapEvent::MakerPaymentValidateFailed(e.to_string().into()),
+                    ]))
+                },
+            },
+            None => None,
+        };
+        swap_events.push(TakerSwapEvent::TakerPaymentInstructionsReceived(instructions));
+
+        let maker_payment = match self.maker_coin.tx_enum_from_bytes(payload.data()) {
             Ok(p) => p,
             Err(e) => {
                 return Ok((Some(TakerSwapCommand::Finish), vec![
                     TakerSwapEvent::MakerPaymentValidateFailed(
-                        ERRL!("Error parsing the 'maker-payment': {}", e).into(),
+                        ERRL!("Error parsing the 'maker-payment': {:?}", e).into(),
                     ),
                 ]))
             },
@@ -1101,14 +1291,14 @@ impl TakerSwap {
         let tx_hash = maker_payment.tx_hash();
         info!("Got maker payment {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: maker_payment.tx_hex().into(),
+            tx_hex: BytesJson::from(maker_payment.tx_hex()),
             tx_hash,
         };
 
-        Ok((Some(TakerSwapCommand::ValidateMakerPayment), vec![
-            TakerSwapEvent::MakerPaymentReceived(tx_ident),
-            TakerSwapEvent::MakerPaymentWaitConfirmStarted,
-        ]))
+        swap_events.push(TakerSwapEvent::MakerPaymentReceived(tx_ident));
+        swap_events.push(TakerSwapEvent::MakerPaymentWaitConfirmStarted);
+
+        Ok((Some(TakerSwapCommand::ValidateMakerPayment), swap_events))
     }
 
     async fn validate_maker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
@@ -1132,6 +1322,7 @@ impl TakerSwap {
 
         let validate_input = ValidatePaymentInput {
             payment_tx: self.r().maker_payment.clone().unwrap().tx_hex.0,
+            time_lock_duration: self.r().data.lock_duration,
             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(),
@@ -1154,8 +1345,41 @@ impl TakerSwap {
         ]))
     }
 
+    fn create_watcher_data(
+        &self,
+        taker_payment_hash: Vec<u8>,
+        maker_payment_spend_preimage: Vec<u8>,
+        taker_payment_refund_preimage: Vec<u8>,
+    ) -> TakerSwapWatcherData {
+        TakerSwapWatcherData {
+            uuid: self.uuid,
+            secret_hash: self.r().secret_hash.clone().into(),
+            maker_payment_spend_preimage,
+            taker_payment_refund_preimage,
+            swap_started_at: self.r().data.started_at,
+            lock_duration: self.r().data.lock_duration,
+            taker_coin: self.r().data.taker_coin.clone(),
+            taker_fee_hash: self.r().taker_fee.as_ref().unwrap().tx_hash.0.clone(),
+            taker_payment_hash,
+            taker_coin_start_block: self.r().data.taker_coin_start_block,
+            taker_payment_confirmations: self.r().data.taker_payment_confirmations,
+            taker_payment_requires_nota: self.r().data.taker_payment_requires_nota,
+            maker_coin: self.r().data.maker_coin.clone(),
+            maker_pub: self.r().other_maker_coin_htlc_pub.to_vec(),
+            maker_payment_hash: self.r().maker_payment.as_ref().unwrap().tx_hash.0.clone(),
+            maker_coin_start_block: self.r().data.maker_coin_start_block,
+        }
+    }
+
     async fn send_taker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
-        let timeout = self.r().data.started_at + self.r().data.lock_duration / 3;
+        #[cfg(test)]
+        if self.fail_at == Some(FailAt::TakerPayment) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![
+                TakerSwapEvent::TakerPaymentTransactionFailed("Explicit test failure".into()),
+            ]));
+        }
+
+        let timeout = self.r().data.maker_payment_wait;
         let now = now_ms() / 1000;
         if now > timeout {
             return Ok((Some(TakerSwapCommand::Finish), vec![
@@ -1164,26 +1388,34 @@ 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_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 f = self.taker_coin.check_if_my_payment_sent(CheckIfMyPaymentSentArgs {
+            time_lock: self.r().data.taker_payment_lock as u32,
+            other_pub: self.r().other_taker_coin_htlc_pub.as_slice(),
+            secret_hash: &self.r().secret_hash.0,
+            search_from_block: self.r().data.taker_coin_start_block,
+            swap_contract_address: &self.r().data.taker_coin_swap_contract_address,
+            swap_unique_data: &unique_data,
+            amount: &self.taker_amount.to_decimal(),
+            payment_instructions: &self.r().payment_instructions,
+        });
         let transaction = match f.compat().await {
             Ok(res) => match res {
                 Some(tx) => tx,
                 None => {
-                    let payment_fut = self.taker_coin.send_taker_payment(
-                        self.r().data.taker_payment_lock as u32,
-                        &*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,
-                    );
+                    let time_lock = match std::env::var("USE_TEST_LOCKTIME") {
+                        Ok(_) => self.r().data.started_at as u32,
+                        Err(_) => self.r().data.taker_payment_lock as u32,
+                    };
+                    let payment_fut = self.taker_coin.send_taker_payment(SendTakerPaymentArgs {
+                        time_lock_duration: self.r().data.lock_duration,
+                        time_lock,
+                        other_pubkey: &*self.r().other_taker_coin_htlc_pub,
+                        secret_hash: &self.r().secret_hash.0,
+                        amount: self.taker_amount.to_decimal(),
+                        swap_contract_address: &self.r().data.taker_coin_swap_contract_address,
+                        swap_unique_data: &unique_data,
+                        payment_instructions: &self.r().payment_instructions,
+                    });
 
                     match payment_fut.compat().await {
                         Ok(t) => t,
@@ -1205,37 +1437,129 @@ impl TakerSwap {
         };
 
         let tx_hash = transaction.tx_hash();
+        let tx_hex = BytesJson::from(transaction.tx_hex());
         info!("Taker payment tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: tx_hex.clone(),
             tx_hash,
         };
 
-        Ok((Some(TakerSwapCommand::WaitForTakerPaymentSpend), vec![
-            TakerSwapEvent::TakerPaymentSent(tx_ident),
-        ]))
+        let mut swap_events = vec![TakerSwapEvent::TakerPaymentSent(tx_ident)];
+        if self.ctx.use_watchers()
+            && self.taker_coin.is_supported_by_watchers()
+            && self.maker_coin.is_supported_by_watchers()
+        {
+            let maker_payment_spend_preimage_fut = self.taker_coin.create_maker_payment_spend_preimage(
+                &self.r().maker_payment.as_ref().unwrap().tx_hex,
+                self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                self.r().other_maker_coin_htlc_pub.as_slice(),
+                &self.r().secret_hash.0,
+                &self.unique_swap_data()[..],
+            );
+
+            let time_lock = match std::env::var("USE_TEST_LOCKTIME") {
+                Ok(_) => try_s!(u32::try_from(self.r().data.started_at)),
+                Err(_) => try_s!(u32::try_from(self.r().data.taker_payment_lock)),
+            };
+            let taker_payment_refund_preimage_fut = self.taker_coin.create_taker_payment_refund_preimage(
+                &transaction.tx_hex(),
+                time_lock,
+                &*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 payment_fut_pair = try_join(
+                maker_payment_spend_preimage_fut.compat(),
+                taker_payment_refund_preimage_fut.compat(),
+            );
+
+            match payment_fut_pair.await {
+                Ok((maker_payment_spend, taker_payment_refund)) => {
+                    let watcher_data = self.create_watcher_data(
+                        transaction.tx_hash().into_vec(),
+                        maker_payment_spend.tx_hex(),
+                        taker_payment_refund.tx_hex(),
+                    );
+                    let swpmsg_watcher = SwapWatcherMsg::TakerSwapWatcherMsg(watcher_data);
+
+                    let htlc_keypair = self.taker_coin.derive_htlc_key_pair(&self.unique_swap_data());
+                    broadcast_swap_message(
+                        &self.ctx,
+                        watcher_topic(&self.r().data.taker_coin),
+                        swpmsg_watcher,
+                        &Some(htlc_keypair),
+                    );
+
+                    swap_events.push(TakerSwapEvent::WatcherMessageSent(
+                        Some(maker_payment_spend.tx_hex()),
+                        Some(taker_payment_refund.tx_hex()),
+                    ));
+                },
+                Err(e) => error!(
+                    "The watcher message could not be sent, error creating at least one of the preimages: {}",
+                    e.get_plain_text_format()
+                ),
+            }
+        }
+
+        Ok((Some(TakerSwapCommand::WaitForTakerPaymentSpend), swap_events))
     }
 
     async fn wait_for_taker_payment_spend(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
+        const BROADCAST_SWAP_MESSAGE_INTERVAL: f64 = 600.;
+
         let tx_hex = self.r().taker_payment.as_ref().unwrap().tx_hex.0.clone();
+        let mut watcher_broadcast_abort_handle = None;
+        // Watchers cannot be used for lightning swaps for now
+        // Todo: Check if watchers can work in some cases with lightning and implement it if it's possible, this part will probably work if only the taker is lightning since the preimage is available
+        if self.ctx.use_watchers()
+            && self.taker_coin.is_supported_by_watchers()
+            && self.maker_coin.is_supported_by_watchers()
+        {
+            if let (Some(maker_payment_spend), Some(taker_payment_refund)) = (
+                self.r().maker_payment_spend_preimage.clone(),
+                self.r().taker_payment_refund_preimage.clone(),
+            ) {
+                let watcher_data = self.create_watcher_data(
+                    self.r().taker_payment.as_ref().unwrap().tx_hash.0.clone(),
+                    maker_payment_spend,
+                    taker_payment_refund,
+                );
+                let swpmsg_watcher = SwapWatcherMsg::TakerSwapWatcherMsg(watcher_data);
+                let htlc_keypair = self.taker_coin.derive_htlc_key_pair(&self.unique_swap_data());
+                watcher_broadcast_abort_handle = Some(broadcast_swap_message_every(
+                    self.ctx.clone(),
+                    watcher_topic(&self.r().data.taker_coin),
+                    swpmsg_watcher,
+                    BROADCAST_SWAP_MESSAGE_INTERVAL,
+                    Some(htlc_keypair),
+                ));
+            }
+        }
+
+        // Todo: taker_payment should be a message on lightning network not a swap message
         let msg = SwapMsg::TakerPayment(tx_hex);
-        let send_abort_handle =
-            broadcast_swap_message_every(self.ctx.clone(), swap_topic(&self.uuid), msg, 600., self.p2p_privkey);
+        let send_abort_handle = broadcast_swap_message_every(
+            self.ctx.clone(),
+            swap_topic(&self.uuid),
+            msg,
+            BROADCAST_SWAP_MESSAGE_INTERVAL,
+            self.p2p_privkey,
+        );
 
-        let wait_duration = (self.r().data.lock_duration * 4) / 5;
-        let wait_taker_payment = self.r().data.started_at + wait_duration;
         let wait_f = self
             .taker_coin
             .wait_for_confirmations(
                 &self.r().taker_payment.clone().unwrap().tx_hex,
                 self.r().data.taker_payment_confirmations,
                 self.r().data.taker_payment_requires_nota.unwrap_or(false),
-                wait_taker_payment,
+                self.r().data.taker_payment_lock,
                 WAIT_CONFIRM_INTERVAL,
             )
             .compat();
         if let Err(err) = wait_f.await {
-            return Ok((Some(TakerSwapCommand::RefundTakerPayment), vec![
+            return Ok((Some(TakerSwapCommand::PrepareForTakerPaymentRefund), vec![
                 TakerSwapEvent::TakerPaymentWaitConfirmFailed(
                     ERRL!("!taker_coin.wait_for_confirmations: {}", err).into(),
                 ),
@@ -1245,16 +1569,18 @@ impl TakerSwap {
             ]));
         }
 
-        let f = self.taker_coin.wait_for_tx_spend(
+        let f = self.taker_coin.wait_for_htlc_tx_spend(
             &self.r().taker_payment.clone().unwrap().tx_hex,
+            &self.r().secret_hash.0,
             self.r().data.taker_payment_lock,
             self.r().data.taker_coin_start_block,
             &self.r().data.taker_coin_swap_contract_address,
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
         );
         let tx = match f.compat().await {
             Ok(t) => t,
             Err(err) => {
-                return Ok((Some(TakerSwapCommand::RefundTakerPayment), vec![
+                return Ok((Some(TakerSwapCommand::PrepareForTakerPaymentRefund), vec![
                     TakerSwapEvent::TakerPaymentWaitForSpendFailed(err.get_plain_text_format().into()),
                     TakerSwapEvent::TakerPaymentWaitRefundStarted {
                         wait_until: self.wait_refund_until(),
@@ -1263,16 +1589,16 @@ impl TakerSwap {
             },
         };
         drop(send_abort_handle);
+        drop(watcher_broadcast_abort_handle);
         let tx_hash = tx.tx_hash();
         info!("Taker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: tx.tx_hex().into(),
+            tx_hex: BytesJson::from(tx.tx_hex()),
             tx_hash,
         };
-        let secret = match self
-            .taker_coin
-            .extract_secret(&self.r().secret_hash.0, &tx_ident.tx_hex.0)
-        {
+
+        let secret_hash = self.r().secret_hash.clone();
+        let secret = match self.taker_coin.extract_secret(&secret_hash.0, &tx_ident.tx_hex).await {
             Ok(bytes) => H256Json::from(bytes.as_slice()),
             Err(e) => {
                 return Ok((Some(TakerSwapCommand::Finish), vec![
@@ -1290,14 +1616,21 @@ impl TakerSwap {
     }
 
     async fn spend_maker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
-        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_maker_coin_htlc_pub,
-            &self.r().secret.0,
-            &self.r().data.maker_coin_swap_contract_address,
-            &self.unique_swap_data(),
-        );
+        #[cfg(test)]
+        if self.fail_at == Some(FailAt::MakerPaymentSpend) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![
+                TakerSwapEvent::MakerPaymentSpendFailed("Explicit test failure".into()),
+            ]));
+        }
+        let spend_fut = self.maker_coin.send_taker_spends_maker_payment(SendSpendPaymentArgs {
+            other_payment_tx: &self.r().maker_payment.clone().unwrap().tx_hex,
+            time_lock: self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+            other_pubkey: &*self.r().other_maker_coin_htlc_pub,
+            secret: &self.r().secret.0,
+            secret_hash: &self.r().secret_hash.0,
+            swap_contract_address: &self.r().data.maker_coin_swap_contract_address,
+            swap_unique_data: &self.unique_swap_data(),
+        });
         let transaction = match spend_fut.compat().await {
             Ok(t) => t,
             Err(err) => {
@@ -1326,7 +1659,7 @@ impl TakerSwap {
         let tx_hash = transaction.tx_hash();
         info!("Maker payment spend tx {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
@@ -1335,8 +1668,42 @@ impl TakerSwap {
         )]))
     }
 
+    async fn prepare_for_taker_payment_refund(
+        &self,
+    ) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
+        let maker_payment = self.r().maker_payment.clone().unwrap().tx_hex;
+        if let Err(e) = self.maker_coin.on_taker_payment_refund_start(&maker_payment).await {
+            error!("Error {} on calling on_taker_payment_refund_start!", e)
+        }
+
+        Ok((Some(TakerSwapCommand::RefundTakerPayment), vec![
+            TakerSwapEvent::TakerPaymentRefundStarted,
+        ]))
+    }
+
     async fn refund_taker_payment(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
+        #[cfg(test)]
+        if self.fail_at == Some(FailAt::TakerPaymentRefund) {
+            return Ok((Some(TakerSwapCommand::Finish), vec![
+                TakerSwapEvent::TakerPaymentRefundFailed("Explicit test failure".into()),
+            ]));
+        }
+
+        let taker_payment = self.r().taker_payment.clone().unwrap().tx_hex;
         let locktime = self.r().data.taker_payment_lock;
+        if self.taker_coin.is_auto_refundable() {
+            return match self.taker_coin.wait_for_htlc_refund(&taker_payment, locktime).await {
+                Ok(()) => Ok((Some(TakerSwapCommand::FinalizeTakerPaymentRefund), vec![
+                    TakerSwapEvent::TakerPaymentRefunded(None),
+                ])),
+                Err(err) => Ok((Some(TakerSwapCommand::Finish), vec![
+                    TakerSwapEvent::TakerPaymentRefundFailed(
+                        ERRL!("!taker_coin.wait_for_htlc_refund: {}", err.to_string()).into(),
+                    ),
+                ])),
+            };
+        }
+
         loop {
             match self.taker_coin.can_refund_htlc(locktime).compat().await {
                 Ok(CanRefundHtlc::CanRefundNow) => break,
@@ -1348,14 +1715,14 @@ 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_taker_coin_htlc_pub,
-            &self.r().secret_hash.0,
-            &self.r().data.taker_coin_swap_contract_address,
-            &self.unique_swap_data(),
-        );
+        let refund_fut = self.taker_coin.send_taker_refunds_payment(SendTakerRefundsPaymentArgs {
+            payment_tx: &taker_payment,
+            time_lock: locktime as u32,
+            other_pubkey: &*self.r().other_taker_coin_htlc_pub,
+            secret_hash: &self.r().secret_hash.0,
+            swap_contract_address: &self.r().data.taker_coin_swap_contract_address,
+            swap_unique_data: &self.unique_swap_data(),
+        });
 
         let transaction = match refund_fut.compat().await {
             Ok(t) => t,
@@ -1385,12 +1752,23 @@ impl TakerSwap {
         let tx_hash = transaction.tx_hash();
         info!("Taker refund tx hash {:02x}", tx_hash);
         let tx_ident = TransactionIdentifier {
-            tx_hex: transaction.tx_hex().into(),
+            tx_hex: BytesJson::from(transaction.tx_hex()),
             tx_hash,
         };
 
+        Ok((Some(TakerSwapCommand::FinalizeTakerPaymentRefund), vec![
+            TakerSwapEvent::TakerPaymentRefunded(Some(tx_ident)),
+        ]))
+    }
+
+    async fn finalize_taker_payment_refund(&self) -> Result<(Option<TakerSwapCommand>, Vec<TakerSwapEvent>), String> {
+        let maker_payment = self.r().maker_payment.clone().unwrap().tx_hex;
+        if let Err(e) = self.maker_coin.on_taker_payment_refund_success(&maker_payment).await {
+            error!("Error {} on calling on_taker_payment_refund_success!", e)
+        }
+
         Ok((Some(TakerSwapCommand::Finish), vec![
-            TakerSwapEvent::TakerPaymentRefunded(tx_ident),
+            TakerSwapEvent::TakerPaymentRefundFinished,
         ]))
     }
 
@@ -1435,9 +1813,11 @@ impl TakerSwap {
             data.taker_coin_swap_contract_address = taker_coin.swap_contract_address();
         }
 
+        let crypto_ctx = try_s!(CryptoCtx::from_ctx(&ctx));
+        let my_persistent_pub = H264::from(&**crypto_ctx.mm2_internal_key_pair().public());
+
         let mut maker = bits256::from([0; 32]);
         maker.bytes = data.maker.0;
-        let my_persistent_pub = H264::from(&**ctx.secp256k1_key_pair().public());
         let conf_settings = SwapConfirmationsSettings {
             maker_coin_confs: data.maker_payment_confirmations,
             maker_coin_nota: data
@@ -1536,19 +1916,23 @@ impl TakerSwap {
         }
 
         let maybe_taker_payment = self.r().taker_payment.clone();
+        let payment_instructions = self.r().payment_instructions.clone();
+
         let taker_payment = match maybe_taker_payment {
-            Some(tx) => tx.tx_hex.0.clone(),
+            Some(tx) => tx.tx_hex.0,
             None => {
                 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,
-                        )
+                        .check_if_my_payment_sent(CheckIfMyPaymentSentArgs {
+                            time_lock: taker_payment_lock as u32,
+                            other_pub: other_taker_coin_htlc_pub.as_slice(),
+                            secret_hash: &secret_hash,
+                            search_from_block: taker_coin_start_block,
+                            swap_contract_address: &taker_coin_swap_contract_address,
+                            swap_unique_data: &unique_data,
+                            amount: &self.taker_amount.to_decimal(),
+                            payment_instructions: &payment_instructions,
+                        })
                         .compat()
                         .await
                 );
@@ -1567,14 +1951,17 @@ impl TakerSwap {
             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 fut = self
+                .maker_coin
+                .send_taker_spends_maker_payment(SendTakerSpendsMakerPaymentArgs {
+                    other_payment_tx: &maker_payment,
+                    time_lock: self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                    other_pubkey: other_maker_coin_htlc_pub.as_slice(),
+                    secret: &secret,
+                    secret_hash: &secret_hash,
+                    swap_contract_address: &maker_coin_swap_contract_address,
+                    swap_unique_data: &unique_data,
+                });
 
             let transaction = match fut.compat().await {
                 Ok(t) => t,
@@ -1614,16 +2001,21 @@ impl TakerSwap {
             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 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 secret_hash = self.r().secret_hash.clone();
+                    let tx_hex = tx.tx_hex();
+                    let secret = try_s!(self.taker_coin.extract_secret(&secret_hash.0, &tx_hex).await);
+
+                    let fut = self
+                        .maker_coin
+                        .send_taker_spends_maker_payment(SendTakerSpendsMakerPaymentArgs {
+                            other_payment_tx: &maker_payment,
+                            time_lock: self.maker_payment_lock.load(Ordering::Relaxed) as u32,
+                            other_pubkey: other_maker_coin_htlc_pub.as_slice(),
+                            secret: &secret,
+                            secret_hash: &secret_hash,
+                            swap_contract_address: &maker_coin_swap_contract_address,
+                            swap_unique_data: &unique_data,
+                        });
 
                     let transaction = match fut.compat().await {
                         Ok(t) => t,
@@ -1653,21 +2045,23 @@ impl TakerSwap {
                 ),
             },
             None => {
-                if now_ms() / 1000 < self.r().data.taker_payment_lock + 3700 {
-                    return ERR!(
-                        "Too early to refund, wait until {}",
-                        self.r().data.taker_payment_lock + 3700
-                    );
+                if self.taker_coin.is_auto_refundable() {
+                    return ERR!("Taker payment will be refunded automatically!");
                 }
 
-                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 can_refund = try_s!(self.taker_coin.can_refund_htlc(taker_payment_lock).compat().await);
+                if let CanRefundHtlc::HaveToWait(seconds_to_wait) = can_refund {
+                    return ERR!("Too early to refund, wait until {}", now_ms() / 1000 + seconds_to_wait);
+                }
+
+                let fut = self.taker_coin.send_taker_refunds_payment(SendTakerRefundsPaymentArgs {
+                    payment_tx: &taker_payment,
+                    time_lock: taker_payment_lock as u32,
+                    other_pubkey: other_taker_coin_htlc_pub.as_slice(),
+                    secret_hash: &secret_hash,
+                    swap_contract_address: &taker_coin_swap_contract_address,
+                    swap_unique_data: &unique_data,
+                });
 
                 let transaction = match fut.compat().await {
                     Ok(t) => t,
@@ -1780,7 +2174,7 @@ pub async fn check_balance_for_taker_swap(
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, my_coin.ticker()))?;
             let maker_payment_spend_trade_fee = other_coin
-                .get_receiver_trade_fee(stage)
+                .get_receiver_trade_fee(volume.to_decimal(), stage)
                 .compat()
                 .await
                 .mm_err(|e| CheckBalanceError::from_trade_preimage_error(e, other_coin.ticker()))?;
@@ -1875,7 +2269,7 @@ pub async fn taker_swap_trade_preimage(
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, my_coin_ticker))?;
     let other_coin_trade_fee = other_coin
-        .get_receiver_trade_fee(stage.clone())
+        .get_receiver_trade_fee(my_coin_volume.to_decimal(), stage.clone())
         .compat()
         .await
         .mm_err(|e| TradePreimageRpcError::from_trade_preimage_error(e, other_coin_ticker))?;
@@ -1903,7 +2297,7 @@ pub async fn taker_swap_trade_preimage(
         rel_confs: rel_coin.required_confirmations(),
         rel_nota: rel_coin.requires_notarization(),
     };
-    let our_public_id = ctx.public_id().expect("!ctx.public_id()");
+    let our_public_id = CryptoCtx::from_ctx(ctx)?.mm2_internal_public_id();
     let order_builder = TakerOrderBuilder::new(&base_coin, &rel_coin)
         .with_base_amount(base_amount)
         .with_rel_amount(rel_amount)
@@ -2041,6 +2435,7 @@ pub struct MaxTakerVolumeLessThanDust {
     pub min_tx_amount: MmNumber,
 }
 
+#[allow(clippy::result_large_err)]
 pub fn max_taker_vol_from_available(
     available: MmNumber,
     base: &str,
@@ -2065,10 +2460,6 @@ pub fn max_taker_vol_from_available(
     Ok(max_vol)
 }
 
-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::*;
@@ -2077,10 +2468,12 @@ mod taker_swap_tests {
     use coins::utxo::UtxoTx;
     use coins::{FoundSwapTxSpend, MarketCoinOps, MmCoin, SwapOps, TestCoin};
     use common::{block_on, new_uuid};
-    use crypto::privkey::key_pair_from_seed;
-    use mm2_core::mm_ctx::MmCtxBuilder;
+    use mm2_test_helpers::for_tests::mm_ctx_with_iguana;
     use mocktopus::mocking::*;
 
+    const PASSPHRASE: Option<&str> =
+        Some("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+
     fn eth_tx_for_test() -> SignedEthTx {
         // raw transaction bytes of https://etherscan.io/tx/0x0869be3e5d4456a29d488a533ad6c118620fef450f36778aecf31d356ff8b41f
         let tx_bytes = [
@@ -2100,18 +2493,16 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_maker_payment_spend_errored() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.12596566232185483","maker_coin":"KMD","maker_coin_start_block":1458035,"maker_payment_confirmations":1,"maker_payment_wait":1564053079,"my_persistent_pub":"0326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0a","started_at":1564050479,"taker_amount":"50.000000000000001504212457800000","taker_coin":"DOGE","taker_coin_start_block":2823448,"taker_payment_confirmations":1,"taker_payment_lock":1564058279,"uuid":"41383f43-46a5-478c-9386-3b2cce0aca20"},"type":"Started"},"timestamp":1564050480269},{"event":{"data":{"maker_payment_locktime":1564066080,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"3669eb83a007a3c507448d79f45a9f06ec2f36a8"},"type":"Negotiated"},"timestamp":1564050540991},{"event":{"data":{"tx_hash":"bdde828b492d6d1cc25cd2322fd592dafd722fcc7d8b0fedce4d3bb4a1a8c8ff","tx_hex":"0100000002c7efa995c8b7be0a8b6c2d526c6c444c1634d65584e9ee89904e9d8675eac88c010000006a473044022051f34d5e3b7d0b9098d5e35333f3550f9cb9e57df83d5e4635b7a8d2986d6d5602200288c98da05de6950e01229a637110a1800ba643e75cfec59d4eb1021ad9b40801210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffffae6c233989efa7c7d2aa6534adc96078917ff395b7f09f734a147b2f44ade164000000006a4730440220393a784c2da74d0e2a28ec4f7df6c8f9d8b2af6ae6957f1e68346d744223a8fd02201b7a96954ac06815a43a6c7668d829ae9cbb5de76fa77189ddfd9e3038df662c01210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffff02115f5800000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac41a84641020000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac6d84395d"},"type":"TakerFeeSent"},"timestamp":1564050545296},{"event":{"data":{"tx_hash":"0a0f11fa82802c2c30862c50ab2162185dae8de7f7235f32c506f814c142b382","tx_hex":"0400008085202f8902ace337db2dd4c56b0697f58fb8cfb6bd1cd6f469d925fc0376d1dcfb7581bf82000000006b483045022100d1f95be235c5c8880f5d703ace287e2768548792c58c5dbd27f5578881b30ea70220030596106e21c7e0057ee0dab283f9a1fe273f15208cba80870c447bd559ef0d0121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff9f339752567c404427fd77f2b35cecdb4c21489edc64e25e729fdb281785e423000000006a47304402203179e95877dbc107123a417f1e648e3ff13d384890f1e4a67b6dd5087235152e0220102a8ab799fadb26b5d89ceb9c7bc721a7e0c2a0d0d7e46bbe0cf3d130010d430121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff025635c0000000000017a91480a95d366d65e34a465ab17b0c9eb1d5a33bae08876cbfce05000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac8d7c395d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1564050588176},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1564050588178},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1564050693585},{"event":{"data":{"tx_hash":"539cb6dbdc25465bbccc575554f05d1bb04c70efce4316e41194e747375c3659","tx_hex":"0100000001ffc8a8a1b43b4dceed0f8b7dcc2f72fdda92d52f32d25cc21c6d2d498b82debd010000006a47304402203967b7f9f5532fa47116585c7d1bcba51861ea2059cca00409f34660db18e33a0220640991911852533a12fdfeb039fb9c8ca2c45482c6993bd84636af3670d49c1501210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffff0200f2052a0100000017a914f2fa08ae416b576779ae5da975e5442663215fce87415173f9000000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac0585395d"},"type":"TakerPaymentSent"},"timestamp":1564050695611},{"event":{"data":{"secret":"1b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093","transaction":{"tx_hash":"cc5af1cf68d246419fee49c3d74c0cd173599d115b86efe274368a614951bc47","tx_hex":"010000000159365c3747e79411e41643ceef704cb01b5df0545557ccbc5b4625dcdbb69c5300000000d747304402200e78e27d2f1c18676f98ca3dfa4e4a9eeaa8209b55f57b4dd5d9e1abdf034cfa0220623b5c22b62234cec230342aa306c497e43494b44ec2425b84e236b1bf01257001201b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093004c6b6304a7a2395db175210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0aac6782012088a9143669eb83a007a3c507448d79f45a9f06ec2f36a88821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68ffffffff01008d380c010000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac8c77395d"}},"type":"TakerPaymentSpent"},"timestamp":1564051092890},{"event":{"data":{"error":"lp_swap:1981] utxo:891] rpc_clients:738] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"67\", method: \"blockchain.transaction.broadcast\", params: [String(\"0400008085202f890182b342c114f806c5325f23f7e78dae5d186221ab502c86302c2c8082fa110f0a00000000d7473044022035791ea5548f87484065c9e1f0bdca9ebc699f2c7f51182c84f360102e32dc3d02200612ed53bca52d9c2568437f087598531534badf26229fe0f652ea72ddf03ca501201b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093004c6b630420c1395db17521031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac6782012088a9143669eb83a007a3c507448d79f45a9f06ec2f36a888210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0aac68ffffffff01460ec000000000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac967e395d000000000000000000000000000000\")] }, error: Transport(\"rpc_clients:668] All electrums are currently disconnected\") }"},"type":"MakerPaymentSpendFailed"},"timestamp":1564051092897},{"event":{"type":"Finished"},"timestamp":1564051092900}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"41383f43-46a5-478c-9386-3b2cce0aca20"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         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())))
         });
@@ -2132,18 +2523,18 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_taker_payment_errored_but_sent_not_spent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"3.54932734","maker_coin":"KMD","maker_coin_start_block":1452970,"maker_payment_confirmations":1,"maker_payment_wait":1563746537,"my_persistent_pub":"03101ace6b08605b9424b0582b5cce044b70a3c8d8d10cb2965e039b0967ae92b9","started_at":1563743937,"taker_amount":"0.02004833998671660000000000","taker_coin":"ETH","taker_coin_start_block":8196380,"taker_payment_confirmations":1,"taker_payment_lock":1563751737,"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"},"type":"Started"},"timestamp":1563743937741},{"event":{"data":{"maker_payment_locktime":1563759539,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"432c8272ac59b47dea2d299b5cf1ee64ea1917b9"},"type":"Negotiated"},"timestamp":1563744003530},{"event":{"data":{"tx_hash":"a59203eb2328827de00bed699a29389792906e4f39fdea145eb40dc6b3821bd6","tx_hex":"f8690284ee6b280082520894d8997941dd1346e9231118d5685d866294f59e5b865af3107a4000801ca0743d2b7c9fad65805d882179062012261be328d7628ae12ee08eff8d7657d993a07eecbd051f49d35279416778faa4664962726d516ce65e18755c9b9406a9c2fd"},"type":"TakerFeeSent"},"timestamp":1563744020598},{"event":{"data":{"tx_hash":"0cf4acbcefde53645851c5c6053ea61fe0cbb5f828a906d69eb809e0b071a03b","tx_hex":"0400008085202f89025d5ae3e8c87418c9b735f8f2f7d29e26820c33c9f30d53f2d31f8b99ea9b1490010000006a47304402201185c06ca575261c539b287175751b7de642eb7466c59128639a19b4c2dd2f9b02201c8c4167d581864bedd4d1deb5596472e6e3ce29fe9e7996907a7b59c905d5490121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff06dbf9971c8dfd4a0c8c49f4f15c51de59ba13b2efa702682e26869843af9a87000000006a473044022012b47c12c7f6ad7d8b778fc4b5dcfd56a39325daf302f56e7b84753ba5216cfa022076bf571cf9e20facf70d2f134e8ed2de67aa08581a27ff3128bf93a9b594ac770121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff02fed727150000000017a914d5268b31131a652f9b6ddf57db62f02285cdfad1874e1d7835000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac37cf345d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563744071778},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563744071781},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563744118073},{"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":"TakerPaymentTransactionFailed"},"timestamp":1563744118577},{"event":{"type":"Finished"},"timestamp":1563744118580}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::CanRefundNow))));
 
         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()))))
         });
@@ -2155,7 +2546,7 @@ mod taker_swap_tests {
         });
 
         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())))
         });
@@ -2176,19 +2567,17 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_taker_payment_errored_but_sent_and_spent_by_maker() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"3.54932734","maker_coin":"KMD","maker_coin_start_block":1452970,"maker_payment_confirmations":1,"maker_payment_wait":1563746537,"my_persistent_pub":"03101ace6b08605b9424b0582b5cce044b70a3c8d8d10cb2965e039b0967ae92b9","started_at":1563743937,"taker_amount":"0.02004833998671660000000000","taker_coin":"ETH","taker_coin_start_block":8196380,"taker_payment_confirmations":1,"taker_payment_lock":1563751737,"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"},"type":"Started"},"timestamp":1563743937741},{"event":{"data":{"maker_payment_locktime":1563759539,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"432c8272ac59b47dea2d299b5cf1ee64ea1917b9"},"type":"Negotiated"},"timestamp":1563744003530},{"event":{"data":{"tx_hash":"a59203eb2328827de00bed699a29389792906e4f39fdea145eb40dc6b3821bd6","tx_hex":"f8690284ee6b280082520894d8997941dd1346e9231118d5685d866294f59e5b865af3107a4000801ca0743d2b7c9fad65805d882179062012261be328d7628ae12ee08eff8d7657d993a07eecbd051f49d35279416778faa4664962726d516ce65e18755c9b9406a9c2fd"},"type":"TakerFeeSent"},"timestamp":1563744020598},{"event":{"data":{"tx_hash":"0cf4acbcefde53645851c5c6053ea61fe0cbb5f828a906d69eb809e0b071a03b","tx_hex":"0400008085202f89025d5ae3e8c87418c9b735f8f2f7d29e26820c33c9f30d53f2d31f8b99ea9b1490010000006a47304402201185c06ca575261c539b287175751b7de642eb7466c59128639a19b4c2dd2f9b02201c8c4167d581864bedd4d1deb5596472e6e3ce29fe9e7996907a7b59c905d5490121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff06dbf9971c8dfd4a0c8c49f4f15c51de59ba13b2efa702682e26869843af9a87000000006a473044022012b47c12c7f6ad7d8b778fc4b5dcfd56a39325daf302f56e7b84753ba5216cfa022076bf571cf9e20facf70d2f134e8ed2de67aa08581a27ff3128bf93a9b594ac770121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff02fed727150000000017a914d5268b31131a652f9b6ddf57db62f02285cdfad1874e1d7835000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac37cf345d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563744071778},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563744071781},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563744118073},{"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":"TakerPaymentTransactionFailed"},"timestamp":1563744118577},{"event":{"type":"Finished"},"timestamp":1563744118580}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"3447b727-fe93-4357-8e5a-8cf2699b7e86"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
-        TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Ok(vec![])));
+        TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Box::pin(async move { 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()))))
         });
@@ -2204,7 +2593,7 @@ mod taker_swap_tests {
             .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())))
         });
@@ -2225,15 +2614,15 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_taker_payment_refund_failed_not_spent() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_wait":1563623475,"my_persistent_pub":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91","started_at":1563620875,"taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"taker_payment_lock":1563628675,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875766},{"event":{"data":{"maker_payment_locktime":1563636475,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"7ed38daab6085c1a1e4426e61dc87a3c2c081a95"},"type":"Negotiated"},"timestamp":1563620955014},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeSent"},"timestamp":1563620958220},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563620999307},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563620999310},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563621244153},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentSent"},"timestamp":1563621246370},{"event":{"data":{"error":"utxo:1145] rpc_clients:782] Waited too long until 1563628675 for output TransactionOutput { value: 777000, script_pubkey: a91483818667161bf94adda3964a81a231cbf6f5338187 } to be spent "},"type":"TakerPaymentWaitForSpendFailed"},"timestamp":1563638060370},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563638060585}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::CanRefundNow))));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
         TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
@@ -2242,7 +2631,7 @@ mod taker_swap_tests {
         });
 
         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())))
         });
@@ -2262,15 +2651,15 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_taker_payment_refund_failed_not_spent_too_early_to_refund() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_wait":1563623475,"my_persistent_pub":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91","started_at":1563620875,"taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"taker_payment_lock":1563628675,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875766},{"event":{"data":{"maker_payment_locktime":1563636475,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"7ed38daab6085c1a1e4426e61dc87a3c2c081a95"},"type":"Negotiated"},"timestamp":1563620955014},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeSent"},"timestamp":1563620958220},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563620999307},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563620999310},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563621244153},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentSent"},"timestamp":1563621246370},{"event":{"data":{"error":"utxo:1145] rpc_clients:782] Waited too long until 1563628675 for output TransactionOutput { value: 777000, script_pubkey: a91483818667161bf94adda3964a81a231cbf6f5338187 } to be spent "},"type":"TakerPaymentWaitForSpendFailed"},"timestamp":1563638060370},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563638060585}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
+        TestCoin::can_refund_htlc
+            .mock_safe(|_, _| MockResult::Return(Box::new(futures01::future::ok(CanRefundHtlc::HaveToWait(1000)))));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
         TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
@@ -2280,23 +2669,21 @@ 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();
-        taker_swap.w().data.taker_payment_lock = (now_ms() / 1000) - 3690;
-        assert!(block_on(taker_swap.recover_funds()).is_err());
+        let error = block_on(taker_swap.recover_funds()).unwrap_err();
+        assert!(error.contains("Too early to refund"));
         assert!(unsafe { SEARCH_TX_SPEND_CALLED });
     }
 
     #[test]
     fn test_recover_funds_taker_swap_taker_payment_refund_failed_spent_by_maker() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_wait":1563623475,"my_persistent_pub":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91","started_at":1563620875,"taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"taker_payment_lock":1563628675,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875766},{"event":{"data":{"maker_payment_locktime":1563636475,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"7ed38daab6085c1a1e4426e61dc87a3c2c081a95"},"type":"Negotiated"},"timestamp":1563620955014},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeSent"},"timestamp":1563620958220},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563620999307},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563620999310},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563621244153},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentSent"},"timestamp":1563621246370},{"event":{"data":{"error":"utxo:1145] rpc_clients:782] Waited too long until 1563628675 for output TransactionOutput { value: 777000, script_pubkey: a91483818667161bf94adda3964a81a231cbf6f5338187 } to be spent "},"type":"TakerPaymentWaitForSpendFailed"},"timestamp":1563638060370},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563638060585}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
-        TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Ok(vec![])));
+        TestCoin::extract_secret.mock_safe(|_, _, _| MockResult::Return(Box::pin(async move { Ok(vec![]) })));
 
         static mut SEARCH_TX_SPEND_CALLED: bool = false;
         TestCoin::search_for_swap_tx_spend_my.mock_safe(|_, _| {
@@ -2309,7 +2696,7 @@ mod taker_swap_tests {
             .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())))
         });
@@ -2329,13 +2716,11 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recover_funds_taker_swap_not_finished() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // the json doesn't have Finished event at the end
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.12596566232185483","maker_coin":"KMD","maker_coin_start_block":1458035,"maker_payment_confirmations":1,"maker_payment_wait":1564053079,"my_persistent_pub":"0326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0a","started_at":1564050479,"taker_amount":"50.000000000000001504212457800000","taker_coin":"DOGE","taker_coin_start_block":2823448,"taker_payment_confirmations":1,"taker_payment_lock":1564058279,"uuid":"41383f43-46a5-478c-9386-3b2cce0aca20"},"type":"Started"},"timestamp":1564050480269},{"event":{"data":{"maker_payment_locktime":1564066080,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"3669eb83a007a3c507448d79f45a9f06ec2f36a8"},"type":"Negotiated"},"timestamp":1564050540991},{"event":{"data":{"tx_hash":"bdde828b492d6d1cc25cd2322fd592dafd722fcc7d8b0fedce4d3bb4a1a8c8ff","tx_hex":"0100000002c7efa995c8b7be0a8b6c2d526c6c444c1634d65584e9ee89904e9d8675eac88c010000006a473044022051f34d5e3b7d0b9098d5e35333f3550f9cb9e57df83d5e4635b7a8d2986d6d5602200288c98da05de6950e01229a637110a1800ba643e75cfec59d4eb1021ad9b40801210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffffae6c233989efa7c7d2aa6534adc96078917ff395b7f09f734a147b2f44ade164000000006a4730440220393a784c2da74d0e2a28ec4f7df6c8f9d8b2af6ae6957f1e68346d744223a8fd02201b7a96954ac06815a43a6c7668d829ae9cbb5de76fa77189ddfd9e3038df662c01210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffff02115f5800000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac41a84641020000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac6d84395d"},"type":"TakerFeeSent"},"timestamp":1564050545296},{"event":{"data":{"tx_hash":"0a0f11fa82802c2c30862c50ab2162185dae8de7f7235f32c506f814c142b382","tx_hex":"0400008085202f8902ace337db2dd4c56b0697f58fb8cfb6bd1cd6f469d925fc0376d1dcfb7581bf82000000006b483045022100d1f95be235c5c8880f5d703ace287e2768548792c58c5dbd27f5578881b30ea70220030596106e21c7e0057ee0dab283f9a1fe273f15208cba80870c447bd559ef0d0121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff9f339752567c404427fd77f2b35cecdb4c21489edc64e25e729fdb281785e423000000006a47304402203179e95877dbc107123a417f1e648e3ff13d384890f1e4a67b6dd5087235152e0220102a8ab799fadb26b5d89ceb9c7bc721a7e0c2a0d0d7e46bbe0cf3d130010d430121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff025635c0000000000017a91480a95d366d65e34a465ab17b0c9eb1d5a33bae08876cbfce05000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac8d7c395d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1564050588176},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1564050588178},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1564050693585},{"event":{"data":{"tx_hash":"539cb6dbdc25465bbccc575554f05d1bb04c70efce4316e41194e747375c3659","tx_hex":"0100000001ffc8a8a1b43b4dceed0f8b7dcc2f72fdda92d52f32d25cc21c6d2d498b82debd010000006a47304402203967b7f9f5532fa47116585c7d1bcba51861ea2059cca00409f34660db18e33a0220640991911852533a12fdfeb039fb9c8ca2c45482c6993bd84636af3670d49c1501210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0affffffff0200f2052a0100000017a914f2fa08ae416b576779ae5da975e5442663215fce87415173f9000000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac0585395d"},"type":"TakerPaymentSent"},"timestamp":1564050695611},{"event":{"data":{"secret":"1b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093","transaction":{"tx_hash":"cc5af1cf68d246419fee49c3d74c0cd173599d115b86efe274368a614951bc47","tx_hex":"010000000159365c3747e79411e41643ceef704cb01b5df0545557ccbc5b4625dcdbb69c5300000000d747304402200e78e27d2f1c18676f98ca3dfa4e4a9eeaa8209b55f57b4dd5d9e1abdf034cfa0220623b5c22b62234cec230342aa306c497e43494b44ec2425b84e236b1bf01257001201b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093004c6b6304a7a2395db175210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0aac6782012088a9143669eb83a007a3c507448d79f45a9f06ec2f36a88821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68ffffffff01008d380c010000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac8c77395d"}},"type":"TakerPaymentSpent"},"timestamp":1564051092890},{"event":{"data":{"error":"lp_swap:1981] utxo:891] rpc_clients:738] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"67\", method: \"blockchain.transaction.broadcast\", params: [String(\"0400008085202f890182b342c114f806c5325f23f7e78dae5d186221ab502c86302c2c8082fa110f0a00000000d7473044022035791ea5548f87484065c9e1f0bdca9ebc699f2c7f51182c84f360102e32dc3d02200612ed53bca52d9c2568437f087598531534badf26229fe0f652ea72ddf03ca501201b8886b8a2cdb62505699400b694ac20f04d7bd4abd80e1ab154aa8d861fc093004c6b630420c1395db17521031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac6782012088a9143669eb83a007a3c507448d79f45a9f06ec2f36a888210326846707a52a233cfc49a61ef51b1698bbe6aa78fa8b8d411c02743c09688f0aac68ffffffff01460ec000000000001976a914444f0e1099709ba4d742454a7d98a5c9c162ceab88ac967e395d000000000000000000000000000000\")] }, error: Transport(\"rpc_clients:668] All electrums are currently disconnected\") }"},"type":"MakerPaymentSpendFailed"},"timestamp":1564051092897}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"41383f43-46a5-478c-9386-3b2cce0aca20"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         TestCoin::swap_contract_address.mock_safe(|_| MockResult::Return(None));
@@ -2362,13 +2747,11 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recheck_swap_contract_address_if_none() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // swap file contains neither maker_coin_swap_contract_address nor taker_coin_swap_contract_address
         let taker_saved_json = r#"{"error_events":["StartFailed","NegotiateFailed","TakerFeeSendFailed","MakerPaymentValidateFailed","TakerPaymentTransactionFailed","TakerPaymentDataSendFailed","TakerPaymentWaitForSpendFailed","MakerPaymentSpendFailed","TakerPaymentRefunded","TakerPaymentRefundFailed"],"events":[{"event":{"data":{"lock_duration":7800,"maker":"1bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","maker_amount":"0.58610590","maker_coin":"KMD","maker_coin_start_block":1450923,"maker_payment_confirmations":1,"maker_payment_wait":1563623475,"my_persistent_pub":"02713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91","started_at":1563620875,"taker_amount":"0.0077700000552410000000000","taker_coin":"LTC","taker_coin_start_block":1670837,"taker_payment_confirmations":1,"taker_payment_lock":1563628675,"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"},"type":"Started"},"timestamp":1563620875766},{"event":{"data":{"maker_payment_locktime":1563636475,"maker_pubkey":"031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8","secret_hash":"7ed38daab6085c1a1e4426e61dc87a3c2c081a95"},"type":"Negotiated"},"timestamp":1563620955014},{"event":{"data":{"tx_hash":"6740136eaaa615d9d231969e3a9599d0fc59e53989237a8d31cd6fc86c160013","tx_hex":"0100000001a2586ea8294cedc55741bef625ba72c646399903391a7f6c604a58c6263135f2000000006b4830450221009c78c8ba4a7accab6b09f9a95da5bc59c81f4fc1e60b288ec3c5462b4d02ef01022056b63be1629cf17751d3cc5ffec51bcb1d7f9396e9ce9ca254d0f34104f7263a012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0210270000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac78aa1900000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac5bf6325d"},"type":"TakerFeeSent"},"timestamp":1563620958220},{"event":{"data":{"tx_hash":"d0f6e664cea9d89fe7b5cf8005fdca070d1ab1d05a482aaef95c08cdaecddf0a","tx_hex":"0400008085202f89019f1cbda354342cdf982046b331bbd3791f53b692efc6e4becc36be495b2977d9000000006b483045022100fa9d4557394141f6a8b9bfb8cd594a521fd8bcd1965dbf8bc4e04abc849ac66e0220589f521814c10a7561abfd5e432f7a2ee60d4875fe4604618af3207dae531ac00121031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ffffffff029e537e030000000017a9145534898009f1467191065f6890b96914b39a1c018791857702000000001976a914c3f710deb7320b0efa6edb14e3ebeeb9155fa90d88ac72ee325d000000000000000000000000000000"},"type":"MakerPaymentReceived"},"timestamp":1563620999307},{"event":{"type":"MakerPaymentWaitConfirmStarted"},"timestamp":1563620999310},{"event":{"type":"MakerPaymentValidatedAndConfirmed"},"timestamp":1563621244153},{"event":{"data":{"tx_hash":"1e883eb2f3991e84ba27f53651f89b7dda708678a5b9813d043577f222b9ca30","tx_hex":"01000000011300166cc86fcd318d7a238939e559fcd099953a9e9631d2d915a6aa6e134067010000006a47304402206781d5f2db2ff13d2ec7e266f774ea5630cc2dba4019e18e9716131b8b026051022006ebb33857b6d180f13aa6be2fc532f9734abde9d00ae14757e7d7ba3741c08c012102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ffffffff0228db0b000000000017a91483818667161bf94adda3964a81a231cbf6f5338187b0480c00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac7cf7325d"},"type":"TakerPaymentSent"},"timestamp":1563621246370},{"event":{"data":{"error":"utxo:1145] rpc_clients:782] Waited too long until 1563628675 for output TransactionOutput { value: 777000, script_pubkey: a91483818667161bf94adda3964a81a231cbf6f5338187 } to be spent "},"type":"TakerPaymentWaitForSpendFailed"},"timestamp":1563638060370},{"event":{"data":{"error":"lp_swap:2025] utxo:938] rpc_clients:719] JsonRpcError { request: JsonRpcRequest { jsonrpc: \"2.0\", id: \"9\", method: \"blockchain.transaction.broadcast\", params: [String(\"010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d\")] }, error: Response(Object({\"code\": Number(1), \"message\": String(\"the transaction was rejected by network rules.\\n\\nMissing inputs\\n[010000000130cab922f27735043d81b9a5788670da7d9bf85136f527ba841e99f3b23e881e00000000b6473044022058a0c1da6bcf8c1418899ff8475f3ab6dddbff918528451c1fe71c2f7dad176302204c2e0bcf8f9b5f09e02ccfeb9256e9b34fb355ea655a5704a8a3fa920079b91501514c6b63048314335db1752102713015d3fa4d30259e90be5f131beb593bf0131f3af2dcdb304e3322d8d52b91ac6782012088a9147ed38daab6085c1a1e4426e61dc87a3c2c081a958821031bb83b58ec130e28e0a6d5d2acf2eb01b0d3f1670e021d47d31db8a858219da8ac68feffffff0188540a00000000001976a91406ccabfd5f9075ecd5e8d0d31c0e973a54d51e8288ac1c2b335d]\")})) }"},"type":"TakerPaymentRefundFailed"},"timestamp":1563638060583},{"event":{"type":"Finished"},"timestamp":1563638060585}],"success_events":["Started","Negotiated","TakerFeeSent","MakerPaymentReceived","MakerPaymentWaitConfirmStarted","MakerPaymentValidatedAndConfirmed","TakerPaymentSent","TakerPaymentSpent","MakerPaymentSpent","Finished"],"uuid":"9db641f5-4300-4527-9fa6-f1c391d42c35"}"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         static mut SWAP_CONTRACT_ADDRESS_CALLED: usize = 0;
@@ -2393,13 +2776,11 @@ mod taker_swap_tests {
 
     #[test]
     fn test_recheck_only_one_swap_contract_address() {
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
+
         // swap file contains only maker_coin_swap_contract_address
         let taker_saved_json = r#"{"type":"Taker","uuid":"49c79ea4-e1eb-4fb2-a0ef-265bded0b77f","events":[{"timestamp":1608542326909,"event":{"type":"Started","data":{"taker_coin":"RICK","maker_coin":"ETH","maker":"c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed","my_persistent_pub":"02031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3","lock_duration":7800,"maker_amount":"0.1","taker_amount":"0.1","maker_payment_confirmations":1,"maker_payment_requires_nota":false,"taker_payment_confirmations":0,"taker_payment_requires_nota":false,"taker_payment_lock":1608550126,"uuid":"49c79ea4-e1eb-4fb2-a0ef-265bded0b77f","started_at":1608542326,"maker_payment_wait":1608545446,"maker_coin_start_block":14360,"taker_coin_start_block":723123,"maker_coin_swap_contract_address":"a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd"}}},{"timestamp":1608542327416,"event":{"type":"Negotiated","data":{"maker_payment_locktime":1608557926,"maker_pubkey":"03c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3ed","secret_hash":"8b0221f3b977c1c65dddf17c1c28e2bbced9e7b4"}}},{"timestamp":1608542332604,"event":{"type":"TakerFeeSent","data":{"tx_hex":"0400008085202f89011ca964f77200b73d64b481f47de84098041d3470d6256e44f2741f080e2b11cf020000006b4830450221008a064f5e51ef8281d43eb7bcd016fed7e560ea1eb7b0713ec977602c96d8f79b02205bfaa6655b849b9922c03276b938273f2edb8fb9ffcaa2a9212d7220560f6060012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0246320000000000001976a914ca1e04745e8ca0c60d8c5881531d51bec470743f88ac62752e27000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac7768e05f000000000000000000000000000000","tx_hash":"3793df28ed2aac6188d2c48ec65eff12eea301089d60da655fc96f598326d708"}}},{"timestamp":1608542334018,"event":{"type":"MakerPaymentReceived","data":{"tx_hex":"f8ef82021c80830249f094a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd88016345785d8a0000b884152cf3af50aebafeaf827c62c2eed09e265fa5aa9e013c0f27f0a88259f1aaa1279f0c32000000000000000000000000bab36286672fbdc7b250804bf6d14be0df69fa298b0221f3b977c1c65dddf17c1c28e2bbced9e7b4000000000000000000000000000000000000000000000000000000000000000000000000000000005fe0a5661ba0f18a0c5c349462b51dacd1a0761e4997d4572a01e48480c4e310d69a40308ad3a04510513f01a79c59f22c9cb79952547c8dfc4c74785b630f512d64369323e0c1","tx_hash":"6782323490584a2bc768cd5199506bfa1ed91e7515b35bb72fa269604b7dc0aa"}}},{"timestamp":1608542334019,"event":{"type":"MakerPaymentWaitConfirmStarted"}},{"timestamp":1608542334825,"event":{"type":"MakerPaymentValidatedAndConfirmed"}},{"timestamp":1608542337671,"event":{"type":"TakerPaymentSent","data":{"tx_hex":"0400008085202f890108d72683596fc95f65da609d0801a3ee12ff5ec68ec4d28861ac2aed28df9337010000006b48304502210086a03db599438b243bee2b02af56e23447f85d09854416b51305536b9ca5890e02204b288acdea4cdc7ab1ffbd9766a7bdf95f5bd02d2917dfb7089dbf29032591b0012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff03809698000000000017a914888e9e1816214c3960eac7b55e35521ca4426b0c870000000000000000166a148b0221f3b977c1c65dddf17c1c28e2bbced9e7b4fada9526000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac7f68e05f000000000000000000000000000000","tx_hash":"44fa493757df5fdca823bbac05a8b8feb5862d799d4947fd544abcd129feceea"}}},{"timestamp":1608542348271,"event":{"type":"TakerPaymentSpent","data":{"transaction":{"tx_hex":"0400008085202f8901eacefe29d1bc4a54fd47499d792d86b5feb8a805acbb23a8dc5fdf573749fa4400000000d74730440220508c853cc4f1fcb9e6aa00e704eef99adaee9a4ea63a1fd6393bb7ff18da02c802200396bb5d52157bd77ff26ac521ed75aca388d3ec1e5e3ebb7b3aed73c3d33ec50120df871242dcbcc4fe9ed4d3413e21b2f8ce606a3ee7128c9b2d2e31fcedc1848e004c6b6304ee86e05fb1752102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ac6782012088a9148b0221f3b977c1c65dddf17c1c28e2bbced9e7b4882103c6a78589e18b482aea046975e6d0acbdea7bf7dbf04d9d5bd67fda917815e3edac68ffffffff0198929800000000001976a9146d9d2b554d768232320587df75c4338ecc8bf37d88ac725ae05f000000000000000000000000000000","tx_hash":"9376dde62249802a0aba8259f51def9bb2e509af85a5ec7df04b479a9da28a29"},"secret":"df871242dcbcc4fe9ed4d3413e21b2f8ce606a3ee7128c9b2d2e31fcedc1848e"}}},{"timestamp":1608542349372,"event":{"type":"MakerPaymentSpent","data":{"tx_hex":"f90107821fb980830249f094a09ad3cd7e96586ebd05a2607ee56b56fb2db8fd80b8a402ed292b50aebafeaf827c62c2eed09e265fa5aa9e013c0f27f0a88259f1aaa1279f0c32000000000000000000000000000000000000000000000000016345785d8a0000df871242dcbcc4fe9ed4d3413e21b2f8ce606a3ee7128c9b2d2e31fcedc1848e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b2d0d6c2c785217457b69b922a2a9cea98f71e91ca0ed6a4942a78c7ae6eb3c9dec496459a9ef68b34cb389acd939d13d3ecaf7e4aca021bb77e80fc60acf25a7a01cc1272b1b76594a521fb1abe1322d650e58a672c2","tx_hash":"c2d206e665aee159a5ab9aff60f76444e97bdad8f9152eccb6ca07d9204974ca"}}},{"timestamp":1608542349373,"event":{"type":"Finished"}}],"maker_amount":"0.1","maker_coin":"ETH","taker_amount":"0.1","taker_coin":"RICK","gui":"nogui","mm_version":"1a6082121","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 taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
 
         TestCoin::ticker.mock_safe(|_| MockResult::Return("ticker"));
         static mut SWAP_CONTRACT_ADDRESS_CALLED: usize = 0;
@@ -2565,10 +2946,8 @@ mod taker_swap_tests {
             "error_events": []
         }"#;
         let taker_saved_swap: TakerSavedSwap = json::from_str(taker_saved_json).unwrap();
-        let key_pair =
-            key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid")
-                .unwrap();
-        let ctx = MmCtxBuilder::default().with_secp256k1_key_pair(key_pair).into_mm_arc();
+
+        let ctx = mm_ctx_with_iguana(PASSPHRASE);
 
         let maker_coin = MmCoinEnum::Test(TestCoin::new("RICK"));
         let taker_coin = MmCoinEnum::Test(TestCoin::new("MORTY"));
diff --git a/mm2src/mm2_main/src/lp_swap/trade_preimage.rs b/mm2src/mm2_main/src/lp_swap/trade_preimage.rs
index 56c6b374ca..7355f99b7e 100644
--- a/mm2src/mm2_main/src/lp_swap/trade_preimage.rs
+++ b/mm2src/mm2_main/src/lp_swap/trade_preimage.rs
@@ -3,6 +3,7 @@ use super::{maker_swap_trade_preimage, taker_swap_trade_preimage, MakerTradePrei
 use crate::mm2::lp_ordermatch::{MakerOrderBuildError, TakerAction, TakerOrderBuildError};
 use coins::{is_wallet_only_ticker, lp_coinfind_or_err, BalanceError, CoinFindError, TradeFee, TradePreimageError};
 use common::HttpStatusCode;
+use crypto::CryptoCtxError;
 use derive_more::Display;
 use http::StatusCode;
 use mm2_core::mm_ctx::MmArc;
@@ -259,8 +260,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::UnexpectedDerivationMethod(_) => TradePreimageRpcError::InternalError(e.to_string()),
+            BalanceError::WalletStorageError(_) => TradePreimageRpcError::InternalError(e.to_string()),
             BalanceError::Internal(internal) => TradePreimageRpcError::InternalError(internal),
         }
     }
@@ -314,6 +315,10 @@ impl From<CoinFindError> for TradePreimageRpcError {
     }
 }
 
+impl From<CryptoCtxError> for TradePreimageRpcError {
+    fn from(e: CryptoCtxError) -> Self { TradePreimageRpcError::InternalError(e.to_string()) }
+}
+
 impl TradePreimageRpcError {
     /// Construct [`TradePreimageRpcError`] from [`coins::TradePreimageError`] using the additional `ticker` argument.
     /// `ticker` is used to identify whether the `NotSufficientBalance` or `NotSufficientBaseCoinBalance` has occurred.
diff --git a/mm2src/mm2_main/src/mm2.rs b/mm2src/mm2_main/src/mm2.rs
index 0a3983b723..2281cd11a9 100644
--- a/mm2src/mm2_main/src/mm2.rs
+++ b/mm2src/mm2_main/src/mm2.rs
@@ -51,7 +51,7 @@ use std::ptr::null;
 use std::str;
 
 #[path = "lp_native_dex.rs"] mod lp_native_dex;
-use self::lp_native_dex::lp_init;
+pub use self::lp_native_dex::lp_init;
 use coins::update_coins_config;
 use mm2_err_handle::prelude::*;
 
@@ -68,12 +68,6 @@ pub mod database;
 #[path = "lp_swap.rs"] pub mod lp_swap;
 #[path = "rpc.rs"] pub mod rpc;
 
-#[cfg(any(test, target_arch = "wasm32"))]
-#[path = "mm2_tests.rs"]
-pub mod mm2_tests;
-
-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")]
@@ -81,17 +75,12 @@ const CUSTOM_PAYMENT_LOCKTIME_DEFAULT: u64 = 900;
 
 #[derive(Serialize)]
 pub struct MmVersionResult {
-    result: &'static str,
-    datetime: &'static str,
+    result: String,
+    datetime: String,
 }
 
 impl MmVersionResult {
-    pub const fn new() -> MmVersionResult {
-        MmVersionResult {
-            result: MM_VERSION,
-            datetime: MM_DATETIME,
-        }
-    }
+    pub const fn new(result: String, datetime: String) -> MmVersionResult { MmVersionResult { result, datetime } }
 
     pub fn to_json(&self) -> Json { json::to_value(self).expect("expected valid JSON object") }
 }
@@ -238,7 +227,12 @@ fn initialize_payment_locktime(conf: &Json) {
 }
 
 /// * `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> {
+pub async fn lp_main(
+    params: LpMainParams,
+    ctx_cb: &dyn Fn(u32),
+    version: String,
+    datetime: String,
+) -> Result<(), String> {
     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.
@@ -270,10 +264,11 @@ pub async fn lp_main(params: LpMainParams, ctx_cb: &dyn Fn(u32)) -> Result<(), S
     let ctx = MmCtxBuilder::new()
         .with_conf(conf)
         .with_log_level(log_filter)
-        .with_version(MM_VERSION.into())
+        .with_version(version.clone())
+        .with_datetime(datetime.clone())
         .into_mm_arc();
     ctx_cb(try_s!(ctx.ffi_handle()));
-    try_s!(lp_init(ctx).await);
+    try_s!(lp_init(ctx, version, datetime).await);
     Ok(())
 }
 
@@ -340,11 +335,10 @@ https://developers.atomicdex.io
 
 #[cfg(not(target_arch = "wasm32"))]
 #[allow(dead_code)] // Not used by mm2_lib.
-pub fn mm2_main() {
+pub fn mm2_main(version: String, datetime: String) {
     use libc::c_char;
 
     init_crash_reports();
-    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()
@@ -381,16 +375,24 @@ pub fn mm2_main() {
         return;
     }
 
+    if first_arg == Some("--version") || first_arg == Some("-v") || first_arg == Some("version") {
+        println!("AtomicDEX API: {version}");
+        return;
+    }
+
     if first_arg == Some("--help") || first_arg == Some("-h") || first_arg == Some("help") {
         help();
         return;
     }
+
     if cfg!(windows) && first_arg == Some("/?") {
         help();
         return;
     }
 
-    if let Err(err) = run_lp_main(first_arg, &|_| ()) {
+    log!("AtomicDEX API {} DT {}", version, datetime);
+
+    if let Err(err) = run_lp_main(first_arg, &|_| (), version, datetime) {
         log!("{}", err);
         exit(1);
     }
@@ -448,13 +450,18 @@ pub fn get_mm2config(first_arg: Option<&str>) -> Result<Json, String> {
 /// * `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> {
+pub fn run_lp_main(
+    first_arg: Option<&str>,
+    ctx_cb: &dyn Fn(u32),
+    version: String,
+    datetime: String,
+) -> 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)));
+    try_s!(block_on(lp_main(params, ctx_cb, version, datetime)));
     Ok(())
 }
 
@@ -483,7 +490,7 @@ fn on_update_config(args: &[OsString]) -> Result<(), String> {
     let formatter = json::ser::PrettyFormatter::with_indent(b"\t");
     let mut ser = json::Serializer::with_formatter(buf, formatter);
     try_s!(result.serialize(&mut ser));
-    try_s!(std::fs::write(&dst_path, ser.into_inner()));
+    try_s!(std::fs::write(dst_path, ser.into_inner()));
     Ok(())
 }
 
diff --git a/mm2src/mm2_main/src/mm2_bin.rs b/mm2src/mm2_main/src/mm2_bin.rs
deleted file mode 100644
index 798e95c8de..0000000000
--- a/mm2src/mm2_main/src/mm2_bin.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-#![allow(uncommon_codepoints)]
-#![feature(async_closure)]
-#![feature(drain_filter)]
-#![recursion_limit = "512"]
-#![feature(test)]
-#![feature(hash_raw_entry)]
-#![feature(map_first_last)]
-
-#[macro_use] extern crate common;
-#[macro_use] extern crate gstuff;
-#[macro_use] extern crate serde_json;
-#[macro_use] extern crate serde_derive;
-#[macro_use] extern crate serialization_derive;
-#[macro_use] extern crate ser_error_derive;
-
-#[path = "mm2.rs"] mod mm2;
-
-fn main() {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        mm2::mm2_main()
-    }
-}
diff --git a/mm2src/mm2_main/src/mm2_lib.rs b/mm2src/mm2_main/src/mm2_lib.rs
deleted file mode 100644
index b434c474a7..0000000000
--- a/mm2src/mm2_main/src/mm2_lib.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-#![allow(uncommon_codepoints)]
-#![feature(async_closure)]
-#![feature(drain_filter)]
-#![feature(hash_raw_entry)]
-#![feature(integer_atomics)]
-#![recursion_limit = "512"]
-#![cfg_attr(target_arch = "wasm32", allow(unused_imports))]
-
-#[macro_use] extern crate common;
-#[macro_use] extern crate enum_primitive_derive;
-#[macro_use] extern crate gstuff;
-#[macro_use] extern crate serde_json;
-#[macro_use] extern crate serde_derive;
-#[macro_use] extern crate serialization_derive;
-#[macro_use] extern crate ser_error_derive;
-
-#[path = "mm2.rs"] mod mm2;
-
-#[cfg(not(target_arch = "wasm32"))]
-#[path = "mm2_lib/mm2_native_lib.rs"]
-mod mm2_native_lib;
-
-#[cfg(target_arch = "wasm32")]
-#[path = "mm2_lib/mm2_wasm_lib.rs"]
-mod mm2_wasm_lib;
-
-use mm2_core::mm_ctx::MmArc;
-use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
-#[cfg(target_arch = "wasm32")] use wasm_bindgen::prelude::*;
-
-static LP_MAIN_RUNNING: AtomicBool = AtomicBool::new(false);
-static CTX: AtomicU32 = AtomicU32::new(0);
-
-#[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
-pub enum MainStatus {
-    /// MM2 is not running yet.
-    NotRunning = 0,
-    /// MM2 is running, but no context yet.
-    NoContext = 1,
-    /// MM2 is running, but no RPC yet.
-    NoRpc = 2,
-    /// MM2's RPC is up.
-    RpcIsUp = 3,
-}
-
-/// Checks if the MM2 singleton thread is currently running or not.
-pub fn mm2_status() -> MainStatus {
-    if !LP_MAIN_RUNNING.load(Ordering::Relaxed) {
-        return MainStatus::NotRunning;
-    }
-
-    let ctx = CTX.load(Ordering::Relaxed);
-    if ctx == 0 {
-        return MainStatus::NoContext;
-    }
-
-    let ctx = match MmArc::from_ffi_handle(ctx) {
-        Ok(ctx) => ctx,
-        Err(_) => return MainStatus::NoRpc,
-    };
-
-    if ctx.rpc_started.copy_or(false) {
-        MainStatus::RpcIsUp
-    } else {
-        MainStatus::NoRpc
-    }
-}
diff --git a/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs b/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs
deleted file mode 100644
index a44a4fe5bf..0000000000
--- a/mm2src/mm2_main/src/mm2_tests/lightning_tests.rs
+++ /dev/null
@@ -1,408 +0,0 @@
-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
deleted file mode 100644
index 8d0ea37a8c..0000000000
--- a/mm2src/mm2_main/src/mm2_tests/lp_bot_tests.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-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/ordermatch_tests.rs b/mm2src/mm2_main/src/ordermatch_tests.rs
index 2b3988476b..9b35c5bb47 100644
--- a/mm2src/mm2_main/src/ordermatch_tests.rs
+++ b/mm2src/mm2_main/src/ordermatch_tests.rs
@@ -6,9 +6,10 @@ 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_core::mm_ctx::{MmArc, MmCtx};
 use mm2_libp2p::atomicdex_behaviour::AdexBehaviourCmd;
 use mm2_libp2p::{decode_message, PeerId};
+use mm2_test_helpers::for_tests::mm_ctx_with_iguana;
 use mocktopus::mocking::*;
 use rand::{seq::SliceRandom, thread_rng, Rng};
 use std::collections::HashSet;
@@ -1039,9 +1040,7 @@ fn prepare_for_cancel_by(ctx: &MmArc) -> mpsc::Receiver<AdexBehaviourCmd> {
 
 #[test]
 fn test_cancel_by_single_coin() {
-    let ctx = MmCtxBuilder::default()
-        .with_secp256k1_key_pair(key_pair_from_seed("123").unwrap())
-        .into_mm_arc();
+    let ctx = mm_ctx_with_iguana(None);
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
@@ -1060,9 +1059,7 @@ fn test_cancel_by_single_coin() {
 
 #[test]
 fn test_cancel_by_pair() {
-    let ctx = MmCtxBuilder::default()
-        .with_secp256k1_key_pair(key_pair_from_seed("123").unwrap())
-        .into_mm_arc();
+    let ctx = mm_ctx_with_iguana(None);
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
@@ -1085,9 +1082,7 @@ fn test_cancel_by_pair() {
 
 #[test]
 fn test_cancel_by_all() {
-    let ctx = MmCtxBuilder::default()
-        .with_secp256k1_key_pair(key_pair_from_seed("123").unwrap())
-        .into_mm_arc();
+    let ctx = mm_ctx_with_iguana(None);
     let rx = prepare_for_cancel_by(&ctx);
 
     let connection = Connection::open_in_memory().unwrap();
@@ -1203,13 +1198,13 @@ fn test_maker_order_was_updated() {
 
 #[test]
 fn lp_connect_start_bob_should_not_be_invoked_if_order_match_already_connected() {
+    let ctx = mm_ctx_with_iguana(Some(
+        "also shoot benefit prefer juice shell elder veteran woman mimic image kidney",
+    ));
+
     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"}"#;
     let maker_order: MakerOrder = json::from_str(order_json).unwrap();
-    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 ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     ordermatch_ctx
         .maker_orders_ctx
@@ -1230,14 +1225,13 @@ fn lp_connect_start_bob_should_not_be_invoked_if_order_match_already_connected()
 
 #[test]
 fn should_process_request_only_once() {
+    let ctx = mm_ctx_with_iguana(Some(
+        "also shoot benefit prefer juice shell elder veteran woman mimic image kidney",
+    ));
+
     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"}"#;
     let maker_order: MakerOrder = json::from_str(order_json).unwrap();
     let uuid = maker_order.uuid;
-    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 ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     ordermatch_ctx
         .maker_orders_ctx
@@ -1620,11 +1614,10 @@ fn test_choose_taker_confs_settings_sell_action() {
 fn make_ctx_for_tests() -> (MmArc, String, [u8; 32]) {
     let ctx = MmArc::new(MmCtx::default());
     ctx.init_metrics().unwrap();
-    ctx.secp256k1_key_pair
-        .pin(key_pair_from_seed("passphrase").unwrap())
-        .unwrap();
-    let secret = *(&*ctx.secp256k1_key_pair().private().secret);
-    let pubkey = hex::encode(&**ctx.secp256k1_key_pair().public());
+    let crypto_ctx = CryptoCtx::init_with_iguana_passphrase(ctx.clone(), "passphrase").unwrap();
+
+    let secret = crypto_ctx.mm2_internal_privkey_secret().take();
+    let pubkey = crypto_ctx.mm2_internal_pubkey_hex();
     (ctx, pubkey, secret)
 }
 
@@ -1710,10 +1703,7 @@ fn test_process_get_orderbook_request() {
     orders_by_pubkeys.insert(pubkey2, pubkey2_orders);
     orders_by_pubkeys.insert(pubkey3, pubkey3_orders);
 
-    let ordermatch_ctx = Arc::new(OrdermatchContext::default());
-    let ordermatch_ctx_clone = ordermatch_ctx.clone();
-    OrdermatchContext::from_ctx.mock_safe(move |_| MockResult::Return(Ok(ordermatch_ctx_clone.clone())));
-
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     for order in orders_by_pubkeys.iter().map(|(_pubkey, orders)| orders).flatten() {
@@ -1753,11 +1743,7 @@ fn test_process_get_orderbook_request() {
 #[test]
 fn test_process_get_orderbook_request_limit() {
     let (ctx, pubkey, secret) = make_ctx_for_tests();
-
-    let ordermatch_ctx = Arc::new(OrdermatchContext::default());
-    let ordermatch_ctx_clone = ordermatch_ctx.clone();
-    OrdermatchContext::from_ctx.mock_safe(move |_| MockResult::Return(Ok(ordermatch_ctx_clone.clone())));
-
+    let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     let mut orderbook = ordermatch_ctx.orderbook.lock();
 
     let orders = make_random_orders(
@@ -3180,9 +3166,7 @@ fn check_order_serde() {
 
 #[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 ctx = mm_ctx_with_iguana(None);
 
     let ordermatch_ctx = OrdermatchContext::from_ctx(&ctx).unwrap();
     let mut maker_orders_ctx = ordermatch_ctx.maker_orders_ctx.lock();
diff --git a/mm2src/mm2_main/src/rpc.rs b/mm2src/mm2_main/src/rpc.rs
index 226a7783a4..c94ec2714f 100644
--- a/mm2src/mm2_main/src/rpc.rs
+++ b/mm2src/mm2_main/src/rpc.rs
@@ -21,12 +21,11 @@
 //
 
 use crate::mm2::rpc::rate_limiter::RateLimitError;
-#[cfg(not(target_arch = "wasm32"))] use common::log::warn;
-use common::log::{error, info};
-use common::{err_to_rpc_json_string, err_tp_rpc_json, HttpStatusCode};
+use common::log::error;
+use common::{err_to_rpc_json_string, err_tp_rpc_json, HttpStatusCode, APPLICATION_JSON};
 use derive_more::Display;
 use futures::future::{join_all, FutureExt};
-use http::header::{HeaderValue, ACCESS_CONTROL_ALLOW_ORIGIN};
+use http::header::{HeaderValue, ACCESS_CONTROL_ALLOW_ORIGIN, CONTENT_TYPE};
 use http::request::Parts;
 use http::{Method, Request, Response, StatusCode};
 #[cfg(not(target_arch = "wasm32"))]
@@ -277,7 +276,7 @@ async fn rpc_service(req: Request<Body>, ctx_h: u32, client: SocketAddr) -> Resp
     if is_invalid_input {
         return Response::builder()
             .status(500)
-            .header("Content-Type", "application/json")
+            .header(CONTENT_TYPE, APPLICATION_JSON)
             .body(Body::from(err_to_rpc_json_string("Invalid input")))
             .unwrap();
     }
@@ -286,7 +285,7 @@ async fn rpc_service(req: Request<Body>, ctx_h: u32, client: SocketAddr) -> Resp
     let res = try_sf!(process_rpc_request(ctx, req, req_json, client).await, ACCESS_CONTROL_ALLOW_ORIGIN => rpc_cors);
     let (mut parts, body) = res.into_parts();
     parts.headers.insert(ACCESS_CONTROL_ALLOW_ORIGIN, rpc_cors);
-    let body_escaped = match std::str::from_utf8(&*body) {
+    let body_escaped = match std::str::from_utf8(&body) {
         Ok(body_utf8) => {
             let escaped = escape_answer(body_utf8);
             escaped.as_bytes().to_vec()
@@ -294,7 +293,7 @@ async fn rpc_service(req: Request<Body>, ctx_h: u32, client: SocketAddr) -> Resp
         Err(_) => {
             return Response::builder()
                 .status(500)
-                .header("Content-Type", "application/json")
+                .header(CONTENT_TYPE, APPLICATION_JSON)
                 .body(Body::from(err_to_rpc_json_string("Non UTF-8 output")))
                 .unwrap();
         },
@@ -332,24 +331,18 @@ pub extern "C" fn spawn_rpc(ctx_h: u32) {
         }
     });
 
-    let (shutdown_tx, shutdown_rx) = futures::channel::oneshot::channel::<()>();
-    let mut shutdown_tx = Some(shutdown_tx);
-    ctx.on_stop(Box::new(move || {
-        if let Some(shutdown_tx) = shutdown_tx.take() {
-            info!("on_stop] firing shutdown_tx!");
-            if shutdown_tx.send(()).is_err() {
-                warn!("on_stop] shutdown_tx already closed");
-            }
-            Ok(())
-        } else {
-            ERR!("on_stop callback called twice!")
-        }
-    }));
+    let shutdown_fut = match ctx.graceful_shutdown_registry.register_listener() {
+        Ok(shutdown_fut) => shutdown_fut,
+        Err(e) => {
+            error!("MmCtx seems to be stopped already: {e}");
+            return;
+        },
+    };
 
     let server = server
         .http1_half_close(false)
         .serve(make_svc)
-        .with_graceful_shutdown(shutdown_rx.then(|_| futures::future::ready(())));
+        .with_graceful_shutdown(shutdown_fut);
 
     let server = server.then(|r| {
         if let Err(err) = r {
@@ -359,7 +352,13 @@ pub extern "C" fn spawn_rpc(ctx_h: u32) {
     });
 
     let rpc_ip_port = ctx.rpc_ip_port().unwrap();
-    CORE.0.spawn({
+
+    // As it's said in the [issue](https://github.com/hyperium/tonic/issues/330):
+    //
+    // Aborting the server future will forcefully cancel all connections and not perform a proper drain/shutdown.
+    // While using the special shutdown methods on the server will allow hyper to gracefully drain all connections
+    // and gracefully close connections.
+    common::executor::spawn({
         log_tag!(
             ctx,
             "😉";
@@ -375,6 +374,7 @@ pub extern "C" fn spawn_rpc(ctx_h: u32) {
 
 #[cfg(target_arch = "wasm32")]
 pub fn spawn_rpc(ctx_h: u32) {
+    use common::executor::SpawnFuture;
     use futures::StreamExt;
     use mm2_rpc::wasm_rpc;
     use std::sync::Mutex;
@@ -398,13 +398,19 @@ pub fn spawn_rpc(ctx_h: u32) {
                 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);
-            }
+            let spawner = ctx.spawner();
+            let request_fut = async move {
+                let response = process_json_request(ctx, request_json, client).await;
+                if let Err(e) = response_tx.send(response) {
+                    error!("Response is not processed: {:?}", e);
+                }
+            };
+            // Spawn the `request_fut` so the requests can be processed asynchronously.
+            // Fixes: https://github.com/KomodoPlatform/atomicDEX-API/issues/1616
+            spawner.spawn(request_fut);
         }
     };
-    common::executor::spawn(fut);
+    ctx.spawner().spawn(fut);
 
     // even if the [`MmCtx::wasm_rpc`] is initialized already, the spawned future above will be shutdown
     if let Err(e) = ctx.wasm_rpc.pin(request_tx) {
diff --git a/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs
index 51f9f6f7b9..a553ff9c51 100644
--- a/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs
+++ b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher.rs
@@ -1,19 +1,29 @@
 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_native_dex::init_hw::{cancel_init_trezor, init_trezor, init_trezor_status, init_trezor_user_action};
+#[cfg(target_arch = "wasm32")]
+use crate::mm2::lp_native_dex::init_metamask::{cancel_connect_metamask, connect_metamask, connect_metamask_status};
 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;
+            mm2::lp_swap::{get_locked_amount_rpc, max_maker_vol, recreate_swap_data, trade_preimage_rpc},
+            mm2::rpc::lp_commands::{get_public_key, get_public_key_hash, get_shared_db_id, trezor_connection_status}};
+use coins::eth::EthCoin;
 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::rpc_command::{account_balance::account_balance,
+                         get_current_mtp::get_current_mtp_rpc,
+                         get_enabled_coins::get_enabled_coins,
+                         get_new_address::{cancel_get_new_address, get_new_address, init_get_new_address,
+                                           init_get_new_address_status, init_get_new_address_user_action},
+                         init_account_balance::{cancel_account_balance, init_account_balance,
+                                                init_account_balance_status},
+                         init_create_account::{cancel_create_new_account, init_create_new_account,
+                                               init_create_new_account_status, init_create_new_account_user_action},
+                         init_scan_for_new_addresses::{cancel_scan_for_new_addresses, init_scan_for_new_addresses,
+                                                       init_scan_for_new_addresses_status},
+                         init_withdraw::{cancel_withdraw, init_withdraw, withdraw_status, withdraw_user_action}};
+use coins::tendermint::{TendermintCoin, TendermintToken};
 use coins::utxo::bch::BchCoin;
 use coins::utxo::qtum::QtumCoin;
 use coins::utxo::slp::SlpToken;
@@ -22,7 +32,8 @@ use coins::{add_delegation, get_raw_transaction, get_staking_infos, remove_deleg
             withdraw};
 #[cfg(all(not(target_os = "ios"), not(target_os = "android"), not(target_arch = "wasm32")))]
 use coins::{SolanaCoin, SplToken};
-use coins_activation::{enable_l2, enable_platform_coin_with_tokens, enable_token, init_standalone_coin,
+use coins_activation::{cancel_init_l2, cancel_init_standalone_coin, enable_platform_coin_with_tokens, enable_token,
+                       init_l2, init_l2_status, init_l2_user_action, init_standalone_coin,
                        init_standalone_coin_status, init_standalone_coin_user_action};
 use common::log::{error, warn};
 use common::HttpStatusCode;
@@ -36,9 +47,7 @@ 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::lightning::LightningCoin;
     use coins::z_coin::ZCoin;
 }
 
@@ -119,6 +128,21 @@ async fn auth(request: &MmRpcRequest, ctx: &MmArc, client: &SocketAddr) -> Dispa
 }
 
 async fn dispatcher_v2(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Response<Vec<u8>>> {
+    if let Some(task_method) = request.method.strip_prefix("task::") {
+        let task_method = task_method.to_string();
+        return rpc_task_dispatcher(request, ctx, task_method).await;
+    }
+    if let Some(gui_storage_method) = request.method.strip_prefix("gui_storage::") {
+        let gui_storage_method = gui_storage_method.to_owned();
+        return gui_storage_dispatcher(request, ctx, &gui_storage_method).await;
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    if let Some(lightning_method) = request.method.strip_prefix("lightning::") {
+        let lightning_method = lightning_method.to_owned();
+        return lightning_dispatcher(request, ctx, &lightning_method).await;
+    }
+
     match request.method.as_str() {
         "account_balance" => handle_mmrpc(ctx, request, account_balance).await,
         "add_delegation" => handle_mmrpc(ctx, request, add_delegation).await,
@@ -126,28 +150,22 @@ async fn dispatcher_v2(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Re
         "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,
+        "enable_eth_with_tokens" => handle_mmrpc(ctx, request, enable_platform_coin_with_tokens::<EthCoin>).await,
+        "enable_erc20" => handle_mmrpc(ctx, request, enable_token::<EthCoin>).await,
+        "enable_tendermint_with_assets" => {
+            handle_mmrpc(ctx, request, enable_platform_coin_with_tokens::<TendermintCoin>).await
+        },
+        "enable_tendermint_token" => handle_mmrpc(ctx, request, enable_token::<TendermintToken>).await,
+        "get_current_mtp" => handle_mmrpc(ctx, request, get_current_mtp_rpc).await,
+        "get_enabled_coins" => handle_mmrpc(ctx, request, get_enabled_coins).await,
+        "get_locked_amount" => handle_mmrpc(ctx, request, get_locked_amount_rpc).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_shared_db_id" => handle_mmrpc(ctx, request, get_shared_db_id).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,
+        "max_maker_vol" => handle_mmrpc(ctx, request, max_maker_vol).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,
@@ -159,28 +177,12 @@ async fn dispatcher_v2(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Re
         "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,
+        "trezor_connection_status" => handle_mmrpc(ctx, request, trezor_connection_status).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,
             #[cfg(all(not(target_os = "ios"), not(target_os = "android")))]
             "enable_solana_with_tokens" => {
                 handle_mmrpc(ctx, request, enable_platform_coin_with_tokens::<SolanaCoin>).await
@@ -194,3 +196,135 @@ async fn dispatcher_v2(request: MmRpcRequest, ctx: MmArc) -> DispatcherResult<Re
         _ => MmError::err(DispatcherError::NoSuchMethod),
     }
 }
+
+/// `task` dispatcher.
+/// The full path is expected to be `task::method::action`.
+/// For example, `task::withdraw::init`, `task::create_new_account::init` etc.
+///
+/// # Note
+///
+/// `task_method` is a method name with the `task::` prefix removed.
+async fn rpc_task_dispatcher(
+    request: MmRpcRequest,
+    ctx: MmArc,
+    task_method: String,
+) -> DispatcherResult<Response<Vec<u8>>> {
+    match task_method.as_str() {
+        "account_balance::cancel" => handle_mmrpc(ctx, request, cancel_account_balance).await,
+        "account_balance::init" => handle_mmrpc(ctx, request, init_account_balance).await,
+        "account_balance::status" => handle_mmrpc(ctx, request, init_account_balance_status).await,
+        "create_new_account::cancel" => handle_mmrpc(ctx, request, cancel_create_new_account).await,
+        "create_new_account::init" => handle_mmrpc(ctx, request, init_create_new_account).await,
+        "create_new_account::status" => handle_mmrpc(ctx, request, init_create_new_account_status).await,
+        "create_new_account::user_action" => handle_mmrpc(ctx, request, init_create_new_account_user_action).await,
+        "enable_qtum::cancel" => handle_mmrpc(ctx, request, cancel_init_standalone_coin::<QtumCoin>).await,
+        "enable_qtum::init" => handle_mmrpc(ctx, request, init_standalone_coin::<QtumCoin>).await,
+        "enable_qtum::status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<QtumCoin>).await,
+        "enable_qtum::user_action" => handle_mmrpc(ctx, request, init_standalone_coin_user_action::<QtumCoin>).await,
+        "enable_utxo::cancel" => handle_mmrpc(ctx, request, cancel_init_standalone_coin::<UtxoStandardCoin>).await,
+        "enable_utxo::init" => handle_mmrpc(ctx, request, init_standalone_coin::<UtxoStandardCoin>).await,
+        "enable_utxo::status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<UtxoStandardCoin>).await,
+        "enable_utxo::user_action" => {
+            handle_mmrpc(ctx, request, init_standalone_coin_user_action::<UtxoStandardCoin>).await
+        },
+        "get_new_address::cancel" => handle_mmrpc(ctx, request, cancel_get_new_address).await,
+        "get_new_address::init" => handle_mmrpc(ctx, request, init_get_new_address).await,
+        "get_new_address::status" => handle_mmrpc(ctx, request, init_get_new_address_status).await,
+        "get_new_address::user_action" => handle_mmrpc(ctx, request, init_get_new_address_user_action).await,
+        "scan_for_new_addresses::cancel" => handle_mmrpc(ctx, request, cancel_scan_for_new_addresses).await,
+        "scan_for_new_addresses::init" => handle_mmrpc(ctx, request, init_scan_for_new_addresses).await,
+        "scan_for_new_addresses::status" => handle_mmrpc(ctx, request, init_scan_for_new_addresses_status).await,
+        "init_trezor::cancel" => handle_mmrpc(ctx, request, cancel_init_trezor).await,
+        "init_trezor::init" => 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,
+        "withdraw::cancel" => handle_mmrpc(ctx, request, cancel_withdraw).await,
+        "withdraw::init" => handle_mmrpc(ctx, request, init_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 {
+            "enable_lightning::cancel" => handle_mmrpc(ctx, request, cancel_init_l2::<LightningCoin>).await,
+            "enable_lightning::init" => handle_mmrpc(ctx, request, init_l2::<LightningCoin>).await,
+            "enable_lightning::status" => handle_mmrpc(ctx, request, init_l2_status::<LightningCoin>).await,
+            "enable_lightning::user_action" => handle_mmrpc(ctx, request, init_l2_user_action::<LightningCoin>).await,
+            "enable_z_coin::cancel" => handle_mmrpc(ctx, request, cancel_init_standalone_coin::<ZCoin>).await,
+            "enable_z_coin::init" => handle_mmrpc(ctx, request, init_standalone_coin::<ZCoin>).await,
+            "enable_z_coin::status" => handle_mmrpc(ctx, request, init_standalone_coin_status::<ZCoin>).await,
+            "enable_z_coin::user_action" => handle_mmrpc(ctx, request, init_standalone_coin_user_action::<ZCoin>).await,
+            _ => MmError::err(DispatcherError::NoSuchMethod),
+        },
+        #[cfg(target_arch = "wasm32")]
+        wasm_only_methods => match wasm_only_methods {
+            "connect_metamask::cancel" => handle_mmrpc(ctx, request, cancel_connect_metamask).await,
+            "connect_metamask::init" => handle_mmrpc(ctx, request, connect_metamask).await,
+            "connect_metamask::status" => handle_mmrpc(ctx, request, connect_metamask_status).await,
+            _ => MmError::err(DispatcherError::NoSuchMethod),
+        },
+    }
+}
+
+/// `gui_storage` dispatcher.
+///
+/// # Note
+///
+/// `gui_storage_method` is a method name with the `gui_storage::` prefix removed.
+async fn gui_storage_dispatcher(
+    request: MmRpcRequest,
+    ctx: MmArc,
+    gui_storage_method: &str,
+) -> DispatcherResult<Response<Vec<u8>>> {
+    use mm2_gui_storage::rpc_commands as gui_storage_rpc;
+
+    match gui_storage_method {
+        "activate_coins" => handle_mmrpc(ctx, request, gui_storage_rpc::activate_coins).await,
+        "add_account" => handle_mmrpc(ctx, request, gui_storage_rpc::add_account).await,
+        "deactivate_coins" => handle_mmrpc(ctx, request, gui_storage_rpc::deactivate_coins).await,
+        "delete_account" => handle_mmrpc(ctx, request, gui_storage_rpc::delete_account).await,
+        "enable_account" => handle_mmrpc(ctx, request, gui_storage_rpc::enable_account).await,
+        "get_accounts" => handle_mmrpc(ctx, request, gui_storage_rpc::get_accounts).await,
+        "get_account_coins" => handle_mmrpc(ctx, request, gui_storage_rpc::get_account_coins).await,
+        "get_enabled_account" => handle_mmrpc(ctx, request, gui_storage_rpc::get_enabled_account).await,
+        "set_account_balance" => handle_mmrpc(ctx, request, gui_storage_rpc::set_account_balance).await,
+        "set_account_description" => handle_mmrpc(ctx, request, gui_storage_rpc::set_account_description).await,
+        "set_account_name" => handle_mmrpc(ctx, request, gui_storage_rpc::set_account_name).await,
+        _ => MmError::err(DispatcherError::NoSuchMethod),
+    }
+}
+
+/// `lightning` dispatcher.
+///
+/// # Note
+///
+/// `lightning_method` is a method name with the `lightning::` prefix removed.
+#[cfg(not(target_arch = "wasm32"))]
+async fn lightning_dispatcher(
+    request: MmRpcRequest,
+    ctx: MmArc,
+    lightning_method: &str,
+) -> DispatcherResult<Response<Vec<u8>>> {
+    use coins::rpc_command::lightning::{channels, nodes, payments};
+
+    match lightning_method {
+        "channels::close_channel" => handle_mmrpc(ctx, request, channels::close_channel).await,
+        "channels::get_channel_details" => handle_mmrpc(ctx, request, channels::get_channel_details).await,
+        "channels::get_claimable_balances" => handle_mmrpc(ctx, request, channels::get_claimable_balances).await,
+        "channels::list_closed_channels_by_filter" => {
+            handle_mmrpc(ctx, request, channels::list_closed_channels_by_filter).await
+        },
+        "channels::list_open_channels_by_filter" => {
+            handle_mmrpc(ctx, request, channels::list_open_channels_by_filter).await
+        },
+        "channels::open_channel" => handle_mmrpc(ctx, request, channels::open_channel).await,
+        "channels::update_channel" => handle_mmrpc(ctx, request, channels::update_channel).await,
+        "nodes::add_trusted_node" => handle_mmrpc(ctx, request, nodes::add_trusted_node).await,
+        "nodes::connect_to_node" => handle_mmrpc(ctx, request, nodes::connect_to_node).await,
+        "nodes::list_trusted_nodes" => handle_mmrpc(ctx, request, nodes::list_trusted_nodes).await,
+        "nodes::remove_trusted_node" => handle_mmrpc(ctx, request, nodes::remove_trusted_node).await,
+        "payments::generate_invoice" => handle_mmrpc(ctx, request, payments::generate_invoice).await,
+        "payments::get_payment_details" => handle_mmrpc(ctx, request, payments::get_payment_details).await,
+        "payments::list_payments_by_filter" => handle_mmrpc(ctx, request, payments::list_payments_by_filter).await,
+        "payments::send_payment" => handle_mmrpc(ctx, request, payments::send_payment).await,
+        _ => MmError::err(DispatcherError::NoSuchMethod),
+    }
+}
diff --git a/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
index fec2f6022f..795b76cee0 100644
--- a/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
+++ b/mm2src/mm2_main/src/rpc/dispatcher/dispatcher_legacy.rs
@@ -112,7 +112,7 @@ pub fn dispatcher(req: Json, ctx: MmArc) -> DispatcherRes {
         "unban_pubkeys" => hyres(unban_pubkeys_rpc(ctx, req)),
         "update_maker_order" => hyres(update_maker_order_rpc(ctx, req)),
         "validateaddress" => hyres(validate_address(ctx, req)),
-        "version" => version(),
+        "version" => version(ctx),
         "withdraw" => hyres(into_legacy::withdraw(ctx, req)),
         _ => return DispatcherRes::NoMatch(req),
     })
diff --git a/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
index 6cad4b4dee..ae992c6d3e 100644
--- a/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
+++ b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands.rs
@@ -1,5 +1,5 @@
 use common::HttpStatusCode;
-use crypto::{CryptoCtx, CryptoInitError};
+use crypto::{CryptoCtx, CryptoCtxError, HwConnectionStatus, HwPubkey};
 use derive_more::Display;
 use http::StatusCode;
 use mm2_core::mm_ctx::MmArc;
@@ -8,6 +8,8 @@ use rpc::v1::types::H160 as H160Json;
 use serde_json::Value as Json;
 
 pub type GetPublicKeyRpcResult<T> = Result<T, MmError<GetPublicKeyError>>;
+pub type GetSharedDbIdResult<T> = Result<T, MmError<GetSharedDbIdError>>;
+pub type GetSharedDbIdError = GetPublicKeyError;
 
 #[derive(Serialize, Display, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
@@ -15,8 +17,8 @@ pub enum GetPublicKeyError {
     Internal(String),
 }
 
-impl From<CryptoInitError> for GetPublicKeyError {
-    fn from(_: CryptoInitError) -> Self { GetPublicKeyError::Internal("public_key not available".to_string()) }
+impl From<CryptoCtxError> for GetPublicKeyError {
+    fn from(_: CryptoCtxError) -> Self { GetPublicKeyError::Internal("public_key not available".to_string()) }
 }
 
 #[derive(Serialize)]
@@ -33,7 +35,7 @@ impl HttpStatusCode for GetPublicKeyError {
 }
 
 pub async fn get_public_key(ctx: MmArc, _req: Json) -> GetPublicKeyRpcResult<GetPublicKeyResponse> {
-    let public_key = CryptoCtx::from_ctx(&ctx)?.secp256k1_pubkey().to_string();
+    let public_key = CryptoCtx::from_ctx(&ctx)?.mm2_internal_pubkey().to_string();
     Ok(GetPublicKeyResponse { public_key })
 }
 
@@ -46,3 +48,69 @@ pub async fn get_public_key_hash(ctx: MmArc, _req: Json) -> GetPublicKeyRpcResul
     let public_key_hash = ctx.rmd160().to_owned().into();
     Ok(GetPublicKeyHashResponse { public_key_hash })
 }
+
+#[derive(Serialize)]
+pub struct GetSharedDbIdResponse {
+    shared_db_id: H160Json,
+}
+
+pub async fn get_shared_db_id(ctx: MmArc, _req: Json) -> GetSharedDbIdResult<GetSharedDbIdResponse> {
+    let shared_db_id = ctx.shared_db_id().to_owned().into();
+    Ok(GetSharedDbIdResponse { shared_db_id })
+}
+
+#[derive(Serialize, Display, SerializeErrorType)]
+#[serde(tag = "error_type", content = "error_data")]
+pub enum TrezorConnectionError {
+    #[display(fmt = "Trezor hasn't been initialized yet")]
+    TrezorNotInitialized,
+    #[display(fmt = "Found unexpected device. Please re-initialize Hardware wallet")]
+    FoundUnexpectedDevice,
+    Internal(String),
+}
+
+impl From<CryptoCtxError> for TrezorConnectionError {
+    fn from(e: CryptoCtxError) -> Self { TrezorConnectionError::Internal(format!("'CryptoCtx' is not available: {e}")) }
+}
+
+impl HttpStatusCode for TrezorConnectionError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            TrezorConnectionError::TrezorNotInitialized => StatusCode::BAD_REQUEST,
+            TrezorConnectionError::FoundUnexpectedDevice | TrezorConnectionError::Internal(_) => {
+                StatusCode::INTERNAL_SERVER_ERROR
+            },
+        }
+    }
+}
+
+#[derive(Deserialize)]
+pub struct TrezorConnectionStatusReq {
+    /// Can be used to make sure that the Trezor device is expected.
+    device_pubkey: Option<HwPubkey>,
+}
+
+#[derive(Serialize)]
+pub struct TrezorConnectionStatusRes {
+    status: HwConnectionStatus,
+}
+
+pub async fn trezor_connection_status(
+    ctx: MmArc,
+    req: TrezorConnectionStatusReq,
+) -> MmResult<TrezorConnectionStatusRes, TrezorConnectionError> {
+    let crypto_ctx = CryptoCtx::from_ctx(&ctx)?;
+    let hw_ctx = crypto_ctx
+        .hw_ctx()
+        .or_mm_err(|| TrezorConnectionError::TrezorNotInitialized)?;
+
+    if let Some(expected) = req.device_pubkey {
+        if hw_ctx.hw_pubkey() != expected {
+            return MmError::err(TrezorConnectionError::FoundUnexpectedDevice);
+        }
+    }
+
+    Ok(TrezorConnectionStatusRes {
+        status: hw_ctx.trezor_connection_status().await,
+    })
+}
diff --git a/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
index d78d756f4a..0aa615739a 100644
--- a/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
+++ b/mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
@@ -19,63 +19,105 @@
 //  marketmaker
 //
 
-use coins::{disable_coin as disable_coin_impl, lp_coinfind, lp_coininit, MmCoinEnum};
-use common::executor::{spawn, Timer};
+use coins::{lp_coinfind, lp_coininit, CoinsContext, MmCoinEnum};
+use common::executor::Timer;
 use common::log::error;
-use common::mm_metrics::MetricsOps;
 use common::{rpc_err_response, rpc_response, HyRes};
 use futures::compat::Future01CompatExt;
 use http::Response;
+use itertools::Itertools;
 use mm2_core::mm_ctx::MmArc;
+use mm2_metrics::MetricsOps;
 use mm2_number::{construct_detailed, BigDecimal};
 use serde_json::{self as json, Value as Json};
 use std::borrow::Cow;
+use std::collections::HashSet;
+use std::iter::Extend;
+use uuid::Uuid;
 
 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, tx_helper_topic};
+use crate::mm2::lp_ordermatch::{cancel_orders_by, get_matching_orders, CancelBy};
+use crate::mm2::lp_swap::{active_swaps_using_coins, tx_helper_topic, watcher_topic};
 use crate::mm2::MmVersionResult;
 
+const INTERNAL_SERVER_ERROR_CODE: u16 = 500;
+const RESPONSE_OK_STATUS_CODE: u16 = 200;
+
+pub fn disable_coin_err(
+    error: String,
+    matching: &[Uuid],
+    cancelled: &[Uuid],
+    active_swaps: &[Uuid],
+    dependent_tokens: &[String],
+) -> Result<Response<Vec<u8>>, String> {
+    let err = json!({
+        "error": error,
+        "orders": {
+            "matching": matching,
+            "cancelled": cancelled
+        },
+        "active_swaps": active_swaps,
+        "dependent_tokens": dependent_tokens,
+    });
+    Response::builder()
+        .status(INTERNAL_SERVER_ERROR_CODE)
+        .body(json::to_vec(&err).unwrap())
+        .map_err(|e| ERRL!("{}", e))
+}
+
 /// Attempts to disable the coin
 pub async fn disable_coin(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 {
+    let coin = match lp_coinfind(&ctx, &ticker).await {
         Ok(Some(t)) => t,
         Ok(None) => return ERR!("No such coin: {}", ticker),
         Err(err) => return ERR!("!lp_coinfind({}): ", err),
     };
-    let swaps = try_s!(active_swaps_using_coin(&ctx, &ticker));
-    if !swaps.is_empty() {
-        let err = json!({
-            "error": format!("There're active swaps using {}", ticker),
-            "swaps": swaps,
-        });
-        return Response::builder()
-            .status(500)
-            .body(json::to_vec(&err).unwrap())
-            .map_err(|e| ERRL!("{}", e));
+
+    // Get all matching orders and active swaps.
+    let coins_to_disable: HashSet<_> = std::iter::once(ticker.clone()).collect();
+    let active_swaps = try_s!(active_swaps_using_coins(&ctx, &coins_to_disable));
+    let still_matching_orders = try_s!(get_matching_orders(&ctx, &coins_to_disable).await);
+
+    let coins_ctx = try_s!(CoinsContext::from_ctx(&ctx));
+    // Convert `HashSet<String>` into the sorted `Vec<String>`.
+    let dependent_tokens: Vec<_> = coins_ctx
+        .get_dependent_tokens(&ticker)
+        .await
+        .into_iter()
+        .sorted()
+        .collect();
+
+    // Return an error if:
+    // 1. There are matching orders or active swaps.
+    // 2. A platform coin is to be disabled and there are tokens dependent on it.
+    if !active_swaps.is_empty() || !still_matching_orders.is_empty() || !dependent_tokens.is_empty() {
+        let err = format!("There are currently matching orders, active swaps, or tokens dependent on '{ticker}'");
+        return disable_coin_err(err, &still_matching_orders, &[], &active_swaps, &dependent_tokens);
     }
-    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": format!("There're currently matching orders using {}", ticker),
-            "orders": {
-                "matching": still_matching,
-                "cancelled": cancelled,
-            }
-        });
-        return Response::builder()
-            .status(500)
-            .body(json::to_vec(&err).unwrap())
-            .map_err(|e| ERRL!("{}", e));
+
+    // Proceed with diabling the coin/tokens.
+    let mut cancelled_orders = vec![];
+    log!("disabling {ticker} coin");
+    let cancelled_and_matching_orders = cancel_orders_by(&ctx, CancelBy::Coin {
+        ticker: ticker.to_string(),
+    })
+    .await;
+    match cancelled_and_matching_orders {
+        Ok((cancelled, _)) => {
+            cancelled_orders.extend(cancelled);
+        },
+        Err(err) => {
+            return disable_coin_err(err, &still_matching_orders, &cancelled_orders, &active_swaps, &[]);
+        },
     }
 
-    try_s!(disable_coin_impl(&ctx, &ticker).await);
+    coins_ctx.remove_coin(coin).await;
     let res = json!({
         "result": {
             "coin": ticker,
-            "cancelled_orders": cancelled,
+            "cancelled_orders": cancelled_orders,
         }
     });
     Response::builder()
@@ -136,6 +178,9 @@ pub async fn enable(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String>
     if coin.is_utxo_in_native_mode() {
         subscribe_to_topic(&ctx, tx_helper_topic(coin.ticker()));
     }
+    if ctx.is_watcher() {
+        subscribe_to_topic(&ctx, watcher_topic(coin.ticker()));
+    }
 
     Ok(res)
 }
@@ -143,7 +188,7 @@ pub async fn enable(ctx: MmArc, req: Json) -> Result<Response<Vec<u8>>, String>
 #[cfg(target_arch = "wasm32")]
 pub fn help() -> HyRes {
     rpc_response(
-        500,
+        INTERNAL_SERVER_ERROR_CODE,
         json!({
             "error":"'help' is only supported in native mode"
         })
@@ -154,7 +199,7 @@ pub fn help() -> HyRes {
 #[cfg(not(target_arch = "wasm32"))]
 pub fn help() -> HyRes {
     rpc_response(
-        200,
+        RESPONSE_OK_STATUS_CODE,
         "
         buy(base, rel, price, relvolume, timeout=10, duration=3600)
         electrum(coin, urls)
@@ -176,8 +221,8 @@ pub fn help() -> HyRes {
 /// Get MarketMaker session metrics
 pub fn metrics(ctx: MmArc) -> HyRes {
     match ctx.metrics.collect_json().map(|value| value.to_string()) {
-        Ok(response) => rpc_response(200, response),
-        Err(err) => rpc_err_response(500, &err),
+        Ok(response) => rpc_response(RESPONSE_OK_STATUS_CODE, response),
+        Err(err) => rpc_err_response(INTERNAL_SERVER_ERROR_CODE, &err.to_string()),
     }
 }
 
@@ -204,12 +249,18 @@ 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 {
+    let fut = async move {
         Timer::sleep(0.05).await;
         if let Err(e) = ctx.stop() {
             error!("Error stopping MmCtx: {}", e);
         }
-    });
+    };
+
+    // Please note we shouldn't use `MmCtx::spawner` to spawn this future,
+    // as all spawned futures will be dropped on `MmArc::stop`, so this future will be dropped as well,
+    // and it may lead to an unexpected behaviour.
+    common::executor::spawn(fut);
+
     let res = json!({
         "result": "success"
     });
@@ -247,7 +298,14 @@ 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, MmVersionResult::new().to_json().to_string()) }
+pub fn version(ctx: MmArc) -> HyRes {
+    rpc_response(
+        RESPONSE_OK_STATUS_CODE,
+        MmVersionResult::new(ctx.mm_version.clone(), ctx.datetime.clone())
+            .to_json()
+            .to_string(),
+    )
+}
 
 pub async fn get_peers_info(ctx: MmArc) -> Result<Response<Vec<u8>>, String> {
     use crate::mm2::lp_network::P2PContext;
diff --git a/mm2src/mm2_main/src/wasm_tests.rs b/mm2src/mm2_main/src/wasm_tests.rs
new file mode 100644
index 0000000000..19a85033ea
--- /dev/null
+++ b/mm2src/mm2_main/src/wasm_tests.rs
@@ -0,0 +1,166 @@
+use crate::mm2::lp_init;
+use common::executor::{spawn, Timer};
+use common::log::wasm_log::register_wasm_log;
+use mm2_core::mm_ctx::MmArc;
+use mm2_test_helpers::electrums::{morty_electrums, rick_electrums};
+use mm2_test_helpers::for_tests::{check_recent_swaps, enable_electrum_json, morty_conf, rick_conf, start_swaps,
+                                  test_qrc20_history_impl, wait_for_swaps_finish_and_check_status, MarketMakerIt,
+                                  Mm2InitPrivKeyPolicy, Mm2TestConf, Mm2TestConfForSwap, MORTY, RICK};
+use mm2_test_helpers::get_passphrase;
+use mm2_test_helpers::structs::OrderbookResponse;
+use serde_json::json;
+use wasm_bindgen_test::wasm_bindgen_test;
+
+/// Starts the WASM version of MM.
+fn wasm_start(ctx: MmArc) {
+    spawn(async move {
+        lp_init(ctx, "TEST".into(), "TEST".into()).await.unwrap();
+    })
+}
+
+/// This function runs Alice and Bob nodes, activates coins, starts swaps,
+/// and then immediately stops the nodes to check if `MmArc` is dropped in a short period.
+async fn test_mm2_stops_impl(
+    pairs: &[(&'static str, &'static str)],
+    maker_price: f64,
+    taker_price: f64,
+    volume: f64,
+    stop_timeout_ms: u64,
+) {
+    let coins = json!([rick_conf(), morty_conf()]);
+
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mut mm_bob = MarketMakerIt::start_async(bob_conf.conf, bob_conf.rpc_password, Some(wasm_start))
+        .await
+        .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    Timer::sleep(1.).await;
+
+    let alice_conf = Mm2TestConf::light_node(&alice_passphrase, &coins, &[&mm_bob.my_seed_addr()]);
+    let mut mm_alice = MarketMakerIt::start_async(alice_conf.conf, alice_conf.rpc_password, Some(wasm_start))
+        .await
+        .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+
+    // Enable coins on Bob side. Print the replies in case we need the address.
+    let rc = enable_electrum_json(&mm_bob, RICK, true, rick_electrums()).await;
+    log!("enable RICK (bob): {:?}", rc);
+
+    let rc = enable_electrum_json(&mm_bob, MORTY, true, morty_electrums()).await;
+    log!("enable MORTY (bob): {:?}", rc);
+
+    // Enable coins on Alice side. Print the replies in case we need the address.
+    let rc = enable_electrum_json(&mm_alice, RICK, true, rick_electrums()).await;
+    log!("enable RICK (bob): {:?}", rc);
+
+    let rc = enable_electrum_json(&mm_alice, MORTY, true, morty_electrums()).await;
+    log!("enable MORTY (bob): {:?}", rc);
+
+    start_swaps(&mut mm_bob, &mut mm_alice, pairs, maker_price, taker_price, volume).await;
+
+    mm_alice
+        .stop_and_wait_for_ctx_is_dropped(stop_timeout_ms)
+        .await
+        .unwrap();
+    mm_bob.stop_and_wait_for_ctx_is_dropped(stop_timeout_ms).await.unwrap();
+}
+
+#[wasm_bindgen_test]
+async fn test_mm2_stops_immediately() {
+    const STOP_TIMEOUT_MS: u64 = 1000;
+
+    register_wasm_log();
+
+    let pairs: &[_] = &[("RICK", "MORTY")];
+    test_mm2_stops_impl(pairs, 1., 1., 0.0001, STOP_TIMEOUT_MS).await;
+}
+
+#[wasm_bindgen_test]
+async fn test_qrc20_tx_history() { test_qrc20_history_impl(Some(wasm_start)).await }
+
+async fn trade_base_rel_electrum(
+    bob_priv_key_policy: Mm2InitPrivKeyPolicy,
+    alice_priv_key_policy: Mm2InitPrivKeyPolicy,
+    pairs: &[(&'static str, &'static str)],
+    maker_price: f64,
+    taker_price: f64,
+    volume: f64,
+) {
+    let coins = json!([rick_conf(), morty_conf(),]);
+
+    let bob_conf = Mm2TestConfForSwap::bob_conf_with_policy(bob_priv_key_policy, &coins);
+    let mut mm_bob = MarketMakerIt::start_async(bob_conf.conf, bob_conf.rpc_password, Some(wasm_start))
+        .await
+        .unwrap();
+
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    Timer::sleep(1.).await;
+
+    let alice_conf = Mm2TestConfForSwap::alice_conf_with_policy(alice_priv_key_policy, &coins, &mm_bob.my_seed_addr());
+    let mut mm_alice = MarketMakerIt::start_async(alice_conf.conf, alice_conf.rpc_password, Some(wasm_start))
+        .await
+        .unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+
+    // Enable coins on Bob side. Print the replies in case we need the address.
+    let rc = enable_electrum_json(&mm_bob, RICK, true, rick_electrums()).await;
+    log!("enable RICK (bob): {:?}", rc);
+
+    let rc = enable_electrum_json(&mm_bob, MORTY, true, morty_electrums()).await;
+    log!("enable MORTY (bob): {:?}", rc);
+
+    // Enable coins on Alice side. Print the replies in case we need the address.
+    let rc = enable_electrum_json(&mm_alice, RICK, true, rick_electrums()).await;
+    log!("enable RICK (bob): {:?}", rc);
+
+    let rc = enable_electrum_json(&mm_alice, MORTY, true, morty_electrums()).await;
+    log!("enable MORTY (bob): {:?}", rc);
+
+    let uuids = start_swaps(&mut mm_bob, &mut mm_alice, pairs, maker_price, taker_price, volume).await;
+
+    wait_for_swaps_finish_and_check_status(&mut mm_bob, &mut mm_alice, &uuids, volume, maker_price).await;
+
+    log!("Checking alice recent swaps..");
+    check_recent_swaps(&mm_alice, uuids.len()).await;
+    log!("Checking bob recent swaps..");
+    check_recent_swaps(&mm_bob, uuids.len()).await;
+    for (base, rel) in pairs.iter() {
+        log!("Get {}/{} orderbook", base, rel);
+        let rc = mm_bob
+            .rpc(&json! ({
+                "userpass": mm_bob.userpass,
+                "method": "orderbook",
+                "base": base,
+                "rel": rel,
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+        let bob_orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
+        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);
+    }
+
+    const STOP_TIMEOUT_MS: u64 = 1000;
+
+    mm_bob.stop_and_wait_for_ctx_is_dropped(STOP_TIMEOUT_MS).await.unwrap();
+    mm_alice
+        .stop_and_wait_for_ctx_is_dropped(STOP_TIMEOUT_MS)
+        .await
+        .unwrap();
+}
+
+#[wasm_bindgen_test]
+async fn trade_test_rick_and_morty() {
+    let bob_policy = Mm2InitPrivKeyPolicy::Iguana;
+    let alice_policy = Mm2InitPrivKeyPolicy::GlobalHDAccount(0);
+    let pairs: &[_] = &[("RICK", "MORTY")];
+    trade_base_rel_electrum(bob_policy, alice_policy, pairs, 1., 1., 0.0001).await;
+}
diff --git a/mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs b/mm2src/mm2_main/tests/docker_tests/docker_ordermatch_tests.rs
similarity index 94%
rename from mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/docker_ordermatch_tests.rs
index e7e45f9bad..8755c407d9 100644
--- a/mm2src/mm2_main/src/docker_tests/docker_ordermatch_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/docker_ordermatch_tests.rs
@@ -1,6 +1,13 @@
-use super::*;
+use crate::generate_utxo_coin_with_random_privkey;
+use crate::integration_tests_common::enable_native;
 use common::block_on;
+use mm2_number::BigDecimal;
 use mm2_test_helpers::for_tests::{mm_dump, MarketMakerIt};
+use mm2_test_helpers::structs::{BestOrdersResponse, BestOrdersV2Response, BuyOrSellRpcResult, MyOrdersRpcResult,
+                                OrderbookDepthResponse, OrderbookResponse, RpcV2Response, SetPriceResponse};
+use serde_json::Value as Json;
+use std::thread;
+use std::time::Duration;
 
 fn check_asks_num(mm: &MarketMakerIt, base: &str, rel: &str, expected: usize) {
     log!("Get {}/{} orderbook", base, rel);
@@ -12,7 +19,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();
+    let orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
@@ -34,7 +41,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();
+    let orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.bids.len(),
@@ -55,7 +62,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();
+    let orderbook_depth: OrderbookDepthResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook depth {:?}", orderbook_depth);
     for (pair, expected_depth) in pairs.iter().zip(expected) {
         let actual_depth = orderbook_depth
@@ -94,7 +101,7 @@ fn check_best_orders(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let best_orders: BestOrdersResponse = json::from_str(&rc.1).unwrap();
+    let best_orders: BestOrdersResponse = serde_json::from_str(&rc.1).unwrap();
     let orders = best_orders
         .result
         .get(ticker_in_response)
@@ -126,7 +133,7 @@ fn check_best_orders_v2_by_number(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let best_orders: RpcV2Response<BestOrdersV2Response> = serde_json::from_str(&rc.1).unwrap();
     let orders = best_orders
         .result
         .orders
@@ -158,7 +165,7 @@ fn check_best_orders_v2_by_volume(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!best_orders: {}", rc.1);
-    let best_orders: RpcV2Response<BestOrdersV2Response> = json::from_str(&rc.1).unwrap();
+    let best_orders: RpcV2Response<BestOrdersV2Response> = serde_json::from_str(&rc.1).unwrap();
     let orders = best_orders
         .result
         .orders
@@ -224,7 +231,7 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_maker() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let sell_result: SetPriceResponse = json::from_str(&rc.1).unwrap();
+    let sell_result: SetPriceResponse = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(sell_result.result.base, "MYCOIN-Custom");
     assert_eq!(sell_result.result.rel, "MYCOIN1-Custom");
     assert_eq!(sell_result.result.base_orderbook_ticker, Some("MYCOIN".to_owned()));
@@ -418,7 +425,7 @@ fn test_ordermatch_custom_orderbook_ticker_both_on_taker() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let buy_result: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
+    let buy_result: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(buy_result.result.base, "MYCOIN-Custom");
     assert_eq!(buy_result.result.rel, "MYCOIN1-Custom");
     assert_eq!(buy_result.result.base_orderbook_ticker, Some("MYCOIN".to_owned()));
@@ -491,7 +498,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let set_price: SetPriceResponse = json::from_str(&rc.1).unwrap();
+    let set_price: SetPriceResponse = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(set_price.result.base, "MYCOIN-Custom");
     assert_eq!(set_price.result.rel, "MYCOIN1");
     assert_eq!(set_price.result.base_orderbook_ticker, Some("MYCOIN".to_owned()));
@@ -556,7 +563,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_one() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let buy_result: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
+    let buy_result: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(buy_result.result.base, "MYCOIN");
     assert_eq!(buy_result.result.rel, "MYCOIN1-Custom");
     assert!(buy_result.result.base_orderbook_ticker.is_none());
@@ -632,7 +639,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let set_price: SetPriceResponse = json::from_str(&rc.1).unwrap();
+    let set_price: SetPriceResponse = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(set_price.result.base, "MYCOIN");
     assert_eq!(set_price.result.rel, "MYCOIN1-Custom");
     assert!(set_price.result.base_orderbook_ticker.is_none());
@@ -697,7 +704,7 @@ fn test_ordermatch_custom_orderbook_ticker_mixed_case_two() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let buy_result: BuyOrSellRpcResult = json::from_str(&rc.1).unwrap();
+    let buy_result: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(buy_result.result.base, "MYCOIN-Custom");
     assert_eq!(buy_result.result.rel, "MYCOIN1");
     assert_eq!(buy_result.result.base_orderbook_ticker, Some("MYCOIN".to_owned()));
@@ -763,7 +770,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    let set_price_res: SetPriceResponse = json::from_str(&rc.1).unwrap();
+    let set_price_res: SetPriceResponse = serde_json::from_str(&rc.1).unwrap();
 
     println!("set_price_res {:?}", set_price_res);
 
@@ -777,7 +784,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     .unwrap();
     assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
 
-    let withdraw: Json = json::from_str(&withdraw.1).unwrap();
+    let withdraw: Json = serde_json::from_str(&withdraw.1).unwrap();
 
     let send_raw = block_on(mm_maker.rpc(&json! ({
         "userpass": mm_maker.userpass,
@@ -802,7 +809,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    let orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
@@ -818,7 +825,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
-    let my_orders: MyOrdersRpcResult = json::from_str(&rc.1).unwrap();
+    let my_orders: MyOrdersRpcResult = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(my_orders.result.maker_orders.len(), 1);
 
     let my_order = my_orders.result.maker_orders.get(&set_price_res.result.uuid).unwrap();
@@ -842,7 +849,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    let orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook {:?}", orderbook);
     assert!(
         orderbook.asks.is_empty(),
@@ -865,7 +872,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     .unwrap();
     assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
 
-    let orderbook: OrderbookResponse = json::from_str(&rc.1).unwrap();
+    let orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
     log!("orderbook {:?}", orderbook);
     assert_eq!(
         orderbook.asks.len(),
@@ -881,7 +888,7 @@ fn test_zombie_order_after_balance_reduce_and_mm_restart() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
-    let my_orders: MyOrdersRpcResult = json::from_str(&rc.1).unwrap();
+    let my_orders: MyOrdersRpcResult = serde_json::from_str(&rc.1).unwrap();
     assert_eq!(my_orders.result.maker_orders.len(), 1);
 
     let my_order = my_orders.result.maker_orders.get(&set_price_res.result.uuid).unwrap();
diff --git a/mm2src/mm2_main/src/docker_tests/docker_tests_common.rs b/mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
similarity index 71%
rename from mm2src/mm2_main/src/docker_tests/docker_tests_common.rs
rename to mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
index f17b0db32b..9e81d2c3b3 100644
--- a/mm2src/mm2_main/src/docker_tests/docker_tests_common.rs
+++ b/mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
@@ -1,30 +1,39 @@
-// 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,
+                                      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 chain::TransactionOutput;
+use coins::eth::{eth_coin_from_conf_and_request, EthCoin};
 use coins::qrc20::rpc_clients::for_tests::Qrc20NativeWalletOps;
-use coins::qrc20::{qrc20_coin_from_conf_and_params, Qrc20ActivationParams, Qrc20Coin};
+use coins::qrc20::{qrc20_coin_with_priv_key, Qrc20ActivationParams, Qrc20Coin};
+use coins::utxo::bch::{bch_coin_with_priv_key, BchActivationRequest, BchCoin};
 use coins::utxo::qtum::{qtum_coin_with_priv_key, QtumBasedCoin, QtumCoin};
 use coins::utxo::rpc_clients::{NativeClient, UtxoRpcClientEnum, UtxoRpcClientOps};
+use coins::utxo::slp::{slp_genesis_output, SlpOutput, SlpToken};
+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::{coin_daemon_data_dir, sat_from_big_decimal, zcash_params_path, UtxoActivationParams,
-                  UtxoAddressFormat, UtxoCoinFields};
-use coins::MarketCoinOps;
+                  UtxoAddressFormat, UtxoCoinFields, UtxoCommonOps};
+use coins::{CoinProtocol, MarketCoinOps, PrivKeyBuildPolicy, Transaction};
+use crypto::privkey::key_pair_from_seed;
+use crypto::Secp256k1Secret;
 use ethereum_types::H160 as H160Eth;
 use futures01::Future;
 use http::StatusCode;
-use keys::{Address, AddressHashEnum};
+use keys::{Address, AddressHashEnum, KeyPair, NetworkPrefix as CashAddrPrefix};
 use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
 use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{enable_native, eth_jst_testnet_conf, eth_testnet_conf, ETH_DEV_NODES,
+                                  ETH_DEV_SWAP_CONTRACT};
+use mm2_test_helpers::structs::{MyBalanceResponse, TransactionDetails};
 use primitives::hash::{H160, H256};
+use script::Builder;
 use secp256k1::Secp256k1;
 use serde_json::{self as json, Value as Json};
 use std::path::PathBuf;
@@ -36,12 +45,17 @@ use testcontainers::images::generic::{GenericImage, WaitFor};
 use testcontainers::{Container, Docker, Image};
 
 lazy_static! {
-    static ref COINS_LOCK: Mutex<()> = Mutex::new(());
+    static ref MY_COIN_LOCK: Mutex<()> = Mutex::new(());
+    static ref MY_COIN1_LOCK: Mutex<()> = Mutex::new(());
+    static ref QTUM_LOCK: Mutex<()> = Mutex::new(());
+    static ref FOR_SLP_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));
+    static ref ETH_DISTRIBUTOR: EthCoin = eth_distributor();
+    static ref MM_CTX: MmArc = MmCtxBuilder::new().into_mm_arc();
 }
 
 pub static mut QICK_TOKEN_ADDRESS: Option<H160Eth> = None;
@@ -88,6 +102,206 @@ pub trait CoinDockerOps {
     }
 }
 
+pub struct UtxoAssetDockerOps {
+    #[allow(dead_code)]
+    ctx: MmArc,
+    coin: UtxoStandardCoin,
+}
+
+impl CoinDockerOps for UtxoAssetDockerOps {
+    fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
+}
+
+impl UtxoAssetDockerOps {
+    pub fn from_ticker(ticker: &str) -> UtxoAssetDockerOps {
+        let conf = json!({"asset": ticker, "txfee": 1000, "network": "regtest"});
+        let req = json!({"method":"enable"});
+        let priv_key = Secp256k1Secret::from("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f");
+        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, ticker, &conf, &params, priv_key)).unwrap();
+        UtxoAssetDockerOps { ctx, coin }
+    }
+}
+
+pub struct BchDockerOps {
+    #[allow(dead_code)]
+    ctx: MmArc,
+    coin: BchCoin,
+}
+
+// builds the EthCoin using the external dev Parity/OpenEthereum node
+// the address belonging to the default passphrase has million of ETH that it can distribute to
+// random privkeys generated in tests
+pub fn eth_distributor() -> EthCoin {
+    let req = json!({
+        "method": "enable",
+        "coin": "ETH",
+        "urls": ETH_DEV_NODES,
+        "swap_contract_address": ETH_DEV_SWAP_CONTRACT,
+    });
+    let keypair =
+        key_pair_from_seed("spice describe gravity federal blast come thank unfair canal monkey style afraid").unwrap();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(keypair.private().secret);
+    block_on(eth_coin_from_conf_and_request(
+        &MM_CTX,
+        "ETH",
+        &eth_testnet_conf(),
+        &req,
+        CoinProtocol::ETH,
+        priv_key_policy,
+    ))
+    .unwrap()
+}
+
+// pass address without 0x prefix to this fn
+pub fn fill_eth(to_addr: &str) {
+    ETH_DISTRIBUTOR
+        .send_to_address(to_addr.parse().unwrap(), 1_000_000_000_000_000_000u64.into())
+        .wait()
+        .unwrap();
+}
+
+pub fn generate_eth_coin_with_random_privkey() -> EthCoin {
+    let req = json!({
+        "method": "enable",
+        "coin": "ETH",
+        "urls": ETH_DEV_NODES,
+        "swap_contract_address": ETH_DEV_SWAP_CONTRACT,
+    });
+    let priv_key = random_secp256k1_secret();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(priv_key);
+    block_on(eth_coin_from_conf_and_request(
+        &MM_CTX,
+        "ETH",
+        &eth_testnet_conf(),
+        &req,
+        CoinProtocol::ETH,
+        priv_key_policy,
+    ))
+    .unwrap()
+}
+
+pub fn generate_jst_with_seed(seed: &str) -> EthCoin {
+    let req = json!({
+        "method": "enable",
+        "coin": "JST",
+        "urls": ETH_DEV_NODES,
+        "swap_contract_address": ETH_DEV_SWAP_CONTRACT,
+    });
+
+    let keypair = key_pair_from_seed(seed).unwrap();
+    let priv_key_policy = PrivKeyBuildPolicy::IguanaPrivKey(keypair.private().secret);
+    block_on(eth_coin_from_conf_and_request(
+        &MM_CTX,
+        "JST",
+        &eth_jst_testnet_conf(),
+        &req,
+        CoinProtocol::ERC20 {
+            platform: "ETH".into(),
+            contract_address: String::from("0x2b294F029Fde858b2c62184e8390591755521d8E"),
+        },
+        priv_key_policy,
+    ))
+    .unwrap()
+}
+
+impl BchDockerOps {
+    pub 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 = Secp256k1Secret::from("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f");
+        let ctx = MmCtxBuilder::new().into_mm_arc();
+        let params = BchActivationRequest::from_legacy_req(&req).unwrap();
+
+        let coin = block_on(bch_coin_with_priv_key(
+            &ctx,
+            ticker,
+            &conf,
+            params,
+            CashAddrPrefix::SlpTest,
+            priv_key,
+        ))
+        .unwrap();
+        BchDockerOps { ctx, coin }
+    }
+
+    pub 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 key_pair = KeyPair::random_compressed();
+            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(*key_pair.private_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,
+        )
+        .unwrap();
+
+        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 }
+}
+
 pub struct UtxoDockerNode<'a> {
     #[allow(dead_code)]
     pub container: Container<'a, Cli, GenericImage>,
@@ -97,6 +311,11 @@ pub struct UtxoDockerNode<'a> {
     pub port: u16,
 }
 
+pub fn random_secp256k1_secret() -> Secp256k1Secret {
+    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    Secp256k1Secret::from(*priv_key.as_ref())
+}
+
 pub fn utxo_asset_docker_node<'a>(docker: &'a Cli, ticker: &'static str, port: u16) -> UtxoDockerNode<'a> {
     let args = vec![
         "-v".into(),
@@ -142,8 +361,8 @@ pub fn utxo_asset_docker_node<'a>(docker: &'a Cli, ticker: &'static str, port: u
     }
 }
 
-pub fn rmd160_from_priv(privkey: [u8; 32]) -> H160 {
-    let secret = SecretKey::from_slice(&privkey).unwrap();
+pub fn rmd160_from_priv(privkey: Secp256k1Secret) -> H160 {
+    let secret = SecretKey::from_slice(privkey.as_slice()).unwrap();
     let public = PublicKey::from_secret_key(&Secp256k1::new(), &secret);
     dhash160(&public.serialize())
 }
@@ -166,7 +385,7 @@ where
 }
 
 /// Build `Qrc20Coin` from ticker and privkey without filling the balance.
-pub fn qrc20_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, Qrc20Coin) {
+pub fn qrc20_coin_from_privkey(ticker: &str, priv_key: Secp256k1Secret) -> (MmArc, Qrc20Coin) {
     let (contract_address, swap_contract_address) = unsafe {
         let contract_address = match ticker {
             "QICK" => QICK_TOKEN_ADDRESS
@@ -206,13 +425,13 @@ pub fn qrc20_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, Qrc20Co
     });
     let params = Qrc20ActivationParams::from_legacy_req(&req).unwrap();
 
-    let coin = block_on(qrc20_coin_from_conf_and_params(
+    let coin = block_on(qrc20_coin_with_priv_key(
         &ctx,
         ticker,
         platform,
         &conf,
         &params,
-        &priv_key,
+        priv_key,
         contract_address,
     ))
     .unwrap();
@@ -249,7 +468,7 @@ fn qrc20_coin_conf_item(ticker: &str) -> Json {
 }
 
 /// Build asset `UtxoStandardCoin` from ticker and privkey without filling the balance.
-pub fn utxo_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, UtxoStandardCoin) {
+pub fn utxo_coin_from_privkey(ticker: &str, priv_key: Secp256k1Secret) -> (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"});
@@ -259,6 +478,27 @@ pub fn utxo_coin_from_privkey(ticker: &str, priv_key: &[u8]) -> (MmArc, UtxoStan
     (ctx, coin)
 }
 
+/// Create a UTXO coin for the given privkey and fill it's address with the specified balance.
+pub fn generate_utxo_coin_with_privkey(ticker: &str, balance: BigDecimal, priv_key: Secp256k1Secret) {
+    let (_, coin) = utxo_coin_from_privkey(ticker, priv_key);
+    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);
+}
+
+/// Generate random privkey, create a UTXO coin and fill it's address with the specified balance.
+pub fn generate_utxo_coin_with_random_privkey(
+    ticker: &str,
+    balance: BigDecimal,
+) -> (MmArc, UtxoStandardCoin, Secp256k1Secret) {
+    let priv_key = random_secp256k1_secret();
+    let (ctx, coin) = utxo_coin_from_privkey(ticker, priv_key);
+    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)
+}
+
 /// Get only one address assigned the specified label.
 pub fn get_address_by_label<T>(coin: T, label: &str) -> String
 where
@@ -284,7 +524,7 @@ 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 _lock = QTUM_LOCK.lock().unwrap();
     let timeout = now_ms() / 1000 + timeout;
     let client = match coin.as_ref().rpc_client {
         UtxoRpcClientEnum::Native(ref client) => client,
@@ -319,15 +559,15 @@ 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());
+) -> (MmArc, Qrc20Coin, Secp256k1Secret) {
+    let priv_key = random_secp256k1_secret();
+    let (ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key);
 
     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())
+    (ctx, coin, priv_key)
 }
 
 pub fn generate_qtum_coin_with_random_privkey(
@@ -352,22 +592,22 @@ pub fn generate_qtum_coin_with_random_privkey(
         "dust": 72800,
     });
     let req = json!({"method": "enable"});
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let priv_key = random_secp256k1_secret();
     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 coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).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())
+    (ctx, coin, priv_key.take())
 }
 
 pub fn generate_segwit_qtum_coin_with_random_privkey(
     ticker: &str,
     balance: BigDecimal,
     txfee: Option<u64>,
-) -> (MmArc, QtumCoin, [u8; 32]) {
+) -> (MmArc, QtumCoin, Secp256k1Secret) {
     let confpath = unsafe { QTUM_CONF_PATH.as_ref().expect("Qtum config is not set yet") };
     let conf = json!({
         "coin":ticker,
@@ -390,15 +630,15 @@ pub fn generate_segwit_qtum_coin_with_random_privkey(
         },
     });
     let req = json!({"method": "enable"});
-    let priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let priv_key = random_secp256k1_secret();
     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 coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).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())
+    (ctx, coin, priv_key)
 }
 
 pub fn fill_address<T>(coin: &T, address: &str, amount: BigDecimal, timeout: u64)
@@ -408,7 +648,14 @@ where
     // 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 mutex = match coin.ticker() {
+        "MYCOIN" => &*MY_COIN_LOCK,
+        "MYCOIN1" => &*MY_COIN1_LOCK,
+        "QTUM" | "QICK" | "QORTY" => &*QTUM_LOCK,
+        "FORSLP" => &*FOR_SLP_LOCK,
+        ticker => panic!("Unknown ticker {}", ticker),
+    };
+    let _lock = mutex.lock().unwrap();
     let timeout = now_ms() / 1000 + timeout;
 
     if let UtxoRpcClientEnum::Native(client) = &coin.as_ref().rpc_client {
@@ -451,8 +698,8 @@ pub fn wait_for_estimate_smart_fee(timeout: u64) -> Result<(), String> {
         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 priv_key = random_secp256k1_secret();
+    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key);
     let timeout = now_ms() / 1000 + timeout;
     let client = match coin.as_ref().rpc_client {
         UtxoRpcClientEnum::Native(ref client) => client,
@@ -495,7 +742,7 @@ pub async fn enable_qrc20_native(mm: &MarketMakerIt, coin: &str) -> Json {
 
 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] {
+    fn generate_and_fill_priv_key(ticker: &str) -> Secp256k1Secret {
         let timeout = 30; // timeout if test takes more than 30 seconds to run
 
         match ticker {
@@ -507,28 +754,27 @@ pub fn trade_base_rel((base, rel): (&str, &str)) {
                 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 priv_key = random_secp256k1_secret();
+                let (_ctx, coin) = qrc20_coin_from_privkey(ticker, priv_key);
                 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()
+                priv_key
             },
             "MYCOIN" | "MYCOIN1" => {
-                let priv_key = SecretKey::new(&mut rand6::thread_rng());
-                let (_ctx, coin) = utxo_coin_from_privkey(ticker, priv_key.as_ref());
+                let priv_key = random_secp256k1_secret();
+                let (_ctx, coin) = utxo_coin_from_privkey(ticker, priv_key);
                 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 (_ctx, coin) = qrc20_coin_from_privkey("QICK", priv_key);
                 let my_address = coin.my_address().expect("!my_address");
                 fill_address(&coin, &my_address, 10.into(), timeout);
 
-                *priv_key.as_ref()
+                priv_key
             },
-            "ADEXSLP" => get_prefilled_slp_privkey(),
-            "FORSLP" => get_prefilled_slp_privkey(),
+            "ADEXSLP" | "FORSLP" => Secp256k1Secret::from(get_prefilled_slp_privkey()),
             _ => panic!("Expected either QICK or QORTY or MYCOIN or MYCOIN1, found {}", ticker),
         }
     }
diff --git a/mm2src/mm2_main/tests/docker_tests/docker_tests_inner.rs b/mm2src/mm2_main/tests/docker_tests/docker_tests_inner.rs
new file mode 100644
index 0000000000..891a817503
--- /dev/null
+++ b/mm2src/mm2_main/tests/docker_tests/docker_tests_inner.rs
@@ -0,0 +1,3494 @@
+use crate::integration_tests_common::*;
+use crate::{fill_address, fill_eth, generate_utxo_coin_with_random_privkey, random_secp256k1_secret, rmd160_from_priv,
+            utxo_coin_from_privkey};
+use bitcrypto::dhash160;
+use chain::OutPoint;
+use coins::utxo::rpc_clients::UnspentInfo;
+use coins::utxo::{GetUtxoListOps, UtxoCommonOps};
+use coins::{FoundSwapTxSpend, MarketCoinOps, MmCoin, SearchForSwapTxSpendInput, SendMakerPaymentArgs,
+            SendMakerRefundsPaymentArgs, SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs,
+            SendTakerSpendsMakerPaymentArgs, SwapOps, TransactionEnum, WithdrawRequest};
+use common::{block_on, now_ms};
+use futures01::Future;
+use mm2_number::{BigDecimal, MmNumber};
+use mm2_test_helpers::for_tests::{check_my_swap_status_amounts, eth_testnet_conf, get_locked_amount, kmd_conf,
+                                  max_maker_vol, mm_dump, mycoin1_conf, mycoin_conf, set_price, start_swaps,
+                                  MarketMakerIt, Mm2TestConf};
+use mm2_test_helpers::structs::*;
+use serde_json::Value as Json;
+use std::collections::HashMap;
+use std::env;
+use std::thread;
+use std::time::Duration;
+
+#[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_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 taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_taker_payment(taker_payment_args).wait().unwrap();
+
+    coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let refund_tx = coin
+        .send_maker_refunds_payment(maker_refunds_payment_args)
+        .wait()
+        .unwrap();
+
+    coin.wait_for_confirmations(&refund_tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    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);
+}
+
+#[test]
+fn test_for_non_existent_tx_hex_utxo() {
+    // This test shouldn't wait till timeout!
+    let timeout = (now_ms() / 1000) + 120;
+    let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+    // bad transaction hex
+    let tx = hex::decode("0400008085202f8902bf17bf7d1daace52e08f732a6b8771743ca4b1cb765a187e72fd091a0aabfd52000000006a47304402203eaaa3c4da101240f80f9c5e9de716a22b1ec6d66080de6a0cca32011cd77223022040d9082b6242d6acf9a1a8e658779e1c655d708379862f235e8ba7b8ca4e69c6012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffffff023ca13c0e9e085dd13f481f193e8a3e8fd609020936e98b5587342d994f4d020000006b483045022100c0ba56adb8de923975052312467347d83238bd8d480ce66e8b709a7997373994022048507bcac921fdb2302fa5224ce86e41b7efc1a2e20ae63aa738dfa99b7be826012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0300e1f5050000000017a9141ee6d4c38a3c078eab87ad1a5e4b00f21259b10d87000000000000000016611400000000000000000000000000000000000000001b94d736000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac2d08e35e000000000000000000000000000000").unwrap();
+    let actual = coin
+        .wait_for_confirmations(&tx, 1, false, timeout, 1)
+        .wait()
+        .err()
+        .unwrap();
+    assert!(actual.contains(
+        "Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 was not found on chain after 10 tries"
+    ));
+}
+
+#[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_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 maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_maker_payment(maker_payment_args).wait().unwrap();
+
+    coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let refund_tx = coin
+        .send_maker_refunds_payment(maker_refunds_payment_args)
+        .wait()
+        .unwrap();
+
+    coin.wait_for_confirmations(&refund_tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    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);
+}
+
+#[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_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+    let secret = [0; 32];
+    let my_pubkey = coin.my_public_key().unwrap();
+
+    let secret_hash = dhash160(&secret);
+    let time_lock = (now_ms() / 1000) as u32 - 3600;
+    let taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_pubkey,
+        secret_hash: secret_hash.as_slice(),
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_taker_payment(taker_payment_args).wait().unwrap();
+
+    coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+    let maker_spends_payment_args = SendMakerSpendsTakerPaymentArgs {
+        other_payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_pubkey,
+        secret: &secret,
+        secret_hash: secret_hash.as_slice(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let spend_tx = coin
+        .send_maker_spends_taker_payment(maker_spends_payment_args)
+        .wait()
+        .unwrap();
+
+    coin.wait_for_confirmations(&spend_tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    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);
+}
+
+#[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_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 secret_hash = dhash160(&secret);
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_pubkey,
+        secret_hash: secret_hash.as_slice(),
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_maker_payment(maker_payment_args).wait().unwrap();
+
+    coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+    let taker_spends_payment_args = SendTakerSpendsMakerPaymentArgs {
+        other_payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_pubkey,
+        secret: &secret,
+        secret_hash: secret_hash.as_slice(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
+    let spend_tx = coin
+        .send_taker_spends_maker_payment(taker_spends_payment_args)
+        .wait()
+        .unwrap();
+
+    coin.wait_for_confirmations(&spend_tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    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);
+}
+
+#[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_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![];
+    let mut sent_tx = vec![];
+    for i in 0..100 {
+        let maker_payment_args = SendMakerPaymentArgs {
+            time_lock_duration: 0,
+            time_lock: time_lock + i,
+            other_pubkey: my_pubkey,
+            secret_hash: &*dhash160(&secret),
+            amount: 1.into(),
+            swap_contract_address: &coin.swap_contract_address(),
+            swap_unique_data: &[],
+            payment_instructions: &None,
+        };
+        let tx = coin.send_maker_payment(maker_payment_args).wait().unwrap();
+        if let TransactionEnum::UtxoTx(tx) = tx {
+            unspents.push(UnspentInfo {
+                outpoint: OutPoint {
+                    hash: tx.hash(),
+                    index: 2,
+                },
+                value: tx.outputs[2].value,
+                height: None,
+            });
+            sent_tx.push(tx);
+        }
+    }
+
+    let recently_sent = block_on(coin.as_ref().recently_spent_outpoints.lock());
+
+    unspents = recently_sent
+        .replace_spent_outputs_with_cache(unspents.into_iter().collect())
+        .into_iter()
+        .collect();
+
+    let last_tx = sent_tx.last().unwrap();
+    let expected_unspent = UnspentInfo {
+        outpoint: OutPoint {
+            hash: last_tx.hash(),
+            index: 2,
+        },
+        value: last_tx.outputs[2].value,
+        height: None,
+    };
+    assert_eq!(vec![expected_unspent], unspents);
+}
+
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/554
+#[test]
+fn order_should_be_cancelled_when_entire_balance_is_withdrawn() {
+    let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "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": format!("0x{}", hex::encode(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);
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "999",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
+
+    log!("Get MYCOIN/MYCOIN1 orderbook");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_bob.userpass,
+        "method": "withdraw",
+        "coin": "MYCOIN",
+        "max": true,
+        "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
+    })))
+    .unwrap();
+    assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
+
+    let withdraw: Json = serde_json::from_str(&withdraw.1).unwrap();
+
+    let send_raw = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "send_raw_transaction",
+        "coin": "MYCOIN",
+        "tx_hex": withdraw["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
+
+    thread::sleep(Duration::from_secs(32));
+
+    log!("Get MYCOIN/MYCOIN1 orderbook");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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!({
+        "userpass": mm_bob.userpass,
+        "method": "my_orders",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
+    let orders: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("my_orders {}", serde_json::to_string(&orders).unwrap());
+    assert!(
+        orders["result"]["maker_orders"].as_object().unwrap().is_empty(),
+        "maker_orders must be empty"
+    );
+
+    let rmd160 = rmd160_from_priv(priv_key);
+    let order_path = mm_bob.folder.join(format!(
+        "DB/{}/ORDERS/MY/MAKER/{}.json",
+        hex::encode(rmd160.take()),
+        bob_uuid,
+    ));
+    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_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "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": format!("0x{}", hex::encode(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);
+
+    let mm_alice = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": "alice passphrase",
+            "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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "999",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Get MYCOIN/MYCOIN1 orderbook");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_bob.userpass,
+        "method": "withdraw",
+        "coin": "MYCOIN",
+        "amount": "499.99998",
+        "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
+    })))
+    .unwrap();
+    assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
+
+    let withdraw: Json = serde_json::from_str(&withdraw.1).unwrap();
+
+    let send_raw = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "send_raw_transaction",
+        "coin": "MYCOIN",
+        "tx_hex": withdraw["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
+
+    thread::sleep(Duration::from_secs(32));
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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");
+
+    let order_volume = asks[0]["maxvolume"].as_str().unwrap();
+    assert_eq!("500", order_volume);
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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 order_volume = asks[0]["maxvolume"].as_str().unwrap();
+    assert_eq!("500", order_volume);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn order_should_be_updated_when_balance_is_decreased_alice_subscribes_before_update() {
+    let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "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": format!("0x{}", hex::encode(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);
+
+    let mm_alice = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": "alice passphrase",
+            "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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "999",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    log!("Get MYCOIN/MYCOIN1 orderbook");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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!({
+        "userpass": mm_bob.userpass,
+        "method": "withdraw",
+        "coin": "MYCOIN",
+        "amount": "499.99998",
+        "to": "R9imXLs1hEcU9KbFDQq2hJEEJ1P5UoekaF",
+    })))
+    .unwrap();
+    assert!(withdraw.0.is_success(), "!withdraw: {}", withdraw.1);
+
+    let withdraw: Json = serde_json::from_str(&withdraw.1).unwrap();
+
+    let send_raw = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "send_raw_transaction",
+        "coin": "MYCOIN",
+        "tx_hex": withdraw["tx_hex"],
+    })))
+    .unwrap();
+    assert!(send_raw.0.is_success(), "!send_raw: {}", send_raw.1);
+
+    thread::sleep(Duration::from_secs(32));
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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");
+
+    let order_volume = asks[0]["maxvolume"].as_str().unwrap();
+    assert_eq!("500", order_volume);
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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 order_volume = asks[0]["maxvolume"].as_str().unwrap();
+    assert_eq!("500", order_volume);
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_order_should_be_updated_when_matched_partially() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "1000",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "500",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Bob side");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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");
+
+    let order_volume = asks[0]["maxvolume"].as_str().unwrap();
+    assert_eq!("500", order_volume);
+
+    log!("Get MYCOIN/MYCOIN1 orderbook on Alice side");
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    log!("orderbook {}", serde_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");
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/471
+#[test]
+fn test_match_and_trade_setprice_max() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    let bob_uuid = json["result"]["uuid"].as_str().unwrap().to_owned();
+
+    log!("Get MYCOIN/MYCOIN1 orderbook");
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "999.99999",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    thread::sleep(Duration::from_secs(3));
+
+    let rmd160 = rmd160_from_priv(bob_priv_key);
+    let order_path = mm_bob.folder.join(format!(
+        "DB/{}/ORDERS/MY/MAKER/{}.json",
+        hex::encode(rmd160.take()),
+        bob_uuid,
+    ));
+    log!("Order path {}", order_path.display());
+    assert!(!order_path.exists());
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/888
+fn test_max_taker_vol_swap() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut mm_bob = block_on(MarketMakerIt::start_with_envs(
+        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,
+        &[("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 = block_on(MarketMakerIt::start_with_envs(
+        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,
+        &[("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", &[])));
+    let price = MmNumber::from((100, 1620));
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": price,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+    log!("{}", rc.1);
+    thread::sleep(Duration::from_secs(3));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+        "trade_with": "MYCOIN",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
+    let vol: MaxTakerVolResponse = serde_json::from_str(&rc.1).unwrap();
+    let expected_vol = MmNumber::from((647499741, 12965000));
+
+    let actual_vol = MmNumber::from(vol.result.clone());
+    println!("actual vol {}", actual_vol.to_decimal());
+    println!("expected vol {}", expected_vol.to_decimal());
+
+    assert_eq!(expected_vol, actual_vol);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": "16",
+        "volume": vol.result,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+    let sell_res: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    thread::sleep(Duration::from_secs(3));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "my_swap_status",
+        "params": {
+            "uuid": sell_res.result.uuid
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!my_swap_status: {}", rc.1);
+
+    let status_response: Json = serde_json::from_str(&rc.1).unwrap();
+    let events_array = status_response["result"]["events"].as_array().unwrap();
+    let first_event_type = events_array[0]["event"]["type"].as_str().unwrap();
+    assert_eq!("Started", first_event_type);
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_buy_when_coins_locked_by_other_swap() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // the result of equation x + x / 777 + 0.00002 = 1
+        "volume": {
+            "numer":"77698446",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).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(6));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // it is slightly more than previous volume so it should fail
+        // because the total sum of used funds will be slightly more than available 2
+        "volume": {
+            "numer":"77698447",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "buy success, but should fail: {}", rc.1);
+    assert!(rc.1.contains("Not enough MYCOIN1 for swap"), "{}", rc.1);
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_sell_when_coins_locked_by_other_swap() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": 1,
+        // the result of equation x + x / 777 + 0.00002 = 1
+        "volume": {
+            "numer":"77698446",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).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(6));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": 1,
+        // it is slightly more than previous volume so it should fail
+        // because the total sum of used funds will be slightly more than available 2
+        "volume": {
+            "numer":"77698447",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "sell success, but should fail: {}", rc.1);
+    assert!(rc.1.contains("Not enough MYCOIN1 for swap"), "{}", rc.1);
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_buy_max() {
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // the result of equation x + x / 777 + 0.00002 = 1
+        "volume": {
+            "numer":"77698446",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // it is slightly more than previous volume so it should fail
+        "volume": {
+            "numer":"77698447",
+            "denom":"77800000"
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "buy success, but should fail: {}", rc.1);
+    // assert! (rc.1.contains("MYCOIN1 balance 1 is too low"));
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_maker_trade_preimage() {
+    let priv_key = random_secp256k1_secret();
+
+    let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key);
+    let my_address = mycoin.my_address().expect("!my_address");
+    fill_address(&mycoin, &my_address, 10.into(), 30);
+
+    let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key);
+    let my_address = mycoin1.my_address().expect("!my_address");
+    fill_address(&mycoin1, &my_address, 20.into(), 30);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(2000)]);
+    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();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 1,
+            "max": true,
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
+    let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", true);
+    let volume = MmNumber::from("9.99999");
+
+    let my_coin_total = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0.00001");
+    let my_coin1_total = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0");
+
+    let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
+        base_coin_fee,
+        rel_coin_fee,
+        volume: Some(volume.to_decimal()),
+        volume_rat: Some(volume.to_ratio()),
+        volume_fraction: Some(volume.to_fraction()),
+        total_fees: vec![my_coin_total, my_coin1_total],
+    });
+
+    let mut actual: RpcSuccessResponse<TradePreimageResult> = serde_json::from_str(&rc.1).unwrap();
+    actual.result.sort_total_fees();
+    assert_eq!(expected, actual.result);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN1",
+            "rel": "MYCOIN",
+            "swap_method": "setprice",
+            "price": 1,
+            "max": true,
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let mut actual: RpcSuccessResponse<TradePreimageResult> = serde_json::from_str(&rc.1).unwrap();
+    actual.result.sort_total_fees();
+
+    let base_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
+    let rel_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
+    let volume = MmNumber::from("19.99998");
+
+    let my_coin_total = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
+    let my_coin1_total = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0.00002");
+    let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
+        base_coin_fee,
+        rel_coin_fee,
+        volume: Some(volume.to_decimal()),
+        volume_rat: Some(volume.to_ratio()),
+        volume_fraction: Some(volume.to_fraction()),
+        total_fees: vec![my_coin_total, my_coin1_total],
+    });
+
+    actual.result.sort_total_fees();
+    assert_eq!(expected, actual.result);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN1",
+            "rel": "MYCOIN",
+            "swap_method": "setprice",
+            "price": 1,
+            "volume": "19.99998",
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let mut actual: RpcSuccessResponse<TradePreimageResult> = serde_json::from_str(&rc.1).unwrap();
+    actual.result.sort_total_fees();
+
+    let base_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
+    let rel_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
+
+    let total_my_coin = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
+    let total_my_coin1 = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0.00002");
+
+    let expected = TradePreimageResult::MakerPreimage(MakerPreimage {
+        base_coin_fee,
+        rel_coin_fee,
+        volume: None,
+        volume_rat: None,
+        volume_fraction: None,
+        total_fees: vec![total_my_coin, total_my_coin1],
+    });
+
+    actual.result.sort_total_fees();
+    assert_eq!(expected, actual.result);
+}
+
+#[test]
+fn test_taker_trade_preimage() {
+    let priv_key = random_secp256k1_secret();
+
+    let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key);
+    let my_address = mycoin.my_address().expect("!my_address");
+    fill_address(&mycoin, &my_address, 10.into(), 30);
+
+    let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key);
+    let my_address = mycoin1.my_address().expect("!my_address");
+    fill_address(&mycoin1, &my_address, 20.into(), 30);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(2000)]);
+    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();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "sell",
+            "max": true,
+            "price": 1,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+
+    let actual: RpcErrorResponse<trade_preimage_error::InvalidParam> = serde_json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "InvalidParam", "Unexpected error_type: {}", rc.1);
+    let expected = trade_preimage_error::InvalidParam {
+        param: "max".to_owned(),
+        reason: "'max' cannot be used with 'sell' or 'buy' method".to_owned(),
+    };
+    assert_eq!(actual.error_data, Some(expected));
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "sell",
+            "volume": "7.77",
+            "price": "2",
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+
+    let mut actual: RpcSuccessResponse<TradePreimageResult> = serde_json::from_str(&rc.1).unwrap();
+    actual.result.sort_total_fees();
+
+    let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
+    let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", true);
+    let taker_fee = TradeFeeForTest::new("MYCOIN", "0.01", false);
+    let fee_to_send_taker_fee = TradeFeeForTest::new("MYCOIN", "0.00001", false);
+
+    let my_coin_total_fee = TotalTradeFeeForTest::new("MYCOIN", "0.01002", "0.01002");
+    let my_coin1_total_fee = TotalTradeFeeForTest::new("MYCOIN1", "0.00002", "0");
+
+    let expected = TradePreimageResult::TakerPreimage(TakerPreimage {
+        base_coin_fee,
+        rel_coin_fee,
+        taker_fee,
+        fee_to_send_taker_fee,
+        total_fees: vec![my_coin_total_fee, my_coin1_total_fee],
+    });
+    assert_eq!(expected, actual.result);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "buy",
+            "volume": "7.77",
+            "price": "2",
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let mut actual: RpcSuccessResponse<TradePreimageResult> = serde_json::from_str(&rc.1).unwrap();
+    actual.result.sort_total_fees();
+
+    let base_coin_fee = TradeFeeForTest::new("MYCOIN", "0.00001", true);
+    let rel_coin_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
+    let taker_fee = TradeFeeForTest::new("MYCOIN1", "0.02", false);
+    let fee_to_send_taker_fee = TradeFeeForTest::new("MYCOIN1", "0.00002", false);
+
+    let my_coin_total_fee = TotalTradeFeeForTest::new("MYCOIN", "0.00001", "0");
+    let my_coin1_total_fee = TotalTradeFeeForTest::new("MYCOIN1", "0.02004", "0.02004");
+
+    let expected = TradePreimageResult::TakerPreimage(TakerPreimage {
+        base_coin_fee,
+        rel_coin_fee,
+        taker_fee,
+        fee_to_send_taker_fee,
+        total_fees: vec![my_coin_total_fee, my_coin1_total_fee],
+    });
+    assert_eq!(expected, actual.result);
+}
+
+#[test]
+fn test_trade_preimage_not_sufficient_balance() {
+    #[track_caller]
+    fn expect_not_sufficient_balance(
+        res: &str,
+        available: BigDecimal,
+        required: BigDecimal,
+        locked_by_swaps: Option<BigDecimal>,
+    ) {
+        let actual: RpcErrorResponse<trade_preimage_error::NotSufficientBalance> = serde_json::from_str(res).unwrap();
+        assert_eq!(actual.error_type, "NotSufficientBalance");
+        let expected = trade_preimage_error::NotSufficientBalance {
+            coin: "MYCOIN".to_owned(),
+            available,
+            required,
+            locked_by_swaps,
+        };
+        assert_eq!(actual.error_data, Some(expected));
+    }
+
+    let priv_key = random_secp256k1_secret();
+    let fill_balance_functor = |amount: BigDecimal| {
+        let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key);
+        let my_address = mycoin.my_address().expect("!my_address");
+        fill_address(&mycoin, &my_address, amount, 30);
+    };
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(2000)]);
+    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();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 1,
+            "max": true,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let available = MmNumber::from("0.000015").to_decimal();
+    // Required at least 0.00002 MYCOIN to pay the transaction_fee(0.00001) and to send a value not less than dust(0.00001).
+    let required = MmNumber::from("0.00002").to_decimal();
+    expect_not_sufficient_balance(&rc.1, available, required, None);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 1,
+            "volume": 0.1,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    // Required 0.00001 MYCOIN to pay the transaction fee and the specified 0.1 volume.
+    let available = MmNumber::from("0.000015").to_decimal();
+    let required = MmNumber::from("0.10001").to_decimal();
+    expect_not_sufficient_balance(&rc.1, available, required, None);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 1,
+            "max": true,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    // balance(0.000015)
+    let available = MmNumber::from("0.000015").to_decimal();
+    // balance(0.000015) + transaction_fee(0.00001)
+    let required = MmNumber::from("0.00002").to_decimal();
+    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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "sell",
+            "price": 1,
+            "volume": 7.77,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let available = MmNumber::from("7.7701").to_decimal();
+    // `required = volume + fee_to_send_taker_payment + dex_fee + fee_to_send_dex_fee`,
+    // where `volume = 7.77`, `fee_to_send_taker_payment = fee_to_send_dex_fee = 0.00001`, `dex_fee = 0.01`.
+    // Please note `dex_fee = 7.77 / 777` with dex_fee = 0.01
+    // required = 7.77 + 0.01 (dex_fee) + (0.0001 * 2) = 7.78002
+    let required = MmNumber::from("7.78002");
+    expect_not_sufficient_balance(&rc.1, available, required.to_decimal(), Some(BigDecimal::from(0)));
+}
+
+/// This test ensures that `trade_preimage` will not succeed on input that will fail on `buy/sell/setprice`.
+/// https://github.com/KomodoPlatform/atomicDEX-API/issues/902
+#[test]
+fn test_trade_preimage_additional_validation() {
+    let priv_key = random_secp256k1_secret();
+
+    let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key);
+    let my_address = mycoin1.my_address().expect("!my_address");
+    fill_address(&mycoin1, &my_address, 20.into(), 30);
+
+    let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key);
+    let my_address = mycoin.my_address().expect("!my_address");
+    fill_address(&mycoin, &my_address, 10.into(), 30);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(2000)]);
+
+    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();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 0,
+            "volume": 0.1,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let actual: RpcErrorResponse<trade_preimage_error::PriceTooLow> = serde_json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "PriceTooLow");
+    // currently the minimum price is 0.00000001
+    let price_threshold = BigDecimal::from(1) / BigDecimal::from(100_000_000);
+    let expected = trade_preimage_error::PriceTooLow {
+        price: BigDecimal::from(0),
+        threshold: price_threshold,
+    };
+    assert_eq!(actual.error_data, Some(expected));
+
+    // 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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "setprice",
+            "price": 1,
+            "volume": low_volume,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = serde_json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "VolumeTooLow");
+    // Min MYCOIN trading volume is 0.0001.
+    let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
+    let expected = trade_preimage_error::VolumeTooLow {
+        coin: "MYCOIN".to_owned(),
+        volume: low_volume.clone(),
+        threshold: volume_threshold,
+    };
+    assert_eq!(actual.error_data, Some(expected));
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "sell",
+            "price": 1,
+            "volume": low_volume,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = serde_json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "VolumeTooLow");
+    // Min MYCOIN trading volume is 0.0001.
+    let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
+    let expected = trade_preimage_error::VolumeTooLow {
+        coin: "MYCOIN".to_owned(),
+        volume: low_volume,
+        threshold: volume_threshold,
+    };
+    assert_eq!(actual.error_data, Some(expected));
+
+    // rel volume is too low
+    // Min MYCOIN trading volume is 0.0001.
+    let volume = BigDecimal::from(1) / BigDecimal::from(10_000);
+    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!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "trade_preimage",
+        "params": {
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "swap_method": "sell",
+            "price": low_price,
+            "volume": volume,
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    let actual: RpcErrorResponse<trade_preimage_error::VolumeTooLow> = serde_json::from_str(&rc.1).unwrap();
+    assert_eq!(actual.error_type, "VolumeTooLow");
+    // Min MYCOIN1 trading volume is 0.0001.
+    let volume_threshold = BigDecimal::from(1) / BigDecimal::from(10_000);
+    let expected = trade_preimage_error::VolumeTooLow {
+        coin: "MYCOIN1".to_owned(),
+        volume: low_rel_volume,
+        threshold: volume_threshold,
+    };
+    assert_eq!(actual.error_data, Some(expected));
+}
+
+#[test]
+fn test_trade_preimage_legacy() {
+    let priv_key = random_secp256k1_secret();
+    let (_ctx, mycoin) = utxo_coin_from_privkey("MYCOIN", priv_key);
+    let my_address = mycoin.my_address().expect("!my_address");
+    fill_address(&mycoin, &my_address, 10.into(), 30);
+    let (_ctx, mycoin1) = utxo_coin_from_privkey("MYCOIN1", priv_key);
+    let my_address = mycoin1.my_address().expect("!my_address");
+    fill_address(&mycoin1, &my_address, 20.into(), 30);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(2000)]);
+    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();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "trade_preimage",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "swap_method": "setprice",
+        "max": true,
+        "price": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let _: TradePreimageResponse = serde_json::from_str(&rc.1).unwrap();
+
+    // vvv test a taker method vvv
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "trade_preimage",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "swap_method": "sell",
+        "volume": "7.77",
+        "price": "2",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!trade_preimage: {}", rc.1);
+    let _: TradePreimageResponse = serde_json::from_str(&rc.1).unwrap();
+
+    // vvv test the error response vvv
+
+    // `max` field is not supported for `buy/sell` swap methods
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "trade_preimage",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "swap_method": "sell",
+        "max": true,
+        "price": "1",
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "trade_preimage success, but should fail: {}", rc.1);
+    assert!(rc
+        .1
+        .contains("Incorrect use of the 'max' parameter: 'max' cannot be used with 'sell' or 'buy' method"));
+}
+
+#[test]
+fn test_get_max_taker_vol() {
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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!({
+        "userpass": mm_alice.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
+    let json: MaxTakerVolResponse = serde_json::from_str(&rc.1).unwrap();
+    // the result of equation `max_vol + max_vol / 777 + 0.00002 = 1`
+    // derived from `max_vol = balance - locked - trade_fee - fee_to_send_taker_fee - dex_fee(max_vol)`
+    // where balance = 1, locked = 0, trade_fee = fee_to_send_taker_fee = 0.00001, dex_fee = max_vol / 777
+    let expected = MmNumber::from((38849223, 38900000)).to_fraction();
+    assert_eq!(json.result, expected);
+    assert_eq!(json.coin, "MYCOIN1");
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": 1,
+        "volume": json.result,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    block_on(mm_alice.stop()).unwrap();
+}
+
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/733
+#[test]
+fn test_get_max_taker_vol_dex_fee_threshold() {
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", "0.05328455".parse().unwrap());
+    let coins = json!([mycoin_conf(10000), mycoin1_conf(10000)]);
+    let 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",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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!({
+        "userpass": mm_alice.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    // the result of equation x + 0.0001 (dex fee) + 0.0002 (miner fee * 2) = 0.05328455
+    assert_eq!(json["result"]["numer"], Json::from("1059691"));
+    assert_eq!(json["result"]["denom"], Json::from("20000000"));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": 1,
+        "volume": {
+            "numer": json["result"]["numer"],
+            "denom": json["result"]["denom"],
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    block_on(mm_alice.stop()).unwrap();
+}
+
+/// Test if the `max_taker_vol` cannot return a volume less than the coin's dust.
+/// The minimum required balance for trading can be obtained by solving the equation:
+/// `volume + taker_fee + trade_fee + fee_to_send_taker_fee = x`.
+/// Let `dust = 0.000728` like for Qtum, `trade_fee = 0.0001`, `fee_to_send_taker_fee = 0.0001` and `taker_fee` is the `0.000728` threshold,
+/// therefore to find a minimum required balance, we should pass the `dust` as the `volume` into the equation above:
+/// `2 * 0.000728 + 0.0002 = x`, so `x = 0.001656`
+#[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_utxo_coin_with_random_privkey("MYCOIN1", "0.001656".parse().unwrap());
+    let coins = json!([
+    mycoin_conf(10000),
+    {"coin":"MYCOIN1","asset":"MYCOIN1","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"},"dust":72800}
+    ]);
+    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();
+    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", &[])));
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    let result: MmNumber = serde_json::from_value(json["result"].clone()).unwrap();
+    assert!(result.is_zero());
+
+    fill_address(&coin, &coin.my_address().unwrap(), "0.00001".parse().unwrap(), 30);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    // the result of equation x + 0.000728 (dex fee) + 0.0002 (miner fee * 2) = 0.001666
+    assert_eq!(json["result"]["numer"], Json::from("369"));
+    assert_eq!(json["result"]["denom"], Json::from("500000"));
+
+    block_on(mm.stop()).unwrap();
+}
+
+#[test]
+fn test_get_max_taker_vol_with_kmd() {
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
+    let coins = json!([mycoin_conf(10000), mycoin1_conf(10000), kmd_conf(10000)]);
+    let 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",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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 electrum = block_on(enable_electrum(&mm_alice, "KMD", false, &[
+        "electrum1.cipig.net:10001",
+        "electrum2.cipig.net:10001",
+        "electrum3.cipig.net:10001",
+    ]));
+    log!("{:?}", electrum);
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "max_taker_vol",
+        "coin": "MYCOIN1",
+        "trade_with": "KMD",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!max_taker_vol: {}", rc.1);
+    let json: Json = serde_json::from_str(&rc.1).unwrap();
+    // the result of equation x + x * 9 / 7770 + 0.0002 = 1
+    assert_eq!(json["result"]["numer"], Json::from("1294741"));
+    assert_eq!(json["result"]["denom"], Json::from("1296500"));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "KMD",
+        "price": 1,
+        "volume": {
+            "numer": json["result"]["numer"],
+            "denom": json["result"]["denom"],
+        }
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_get_max_maker_vol() {
+    let (_ctx, _, priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 1.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let conf = Mm2TestConf::seednode(&format!("0x{}", hex::encode(priv_key)), &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN1", &[])));
+
+    // 1 - tx_fee
+    let expected_volume = MmNumber::from("0.99999");
+    let expected = MaxMakerVolResponse {
+        coin: "MYCOIN1".to_string(),
+        volume: MmNumberMultiRepr::from(expected_volume.clone()),
+        balance: MmNumberMultiRepr::from(1),
+        locked_by_swaps: MmNumberMultiRepr::from(0),
+    };
+    let actual = block_on(max_maker_vol(&mm, "MYCOIN1")).unwrap::<MaxMakerVolResponse>();
+    assert_eq!(actual, expected);
+
+    let res = block_on(set_price(&mm, "MYCOIN1", "MYCOIN", "1", "0", true));
+    assert_eq!(res.result.max_base_vol, expected_volume.to_decimal());
+}
+
+#[test]
+fn test_get_max_maker_vol_error() {
+    let priv_key = random_secp256k1_secret();
+    let coins = json!([mycoin_conf(1000)]);
+    let conf = Mm2TestConf::seednode(&format!("0x{}", hex::encode(priv_key)), &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+    let (_dump_log, _dump_dashboard) = mm_dump(&mm.log_path);
+
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+
+    let actual_error = block_on(max_maker_vol(&mm, "MYCOIN")).unwrap_err::<max_maker_vol_error::NotSufficientBalance>();
+    let expected_error = max_maker_vol_error::NotSufficientBalance {
+        coin: "MYCOIN".to_owned(),
+        available: 0.into(),
+        // tx_fee
+        required: BigDecimal::from(1000) / BigDecimal::from(100_000_000),
+        locked_by_swaps: None,
+    };
+    assert_eq!(actual_error.error_type, "NotSufficientBalance");
+    assert_eq!(actual_error.error_data, Some(expected_error));
+}
+
+#[test]
+fn test_set_price_max() {
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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!({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // the result of equation x + 0.00001 = 1
+        "volume": {
+            "numer":"99999",
+            "denom":"100000"
+        },
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        // it is slightly more than previous volume so it should fail
+        "volume": {
+            "numer":"100000",
+            "denom":"100000"
+        },
+    })))
+    .unwrap();
+    assert!(!rc.0.is_success(), "setprice success, but should fail: {}", rc.1);
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn swaps_should_stop_on_stop_rpc() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let mut uuids = Vec::with_capacity(3);
+
+    for _ in 0..3 {
+        let rc = block_on(mm_alice.rpc(&json!({
+            "userpass": mm_alice.userpass,
+            "method": "buy",
+            "base": "MYCOIN",
+            "rel": "MYCOIN1",
+            "price": 1,
+            "volume": "1",
+        })))
+        .unwrap();
+        assert!(rc.0.is_success(), "!buy: {}", rc.1);
+        let buy: Json = serde_json::from_str(&rc.1).unwrap();
+        uuids.push(buy["result"]["uuid"].as_str().unwrap().to_owned());
+    }
+    for uuid in uuids.iter() {
+        block_on(mm_bob.wait_for_log(22., |log| {
+            log.contains(&format!(
+                "Entering the maker_swap_loop MYCOIN/MYCOIN1 with uuid: {}",
+                uuid
+            ))
+        }))
+        .unwrap();
+        block_on(mm_alice.wait_for_log(22., |log| {
+            log.contains(&format!(
+                "Entering the taker_swap_loop MYCOIN/MYCOIN1 with uuid: {}",
+                uuid
+            ))
+        }))
+        .unwrap();
+    }
+    thread::sleep(Duration::from_secs(3));
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    for uuid in uuids {
+        block_on(mm_bob.wait_for_log_after_stop(22., |log| log.contains(&format!("swap {} stopped", uuid)))).unwrap();
+        block_on(mm_alice.wait_for_log_after_stop(22., |log| log.contains(&format!("swap {} stopped", uuid)))).unwrap();
+    }
+}
+
+#[test]
+fn test_maker_order_should_kick_start_and_appear_in_orderbook_on_restart() {
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut bob_conf = 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,
+    });
+    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!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    // mm_bob using same DB dir that should kick start the order
+    bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
+    bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
+    block_on(mm_bob.stop()).unwrap();
+
+    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", &[])));
+
+    thread::sleep(Duration::from_secs(2));
+
+    log!("Get RICK/MORTY orderbook on Bob side");
+    let rc = block_on(mm_bob_dup.rpc(&json!({
+        "userpass": mm_bob_dup.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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_utxo_coin_with_random_privkey("MYCOIN", 1000.into());
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut bob_conf = 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,
+    });
+    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!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let res: SetPriceResponse = serde_json::from_str(&rc.1).unwrap();
+    let uuid = res.result.uuid;
+
+    // mm_bob using same DB dir that should kick start the order
+    bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
+    bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
+    block_on(mm_bob.stop()).unwrap();
+
+    let withdraw = coin
+        .withdraw(WithdrawRequest::new_max(
+            "MYCOIN".to_string(),
+            "RRYmiZSDo3UdHHqj1rLKf8cbJroyv9NxXw".to_string(),
+        ))
+        .wait()
+        .unwrap();
+    coin.send_raw_tx(&hex::encode(&withdraw.tx_hex.0)).wait().unwrap();
+    coin.wait_for_confirmations(&withdraw.tx_hex.0, 1, false, (now_ms() / 1000) + 10, 1)
+        .wait()
+        .unwrap();
+
+    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", &[])));
+
+    thread::sleep(Duration::from_secs(2));
+
+    log!("Get RICK/MORTY orderbook on Bob side");
+    let rc = block_on(mm_bob_dup.rpc(&json!({
+        "userpass": mm_bob_dup.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_bob_dup.userpass,
+        "method": "my_orders",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
+
+    let res: MyOrdersRpcResult = serde_json::from_str(&rc.1).unwrap();
+    assert!(res.result.maker_orders.is_empty(), "Bob maker orders must be empty");
+
+    let order_path = mm_bob.folder.join(format!(
+        "DB/{}/ORDERS/MY/MAKER/{}.json",
+        hex::encode(rmd160_from_priv(bob_priv_key).take()),
+        uuid
+    ));
+
+    println!("Order path {}", order_path.display());
+    assert!(!order_path.exists());
+}
+
+#[test]
+fn test_maker_order_kick_start_should_trigger_subscription_and_match() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let relay_conf = json!({
+        "gui": "nogui",
+        "netid": 9000,
+        "dht": "on",  // Enable DHT without delay.
+        "passphrase": "relay",
+        "coins": coins,
+        "rpc_password": "pass",
+        "i_am_seed": true,
+    });
+    let relay = MarketMakerIt::start(relay_conf, "pass".to_string(), None).unwrap();
+    let (_relay_dump_log, _relay_dump_dashboard) = mm_dump(&relay.log_path);
+
+    let mut bob_conf = json!({
+        "gui": "nogui",
+        "netid": 9000,
+        "dht": "on",  // Enable DHT without delay.
+        "passphrase": format!("0x{}", hex::encode(bob_priv_key)),
+        "coins": coins,
+        "rpc_password": "pass",
+        "seednodes": vec![format!("{}", relay.ip)],
+        "i_am_seed": false,
+    });
+    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);
+
+    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!("{}", relay.ip)],
+        }),
+        "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!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    // mm_bob using same DB dir that should kick start the order
+    bob_conf["dbdir"] = mm_bob.folder.join("DB").to_str().unwrap().into();
+    bob_conf["log"] = mm_bob.folder.join("mm2_dup.log").to_str().unwrap().into();
+    block_on(mm_bob.stop()).unwrap();
+
+    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!("Give restarted Bob 2 seconds to kickstart the order");
+    thread::sleep(Duration::from_secs(2));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": 1,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob_dup.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+}
+
+#[test]
+fn test_orders_should_match_on_both_nodes_with_same_priv() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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);
+
+    let mut mm_alice_1 = 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_1_dump_log, _alice_1_dump_dashboard) = mm_dump(&mm_alice_1.log_path);
+
+    let mut mm_alice_2 = 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_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", &[])));
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice_1.rpc(&json!({
+        "userpass": mm_alice_1.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    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!({
+        "userpass": mm_alice_2.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_alice_2.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice_1.stop()).unwrap();
+    block_on(mm_alice_2.stop()).unwrap();
+}
+
+#[test]
+fn test_maker_and_taker_order_created_with_same_priv_should_not_match() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut mm_bob = 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 (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+
+    let mut mm_alice = 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",
+            "seednodes": vec![format!("{}", mm_bob.ip)],
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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", &[])));
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": "1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(5., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap_err();
+    block_on(mm_alice.wait_for_log(5., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap_err();
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_taker_order_converted_to_maker_should_cancel_properly_when_matched() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    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);
+
+    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);
+
+    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",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": 1,
+        "timeout": 2,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    log!("Give Bob 4 seconds to convert order to maker");
+    thread::sleep(Duration::from_secs(4));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "volume": 1,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    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!({
+        "userpass": mm_bob.userpass,
+        "method": "my_orders",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!my_orders: {}", rc.1);
+    let my_orders_json: Json = serde_json::from_str(&rc.1).unwrap();
+    let maker_orders: HashMap<String, Json> =
+        serde_json::from_value(my_orders_json["result"]["maker_orders"].clone()).unwrap();
+    assert!(maker_orders.is_empty());
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let bob_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+    let alice_orderbook: Json = serde_json::from_str(&rc.1).unwrap();
+    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");
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_utxo_merge() {
+    let timeout = 30; // timeout if test takes more than 30 seconds to run
+    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);
+    fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
+    fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(privkey)),
+            "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);
+
+    let native = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "enable",
+        "coin": "MYCOIN",
+        "mm2": 1,
+        "utxo_merge_params": {
+            "merge_at": 2,
+            "check_every": 1,
+        }
+    })))
+    .unwrap();
+    assert!(native.0.is_success(), "'enable' failed: {}", 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();
+
+    block_on(mm_bob.wait_for_log(4., |log| log.contains("Trying to merge 5 UTXOs of coin MYCOIN"))).unwrap();
+
+    block_on(mm_bob.wait_for_log(4., |log| log.contains("UTXO merge successful for coin MYCOIN, tx_hash"))).unwrap();
+
+    thread::sleep(Duration::from_secs(2));
+    let (unspents, _) =
+        block_on(coin.get_unspent_ordered_list(&coin.as_ref().derivation_method.unwrap_single_addr())).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_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);
+    fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
+    fill_address(&coin, &coin.my_address().unwrap(), 2.into(), timeout);
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mut mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(privkey)),
+            "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);
+
+    let native = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "enable",
+        "coin": "MYCOIN",
+        "mm2": 1,
+        "utxo_merge_params": {
+            "merge_at": 3,
+            "check_every": 1,
+            "max_merge_at_once": 4,
+        }
+    })))
+    .unwrap();
+    assert!(native.0.is_success(), "'enable' failed: {}", 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();
+
+    block_on(mm_bob.wait_for_log(4., |log| log.contains("Trying to merge 4 UTXOs of coin MYCOIN"))).unwrap();
+
+    block_on(mm_bob.wait_for_log(4., |log| log.contains("UTXO merge successful for coin MYCOIN, tx_hash"))).unwrap();
+
+    thread::sleep(Duration::from_secs(2));
+    let (unspents, _) =
+        block_on(coin.get_unspent_ordered_list(&coin.as_ref().derivation_method.unwrap_single_addr())).unwrap();
+    // 4 utxos are merged of 5 so the resulting unspents len must be 2
+    assert_eq!(unspents.len(), 2);
+}
+
+#[test]
+fn test_withdraw_not_sufficient_balance() {
+    let privkey = random_secp256k1_secret();
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let mm = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(privkey)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "i_am_seed": true,
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm.log_path);
+    log!("{:?}", block_on(enable_native(&mm, "MYCOIN", &[])));
+
+    // balance = 0, but amount = 1
+    let amount = BigDecimal::from(1);
+    let withdraw = block_on(mm.rpc(&json!({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "params": {
+            "coin": "MYCOIN",
+            "to": "RJTYiYeJ8eVvJ53n2YbrVmxWNNMVZjDGLh",
+            "amount": amount,
+        },
+        "id": 0,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", withdraw.1);
+    log!("error: {:?}", withdraw.1);
+    let error: RpcErrorResponse<withdraw_error::NotSufficientBalance> =
+        serde_json::from_str(&withdraw.1).expect("Expected 'RpcErrorResponse<NotSufficientBalance>'");
+    let expected_error = withdraw_error::NotSufficientBalance {
+        coin: "MYCOIN".to_owned(),
+        available: 0.into(),
+        required: amount,
+    };
+    assert_eq!(error.error_type, "NotSufficientBalance");
+    assert_eq!(error.error_data, Some(expected_error));
+
+    // fill the MYCOIN balance
+    let balance = BigDecimal::from(1) / BigDecimal::from(2);
+    let (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", privkey);
+    fill_address(&coin, &coin.my_address().unwrap(), balance.clone(), 30);
+
+    // 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!({
+        "mmrpc": "2.0",
+        "userpass": mm.userpass,
+        "method": "withdraw",
+        "params": {
+            "coin": "MYCOIN",
+            "to": "RJTYiYeJ8eVvJ53n2YbrVmxWNNMVZjDGLh",
+            "amount": balance,
+        },
+        "id": 0,
+    })))
+    .unwrap();
+
+    assert!(withdraw.0.is_client_error(), "RICK withdraw: {}", withdraw.1);
+    log!("error: {:?}", withdraw.1);
+    let error: RpcErrorResponse<withdraw_error::NotSufficientBalance> =
+        serde_json::from_str(&withdraw.1).expect("Expected 'RpcErrorResponse<NotSufficientBalance>'");
+    let expected_error = withdraw_error::NotSufficientBalance {
+        coin: "MYCOIN".to_owned(),
+        available: balance.clone(),
+        required: balance + txfee,
+    };
+    assert_eq!(error.error_type, "NotSufficientBalance");
+    assert_eq!(error.error_data, Some(expected_error));
+}
+
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/1053
+#[test]
+fn test_taker_should_match_with_best_price_buy() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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);
+
+    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);
+
+    let mut mm_eve = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(eve_priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "seednodes": vec![format!("{}", mm_bob.ip)],
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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", &[])));
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 2,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_eve.rpc(&json!({
+        "userpass": mm_eve.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    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!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
+    log!("alice orderbook {}", rc.1);
+
+    thread::sleep(Duration::from_secs(1));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 3,
+        "volume": "1000",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+    let alice_buy: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
+
+    block_on(mm_eve.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    thread::sleep(Duration::from_secs(2));
+
+    block_on(check_my_swap_status_amounts(
+        &mm_alice,
+        alice_buy.result.uuid,
+        1000.into(),
+        1000.into(),
+    ));
+    block_on(check_my_swap_status_amounts(
+        &mm_eve,
+        alice_buy.result.uuid,
+        1000.into(),
+        1000.into(),
+    ));
+
+    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/1053
+#[test]
+fn test_taker_should_match_with_best_price_sell() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let 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);
+
+    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);
+
+    let mut mm_eve = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9000,
+            "dht": "on",  // Enable DHT without delay.
+            "passphrase": format!("0x{}", hex::encode(eve_priv_key)),
+            "coins": coins,
+            "rpc_password": "pass",
+            "seednodes": vec![format!("{}", mm_bob.ip)],
+        }),
+        "pass".to_string(),
+        None,
+    )
+    .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", &[])));
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 2,
+        "max": true,
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_eve.rpc(&json!({
+        "userpass": mm_eve.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+        "price": 1,
+        "max": true,
+    })))
+    .unwrap();
+    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!({
+        "userpass": mm_alice.userpass,
+        "method": "orderbook",
+        "base": "MYCOIN",
+        "rel": "MYCOIN1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!alice orderbook: {}", rc.1);
+    log!("alice orderbook {}", rc.1);
+
+    thread::sleep(Duration::from_secs(1));
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "MYCOIN1",
+        "rel": "MYCOIN",
+        "price": "0.1",
+        "volume": "1000",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+    let alice_buy: BuyOrSellRpcResult = serde_json::from_str(&rc.1).unwrap();
+
+    block_on(mm_eve.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
+
+    thread::sleep(Duration::from_secs(2));
+
+    block_on(check_my_swap_status_amounts(
+        &mm_alice,
+        alice_buy.result.uuid,
+        1000.into(),
+        1000.into(),
+    ));
+    block_on(check_my_swap_status_amounts(
+        &mm_eve,
+        alice_buy.result.uuid,
+        1000.into(),
+        1000.into(),
+    ));
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_eve.stop()).unwrap();
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
+fn test_match_utxo_with_eth_taker_sell() {
+    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!([mycoin_conf(1000), eth_testnet_conf()]);
+
+    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);
+
+    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);
+
+    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"]));
+    // pass without 0x
+    fill_eth(&eth_bob.address[2..]);
+
+    let eth_alice = block_on(enable_native(&mm_alice, "ETH", &["http://195.201.0.6:8565"]));
+    // pass without 0x
+    fill_eth(&eth_alice.address[2..]);
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "ETH",
+        "price": 1,
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "sell",
+        "base": "ETH",
+        "rel": "MYCOIN",
+        "price": 1,
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!sell: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/ETH"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/ETH"))).unwrap();
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+// https://github.com/KomodoPlatform/atomicDEX-API/issues/1074
+fn test_match_utxo_with_eth_taker_buy() {
+    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!([mycoin_conf(1000), eth_testnet_conf()]);
+    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);
+
+    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);
+
+    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"]));
+    // pass without 0x
+    fill_eth(&eth_bob.address[2..]);
+
+    let eth_alice = block_on(enable_native(&mm_alice, "ETH", &["http://195.201.0.6:8565"]));
+    // pass without 0x
+    fill_eth(&eth_alice.address[2..]);
+
+    let rc = block_on(mm_bob.rpc(&json!({
+        "userpass": mm_bob.userpass,
+        "method": "setprice",
+        "base": "MYCOIN",
+        "rel": "ETH",
+        "price": 1,
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+
+    let rc = block_on(mm_alice.rpc(&json!({
+        "userpass": mm_alice.userpass,
+        "method": "buy",
+        "base": "MYCOIN",
+        "rel": "ETH",
+        "price": 1,
+        "volume": "0.1",
+    })))
+    .unwrap();
+    assert!(rc.0.is_success(), "!buy: {}", rc.1);
+
+    block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/ETH"))).unwrap();
+    block_on(mm_alice.wait_for_log(22., |log| log.contains("Entering the taker_swap_loop MYCOIN/ETH"))).unwrap();
+
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+}
+
+#[test]
+fn test_locked_amount() {
+    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!([mycoin_conf(1000), mycoin1_conf(1000)]);
+    let bob_conf = Mm2TestConf::seednode(&format!("0x{}", hex::encode(bob_priv_key)), &coins);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+
+    let alice_conf = Mm2TestConf::light_node(&format!("0x{}", hex::encode(alice_priv_key)), &coins, &[&mm_bob
+        .ip
+        .to_string()]);
+    let mut mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, 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", &[])));
+
+    block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("MYCOIN", "MYCOIN1")],
+        1.,
+        1.,
+        777.,
+    ));
+
+    let locked_bob = block_on(get_locked_amount(&mm_bob, "MYCOIN"));
+    assert_eq!(locked_bob.coin, "MYCOIN");
+
+    let expected_result: MmNumberMultiRepr = MmNumber::from("777.00001").into();
+    assert_eq!(expected_result, locked_bob.locked_amount);
+
+    let locked_alice = block_on(get_locked_amount(&mm_alice, "MYCOIN1"));
+    assert_eq!(locked_alice.coin, "MYCOIN1");
+
+    let expected_result: MmNumberMultiRepr = MmNumber::from("778.00002").into();
+    assert_eq!(expected_result, locked_alice.locked_amount);
+}
diff --git a/mm2src/mm2_main/tests/docker_tests/mod.rs b/mm2src/mm2_main/tests/docker_tests/mod.rs
new file mode 100644
index 0000000000..837d09fcd0
--- /dev/null
+++ b/mm2src/mm2_main/tests/docker_tests/mod.rs
@@ -0,0 +1,15 @@
+pub mod docker_tests_common;
+
+mod docker_ordermatch_tests;
+mod docker_tests_inner;
+pub mod qrc20_tests;
+mod slp_tests;
+mod swap_watcher_tests;
+mod swaps_confs_settings_sync_tests;
+mod swaps_file_lock_tests;
+
+#[cfg(not(feature = "disable-solana-tests"))] mod solana_tests;
+
+// dummy test helping IDE to recognize this as test module
+#[test]
+fn dummy() { assert!(true) }
diff --git a/mm2src/mm2_main/src/docker_tests/qrc20_tests.rs b/mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs
similarity index 87%
rename from mm2src/mm2_main/src/docker_tests/qrc20_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs
index 4d2e22f0ec..838a148095 100644
--- a/mm2src/mm2_main/src/docker_tests/qrc20_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/qrc20_tests.rs
@@ -1,20 +1,26 @@
 use crate::docker_tests::docker_tests_common::*;
-use crate::mm2::lp_swap::{dex_fee_amount, max_taker_vol_from_available};
+use crate::integration_tests_common::enable_native;
 use bitcrypto::dhash160;
 use coins::qrc20::rpc_clients::for_tests::Qrc20NativeWalletOps;
 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::utxo::{UtxoActivationParams, UtxoCommonOps};
-use coins::{FeeApproxStage, FoundSwapTxSpend, MarketCoinOps, MmCoin, SearchForSwapTxSpendInput, SwapOps,
-            TradePreimageValue, TransactionEnum, ValidatePaymentInput};
+use coins::{CheckIfMyPaymentSentArgs, FeeApproxStage, FoundSwapTxSpend, MarketCoinOps, MmCoin,
+            SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerRefundsPaymentArgs,
+            SendMakerSpendsTakerPaymentArgs, SendTakerPaymentArgs, SendTakerRefundsPaymentArgs,
+            SendTakerSpendsMakerPaymentArgs, SwapOps, TradePreimageValue, TransactionEnum, ValidatePaymentInput};
 use common::log::debug;
 use common::{temp_dir, DEX_FEE_ADDR_RAW_PUBKEY};
+use crypto::Secp256k1Secret;
 use ethereum_types::H160;
 use futures01::Future;
 use http::StatusCode;
 use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_main::mm2::lp_swap::{dex_fee_amount, max_taker_vol_from_available};
 use mm2_number::BigDecimal;
+use mm2_test_helpers::structs::{trade_preimage_error, EnableElectrumResponse, OrderbookResponse, RpcErrorResponse,
+                                RpcSuccessResponse, TransactionDetails};
 use rand6::Rng;
 use serde_json::{self as json, Value as Json};
 use std::convert::TryFrom;
@@ -29,6 +35,7 @@ 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 TAKER_PAYMENT_SPEND_SEARCH_INTERVAL: f64 = 1.;
 
 pub struct QtumDockerOps {
     #[allow(dead_code)]
@@ -48,9 +55,9 @@ impl QtumDockerOps {
         let req = json!({
             "method": "enable",
         });
-        let priv_key = hex::decode("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f").unwrap();
+        let priv_key = Secp256k1Secret::from("809465b17d0a4ddb3e4c69e8f23c2cabad868f51f8bed5c765ad1d6516c3306f");
         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 coin = block_on(qtum_coin_with_priv_key(&ctx, "QTUM", &conf, &params, priv_key)).unwrap();
         QtumDockerOps { ctx, coin }
     }
 
@@ -175,18 +182,17 @@ fn test_taker_spends_maker_payment() {
     let secret = &[1; 32];
     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,
-            amount.clone(),
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash: &secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = maker_coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -202,9 +208,10 @@ fn test_taker_spends_maker_payment() {
 
     let input = ValidatePaymentInput {
         payment_tx: payment_tx_hex.clone(),
+        time_lock_duration: 0,
         time_lock: timelock,
         other_pub: maker_pub.clone(),
-        secret_hash,
+        secret_hash: secret_hash.clone(),
         amount: amount.clone(),
         swap_contract_address: taker_coin.swap_contract_address(),
         try_spv_proof_until: wait_until + 30,
@@ -212,16 +219,17 @@ fn test_taker_spends_maker_payment() {
         unique_swap_data: Vec::new(),
     };
     taker_coin.validate_maker_payment(input).wait().unwrap();
-
+    let taker_spends_payment_args = SendTakerSpendsMakerPaymentArgs {
+        other_payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: &maker_pub,
+        secret,
+        secret_hash: &secret_hash,
+        swap_contract_address: &taker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let spend = taker_coin
-        .send_taker_spends_maker_payment(
-            &payment_tx_hex,
-            timelock,
-            &maker_pub,
-            secret,
-            &taker_coin.swap_contract_address(),
-            &[],
-        )
+        .send_taker_spends_maker_payment(taker_spends_payment_args)
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
@@ -267,18 +275,17 @@ fn test_maker_spends_taker_payment() {
     let secret = &[1; 32];
     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,
-            amount.clone(),
-            &taker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &maker_pub,
+        secret_hash: &secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: &taker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = taker_coin.send_taker_payment(taker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Taker payment: {:?}", payment_tx_hash);
@@ -294,6 +301,7 @@ fn test_maker_spends_taker_payment() {
 
     let input = ValidatePaymentInput {
         payment_tx: payment_tx_hex.clone(),
+        time_lock_duration: 0,
         time_lock: timelock,
         other_pub: taker_pub.clone(),
         secret_hash: secret_hash.clone(),
@@ -304,16 +312,17 @@ fn test_maker_spends_taker_payment() {
         unique_swap_data: Vec::new(),
     };
     maker_coin.validate_taker_payment(input).wait().unwrap();
-
+    let maker_spends_payment_args = SendMakerSpendsTakerPaymentArgs {
+        other_payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret,
+        secret_hash: &secret_hash,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let spend = maker_coin
-        .send_maker_spends_taker_payment(
-            &payment_tx_hex,
-            timelock,
-            &taker_pub,
-            secret,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_spends_taker_payment(maker_spends_payment_args)
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
@@ -348,18 +357,17 @@ fn test_maker_refunds_payment() {
     let taker_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
     let secret_hash = &[1; 20];
     let amount = BigDecimal::from_str("0.2").unwrap();
-
-    let payment = coin
-        .send_maker_payment(
-            timelock,
-            &taker_pub,
-            secret_hash,
-            amount.clone(),
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = coin.send_maker_payment(maker_payment).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -374,16 +382,16 @@ fn test_maker_refunds_payment() {
 
     let balance_after_payment = coin.my_spendable_balance().wait().unwrap();
     assert_eq!(expected_balance.clone() - amount, balance_after_payment);
-
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let refund = coin
-        .send_maker_refunds_payment(
-            &payment_tx_hex,
-            timelock,
-            &taker_pub,
-            secret_hash,
-            &coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
@@ -409,18 +417,17 @@ fn test_taker_refunds_payment() {
     let maker_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
     let secret_hash = &[1; 20];
     let amount = BigDecimal::from_str("0.2").unwrap();
-
-    let payment = coin
-        .send_taker_payment(
-            timelock,
-            &maker_pub,
-            secret_hash,
-            amount.clone(),
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &maker_pub,
+        secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = coin.send_taker_payment(taker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Taker payment: {:?}", payment_tx_hash);
@@ -435,16 +442,16 @@ fn test_taker_refunds_payment() {
 
     let balance_after_payment = coin.my_spendable_balance().wait().unwrap();
     assert_eq!(expected_balance.clone() - amount, balance_after_payment);
-
+    let taker_refunds_payment_args = SendTakerRefundsPaymentArgs {
+        payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: &maker_pub,
+        secret_hash,
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let refund = coin
-        .send_taker_refunds_payment(
-            &payment_tx_hex,
-            timelock,
-            &maker_pub,
-            secret_hash,
-            &coin.swap_contract_address(),
-            &[],
-        )
+        .send_taker_refunds_payment(taker_refunds_payment_args)
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
@@ -467,18 +474,17 @@ fn test_check_if_my_payment_sent() {
     let taker_pub = hex::decode("022b00078841f37b5d30a6a1defb82b3af4d4e2d24dd4204d41f0c9ce1e875de1a").unwrap();
     let secret_hash = &[1; 20];
     let amount = BigDecimal::from_str("0.2").unwrap();
-
-    let payment = coin
-        .send_maker_payment(
-            timelock,
-            &taker_pub,
-            secret_hash,
-            amount,
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        amount: amount.clone(),
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -492,17 +498,17 @@ fn test_check_if_my_payment_sent() {
         .unwrap();
 
     let search_from_block = coin.current_block().wait().expect("!current_block") - 10;
-    let found = coin
-        .check_if_my_payment_sent(
-            timelock,
-            &taker_pub,
-            secret_hash,
-            search_from_block,
-            &coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let if_my_payment_sent_args = CheckIfMyPaymentSentArgs {
+        time_lock: timelock,
+        other_pub: &taker_pub,
+        secret_hash,
+        search_from_block,
+        swap_contract_address: &coin.swap_contract_address(),
+        swap_unique_data: &[],
+        amount: &amount,
+        payment_instructions: &None,
+    };
+    let found = coin.check_if_my_payment_sent(if_my_payment_sent_args).wait().unwrap();
     assert_eq!(found, Some(payment));
 }
 
@@ -516,20 +522,19 @@ fn test_search_for_swap_tx_spend_taker_spent() {
     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 secret_hash = dhash160(secret);
     let amount = BigDecimal::try_from(0.2).unwrap();
-
-    let payment = maker_coin
-        .send_maker_payment(
-            timelock,
-            taker_pub,
-            secret_hash,
-            amount,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: taker_pub,
+        secret_hash: secret_hash.as_slice(),
+        amount,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = maker_coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -542,16 +547,17 @@ fn test_search_for_swap_tx_spend_taker_spent() {
         .wait_for_confirmations(&payment_tx_hex, confirmations, requires_nota, wait_until, check_every)
         .wait()
         .unwrap();
-
+    let taker_spends_payment_args = SendTakerSpendsMakerPaymentArgs {
+        other_payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: maker_pub,
+        secret,
+        secret_hash: secret_hash.as_slice(),
+        swap_contract_address: &taker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let spend = taker_coin
-        .send_taker_spends_maker_payment(
-            &payment_tx_hex,
-            timelock,
-            maker_pub,
-            secret,
-            &taker_coin.swap_contract_address(),
-            &[],
-        )
+        .send_taker_spends_maker_payment(taker_spends_payment_args)
         .wait()
         .unwrap();
     let spend_tx_hash = spend.tx_hash();
@@ -567,7 +573,7 @@ fn test_search_for_swap_tx_spend_taker_spent() {
     let search_input = SearchForSwapTxSpendInput {
         time_lock: timelock,
         other_pub: taker_pub,
-        secret_hash,
+        secret_hash: secret_hash.as_slice(),
         tx: &payment_tx_hex,
         search_from_block,
         swap_contract_address: &maker_coin.swap_contract_address(),
@@ -588,18 +594,17 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
     let amount = BigDecimal::try_from(0.2).unwrap();
-
-    let payment = maker_coin
-        .send_maker_payment(
-            timelock,
-            &taker_pub,
-            secret_hash,
-            amount,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        amount,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = maker_coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -612,16 +617,16 @@ fn test_search_for_swap_tx_spend_maker_refunded() {
         .wait_for_confirmations(&payment_tx_hex, confirmations, requires_nota, wait_until, check_every)
         .wait()
         .unwrap();
-
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &payment_tx_hex,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+    };
     let refund = maker_coin
-        .send_maker_refunds_payment(
-            &payment_tx_hex,
-            timelock,
-            &taker_pub,
-            secret_hash,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
     let refund_tx_hash = refund.tx_hash();
@@ -658,18 +663,17 @@ fn test_search_for_swap_tx_spend_not_spent() {
     let secret = &[1; 32];
     let secret_hash = &*dhash160(secret);
     let amount = BigDecimal::try_from(0.2).unwrap();
-
-    let payment = maker_coin
-        .send_maker_payment(
-            timelock,
-            &taker_pub,
-            secret_hash,
-            amount,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &taker_pub,
+        secret_hash,
+        amount,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = maker_coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -707,20 +711,19 @@ fn test_wait_for_tx_spend() {
     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 secret_hash = dhash160(secret);
     let amount = BigDecimal::try_from(0.2).unwrap();
-
-    let payment = maker_coin
-        .send_maker_payment(
-            timelock,
-            taker_pub,
-            secret_hash,
-            amount,
-            &maker_coin.swap_contract_address(),
-            &[],
-        )
-        .wait()
-        .unwrap();
+    let maker_payment_args = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: taker_pub,
+        secret_hash: secret_hash.as_slice(),
+        amount,
+        swap_contract_address: &maker_coin.swap_contract_address(),
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let payment = maker_coin.send_maker_payment(maker_payment_args).wait().unwrap();
     let payment_tx_hash = payment.tx_hash();
     let payment_tx_hex = payment.tx_hex();
     log!("Maker payment: {:?}", payment_tx_hash);
@@ -734,14 +737,16 @@ fn test_wait_for_tx_spend() {
         .wait()
         .unwrap();
 
-    // first try to check if the wait_for_tx_spend() returns an error correctly
+    // first try to check if the wait_for_htlc_tx_spend() returns an error correctly
     let wait_until = (now_ms() / 1000) + 5;
     let tx_err = maker_coin
-        .wait_for_tx_spend(
+        .wait_for_htlc_tx_spend(
             &payment_tx_hex,
+            &[],
             wait_until,
             from_block,
             &maker_coin.swap_contract_address(),
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
         )
         .wait()
         .expect_err("Expected 'Waited too long' error");
@@ -750,23 +755,24 @@ fn test_wait_for_tx_spend() {
     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
+    // also spends the maker payment and try to check if the wait_for_htlc_tx_spend() returns the correct tx
     static mut SPEND_TX: Option<TransactionEnum> = None;
 
     let maker_pub_c = maker_pub.to_vec();
     let payment_hex = payment_tx_hex.clone();
     thread::spawn(move || {
         thread::sleep(Duration::from_secs(5));
-
+        let taker_spends_payment_args = SendTakerSpendsMakerPaymentArgs {
+            other_payment_tx: &payment_hex,
+            time_lock: timelock,
+            other_pubkey: &maker_pub_c,
+            secret,
+            secret_hash: secret_hash.as_slice(),
+            swap_contract_address: &taker_coin.swap_contract_address(),
+            swap_unique_data: &[],
+        };
         let spend = taker_coin
-            .send_taker_spends_maker_payment(
-                &payment_hex,
-                timelock,
-                &maker_pub_c,
-                secret,
-                &taker_coin.swap_contract_address(),
-                &[],
-            )
+            .send_taker_spends_maker_payment(taker_spends_payment_args)
             .wait()
             .unwrap();
         unsafe { SPEND_TX = Some(spend) }
@@ -774,11 +780,13 @@ fn test_wait_for_tx_spend() {
 
     let wait_until = (now_ms() / 1000) + 120;
     let found = maker_coin
-        .wait_for_tx_spend(
+        .wait_for_htlc_tx_spend(
             &payment_tx_hex,
+            &[],
             wait_until,
             from_block,
             &maker_coin.swap_contract_address(),
+            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
         )
         .wait()
         .unwrap();
@@ -788,26 +796,26 @@ fn test_wait_for_tx_spend() {
 
 #[test]
 fn test_check_balance_on_order_post_base_coin_locked() {
-    let bob_priv_key = SecretKey::new(&mut rand6::thread_rng());
-    let alice_priv_key = SecretKey::new(&mut rand6::thread_rng());
+    let bob_priv_key = random_secp256k1_secret();
+    let alice_priv_key = random_secp256k1_secret();
     let timeout = 30; // timeout if test takes more than 80 seconds to run
 
     // fill the Bob address by 0.05 Qtum
-    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", bob_priv_key.as_ref());
+    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", bob_priv_key);
     let my_address = coin.my_address().expect("!my_address");
     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 (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", bob_priv_key);
     let my_address = coin.my_address().expect("!my_address");
     fill_address(&coin, &my_address, 10.into(), timeout);
 
     // fill the Alice address by 10 Qtum and 10 QICK
-    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", alice_priv_key.as_ref());
+    let (_ctx, coin) = qrc20_coin_from_privkey("QICK", alice_priv_key);
     let my_address = coin.my_address().expect("!my_address");
     fill_address(&coin, &my_address, 10.into(), timeout);
     fill_qrc20_address(&coin, 10.into(), timeout);
     // fill the Alice address by 10 MYCOIN
-    let (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", alice_priv_key.as_ref());
+    let (_ctx, coin) = utxo_coin_from_privkey("MYCOIN", alice_priv_key);
     let my_address = coin.my_address().expect("!my_address");
     fill_address(&coin, &my_address, 10.into(), timeout);
 
@@ -826,7 +834,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
             "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": format!("0x{}", hex::encode(bob_priv_key.as_ref())),
+            "passphrase": format!("0x{}", hex::encode(bob_priv_key)),
             "coins": coins,
             "i_am_seed": true,
             "rpc_password": "pass",
@@ -849,7 +857,7 @@ fn test_check_balance_on_order_post_base_coin_locked() {
             "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": format!("0x{}", hex::encode(alice_priv_key.as_ref())),
+            "passphrase": format!("0x{}", hex::encode(alice_priv_key)),
             "coins": coins,
             "seednodes": [mm_bob.ip.to_string()],
             "rpc_password": "pass",
@@ -1020,16 +1028,19 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
         .send_taker_fee(&DEX_FEE_ADDR_RAW_PUBKEY, dex_fee_amount.to_decimal(), &[])
         .wait()
         .expect("!send_taker_fee");
+    let taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock: timelock,
+        other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
+        secret_hash,
+        amount: expected_max_taker_vol.to_decimal(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
 
     let _taker_payment_tx = coin
-        .send_taker_payment(
-            timelock,
-            &DEX_FEE_ADDR_RAW_PUBKEY,
-            secret_hash,
-            expected_max_taker_vol.to_decimal(),
-            &None,
-            &[],
-        )
+        .send_taker_payment(taker_payment_args)
         .wait()
         .expect("!send_taker_payment");
 
@@ -1298,8 +1309,8 @@ fn test_segwit_native_balance() {
     block_on(mm.wait_for_log(22., |log| log.contains(">>>>>>>>> DEX stats "))).unwrap();
 
     let enable_res = block_on(enable_native(&mm, "QTUM", &[]));
-    let balance = enable_res["balance"].as_str().unwrap();
-    assert_eq!(balance, "0.5");
+    let expected_balance: BigDecimal = "0.5".parse().unwrap();
+    assert_eq!(enable_res.balance, expected_balance);
 
     let my_balance = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
@@ -1415,17 +1426,31 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_maker() {
     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, my_public_key, &[0; 20], 1u64.into(), &None, &[])
-        .wait()
-        .unwrap();
+    let maker_payment = SendMakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_maker_payment(maker_payment).wait().unwrap();
 
     coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
         .wait()
         .unwrap();
-
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
     let refund_tx = coin
-        .send_maker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
 
@@ -1456,17 +1481,31 @@ fn test_search_for_segwit_swap_tx_spend_native_was_refunded_taker() {
     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, my_public_key, &[0; 20], 1u64.into(), &None, &[])
-        .wait()
-        .unwrap();
+    let taker_payment = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_taker_payment(taker_payment).wait().unwrap();
 
     coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
         .wait()
         .unwrap();
-
+    let maker_refunds_payment_args = SendMakerRefundsPaymentArgs {
+        payment_tx: &tx.tx_hex(),
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+    };
     let refund_tx = coin
-        .send_taker_refunds_payment(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
+        .send_maker_refunds_payment(maker_refunds_payment_args)
         .wait()
         .unwrap();
 
diff --git a/mm2src/mm2_main/src/docker_tests/slp_tests.rs b/mm2src/mm2_main/tests/docker_tests/slp_tests.rs
similarity index 78%
rename from mm2src/mm2_main/src/docker_tests/slp_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/slp_tests.rs
index 478743d89f..b1e889cc22 100644
--- a/mm2src/mm2_main/src/docker_tests/slp_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/slp_tests.rs
@@ -1,6 +1,9 @@
 use crate::docker_tests::docker_tests_common::*;
+use crate::integration_tests_common::enable_native;
 use mm2_number::BigDecimal;
-use mm2_test_helpers::for_tests::{enable_bch_with_tokens, enable_slp, UtxoRpcMode};
+use mm2_test_helpers::for_tests::{assert_coin_not_found_on_balance, disable_coin, disable_coin_err,
+                                  enable_bch_with_tokens, enable_slp, my_balance, UtxoRpcMode};
+use mm2_test_helpers::structs::{EnableBchWithTokensResponse, EnableElectrumResponse, EnableSlpResponse, RpcV2Response};
 use serde_json::{self as json};
 use std::time::Duration;
 
@@ -30,7 +33,6 @@ fn test_bch_and_slp_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);
@@ -146,3 +148,35 @@ fn test_withdraw_bch_max_must_not_spend_slp() {
 
     assert_eq!(expected_spendable, slp_balance.balance);
 }
+
+#[test]
+fn test_disable_platform_coin_with_tokens() {
+    let mm = slp_supplied_node();
+    let _ = block_on(enable_bch_with_tokens(
+        &mm,
+        "FORSLP",
+        &["ADEXSLP"],
+        UtxoRpcMode::Native,
+        false,
+    ));
+    // Try to disable ADEXSLP token.
+    block_on(disable_coin(&mm, "ADEXSLP"));
+    // Check if platform_coin FORSLP is still enabled.
+    block_on(my_balance(&mm, "FORSLP"));
+    // Check if ADEXSLP token still enabled.
+    block_on(assert_coin_not_found_on_balance(&mm, "ADEXSLP"));
+    // Try to disable patform_coin.
+    block_on(disable_coin(&mm, "FORSLP"));
+
+    // Enable enable_bch_with_tokens again to restart the process
+    let _ = block_on(enable_bch_with_tokens(
+        &mm,
+        "FORSLP",
+        &["ADEXSLP"],
+        UtxoRpcMode::Native,
+        false,
+    ));
+    // Try to disable platform coin, FORSLP. This should fail due to the dependent tokens.
+    let error = block_on(disable_coin_err(&mm, "FORSLP"));
+    assert_eq!(error.dependent_tokens, ["ADEXSLP"]);
+}
diff --git a/mm2src/mm2_main/src/docker_tests/solana_tests.rs b/mm2src/mm2_main/tests/docker_tests/solana_tests.rs
similarity index 73%
rename from mm2src/mm2_main/src/docker_tests/solana_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/solana_tests.rs
index a566123dbb..1164c20c95 100644
--- a/mm2src/mm2_main/src/docker_tests/solana_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/solana_tests.rs
@@ -1,6 +1,9 @@
 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 mm2_number::bigdecimal::Zero;
+use mm2_test_helpers::for_tests::{disable_coin, disable_coin_err, enable_solana_with_tokens, enable_spl, sign_message,
+                                  verify_message};
+use mm2_test_helpers::structs::{EnableSolanaWithTokensResponse, EnableSplResponse, RpcV2Response, SignatureResponse,
+                                VerificationResponse};
 use serde_json as json;
 
 #[test]
@@ -109,3 +112,27 @@ fn test_sign_verify_message_spl() {
 
     assert!(response.is_valid);
 }
+
+#[test]
+fn test_disable_solana_platform_coin_with_tokens() {
+    let mm = solana_supplied_node();
+    block_on(enable_solana_with_tokens(
+        &mm,
+        "SOL-DEVNET",
+        &["USDC-SOL-DEVNET"],
+        "https://api.devnet.solana.com",
+        false,
+    ));
+    block_on(enable_spl(&mm, "ADEX-SOL-DEVNET"));
+
+    // Try to disable platform coin, SOL-DEVNET. This should fail due to the dependent tokens.
+    let error = block_on(disable_coin_err(&mm, "SOL-DEVNET"));
+    assert_eq!(error.dependent_tokens, ["ADEX-SOL-DEVNET", "USDC-SOL-DEVNET"]);
+
+    // Try to disable ADEX-SOL-DEVNET token first.
+    block_on(disable_coin(&mm, "ADEX-SOL-DEVNET"));
+    // Try to disable USDC-SOL-DEVNET token first.
+    block_on(disable_coin(&mm, "USDC-SOL-DEVNET"));
+    // Then try to disable SOL-DEVNET platform coin.
+    block_on(disable_coin(&mm, "SOL-DEVNET"));
+}
diff --git a/mm2src/mm2_main/tests/docker_tests/swap_watcher_tests.rs b/mm2src/mm2_main/tests/docker_tests/swap_watcher_tests.rs
new file mode 100644
index 0000000000..98ea02ce44
--- /dev/null
+++ b/mm2src/mm2_main/tests/docker_tests/swap_watcher_tests.rs
@@ -0,0 +1,929 @@
+use crate::docker_tests::docker_tests_common::{eth_distributor, generate_eth_coin_with_random_privkey,
+                                               generate_jst_with_seed};
+use crate::integration_tests_common::*;
+use crate::{generate_utxo_coin_with_privkey, generate_utxo_coin_with_random_privkey, random_secp256k1_secret,
+            SecretKey};
+use coins::coin_errors::ValidatePaymentError;
+use coins::utxo::UtxoCommonOps;
+use coins::{FoundSwapTxSpend, MarketCoinOps, MmCoinEnum, SearchForSwapTxSpendInput, SendTakerPaymentArgs,
+            SendWatcherRefundsPaymentArgs, SwapOps, WatcherOps, WatcherValidateTakerFeeInput,
+            EARLY_CONFIRMATION_ERR_LOG, INVALID_RECEIVER_ERR_LOG, INVALID_SENDER_ERR_LOG, OLD_TRANSACTION_ERR_LOG};
+use common::{block_on, now_ms, DEX_FEE_ADDR_RAW_PUBKEY};
+use futures01::Future;
+use mm2_main::mm2::lp_swap::{dex_fee_amount_from_taker_coin, get_payment_locktime, MAKER_PAYMENT_SENT_LOG,
+                             MAKER_PAYMENT_SPEND_FOUND_LOG, MAKER_PAYMENT_SPEND_SENT_LOG,
+                             TAKER_PAYMENT_REFUND_SENT_LOG, WATCHER_MESSAGE_SENT_LOG};
+use mm2_number::BigDecimal;
+use mm2_number::MmNumber;
+use mm2_test_helpers::for_tests::{enable_eth_coin, eth_jst_conf, eth_testnet_conf, mm_dump, my_balance, mycoin1_conf,
+                                  mycoin_conf, start_swaps, MarketMakerIt, Mm2TestConf, DEFAULT_RPC_PASSWORD,
+                                  ETH_SEPOLIA_NODE, ETH_SEPOLIA_SWAP_CONTRACT, ETH_SEPOLIA_TOKEN_CONTRACT};
+use mm2_test_helpers::structs::WatcherConf;
+use std::str::FromStr;
+use std::thread;
+use std::time::Duration;
+use uuid::Uuid;
+
+fn enable_eth_and_jst(mm_node: &MarketMakerIt) {
+    dbg!(block_on(enable_eth_coin(
+        mm_node,
+        "ETH",
+        ETH_SEPOLIA_NODE,
+        ETH_SEPOLIA_SWAP_CONTRACT,
+        Some(ETH_SEPOLIA_SWAP_CONTRACT)
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        mm_node,
+        "JST",
+        ETH_SEPOLIA_NODE,
+        ETH_SEPOLIA_SWAP_CONTRACT,
+        Some(ETH_SEPOLIA_SWAP_CONTRACT)
+    )));
+}
+
+#[test]
+#[ignore]
+fn test_watcher_spends_maker_payment_spend_eth_erc20() {
+    let coins = json!([eth_testnet_conf(), eth_jst_conf(ETH_SEPOLIA_TOKEN_CONTRACT)]);
+
+    let alice_passphrase =
+        String::from("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&alice_passphrase, &coins);
+    let mut mm_alice = MarketMakerIt::start(alice_conf.conf.clone(), alice_conf.rpc_password.clone(), None).unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let bob_passphrase = String::from("also shoot benefit prefer juice shell elder veteran woman mimic image kidney");
+    let bob_conf = Mm2TestConf::light_node(&bob_passphrase, &coins, &[&mm_alice.ip.to_string()]);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let watcher_passphrase =
+        String::from("also shoot benefit prefer juice shell thank unfair canal monkey style afraid");
+    let watcher_conf =
+        Mm2TestConf::watcher_light_node(&watcher_passphrase, &coins, &[&mm_alice.ip.to_string()], WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 0.,
+            refund_start_factor: 1.5,
+            search_interval: 1.0,
+        })
+        .conf;
+    let mut mm_watcher = MarketMakerIt::start(watcher_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.log_path);
+
+    enable_eth_and_jst(&mm_alice);
+    enable_eth_and_jst(&mm_bob);
+    enable_eth_and_jst(&mm_watcher);
+
+    let alice_eth_balance_before = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_before = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+    let bob_eth_balance_before = block_on(my_balance(&mm_bob, "ETH")).balance.with_scale(2);
+    let bob_jst_balance_before = block_on(my_balance(&mm_bob, "JST")).balance.with_scale(2);
+
+    block_on(start_swaps(&mut mm_bob, &mut mm_alice, &[("ETH", "JST")], 1., 1., 0.01));
+
+    block_on(mm_alice.wait_for_log(180., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(180., |log| log.contains(MAKER_PAYMENT_SPEND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(25));
+
+    let mm_alice = MarketMakerIt::start(alice_conf.conf.clone(), alice_conf.rpc_password.clone(), None).unwrap();
+    enable_eth_and_jst(&mm_alice);
+
+    let alice_eth_balance_after = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_after = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+    let bob_eth_balance_after = block_on(my_balance(&mm_bob, "ETH")).balance.with_scale(2);
+    let bob_jst_balance_after = block_on(my_balance(&mm_bob, "JST")).balance.with_scale(2);
+
+    let volume = BigDecimal::from_str("0.01").unwrap();
+    assert_eq!(alice_jst_balance_before - volume.clone(), alice_jst_balance_after);
+    assert_eq!(bob_jst_balance_before + volume.clone(), bob_jst_balance_after);
+    assert_eq!(alice_eth_balance_before + volume.clone(), alice_eth_balance_after);
+    assert_eq!(bob_eth_balance_before - volume.clone(), bob_eth_balance_after);
+}
+
+#[test]
+#[ignore]
+fn test_watcher_spends_maker_payment_spend_erc20_eth() {
+    let coins = json!([eth_testnet_conf(), eth_jst_conf(ETH_SEPOLIA_TOKEN_CONTRACT)]);
+
+    let alice_passphrase =
+        String::from("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&alice_passphrase, &coins);
+    let mut mm_alice = MarketMakerIt::start(alice_conf.conf.clone(), alice_conf.rpc_password.clone(), None).unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let bob_passphrase = String::from("also shoot benefit prefer juice shell elder veteran woman mimic image kidney");
+    let bob_conf = Mm2TestConf::light_node(&bob_passphrase, &coins, &[&mm_alice.ip.to_string()]);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let watcher_passphrase =
+        String::from("also shoot benefit prefer juice shell thank unfair canal monkey style afraid");
+    let watcher_conf =
+        Mm2TestConf::watcher_light_node(&watcher_passphrase, &coins, &[&mm_alice.ip.to_string()], WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 0.,
+            refund_start_factor: 1.5,
+            search_interval: 1.0,
+        })
+        .conf;
+
+    let mut mm_watcher = MarketMakerIt::start(watcher_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.log_path);
+
+    enable_eth_and_jst(&mm_alice);
+    enable_eth_and_jst(&mm_bob);
+    enable_eth_and_jst(&mm_watcher);
+
+    let alice_eth_balance_before = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_before = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+    let bob_eth_balance_before = block_on(my_balance(&mm_bob, "ETH")).balance.with_scale(2);
+    let bob_jst_balance_before = block_on(my_balance(&mm_bob, "JST")).balance.with_scale(2);
+
+    block_on(start_swaps(&mut mm_bob, &mut mm_alice, &[("JST", "ETH")], 1., 1., 0.01));
+
+    block_on(mm_alice.wait_for_log(180., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(180., |log| log.contains(MAKER_PAYMENT_SPEND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(25));
+
+    let mm_alice = MarketMakerIt::start(alice_conf.conf.clone(), alice_conf.rpc_password.clone(), None).unwrap();
+    enable_eth_and_jst(&mm_alice);
+
+    let alice_eth_balance_after = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_after = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+    let bob_eth_balance_after = block_on(my_balance(&mm_bob, "ETH")).balance.with_scale(2);
+    let bob_jst_balance_after = block_on(my_balance(&mm_bob, "JST")).balance.with_scale(2);
+
+    let volume = BigDecimal::from_str("0.01").unwrap();
+
+    assert_eq!(alice_jst_balance_before + volume.clone(), alice_jst_balance_after);
+    assert_eq!(bob_jst_balance_before - volume.clone(), bob_jst_balance_after);
+    assert_eq!(alice_eth_balance_before - volume.clone(), alice_eth_balance_after);
+    assert_eq!(bob_eth_balance_before + volume.clone(), bob_eth_balance_after);
+}
+
+#[test]
+#[ignore]
+fn test_watcher_refunds_taker_payment_erc20() {
+    let coins = json!([eth_testnet_conf(), eth_jst_conf(ETH_SEPOLIA_TOKEN_CONTRACT)]);
+
+    let alice_passphrase =
+        String::from("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&alice_passphrase, &coins);
+    let mut mm_alice = block_on(MarketMakerIt::start_with_envs(
+        alice_conf.conf.clone(),
+        alice_conf.rpc_password.clone(),
+        None,
+        &[("USE_TEST_LOCKTIME", "")],
+    ))
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let bob_passphrase = String::from("also shoot benefit prefer juice shell elder veteran woman mimic image kidney");
+    let bob_conf = Mm2TestConf::light_node(&bob_passphrase, &coins, &[&mm_alice.ip.to_string()]);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let watcher_passphrase =
+        String::from("also shoot benefit prefer juice shell thank unfair canal monkey style afraid");
+    let watcher_conf =
+        Mm2TestConf::watcher_light_node(&watcher_passphrase, &coins, &[&mm_alice.ip.to_string()], WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 1.,
+            refund_start_factor: 0.,
+            search_interval: 1.,
+        })
+        .conf;
+    let mut mm_watcher = block_on(MarketMakerIt::start_with_envs(
+        watcher_conf,
+        DEFAULT_RPC_PASSWORD.to_string(),
+        None,
+        &[("REFUND_TEST", "")],
+    ))
+    .unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.log_path);
+
+    enable_eth_and_jst(&mm_alice);
+    enable_eth_and_jst(&mm_bob);
+    enable_eth_and_jst(&mm_watcher);
+
+    let alice_eth_balance_before = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_before = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+
+    block_on(start_swaps(&mut mm_bob, &mut mm_alice, &[("ETH", "JST")], 1., 1., 0.01));
+
+    block_on(mm_bob.wait_for_log(160., |log| log.contains(MAKER_PAYMENT_SENT_LOG))).unwrap();
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.wait_for_log(160., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(160., |log| log.contains(TAKER_PAYMENT_REFUND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(25));
+
+    let mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
+    enable_eth_and_jst(&mm_alice);
+
+    let alice_eth_balance_after = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_after = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+
+    assert_eq!(alice_jst_balance_before, alice_jst_balance_after);
+    assert_eq!(alice_eth_balance_before, alice_eth_balance_after);
+}
+
+#[test]
+#[ignore]
+fn test_watcher_refunds_taker_payment_eth() {
+    let coins = json!([eth_testnet_conf(), eth_jst_conf(ETH_SEPOLIA_TOKEN_CONTRACT)]);
+
+    let alice_passphrase =
+        String::from("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&alice_passphrase, &coins);
+    let mut mm_alice = block_on(MarketMakerIt::start_with_envs(
+        alice_conf.conf.clone(),
+        alice_conf.rpc_password.clone(),
+        None,
+        &[("USE_TEST_LOCKTIME", "")],
+    ))
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let bob_passphrase = String::from("also shoot benefit prefer juice shell elder veteran woman mimic image kidney");
+    let bob_conf = Mm2TestConf::light_node(&bob_passphrase, &coins, &[&mm_alice.ip.to_string()]);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let watcher_passphrase =
+        String::from("also shoot benefit prefer juice shell thank unfair canal monkey style afraid");
+    let watcher_conf =
+        Mm2TestConf::watcher_light_node(&watcher_passphrase, &coins, &[&mm_alice.ip.to_string()], WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 1.,
+            refund_start_factor: 0.,
+            search_interval: 1.,
+        })
+        .conf;
+    let mut mm_watcher = block_on(MarketMakerIt::start_with_envs(
+        watcher_conf,
+        DEFAULT_RPC_PASSWORD.to_string(),
+        None,
+        &[("REFUND_TEST", "")],
+    ))
+    .unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.log_path);
+
+    enable_eth_and_jst(&mm_alice);
+    enable_eth_and_jst(&mm_bob);
+    enable_eth_and_jst(&mm_watcher);
+
+    let alice_eth_balance_before = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_before = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+
+    block_on(start_swaps(&mut mm_bob, &mut mm_alice, &[("JST", "ETH")], 1., 1., 0.01));
+
+    block_on(mm_bob.wait_for_log(160., |log| log.contains(MAKER_PAYMENT_SENT_LOG))).unwrap();
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.wait_for_log(160., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(160., |log| log.contains(TAKER_PAYMENT_REFUND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(25));
+
+    let mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
+    enable_eth_and_jst(&mm_alice);
+
+    let alice_eth_balance_after = block_on(my_balance(&mm_alice, "ETH")).balance.with_scale(2);
+    let alice_jst_balance_after = block_on(my_balance(&mm_alice, "JST")).balance.with_scale(2);
+
+    assert_eq!(alice_jst_balance_before, alice_jst_balance_after);
+    assert_eq!(alice_eth_balance_before, alice_eth_balance_after);
+}
+
+#[test]
+fn test_watcher_validate_taker_fee_eth() {
+    let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
+    let lock_duration = get_payment_locktime();
+
+    let taker_coin = eth_distributor();
+    let taker_keypair = taker_coin.derive_htlc_key_pair(&[]);
+    let taker_pubkey = taker_keypair.public();
+
+    let maker_coin = generate_eth_coin_with_random_privkey();
+    let maker_keypair = maker_coin.derive_htlc_key_pair(&[]);
+    let maker_pubkey = maker_keypair.public();
+
+    let taker_amount = MmNumber::from((10, 1));
+    let fee_amount = dex_fee_amount_from_taker_coin(
+        &MmCoinEnum::EthCoin(taker_coin.clone()),
+        maker_coin.ticker(),
+        &taker_amount,
+    );
+    let taker_fee = taker_coin
+        .send_taker_fee(
+            &DEX_FEE_ADDR_RAW_PUBKEY,
+            fee_amount.clone().into(),
+            Uuid::new_v4().as_bytes(),
+        )
+        .wait()
+        .unwrap();
+
+    taker_coin
+        .wait_for_confirmations(&taker_fee.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    let validate_taker_fee_res = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait();
+    assert!(validate_taker_fee_res.is_ok());
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: maker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_SENDER_ERR_LOG))
+        },
+        _ => panic!("Expected `WrongPaymentTx` invalid public key, found {:?}", error),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: std::u64::MAX,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(EARLY_CONFIRMATION_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` confirmed before min_block, found {:?}",
+            error
+        ),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: taker_pubkey.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_RECEIVER_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` tx output script_pubkey doesn't match expected, found {:?}",
+            error
+        ),
+    }
+}
+
+#[test]
+fn test_watcher_validate_taker_fee_erc20() {
+    let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
+    let lock_duration = get_payment_locktime();
+
+    let seed = String::from("spice describe gravity federal blast come thank unfair canal monkey style afraid");
+    let taker_coin = generate_jst_with_seed(&seed);
+    let taker_keypair = taker_coin.derive_htlc_key_pair(&[]);
+    let taker_pubkey = taker_keypair.public();
+
+    let maker_coin = generate_eth_coin_with_random_privkey();
+    let maker_keypair = maker_coin.derive_htlc_key_pair(&[]);
+    let maker_pubkey = maker_keypair.public();
+
+    let taker_amount = MmNumber::from((10, 1));
+    let fee_amount = dex_fee_amount_from_taker_coin(
+        &MmCoinEnum::EthCoin(taker_coin.clone()),
+        maker_coin.ticker(),
+        &taker_amount,
+    );
+    let taker_fee = taker_coin
+        .send_taker_fee(
+            &DEX_FEE_ADDR_RAW_PUBKEY,
+            fee_amount.clone().into(),
+            Uuid::new_v4().as_bytes(),
+        )
+        .wait()
+        .unwrap();
+
+    taker_coin
+        .wait_for_confirmations(&taker_fee.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    let validate_taker_fee_res = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait();
+    assert!(validate_taker_fee_res.is_ok());
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: maker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_SENDER_ERR_LOG))
+        },
+        _ => panic!("Expected `WrongPaymentTx` invalid public key, found {:?}", error),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: std::u64::MAX,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(EARLY_CONFIRMATION_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` confirmed before min_block, found {:?}",
+            error
+        ),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: taker_pubkey.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_RECEIVER_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` tx output script_pubkey doesn't match expected, found {:?}",
+            error
+        ),
+    }
+}
+
+#[test]
+fn test_watcher_spends_maker_payment_spend_utxo() {
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN1", 100.into(), bob_priv_key);
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN", 100.into(), alice_priv_key);
+
+    let watcher_priv_key = random_secp256k1_secret();
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&format!("0x{}", hex::encode(alice_priv_key)), &coins).conf;
+    let mut mm_alice = MarketMakerIt::start(alice_conf.clone(), DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
+
+    let bob_conf = Mm2TestConf::light_node(&format!("0x{}", hex::encode(bob_priv_key)), &coins, &[&mm_alice
+        .ip
+        .to_string()])
+    .conf;
+    let mut mm_bob = MarketMakerIt::start(bob_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+
+    let watcher_conf = Mm2TestConf::watcher_light_node(
+        &format!("0x{}", hex::encode(watcher_priv_key)),
+        &coins,
+        &[&mm_alice.ip.to_string()],
+        WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 0.,
+            refund_start_factor: 1.5,
+            search_interval: 1.0,
+        },
+    )
+    .conf;
+    let mut mm_watcher = MarketMakerIt::start(watcher_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.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_watcher, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_watcher, "MYCOIN1", &[])));
+
+    block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("MYCOIN", "MYCOIN1")],
+        25.,
+        25.,
+        2.,
+    ));
+    block_on(mm_alice.wait_for_log(60., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(60., |log| log.contains(MAKER_PAYMENT_SPEND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(5));
+
+    let mm_alice = MarketMakerIt::start(alice_conf, DEFAULT_RPC_PASSWORD.to_string(), None).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", &[])));
+
+    assert_eq!(
+        block_on(my_balance(&mm_alice, "MYCOIN1")).balance,
+        BigDecimal::from_str("49.93562994").unwrap()
+    );
+    assert_eq!(
+        block_on(my_balance(&mm_alice, "MYCOIN")).balance,
+        BigDecimal::from_str("101.99999").unwrap()
+    );
+    assert_eq!(
+        block_on(my_balance(&mm_bob, "MYCOIN1")).balance,
+        BigDecimal::from_str("149.99999").unwrap()
+    );
+    assert_eq!(
+        block_on(my_balance(&mm_bob, "MYCOIN")).balance,
+        BigDecimal::from_str("97.99999").unwrap()
+    );
+}
+
+#[test]
+fn test_watcher_waits_for_taker_utxo() {
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN1", 100.into(), bob_priv_key);
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN", 100.into(), alice_priv_key);
+    let watcher_priv_key = *SecretKey::new(&mut rand6::thread_rng()).as_ref();
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&format!("0x{}", hex::encode(alice_priv_key)), &coins).conf;
+    let mut mm_alice = MarketMakerIt::start(alice_conf.clone(), DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
+
+    let bob_conf = Mm2TestConf::light_node(&format!("0x{}", hex::encode(bob_priv_key)), &coins, &[&mm_alice
+        .ip
+        .to_string()])
+    .conf;
+    let mut mm_bob = MarketMakerIt::start(bob_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+
+    let watcher_conf = Mm2TestConf::watcher_light_node(
+        &format!("0x{}", hex::encode(watcher_priv_key)),
+        &coins,
+        &[&mm_alice.ip.to_string()],
+        WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 1.,
+            refund_start_factor: 1.5,
+            search_interval: 1.,
+        },
+    )
+    .conf;
+    let mut mm_watcher = MarketMakerIt::start(watcher_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.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_watcher, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_watcher, "MYCOIN1", &[])));
+
+    block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("MYCOIN", "MYCOIN1")],
+        25.,
+        25.,
+        2.,
+    ));
+    block_on(mm_watcher.wait_for_log(160., |log| log.contains(MAKER_PAYMENT_SPEND_FOUND_LOG))).unwrap();
+}
+
+#[test]
+fn test_watcher_refunds_taker_payment_utxo() {
+    let (_ctx, _, bob_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN1", 100.into(), bob_priv_key);
+    let (_ctx, _, alice_priv_key) = generate_utxo_coin_with_random_privkey("MYCOIN1", 100.into());
+    generate_utxo_coin_with_privkey("MYCOIN", 100.into(), alice_priv_key);
+    let watcher_priv_key = *SecretKey::new(&mut rand6::thread_rng()).as_ref();
+
+    let coins = json!([mycoin_conf(1000), mycoin1_conf(1000)]);
+
+    let alice_conf = Mm2TestConf::seednode_using_watchers(&format!("0x{}", hex::encode(alice_priv_key)), &coins).conf;
+    let mut mm_alice = block_on(MarketMakerIt::start_with_envs(
+        alice_conf.clone(),
+        DEFAULT_RPC_PASSWORD.to_string(),
+        None,
+        &[("USE_TEST_LOCKTIME", "")],
+    ))
+    .unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_dump(&mm_alice.log_path);
+
+    let bob_conf = Mm2TestConf::light_node(&format!("0x{}", hex::encode(bob_priv_key)), &coins, &[&mm_alice
+        .ip
+        .to_string()])
+    .conf;
+    let mut mm_bob = MarketMakerIt::start(bob_conf, DEFAULT_RPC_PASSWORD.to_string(), None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_dump(&mm_bob.log_path);
+
+    let watcher_conf = Mm2TestConf::watcher_light_node(
+        &format!("0x{}", hex::encode(watcher_priv_key)),
+        &coins,
+        &[&mm_alice.ip.to_string()],
+        WatcherConf {
+            wait_taker_payment: 0.,
+            wait_maker_payment_spend_factor: 1.,
+            refund_start_factor: 0.,
+            search_interval: 1.,
+        },
+    )
+    .conf;
+    let mut mm_watcher = block_on(MarketMakerIt::start_with_envs(
+        watcher_conf,
+        DEFAULT_RPC_PASSWORD.to_string(),
+        None,
+        &[("REFUND_TEST", "")],
+    ))
+    .unwrap();
+    let (_watcher_dump_log, _watcher_dump_dashboard) = mm_dump(&mm_watcher.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_watcher, "MYCOIN", &[])));
+    log!("{:?}", block_on(enable_native(&mm_watcher, "MYCOIN1", &[])));
+
+    block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("MYCOIN", "MYCOIN1")],
+        25.,
+        25.,
+        2.,
+    ));
+    block_on(mm_bob.wait_for_log(160., |log| log.contains(MAKER_PAYMENT_SENT_LOG))).unwrap();
+    block_on(mm_bob.stop()).unwrap();
+    block_on(mm_alice.wait_for_log(160., |log| log.contains(WATCHER_MESSAGE_SENT_LOG))).unwrap();
+    block_on(mm_alice.stop()).unwrap();
+    block_on(mm_watcher.wait_for_log(160., |log| log.contains(TAKER_PAYMENT_REFUND_SENT_LOG))).unwrap();
+    thread::sleep(Duration::from_secs(5));
+
+    let mm_alice = MarketMakerIt::start(alice_conf, DEFAULT_RPC_PASSWORD.to_string(), None).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", &[])));
+
+    assert_eq!(
+        block_on(my_balance(&mm_alice, "MYCOIN1")).balance,
+        BigDecimal::from_str("99.93561994").unwrap()
+    );
+    assert_eq!(
+        block_on(my_balance(&mm_alice, "MYCOIN")).balance,
+        BigDecimal::from_str("100").unwrap()
+    );
+}
+
+#[test]
+fn test_watcher_validate_taker_fee_utxo() {
+    let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
+    let lock_duration = get_payment_locktime();
+    let (_ctx, taker_coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+    let (_ctx, maker_coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
+    let taker_pubkey = taker_coin.my_public_key().unwrap();
+
+    let taker_amount = MmNumber::from((10, 1));
+    let fee_amount = dex_fee_amount_from_taker_coin(
+        &MmCoinEnum::UtxoCoin(taker_coin.clone()),
+        maker_coin.ticker(),
+        &taker_amount,
+    );
+
+    let taker_fee = taker_coin
+        .send_taker_fee(
+            &DEX_FEE_ADDR_RAW_PUBKEY,
+            fee_amount.clone().into(),
+            Uuid::new_v4().as_bytes(),
+        )
+        .wait()
+        .unwrap();
+
+    taker_coin
+        .wait_for_confirmations(&taker_fee.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    let validate_taker_fee_res = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait();
+    assert!(validate_taker_fee_res.is_ok());
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: maker_coin.my_public_key().unwrap().to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_SENDER_ERR_LOG))
+        },
+        _ => panic!("Expected `WrongPaymentTx` invalid public key, found {:?}", error),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: std::u64::MAX,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(EARLY_CONFIRMATION_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` confirmed before min_block, found {:?}",
+            error
+        ),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: DEX_FEE_ADDR_RAW_PUBKEY.to_vec(),
+            lock_duration: 0,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(OLD_TRANSACTION_ERR_LOG))
+        },
+        _ => panic!("Expected `WrongPaymentTx` transaction too old, found {:?}", error),
+    }
+
+    let error = taker_coin
+        .watcher_validate_taker_fee(WatcherValidateTakerFeeInput {
+            taker_fee_hash: taker_fee.tx_hash().into_vec(),
+            sender_pubkey: taker_pubkey.to_vec(),
+            min_block_number: 0,
+            fee_addr: taker_pubkey.to_vec(),
+            lock_duration,
+        })
+        .wait()
+        .unwrap_err()
+        .into_inner();
+    log!("error: {:?}", error);
+    match error {
+        ValidatePaymentError::WrongPaymentTx(err) => {
+            assert!(err.contains(INVALID_RECEIVER_ERR_LOG))
+        },
+        _ => panic!(
+            "Expected `WrongPaymentTx` tx output script_pubkey doesn't match expected, found {:?}",
+            error
+        ),
+    }
+}
+
+#[test]
+fn test_send_taker_payment_refund_preimage_utxo() {
+    let timeout = (now_ms() / 1000) + 120; // timeout if test takes more than 120 seconds to run
+    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 taker_payment_args = SendTakerPaymentArgs {
+        time_lock_duration: 0,
+        time_lock,
+        other_pubkey: my_public_key,
+        secret_hash: &[0; 20],
+        amount: 1u64.into(),
+        swap_contract_address: &None,
+        swap_unique_data: &[],
+        payment_instructions: &None,
+    };
+    let tx = coin.send_taker_payment(taker_payment_args).wait().unwrap();
+
+    coin.wait_for_confirmations(&tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    let refund_tx = coin
+        .create_taker_payment_refund_preimage(&tx.tx_hex(), time_lock, my_public_key, &[0; 20], &None, &[])
+        .wait()
+        .unwrap();
+
+    let refund_tx = coin
+        .send_taker_payment_refund_preimage(SendWatcherRefundsPaymentArgs {
+            payment_tx: &refund_tx.tx_hex(),
+            swap_contract_address: &None,
+            secret_hash: &[0; 20],
+            other_pubkey: my_public_key,
+            time_lock,
+            swap_unique_data: &[],
+        })
+        .wait()
+        .unwrap();
+
+    coin.wait_for_confirmations(&refund_tx.tx_hex(), 1, false, timeout, 1)
+        .wait()
+        .unwrap();
+
+    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);
+}
diff --git a/mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs b/mm2src/mm2_main/tests/docker_tests/swaps_confs_settings_sync_tests.rs
similarity index 96%
rename from mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/swaps_confs_settings_sync_tests.rs
index 948718069c..5068aa09f3 100644
--- a/mm2src/mm2_main/src/docker_tests/swaps_confs_settings_sync_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/swaps_confs_settings_sync_tests.rs
@@ -1,6 +1,12 @@
-use super::*;
-use crate::mm2::lp_ordermatch::OrderConfirmationsSettings;
-use crate::mm2::lp_swap::get_payment_locktime;
+use crate::generate_utxo_coin_with_random_privkey;
+use crate::integration_tests_common::enable_native;
+use common::block_on;
+use mm2_main::mm2::lp_ordermatch::OrderConfirmationsSettings;
+use mm2_main::mm2::lp_swap::get_payment_locktime;
+use mm2_test_helpers::for_tests::{mm_dump, MarketMakerIt};
+use serde_json::Value as Json;
+use std::thread;
+use std::time::Duration;
 
 struct SwapConfirmationsSettings {
     maker_coin_confs: u64,
@@ -88,7 +94,7 @@ fn test_confirmation_settings_sync_correctly_on_buy(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let rc_json: Json = json::from_str(&rc.1).unwrap();
+    let rc_json: Json = serde_json::from_str(&rc.1).unwrap();
     let uuid = &rc_json["result"]["uuid"];
 
     block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
@@ -110,7 +116,7 @@ fn test_confirmation_settings_sync_correctly_on_buy(
         uuid,
         maker_status.1
     );
-    let maker_status_json: Json = json::from_str(&maker_status.1).unwrap();
+    let maker_status_json: Json = serde_json::from_str(&maker_status.1).unwrap();
     let maker_started_event = maker_status_json["result"]["events"].as_array().unwrap()[0].clone();
     assert_eq!(
         maker_started_event["event"]["data"]["maker_payment_confirmations"].as_u64(),
@@ -147,7 +153,7 @@ fn test_confirmation_settings_sync_correctly_on_buy(
         uuid,
         taker_status.1
     );
-    let taker_status_json: Json = json::from_str(&taker_status.1).unwrap();
+    let taker_status_json: Json = serde_json::from_str(&taker_status.1).unwrap();
     let taker_started_event = taker_status_json["result"]["events"].as_array().unwrap()[0].clone();
     assert_eq!(
         taker_started_event["event"]["data"]["maker_payment_confirmations"].as_u64(),
@@ -253,7 +259,7 @@ fn test_confirmation_settings_sync_correctly_on_sell(
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let rc_json: Json = json::from_str(&rc.1).unwrap();
+    let rc_json: Json = serde_json::from_str(&rc.1).unwrap();
     let uuid = &rc_json["result"]["uuid"];
 
     block_on(mm_bob.wait_for_log(22., |log| log.contains("Entering the maker_swap_loop MYCOIN/MYCOIN1"))).unwrap();
@@ -275,7 +281,7 @@ fn test_confirmation_settings_sync_correctly_on_sell(
         uuid,
         maker_status.1
     );
-    let maker_status_json: Json = json::from_str(&maker_status.1).unwrap();
+    let maker_status_json: Json = serde_json::from_str(&maker_status.1).unwrap();
     let maker_started_event = maker_status_json["result"]["events"].as_array().unwrap()[0].clone();
     assert_eq!(
         maker_started_event["event"]["data"]["maker_payment_confirmations"].as_u64(),
@@ -312,7 +318,7 @@ fn test_confirmation_settings_sync_correctly_on_sell(
         uuid,
         taker_status.1
     );
-    let taker_status_json: Json = json::from_str(&taker_status.1).unwrap();
+    let taker_status_json: Json = serde_json::from_str(&taker_status.1).unwrap();
     let taker_started_event = taker_status_json["result"]["events"].as_array().unwrap()[0].clone();
     assert_eq!(
         taker_started_event["event"]["data"]["maker_payment_confirmations"].as_u64(),
diff --git a/mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs b/mm2src/mm2_main/tests/docker_tests/swaps_file_lock_tests.rs
similarity index 98%
rename from mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs
rename to mm2src/mm2_main/tests/docker_tests/swaps_file_lock_tests.rs
index f8115f82aa..1ef18a8ed3 100644
--- a/mm2src/mm2_main/src/docker_tests/swaps_file_lock_tests.rs
+++ b/mm2src/mm2_main/tests/docker_tests/swaps_file_lock_tests.rs
@@ -1,6 +1,14 @@
-use super::*;
+use crate::generate_utxo_coin_with_random_privkey;
+use crate::integration_tests_common::enable_native;
+use bitcrypto::ChecksumType;
+use common::block_on;
+use crypto::Secp256k1Secret;
+use keys::{KeyPair, Private};
 use mm2_io::file_lock::FileLock;
-use mm2_test_helpers::for_tests::new_mm2_temp_folder_path;
+use mm2_test_helpers::for_tests::{mm_dump, new_mm2_temp_folder_path, MarketMakerIt};
+use serde_json::Value as Json;
+use std::thread;
+use std::time::Duration;
 
 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"]}"#;
@@ -120,7 +128,7 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     })))
     .unwrap();
     assert!(rc.0.is_success(), "!buy: {}", rc.1);
-    let buy: Json = json::from_str(&rc.1).unwrap();
+    let buy: Json = serde_json::from_str(&rc.1).unwrap();
     let uuid = buy["result"]["uuid"].as_str().unwrap().to_owned();
     block_on(mm_bob.wait_for_log(22., |log| {
         log.contains(&format!(
@@ -165,7 +173,7 @@ fn test_swaps_should_kick_start_if_process_was_killed() {
     block_on(mm_alice_dup.wait_for_log(50., |log| log.contains(&format!("Swap {} kick started.", uuid)))).unwrap();
 }
 
-fn addr_hash_for_privkey(priv_key: [u8; 32]) -> String {
+fn addr_hash_for_privkey(priv_key: Secp256k1Secret) -> String {
     let private = Private {
         prefix: 1,
         secret: priv_key.into(),
diff --git a/mm2src/mm2_main/tests/docker_tests_main.rs b/mm2src/mm2_main/tests/docker_tests_main.rs
new file mode 100644
index 0000000000..e5a1140967
--- /dev/null
+++ b/mm2src/mm2_main/tests/docker_tests_main.rs
@@ -0,0 +1,121 @@
+#![feature(async_closure)]
+#![feature(custom_test_frameworks)]
+#![feature(test)]
+#![test_runner(docker_tests_runner)]
+#![feature(drain_filter)]
+#![feature(hash_raw_entry)]
+#![cfg(not(target_arch = "wasm32"))]
+
+#[cfg(test)]
+#[macro_use]
+extern crate common;
+#[cfg(test)]
+#[macro_use]
+extern crate gstuff;
+#[cfg(test)]
+#[macro_use]
+extern crate lazy_static;
+#[cfg(test)]
+#[macro_use]
+extern crate serde_json;
+#[cfg(test)] extern crate ser_error_derive;
+#[cfg(test)] extern crate test;
+
+use std::io::{BufRead, BufReader};
+use std::process::Command;
+use test::{test_main, StaticBenchFn, StaticTestFn, TestDescAndFn};
+use testcontainers::clients::Cli;
+mod docker_tests;
+use docker_tests::docker_tests_common::*;
+use docker_tests::qrc20_tests::{qtum_docker_node, QtumDockerOps, QTUM_REGTEST_DOCKER_IMAGE};
+#[allow(dead_code)] mod integration_tests_common;
+
+// 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
+// I've tried to use static for such singleton initialization but it turned out that despite
+// rustc allows to use Drop as static the drop fn won't ever be called
+// NB: https://github.com/rust-lang/rfcs/issues/1111
+// the only preparation step required is Zcash params files downloading:
+// Windows - https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.bat
+// Linux and MacOS - https://github.com/KomodoPlatform/komodo/blob/master/zcutil/fetch-params.sh
+pub fn docker_tests_runner(tests: &[&TestDescAndFn]) {
+    // pretty_env_logger::try_init();
+    let docker = Cli::default();
+    let mut containers = vec![];
+    // skip Docker containers initialization if we are intended to run test_mm_start only
+    if std::env::var("_MM2_TEST_CONF").is_err() {
+        pull_docker_image(UTXO_ASSET_DOCKER_IMAGE);
+        pull_docker_image(QTUM_REGTEST_DOCKER_IMAGE);
+        remove_docker_containers(UTXO_ASSET_DOCKER_IMAGE);
+        remove_docker_containers(QTUM_REGTEST_DOCKER_IMAGE);
+
+        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(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
+    let owned_tests: Vec<_> = tests
+        .iter()
+        .map(|t| match t.testfn {
+            StaticTestFn(f) => TestDescAndFn {
+                testfn: StaticTestFn(f),
+                desc: t.desc.clone(),
+            },
+            StaticBenchFn(f) => TestDescAndFn {
+                testfn: StaticBenchFn(f),
+                desc: t.desc.clone(),
+            },
+            _ => panic!("non-static tests passed to lp_coins test runner"),
+        })
+        .collect();
+    let args: Vec<String> = std::env::args().collect();
+    let _exit_code = test_main(&args, owned_tests, None);
+}
+
+fn pull_docker_image(name: &str) {
+    Command::new("docker")
+        .arg("pull")
+        .arg(name)
+        .status()
+        .expect("Failed to execute docker command");
+}
+
+fn remove_docker_containers(name: &str) {
+    let stdout = Command::new("docker")
+        .arg("ps")
+        .arg("-f")
+        .arg(format!("ancestor={}", name))
+        .arg("-q")
+        .output()
+        .expect("Failed to execute docker command");
+
+    let reader = BufReader::new(stdout.stdout.as_slice());
+    let ids: Vec<_> = reader.lines().map(|line| line.unwrap()).collect();
+    if !ids.is_empty() {
+        Command::new("docker")
+            .arg("rm")
+            .arg("-f")
+            .args(ids)
+            .status()
+            .expect("Failed to execute docker command");
+    }
+}
diff --git a/mm2src/mm2_main/tests/integration_tests_common/mod.rs b/mm2src/mm2_main/tests/integration_tests_common/mod.rs
new file mode 100644
index 0000000000..3d0519ae3e
--- /dev/null
+++ b/mm2src/mm2_main/tests/integration_tests_common/mod.rs
@@ -0,0 +1,147 @@
+use common::executor::Timer;
+use common::log::LogLevel;
+use common::{block_on, log, now_ms};
+use crypto::privkey::key_pair_from_seed;
+use mm2_main::mm2::{lp_main, LpMainParams};
+use mm2_test_helpers::electrums::{morty_electrums, rick_electrums};
+use mm2_test_helpers::for_tests::{enable_native as enable_native_impl, init_utxo_electrum, init_utxo_status,
+                                  init_z_coin_light, init_z_coin_status, MarketMakerIt};
+use mm2_test_helpers::structs::{CoinActivationResult, EnableElectrumResponse, InitTaskResult, InitUtxoStatus,
+                                InitZcoinStatus, RpcV2Response, UtxoStandardActivationResult};
+use serde_json::{self as json, Value as Json};
+use std::collections::HashMap;
+use std::env::var;
+use std::str::FromStr;
+
+/// 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() { test_mm_start_impl(); }
+
+pub fn test_mm_start_impl() {
+    if let Ok(conf) = var("_MM2_TEST_CONF") {
+        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| (), "TEST".into(), "TEST".into())).unwrap()
+            }
+        }
+    }
+}
+
+/// Ideally, this function should be replaced everywhere with `enable_electrum_json`.
+pub 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()
+}
+
+pub 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()
+}
+
+pub 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()
+}
+
+pub 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
+}
+
+pub async fn enable_z_coin_light(
+    mm: &MarketMakerIt,
+    coin: &str,
+    electrums: &[&str],
+    lightwalletd_urls: &[&str],
+) -> CoinActivationResult {
+    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() + 12000000;
+
+    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();
+        match status.result {
+            InitZcoinStatus::Ok(result) => break result,
+            InitZcoinStatus::Error(e) => panic!("{} initialization error {:?}", coin, e),
+            _ => Timer::sleep(1.).await,
+        }
+    }
+}
+
+pub async fn enable_utxo_v2_electrum(
+    mm: &MarketMakerIt,
+    coin: &str,
+    servers: Vec<Json>,
+    timeout: u64,
+) -> UtxoStandardActivationResult {
+    let init = init_utxo_electrum(mm, coin, servers).await;
+    let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
+    let timeout = now_ms() + (timeout * 1000);
+
+    loop {
+        if now_ms() > timeout {
+            panic!("{} initialization timed out", coin);
+        }
+
+        let status = init_utxo_status(mm, init.result.task_id).await;
+        let status: RpcV2Response<InitUtxoStatus> = json::from_value(status).unwrap();
+        log!("init_utxo_status: {:?}", status);
+        match status.result {
+            InitUtxoStatus::Ok(result) => break result,
+            InitUtxoStatus::Error(e) => panic!("{} initialization error {:?}", coin, e),
+            _ => Timer::sleep(1.).await,
+        }
+    }
+}
+
+pub 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_json(mm, "RICK", false, rick_electrums()).await);
+    replies.insert(
+        "MORTY",
+        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);
+    replies
+}
+
+pub fn addr_from_enable<'a>(enable_response: &'a HashMap<&str, EnableElectrumResponse>, coin: &str) -> &'a str {
+    &enable_response.get(coin).unwrap().address
+}
+
+pub fn rmd160_from_passphrase(passphrase: &str) -> [u8; 20] {
+    key_pair_from_seed(passphrase).unwrap().public().address_hash().take()
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs b/mm2src/mm2_main/tests/mm2_tests/bch_and_slp_tests.rs
similarity index 78%
rename from mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs
rename to mm2src/mm2_main/tests/mm2_tests/bch_and_slp_tests.rs
index 2c62d78f56..b0887667ca 100644
--- a/mm2src/mm2_main/src/mm2_tests/bch_and_slp_tests.rs
+++ b/mm2src/mm2_main/tests/mm2_tests/bch_and_slp_tests.rs
@@ -1,7 +1,18 @@
-use super::*;
-use mm2_test_helpers::for_tests::{enable_bch_with_tokens, enable_slp, my_tx_history_v2, sign_message, verify_message,
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::{block_on, log, repeatable};
+use http::StatusCode;
+use itertools::Itertools;
+use mm2_test_helpers::for_tests::{disable_coin, enable_bch_with_tokens, enable_slp, my_tx_history_v2, sign_message,
+                                  tbch_for_slp_conf, tbch_usdf_conf, verify_message, MarketMakerIt, Mm2TestConf,
                                   UtxoRpcMode};
+use mm2_test_helpers::structs::{EnableBchWithTokensResponse, RpcV2Response, SignatureResponse, StandardHistoryV2Res,
+                                UtxoFeeDetails, VerificationResponse};
+use serde_json::{self as json, json, Value as Json};
+use std::env;
+use std::thread;
+use std::time::Duration;
 
+#[cfg(not(target_arch = "wasm32"))]
 const T_BCH_ELECTRUMS: &[&str] = &[
     "electroncash.de:50003",
     "tbch.loping.net:60001",
@@ -10,6 +21,15 @@ const T_BCH_ELECTRUMS: &[&str] = &[
     "testnet.imaginary.cash:50001",
 ];
 
+#[cfg(target_arch = "wasm32")]
+const T_BCH_ELECTRUMS: &[&str] = &[
+    "electroncash.de:60003",
+    "electroncash.de:60004",
+    "blackie.c3-soft.com:60004",
+];
+
+const BIP39_PASSPHRASE: &str = "tank abandon bind salon remove wisdom net size aspect direct source fossil";
+
 fn t_bch_electrums_legacy_json() -> Vec<Json> { T_BCH_ELECTRUMS.into_iter().map(|url| json!({ "url": url })).collect() }
 
 #[test]
@@ -32,7 +52,7 @@ fn test_withdraw_cashaddresses() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -150,13 +170,7 @@ fn test_withdraw_cashaddresses() {
     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);
+    block_on(disable_coin(&mm, "BCH"));
 
     let electrum = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
@@ -242,7 +256,7 @@ fn test_withdraw_to_different_cashaddress_network_should_fail() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -303,7 +317,7 @@ fn test_common_cashaddresses() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -374,49 +388,48 @@ async fn wait_till_history_has_records(
     expected_len: usize,
     for_coin: &str,
     paging: Option<common::PagingOptionsEnum<String>>,
+    timeout_s: u64,
 ) -> StandardHistoryV2Res {
-    loop {
+    repeatable!(async {
         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;
+            return Ready(history.result);
         }
-        Timer::sleep(1.).await;
-    }
+        Retry(())
+    })
+    .repeat_every_secs(1.)
+    .with_timeout_ms(timeout_s * 1000)
+    .await
+    .unwrap()
 }
 
-#[test]
-#[cfg(not(target_arch = "wasm32"))]
-fn test_bch_and_slp_testnet_history() {
+async fn test_bch_and_slp_testnet_history_impl() {
+    const PASSPHRASE: &str = "BCH SLP test";
+    const TIMEOUT_S: u64 = 45;
+
     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 conf = Mm2TestConf::seednode(PASSPHRASE, &coins);
+    let mm = MarketMakerIt::start_async(conf.conf, conf.rpc_password, None)
+        .await
+        .unwrap();
+
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        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));
+    let enable_bch = enable_bch_with_tokens(&mm, "tBCH", &[], rpc_mode, tx_history).await;
     log!("enable_bch: {:?}", enable_bch);
-    let history = block_on(wait_till_history_has_records(&mm, 4, "tBCH", None));
+    let history = wait_till_history_has_records(&mm, 4, "tBCH", None, TIMEOUT_S).await;
     log!("bch history: {:?}", history);
 
     let expected_internal_ids = vec![
@@ -434,19 +447,19 @@ fn test_bch_and_slp_testnet_history() {
 
     assert_eq!(expected_internal_ids, actual_ids);
 
-    let enable_usdf = block_on(enable_slp(&mm, "USDF"));
+    let enable_usdf = enable_slp(&mm, "USDF").await;
     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)));
+    let slp_history = wait_till_history_has_records(&mm, 4, "USDF", Some(paging), TIMEOUT_S).await;
 
     log!("slp history: {:?}", slp_history);
 
     let expected_slp_ids = vec![
-        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989",
+        "babe9bd0dc1495dff0920da14a76311b744daadc9d01314f8bd4e2438c6b183b",
         "1c1e68357cf5a6dacb53881f13aa5d2048fe0d0fab24b76c9ec48f53884bed97",
-        "c4304b5ef4f1b88ed4939534a8ca9eca79f592939233174ae08002e8454e3f06",
+        "cd6ec10b0cd9747ddc66ac5c97c2d7b493e8cea191bc2d847b3498719d4bd989",
         "b0035434a1e7be5af2ed991ee2a21a90b271c5852a684a0b7d315c5a770d1b1c",
     ];
 
@@ -464,6 +477,25 @@ fn test_bch_and_slp_testnet_history() {
         let fee_details: UtxoFeeDetails = json::from_value(tx.tx.fee_details).unwrap();
         assert_eq!(fee_details.coin, Some("tBCH".to_owned()));
     }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        /// 1 second.
+        const STOP_TIMEOUT_MS: u64 = 1000;
+
+        mm.stop_and_wait_for_ctx_is_dropped(STOP_TIMEOUT_MS).await.unwrap();
+    }
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_bch_and_slp_testnet_history() { block_on(test_bch_and_slp_testnet_history_impl()); }
+
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen_test]
+async fn test_bch_and_slp_testnet_history() {
+    common::log::wasm_log::register_wasm_log();
+    test_bch_and_slp_testnet_history_impl().await;
 }
 
 #[test]
@@ -488,7 +520,7 @@ fn test_sign_verify_message_bch() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -557,7 +589,7 @@ fn test_sign_verify_message_slp() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -590,3 +622,76 @@ fn test_sign_verify_message_slp() {
 
     assert!(response.is_valid);
 }
+
+/// Tested via [Electron-Cash-SLP](https://github.com/simpleledger/Electron-Cash-SLP).
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_bch_and_slp_with_hd_account_id() {
+    const TX_HISTORY: bool = false;
+
+    let coins = json!([tbch_for_slp_conf(), tbch_usdf_conf()]);
+
+    // HD account 0
+
+    let hd_account_id = 0;
+    let conf_0 = Mm2TestConf::seednode_with_hd_account(BIP39_PASSPHRASE, hd_account_id, &coins);
+    let mm_hd_0 = MarketMakerIt::start(conf_0.conf, conf_0.rpc_password, None).unwrap();
+
+    let rpc_mode = UtxoRpcMode::electrum(T_BCH_ELECTRUMS);
+    let activation_result = block_on(enable_bch_with_tokens(
+        &mm_hd_0,
+        "tBCH",
+        &["USDF"],
+        rpc_mode,
+        TX_HISTORY,
+    ));
+
+    let activation_result: RpcV2Response<EnableBchWithTokensResponse> = json::from_value(activation_result).unwrap();
+    let (bch_addr, _) = activation_result
+        .result
+        .bch_addresses_infos
+        .into_iter()
+        .exactly_one()
+        .unwrap();
+    assert_eq!(bch_addr, "bchtest:qpylzql7gzh6yctm7uslsz5qufl44gk2tsj8c9pjw0");
+
+    let (slp_addr, _) = activation_result
+        .result
+        .slp_addresses_infos
+        .into_iter()
+        .exactly_one()
+        .unwrap();
+    assert_eq!(slp_addr, "slptest:qpylzql7gzh6yctm7uslsz5qufl44gk2tsfnl7m9uj");
+
+    // HD account 1
+
+    let hd_account_id = 1;
+    let conf_1 = Mm2TestConf::seednode_with_hd_account(BIP39_PASSPHRASE, hd_account_id, &coins);
+    let mm_hd_1 = MarketMakerIt::start(conf_1.conf, conf_1.rpc_password, None).unwrap();
+
+    let rpc_mode = UtxoRpcMode::electrum(T_BCH_ELECTRUMS);
+    let activation_result = block_on(enable_bch_with_tokens(
+        &mm_hd_1,
+        "tBCH",
+        &["USDF"],
+        rpc_mode,
+        TX_HISTORY,
+    ));
+
+    let activation_result: RpcV2Response<EnableBchWithTokensResponse> = json::from_value(activation_result).unwrap();
+    let (bch_addr, _) = activation_result
+        .result
+        .bch_addresses_infos
+        .into_iter()
+        .exactly_one()
+        .unwrap();
+    assert_eq!(bch_addr, "bchtest:qpyhwc7shd5hlul8zg0snmaptaa9q9yc4q7g9khpkj");
+
+    let (slp_addr, _) = activation_result
+        .result
+        .slp_addresses_infos
+        .into_iter()
+        .exactly_one()
+        .unwrap();
+    assert_eq!(slp_addr, "slptest:qpyhwc7shd5hlul8zg0snmaptaa9q9yc4q9uzddky0");
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs b/mm2src/mm2_main/tests/mm2_tests/best_orders_tests.rs
similarity index 83%
rename from mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs
rename to mm2src/mm2_main/tests/mm2_tests/best_orders_tests.rs
index 4508a2d65d..e817d15d51 100644
--- a/mm2src/mm2_main/src/mm2_tests/best_orders_tests.rs
+++ b/mm2src/mm2_main/tests/mm2_tests/best_orders_tests.rs
@@ -1,19 +1,23 @@
-use super::*;
-
-#[cfg(feature = "zhtlc-native-tests")]
-use mm2_test_helpers::for_tests::best_orders_v2;
+use crate::integration_tests_common::*;
+use common::{block_on, log};
+use http::StatusCode;
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{best_orders_v2, best_orders_v2_by_number, eth_jst_testnet_conf, eth_testnet_conf,
+                                  get_passphrase, morty_conf, rick_conf, tbtc_conf, tbtc_segwit_conf, MarketMakerIt,
+                                  Mm2TestConf, RICK_ELECTRUM_ADDRS, TBTC_ELECTRUMS};
+use mm2_test_helpers::structs::{BestOrdersResponse, BestOrdersV2Response, EnableElectrumResponse, RpcV2Response,
+                                SetPriceResponse};
+use serde_json::{self as json, json};
+use std::env::{self};
+use std::thread;
+use std::time::Duration;
 
 #[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"}}}
-    ]);
+    let coins = json!([rick_conf(), morty_conf(), eth_testnet_conf(), eth_jst_testnet_conf()]);
 
     // start bob and immediately place the orders
     let mut mm_bob = MarketMakerIt::start(
@@ -29,7 +33,7 @@ fn test_best_orders() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -80,7 +84,7 @@ fn test_best_orders() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -178,12 +182,7 @@ fn test_best_orders() {
 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"}}}
-    ]);
+    let coins = json!([rick_conf(), morty_conf(), eth_testnet_conf(), eth_jst_testnet_conf()]);
 
     // start bob and immediately place the orders
     let mut mm_bob = MarketMakerIt::start(
@@ -199,7 +198,7 @@ fn test_best_orders_v2_by_number() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -249,7 +248,7 @@ fn test_best_orders_v2_by_number() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
@@ -259,46 +258,18 @@ fn test_best_orders_v2_by_number() {
     }))
     .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 rc = block_on(best_orders_v2_by_number(&mm_alice, "RICK", "buy", 1));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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 rc = block_on(best_orders_v2_by_number(&mm_alice, "RICK", "buy", 2));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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());
@@ -307,23 +278,9 @@ fn test_best_orders_v2_by_number() {
     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 rc = block_on(best_orders_v2_by_number(&mm_alice, "RICK", "sell", 1));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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]);
@@ -334,23 +291,9 @@ fn test_best_orders_v2_by_number() {
     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 rc = block_on(best_orders_v2_by_number(&mm_alice, "ETH", "sell", 1));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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());
@@ -366,12 +309,7 @@ fn test_best_orders_v2_by_number() {
 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"}}}
-    ]);
+    let coins = json!([rick_conf(), morty_conf(), eth_testnet_conf(), eth_jst_testnet_conf()]);
 
     // start bob and immediately place the orders
     let mut mm_bob = MarketMakerIt::start(
@@ -387,7 +325,7 @@ fn test_best_orders_v2_by_volume() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -437,7 +375,7 @@ fn test_best_orders_v2_by_volume() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
@@ -447,23 +385,9 @@ fn test_best_orders_v2_by_volume() {
     }))
     .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();
+    let rc = block_on(best_orders_v2(&mm_alice, "RICK", "buy", "1.7"));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).unwrap();
     // MORTY
     let best_morty_orders = response.result.orders.get("MORTY").unwrap();
     log!("Best MORTY orders when buy RICK {:?}", [best_morty_orders]);
@@ -477,23 +401,9 @@ fn test_best_orders_v2_by_volume() {
     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 rc = block_on(best_orders_v2(&mm_alice, "RICK", "sell", "0.1"));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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]);
@@ -503,23 +413,9 @@ fn test_best_orders_v2_by_volume() {
     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 rc = block_on(best_orders_v2(&mm_alice, "ETH", "sell", "0.1"));
+    log!("rc {:?}", rc);
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).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]);
@@ -533,13 +429,10 @@ fn test_best_orders_v2_by_volume() {
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn test_best_orders_duplicates_after_update() {
+fn test_best_orders_no_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"}}
-    ]);
+    let coins = json!([rick_conf(), morty_conf()]);
 
     // start bob as a seednode
     let mut mm_bob = MarketMakerIt::start(
@@ -555,7 +448,7 @@ fn test_best_orders_duplicates_after_update() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -573,7 +466,7 @@ fn test_best_orders_duplicates_after_update() {
             "seednodes": [mm_bob.ip.to_string()],
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -609,7 +502,7 @@ fn test_best_orders_duplicates_after_update() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -686,19 +579,14 @@ fn test_best_orders_duplicates_after_update() {
 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"}}}
-    ]);
+    let bob_coins_config = json!([rick_conf(), morty_conf(), eth_testnet_conf(), eth_jst_testnet_conf()]);
 
     // 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"}},
+        rick_conf(),
+        eth_testnet_conf(),
+        eth_jst_testnet_conf(),
         {"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
@@ -715,7 +603,7 @@ fn test_best_orders_filter_response() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -766,7 +654,7 @@ fn test_best_orders_filter_response() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -809,7 +697,7 @@ fn test_best_orders_address_and_confirmations() {
     ]);
 
     let alice_coins_config = json!([
-        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"protocol":{"type":"UTXO"}},
+        rick_conf(),
         {"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"}}
     ]);
 
@@ -826,7 +714,7 @@ fn test_best_orders_address_and_confirmations() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -905,7 +793,7 @@ fn test_best_orders_address_and_confirmations() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -999,16 +887,147 @@ fn test_best_orders_address_and_confirmations() {
     block_on(mm_alice.stop()).unwrap();
 }
 
+#[test]
+fn best_orders_must_return_duplicate_for_orderbook_tickers() {
+    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(), tbtc_conf(), tbtc_segwit_conf()]);
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
+    log!("Bob log path: {}", mm_bob.log_path.display());
+
+    let t_btc_bob = block_on(enable_electrum(&mm_bob, "tBTC", false, TBTC_ELECTRUMS));
+    log!("Bob enable tBTC: {:?}", t_btc_bob);
+
+    let rick_bob = block_on(enable_electrum(&mm_bob, "RICK", false, RICK_ELECTRUM_ADDRS));
+    log!("Bob enable RICK: {:?}", rick_bob);
+
+    // 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 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, None).unwrap();
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "tBTC-Segwit",
+        "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!(best_orders.len(), 1);
+
+    let rc = block_on(mm_alice.rpc(&json! ({
+        "userpass": mm_alice.userpass,
+        "method": "best_orders",
+        "coin": "tBTC-Segwit",
+        "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!(best_orders.len(), 1);
+
+    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!(best_orders.len(), 1);
+    let best_orders = response.result.get("tBTC-Segwit").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    assert_eq!(best_orders[0].coin, "tBTC-Segwit");
+
+    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!(best_orders.len(), 1);
+    let best_orders = response.result.get("tBTC-Segwit").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    assert_eq!(best_orders[0].coin, "tBTC-Segwit");
+
+    let rc = block_on(best_orders_v2(&mm_alice, "tBTC-Segwit", "buy", "0.0002"));
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).unwrap();
+    let best_orders = response.result.orders.get("RICK").unwrap();
+    assert_eq!(best_orders.len(), 1);
+
+    let rc = block_on(best_orders_v2(&mm_alice, "tBTC-Segwit", "sell", "0.0002"));
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).unwrap();
+    let best_orders = response.result.orders.get("RICK").unwrap();
+    assert_eq!(best_orders.len(), 1);
+
+    let rc = block_on(best_orders_v2(&mm_alice, "RICK", "buy", "0.0002"));
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).unwrap();
+    let best_orders = response.result.orders.get("tBTC").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    let best_orders = response.result.orders.get("tBTC-Segwit").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    assert_eq!(best_orders[0].coin, "tBTC-Segwit");
+
+    let rc = block_on(best_orders_v2(&mm_alice, "RICK", "sell", "0.0002"));
+    let response: RpcV2Response<BestOrdersV2Response> = json::from_value(rc).unwrap();
+    let best_orders = response.result.orders.get("tBTC").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    let best_orders = response.result.orders.get("tBTC-Segwit").unwrap();
+    assert_eq!(best_orders.len(), 1);
+    assert_eq!(best_orders[0].coin, "tBTC-Segwit");
+}
+
 #[cfg(feature = "zhtlc-native-tests")]
 #[test]
 fn zhtlc_best_orders() {
+    use mm2_test_helpers::for_tests::zombie_conf;
+
     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 coins = json!([rick_conf(), zombie_conf()]);
 
     let mm_bob = MarketMakerIt::start(
         json!({
diff --git a/mm2src/mm2_main/tests/mm2_tests/eth_tests.rs b/mm2src/mm2_main/tests/mm2_tests/eth_tests.rs
new file mode 100644
index 0000000000..62c82f0de8
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/eth_tests.rs
@@ -0,0 +1,79 @@
+use common::block_on;
+use http::StatusCode;
+use mm2_test_helpers::for_tests::{disable_coin, disable_coin_err, get_passphrase, MarketMakerIt, Mm2TestConf,
+                                  ETH_DEV_NODES};
+use serde_json::{json, Value as Json};
+use std::str::FromStr;
+
+#[cfg(not(target_arch = "wasm32"))]
+async fn enable_eth_with_tokens(mm: &MarketMakerIt, platform_coin: &str, tokens: &[&str], nodes: &[&str]) -> Json {
+    let erc20_tokens_requests: Vec<_> = tokens.iter().map(|ticker| json!({ "ticker": ticker })).collect();
+    let nodes: Vec<_> = nodes.iter().map(|url| json!({ "url": url })).collect();
+
+    let enable = mm
+        .rpc(&json!({
+        "userpass": mm.userpass,
+        "method": "enable_eth_with_tokens",
+        "mmrpc": "2.0",
+        "params": {
+                "ticker": platform_coin,
+                "swap_contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E",
+                "fallback_swap_contract":"0x8500AFc0bc5214728082163326C2FF0C73f4a871",
+                "nodes": nodes,
+                "tx_history": true,
+                "erc20_tokens_requests": erc20_tokens_requests,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        enable.0,
+        StatusCode::OK,
+        "'enable_eth_with_tokens' failed: {}",
+        enable.1
+    );
+    Json::from_str(&enable.1).unwrap()
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_disable_eth_coin_with_token() {
+    let passphrase = get_passphrase(&".env.client", "BOB_PASSPHRASE").unwrap();
+    let coins = json! ([
+        {"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 conf = Mm2TestConf::seednode(&passphrase, &coins);
+    let mm = block_on(MarketMakerIt::start_async(conf.conf, conf.rpc_password, None)).unwrap();
+    block_on(enable_eth_with_tokens(&mm, "ETH", &["JST"], ETH_DEV_NODES));
+
+    // Create setprice order
+    let req = json!({
+        "userpass": mm.userpass,
+        "method": "buy",
+        "base": "ETH",
+        "rel": "JST",
+        "price": 1,
+        "volume": 0.1,
+        "base_confs": 5,
+        "base_nota": false,
+        "rel_confs": 4,
+        "rel_nota": false,
+    });
+    let make_test_order = block_on(mm.rpc(&req)).unwrap();
+    assert_eq!(make_test_order.0, StatusCode::OK);
+    let order_uuid = Json::from_str(&*make_test_order.1).unwrap();
+    let order_uuid = order_uuid.get("result").unwrap().get("uuid").unwrap().as_str().unwrap();
+
+    // Try to disable platform coin, ETH. This should fail due to the dependent tokens.
+    let error = block_on(disable_coin_err(&mm, "ETH"));
+    assert_eq!(error.dependent_tokens, ["JST"]);
+
+    // Try to disable JST token first.
+    // ETH and JST should be deactivated at once.
+    let res = block_on(disable_coin(&mm, "JST"));
+    // We expected make_test_order to be cancelled
+    assert!(res.cancelled_orders.contains(order_uuid));
+    // Then try to disable ETH platform coin.
+    block_on(disable_coin(&mm, "ETH"));
+}
diff --git a/mm2src/mm2_main/tests/mm2_tests/iris_swap.rs b/mm2src/mm2_main/tests/mm2_tests/iris_swap.rs
new file mode 100644
index 0000000000..c6dd0265b6
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/iris_swap.rs
@@ -0,0 +1,280 @@
+use crate::integration_tests_common::enable_electrum;
+use common::executor::Timer;
+use common::{block_on, log};
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{check_my_swap_status, check_recent_swaps, check_stats_swap_status, enable_eth_coin,
+                                  enable_tendermint, iris_nimda_testnet_conf, iris_testnet_conf, rick_conf, tbnb_conf,
+                                  usdc_ibc_iris_testnet_conf, MarketMakerIt, MAKER_ERROR_EVENTS, MAKER_SUCCESS_EVENTS,
+                                  RICK_ELECTRUM_ADDRS, TAKER_ERROR_EVENTS, TAKER_SUCCESS_EVENTS};
+use mm2_test_helpers::structs::OrderbookResponse;
+use serde_json::{json, Value as Json};
+use std::convert::TryFrom;
+use std::env;
+
+// https://academy.binance.com/en/articles/connecting-metamask-to-binance-smart-chain
+const TBNB_URLS: &[&str] = &["https://data-seed-prebsc-1-s3.binance.org:8545/"];
+// https://testnet.bscscan.com/address/0xb1ad803ea4f57401639c123000c75f5b66e4d123
+const TBNB_SWAP_CONTRACT: &str = "0xB1Ad803ea4F57401639c123000C75F5B66E4D123";
+
+#[test]
+#[ignore]
+// TODO https://github.com/KomodoPlatform/atomicDEX-API/issues/1569
+fn start_swap_operation() {
+    let pairs = [
+        ("USDC-IBC-IRIS", "IRIS-NIMDA"),
+        ("IRIS-NIMDA", "RICK"),
+        ("USDC-IBC-IRIS", "tBNB"),
+    ];
+    block_on(trade_base_rel_iris(&pairs, 1, 2, 0.01));
+}
+
+pub async fn trade_base_rel_iris(
+    pairs: &[(&'static str, &'static str)],
+    maker_price: i32,
+    taker_price: i32,
+    volume: f64,
+) {
+    let bob_passphrase = String::from("iris test seed");
+    let alice_passphrase = String::from("iris test2 seed");
+
+    let coins = json!([
+        usdc_ibc_iris_testnet_conf(),
+        iris_nimda_testnet_conf(),
+        iris_testnet_conf(),
+        rick_conf(),
+        tbnb_conf(),
+    ]);
+
+    println!("coins config {}", serde_json::to_string(&coins).unwrap());
+
+    let mut mm_bob = MarketMakerIt::start_async(
+        json!({
+            "gui": "nogui",
+            "netid": 8999,
+            "dht": "on",
+            "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(),
+        None,
+    )
+    .await
+    .unwrap();
+
+    Timer::sleep(1.).await;
+
+    let mut mm_alice = MarketMakerIt::start_async(
+        json!({
+            "gui": "nogui",
+            "netid": 8999,
+            "dht": "on",
+            "myipaddr": env::var("ALICE_TRADE_IP") .ok(),
+            "rpcip": env::var("ALICE_TRADE_IP") .ok(),
+            "passphrase": alice_passphrase,
+            "coins": coins,
+            "seednodes": [mm_bob.my_seed_addr()],
+            "rpc_password": "password",
+            "skip_startup_checks": true,
+        }),
+        "password".into(),
+        None,
+    )
+    .await
+    .unwrap();
+
+    dbg!(
+        enable_tendermint(
+            &mm_bob,
+            "IRIS-TEST",
+            &["IRIS-NIMDA", "USDC-IBC-IRIS"],
+            &["http://34.80.202.172:26657"],
+            false
+        )
+        .await
+    );
+    dbg!(enable_electrum(&mm_bob, "RICK", false, RICK_ELECTRUM_ADDRS).await);
+
+    dbg!(
+        enable_tendermint(
+            &mm_alice,
+            "IRIS-TEST",
+            &["IRIS-NIMDA", "USDC-IBC-IRIS"],
+            &["http://34.80.202.172:26657"],
+            false
+        )
+        .await
+    );
+    dbg!(enable_electrum(&mm_alice, "RICK", false, RICK_ELECTRUM_ADDRS).await);
+    dbg!(enable_eth_coin(&mm_bob, "tBNB", TBNB_URLS, TBNB_SWAP_CONTRACT, None).await);
+    dbg!(enable_eth_coin(&mm_alice, "tBNB", TBNB_URLS, TBNB_SWAP_CONTRACT, None).await);
+
+    for (base, rel) in pairs.iter() {
+        log!("Issue bob {}/{} sell request", base, rel);
+        let rc = mm_bob
+            .rpc(&json!({
+                "userpass": mm_bob.userpass,
+                "method": "setprice",
+                "base": base,
+                "rel": rel,
+                "price": maker_price,
+                "volume": volume
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    let mut uuids = vec![];
+
+    for (base, rel) in pairs.iter() {
+        common::log::info!(
+            "Trigger alice subscription to {}/{} orderbook topic first and sleep for 1 second",
+            base,
+            rel
+        );
+        let rc = mm_alice
+            .rpc(&json!({
+                "userpass": mm_alice.userpass,
+                "method": "orderbook",
+                "base": base,
+                "rel": rel,
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+        Timer::sleep(1.).await;
+        common::log::info!("Issue alice {}/{} buy request", base, rel);
+        let rc = mm_alice
+            .rpc(&json!({
+                "userpass": mm_alice.userpass,
+                "method": "buy",
+                "base": base,
+                "rel": rel,
+                "volume": volume,
+                "price": taker_price
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!buy: {}", rc.1);
+        let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
+        uuids.push(buy_json["result"]["uuid"].as_str().unwrap().to_owned());
+    }
+
+    for (base, rel) in pairs.iter() {
+        // ensure the swaps are started
+        let expected_log = format!("Entering the taker_swap_loop {}/{}", base, rel);
+        mm_alice
+            .wait_for_log(5., |log| log.contains(&expected_log))
+            .await
+            .unwrap();
+        let expected_log = format!("Entering the maker_swap_loop {}/{}", base, rel);
+        mm_bob
+            .wait_for_log(5., |log| log.contains(&expected_log))
+            .await
+            .unwrap()
+    }
+
+    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);
+        mm_alice
+            .wait_for_log(5., |log| log.contains(&expected_log))
+            .await
+            .unwrap();
+        mm_bob
+            .wait_for_log(5., |log| log.contains(&expected_log))
+            .await
+            .unwrap()
+    }
+
+    for uuid in uuids.iter() {
+        match mm_bob
+            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
+            .await
+        {
+            Ok(_) => (),
+            Err(_) => {
+                println!("{}", mm_bob.log_as_utf8().unwrap());
+            },
+        }
+
+        match mm_alice
+            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
+            .await
+        {
+            Ok(_) => (),
+            Err(_) => {
+                println!("{}", mm_alice.log_as_utf8().unwrap());
+            },
+        }
+
+        log!("Waiting a few second for the fresh swap status to be saved..");
+        Timer::sleep(5.).await;
+
+        println!("{}", mm_alice.log_as_utf8().unwrap());
+        log!("Checking alice/taker status..");
+        check_my_swap_status(
+            &mm_alice,
+            uuid,
+            &TAKER_SUCCESS_EVENTS,
+            &TAKER_ERROR_EVENTS,
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume).unwrap(),
+        )
+        .await;
+
+        println!("{}", mm_bob.log_as_utf8().unwrap());
+        log!("Checking bob/maker status..");
+        check_my_swap_status(
+            &mm_bob,
+            uuid,
+            &MAKER_SUCCESS_EVENTS,
+            &MAKER_ERROR_EVENTS,
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume).unwrap(),
+        )
+        .await;
+    }
+
+    log!("Waiting 3 seconds for nodes to broadcast their swaps data..");
+    Timer::sleep(3.).await;
+
+    for uuid in uuids.iter() {
+        log!("Checking alice status..");
+        check_stats_swap_status(&mm_alice, uuid, &MAKER_SUCCESS_EVENTS, &TAKER_SUCCESS_EVENTS).await;
+
+        log!("Checking bob status..");
+        check_stats_swap_status(&mm_bob, uuid, &MAKER_SUCCESS_EVENTS, &TAKER_SUCCESS_EVENTS).await;
+    }
+
+    log!("Checking alice recent swaps..");
+    check_recent_swaps(&mm_alice, uuids.len()).await;
+    log!("Checking bob recent swaps..");
+    check_recent_swaps(&mm_bob, uuids.len()).await;
+    for (base, rel) in pairs.iter() {
+        log!("Get {}/{} orderbook", base, rel);
+        let rc = mm_bob
+            .rpc(&json!({
+                "userpass": mm_bob.userpass,
+                "method": "orderbook",
+                "base": base,
+                "rel": rel,
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+
+        let bob_orderbook: OrderbookResponse = serde_json::from_str(&rc.1).unwrap();
+        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);
+    }
+    mm_bob.stop().await.unwrap();
+    mm_alice.stop().await.unwrap();
+}
diff --git a/mm2src/mm2_main/tests/mm2_tests/lightning_tests.rs b/mm2src/mm2_main/tests/mm2_tests/lightning_tests.rs
new file mode 100644
index 0000000000..ff2b5040fc
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/lightning_tests.rs
@@ -0,0 +1,798 @@
+use crate::integration_tests_common::{enable_coins_rick_morty_electrum, enable_electrum};
+use coins::lightning::ln_events::{SUCCESSFUL_CLAIM_LOG, SUCCESSFUL_SEND_LOG};
+use common::executor::Timer;
+use common::{block_on, log};
+use gstuff::now_ms;
+use http::StatusCode;
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{disable_coin, disable_coin_err, init_lightning, init_lightning_status, my_balance,
+                                  sign_message, start_swaps, verify_message, wait_for_swaps_finish_and_check_status,
+                                  MarketMakerIt};
+use mm2_test_helpers::structs::{InitLightningStatus, InitTaskResult, LightningActivationResult, RpcV2Response,
+                                SignatureResponse, VerificationResponse};
+use serde_json::{self as json, json, Value as Json};
+use std::env;
+use std::str::FromStr;
+
+const BTC_AVG_BLOCKTIME: u64 = 600;
+const T_BTC_ELECTRUMS: &[&str] = &[
+    "electrum1.cipig.net:10068",
+    "electrum2.cipig.net:10068",
+    "electrum3.cipig.net:10068",
+];
+
+async fn enable_lightning(mm: &MarketMakerIt, coin: &str, timeout: u64) -> LightningActivationResult {
+    let init = init_lightning(mm, coin).await;
+    let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
+    let timeout = now_ms() + (timeout * 1000);
+
+    loop {
+        if now_ms() > timeout {
+            panic!("{} initialization timed out", coin);
+        }
+
+        let status = init_lightning_status(mm, init.result.task_id).await;
+        let status: RpcV2Response<InitLightningStatus> = json::from_value(status).unwrap();
+        log!("init_lightning_status: {:?}", status);
+        match status.result {
+            InitLightningStatus::Ok(result) => break result,
+            InitLightningStatus::Error(e) => panic!("{} initialization error {:?}", coin, e),
+            _ => Timer::sleep(1.).await,
+        }
+    }
+}
+
+fn start_lightning_nodes(enable_0_confs: bool) -> (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,
+            "avg_blocktime": BTC_AVG_BLOCKTIME,
+            "protocol": {
+              "type": "UTXO"
+            }
+          },
+          {
+            "coin": "tBTC-TEST-lightning",
+            "mm2": 1,
+            "decimals": 11,
+            "our_channels_configs": {
+              "inbound_channels_confirmations": 1,
+              "max_inbound_in_flight_htlc_percent": 100
+            },
+            "counterparty_channel_config_limits": {
+              "outbound_channels_confirmations": 1,
+              // If true, this enables sending payments between the 2 nodes straight away without waiting for on-chain confirmations
+              // if the other node added this node as trusted. It also overrides "outbound_channels_confirmations".
+              "allow_outbound_0conf": enable_0_confs
+            },
+            "protocol": {
+              "type": "LIGHTNING",
+              "protocol_data":{
+                "platform": "tBTC-TEST-segwit",
+                "network": "testnet",
+                "confirmation_targets": {
+                  "background": 12,
+                  "normal": 6,
+                  "high_priority": 1
+                }
+              }
+            }
+          },
+        {"coin":"RICK","asset":"RICK","rpcport":8923,"txversion":4,"overwintered":1,"required_confirmations":0,"protocol":{"type":"UTXO"}},
+        {"coin":"MORTY","asset":"MORTY","rpcport":11608,"txversion":4,"overwintered":1,"required_confirmations":0,"protocol":{"type":"UTXO"}}
+    ]);
+
+    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",
+            "i_am_seed": true,
+        }),
+        "pass".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_node_1.mm_dump();
+    log!("Node 1 log path: {}", mm_node_1.log_path.display());
+
+    let electrum = block_on(enable_electrum(&mm_node_1, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+    log!("Node 1 tBTC address: {}", electrum.address);
+
+    let enable_lightning_1 = block_on(enable_lightning(&mm_node_1, "tBTC-TEST-lightning", 600));
+    let node_1_address = enable_lightning_1.address;
+
+    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",
+            "seednodes": [mm_node_1.my_seed_addr()],
+        }),
+        "pass".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_node_2.mm_dump();
+    log!("Node 2 log path: {}", mm_node_2.log_path.display());
+
+    let electrum = block_on(enable_electrum(&mm_node_2, "tBTC-TEST-segwit", false, T_BTC_ELECTRUMS));
+    log!("Node 2 tBTC address: {}", electrum.address);
+
+    let enable_lightning_2 = block_on(enable_lightning(&mm_node_2, "tBTC-TEST-lightning", 600));
+    let node_2_address = enable_lightning_2.address;
+
+    (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,
+            "avg_blocktime": BTC_AVG_BLOCKTIME,
+            "protocol": {
+              "type": "UTXO"
+            }
+          },
+          {
+            "coin": "tBTC-TEST-lightning",
+            "mm2": 1,
+            "decimals": 11,
+            "protocol": {
+              "type": "LIGHTNING",
+              "protocol_data":{
+                "platform": "tBTC-TEST-segwit",
+                "network": "testnet",
+                "confirmation_targets": {
+                  "background": 12,
+                  "normal": 6,
+                  "high_priority": 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(),
+        None,
+    )
+    .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_coin = block_on(enable_lightning(&mm, "tBTC-TEST-lightning", 600));
+    assert_eq!(&enable_lightning_coin.platform_coin, "tBTC-TEST-segwit");
+    assert_eq!(
+        &enable_lightning_coin.address,
+        "02ce55b18d617bf4ac27b0f045301a0bb4e71669ae45cb5f2529f2f217520ffca1"
+    );
+    assert_eq!(enable_lightning_coin.balance.spendable, BigDecimal::from(0));
+    assert_eq!(enable_lightning_coin.balance.unspendable, BigDecimal::from(0));
+
+    // Disable tBTC-TEST-lightning
+    let disabled = block_on(mm.rpc(&json! ({
+        "userpass": mm.userpass,
+        "method": "disable_coin",
+        "coin": "tBTC-TEST-lightning",
+    })))
+    .unwrap();
+    assert_eq!(disabled.0, StatusCode::OK);
+
+    // Enable tBTC-TEST-lightning
+    let enable_lightning_coin = block_on(enable_lightning(&mm, "tBTC-TEST-lightning", 600));
+    assert_eq!(&enable_lightning_coin.platform_coin, "tBTC-TEST-segwit");
+    assert_eq!(
+        &enable_lightning_coin.address,
+        "02ce55b18d617bf4ac27b0f045301a0bb4e71669ae45cb5f2529f2f217520ffca1"
+    );
+
+    // Try to disable platform coin, tBTC-TEST-segwit. This should fail due to the dependent tokens.
+    let error = block_on(disable_coin_err(&mm, "tBTC-TEST-segwit"));
+    assert_eq!(error.dependent_tokens, ["tBTC-TEST-lightning"]);
+
+    // Try to disable tBTC-TEST-lightning token first.
+    block_on(disable_coin(&mm, "tBTC-TEST-lightning"));
+    // Then try to disable tBTC-TEST-segwit platform coin.
+    block_on(disable_coin(&mm, "tBTC-TEST-segwit"));
+
+    // Stop mm2
+    block_on(mm.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_connect_to_node() {
+    let (mm_node_1, mm_node_2, node_1_id, _) = start_lightning_nodes(false);
+    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": "lightning::nodes::connect_to_node",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+        },
+    })))
+    .unwrap();
+    assert!(
+        connect.0.is_success(),
+        "!lightning::nodes::connect_to_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]
+// This test is ignored because it requires refilling the tBTC addresses with test coins periodically.
+#[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(false);
+    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": "lightning::channels::open_channel",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+            "amount": {
+                "type": "Exact",
+                "value": 0.0002,
+            },
+        },
+    })))
+    .unwrap();
+    assert!(
+        open_channel.0.is_success(),
+        "!lightning::channels::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": "lightning::channels::list_open_channels_by_filter",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+        },
+    })))
+    .unwrap();
+    assert!(
+        list_channels_node_1.0.is_success(),
+        "!lightning::channels::list_open_channels_by_filter: {}",
+        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": "lightning::channels::list_open_channels_by_filter",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+      },
+    })))
+    .unwrap();
+    assert!(
+        list_channels_node_2.0.is_success(),
+        "!lightning::channels::list_open_channels_by_filter: {}",
+        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"],
+        20000000
+    );
+
+    block_on(mm_node_1.stop()).unwrap();
+    block_on(mm_node_2.stop()).unwrap();
+}
+
+#[test]
+// This test is ignored because it requires refilling the tBTC addresses with test coins periodically.
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+// This also tests 0_confs_channels
+fn test_send_payment() {
+    let (mut mm_node_2, mut mm_node_1, node_2_id, node_1_id) = start_lightning_nodes(true);
+    let node_1_address = format!("{}@{}:9735", node_1_id, mm_node_1.ip.to_string());
+
+    let add_trusted_node = block_on(mm_node_1.rpc(&json!({
+        "userpass": mm_node_1.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::nodes::add_trusted_node",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_id": node_2_id
+        },
+    })))
+    .unwrap();
+    assert!(
+        add_trusted_node.0.is_success(),
+        "!lightning::nodes::add_trusted_node: {}",
+        add_trusted_node.1
+    );
+
+    let open_channel = block_on(mm_node_2.rpc(&json!({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::channels::open_channel",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+            "amount": {
+                "type": "Exact",
+                "value": 0.0002,
+            },
+        },
+    })))
+    .unwrap();
+    assert!(
+        open_channel.0.is_success(),
+        "!lightning::channels::open_channel: {}",
+        open_channel.1
+    );
+
+    block_on(mm_node_2.wait_for_log(60., |log| log.contains("Received message ChannelReady"))).unwrap();
+
+    let send_payment = block_on(mm_node_2.rpc(&json!({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::payments::send_payment",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "payment": {
+                "type": "keysend",
+                "destination": node_1_id,
+                "amount_in_msat": 1000,
+                "expiry": 24
+            }
+        },
+    })))
+    .unwrap();
+    assert!(
+        send_payment.0.is_success(),
+        "!lightning::payments::send_payment: {}",
+        send_payment.1
+    );
+
+    let send_payment_res: Json = json::from_str(&send_payment.1).unwrap();
+    log!("send_payment_res {:?}", send_payment_res);
+    let payment_hash = send_payment_res["result"]["payment_hash"].as_str().unwrap();
+
+    block_on(mm_node_2.wait_for_log(60., |log| log.contains(SUCCESSFUL_SEND_LOG))).unwrap();
+
+    // Check payment on the sending node side
+    let get_payment_details = block_on(mm_node_2.rpc(&json!({
+      "userpass": mm_node_2.userpass,
+      "mmrpc": "2.0",
+      "method": "lightning::payments::get_payment_details",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+          "payment_hash": payment_hash
+      },
+    })))
+    .unwrap();
+    assert!(
+        get_payment_details.0.is_success(),
+        "!lightning::payments::get_payment_details: {}",
+        get_payment_details.1
+    );
+
+    let get_payment_details_res: Json = json::from_str(&get_payment_details.1).unwrap();
+    let payment = &get_payment_details_res["result"]["payment_details"];
+    assert_eq!(payment["status"], "succeeded");
+    assert_eq!(payment["amount_in_msat"], 1000);
+    assert_eq!(payment["payment_type"]["type"], "Outbound Payment");
+
+    // Check payment on the receiving node side
+    let get_payment_details = block_on(mm_node_1.rpc(&json!({
+      "userpass": mm_node_1.userpass,
+      "mmrpc": "2.0",
+      "method": "lightning::payments::get_payment_details",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+          "payment_hash": payment_hash
+      },
+    })))
+    .unwrap();
+    assert!(
+        get_payment_details.0.is_success(),
+        "!lightning::payments::get_payment_details: {}",
+        get_payment_details.1
+    );
+
+    let get_payment_details_res: Json = json::from_str(&get_payment_details.1).unwrap();
+    let payment = &get_payment_details_res["result"]["payment_details"];
+    assert_eq!(payment["status"], "succeeded");
+    assert_eq!(payment["amount_in_msat"], 1000);
+    assert_eq!(payment["payment_type"]["type"], "Inbound Payment");
+
+    // Test generate and pay invoice
+    let generate_invoice = block_on(mm_node_1.rpc(&json!({
+        "userpass": mm_node_1.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::payments::generate_invoice",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "description": "test invoice",
+            "amount_in_msat": 10000
+        },
+    })))
+    .unwrap();
+    assert!(
+        generate_invoice.0.is_success(),
+        "!lightning::payments::generate_invoice: {}",
+        generate_invoice.1
+    );
+
+    let generate_invoice_res: Json = json::from_str(&generate_invoice.1).unwrap();
+    log!("generate_invoice_res {:?}", generate_invoice_res);
+    let invoice = generate_invoice_res["result"]["invoice"].as_str().unwrap();
+    let invoice_payment_hash = generate_invoice_res["result"]["payment_hash"].as_str().unwrap();
+
+    let pay_invoice = block_on(mm_node_2.rpc(&json!({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::payments::send_payment",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "payment": {
+                "type": "invoice",
+                "invoice": invoice
+            }
+        },
+    })))
+    .unwrap();
+    assert!(
+        pay_invoice.0.is_success(),
+        "!lightning::payments::send_payment: {}",
+        pay_invoice.1
+    );
+
+    let pay_invoice_res: Json = json::from_str(&pay_invoice.1).unwrap();
+    log!("pay_invoice_res {:?}", pay_invoice_res);
+    let payment_hash = pay_invoice_res["result"]["payment_hash"].as_str().unwrap();
+
+    block_on(mm_node_1.wait_for_log(60., |log| log.contains(SUCCESSFUL_CLAIM_LOG))).unwrap();
+    block_on(mm_node_2.wait_for_log(60., |log| {
+        log.contains(&format!(
+            "{} of 10000 millisatoshis with payment hash {}",
+            SUCCESSFUL_SEND_LOG, payment_hash
+        ))
+    }))
+    .unwrap();
+
+    // Check payment on the sending node side
+    let get_payment_details = block_on(mm_node_2.rpc(&json!({
+      "userpass": mm_node_2.userpass,
+      "mmrpc": "2.0",
+      "method": "lightning::payments::get_payment_details",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+          "payment_hash": payment_hash
+      },
+    })))
+    .unwrap();
+    assert!(
+        get_payment_details.0.is_success(),
+        "!lightning::payments::get_payment_details: {}",
+        get_payment_details.1
+    );
+
+    let get_payment_details_res: Json = json::from_str(&get_payment_details.1).unwrap();
+    let payment = &get_payment_details_res["result"]["payment_details"];
+    assert_eq!(payment["status"], "succeeded");
+    assert_eq!(payment["amount_in_msat"], 10000);
+    assert_eq!(payment["payment_type"]["type"], "Outbound Payment");
+    assert_eq!(payment["description"], "test invoice");
+
+    // Check payment on the receiving node side
+    let get_payment_details = block_on(mm_node_1.rpc(&json!({
+      "userpass": mm_node_1.userpass,
+      "mmrpc": "2.0",
+      "method": "lightning::payments::get_payment_details",
+      "params": {
+          "coin": "tBTC-TEST-lightning",
+          "payment_hash": invoice_payment_hash
+      },
+    })))
+    .unwrap();
+    assert!(
+        get_payment_details.0.is_success(),
+        "!lightning::payments::get_payment_details: {}",
+        get_payment_details.1
+    );
+
+    let get_payment_details_res: Json = json::from_str(&get_payment_details.1).unwrap();
+    let payment = &get_payment_details_res["result"]["payment_details"];
+    assert_eq!(payment["status"], "succeeded");
+    assert_eq!(payment["amount_in_msat"], 10000);
+    assert_eq!(payment["payment_type"]["type"], "Inbound Payment");
+    assert_eq!(payment["description"], "test invoice");
+
+    block_on(mm_node_1.stop()).unwrap();
+    block_on(mm_node_2.stop()).unwrap();
+}
+
+#[test]
+// This test is ignored because it requires refilling the tBTC and RICK addresses with test coins periodically.
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_lightning_swaps() {
+    let (mut mm_node_1, mut mm_node_2, node_1_id, node_2_id) = start_lightning_nodes(true);
+    let node_1_address = format!("{}@{}:9735", node_1_id, mm_node_1.ip.to_string());
+
+    let add_trusted_node = block_on(mm_node_1.rpc(&json!({
+        "userpass": mm_node_1.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::nodes::add_trusted_node",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_id": node_2_id
+        },
+    })))
+    .unwrap();
+    assert!(
+        add_trusted_node.0.is_success(),
+        "!lightning::nodes::add_trusted_node: {}",
+        add_trusted_node.1
+    );
+
+    let open_channel = block_on(mm_node_2.rpc(&json!({
+        "userpass": mm_node_2.userpass,
+        "mmrpc": "2.0",
+        "method": "lightning::channels::open_channel",
+        "params": {
+            "coin": "tBTC-TEST-lightning",
+            "node_address": node_1_address,
+            "amount": {
+                "type": "Exact",
+                "value": 0.0002,
+            },
+        },
+    })))
+    .unwrap();
+    assert!(
+        open_channel.0.is_success(),
+        "!lightning::channels::open_channel: {}",
+        open_channel.1
+    );
+
+    block_on(mm_node_2.wait_for_log(60., |log| log.contains("Received message ChannelReady"))).unwrap();
+
+    // Enable coins on mm_node_1 side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (mm_node_1): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_node_1))
+    );
+
+    // Enable coins on mm_node_2 side. Print the replies in case we need the "address".
+    log!(
+        "enable_coins (mm_node_2): {:?}",
+        block_on(enable_coins_rick_morty_electrum(&mm_node_2))
+    );
+
+    // -------------------- Test Lightning Taker Swap --------------------
+    let price = 0.0005;
+    let volume = 0.1;
+    let uuids = block_on(start_swaps(
+        &mut mm_node_1,
+        &mut mm_node_2,
+        &[("RICK", "tBTC-TEST-lightning")],
+        price,
+        price,
+        volume,
+    ));
+    block_on(wait_for_swaps_finish_and_check_status(
+        &mut mm_node_1,
+        &mut mm_node_2,
+        &uuids,
+        volume,
+        price,
+    ));
+
+    // Check node 1 lightning balance after swap
+    let node_1_lightning_balance = block_on(my_balance(&mm_node_1, "tBTC-TEST-lightning")).balance;
+    // Channel reserve balance, which is non-spendable, is 1000 sats or 0.00001 BTC.
+    // Note: A channel reserve balance is the amount that is set aside by each channel participant which ensures neither have 'nothing at stake' if a cheating attempt occurs.
+    assert_eq!(node_1_lightning_balance, BigDecimal::from_str("0.00004").unwrap());
+
+    // -------------------- Test Lightning Maker Swap --------------------
+    let price = 10.;
+    let volume = 0.00004;
+    let uuids = block_on(start_swaps(
+        &mut mm_node_1,
+        &mut mm_node_2,
+        &[("tBTC-TEST-lightning", "RICK")],
+        price,
+        price,
+        volume,
+    ));
+    block_on(wait_for_swaps_finish_and_check_status(
+        &mut mm_node_1,
+        &mut mm_node_2,
+        &uuids,
+        volume,
+        price,
+    ));
+
+    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,
+        "avg_blocktime": BTC_AVG_BLOCKTIME,
+        "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",
+            "confirmation_targets": {
+              "background": 12,
+              "normal": 6,
+              "high_priority": 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(),
+        None,
+    )
+    .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", 600));
+
+    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/tests/mm2_tests/lp_bot_tests.rs b/mm2src/mm2_main/tests/mm2_tests/lp_bot_tests.rs
new file mode 100644
index 0000000000..63ed8f3f4e
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/lp_bot_tests.rs
@@ -0,0 +1,83 @@
+use common::{block_on, log};
+use http::HeaderMap;
+use http::StatusCode;
+use mm2_test_helpers::for_tests::MarketMakerIt;
+use serde_json::json;
+
+#[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.rs b/mm2src/mm2_main/tests/mm2_tests/mm2_tests_inner.rs
similarity index 89%
rename from mm2src/mm2_main/src/mm2_tests.rs
rename to mm2src/mm2_main/tests/mm2_tests/mm2_tests_inner.rs
index 675b2ed814..d6d4042ace 100644
--- a/mm2src/mm2_main/src/mm2_tests.rs
+++ b/mm2src/mm2_main/tests/mm2_tests/mm2_tests_inner.rs
@@ -1,54 +1,35 @@
-use super::{lp_main, LpMainParams};
-use crate::mm2::lp_ordermatch::MIN_ORDER_KEEP_ALIVE_INTERVAL;
+use crate::integration_tests_common::*;
 use common::executor::Timer;
-use common::log::LogLevel;
-use common::mm_metrics::{MetricType, MetricsJson};
-use common::now_ms;
+use common::{cfg_native, cfg_wasm32, get_utc_timestamp, log};
 use crypto::privkey::key_pair_from_seed;
 use http::{HeaderMap, StatusCode};
+use mm2_main::mm2::lp_ordermatch::MIN_ORDER_KEEP_ALIVE_INTERVAL;
+use mm2_metrics::{MetricType, MetricsJson};
 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 mm2_test_helpers::electrums::*;
+#[cfg(all(feature = "zhtlc-native-tests", not(target_arch = "wasm32")))]
+use mm2_test_helpers::for_tests::init_z_coin_native;
+use mm2_test_helpers::for_tests::{btc_segwit_conf, btc_with_spv_conf, btc_with_sync_starting_header,
+                                  check_recent_swaps, check_stats_swap_status, enable_eth_coin, enable_qrc20,
+                                  eth_jst_testnet_conf, eth_testnet_conf, find_metrics_in_json, from_env_file,
+                                  get_shared_db_id, mm_spat, morty_conf, rick_conf, sign_message, start_swaps,
+                                  tbtc_with_spv_conf, test_qrc20_history_impl, tqrc20_conf, verify_message,
+                                  wait_for_swap_contract_negotiation, wait_for_swap_negotiation_failure,
+                                  wait_for_swaps_finish_and_check_status, wait_till_history_has_records,
+                                  MarketMakerIt, Mm2InitPrivKeyPolicy, Mm2TestConf, Mm2TestConfForSwap, RaiiDump,
+                                  ETH_DEV_NODES, ETH_DEV_SWAP_CONTRACT, ETH_MAINNET_NODE, ETH_MAINNET_SWAP_CONTRACT,
+                                  MAKER_SUCCESS_EVENTS, MORTY, QRC20_ELECTRUMS, RICK, RICK_ELECTRUM_ADDRS,
+                                  TAKER_SUCCESS_EVENTS};
+use mm2_test_helpers::get_passphrase;
+use mm2_test_helpers::structs::*;
+use serde_json::{self as json, json, Value as Json};
 use std::collections::HashMap;
-use std::convert::{identity, TryFrom};
 use std::env::{self, var};
-use std::path::{Path, PathBuf};
 use std::str::FromStr;
 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};
@@ -62,141 +43,27 @@ cfg_wasm32! {
     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_json(mm, "RICK", false, rick_electrums()).await);
-    replies.insert(
-        "MORTY",
-        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);
-    replies
-}
-
-fn addr_from_enable<'a>(enable_response: &'a HashMap<&str, EnableElectrumResponse>, coin: &str) -> &'a str {
-    &enable_response.get(coin).unwrap().address
-}
-
-fn rmd160_from_passphrase(passphrase: &str) -> [u8; 20] {
-    key_pair_from_seed(passphrase).unwrap().public().address_hash().take()
-}
+#[cfg(all(feature = "zhtlc-native-tests", not(target_arch = "wasm32")))]
+async fn enable_z_coin(mm: &MarketMakerIt, coin: &str) -> CoinActivationResult {
+    use common::now_ms;
+    use mm2_test_helpers::for_tests::init_z_coin_status;
 
-async fn enable_z_coin_light(
-    mm: &MarketMakerIt,
-    coin: &str,
-    electrums: &[&str],
-    lightwalletd_urls: &[&str],
-) -> ZcoinActivationResult {
-    let init = init_z_coin_light(mm, coin, electrums, lightwalletd_urls).await;
+    let init = init_z_coin_native(mm, coin).await;
     let init: RpcV2Response<InitTaskResult> = json::from_value(init).unwrap();
-    let timeout = now_ms() + 12000000;
+    let timeout = now_ms() + 120000;
 
     loop {
-        if now_ms() > timeout {
+        if gstuff::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 } => {
-                    break result;
-                },
-                MmRpcResult::Err(e) => panic!("{} initialization error {:?}", coin, e),
-            }
+        match status.result {
+            InitZcoinStatus::Ok(result) => break result,
+            InitZcoinStatus::Error(e) => panic!("{} initialization error {:?}", coin, e),
+            _ => Timer::sleep(1.).await,
         }
-        Timer::sleep(1.).await;
     }
 }
 
@@ -205,7 +72,7 @@ async fn enable_z_coin_light(
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_rpc() {
-    let (_, mm, _dump_log, _dump_dashboard) = mm_spat(local_start(), &identity);
+    let (_, mm, _dump_log, _dump_dashboard) = mm_spat();
 
     let no_method = block_on(mm.rpc(&json! ({
         "userpass": mm.userpass,
@@ -251,86 +118,6 @@ fn test_rpc() {
     // TODO (workaround libtorrent hanging in delete) // unwrap! (mm.wait_for_log (9., &|log| log.contains ("LogState] Bye!")));
 }
 
-/// 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") {
-        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()
-            }
-        }
-    }
-}
-
-#[allow(unused_variables)]
-fn chdir(dir: &Path) {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        #[cfg(not(windows))]
-        {
-            use std::ffi::CString;
-            let dir_s = dir.to_str().unwrap();
-            let dir_c = CString::new(dir_s).unwrap();
-            let rc = unsafe { libc::chdir(dir_c.as_ptr()) };
-            assert_eq!(rc, 0, "Can not chdir to {:?}", dir);
-        }
-
-        #[cfg(windows)]
-        {
-            use std::ffi::CString;
-            use winapi::um::processenv::SetCurrentDirectoryA;
-            let dir = dir.to_str().unwrap();
-            let dir = CString::new(dir).unwrap();
-            // https://docs.microsoft.com/en-us/windows/desktop/api/WinBase/nf-winbase-setcurrentdirectory
-            let rc = unsafe { SetCurrentDirectoryA(dir.as_ptr()) };
-            assert_ne!(rc, 0);
-        }
-    }
-}
-
-/// Typically used when the `LOCAL_THREAD_MM` env is set, helping debug the tested MM.  
-/// NB: Accessing `lp_main` this function have to reside in the mm2 binary crate. We pass a pointer to it to subcrates.
-#[cfg(not(target_arch = "wasm32"))]
-fn local_start_impl(folder: PathBuf, log_path: PathBuf, mut conf: Json) {
-    thread::Builder::new()
-        .name("MM".into())
-        .spawn(move || {
-            if conf["log"].is_null() {
-                conf["log"] = log_path.to_str().unwrap().into();
-            } else {
-                let path = Path::new(conf["log"].as_str().expect("log is not a string"));
-                assert_eq!(log_path, path);
-            }
-
-            log!("local_start] MM in a thread, log {:?}.", log_path);
-
-            chdir(&folder);
-
-            let params = LpMainParams::with_conf(conf);
-            block_on(lp_main(params, &|_ctx| ())).unwrap()
-        })
-        .unwrap();
-}
-
-/// Starts the WASM version of MM.
-#[cfg(target_arch = "wasm32")]
-fn wasm_start_impl(ctx: mm2_core::mm_ctx::MmArc) {
-    common::executor::spawn(async move {
-        super::lp_init(ctx).await.unwrap();
-    })
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn local_start() -> LocalStart { local_start_impl }
-
-#[cfg(target_arch = "wasm32")]
-fn local_start() -> LocalStart { wasm_start_impl }
-
 /// https://github.com/KomodoPlatform/atomicDEX-API/issues/886#issuecomment-812489844
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
@@ -354,7 +141,7 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -389,7 +176,7 @@ fn orders_of_banned_pubkeys_should_not_be_displayed() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -458,7 +245,7 @@ fn test_my_balance() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -533,7 +320,7 @@ fn test_p2wpkh_my_balance() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -642,7 +429,7 @@ fn test_check_balance_on_order_post() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -650,7 +437,9 @@ fn test_check_balance_on_order_post() {
     // 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"]))
+        block_on(enable_coins_eth_electrum(&mm, &[
+            "https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"
+        ]))
     );
     // issue sell request by setting base/rel price
 
@@ -700,7 +489,7 @@ fn test_rpc_password_from_json() {
             "skip_startup_checks": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     block_on(err_mm1.wait_for_log(5., |log| log.contains("rpc_password must not be empty"))).unwrap();
@@ -717,7 +506,7 @@ fn test_rpc_password_from_json() {
             "skip_startup_checks": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     block_on(err_mm2.wait_for_log(5., |log| log.contains("rpc_password must be string"))).unwrap();
@@ -732,7 +521,7 @@ fn test_rpc_password_from_json() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -823,7 +612,7 @@ fn test_mmrpc_v2() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -932,7 +721,7 @@ fn test_rpc_password_from_json_no_userpass() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -955,43 +744,28 @@ fn test_rpc_password_from_json_no_userpass() {
 
 /// Trading test using coins with remote RPC (Electrum, ETH nodes), it needs only ENV variables to be set, coins daemons are not required.
 /// Trades few pairs concurrently to speed up the process and also act like "load" test
+///
+/// Please note that it
 async fn trade_base_rel_electrum(
+    bob_priv_key_policy: Mm2InitPrivKeyPolicy,
+    alice_priv_key_policy: Mm2InitPrivKeyPolicy,
     pairs: &[(&'static str, &'static str)],
-    maker_price: i32,
-    taker_price: i32,
+    maker_price: f64,
+    taker_price: f64,
     volume: f64,
 ) {
-    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"}},
+    let coins = json!([
+        rick_conf(),
+        morty_conf(),
+        eth_testnet_conf(),
+        eth_jst_testnet_conf(),
         {"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_async(
-        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"),
-    )
-    .await
-    .unwrap();
+    let bob_conf = Mm2TestConfForSwap::bob_conf_with_policy(bob_priv_key_policy, &coins);
+    let mut mm_bob = MarketMakerIt::start_async(bob_conf.conf, bob_conf.rpc_password, None)
+        .await
+        .unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
     #[cfg(not(target_arch = "wasm32"))]
@@ -1001,24 +775,10 @@ async fn trade_base_rel_electrum(
 
     Timer::sleep(1.).await;
 
-    let mut mm_alice = MarketMakerIt::start_async(
-        json! ({
-            "gui": "nogui",
-            "netid": 8999,
-            "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.my_seed_addr()],
-            "rpc_password": "password",
-            "skip_startup_checks": true,
-        }),
-        "password".into(),
-        local_start!("alice"),
-    )
-    .await
-    .unwrap();
+    let alice_conf = Mm2TestConfForSwap::alice_conf_with_policy(alice_priv_key_policy, &coins, &mm_bob.my_seed_addr());
+    let mut mm_alice = MarketMakerIt::start_async(alice_conf.conf, alice_conf.rpc_password, None)
+        .await
+        .unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
     #[cfg(not(target_arch = "wasm32"))]
@@ -1050,81 +810,14 @@ async fn trade_base_rel_electrum(
         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;
+    let rc = enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES).await;
     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;
+    let rc = enable_coins_eth_electrum(&mm_alice, ETH_DEV_NODES).await;
     log!("enable_coins (alice): {:?}", rc);
 
-    // unwrap! (mm_alice.wait_for_log (999., &|log| log.contains ("set pubkey for ")));
-
-    let mut uuids = vec![];
-
-    // issue sell request on Bob side by setting base/rel price
-    for (base, rel) in pairs.iter() {
-        log!("Issue bob {}/{} sell request", base, rel);
-        let rc = mm_bob
-            .rpc(&json! ({
-                "userpass": mm_bob.userpass,
-                "method": "setprice",
-                "base": base,
-                "rel": rel,
-                "price": maker_price,
-                "volume": volume
-            }))
-            .await
-            .unwrap();
-        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
-    }
-
-    for (base, rel) in pairs.iter() {
-        common::log::info!(
-            "Trigger alice subscription to {}/{} orderbook topic first and sleep for 1 second",
-            base,
-            rel
-        );
-        let rc = mm_alice
-            .rpc(&json! ({
-                "userpass": mm_alice.userpass,
-                "method": "orderbook",
-                "base": base,
-                "rel": rel,
-            }))
-            .await
-            .unwrap();
-        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
-        Timer::sleep(1.).await;
-        common::log::info!("Issue alice {}/{} buy request", base, rel);
-        let rc = mm_alice
-            .rpc(&json! ({
-                "userpass": mm_alice.userpass,
-                "method": "buy",
-                "base": base,
-                "rel": rel,
-                "volume": volume,
-                "price": taker_price
-            }))
-            .await
-            .unwrap();
-        assert!(rc.0.is_success(), "!buy: {}", rc.1);
-        let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
-        uuids.push(buy_json["result"]["uuid"].as_str().unwrap().to_owned());
-    }
-
-    for (base, rel) in pairs.iter() {
-        // ensure the swaps are started
-        let expected_log = format!("Entering the taker_swap_loop {}/{}", base, rel);
-        mm_alice
-            .wait_for_log(5., |log| log.contains(&expected_log))
-            .await
-            .unwrap();
-        let expected_log = format!("Entering the maker_swap_loop {}/{}", base, rel);
-        mm_bob
-            .wait_for_log(5., |log| log.contains(&expected_log))
-            .await
-            .unwrap()
-    }
+    let uuids = start_swaps(&mut mm_bob, &mut mm_alice, pairs, maker_price, taker_price, volume).await;
 
     #[cfg(not(target_arch = "wasm32"))]
     for uuid in uuids.iter() {
@@ -1140,42 +833,7 @@ async fn trade_base_rel_electrum(
             .unwrap()
     }
 
-    for uuid in uuids.iter() {
-        mm_bob
-            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
-            .await
-            .unwrap();
-
-        mm_alice
-            .wait_for_log(900., |log| log.contains(&format!("[swap uuid={}] Finished", uuid)))
-            .await
-            .unwrap();
-
-        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(
-            &mm_alice,
-            uuid,
-            &TAKER_SUCCESS_EVENTS,
-            &TAKER_ERROR_EVENTS,
-            BigDecimal::try_from(volume).unwrap(),
-            BigDecimal::try_from(volume).unwrap(),
-        )
-        .await;
-
-        log!("Checking bob/maker status..");
-        check_my_swap_status(
-            &mm_bob,
-            uuid,
-            &MAKER_SUCCESS_EVENTS,
-            &MAKER_ERROR_EVENTS,
-            BigDecimal::try_from(volume).unwrap(),
-            BigDecimal::try_from(volume).unwrap(),
-        )
-        .await;
-    }
+    wait_for_swaps_finish_and_check_status(&mut mm_bob, &mut mm_alice, &uuids, volume, maker_price).await;
 
     log!("Waiting 3 seconds for nodes to broadcast their swaps data..");
     Timer::sleep(3.).await;
@@ -1212,23 +870,40 @@ async fn trade_base_rel_electrum(
         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);
     }
-    mm_bob.stop().await.unwrap();
-    mm_alice.stop().await.unwrap();
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        const STOP_TIMEOUT_MS: u64 = 1000;
+
+        mm_bob.stop_and_wait_for_ctx_is_dropped(STOP_TIMEOUT_MS).await.unwrap();
+        mm_alice
+            .stop_and_wait_for_ctx_is_dropped(STOP_TIMEOUT_MS)
+            .await
+            .unwrap();
+    }
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        mm_bob.stop().await.unwrap();
+        mm_alice.stop().await.unwrap();
+    }
 }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
-fn trade_test_electrum_and_eth_coins() { block_on(trade_base_rel_electrum(&[("ETH", "JST")], 1, 2, 0.1)); }
+fn trade_test_electrum_and_eth_coins() {
+    let bob_policy = Mm2InitPrivKeyPolicy::Iguana;
+    let alice_policy = Mm2InitPrivKeyPolicy::GlobalHDAccount(0);
+    let pairs = &[("ETH", "JST")];
+    block_on(trade_base_rel_electrum(bob_policy, alice_policy, pairs, 1., 2., 0.1));
+}
 
 #[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)); }
-
-#[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;
+fn trade_test_electrum_rick_zombie() {
+    let bob_policy = Mm2InitPrivKeyPolicy::Iguana;
+    let alice_policy = Mm2InitPrivKeyPolicy::Iguana;
+    let pairs = &[("RICK", "ZOMBIE")];
+    block_on(trade_base_rel_electrum(bob_policy, alice_policy, pairs, 1., 2., 0.1));
 }
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -1307,10 +982,7 @@ fn test_withdraw_and_send() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -1320,7 +992,7 @@ fn test_withdraw_and_send() {
     // 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_eth_electrum(&mm_alice, ETH_DEV_NODES));
     enable_res.insert(
         "MORTY_SEGWIT",
         block_on(enable_electrum(&mm_alice, "MORTY_SEGWIT", false, &[
@@ -1473,10 +1145,7 @@ fn test_tbtc_withdraw_to_cashaddresses_should_fail() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -1551,10 +1220,7 @@ fn test_withdraw_legacy() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -1641,10 +1307,7 @@ fn test_withdraw_segwit() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -1723,7 +1386,7 @@ fn test_withdraw_segwit() {
     assert!(withdraw_error["error"]
         .as_str()
         .expect("Expected 'error' field")
-        .contains("Invalid address: tb1p6h5fuzmnvpdthf5shf0qqjzwy7wsqc5rhmgq2ks9xrak4ry6mtrscsqvzp"));
+        .contains("address variant/format Bech32m is not supported yet"));
 
     block_on(mm_alice.stop()).unwrap();
 }
@@ -1746,10 +1409,7 @@ fn test_swap_status() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -1802,10 +1462,7 @@ fn test_order_errors_when_base_equal_rel() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -1868,10 +1525,7 @@ fn startup_passphrase(passphrase: &str, expected_address: &str) {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -1938,10 +1592,7 @@ fn test_cancel_order() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -1979,10 +1630,7 @@ fn test_cancel_order() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -2087,10 +1735,7 @@ fn test_cancel_all_orders() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -2128,10 +1773,7 @@ fn test_cancel_all_orders() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -2241,10 +1883,7 @@ fn test_electrum_enable_conn_errors() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -2290,10 +1929,7 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -2326,10 +1962,7 @@ fn test_order_should_not_be_displayed_when_node_is_down() {
             "maker_order_timeout": 5,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -2424,10 +2057,7 @@ fn test_own_orders_should_not_be_removed_from_orderbook() {
             "maker_order_timeout": 5,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -2516,10 +2146,7 @@ fn test_show_priv_key() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -2527,7 +2154,7 @@ fn test_show_priv_key() {
     log!("Log path: {}", mm.log_path.display());
     log!(
         "enable_coins: {:?}",
-        block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]))
+        block_on(enable_coins_eth_electrum(&mm, ETH_DEV_NODES))
     );
 
     check_priv_key(&mm, "RICK", "UvCjJf4dKSs2vFGVtCnUTAhR5FTZGdg43DDRa9s7s5DV1sSDX14g");
@@ -2560,10 +2187,7 @@ fn test_electrum_and_enable_response() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -2716,17 +2340,14 @@ fn setprice_buy_sell_too_low_volume() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
     log!("Log path: {}", mm.log_path.display());
 
-    let enable = block_on(enable_coins_eth_electrum(&mm, &["http://195.201.0.6:8565"]));
+    let enable = block_on(enable_coins_eth_electrum(&mm, ETH_DEV_NODES));
     log!("{:?}", enable);
 
     check_too_low_volume_order_creation_fails(&mm, "MORTY", "ETH");
@@ -2760,17 +2381,14 @@ fn test_fill_or_kill_taker_order_should_not_transform_to_maker() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob ETH/JST sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -2833,16 +2451,13 @@ fn test_gtc_taker_order_should_transform_to_maker() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob ETH/JST sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -2911,16 +2526,13 @@ fn test_set_price_must_save_order_to_db() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob ETH/JST sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -2969,16 +2581,13 @@ fn test_set_price_response_format() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob ETH/JST sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -3025,10 +2634,7 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -3064,10 +2670,7 @@ fn set_price_with_cancel_previous_should_broadcast_cancelled_message() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -3161,10 +2764,7 @@ fn test_batch_requests() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -3239,7 +2839,7 @@ fn test_metrics_method() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -3295,7 +2895,7 @@ fn test_electrum_tx_history() {
             "metrics_interval": 30.
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -3355,7 +2955,7 @@ fn spin_n_nodes(seednodes: &[&str], coins: &Json, n: usize) -> Vec<(MarketMakerI
                 "rpc_password": "pass",
             }),
             "pass".into(),
-            local_start!("alice"),
+            None,
         )
         .unwrap();
 
@@ -3389,7 +2989,7 @@ fn test_convert_utxo_address() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -3526,7 +3126,7 @@ fn test_convert_segwit_address() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -3616,9 +3216,7 @@ fn test_convert_segwit_address() {
         "!convertaddress success but should be error: {}",
         rc.1
     );
-    assert!(rc
-        .1
-        .contains("Invalid address: ltc1qdkwjk42dw6pryvs9sl0ht3pn3mxghuma64jst5"));
+    assert!(rc.1.contains("Cannot determine format"));
 }
 
 #[test]
@@ -3643,16 +3241,13 @@ fn test_convert_eth_address() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
     log!("log path: {}", mm.log_path.display());
 
-    block_on(enable_native(&mm, "ETH", &["http://195.201.0.6:8565"]));
+    block_on(enable_native(&mm, "ETH", ETH_DEV_NODES));
 
     // test single-case to mixed-case
     let rc = block_on(mm.rpc(&json! ({
@@ -3752,10 +3347,7 @@ fn test_add_delegation_qtum() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -3840,10 +3432,7 @@ fn test_remove_delegation_qtum() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -3903,10 +3492,7 @@ fn test_get_staking_infos_qtum() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
         .unwrap();
 
@@ -3956,7 +3542,7 @@ fn test_convert_qrc20_address() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -4107,18 +3693,12 @@ fn test_validateaddress() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm, ETH_DEV_NODES)));
 
     // test valid RICK address
 
@@ -4279,10 +3859,7 @@ fn test_validateaddress_segwit() {
             "i_am_seed": true,
         }),
         "password".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -4360,7 +3937,7 @@ fn test_validateaddress_segwit() {
     assert!(!result["is_valid"].as_bool().unwrap());
     let reason = result["reason"].as_str().unwrap();
     log!("{}", reason);
-    assert!(reason.contains("Invalid address: bc1qdkwjk42dw6pryvs9sl0ht3pn3mxghuma64jst5"));
+    assert!(reason.contains("Cannot determine format"));
 
     block_on(mm_alice.stop()).unwrap();
 }
@@ -4388,7 +3965,7 @@ fn qrc20_activate_electrum() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -4435,7 +4012,7 @@ fn test_qrc20_withdraw() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -4516,7 +4093,7 @@ fn test_qrc20_withdraw_error() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -4580,123 +4157,7 @@ fn test_qrc20_withdraw_error() {
         .contains("Not enough QTUM to withdraw: available 0, required at least 0.04"));
 }
 
-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,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
-         "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
-    ]);
-
-    let mut mm = MarketMakerIt::start_async(
-        json! ({
-            "gui": "nogui",
-            "netid": 9998,
-            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
-            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
-            "passphrase": passphrase,
-            "coins": coins,
-            "rpc_password": "pass",
-            "metrics_interval": 30.,
-        }),
-        "pass".into(),
-        local_start!("bob"),
-    )
-    .await
-    .unwrap();
-    let (_dump_log, _dump_dashboard) = mm.mm_dump();
-
-    #[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,
-        "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("qfkXE2cNFEwPFQqvBcqs8m9KrkNa9KV4xi")
-    );
-
-    // Wait till tx_history will not be loaded
-    mm.wait_for_log(22., |log| log.contains("history has been loaded successfully"))
-        .await
-        .unwrap();
-
-    // let the MarketMaker save the history to the file
-    Timer::sleep(1.).await;
-
-    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,
-        "RPC «my_tx_history» failed with status «{}», response «{}»",
-        tx_history.0,
-        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"];
-
-    let mut expected = vec![
-        // https://testnet.qtum.info/tx/45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d2
-        "45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d200000000000000020000000000000000",
-        // https://testnet.qtum.info/tx/45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d2
-        "45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d200000000000000020000000000000001",
-        // https://testnet.qtum.info/tx/abcb51963e720fdfed7b889cea79947ba3cabd7b8b384f6b5adb41a3f4b5d61b
-        "abcb51963e720fdfed7b889cea79947ba3cabd7b8b384f6b5adb41a3f4b5d61b00000000000000020000000000000000",
-        // https://testnet.qtum.info/tx/4ea5392d03a9c35126d2d5a8294c3c3102cfc6d65235897c92ca04c5515f6be5
-        "4ea5392d03a9c35126d2d5a8294c3c3102cfc6d65235897c92ca04c5515f6be500000000000000020000000000000000",
-        // https://testnet.qtum.info/tx/9156f5f1d3652c27dca0216c63177da38de5c9e9f03a5cfa278bf82882d2d3d8
-        "9156f5f1d3652c27dca0216c63177da38de5c9e9f03a5cfa278bf82882d2d3d800000000000000020000000000000000",
-        // https://testnet.qtum.info/tx/35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac
-        "35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac00000000000000010000000000000000",
-        // https://testnet.qtum.info/tx/39104d29d77ba83c5c6c63ab7a0f096301c443b4538dc6b30140453a40caa80a
-        "39104d29d77ba83c5c6c63ab7a0f096301c443b4538dc6b30140453a40caa80a00000000000000000000000000000000",
-        // https://testnet.qtum.info/tx/d9965e3496a8a4af2d462424b989694b3146d78c61654b99bbadba64464f75cb
-        "d9965e3496a8a4af2d462424b989694b3146d78c61654b99bbadba64464f75cb00000000000000000000000000000000",
-        // https://testnet.qtum.info/tx/c2f346d3d2aadc35f5343d0d493a139b2579175496d685ec30734d161e62f7a1
-        "c2f346d3d2aadc35f5343d0d493a139b2579175496d685ec30734d161e62f7a100000000000000000000000000000000",
-    ];
-
-    assert_eq!(tx_history_result["total"].as_u64().unwrap(), expected.len() as u64);
-    for tx in tx_history_result["transactions"].as_array().unwrap() {
-        // pop front item
-        let expected_tx = expected.remove(0);
-        assert_eq!(tx["internal_id"].as_str().unwrap(), expected_tx);
-    }
-}
-
 #[test]
-#[ignore]
-/// Ignored temporarily until dev is merged to mm2.1
 #[cfg(not(target_arch = "wasm32"))]
 fn test_get_raw_transaction() {
     let coins = json! ([
@@ -4714,7 +4175,7 @@ fn test_get_raw_transaction() {
             "metrics_interval": 30.,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -4747,9 +4208,9 @@ fn test_get_raw_transaction() {
         "userpass": mm.userpass,
         "method": "enable",
         "coin": "ETH",
-        "urls": &["https://ropsten.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b"],
+        "urls": &[ETH_MAINNET_NODE],
         // Dev chain swap contract address
-        "swap_contract_address": "0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd",
+        "swap_contract_address": ETH_MAINNET_SWAP_CONTRACT,
         "mm2": 1,
     })))
     .unwrap();
@@ -4761,7 +4222,7 @@ fn test_get_raw_transaction() {
         "params": {
             "coin": "ETH",
             // valid hash with 0x prefix
-            "tx_hash": "0xbdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c5519edcad801359",
+            "tx_hash": "0x02c261dcb1c8615c029b9abc712712b80ef8c1ef20d2cbcdd9bde859e7913476",
         },
         "id": 0,
     })))
@@ -4769,7 +4230,7 @@ fn test_get_raw_transaction() {
     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";
+    let expected_hex = "f9012a19851a0de19041830249f09424abe4c71fc658c91313b6552cd40cd808b3ea8080b8c49b415b2a167d3413b0116abb8e99f4c2d4cd39a64df9bc9950006c4ae884527258247dc100000000000000000000000000000000000000000000000006f05b59d3b200000000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef0000000000000000000000000112679fc5e6338a52098ab095bee1e9a15bc630ba9528127bcff524677236f3739cef013311f42000000000000000000000000000000000000000000000000000000000000000000000000000000000619626fa25a0b143893550c8d0164278f94d5fa51ba71e3dfefa112e6f53a575bcb494633a07a00cc60b65e44ae5053257b91c1023b637a38d87ffc32c822591275a6283cd6ec5";
     assert_eq!(res.result.tx_hex, expected_hex);
     let raw = block_on(mm.rpc(&json! ({
         "mmrpc": "2.0",
@@ -4778,7 +4239,7 @@ fn test_get_raw_transaction() {
         "params": {
             "coin": "ETH",
             // valid hash without 0x prefix
-            "tx_hash": "bdef3970c00752b0dc811cd93faadfd75a7a52e6b8e0b608c5519edcad801359",
+            "tx_hash": "02c261dcb1c8615c029b9abc712712b80ef8c1ef20d2cbcdd9bde859e7913476",
         },
         "id": 0,
     })))
@@ -4786,7 +4247,7 @@ fn test_get_raw_transaction() {
     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";
+    let expected_hex = "f9012a19851a0de19041830249f09424abe4c71fc658c91313b6552cd40cd808b3ea8080b8c49b415b2a167d3413b0116abb8e99f4c2d4cd39a64df9bc9950006c4ae884527258247dc100000000000000000000000000000000000000000000000006f05b59d3b200000000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef0000000000000000000000000112679fc5e6338a52098ab095bee1e9a15bc630ba9528127bcff524677236f3739cef013311f42000000000000000000000000000000000000000000000000000000000000000000000000000000000619626fa25a0b143893550c8d0164278f94d5fa51ba71e3dfefa112e6f53a575bcb494633a07a00cc60b65e44ae5053257b91c1023b637a38d87ffc32c822591275a6283cd6ec5";
     assert_eq!(res.result.tx_hex, expected_hex);
 
     // invalid coin
@@ -4893,11 +4354,7 @@ fn test_get_raw_transaction() {
 
 #[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 }
+fn test_qrc20_tx_history() { block_on(test_qrc20_history_impl(None)); }
 
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
@@ -4920,7 +4377,7 @@ fn test_tx_history_segwit() {
             "metrics_interval": 30.,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -5046,7 +4503,7 @@ fn test_tx_history_tbtc_non_segwit() {
             "metrics_interval": 30.,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -5188,16 +4645,13 @@ fn test_buy_conf_settings() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob buy request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5265,16 +4719,13 @@ fn test_buy_response_format() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob buy request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5320,16 +4771,13 @@ fn test_sell_response_format() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5375,16 +4823,13 @@ fn test_my_orders_response_format() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob buy request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5475,10 +4920,10 @@ fn test_my_orders_after_matched() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
 
     // 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"]));
+    let rc = block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES));
     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"]));
+    let rc = block_on(enable_coins_eth_electrum(&mm_alice, ETH_DEV_NODES));
     log!("enable_coins (alice): {:?}", rc);
 
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5545,16 +4990,13 @@ fn test_sell_conf_settings() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5622,16 +5064,13 @@ fn test_set_price_conf_settings() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     log!("Issue bob sell request");
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -5697,7 +5136,7 @@ fn test_update_maker_order() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -5837,7 +5276,7 @@ fn test_update_maker_order_fail() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -6061,10 +5500,10 @@ fn test_update_maker_order_after_matched() {
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
 
     // 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"]));
+    let rc = block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES));
     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"]));
+    let rc = block_on(enable_coins_eth_electrum(&mm_alice, ETH_DEV_NODES));
     log!("enable_coins (alice): {:?}", rc);
 
     let rc = block_on(mm_bob.rpc(&json! ({
@@ -6164,10 +5603,7 @@ fn test_trade_fee_returns_numbers_in_various_formats() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -6209,10 +5645,7 @@ fn test_orderbook_is_mine_orders() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "bob" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -6248,10 +5681,7 @@ fn test_orderbook_is_mine_orders() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        match var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "alice" => Some(local_start()),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
 
@@ -6386,16 +5816,13 @@ fn test_sell_min_volume() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     let min_volume: BigDecimal = "0.1".parse().unwrap();
     log!("Issue bob ETH/JST sell request");
@@ -6462,7 +5889,7 @@ fn test_sell_min_volume_dust() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -6513,7 +5940,7 @@ fn test_setprice_min_volume_dust() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
 
@@ -6563,16 +5990,13 @@ fn test_buy_min_volume() {
             "i_am_seed": true,
         }),
         "password".into(),
-        local_start!("bob"),
+        None,
     )
     .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!("{:?}", block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES)));
 
     let min_volume: BigDecimal = "0.1".parse().unwrap();
     log!("Issue bob ETH/JST sell request");
@@ -6677,14 +6101,14 @@ fn test_orderbook_depth() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        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 bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]));
+    let bob_coins = block_on(enable_coins_eth_electrum(&mm_bob, ETH_DEV_NODES));
     log!("enable_coins (bob): {:?}", bob_coins);
     // issue sell request on Bob side by setting base/rel price
     log!("Issue bob sell requests");
@@ -6726,7 +6150,7 @@ fn test_orderbook_depth() {
             "rpc_password": "pass",
         }),
         "pass".into(),
-        local_start!("alice"),
+        None,
     )
     .unwrap();
 
@@ -6799,6 +6223,43 @@ fn test_mm2_db_migration() {
     .unwrap();
 }
 
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_current_mtp() {
+    // KMD coin config used for this test
+    let coins = json!([
+        {"coin":"KMD","txversion":4,"overwintered":1,"txfee":10000,"protocol":{"type":"UTXO"}},
+    ]);
+    let passphrase = "cMhHM3PMpMrChygR4bLF7QsTdenhWpFrrmf2UezBG3eeFsz41rtL";
+
+    let conf = Mm2TestConf::seednode(&passphrase, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+
+    let electrum = block_on(enable_electrum(&mm, "KMD", false, &[
+        "electrum1.cipig.net:10001",
+        "electrum2.cipig.net:10001",
+        "electrum3.cipig.net:10001",
+    ]));
+    log!("{:?}", electrum);
+
+    let rc = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "get_current_mtp",
+        "params": {
+            "coin": "KMD",
+        },
+    })))
+    .unwrap();
+
+    // Test if request is successful before proceeding.
+    assert_eq!(true, rc.0.is_success());
+    let mtp_result: Json = json::from_str(&rc.1).unwrap();
+    // Test if mtp returns a u32 Number.
+    assert_eq!(true, mtp_result["result"]["mtp"].is_number());
+}
+
 #[test]
 #[cfg(not(target_arch = "wasm32"))]
 fn test_get_public_key() {
@@ -7201,7 +6662,7 @@ fn test_sign_verify_message_utxo() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -7268,7 +6729,7 @@ fn test_sign_verify_message_utxo_segwit() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -7345,7 +6806,7 @@ fn test_sign_verify_message_eth() {
             "i_am_seed": true,
         }),
         "pass".into(),
-        local_start!("bob"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -7354,7 +6815,7 @@ fn test_sign_verify_message_eth() {
     // 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"]))
+        block_on(enable_native(&mm_bob, "ETH", ETH_DEV_NODES))
     );
 
     let response = block_on(sign_message(&mm_bob, "ETH"));
@@ -7381,13 +6842,12 @@ 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 seednode = MarketMakerIt::start(seednode_conf.conf, seednode_conf.rpc_password, None).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 no_login_node = MarketMakerIt::start(no_login_conf.conf, no_login_conf.rpc_password, None).unwrap();
     let (_dump_log, _dump_dashboard) = no_login_node.mm_dump();
     log!("log path: {}", no_login_node.log_path.display());
 
@@ -7505,3 +6965,621 @@ fn test_no_login() {
     .unwrap();
     assert!(version.0.is_success(), "!version: {}", version.1);
 }
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_gui_storage_accounts_functionality() {
+    let passphrase = "test_gui_storage passphrase";
+
+    let conf = Mm2TestConf::seednode(passphrase, &json!([]));
+    let mm = block_on(MarketMakerIt::start_async(conf.conf, conf.rpc_password, None)).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::enable_account",
+        "params": {
+            "policy": "new",
+            "account_id": {
+                "type": "iguana"
+            },
+            "name": "My Iguana wallet",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::enable_account: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::add_account",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            },
+            "description": "Any description",
+            "name": "My HW",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::add_account: {}", resp.1);
+
+    // Add `HD{1}` account that will be deleted later.
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::add_account",
+        "params": {
+            "account_id": {
+                "type": "hd",
+                "account_idx": 1,
+            },
+            "name": "An HD account"
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::add_account: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::delete_account",
+        "params": {
+            "account_id": {
+                "type": "hd",
+                "account_idx": 1,
+            }
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::delete_account: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::set_account_balance",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            },
+            "balance_usd": "123.567",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::set_account_balance: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::set_account_name",
+        "params": {
+            "account_id": {
+                "type": "iguana"
+            },
+            "name": "New Iguana account name",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::set_account_name: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::set_account_description",
+        "params": {
+            "account_id": {
+                "type": "iguana"
+            },
+            "description": "Another description",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::set_account_description: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::get_accounts"
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::get_accounts: {}", resp.1);
+
+    let actual: RpcV2Response<Vec<gui_storage::AccountWithEnabledFlag>> = json::from_str(&resp.1).unwrap();
+    let expected = vec![
+        gui_storage::AccountWithEnabledFlag {
+            account_id: gui_storage::AccountId::Iguana,
+            name: "New Iguana account name".to_string(),
+            description: "Another description".to_string(),
+            balance_usd: BigDecimal::from(0i32),
+            enabled: true,
+        },
+        gui_storage::AccountWithEnabledFlag {
+            account_id: gui_storage::AccountId::HW {
+                device_pubkey: "1549128bbfb33b997949b4105b6a6371c998e212".to_string(),
+            },
+            name: "My HW".to_string(),
+            description: "Any description".to_string(),
+            balance_usd: BigDecimal::from(123567i32) / BigDecimal::from(1000i32),
+            enabled: false,
+        },
+    ];
+    assert_eq!(actual.result, expected);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_gui_storage_coins_functionality() {
+    let passphrase = "test_gui_storage passphrase";
+
+    let conf = Mm2TestConf::seednode(passphrase, &json!([]));
+    let mm = block_on(MarketMakerIt::start_async(conf.conf, conf.rpc_password, None)).unwrap();
+    let (_bob_dump_log, _bob_dump_dashboard) = mm.mm_dump();
+    log!("Log path: {}", mm.log_path.display());
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::enable_account",
+        "params": {
+            "policy": "new",
+            "account_id": {
+                "type": "iguana"
+            },
+            "name": "My Iguana wallet",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::enable_account: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::add_account",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            },
+            "description": "Any description",
+            "name": "My HW",
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::add_account: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::activate_coins",
+        "params": {
+            "account_id": {
+                "type": "iguana"
+            },
+            "tickers": ["RICK", "MORTY", "KMD"],
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::activate_coins: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::activate_coins",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            },
+            "tickers": ["KMD", "MORTY", "BCH"],
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::activate_coins: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::deactivate_coins",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            },
+            "tickers": ["BTC", "MORTY"],
+        },
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::deactivate_coins: {}", resp.1);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::get_enabled_account",
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::get_enabled_account: {}", resp.1);
+    let actual: RpcV2Response<gui_storage::AccountWithCoins> = json::from_str(&resp.1).unwrap();
+    let expected = gui_storage::AccountWithCoins {
+        account_id: gui_storage::AccountId::Iguana,
+        name: "My Iguana wallet".to_string(),
+        description: String::new(),
+        balance_usd: BigDecimal::from(0i32),
+        coins: vec!["RICK".to_string(), "MORTY".to_string(), "KMD".to_string()]
+            .into_iter()
+            .collect(),
+    };
+    assert_eq!(actual.result, expected);
+
+    let resp = block_on(mm.rpc(&json!({
+        "userpass": mm.userpass,
+        "mmrpc": "2.0",
+        "method": "gui_storage::get_account_coins",
+        "params": {
+            "account_id": {
+                "type": "hw",
+                "device_pubkey": "1549128bbfb33b997949b4105b6a6371c998e212"
+            }
+        }
+    })))
+    .unwrap();
+    assert!(resp.0.is_success(), "!gui_storage::get_enabled_account: {}", resp.1);
+    let actual: RpcV2Response<gui_storage::AccountCoins> = json::from_str(&resp.1).unwrap();
+    let expected = gui_storage::AccountCoins {
+        account_id: gui_storage::AccountId::HW {
+            device_pubkey: "1549128bbfb33b997949b4105b6a6371c998e212".to_string(),
+        },
+        coins: vec!["KMD".to_string(), "BCH".to_string()].into_iter().collect(),
+    };
+    assert_eq!(actual.result, expected);
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_enable_btc_with_sync_starting_header() {
+    let coins = json!([btc_with_sync_starting_header()]);
+
+    let mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("log path: {}", mm_bob.log_path.display());
+
+    let utxo_bob = block_on(enable_utxo_v2_electrum(&mm_bob, "BTC", btc_electrums(), 80));
+    log!("enable UTXO bob {:?}", utxo_bob);
+
+    block_on(mm_bob.stop()).unwrap();
+}
+
+// This test is ignored because block headers sync and validation can take some time
+#[test]
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_btc_block_header_sync() {
+    let coins = json!([btc_with_spv_conf()]);
+
+    let mm_bob = MarketMakerIt::start(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("log path: {}", mm_bob.log_path.display());
+
+    let utxo_bob = block_on(enable_utxo_v2_electrum(&mm_bob, "BTC", btc_electrums(), 600));
+    log!("enable UTXO bob {:?}", utxo_bob);
+
+    block_on(mm_bob.stop()).unwrap();
+}
+
+// This test is ignored because block headers sync and validation can take some time
+// Todo: this test is failing, need a small fix in calculating btc_testnet_next_block_bits, and to add each block header individually while validating it.
+#[test]
+#[ignore]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_tbtc_block_header_sync() {
+    let coins = json!([tbtc_with_spv_conf()]);
+
+    let mm_bob = MarketMakerIt::start(
+        json!({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": "bob passphrase",
+            "coins": coins,
+            "rpc_password": "pass",
+        }),
+        "pass".into(),
+        None,
+    )
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
+    log!("log path: {}", mm_bob.log_path.display());
+
+    let utxo_bob = block_on(enable_utxo_v2_electrum(&mm_bob, "tBTC-TEST", tbtc_electrums(), 100000));
+    log!("enable UTXO bob {:?}", utxo_bob);
+
+    block_on(mm_bob.stop()).unwrap();
+}
+
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_enable_coins_with_hd_account_id() {
+    const TX_HISTORY: bool = false;
+    const PASSPHRASE: &str = "tank abandon bind salon remove wisdom net size aspect direct source fossil";
+
+    let coins = json!([
+        eth_testnet_conf(),
+        eth_jst_testnet_conf(),
+        rick_conf(),
+        tqrc20_conf(),
+        btc_segwit_conf(),
+    ]);
+
+    let hd_account_id = 0;
+    let conf_0 = Mm2TestConf::seednode_with_hd_account(PASSPHRASE, hd_account_id, &coins);
+    let mm_hd_0 = MarketMakerIt::start(conf_0.conf, conf_0.rpc_password, None).unwrap();
+    let (_dump_log, _dump_dashboard) = mm_hd_0.mm_dump();
+    log!("log path: {}", mm_hd_0.log_path.display());
+
+    let eth = block_on(enable_native(&mm_hd_0, "ETH", &["http://195.201.0.6:8565"]));
+    assert_eq!(eth.address, "0x1737F1FaB40c6Fd3dc729B51C0F97DB3297CCA93");
+    let jst = block_on(enable_native(&mm_hd_0, "JST", &["http://195.201.0.6:8565"]));
+    assert_eq!(jst.address, "0x1737F1FaB40c6Fd3dc729B51C0F97DB3297CCA93");
+    let rick = block_on(enable_electrum(&mm_hd_0, "RICK", TX_HISTORY, RICK_ELECTRUM_ADDRS));
+    assert_eq!(rick.address, "RXNtAyDSsY3DS3VxTpJegzoHU9bUX54j56");
+    let qrc20 = block_on(enable_qrc20(
+        &mm_hd_0,
+        "QRC20",
+        QRC20_ELECTRUMS,
+        "0xd362e096e873eb7907e205fadc6175c6fec7bc44",
+    ));
+    assert_eq!(qrc20["address"].as_str(), Some("qRtCTiPHW9e6zH9NcRhjMVfq7sG37SvgrL"));
+    let btc_segwit = block_on(enable_electrum(&mm_hd_0, "BTC-segwit", TX_HISTORY, RICK_ELECTRUM_ADDRS));
+    assert_eq!(btc_segwit.address, "bc1q6vyur5hjul2m0979aadd6u7ptuj9ac4gt0ha0c");
+
+    let hd_account_id = 1;
+    let conf_1 = Mm2TestConf::seednode_with_hd_account(PASSPHRASE, hd_account_id, &coins);
+    let mm_hd_1 = MarketMakerIt::start(conf_1.conf, conf_1.rpc_password, None).unwrap();
+    let (_dump_log, _dump_dashboard) = mm_hd_1.mm_dump();
+    log!("log path: {}", mm_hd_1.log_path.display());
+
+    let eth = block_on(enable_native(&mm_hd_1, "ETH", &["http://195.201.0.6:8565"]));
+    assert_eq!(eth.address, "0xDe841899aB4A22E23dB21634e54920aDec402397");
+    let jst = block_on(enable_native(&mm_hd_1, "JST", &["http://195.201.0.6:8565"]));
+    assert_eq!(jst.address, "0xDe841899aB4A22E23dB21634e54920aDec402397");
+    let rick = block_on(enable_electrum(&mm_hd_1, "RICK", TX_HISTORY, RICK_ELECTRUM_ADDRS));
+    assert_eq!(rick.address, "RVyndZp3ZrhGKSwHryyM3Kcz9aq2EJrW1z");
+    let qrc20 = block_on(enable_qrc20(
+        &mm_hd_1,
+        "QRC20",
+        QRC20_ELECTRUMS,
+        "0xd362e096e873eb7907e205fadc6175c6fec7bc44",
+    ));
+    assert_eq!(qrc20["address"].as_str(), Some("qY8FNq2ZDUh52BjNvaroFoeHdr3AAhqsxW"));
+    let btc_segwit = block_on(enable_electrum(&mm_hd_1, "BTC-segwit", TX_HISTORY, RICK_ELECTRUM_ADDRS));
+    assert_eq!(btc_segwit.address, "bc1q6kxcwcrsm5z8pe940xxu294q7588mqvarttxcx");
+}
+
+/// `shared_db_id` must be the same for Iguana and all HD accounts derived from the same passphrase.
+#[test]
+#[cfg(not(target_arch = "wasm32"))]
+fn test_get_shared_db_id() {
+    const PASSPHRASE: &str = "tank abandon bind salon remove wisdom net size aspect direct source fossil";
+    const ANOTHER_PASSPHRASE: &str = "chair lyrics public brick beauty wine panther deer employ panther poet drip";
+
+    let coins = json!([rick_conf()]);
+    let confs = vec![
+        Mm2TestConf::seednode(PASSPHRASE, &coins),
+        Mm2TestConf::seednode_with_hd_account(PASSPHRASE, 0, &coins),
+        Mm2TestConf::seednode_with_hd_account(PASSPHRASE, 1, &coins),
+    ];
+
+    let mut shared_db_id = None;
+    for conf in confs {
+        let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+        let actual = block_on(get_shared_db_id(&mm)).shared_db_id;
+        if let Some(expected) = shared_db_id {
+            assert_eq!(
+                actual, expected,
+                "'shared_db_id' must be the same for Iguana and all HD accounts derived from the same passphrase"
+            );
+        }
+        shared_db_id = Some(actual);
+    }
+
+    let another_conf = Mm2TestConf::seednode(ANOTHER_PASSPHRASE, &coins);
+    let mm_another = MarketMakerIt::start(another_conf.conf, another_conf.rpc_password, None).unwrap();
+    let actual = block_on(get_shared_db_id(&mm_another)).shared_db_id;
+    assert_ne!(
+        Some(actual),
+        shared_db_id,
+        "'shared_db_id' must be different for different passphrases"
+    );
+}
+
+#[test]
+fn test_eth_swap_contract_addr_negotiation_same_fallback() {
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let coins = json!([
+       {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+       {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}},
+    ]);
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+
+    let (_bob_dump_log, _bob_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 mut mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_bob,
+        "ETH",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        "0x2b294F029Fde858b2c62184e8390591755521d8E",
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_bob,
+        "JST",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        "0x2b294F029Fde858b2c62184e8390591755521d8E",
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_alice,
+        "ETH",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        ETH_MAINNET_SWAP_CONTRACT,
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_alice,
+        "JST",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        ETH_MAINNET_SWAP_CONTRACT,
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    let uuids = block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("ETH", "JST")],
+        1.,
+        1.,
+        0.001,
+    ));
+
+    // give few seconds for swap statuses to be saved
+    thread::sleep(Duration::from_secs(3));
+
+    let wait_until = get_utc_timestamp() + 30;
+    let expected_contract = Json::from(ETH_DEV_SWAP_CONTRACT.trim_start_matches("0x"));
+
+    block_on(wait_for_swap_contract_negotiation(
+        &mm_bob,
+        &uuids[0],
+        expected_contract.clone(),
+        wait_until,
+    ));
+    block_on(wait_for_swap_contract_negotiation(
+        &mm_alice,
+        &uuids[0],
+        expected_contract,
+        wait_until,
+    ));
+}
+
+#[test]
+fn test_eth_swap_negotiation_fails_maker_no_fallback() {
+    let bob_passphrase = get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+    let alice_passphrase = get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+
+    let coins = json!([
+       {"coin":"ETH","name":"ethereum","protocol":{"type":"ETH"}},
+       {"coin":"JST","name":"jst","protocol":{"type":"ERC20","protocol_data":{"platform":"ETH","contract_address":"0x2b294F029Fde858b2c62184e8390591755521d8E"}}},
+    ]);
+
+    let bob_conf = Mm2TestConf::seednode(&bob_passphrase, &coins);
+    let mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
+
+    let (_bob_dump_log, _bob_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 mut mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
+
+    let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
+    log!("Alice log path: {}", mm_alice.log_path.display());
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_bob,
+        "ETH",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        "0x2b294F029Fde858b2c62184e8390591755521d8E",
+        None,
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_bob,
+        "JST",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        "0x2b294F029Fde858b2c62184e8390591755521d8E",
+        None,
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_alice,
+        "ETH",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        ETH_MAINNET_SWAP_CONTRACT,
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    dbg!(block_on(enable_eth_coin(
+        &mm_alice,
+        "JST",
+        ETH_DEV_NODES,
+        // using arbitrary address
+        ETH_MAINNET_SWAP_CONTRACT,
+        Some(ETH_DEV_SWAP_CONTRACT)
+    )));
+
+    let uuids = block_on(start_swaps(
+        &mut mm_bob,
+        &mut mm_alice,
+        &[("ETH", "JST")],
+        1.,
+        1.,
+        0.001,
+    ));
+
+    // give few seconds for swap statuses to be saved
+    thread::sleep(Duration::from_secs(3));
+
+    let wait_until = get_utc_timestamp() + 30;
+    block_on(wait_for_swap_negotiation_failure(&mm_bob, &uuids[0], wait_until));
+    block_on(wait_for_swap_negotiation_failure(&mm_alice, &uuids[0], wait_until));
+}
diff --git a/mm2src/mm2_main/tests/mm2_tests/mod.rs b/mm2src/mm2_main/tests/mm2_tests/mod.rs
new file mode 100644
index 0000000000..3959e9e94d
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/mod.rs
@@ -0,0 +1,15 @@
+mod bch_and_slp_tests;
+mod best_orders_tests;
+mod eth_tests;
+mod iris_swap;
+mod lightning_tests;
+mod lp_bot_tests;
+mod mm2_tests_inner;
+mod orderbook_sync_tests;
+mod tendermint_ibc_asset_tests;
+mod tendermint_tests;
+mod z_coin_tests;
+
+// dummy test helping IDE to recognize this as test module
+#[test]
+fn dummy() { assert!(true) }
diff --git a/mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs b/mm2src/mm2_main/tests/mm2_tests/orderbook_sync_tests.rs
similarity index 89%
rename from mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs
rename to mm2src/mm2_main/tests/mm2_tests/orderbook_sync_tests.rs
index d2b447eb0c..f45aae813b 100644
--- a/mm2src/mm2_main/src/mm2_tests/orderbook_sync_tests.rs
+++ b/mm2src/mm2_main/tests/mm2_tests/orderbook_sync_tests.rs
@@ -1,7 +1,20 @@
-use super::*;
-use mm2_test_helpers::for_tests::{orderbook_v2, rick_conf, zombie_conf, Mm2TestConf, RICK, ZOMBIE_ELECTRUMS,
-                                  ZOMBIE_LIGHTWALLETD_URLS, ZOMBIE_TICKER};
+use crate::integration_tests_common::{enable_coins_eth_electrum, enable_coins_rick_morty_electrum, enable_electrum,
+                                      enable_electrum_json, enable_z_coin_light};
+use common::{block_on, log};
+use http::StatusCode;
+use mm2_main::mm2::lp_ordermatch::MIN_ORDER_KEEP_ALIVE_INTERVAL;
+use mm2_number::{BigDecimal, BigRational, MmNumber};
+use mm2_test_helpers::electrums::rick_electrums;
+use mm2_test_helpers::for_tests::{get_passphrase, orderbook_v2, rick_conf, zombie_conf, MarketMakerIt, Mm2TestConf,
+                                  RICK, ZOMBIE_ELECTRUMS, ZOMBIE_LIGHTWALLETD_URLS, ZOMBIE_TICKER};
 use mm2_test_helpers::get_passphrase;
+use mm2_test_helpers::structs::{EnableElectrumResponse, GetPublicKeyResult, OrderbookEntryAggregate,
+                                OrderbookResponse, OrderbookV2Response, RpcV2Response, SetPriceResponse};
+use serde_json::{self as json, json, Value as Json};
+use std::env;
+use std::str::FromStr;
+use std::thread;
+use std::time::Duration;
 
 /// https://github.com/artemii235/SuperNET/issues/241
 #[test]
@@ -13,19 +26,19 @@ fn alice_can_see_the_active_order_after_connection() {
 
     // start bob and immediately place the order
     let mm_bob = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -37,7 +50,7 @@ fn alice_can_see_the_active_order_after_connection() {
     );
     // 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",
@@ -49,7 +62,7 @@ fn alice_can_see_the_active_order_after_connection() {
     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! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -65,19 +78,19 @@ fn alice_can_see_the_active_order_after_connection() {
 
     // start eve and immediately place the order
     let mm_eve = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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"),
+        None,
     )
     .unwrap();
     let (_eve_dump_log, _eve_dump_dashboard) = mm_eve.mm_dump();
@@ -89,7 +102,7 @@ fn alice_can_see_the_active_order_after_connection() {
     );
     // issue sell request on Eve side by setting base/rel price
     log!("Issue eve sell request");
-    let rc = block_on(mm_eve.rpc(&json! ({
+    let rc = block_on(mm_eve.rpc(&json!({
         "userpass": mm_eve.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -101,7 +114,7 @@ fn alice_can_see_the_active_order_after_connection() {
     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! ({
+    let rc = block_on(mm_eve.rpc(&json!({
         "userpass": mm_eve.userpass,
         "method": "setprice",
         "base": "MORTY",
@@ -113,7 +126,7 @@ fn alice_can_see_the_active_order_after_connection() {
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     log!("Get RICK/MORTY orderbook on Eve side");
-    let rc = block_on(mm_eve.rpc(&json! ({
+    let rc = block_on(mm_eve.rpc(&json!({
         "userpass": mm_eve.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -138,7 +151,7 @@ fn alice_can_see_the_active_order_after_connection() {
     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! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -161,18 +174,18 @@ fn alice_can_see_the_active_order_after_connection() {
     );
 
     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(),
+            "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"),
+        None,
     )
     .unwrap();
 
@@ -186,7 +199,7 @@ fn alice_can_see_the_active_order_after_connection() {
     );
 
     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",
@@ -228,19 +241,19 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
     ]);
 
     let mut mm_bob = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -293,7 +306,7 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
         ("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! ({
+        let rc = block_on(mm_bob.rpc(&json!({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": base,
@@ -307,7 +320,7 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
         assert!(rc.0.is_success(), "!setprice: {}", rc.1);
     }
 
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "mmrpc": "2.0",
         "method": "get_public_key",
@@ -319,18 +332,18 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
     let bob_pubkey = get_public_key_res.result.public_key;
 
     let mut mm_alice = MarketMakerIt::start(
-        json! ({
+        json!({
             "gui": "nogui",
             "netid": 9998,
-            "myipaddr": env::var ("ALICE_TRADE_IP") .ok(),
-            "rpcip": env::var ("ALICE_TRADE_IP") .ok(),
+            "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"),
+        None,
     )
     .unwrap();
 
@@ -377,7 +390,7 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
 
     // 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! ({
+    let rc = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -397,7 +410,7 @@ fn alice_can_see_the_active_order_after_orderbook_sync_segwit() {
     .unwrap();
 
     // checking 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": "tBTC",
@@ -428,19 +441,19 @@ fn test_orderbook_segwit() {
     ]);
 
     let mut mm_bob = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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"),
+        None,
     )
     .unwrap();
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
@@ -493,7 +506,7 @@ fn test_orderbook_segwit() {
         ("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! ({
+        let rc = block_on(mm_bob.rpc(&json!({
             "userpass": mm_bob.userpass,
             "method": "setprice",
             "base": base,
@@ -508,18 +521,18 @@ fn test_orderbook_segwit() {
     }
 
     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(),
+            "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"),
+        None,
     )
     .unwrap();
 
@@ -532,7 +545,7 @@ fn test_orderbook_segwit() {
     .unwrap();
 
     // checking 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": "tBTC",
@@ -573,7 +586,7 @@ fn test_get_orderbook_with_same_orderbook_ticker() {
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
     log!("Log path: {}", mm.log_path.display());
 
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -586,7 +599,7 @@ fn test_get_orderbook_with_same_orderbook_ticker() {
         rc.1
     );
 
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -625,7 +638,7 @@ fn test_conf_settings_in_orderbook() {
     );
 
     log!("Issue set_price request for RICK/MORTY on Bob side");
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -637,7 +650,7 @@ fn test_conf_settings_in_orderbook() {
     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! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "MORTY",
@@ -670,7 +683,7 @@ fn test_conf_settings_in_orderbook() {
     );
 
     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",
@@ -735,7 +748,7 @@ fn alice_can_see_confs_in_orderbook_after_sync() {
     );
 
     log!("Issue sell request on Bob side");
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -746,7 +759,7 @@ fn alice_can_see_confs_in_orderbook_after_sync() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "mmrpc": "2.0",
         "method": "get_public_key",
@@ -786,7 +799,7 @@ fn alice_can_see_confs_in_orderbook_after_sync() {
 
     // 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! ({
+    let rc = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -806,7 +819,7 @@ fn alice_can_see_confs_in_orderbook_after_sync() {
     .unwrap();
 
     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",
@@ -845,22 +858,19 @@ fn orderbook_extended_data() {
     ]);
 
     let mm = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = &mm.mm_dump();
@@ -901,7 +911,7 @@ fn orderbook_extended_data() {
 
     thread::sleep(Duration::from_secs(1));
     log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -956,22 +966,19 @@ fn orderbook_should_display_base_rel_volumes() {
     ]);
 
     let mm = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = &mm.mm_dump();
@@ -991,7 +998,7 @@ fn orderbook_should_display_base_rel_volumes() {
     let volume = BigRational::new(1.into(), 1.into());
 
     // create order with rational amount and price
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -1005,7 +1012,7 @@ fn orderbook_should_display_base_rel_volumes() {
 
     thread::sleep(Duration::from_secs(1));
     log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -1025,7 +1032,7 @@ fn orderbook_should_display_base_rel_volumes() {
     assert_eq!(&min_volume * &price, orderbook.asks[0].rel_min_volume_rat);
 
     log!("Get MORTY/RICK orderbook");
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "MORTY",
@@ -1058,22 +1065,19 @@ fn orderbook_should_work_without_coins_activation() {
     ]);
 
     let mm_bob = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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,
-        },
+        None,
     )
     .unwrap();
 
@@ -1081,22 +1085,19 @@ fn orderbook_should_work_without_coins_activation() {
     log!("Bob log path: {}", mm_bob.log_path.display());
 
     let mm_alice = MarketMakerIt::start(
-        json! ({
+        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(),
+            "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,
-        },
+        None,
     )
     .unwrap();
 
@@ -1108,7 +1109,7 @@ fn orderbook_should_work_without_coins_activation() {
         block_on(enable_coins_eth_electrum(&mm_bob, &["http://195.201.0.6:8565"]))
     );
 
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -1121,7 +1122,7 @@ fn orderbook_should_work_without_coins_activation() {
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
     log!("Get ETH/JST 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": "ETH",
@@ -1145,22 +1146,19 @@ fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
     ]);
 
     let mm = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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,
-        },
+        None,
     )
     .unwrap();
     let (_dump_log, _dump_dashboard) = mm.mm_dump();
@@ -1177,7 +1175,7 @@ fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
     ]));
 
     // set 2 orders with different prices
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -1189,7 +1187,7 @@ fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
     .unwrap();
     assert!(rc.0.is_success(), "!setprice: {}", rc.1);
 
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "setprice",
         "base": "RICK",
@@ -1204,7 +1202,7 @@ fn test_all_orders_per_pair_per_node_must_be_displayed_in_orderbook() {
     thread::sleep(Duration::from_secs(2));
 
     log!("Get RICK/MORTY orderbook");
-    let rc = block_on(mm.rpc(&json! ({
+    let rc = block_on(mm.rpc(&json!({
         "userpass": mm.userpass,
         "method": "orderbook",
         "base": "RICK",
@@ -1232,22 +1230,19 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     ]);
 
     let mm_bob = MarketMakerIt::start(
-        json! ({
+        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()),
+            "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,
-        },
+        None,
     )
     .unwrap();
 
@@ -1255,22 +1250,19 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     log!("Bob log path: {}", mm_bob.log_path.display());
 
     let mm_alice = MarketMakerIt::start(
-        json! ({
+        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(),
+            "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,
-        },
+        None,
     )
     .unwrap();
 
@@ -1287,7 +1279,7 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     );
 
     // issue orderbook call on Alice side to trigger subscription to a topic
-    block_on(mm_alice.rpc(&json! ({
+    block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "ETH",
@@ -1295,7 +1287,7 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     })))
     .unwrap();
 
-    let rc = block_on(mm_bob.rpc(&json! ({
+    let rc = block_on(mm_bob.rpc(&json!({
         "userpass": mm_bob.userpass,
         "method": "setprice",
         "base": "ETH",
@@ -1309,7 +1301,7 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
 
     thread::sleep(Duration::from_secs(2));
     log!("Get ETH/JST 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": "ETH",
@@ -1327,7 +1319,7 @@ fn setprice_min_volume_should_be_displayed_in_orderbook() {
     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! ({
+    let rc = block_on(mm_alice.rpc(&json!({
         "userpass": mm_alice.userpass,
         "method": "orderbook",
         "base": "ETH",
@@ -1355,13 +1347,13 @@ fn zhtlc_orders_sync_alice_connected_before_creation() {
     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 mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).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 mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
     log!("Alice log path: {}", mm_alice.log_path.display());
@@ -1423,7 +1415,7 @@ fn zhtlc_orders_sync_alice_connected_after_creation() {
     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 mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
 
     let (_dump_log, _dump_dashboard) = mm_bob.mm_dump();
     log!("Bob log path: {}", mm_bob.log_path.display());
@@ -1451,7 +1443,7 @@ fn zhtlc_orders_sync_alice_connected_after_creation() {
     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 mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
 
     let (_alice_dump_log, _alice_dump_dashboard) = mm_alice.mm_dump();
     log!("Alice log path: {}", mm_alice.log_path.display());
diff --git a/mm2src/mm2_main/tests/mm2_tests/tendermint_ibc_asset_tests.rs b/mm2src/mm2_main/tests/mm2_tests/tendermint_ibc_asset_tests.rs
new file mode 100644
index 0000000000..19b5d99a2a
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/tendermint_ibc_asset_tests.rs
@@ -0,0 +1,69 @@
+use common::block_on;
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{enable_tendermint, iris_testnet_conf, my_balance, orderbook, orderbook_v2,
+                                  set_price, usdc_ibc_iris_testnet_conf, MarketMakerIt, Mm2TestConf};
+use mm2_test_helpers::structs::{OrderbookAddress, OrderbookResponse, OrderbookV2Response, RpcV2Response,
+                                TendermintActivationResult};
+use serde_json::{self, json};
+
+const IRIS_TESTNET_RPCS: &[&str] = &["http://34.80.202.172:26657"];
+const IRIS_TICKER: &str = "IRIS-TEST";
+const USDC_IBC_TICKER: &str = "USDC-IBC-IRIS";
+const IRIS_USDC_ACTIVATION_SEED: &str = "iris usdc activation";
+
+#[test]
+fn test_iris_with_usdc_activation_balance_orderbook() {
+    let coins = json!([iris_testnet_conf(), usdc_ibc_iris_testnet_conf()]);
+
+    let conf = Mm2TestConf::seednode(IRIS_USDC_ACTIVATION_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+
+    let activation_result = block_on(enable_tendermint(
+        &mm,
+        IRIS_TICKER,
+        &[USDC_IBC_TICKER],
+        IRIS_TESTNET_RPCS,
+        false,
+    ));
+
+    let response: RpcV2Response<TendermintActivationResult> = serde_json::from_value(activation_result).unwrap();
+
+    let expected_address = "iaa1udqnpvaw3uyv3gsl7m6800wyask5wj7quvd4nm";
+    assert_eq!(response.result.address, expected_address);
+
+    let expected_iris_balance = BigDecimal::from(100);
+    assert_eq!(response.result.balance.spendable, expected_iris_balance);
+
+    let expected_usdc_balance: BigDecimal = "0.683142".parse().unwrap();
+
+    let actual_usdc_balance = response.result.tokens_balances.get(USDC_IBC_TICKER).unwrap();
+    assert_eq!(actual_usdc_balance.spendable, expected_usdc_balance);
+
+    let actual_usdc_balance = block_on(my_balance(&mm, USDC_IBC_TICKER)).balance;
+    assert_eq!(actual_usdc_balance, expected_usdc_balance);
+
+    let set_price_res = block_on(set_price(&mm, USDC_IBC_TICKER, IRIS_TICKER, "1", "0.1", false));
+    println!("{:?}", set_price_res);
+
+    let set_price_res = block_on(set_price(&mm, IRIS_TICKER, USDC_IBC_TICKER, "1", "0.1", false));
+    println!("{:?}", set_price_res);
+
+    let orderbook = block_on(orderbook(&mm, USDC_IBC_TICKER, IRIS_TICKER));
+    let orderbook: OrderbookResponse = serde_json::from_value(orderbook).unwrap();
+
+    let first_ask = orderbook.asks.first().unwrap();
+    assert_eq!(first_ask.address, expected_address);
+
+    let first_bid = orderbook.bids.first().unwrap();
+    assert_eq!(first_bid.address, expected_address);
+
+    let orderbook_v2 = block_on(orderbook_v2(&mm, USDC_IBC_TICKER, IRIS_TICKER));
+    let orderbook_v2: RpcV2Response<OrderbookV2Response> = serde_json::from_value(orderbook_v2).unwrap();
+
+    let expected_address = OrderbookAddress::Transparent(expected_address.into());
+    let first_ask = orderbook_v2.result.asks.first().unwrap();
+    assert_eq!(first_ask.entry.address, expected_address);
+
+    let first_bid = orderbook_v2.result.bids.first().unwrap();
+    assert_eq!(first_bid.entry.address, expected_address);
+}
diff --git a/mm2src/mm2_main/tests/mm2_tests/tendermint_tests.rs b/mm2src/mm2_main/tests/mm2_tests/tendermint_tests.rs
new file mode 100644
index 0000000000..796162de48
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests/tendermint_tests.rs
@@ -0,0 +1,301 @@
+use common::block_on;
+use mm2_number::BigDecimal;
+use mm2_test_helpers::for_tests::{atom_testnet_conf, disable_coin, disable_coin_err, enable_tendermint,
+                                  enable_tendermint_token, get_tendermint_my_tx_history, iris_nimda_testnet_conf,
+                                  iris_testnet_conf, my_balance, send_raw_transaction, withdraw_v1, MarketMakerIt,
+                                  Mm2TestConf};
+use mm2_test_helpers::structs::{RpcV2Response, TendermintActivationResult, TransactionDetails};
+use serde_json::{self as json, json};
+
+const ATOM_TEST_BALANCE_SEED: &str = "atom test seed";
+const ATOM_TEST_WITHDRAW_SEED: &str = "atom test withdraw seed";
+const ATOM_TICKER: &str = "ATOM";
+const ATOM_TENDERMINT_RPC_URLS: &[&str] = &["https://rpc.sentry-02.theta-testnet.polypore.xyz"];
+
+const IRIS_TESTNET_RPC_URLS: &[&str] = &["http://34.80.202.172:26657"];
+
+#[test]
+fn test_tendermint_activation_and_balance() {
+    let coins = json!([atom_testnet_conf()]);
+    let expected_address = "cosmos1svaw0aqc4584x825ju7ua03g5xtxwd0ahl86hz";
+
+    let conf = Mm2TestConf::seednode(ATOM_TEST_BALANCE_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+
+    let activation_result = block_on(enable_tendermint(
+        &mm,
+        ATOM_TICKER,
+        &[],
+        ATOM_TENDERMINT_RPC_URLS,
+        false,
+    ));
+
+    let result: RpcV2Response<TendermintActivationResult> = json::from_value(activation_result).unwrap();
+    assert_eq!(result.result.address, expected_address);
+    let expected_balance: BigDecimal = "0.0959".parse().unwrap();
+    assert_eq!(result.result.balance.spendable, expected_balance);
+
+    let my_balance = block_on(my_balance(&mm, ATOM_TICKER));
+    assert_eq!(my_balance.balance, expected_balance);
+    assert_eq!(my_balance.unspendable_balance, BigDecimal::default());
+    assert_eq!(my_balance.address, expected_address);
+    assert_eq!(my_balance.coin, ATOM_TICKER);
+}
+
+#[test]
+fn test_tendermint_withdraw() {
+    let coins = json!([atom_testnet_conf()]);
+
+    let conf = Mm2TestConf::seednode(ATOM_TEST_WITHDRAW_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+
+    let activation_res = block_on(enable_tendermint(
+        &mm,
+        ATOM_TICKER,
+        &[],
+        ATOM_TENDERMINT_RPC_URLS,
+        false,
+    ));
+    println!("Activation {}", json::to_string(&activation_res).unwrap());
+
+    // just call withdraw without sending to check response correctness
+    let tx_details = block_on(withdraw_v1(
+        &mm,
+        ATOM_TICKER,
+        "cosmos1svaw0aqc4584x825ju7ua03g5xtxwd0ahl86hz",
+        "0.1",
+    ));
+    println!("Withdraw to other {}", json::to_string(&tx_details).unwrap());
+    // TODO how to check it if the fee is dynamic?
+    /*
+    let expected_total: BigDecimal = "0.15".parse().unwrap();
+    assert_eq!(tx_details.total_amount, expected_total);
+    assert_eq!(tx_details.spent_by_me, expected_total);
+    assert_eq!(tx_details.my_balance_change, expected_total * BigDecimal::from(-1));
+    */
+    assert_eq!(tx_details.received_by_me, BigDecimal::default());
+    assert_eq!(tx_details.to, vec![
+        "cosmos1svaw0aqc4584x825ju7ua03g5xtxwd0ahl86hz".to_owned()
+    ]);
+    assert_eq!(tx_details.from, vec![
+        "cosmos1w5h6wud7a8zpa539rc99ehgl9gwkad3wjsjq8v".to_owned()
+    ]);
+
+    // withdraw and send transaction to ourselves
+    let tx_details = block_on(withdraw_v1(
+        &mm,
+        ATOM_TICKER,
+        "cosmos1w5h6wud7a8zpa539rc99ehgl9gwkad3wjsjq8v",
+        "0.1",
+    ));
+    println!("Withdraw to self {}", json::to_string(&tx_details).unwrap());
+
+    // TODO how to check it if the fee is dynamic?
+    /*
+    let expected_total: BigDecimal = "0.15".parse().unwrap();
+    let expected_balance_change: BigDecimal = "-0.05".parse().unwrap();
+    assert_eq!(tx_details.total_amount, expected_total);
+    assert_eq!(tx_details.spent_by_me, expected_total);
+    assert_eq!(tx_details.my_balance_change, expected_balance_change);
+     */
+    let expected_received: BigDecimal = "0.1".parse().unwrap();
+    assert_eq!(tx_details.received_by_me, expected_received);
+
+    assert_eq!(tx_details.to, vec![
+        "cosmos1w5h6wud7a8zpa539rc99ehgl9gwkad3wjsjq8v".to_owned()
+    ]);
+    assert_eq!(tx_details.from, vec![
+        "cosmos1w5h6wud7a8zpa539rc99ehgl9gwkad3wjsjq8v".to_owned()
+    ]);
+
+    let send_raw_tx = block_on(send_raw_transaction(&mm, ATOM_TICKER, &tx_details.tx_hex));
+    println!("Send raw tx {}", json::to_string(&send_raw_tx).unwrap());
+}
+
+#[test]
+fn test_tendermint_token_activation_and_withdraw() {
+    const TEST_SEED: &str = "iris test seed";
+    let coins = json!([iris_testnet_conf(), iris_nimda_testnet_conf()]);
+    let platform_coin = coins[0]["coin"].as_str().unwrap();
+    let token = coins[1]["coin"].as_str().unwrap();
+
+    let conf = Mm2TestConf::seednode(TEST_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+
+    let activation_res = block_on(enable_tendermint(&mm, platform_coin, &[], IRIS_TESTNET_RPC_URLS, false));
+    println!("Activation with assets {}", json::to_string(&activation_res).unwrap());
+
+    let activation_res = block_on(enable_tendermint_token(&mm, token));
+    println!("Token activation {}", json::to_string(&activation_res).unwrap());
+
+    // just call withdraw without sending to check response correctness
+    let tx_details = block_on(withdraw_v1(
+        &mm,
+        token,
+        "iaa1llp0f6qxemgh4g4m5ewk0ew0hxj76avuz8kwd5",
+        "0.1",
+    ));
+
+    println!("Withdraw to other {}", json::to_string(&tx_details).unwrap());
+
+    let expected_total: BigDecimal = "0.1".parse().unwrap();
+    assert_eq!(tx_details.total_amount, expected_total);
+
+    // TODO How to check it if the fee is dynamic?
+    /*
+    let expected_fee: BigDecimal = "0.05".parse().unwrap();
+    let actual_fee: BigDecimal = tx_details.fee_details["amount"].as_str().unwrap().parse().unwrap();
+    assert_eq!(actual_fee, expected_fee);
+    */
+
+    assert_eq!(tx_details.spent_by_me, expected_total);
+    assert_eq!(tx_details.my_balance_change, expected_total * BigDecimal::from(-1));
+    assert_eq!(tx_details.received_by_me, BigDecimal::default());
+    assert_eq!(tx_details.to, vec![
+        "iaa1llp0f6qxemgh4g4m5ewk0ew0hxj76avuz8kwd5".to_owned()
+    ]);
+    assert_eq!(tx_details.from, vec![
+        "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2".to_owned()
+    ]);
+
+    // withdraw and send transaction to ourselves
+    let tx_details = block_on(withdraw_v1(
+        &mm,
+        token,
+        "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2",
+        "0.1",
+    ));
+    println!("Withdraw to self {}", json::to_string(&tx_details).unwrap());
+
+    let expected_total: BigDecimal = "0.1".parse().unwrap();
+    let expected_received: BigDecimal = "0.1".parse().unwrap();
+
+    assert_eq!(tx_details.total_amount, expected_total);
+
+    // TODO How to check it if the fee is dynamic?
+    /*
+    let expected_fee: BigDecimal = "0.05".parse().unwrap();
+    let actual_fee: BigDecimal = tx_details.fee_details["amount"].as_str().unwrap().parse().unwrap();
+    assert_eq!(actual_fee, expected_fee);
+    */
+
+    assert_eq!(tx_details.spent_by_me, expected_total);
+    assert_eq!(tx_details.received_by_me, expected_received);
+    assert_eq!(tx_details.to, vec![
+        "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2".to_owned()
+    ]);
+    assert_eq!(tx_details.from, vec![
+        "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2".to_owned()
+    ]);
+
+    let send_raw_tx = block_on(send_raw_transaction(&mm, token, &tx_details.tx_hex));
+    println!("Send raw tx {}", json::to_string(&send_raw_tx).unwrap());
+}
+
+#[test]
+fn test_tendermint_tx_history() {
+    const TEST_SEED: &str = "Vdo8Xt8pTAetRlMq3kV0LzE393eVYbPSn5Mhtw4p";
+    const TX_FINISHED_LOG: &str = "Tx history fetching finished for IRIS-TEST.";
+    const TX_HISTORY_PAGE_LIMIT: usize = 50;
+    const IRIS_TEST_EXPECTED_TX_COUNT: u64 = 16;
+    const IRIS_NIMDA_EXPECTED_TX_COUNT: u64 = 10;
+
+    let iris_test_constant_history_txs = include_str!("../../../mm2_test_helpers/dummy_files/iris_test_history.json");
+    let iris_test_constant_history_txs: Vec<TransactionDetails> =
+        serde_json::from_str(iris_test_constant_history_txs).unwrap();
+
+    let iris_nimda_constant_history_txs = include_str!("../../../mm2_test_helpers/dummy_files/iris_nimda_history.json");
+    let iris_nimda_constant_history_txs: Vec<TransactionDetails> =
+        serde_json::from_str(iris_nimda_constant_history_txs).unwrap();
+
+    let coins = json!([iris_testnet_conf(), iris_nimda_testnet_conf()]);
+    let platform_coin = coins[0]["coin"].as_str().unwrap();
+    let token = coins[1]["coin"].as_str().unwrap();
+
+    let conf = Mm2TestConf::seednode(TEST_SEED, &coins);
+    let mut mm = block_on(MarketMakerIt::start_async(conf.conf, conf.rpc_password, None)).unwrap();
+
+    block_on(enable_tendermint(
+        &mm,
+        platform_coin,
+        &[token],
+        IRIS_TESTNET_RPC_URLS,
+        true,
+    ));
+
+    if let Err(_) = block_on(mm.wait_for_log(60., |log| log.contains(TX_FINISHED_LOG))) {
+        println!("{}", mm.log_as_utf8().unwrap());
+        assert!(false, "Tx history didn't finish which is not expected");
+    }
+
+    // testing IRIS-TEST history
+    let iris_tx_history_response = block_on(get_tendermint_my_tx_history(
+        &mm,
+        platform_coin,
+        TX_HISTORY_PAGE_LIMIT,
+        1,
+    ));
+    let total_txs = iris_tx_history_response["result"]["total"].as_u64().unwrap();
+    assert_eq!(total_txs, IRIS_TEST_EXPECTED_TX_COUNT);
+
+    let mut iris_txs_from_request = iris_tx_history_response["result"]["transactions"].clone();
+    for i in 0..IRIS_TEST_EXPECTED_TX_COUNT {
+        iris_txs_from_request[i as usize]
+            .as_object_mut()
+            .unwrap()
+            .remove("confirmations");
+    }
+    let iris_txs_from_request: Vec<TransactionDetails> = serde_json::from_value(iris_txs_from_request).unwrap();
+    assert_eq!(iris_test_constant_history_txs, iris_txs_from_request);
+
+    // testing IRIS-NIMDA history
+    let nimda_tx_history_response = block_on(get_tendermint_my_tx_history(&mm, token, TX_HISTORY_PAGE_LIMIT, 1));
+    let total_txs = nimda_tx_history_response["result"]["total"].as_u64().unwrap();
+    assert_eq!(total_txs, IRIS_NIMDA_EXPECTED_TX_COUNT);
+
+    let mut nimda_txs_from_request = nimda_tx_history_response["result"]["transactions"].clone();
+    for i in 0..IRIS_NIMDA_EXPECTED_TX_COUNT {
+        nimda_txs_from_request[i as usize]
+            .as_object_mut()
+            .unwrap()
+            .remove("confirmations");
+    }
+    let nimda_txs_from_request: Vec<TransactionDetails> = serde_json::from_value(nimda_txs_from_request).unwrap();
+
+    assert_eq!(iris_nimda_constant_history_txs, nimda_txs_from_request);
+
+    block_on(mm.stop()).unwrap();
+}
+
+#[test]
+fn test_disable_tendermint_platform_coin_with_token() {
+    const TEST_SEED: &str = "iris test seed";
+    let coins = json!([iris_testnet_conf(), iris_nimda_testnet_conf()]);
+    let platform_coin = coins[0]["coin"].as_str().unwrap();
+    let token = coins[1]["coin"].as_str().unwrap();
+
+    let conf = Mm2TestConf::seednode(TEST_SEED, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+    // Enable platform coin IRIS-TEST
+    let activation_res = block_on(enable_tendermint(
+        &mm,
+        platform_coin,
+        &[],
+        &["http://34.80.202.172:26657"],
+        false,
+    ));
+    assert!(&activation_res.get("result").unwrap().get("address").is_some());
+
+    // Enable platform coin token IRIS-NIMDA
+    let activation_res = block_on(enable_tendermint_token(&mm, token));
+    assert!(&activation_res.get("result").unwrap().get("balances").is_some());
+
+    // Try to disable platform coin, IRIS-TEST. This should fail due to the dependent tokens.
+    let error = block_on(disable_coin_err(&mm, "IRIS-TEST"));
+    assert_eq!(error.dependent_tokens, ["IRIS-NIMDA"]);
+
+    // Try to disable IRIS-NIMDA token first.
+    block_on(disable_coin(&mm, "IRIS-NIMDA"));
+    // Then try to disable IRIS-TEST platform coin.
+    block_on(disable_coin(&mm, "IRIS-TEST"));
+}
diff --git a/mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs b/mm2src/mm2_main/tests/mm2_tests/z_coin_tests.rs
similarity index 89%
rename from mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs
rename to mm2src/mm2_main/tests/mm2_tests/z_coin_tests.rs
index cad12aa317..0c0f149a80 100644
--- a/mm2src/mm2_main/src/mm2_tests/z_coin_tests.rs
+++ b/mm2src/mm2_main/tests/mm2_tests/z_coin_tests.rs
@@ -1,13 +1,23 @@
-use super::*;
-use common::now_ms;
+use crate::integration_tests_common::*;
+use common::executor::Timer;
+use common::{block_on, log, now_ms};
+use mm2_number::BigDecimal;
+use mm2_test_helpers::electrums::rick_electrums;
 use mm2_test_helpers::for_tests::{init_withdraw, pirate_conf, rick_conf, send_raw_transaction, withdraw_status,
-                                  z_coin_tx_history, zombie_conf, Mm2TestConf, ARRR, PIRATE_ELECTRUMS,
+                                  z_coin_tx_history, zombie_conf, MarketMakerIt, Mm2TestConf, ARRR, PIRATE_ELECTRUMS,
                                   PIRATE_LIGHTWALLETD_URLS, RICK, ZOMBIE_ELECTRUMS, ZOMBIE_LIGHTWALLETD_URLS,
                                   ZOMBIE_TICKER};
+use mm2_test_helpers::structs::{EnableCoinBalance, InitTaskResult, RpcV2Response, TransactionDetails, WithdrawStatus,
+                                ZcoinHistoryRes};
+use serde_json::{self as json, json, Value as Json};
 use std::collections::HashSet;
 use std::iter::FromIterator;
 use std::num::NonZeroUsize;
+use std::str::FromStr;
+use std::thread;
+use std::time::Duration;
 
+const ZOMBIE_TEST_BIP39_ACTIVATION_SEED: &str = "course flock lucky cereal hamster novel team never metal bean behind cute cruel matrix symptom fault harsh fashion impact prison glove then tree chef";
 const ZOMBIE_TEST_BALANCE_SEED: &str = "zombie test seed";
 const ARRR_TEST_ACTIVATION_SEED: &str = "arrr test activation seed";
 const ZOMBIE_TEST_HISTORY_SEED: &str = "zombie test history seed";
@@ -28,13 +38,11 @@ async fn withdraw(mm: &MarketMakerIt, coin: &str, to: &str, amount: &str) -> Tra
         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),
-            }
+        match status.result {
+            WithdrawStatus::Ok(result) => break result,
+            WithdrawStatus::Error(e) => panic!("{} withdraw error {:?}", coin, e),
+            _ => Timer::sleep(1.).await,
         }
-        Timer::sleep(1.).await;
     }
 }
 
@@ -45,7 +53,7 @@ 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 mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
 
     let activation_result = block_on(enable_z_coin_light(
         &mm,
@@ -61,6 +69,32 @@ fn activate_z_coin_light() {
     assert_eq!(balance.balance.spendable, BigDecimal::from_str("3.1").unwrap());
 }
 
+#[test]
+#[ignore]
+fn activate_z_coin_with_hd_account() {
+    let coins = json!([zombie_conf()]);
+
+    let hd_account_id = 0;
+    let conf = Mm2TestConf::seednode_with_hd_account(ZOMBIE_TEST_BIP39_ACTIVATION_SEED, hd_account_id, &coins);
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
+
+    let activation_result = block_on(enable_z_coin_light(
+        &mm,
+        ZOMBIE_TICKER,
+        ZOMBIE_ELECTRUMS,
+        ZOMBIE_LIGHTWALLETD_URLS,
+    ));
+
+    let actual = match activation_result.wallet_balance {
+        EnableCoinBalance::Iguana(iguana) => iguana.address,
+        EnableCoinBalance::HD(_) => panic!("Expected 'Iguana' wallet balance, found HD"),
+    };
+    assert_eq!(
+        actual,
+        "zs1p4xfnqmqa4aq5rrnfldafxcggsqhg0wph3elzrzwls9ks95lrg0gtlktjr0t5gg9lj657jyr8m6"
+    );
+}
+
 // ignored because it requires a long-running Zcoin initialization process
 #[test]
 #[ignore]
@@ -68,7 +102,7 @@ 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();
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
 
     block_on(enable_z_coin_light(
         &mm,
@@ -311,7 +345,7 @@ 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 mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
 
     let activation_result = block_on(enable_z_coin_light(
         &mm,
@@ -349,7 +383,7 @@ fn trade_rick_zombie_light() {
     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 mut mm_bob = MarketMakerIt::start(bob_conf.conf, bob_conf.rpc_password, None).unwrap();
 
     let (_bob_dump_log, _bob_dump_dashboard) = mm_bob.mm_dump();
     log!("Bob log path: {}", mm_bob.log_path.display());
@@ -379,7 +413,7 @@ fn trade_rick_zombie_light() {
     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();
+    let mut mm_alice = MarketMakerIt::start(alice_conf.conf, alice_conf.rpc_password, None).unwrap();
 
     thread::sleep(Duration::from_secs(1));
 
@@ -440,7 +474,7 @@ fn activate_pirate_light() {
     let coins = json!([pirate_conf()]);
 
     let conf = Mm2TestConf::seednode(ARRR_TEST_ACTIVATION_SEED, &coins);
-    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, conf.local).unwrap();
+    let mm = MarketMakerIt::start(conf.conf, conf.rpc_password, None).unwrap();
 
     let activation_result = block_on(enable_z_coin_light(
         &mm,
diff --git a/mm2src/mm2_main/tests/mm2_tests_main.rs b/mm2src/mm2_main/tests/mm2_tests_main.rs
new file mode 100644
index 0000000000..83fdf13071
--- /dev/null
+++ b/mm2src/mm2_main/tests/mm2_tests_main.rs
@@ -0,0 +1,4 @@
+#![cfg(not(target_arch = "wasm32"))]
+
+mod integration_tests_common;
+mod mm2_tests;
diff --git a/mm2src/mm2_metamask/Cargo.toml b/mm2src/mm2_metamask/Cargo.toml
new file mode 100644
index 0000000000..e856efe0d4
--- /dev/null
+++ b/mm2src/mm2_metamask/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "mm2_metamask"
+version = "0.1.0"
+edition = "2021"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+async-trait = "0.1"
+common = { path = "../common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures" }
+itertools = "0.10"
+js-sys = { version = "0.3.27" }
+jsonrpc-core = "18.0.0" # Same version as `web3` depends on.
+lazy_static = "1.4"
+mm2_err_handle = { path = "../mm2_err_handle" }
+mm2_eth = { path = "../mm2_eth" }
+parking_lot = { version = "0.12.0", features = ["nightly"] }
+serde = "1.0"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+serde_derive = "1.0"
+wasm-bindgen = { version = "0.2.50", features = ["nightly"] }
+wasm-bindgen-futures = { version = "0.4.1" }
+web3 = { git = "https://github.com/KomodoPlatform/rust-web3", tag = "v0.19.0", default-features = false, features = ["eip-1193"] }
diff --git a/mm2src/mm2_metamask/src/eip_1193_provider.rs b/mm2src/mm2_metamask/src/eip_1193_provider.rs
new file mode 100644
index 0000000000..2ccba26641
--- /dev/null
+++ b/mm2src/mm2_metamask/src/eip_1193_provider.rs
@@ -0,0 +1,107 @@
+use common::executor::{spawn_local_abortable, AbortOnDropHandle};
+use common::log::error;
+use futures::channel::{mpsc, oneshot};
+use futures::future::BoxFuture;
+use futures::StreamExt;
+use jsonrpc_core::Call;
+use serde::de::DeserializeOwned;
+use serde_json::Value as Json;
+use std::fmt;
+use std::sync::Arc;
+use web3::helpers::build_request;
+use web3::transports::eip_1193::{Eip1193, Provider as RawProvider};
+use web3::{Error, RequestId, Result, Transport};
+
+type EipCommandSender = mpsc::UnboundedSender<EipCommand>;
+type EipCommandReceiver = mpsc::UnboundedReceiver<EipCommand>;
+type EipCommandResultSender<T> = oneshot::Sender<Result<T>>;
+
+/// A wrapper over `Eip1193` transport, allowing it to be used cross-thread.
+#[derive(Clone)]
+pub struct Eip1193Provider {
+    command_tx: EipCommandSender,
+    /// This abort handle is needed to drop the spawned at [`WebUsbWrapper::new`] future immediately.
+    _abort_handle: Arc<AbortOnDropHandle>,
+}
+
+impl Eip1193Provider {
+    pub fn detect() -> Option<Eip1193Provider> {
+        let raw_provider = RawProvider::default().ok()?.map(Eip1193::new)?;
+        let (command_tx, command_rx) = mpsc::unbounded();
+        let abort_handle = spawn_local_abortable(Self::command_loop(raw_provider, command_rx));
+
+        Some(Eip1193Provider {
+            command_tx,
+            _abort_handle: Arc::new(abort_handle),
+        })
+    }
+
+    pub async fn invoke_method<T>(&self, id: RequestId, request: Call) -> Result<T>
+    where
+        T: DeserializeOwned,
+    {
+        let (result_tx, result_rx) = oneshot::channel();
+        let command = EipCommand::InvokeMethod { id, request, result_tx };
+        let result = send_command_recv_response(&self.command_tx, command, result_rx).await?;
+        serde_json::from_value(result).map_err(|e| Error::InvalidResponse(e.to_string()))
+    }
+
+    async fn command_loop(transport: Eip1193, mut command_rx: EipCommandReceiver) {
+        while let Some(command) = command_rx.next().await {
+            match command {
+                EipCommand::InvokeMethod { id, request, result_tx } => {
+                    let res = transport.send(id, request).await;
+                    result_tx.send(res).ok();
+                },
+            }
+        }
+    }
+}
+
+impl Transport for Eip1193Provider {
+    type Out = BoxFuture<'static, Result<Json>>;
+
+    fn prepare(&self, method: &str, params: Vec<Json>) -> (RequestId, Call) {
+        // RequestId doesn't make sense for `MetamaskProvider`.
+        const REQUEST_ID: RequestId = 0;
+
+        let request = build_request(REQUEST_ID, method, params);
+        (REQUEST_ID, request)
+    }
+
+    fn send(&self, id: RequestId, request: Call) -> Self::Out {
+        let this = self.clone();
+        let fut = async move { this.invoke_method(id, request).await };
+        Box::pin(fut)
+    }
+}
+
+impl fmt::Debug for Eip1193Provider {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "Eip1193Provider") }
+}
+
+async fn send_command_recv_response<Ok>(
+    command_tx: &EipCommandSender,
+    command: EipCommand,
+    result_rx: oneshot::Receiver<Result<Ok>>,
+) -> Result<Ok> {
+    if let Err(e) = command_tx.unbounded_send(command) {
+        error!("Error sending an EIP1193 command: {}", e);
+        return Err(Error::Internal);
+    }
+    match result_rx.await {
+        Ok(result) => result,
+        Err(e) => {
+            error!("Error receiving a an EIP1193 result: {}", e);
+            Err(Error::Internal)
+        },
+    }
+}
+
+enum EipCommand {
+    InvokeMethod {
+        id: RequestId,
+        request: Call,
+        result_tx: EipCommandResultSender<Json>,
+    },
+}
diff --git a/mm2src/mm2_metamask/src/lib.rs b/mm2src/mm2_metamask/src/lib.rs
new file mode 100644
index 0000000000..db083fd60c
--- /dev/null
+++ b/mm2src/mm2_metamask/src/lib.rs
@@ -0,0 +1,14 @@
+#[cfg(target_arch = "wasm32")] mod eip_1193_provider;
+#[cfg(target_arch = "wasm32")] mod metamask;
+#[cfg(target_arch = "wasm32")] mod metamask_error;
+
+#[cfg(target_arch = "wasm32")]
+pub use eip_1193_provider::Eip1193Provider;
+#[cfg(target_arch = "wasm32")]
+pub use metamask::{detect_metamask_provider, MetamaskSession};
+#[cfg(target_arch = "wasm32")]
+pub use metamask_error::{from_metamask_error, MetamaskError, MetamaskResult, MetamaskRpcError, WithMetamaskRpcError};
+#[cfg(target_arch = "wasm32")]
+pub use mm2_eth::eip712::{Eip712, ObjectType, PropertyType};
+#[cfg(target_arch = "wasm32")]
+pub use mm2_eth::eip712_encode::hash_typed_data;
diff --git a/mm2src/mm2_metamask/src/metamask.rs b/mm2src/mm2_metamask/src/metamask.rs
new file mode 100644
index 0000000000..9fd135eee5
--- /dev/null
+++ b/mm2src/mm2_metamask/src/metamask.rs
@@ -0,0 +1,83 @@
+use crate::eip_1193_provider::Eip1193Provider;
+use crate::metamask_error::{MetamaskError, MetamaskResult};
+use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
+use itertools::Itertools;
+use lazy_static::lazy_static;
+use mm2_err_handle::prelude::*;
+use mm2_eth::{eip712::Eip712, eip712_encode::hash_typed_data};
+use serde::Serialize;
+use serde_json::{json, Value as Json};
+use web3::helpers::CallFuture;
+use web3::types::H256;
+use web3::Transport;
+
+lazy_static! {
+    /// This mutex is used to limit the number of concurrent requests to one.
+    /// It's required to avoid switching ETH chain ID during the request.
+    static ref METAMASK_MUTEX: AsyncMutex<()> = AsyncMutex::new(());
+}
+
+pub fn detect_metamask_provider() -> MetamaskResult<Eip1193Provider> {
+    Eip1193Provider::detect().or_mm_err(|| MetamaskError::EthProviderNotFound)
+}
+
+/// `MetamaskSession` is designed the way that there can be only one active session at the moment.
+pub struct MetamaskSession<'a> {
+    transport: &'a Eip1193Provider,
+    _guard: AsyncMutexGuard<'a, ()>,
+}
+
+impl<'a> MetamaskSession<'a> {
+    /// Locks the global `METAMASK_MUTEX` to prevent simultaneous requests.
+    pub async fn lock(transport: &'a Eip1193Provider) -> MetamaskSession<'a> {
+        MetamaskSession {
+            transport,
+            _guard: METAMASK_MUTEX.lock().await,
+        }
+    }
+
+    /// Invokes the `eth_requestAccounts` method. We expect only one active account.
+    /// https://docs.metamask.io/guide/rpc-api.html#eth-requestaccounts
+    pub async fn eth_request_account(&self) -> MetamaskResult<String> {
+        let accounts: Vec<String> = CallFuture::new(self.transport.execute("eth_requestAccounts", vec![])).await?;
+        accounts
+            .into_iter()
+            .exactly_one()
+            .map_to_mm(|_| MetamaskError::ExpectedOneEthAccount)
+    }
+
+    /// Invokes the `wallet_switchEthereumChain` method.
+    /// https://docs.metamask.io/guide/rpc-api.html#wallet-switchethereumchain
+    pub async fn wallet_switch_ethereum_chain(&self, chain_id: u64) -> Result<(), web3::Error> {
+        let req = json!({
+            "chainId": format!("0x{chain_id:x}"),
+        });
+
+        CallFuture::new(self.transport.execute("wallet_switchEthereumChain", vec![req])).await
+    }
+
+    /// * user_address - Must match user's active address.
+    /// Returns a hash of the `Eip712` request and the signature.
+    pub async fn sign_typed_data_v4<Domain, SignData>(
+        &self,
+        user_address: String,
+        req: Eip712<Domain, SignData>,
+    ) -> MetamaskResult<(H256, String)>
+    where
+        Domain: Serialize,
+        SignData: Serialize,
+    {
+        let user_address = Json::String(user_address);
+        let req_str =
+            serde_json::to_string(&req).map_to_mm(|e| MetamaskError::ErrorSerializingArguments(e.to_string()))?;
+        let hash = hash_typed_data(req)?;
+
+        let signature = CallFuture::new(
+            self.transport
+                .execute("eth_signTypedData_v4", vec![user_address, Json::String(req_str)]),
+        )
+        .await?;
+
+        Ok((hash, signature))
+    }
+}
diff --git a/mm2src/mm2_metamask/src/metamask_error.rs b/mm2src/mm2_metamask/src/metamask_error.rs
new file mode 100644
index 0000000000..29e3201b9a
--- /dev/null
+++ b/mm2src/mm2_metamask/src/metamask_error.rs
@@ -0,0 +1,85 @@
+use derive_more::Display;
+use jsonrpc_core::{Error as RPCError, ErrorCode as RpcErrorCode};
+use mm2_err_handle::prelude::*;
+use serde_derive::Serialize;
+use web3::Error as Web3Error;
+
+const USER_CANCELLED_ERROR_CODE: RpcErrorCode = RpcErrorCode::ServerError(4001);
+
+pub type MetamaskResult<T> = MmResult<T, MetamaskError>;
+
+#[derive(Debug, Display)]
+pub enum MetamaskError {
+    #[display(fmt = "ETH provider not found")]
+    EthProviderNotFound,
+    #[display(fmt = "Expected one ETH selected account")]
+    ExpectedOneEthAccount,
+    #[display(fmt = "Unexpected account selected")]
+    UnexpectedAccountSelected,
+    #[display(fmt = "Error serializing RPC arguments: {}", _0)]
+    ErrorSerializingArguments(String),
+    #[display(fmt = "Error deserializing RPC result: {}", _0)]
+    ErrorDeserializingMethodResult(String),
+    #[display(fmt = "User cancelled request")]
+    UserCancelled,
+    #[display(fmt = "RPC error: {:?}", _0)]
+    Rpc(RPCError),
+    #[display(fmt = "Transport error: {:?}", _0)]
+    Transport(String),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<Web3Error> for MetamaskError {
+    fn from(e: Web3Error) -> Self {
+        match e {
+            Web3Error::Decoder(de) | Web3Error::InvalidResponse(de) => {
+                MetamaskError::ErrorDeserializingMethodResult(de)
+            },
+            Web3Error::Transport(tr) => MetamaskError::Transport(tr.to_string()),
+            Web3Error::Rpc(rpc) => {
+                if rpc.code == USER_CANCELLED_ERROR_CODE {
+                    MetamaskError::UserCancelled
+                } else {
+                    MetamaskError::Rpc(rpc)
+                }
+            },
+            Web3Error::Io(io) => MetamaskError::Transport(io.to_string()),
+            other => MetamaskError::Internal(other.to_string()),
+        }
+    }
+}
+
+/// This error enumeration is involved to be used as a part of another RPC error.
+/// This enum consists of error types that cli/GUI must handle correctly,
+/// so please extend it if it's required **only**.
+///
+/// Please also note that this enum is fieldless.
+#[derive(Clone, Debug, Display, Serialize, PartialEq)]
+pub enum MetamaskRpcError {
+    EthProviderNotFound,
+    #[display(fmt = "User cancelled request")]
+    UserCancelled,
+    #[display(fmt = "An unexpected ETH account selected. Please select previous account or re-initialize MetaMask")]
+    UnexpectedAccountSelected,
+    #[display(fmt = "Metamask context is not initialized. Consider activating it via 'task::connect_metamask::init'")]
+    MetamaskCtxNotInitialized,
+}
+
+pub trait WithMetamaskRpcError {
+    fn metamask_rpc_error(metamask_rpc_error: MetamaskRpcError) -> Self;
+}
+
+/// Unfortunately, it's not possible to implementing `From<MetamaskError>` for every type
+/// that implements `WithMetamaskRpcError`, `WithTimeout` and `WithInternal`.
+/// So this function should be called from the `From<MetamaskError>` implementation.
+pub fn from_metamask_error<T>(metamask_error: MetamaskError) -> T
+where
+    T: WithMetamaskRpcError + WithInternal,
+{
+    match metamask_error {
+        MetamaskError::EthProviderNotFound => T::metamask_rpc_error(MetamaskRpcError::EthProviderNotFound),
+        MetamaskError::UnexpectedAccountSelected => T::metamask_rpc_error(MetamaskRpcError::UnexpectedAccountSelected),
+        other => T::internal(other.to_string()),
+    }
+}
diff --git a/mm2src/mm2_metrics/Cargo.toml b/mm2src/mm2_metrics/Cargo.toml
new file mode 100644
index 0000000000..126af56ed5
--- /dev/null
+++ b/mm2src/mm2_metrics/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "mm2_metrics"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+doctest = false
+
+[dependencies]
+base64 = "0.10.0"
+common = { path = "../common" }
+derive_more = "0.99"
+futures = { version = "0.3", package = "futures", features = ["compat", "async-await", "thread-pool"] }
+itertools = "0.10"
+metrics = { version = "0.19" }
+metrics-util = { version = "0.13" }
+mm2_err_handle = { path = "../mm2_err_handle" }
+serde = "1"
+serde_derive = "1"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
+wasm-timer = "0.2.4"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+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.23", default-features = false, features = ["http1", "http2", "webpki-tokio"] }
+metrics-exporter-prometheus = "0.10.0"
diff --git a/mm2src/mm2_metrics/src/lib.rs b/mm2src/mm2_metrics/src/lib.rs
new file mode 100644
index 0000000000..84aad52799
--- /dev/null
+++ b/mm2src/mm2_metrics/src/lib.rs
@@ -0,0 +1,130 @@
+#[macro_use] extern crate common;
+#[macro_use] extern crate serde_derive;
+
+#[macro_use]
+pub mod mm_metrics;
+pub mod recorder;
+pub use metrics;
+#[cfg(not(target_arch = "wasm32"))]
+pub use mm_metrics::prometheus;
+
+use common::{executor::SpawnFuture, log::LogWeak};
+use derive_more::Display;
+use mm2_err_handle::prelude::MmError;
+use mm_metrics::Metrics;
+use recorder::{MmRecorder, TryRecorder};
+use serde_json::Value as Json;
+use std::collections::HashMap;
+use std::sync::{Arc, Weak};
+
+pub type MmMetricsResult<T> = Result<T, MmError<MmMetricsError>>;
+
+#[derive(Debug, Display)]
+pub enum MmMetricsError {
+    #[display(fmt = "Internal: {}", _0)]
+    Internal(String),
+    #[display(fmt = "Warning Prometheus: metrics system unavailable")]
+    MetricsSystemUnavailable,
+    #[display(fmt = "Warning Prometheus: authorization required")]
+    PrometheusAuthorizationRequired,
+    #[display(fmt = "Warning Prometheus: invalid credentials: {}", _0)]
+    PrometheusInvalidCredentials(String),
+    #[display(fmt = "Prometheus Server Error: {}", _0)]
+    PrometheusServerError(String),
+    #[display(fmt = "Warning Prometheus: unexpected URI {}", _0)]
+    UnexpectedUri(String),
+}
+
+pub trait MetricsOps {
+    /// Initializes mm2 Metrics.
+    fn init(&self)
+    where
+        Self: Sized;
+
+    /// Initializes mm2 Metrics with dashboard.
+    fn init_with_dashboard<S>(&self, spawner: &S, log_state: LogWeak, interval: f64) -> MmMetricsResult<()>
+    where
+        S: SpawnFuture;
+
+    /// Collect the metrics in a Json data format.
+    fn collect_json(&self) -> MmMetricsResult<Json>;
+}
+
+#[derive(Clone)]
+pub struct MetricsArc(pub(crate) Arc<Metrics>);
+
+impl Default for MetricsArc {
+    fn default() -> Self { Self(Arc::new(Metrics::default())) }
+}
+
+impl MetricsArc {
+    // Create new instance of our metrics recorder set to default.
+    pub fn new() -> Self { Self(Default::default()) }
+
+    /// Try to obtain the `Metrics` from the weak pointer.
+    pub fn from_weak(weak: &MetricsWeak) -> Option<MetricsArc> { weak.0.upgrade().map(MetricsArc) }
+
+    /// Create a weak pointer from `MetricsWeak`.
+    pub fn weak(&self) -> MetricsWeak { MetricsWeak(Arc::downgrade(&self.0)) }
+}
+
+impl TryRecorder for MetricsArc {
+    fn try_recorder(&self) -> Option<Arc<MmRecorder>> { Some(Arc::clone(&self.0.recorder)) }
+}
+
+impl MetricsOps for MetricsArc {
+    fn init(&self) { self.0.init(); }
+
+    fn init_with_dashboard<S>(&self, spawner: &S, log_state: LogWeak, interval: f64) -> MmMetricsResult<()>
+    where
+        S: SpawnFuture,
+    {
+        self.0.init_with_dashboard(spawner, log_state, interval)
+    }
+
+    fn collect_json(&self) -> MmMetricsResult<crate::Json> { self.0.collect_json() }
+}
+
+#[derive(Clone, Default)]
+pub struct MetricsWeak(pub Weak<Metrics>);
+
+impl MetricsWeak {
+    /// Create a default MmWeak without allocating any memory.
+    pub fn new() -> MetricsWeak { MetricsWeak::default() }
+
+    pub fn dropped(&self) -> bool { self.0.strong_count() == 0 }
+}
+
+impl TryRecorder for MetricsWeak {
+    fn try_recorder(&self) -> Option<Arc<MmRecorder>> {
+        let metrics = MetricsArc::from_weak(self)?;
+        metrics.try_recorder()
+    }
+}
+
+#[derive(Serialize, Debug, Default, Deserialize)]
+pub struct MetricsJson {
+    pub metrics: Vec<MetricType>,
+}
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "lowercase")]
+#[serde(tag = "type")]
+pub enum MetricType {
+    Counter {
+        key: String,
+        labels: HashMap<String, String>,
+        value: u64,
+    },
+    Gauge {
+        key: String,
+        labels: HashMap<String, String>,
+        value: f64,
+    },
+    Histogram {
+        key: String,
+        labels: HashMap<String, String>,
+        #[serde(flatten)]
+        quantiles: HashMap<String, f64>,
+    },
+}
diff --git a/mm2src/mm2_metrics/src/mm_metrics.rs b/mm2src/mm2_metrics/src/mm_metrics.rs
new file mode 100644
index 0000000000..ad3c5749b0
--- /dev/null
+++ b/mm2src/mm2_metrics/src/mm_metrics.rs
@@ -0,0 +1,564 @@
+use common::executor::Timer;
+#[cfg(not(target_arch = "wasm32"))] use common::log::error;
+use common::log::{LogArc, LogWeak};
+use itertools::Itertools;
+use metrics::{Key, Label};
+use mm2_err_handle::prelude::*;
+use serde_json::Value;
+use std::sync::{atomic::Ordering, Arc};
+use std::{collections::HashMap, slice::Iter};
+
+use crate::{common::log::Tag, MetricsOps, MmMetricsError, MmMetricsResult, MmRecorder, SpawnFuture};
+
+type MetricLabels = Vec<Label>;
+type MetricNameValueMap = HashMap<String, PreparedMetric>;
+
+/// Construct Vec<Label> from a slice of strings.
+#[macro_export]
+macro_rules! mm_label {
+    ($($label_key:expr => $label_val:expr),+) => {{
+         vec![$(($label_key.to_owned(), $label_val.to_owned())),+]
+    }};
+}
+
+/// Increment counter if an MmArc is not dropped yet and metrics system is initialized already.
+#[macro_export]
+macro_rules! mm_counter {
+    ($metrics:expr, $name:expr, $value:expr) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics) {
+            let key = $crate::metrics::Key::from_static_name($name);
+            let counter = recorder.register_counter(&key);
+            counter.increment($value);
+        };
+    }};
+
+    // Register and increment counter with label.
+    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics) {
+            let key = $crate::metrics::Key::from_parts($name, mm_label!($($label_key => $label_val),+).as_slice());
+            let counter = recorder.register_counter(&key);
+            counter.increment($value);
+        };
+    }};
+}
+
+/// Update gauge if an MmArc is not dropped yet and metrics system is initialized already.
+#[macro_export]
+macro_rules! mm_gauge {
+    ($metrics:expr, $name:expr, $value:expr) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics){
+            let key = $crate::metrics::Key::from_static_name($name);
+            let gauge = recorder.register_gauge(&key);
+            gauge.set($value);
+        }
+    }};
+
+    // Register and set gauge with label.
+    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics){
+            let key = $crate::metrics::Key::from_parts($name, mm_label!($($label_key => $label_val),+).as_slice());
+            let gauge = recorder.register_gauge(&key);
+            gauge.set($value);
+        }
+    }};
+}
+
+/// Update gauge if an MmArc is not dropped yet and metrics system is initialized already.
+#[macro_export]
+macro_rules! mm_timing {
+    ($metrics:expr, $name:expr, $value:expr) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics){
+            let key =$crate::metrics::Key::from_static_name($name);
+            let histo = recorder.register_histogram(&key);
+            histo.record($value);
+        }
+    }};
+
+    // Register and record histogram with label.
+    ($metrics:expr, $name:expr, $value:expr, $($label_key:expr => $label_val:expr),+) => {{
+        use $crate::metrics::Recorder;
+        if let Some(recorder) = $crate::recorder::TryRecorder::try_recorder(&$metrics){
+            let key = $crate::metrics::Key::from_parts($name, mm_label!($($label_key => $label_val),+).as_slice());
+            let histo = recorder.register_histogram(&key);
+            histo.record($value);
+        }
+    }};
+}
+
+/// Market Maker Metrics, used as inner to get metrics data and exporting.
+#[derive(Default, Clone)]
+pub struct Metrics {
+    pub(crate) recorder: Arc<MmRecorder>,
+}
+
+impl Metrics {
+    /// Collect the metrics in Prometheus format.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn collect_prometheus_format(&self) -> String { self.recorder.render_prometheus() }
+}
+
+impl MetricsOps for Metrics {
+    fn init(&self) { Metrics::default(); }
+
+    fn init_with_dashboard<S>(&self, spawner: &S, log_state: LogWeak, interval: f64) -> MmMetricsResult<()>
+    where
+        S: SpawnFuture,
+    {
+        let recorder = self.recorder.clone();
+        let runner = TagObserver::log_tag_metrics(log_state, recorder, interval);
+        spawner.spawn(runner);
+        Ok(())
+    }
+
+    /// Collect prepared metrics json from the recorder.
+    fn collect_json(&self) -> MmMetricsResult<Value> {
+        serde_json::to_value(self.recorder.prepare_json()).map_to_mm(|err| MmMetricsError::Internal(err.to_string()))
+    }
+}
+
+#[derive(Debug)]
+pub struct TagMetric {
+    pub tags: Vec<Tag>,
+    pub message: String,
+}
+
+#[derive(PartialEq, PartialOrd)]
+pub(crate) enum PreparedMetric {
+    Unsigned(u64),
+    Float(f64),
+    Histogram(MmHistogram),
+}
+
+pub struct TagObserver;
+
+impl TagObserver {
+    /// This is for collecting and logging `prepare_tag_metrics` to dashboard.
+    ///
+    /// Used with `init_with_dashboard`.
+    pub async fn log_tag_metrics(log_state: LogWeak, recorder: Arc<MmRecorder>, interval: f64) {
+        loop {
+            Timer::sleep(interval).await;
+            let log_state = match LogArc::from_weak(&log_state) {
+                Some(log_arc) => log_arc,
+                _ => return,
+            };
+
+            log!(">>>>>>>>>> DEX metrics <<<<<<<<<");
+
+            Self::prepare_tag_metrics(&recorder)
+                .into_iter()
+                .for_each(|(labels, name_value_map)| {
+                    let tags = labels_to_tags(labels.iter());
+                    let message = name_value_map_to_message(&name_value_map);
+                    log_state.log_deref_tags("", tags, &message);
+                });
+        }
+    }
+
+    /// Prepare tag metrics for logging in `log_tag_metrics`.
+    fn prepare_tag_metrics(recorder: &MmRecorder) -> HashMap<MetricLabels, MetricNameValueMap> {
+        let mut output = HashMap::new();
+
+        for (key, counter) in recorder.registry.get_counter_handles() {
+            let value = counter.get_inner().load(Ordering::Acquire);
+            map_metrics_to_prepare_tag_metric_output(key, PreparedMetric::Unsigned(value), &mut output);
+        }
+
+        for (key, gauge) in recorder.registry.get_gauge_handles() {
+            let value = f64::from_bits(gauge.get_inner().load(Ordering::Acquire));
+            map_metrics_to_prepare_tag_metric_output(key, PreparedMetric::Float(value), &mut output);
+        }
+
+        for (key, histo) in recorder.registry.get_histogram_handles() {
+            if let Some(values) = MmHistogram::new(&histo.get_inner().data()) {
+                map_metrics_to_prepare_tag_metric_output(key, PreparedMetric::Histogram(values), &mut output);
+            }
+        }
+        output
+    }
+}
+
+/// Used for parsing metrics to `prepare_tag_metric_output`
+fn map_metrics_to_prepare_tag_metric_output(
+    key: Key,
+    value: PreparedMetric,
+    output: &mut HashMap<MetricLabels, MetricNameValueMap>,
+) {
+    let (metric_name, labels) = key.into_parts();
+    output
+        .entry(labels)
+        .or_insert_with(MetricNameValueMap::new)
+        .insert(metric_name.as_str().to_string(), value);
+}
+
+pub(crate) fn labels_to_tags(labels: Iter<Label>) -> Vec<Tag> {
+    labels
+        .map(|label| Tag {
+            key: label.key().to_string(),
+            val: Some(label.value().to_string()),
+        })
+        .collect()
+}
+
+/// Used for parsing `MetricNameValueMap` into Message(loggable string).
+pub(crate) fn name_value_map_to_message(name_value_map: &MetricNameValueMap) -> String {
+    name_value_map
+        .iter()
+        .sorted_by(|x, y| x.partial_cmp(y).unwrap_or(std::cmp::Ordering::Equal))
+        .map(|(key, value)| match value {
+            PreparedMetric::Unsigned(v) => format!("{}={:?}", key, v),
+            PreparedMetric::Float(v) => format!("{}={:?}", key, v),
+            PreparedMetric::Histogram(v) => format!("{}={:?}", key, v.to_tag_message()),
+        })
+        .join(" ")
+}
+
+#[derive(PartialEq, PartialOrd)]
+pub(crate) struct MmHistogram {
+    count: usize,
+    min: f64,
+    max: f64,
+}
+
+impl MmHistogram {
+    /// Create new MmHistogram from `&[f64]`.
+    ///
+    /// Return None if data.len() <= 0.
+    pub(crate) fn new(data: &[f64]) -> Option<MmHistogram> {
+        let (min, max) = data.iter().minmax().into_option()?;
+        Some(MmHistogram {
+            count: data.len(),
+            min: *min,
+            max: *max,
+        })
+    }
+
+    /// Create new MmHistogram from `&[f64]`.
+    pub(crate) fn to_tag_message(&self) -> String { format!("count={} min={} max={}", self.count, self.min, self.max) }
+
+    /// Create new MmHistogram from `&[f64]`.
+    pub(crate) fn to_json_quantiles(&self) -> HashMap<String, f64> {
+        let mut result = HashMap::new();
+        result.insert("count".to_owned(), self.count as f64);
+        result.insert("min".to_owned(), self.min);
+        result.insert("max".to_owned(), self.max);
+
+        result
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub mod prometheus {
+    use crate::{MetricsArc, MetricsWeak};
+
+    use super::*;
+    use futures::future::{Future, FutureExt};
+    use hyper::http::{self, header, Request, Response, StatusCode};
+    use hyper::service::{make_service_fn, service_fn};
+    use hyper::{Body, Server};
+    use mm2_err_handle::prelude::MmError;
+    use std::convert::Infallible;
+    use std::net::SocketAddr;
+
+    #[derive(Clone)]
+    pub struct PrometheusCredentials {
+        pub userpass: String,
+    }
+
+    pub fn spawn_prometheus_exporter(
+        metrics: MetricsWeak,
+        address: SocketAddr,
+        shutdown_detector: impl Future<Output = ()> + 'static + Send,
+        credentials: Option<PrometheusCredentials>,
+    ) -> Result<(), MmMetricsError> {
+        let make_svc = make_service_fn(move |_conn| {
+            let metrics = metrics.clone();
+            let credentials = credentials.clone();
+            futures::future::ready(Ok::<_, Infallible>(service_fn(move |req| {
+                futures::future::ready(scrape_handle(req, metrics.clone(), credentials.clone()))
+            })))
+        });
+
+        let server = Server::try_bind(&address)
+            .map_err(|e| MmMetricsError::PrometheusServerError(e.to_string()))?
+            .http1_half_close(false) // https://github.com/hyperium/hyper/issues/1764
+            .serve(make_svc)
+            .with_graceful_shutdown(shutdown_detector);
+
+        let server = server.then(|r| {
+            if let Err(err) = r {
+                error!("{}", err);
+            };
+            futures::future::ready(())
+        });
+
+        // As it's said in the [issue](https://github.com/hyperium/tonic/issues/330):
+        //
+        // Aborting the server future will forcefully cancel all connections and not perform a proper drain/shutdown.
+        // While using the special shutdown methods on the server will allow hyper to gracefully drain all connections
+        // and gracefully close connections.
+        common::executor::spawn(server);
+        Ok(())
+    }
+
+    fn scrape_handle(
+        req: Request<Body>,
+        metrics: MetricsWeak,
+        credentials: Option<PrometheusCredentials>,
+    ) -> Result<Response<Body>, http::Error> {
+        fn on_error(status: StatusCode, error: MmError<MmMetricsError>) -> Result<Response<Body>, http::Error> {
+            error!("{}", error);
+            Response::builder().status(status).body(Body::empty()).map_err(|err| {
+                error!("{}", err);
+                err
+            })
+        }
+
+        if req.uri() != "/metrics" {
+            return on_error(
+                StatusCode::BAD_REQUEST,
+                MmError::new(MmMetricsError::UnexpectedUri(req.uri().to_string())),
+            );
+        }
+
+        if let Some(credentials) = credentials {
+            if let Err(err) = check_auth_credentials(&req, credentials) {
+                return on_error(StatusCode::UNAUTHORIZED, err);
+            }
+        }
+
+        let metrics = match MetricsArc::from_weak(&metrics) {
+            Some(m) => m,
+            _ => {
+                return on_error(
+                    StatusCode::BAD_REQUEST,
+                    MmError::new(MmMetricsError::MetricsSystemUnavailable),
+                )
+            },
+        };
+
+        let body = Body::from(metrics.0.collect_prometheus_format());
+
+        Response::builder()
+            .status(StatusCode::OK)
+            .header(header::CONTENT_TYPE, "text/plain")
+            .body(body)
+            .map_err(|err| {
+                error!("{}", err);
+                err
+            })
+    }
+
+    fn check_auth_credentials(req: &Request<Body>, expected: PrometheusCredentials) -> MmMetricsResult<()> {
+        let header_value = req
+            .headers()
+            .get(header::AUTHORIZATION)
+            .ok_or(MmMetricsError::PrometheusAuthorizationRequired)
+            .and_then(|header| {
+                Ok(header
+                    .to_str()
+                    .map_err(|err| MmMetricsError::PrometheusServerError(err.to_string())))?
+            })?;
+
+        let expected = format!("Basic {}", base64::encode_config(&expected.userpass, base64::URL_SAFE));
+
+        if header_value != expected {
+            return Err(MmError::new(MmMetricsError::PrometheusInvalidCredentials(
+                header_value.to_string(),
+            )));
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::time::Duration;
+
+    use crate::{MetricsArc, MetricsOps};
+
+    use common::{block_on,
+                 executor::{abortable_queue::AbortableQueue, Timer},
+                 log::{LogArc, LogState}};
+    use wasm_timer::Instant;
+
+    #[test]
+    fn test_collect_json() {
+        let metrics = MetricsArc::new();
+
+        metrics.init();
+
+        mm_counter!(metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
+        mm_counter!(metrics, "rpc.traffic.rx", 105, "coin" => "BTC");
+
+        mm_counter!(metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
+        mm_counter!(metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
+
+        mm_counter!(metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
+        mm_counter!(metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
+
+        mm_gauge!(metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
+        mm_gauge!(metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
+
+        let delta = Duration::from_secs(1);
+        mm_timing!(metrics,
+                   "rpc.query.spent_time",
+                   // ~ 1 second
+                   delta, // delta
+                   "coin" => "KMD",
+                   "method" => "blockchain.transaction.get");
+
+        let delta = Duration::from_secs(2);
+        mm_timing!(metrics,
+                   "rpc.query.spent_time",
+                   // ~ 2 second
+                    delta, // delta
+                   "coin" => "KMD",
+                   "method" => "blockchain.transaction.get");
+
+        let expected = serde_json::json!({
+            "metrics": [
+                {
+                    "key": "rpc.traffic.rx",
+                    "labels": { "coin": "BTC" },
+                    "type": "counter",
+                    "value": 149
+                },
+                {
+                    "key": "rpc.traffic.tx",
+                    "labels": { "coin": "KMD" },
+                    "type": "counter",
+                    "value": 54
+                },
+                {
+                    "key": "rpc.traffic.tx",
+                    "labels": { "coin": "BTC" },
+                    "type": "counter",
+                    "value": 92
+                },
+                {
+                    "key": "rpc.traffic.rx",
+                    "labels": { "coin": "KMD" },
+                    "type": "counter",
+                    "value": 158
+                },
+                {
+                    "count": 2.0,
+                    "key": "rpc.query.spent_time",
+                    "labels": { "coin": "KMD", "method": "blockchain.transaction.get" },
+                    "max": 2.0,
+                    "min": 1.0,
+                    "type": "histogram"
+                },
+                {
+                    "key": "rpc.connection.count",
+                    "labels": { "coin": "KMD" },
+                    "type": "gauge",
+                    "value": 5.0
+                }
+            ]
+        });
+
+        let mut actual = metrics.collect_json().unwrap();
+        let actual = actual["metrics"].as_array_mut().unwrap();
+        for expected in expected["metrics"].as_array().unwrap() {
+            let index = actual.iter().position(|metric| metric == expected).expect(&format!(
+                "Couldn't find expected metric: {:#?} \n in {:#?}",
+                expected, actual
+            ));
+            actual.remove(index);
+        }
+
+        assert!(
+            actual.is_empty(),
+            "More metrics collected than expected. Excess metrics: {:?}",
+            actual
+        );
+    }
+
+    #[test]
+    fn test_dashboard() {
+        let log_state = LogArc::new(LogState::in_memory());
+        let mm_metrics = MetricsArc::new();
+        let abortable_system = AbortableQueue::default();
+
+        mm_metrics
+            .init_with_dashboard(&abortable_system.weak_spawner(), log_state.weak(), 6.)
+            .unwrap();
+
+        let clock = Instant::now();
+        let last = clock.elapsed();
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 105, "coin"=> "BTC");
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
+
+        mm_gauge!(mm_metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
+
+        block_on(async { Timer::sleep(6.).await });
+
+        let delta: Duration = clock.elapsed() - last;
+        mm_timing!(mm_metrics,
+                    "rpc.query.spent_time",
+                    delta,
+                    "coin" => "KMD",
+                    "method" => "blockchain.transaction.get");
+
+        block_on(async { Timer::sleep(6.).await });
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
+
+        mm_gauge!(mm_metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
+
+        let delta = clock.elapsed() - last;
+        mm_timing!(mm_metrics,
+                    "rpc.query.spent_time",
+                    delta,
+                    "coin" => "KMD",
+                    "method" => "blockchain.transaction.get");
+
+        // measure without labels
+        mm_counter!(mm_metrics, "test.counter", 0);
+        mm_gauge!(mm_metrics, "test.gauge", 1.0);
+        let delta: Duration = clock.elapsed() - last;
+        mm_timing!(mm_metrics, "test.uptime", delta);
+
+        block_on(async { Timer::sleep(6.).await });
+    }
+
+    #[test]
+    fn test_prometheus_format() {
+        let mm_metrics = MetricsArc::new();
+
+        mm_metrics.init();
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 62, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 105, "coin" => "BTC");
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 30, "coin" => "BTC");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 44, "coin" => "BTC");
+
+        mm_counter!(mm_metrics, "rpc.traffic.tx", 54, "coin" => "KMD");
+        mm_counter!(mm_metrics, "rpc.traffic.rx", 158, "coin" => "KMD");
+
+        mm_gauge!(mm_metrics, "rpc.connection.count", 3.0, "coin" => "KMD");
+        mm_gauge!(mm_metrics, "rpc.connection.count", 5.0, "coin" => "KMD");
+
+        mm_timing!(mm_metrics,
+                         "rpc.query.spent_time",
+                         4.5,
+                         "coin"=> "KMD",
+                         "method"=>"blockchain.transaction.get");
+
+        println!("{}", mm_metrics.0.collect_prometheus_format());
+    }
+}
diff --git a/mm2src/mm2_metrics/src/recorder.rs b/mm2src/mm2_metrics/src/recorder.rs
new file mode 100644
index 0000000000..a19ca982b8
--- /dev/null
+++ b/mm2src/mm2_metrics/src/recorder.rs
@@ -0,0 +1,195 @@
+use crate::{mm_metrics::MmHistogram, MetricType, MetricsJson};
+
+use metrics::{Counter, Gauge, Histogram, Key, KeyName, Label, Recorder, Unit};
+#[cfg(not(target_arch = "wasm32"))]
+use metrics_exporter_prometheus::formatting::{key_to_parts, write_metric_line, write_type_line};
+use metrics_util::registry::{GenerationalAtomicStorage, GenerationalStorage, Registry};
+use std::sync::{atomic::Ordering, Arc};
+use std::{collections::HashMap, slice::Iter};
+
+pub struct Snapshot {
+    pub counters: HashMap<String, HashMap<Vec<String>, u64>>,
+    pub gauges: HashMap<String, HashMap<Vec<String>, f64>>,
+    pub histograms: HashMap<String, HashMap<Vec<String>, Vec<f64>>>,
+}
+
+/// `MmRecorder` the core of mm metrics.
+///
+///  Registering, Recording, Updating and Collecting metrics is all done from within MmRecorder.
+pub struct MmRecorder {
+    pub(crate) registry: Registry<Key, GenerationalAtomicStorage>,
+}
+
+impl Default for MmRecorder {
+    fn default() -> Self {
+        Self {
+            registry: Registry::new(GenerationalStorage::atomic()),
+        }
+    }
+}
+
+impl MmRecorder {
+    #[cfg(not(target_arch = "wasm32"))]
+    fn get_metrics(&self) -> Snapshot {
+        let mut counters = HashMap::new();
+        for (key, counter) in self.registry.get_counter_handles() {
+            key_value_to_snapshot_entry(&mut counters, key, counter.get_inner().load(Ordering::Acquire));
+        }
+
+        let mut gauges = HashMap::new();
+        for (key, gauge) in self.registry.get_gauge_handles() {
+            key_value_to_snapshot_entry(
+                &mut gauges,
+                key,
+                f64::from_bits(gauge.get_inner().load(Ordering::Acquire)),
+            );
+        }
+
+        let mut histograms = HashMap::new();
+        for (key, histogram) in self.registry.get_histogram_handles() {
+            key_value_to_snapshot_entry(&mut histograms, key, histogram.get_inner().data());
+        }
+
+        Snapshot {
+            counters,
+            gauges,
+            histograms,
+        }
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub fn render_prometheus(&self) -> String {
+        let Snapshot {
+            mut counters,
+            mut histograms,
+            mut gauges,
+        } = self.get_metrics();
+
+        let mut output = String::new();
+
+        for (name, mut by_labels) in counters.drain() {
+            write_type_line(&mut output, name.as_str(), "counter");
+            for (labels, value) in by_labels.drain() {
+                write_metric_line::<&str, u64>(&mut output, &name, None, &labels, None, value);
+            }
+            output.push('\n');
+        }
+
+        for (name, mut by_labels) in gauges.drain() {
+            write_type_line(&mut output, name.as_str(), "gauge");
+            for (labels, value) in by_labels.drain() {
+                write_metric_line::<&str, f64>(&mut output, &name, None, &labels, None, value);
+            }
+            output.push('\n');
+        }
+
+        for (key, histogram) in histograms.drain() {
+            let key = Key::from_name(key.to_owned());
+            let (name, labels) = key_to_parts(&key, None);
+            write_type_line(&mut output, &name, "histogram");
+            for (_, values) in histogram {
+                let mut count = 0;
+                let mut sum = 0.0;
+
+                count += values.len();
+                values.iter().for_each(|value| {
+                    sum += value;
+                });
+
+                write_metric_line::<&str, f64>(&mut output, &name, Some("sum"), &labels, None, sum);
+                write_metric_line::<&str, usize>(
+                    &mut output,
+                    &name,
+                    Some("count"),
+                    key_to_parts(&key, None).1.as_slice(),
+                    None,
+                    count,
+                );
+                output.push('\n');
+            }
+        }
+
+        output
+    }
+
+    pub fn prepare_json(&self) -> MetricsJson {
+        let mut output = vec![];
+
+        for (key, counter) in self.registry.get_counter_handles() {
+            let (key, labels) = key.into_parts();
+            let value = counter.get_inner().load(Ordering::Acquire);
+            output.push(MetricType::Counter {
+                key: key.as_str().to_string(),
+                labels: labels_into_parts(labels.clone().iter()),
+                value,
+            });
+        }
+
+        for (key, gauge) in self.registry.get_gauge_handles() {
+            let (key, labels) = key.into_parts();
+            let value = f64::from_bits(gauge.get_inner().load(Ordering::Acquire));
+            output.push(MetricType::Gauge {
+                key: key.as_str().to_string(),
+                labels: labels_into_parts(labels.clone().iter()),
+                value,
+            });
+        }
+
+        for (key, histogram) in self.registry.get_histogram_handles() {
+            let value = histogram.get_inner().data();
+            let (key, labels) = key.into_parts();
+            let mm_histogram = MmHistogram::new(&value);
+
+            if let Some(qauntiles_value) = mm_histogram {
+                output.push(MetricType::Histogram {
+                    key: key.as_str().to_string(),
+                    labels: labels_into_parts(labels.clone().iter()),
+                    quantiles: qauntiles_value.to_json_quantiles(),
+                });
+            }
+        }
+
+        MetricsJson { metrics: output }
+    }
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn key_value_to_snapshot_entry<V>(metrics: &mut HashMap<String, HashMap<Vec<String>, V>>, key: Key, value: V) {
+    let (key_name, labels) = key_to_parts(&key, None);
+    let metrics = metrics.entry(key_name).or_insert_with(|| HashMap::new());
+    metrics.insert(labels, value);
+}
+
+impl Recorder for MmRecorder {
+    fn describe_counter(&self, _key_name: KeyName, _unit: Option<Unit>, _description: &'static str) {
+        // mm2_metrics doesn't use this method
+    }
+
+    fn describe_gauge(&self, _key_name: KeyName, _unit: Option<Unit>, _description: &'static str) {
+        // mm2_metrics doesn't use this method
+    }
+
+    fn describe_histogram(&self, _key_name: KeyName, _unit: Option<Unit>, _description: &'static str) {
+        // mm2_metrics doesn't use this method
+    }
+
+    fn register_counter(&self, key: &Key) -> Counter { self.registry.get_or_create_counter(key, |e| e.clone().into()) }
+
+    fn register_gauge(&self, key: &Key) -> Gauge { self.registry.get_or_create_gauge(key, |e| e.clone().into()) }
+
+    fn register_histogram(&self, key: &Key) -> Histogram {
+        self.registry.get_or_create_histogram(key, |e| e.clone().into())
+    }
+}
+
+pub trait TryRecorder {
+    /// Check for recorder and set one if none is set.
+    fn try_recorder(&self) -> Option<Arc<MmRecorder>>;
+}
+
+/// Used for parsing `Iter<Label>` into `Key` and `Value`.
+fn labels_into_parts(labels: Iter<Label>) -> HashMap<String, String> {
+    labels
+        .map(|label| (label.key().to_string(), label.value().to_string()))
+        .collect()
+}
diff --git a/mm2src/mm2_net/Cargo.toml b/mm2src/mm2_net/Cargo.toml
index 1c08ae2282..045b255120 100644
--- a/mm2src/mm2_net/Cargo.toml
+++ b/mm2src/mm2_net/Cargo.toml
@@ -3,15 +3,17 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 async-trait = "0.1"
 serde = "1"
-serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 bytes = "1.1"
 cfg-if = "1.0"
 common = { path = "../common" }
+ethkey = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git" }
 mm2_err_handle = { path = "../mm2_err_handle" }
 mm2_core = { path = "../mm2_core" }
 derive_more = "0.99"
diff --git a/mm2src/mm2_net/src/grpc_web.rs b/mm2src/mm2_net/src/grpc_web.rs
index 5640df5d2f..43ba449502 100644
--- a/mm2src/mm2_net/src/grpc_web.rs
+++ b/mm2src/mm2_net/src/grpc_web.rs
@@ -4,15 +4,17 @@
 use crate::transport::SlurpError;
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use common::{cfg_native, cfg_wasm32};
+use http::header::{ACCEPT, CONTENT_TYPE};
 use mm2_err_handle::prelude::*;
 use prost::DecodeError;
 
 cfg_native! {
+    use common::APPLICATION_GRPC_WEB;
     use crate::transport::slurp_req;
-    use http::header::{ACCEPT, CONTENT_TYPE};
 }
 
 cfg_wasm32! {
+    use common::{X_GRPC_WEB, APPLICATION_GRPC_WEB_PROTO};
     use crate::wasm_http::FetchRequest;
 }
 
@@ -85,18 +87,19 @@ where
         return MmError::err(DecodeBodyError::PayloadTooShort);
     }
 
-    let msg = T::decode(&mut body.split_to(len as usize))?;
+    let msg = T::decode(&mut body.split_to(len))?;
 
     Ok(msg)
 }
 
 #[derive(Debug)]
 pub enum PostGrpcWebErr {
-    InvalidRequest(String),
-    EncodeBody(String),
     DecodeBody(String),
-    Transport { uri: String, error: String },
+    EncodeBody(String),
+    InvalidRequest(String),
     Internal(String),
+    PayloadTooShort(String),
+    Transport { uri: String, error: String },
 }
 
 impl From<EncodeBodyError> for PostGrpcWebErr {
@@ -104,7 +107,12 @@ impl From<EncodeBodyError> for PostGrpcWebErr {
 }
 
 impl From<DecodeBodyError> for PostGrpcWebErr {
-    fn from(err: DecodeBodyError) -> Self { PostGrpcWebErr::DecodeBody(format!("{:?}", err)) }
+    fn from(err: DecodeBodyError) -> Self {
+        match err {
+            DecodeBodyError::PayloadTooShort => PostGrpcWebErr::PayloadTooShort(format!("{:?}", err)),
+            DecodeBodyError::DecodeError(_) => PostGrpcWebErr::DecodeBody(format!("{:?}", err)),
+        }
+    }
 }
 
 /// `http::Error` can appear on an HTTP request [`http::Builder::build`] building.
@@ -136,8 +144,8 @@ where
         .version(http::Version::HTTP_11)
         .method(http::Method::POST)
         .uri(url)
-        .header(CONTENT_TYPE, "application/grpc-web")
-        .header(ACCEPT, "application/grpc-web")
+        .header(CONTENT_TYPE, APPLICATION_GRPC_WEB)
+        .header(ACCEPT, APPLICATION_GRPC_WEB)
         .body(encode_body(req)?)?;
 
     let response = slurp_req(request).await?;
@@ -156,10 +164,10 @@ where
     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")
+        .header(CONTENT_TYPE.as_str(), APPLICATION_GRPC_WEB_PROTO)
+        .header(ACCEPT.as_str(), APPLICATION_GRPC_WEB_PROTO)
         // https://github.com/grpc/grpc-web/issues/85#issue-217223001
-        .header("x-grpc-web", "1");
+        .header(X_GRPC_WEB, "1");
 
     let response = request.request_array().await?;
 
diff --git a/mm2src/mm2_net/src/native_http.rs b/mm2src/mm2_net/src/native_http.rs
index c6a1fccdc5..ea4b0b2912 100644
--- a/mm2src/mm2_net/src/native_http.rs
+++ b/mm2src/mm2_net/src/native_http.rs
@@ -1,7 +1,8 @@
 use crate::transport::{SlurpError, SlurpResult};
 use common::wio::{drive03, HYPER};
+use common::APPLICATION_JSON;
 use futures::channel::oneshot::Canceled;
-use http::{header, HeaderValue, Request};
+use http::{header, Request};
 use hyper::Body;
 use mm2_err_handle::prelude::*;
 
@@ -59,7 +60,7 @@ 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"))
+        .header(header::CONTENT_TYPE, APPLICATION_JSON)
         .body(body.into())?;
     slurp_req(request).await
 }
diff --git a/mm2src/mm2_net/src/transport.rs b/mm2src/mm2_net/src/transport.rs
index a76007b0f4..ad51122993 100644
--- a/mm2src/mm2_net/src/transport.rs
+++ b/mm2src/mm2_net/src/transport.rs
@@ -1,4 +1,6 @@
+use common::jsonrpc_client::JsonRpcErrorType;
 use derive_more::Display;
+use ethkey::Secret;
 use http::{HeaderMap, StatusCode};
 use mm2_err_handle::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -25,6 +27,17 @@ pub enum SlurpError {
     Internal(String),
 }
 
+impl From<SlurpError> for JsonRpcErrorType {
+    fn from(err: SlurpError) -> Self {
+        match err {
+            SlurpError::InvalidRequest(err) => Self::InvalidRequest(err),
+            SlurpError::Transport { .. } | SlurpError::Timeout { .. } => Self::Transport(err.to_string()),
+            SlurpError::ErrorDeserializing { uri, error } => Self::Parse(uri.into(), error),
+            SlurpError::Internal(_) => Self::Internal(err.to_string()),
+        }
+    }
+}
+
 /// Send POST JSON HTTPS request and parse response
 pub async fn post_json<T>(url: &str, json: String) -> Result<T, MmError<SlurpError>>
 where
@@ -48,3 +61,19 @@ where
         error: e.to_string(),
     })
 }
+
+#[derive(Clone, Debug)]
+pub struct GuiAuthValidationGenerator {
+    pub coin_ticker: String,
+    pub secret: Secret,
+    pub address: String,
+}
+
+/// gui-auth specific data-type that needed in order to perform gui-auth calls
+#[derive(Serialize, Clone)]
+pub struct GuiAuthValidation {
+    pub coin_ticker: String,
+    pub address: String,
+    pub timestamp_message: i64,
+    pub signature: String,
+}
diff --git a/mm2src/mm2_net/src/wasm_http.rs b/mm2src/mm2_net/src/wasm_http.rs
index 0e0fef551c..afa24d1848 100644
--- a/mm2src/mm2_net/src/wasm_http.rs
+++ b/mm2src/mm2_net/src/wasm_http.rs
@@ -1,7 +1,8 @@
 use crate::transport::{SlurpError, SlurpResult};
 use common::executor::spawn_local;
-use common::stringify_js_error;
+use common::{stringify_js_error, APPLICATION_JSON};
 use futures::channel::oneshot;
+use http::header::CONTENT_TYPE;
 use http::{HeaderMap, StatusCode};
 use js_sys::Uint8Array;
 use mm2_err_handle::prelude::*;
@@ -27,7 +28,7 @@ pub async fn slurp_url(url: &str) -> SlurpResult {
 /// 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")
+        .header(CONTENT_TYPE.as_str(), APPLICATION_JSON)
         .body_utf8(body)
         .request_str()
         .await
@@ -108,6 +109,9 @@ impl FetchRequest {
             let result = Self::fetch_str(request).await;
             tx.send(result).ok();
         };
+
+        // The spawned future doesn't capture shared pointers,
+        // so we can use `spawn_local` here.
         spawn_local(fut);
     }
 
@@ -116,6 +120,9 @@ impl FetchRequest {
             let result = Self::fetch_array(request).await;
             tx.send(result).ok();
         };
+
+        // The spawned future doesn't capture shared pointers,
+        // so we can use `spawn_local` here.
         spawn_local(fut);
     }
 
diff --git a/mm2src/mm2_net/src/wasm_ws.rs b/mm2src/mm2_net/src/wasm_ws.rs
index d6b185966c..40daa603dd 100644
--- a/mm2src/mm2_net/src/wasm_ws.rs
+++ b/mm2src/mm2_net/src/wasm_ws.rs
@@ -1,8 +1,8 @@
 use async_trait::async_trait;
+use common::executor::SpawnFuture;
 use common::log::{debug, error};
+use common::state_machine::{LastState, State, StateExt, StateMachine, StateResult, TransitionFrom};
 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};
@@ -17,7 +17,6 @@ use wasm_bindgen::JsCast;
 use web_sys::{CloseEvent, DomException, MessageEvent, WebSocket};
 
 const NORMAL_CLOSURE_CODE: u16 = 1000;
-const ABNORMAL_CLOSURE_CODE: u16 = 1006;
 
 pub type ConnIdx = usize;
 
@@ -29,7 +28,6 @@ type WsTransportSender = mpsc::Sender<WsTransportEvent>;
 
 type IncomingShutdownTx = oneshot::Sender<()>;
 type OutgoingShutdownTx = mpsc::Sender<()>;
-type ShutdownRx = oneshot::Receiver<()>;
 
 type TransportClosure = Closure<dyn FnMut(JsValue)>;
 
@@ -84,7 +82,7 @@ impl Stream for WsIncomingReceiver {
                 error!("WsIncomingReceiver is expected to be established already");
                 Poll::Pending
             },
-            WebSocketEvent::Closing { .. } | WebSocketEvent::Closed { .. } => {
+            WebSocketEvent::Closed { .. } => {
                 self.closed = true;
                 Poll::Ready(None)
             },
@@ -132,8 +130,6 @@ impl WsOutgoingSender {
 pub enum WebSocketEvent {
     /// A WebSocket connection is established.
     Establish,
-    /// A WebSocket connection is being closing and it should not be used anymore.
-    Closing { reason: ClosureReason },
     /// A WebSocket connection has been closed.
     Closed { reason: ClosureReason },
     /// An error has occurred.
@@ -198,8 +194,12 @@ impl ClosureReason {
     }
 }
 
-pub fn spawn_ws_transport(idx: ConnIdx, url: &str) -> InitWsResult<(WsOutgoingSender, WsEventReceiver)> {
-    let (ws, closures, ws_transport_rx) = init_ws(url)?;
+fn spawn_ws_transport<Spawner: SpawnFuture>(
+    idx: ConnIdx,
+    url: &str,
+    spawner: &Spawner,
+) -> InitWsResult<(WsOutgoingSender, WsEventReceiver)> {
+    let (ws, ws_transport_rx) = WebSocketImpl::init(url)?;
     let (incoming_tx, incoming_rx, incoming_shutdown) = incoming_channel(1024);
     let (outgoing_tx, outgoing_rx, outgoing_shutdown) = outgoing_channel(1024);
 
@@ -216,20 +216,22 @@ pub fn spawn_ws_transport(idx: ConnIdx, url: &str) -> InitWsResult<(WsOutgoingSe
     let fut = async move {
         let state_machine: StateMachine<_, ()> = StateMachine::from_ctx(ws_ctx);
         state_machine.run(ConnectingState).await;
-        // do any action to move the `closures` into this async block to keep it alive until the `state_machine` finishes
-        drop(closures);
     };
-    spawn(fut);
+    spawner.spawn(fut);
 
     Ok((outgoing_tx, incoming_rx))
 }
 
-pub async fn ws_transport(idx: ConnIdx, url: &str) -> InitWsResult<(WsOutgoingSender, WsIncomingReceiver)> {
-    let (sender, mut receiver) = spawn_ws_transport(idx, url)?;
+pub async fn ws_transport<Spawner: SpawnFuture>(
+    idx: ConnIdx,
+    url: &str,
+    spawner: &Spawner,
+) -> InitWsResult<(WsOutgoingSender, WsIncomingReceiver)> {
+    let (sender, mut receiver) = spawn_ws_transport(idx, url, spawner)?;
     while let Some((_conn_idx, event)) = receiver.next().await {
         match event {
             WebSocketEvent::Establish => break,
-            WebSocketEvent::Closed { reason } | WebSocketEvent::Closing { reason } => {
+            WebSocketEvent::Closed { reason } => {
                 return MmError::err(InitWsError::ConnectionFailed { reason });
             },
             // if the error is an underlying error, the connection will close immediately
@@ -274,20 +276,16 @@ fn outgoing_channel(capacity: usize) -> (WsOutgoingSender, WsOutgoingReceiver, i
     (outgoing_tx, outgoing_rx, shutdown_rx)
 }
 
-fn into_one_shutdown(left: impl ShutdownFut, right: impl ShutdownFut) -> ShutdownRx {
+fn into_one_shutdown(left: impl ShutdownFut, right: impl ShutdownFut) -> impl ShutdownFut {
     use futures::future::{select, Either};
 
-    let (shutdown_tx, shutdown_rx) = oneshot::channel();
-    let fut = async move {
+    async move {
         match select(left, right).await {
             Either::Left((_left_output, right_fut)) => right_fut.await,
             Either::Right((_right_output, left_fut)) => left_fut.await,
         }
-        drop(shutdown_tx);
-    };
-
-    spawn(fut);
-    shutdown_rx
+    }
+    .boxed()
 }
 
 /// The JS closures that have to be alive until the corresponding WebSocket exists.
@@ -295,52 +293,52 @@ struct WsClosures {
     _closures: Vec<TransportClosure>,
 }
 
-/// Although wasm is currently single-threaded, we can implement the `Send` trait for `WsClosures`,
-/// but it won't be safe when wasm becomes multi-threaded.
-unsafe impl Send for WsClosures {}
-
-fn init_ws(url: &str) -> InitWsResult<(WebSocket, WsClosures, WsTransportReceiver)> {
-    let ws = WebSocket::new(url).map_to_mm(|e| InitWsError::from_ws_new_err(e, url))?;
-
-    let (tx, rx) = mpsc::channel(1024);
-
-    let onopen_closure = construct_ws_event_closure(|_: JsValue| WsTransportEvent::Establish, tx.clone());
-    let onclose_closure = construct_ws_event_closure(|close: CloseEvent| WsTransportEvent::from(close), tx.clone());
-    let onerror_closure = construct_ws_event_closure(
-        |_: JsValue| WsTransportEvent::Error(WsTransportError::UnderlyingError),
-        tx.clone(),
-    );
-    let onmessage_closure = construct_ws_event_closure(
-        |message: MessageEvent| match decode_incoming(message) {
-            Ok(response) => WsTransportEvent::Incoming(response),
-            Err(e) => WsTransportEvent::Error(WsTransportError::ErrorDecodingIncoming(e)),
-        },
-        tx.clone(),
-    );
+/// This is a wrapper over `WebSocket` that holds the closures passed as [`WebSocket::onopen`], [`WebSocket::onclose`] etc.
+///
+/// # Drop
+///
+/// Once and instance of `WebSocketImpl` is dropped, `WebSocket` will be closed via [`WebSocket::close_with_code`].
+/// Please note that [`WebSocket::drop`] will be fired once the spawned state machine future is aborted.
+struct WebSocketImpl {
+    ws: WebSocket,
+    /// It's not used directly, but we need to hold the closures in memory till `ws` exists.
+    #[allow(dead_code)]
+    closures: WsClosures,
+}
 
-    ws.set_onopen(Some(onopen_closure.as_ref().unchecked_ref()));
-    ws.set_onclose(Some(onclose_closure.as_ref().unchecked_ref()));
-    ws.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
-    ws.set_onmessage(Some(onmessage_closure.as_ref().unchecked_ref()));
+impl WebSocketImpl {
+    fn init(url: &str) -> InitWsResult<(WebSocketImpl, WsTransportReceiver)> {
+        let ws = WebSocket::new(url).map_to_mm(|e| InitWsError::from_ws_new_err(e, url))?;
 
-    // keep the closures in the memory until the `ws` exists
-    let closures = WsClosures {
-        _closures: vec![onopen_closure, onclose_closure, onerror_closure, onmessage_closure],
-    };
+        let (tx, rx) = mpsc::channel(1024);
 
-    Ok((ws, closures, rx))
-}
+        let onopen_closure = construct_ws_event_closure(|_: JsValue| WsTransportEvent::Establish, tx.clone());
+        let onclose_closure = construct_ws_event_closure(|close: CloseEvent| WsTransportEvent::from(close), tx.clone());
+        let onerror_closure = construct_ws_event_closure(
+            |_: JsValue| WsTransportEvent::Error(WsTransportError::UnderlyingError),
+            tx.clone(),
+        );
+        let onmessage_closure = construct_ws_event_closure(
+            |message: MessageEvent| match decode_incoming(message) {
+                Ok(response) => WsTransportEvent::Incoming(response),
+                Err(e) => WsTransportEvent::Error(WsTransportError::ErrorDecodingIncoming(e)),
+            },
+            tx.clone(),
+        );
 
-struct WsContext {
-    idx: ConnIdx,
-    ws: WebSocket,
-    /// The sender used to send the transport events outside (to the userspace).
-    event_tx: WsIncomingSender,
-    /// The stream of internal events that may come from either WebSocket transport or outside (userspace, such as outgoing messages).
-    state_event_rx: StateEventListener,
-}
+        ws.set_onopen(Some(onopen_closure.as_ref().unchecked_ref()));
+        ws.set_onclose(Some(onclose_closure.as_ref().unchecked_ref()));
+        ws.set_onerror(Some(onerror_closure.as_ref().unchecked_ref()));
+        ws.set_onmessage(Some(onmessage_closure.as_ref().unchecked_ref()));
+
+        // keep the closures in the memory until the `ws` exists
+        let closures = WsClosures {
+            _closures: vec![onopen_closure, onclose_closure, onerror_closure, onmessage_closure],
+        };
+
+        Ok((WebSocketImpl { ws, closures }, rx))
+    }
 
-impl WsContext {
     fn send_to_ws(&self, outgoing: Json) -> Result<(), WebSocketError> {
         match json::to_string(&outgoing) {
             Ok(req) => self.ws.send_with_str(&req).map_err(|error| {
@@ -353,7 +351,32 @@ impl WsContext {
             },
         }
     }
+}
+
+impl Drop for WebSocketImpl {
+    fn drop(&mut self) {
+        // Reset all closures as they will not exist after `WebSocketImpl` is dropped.
+        self.ws.set_onopen(None);
+        self.ws.set_onclose(None);
+        self.ws.set_onerror(None);
+        self.ws.set_onmessage(None);
+
+        if let Err(e) = self.ws.close_with_code(NORMAL_CLOSURE_CODE) {
+            error!("Unexpected error when closing WebSocket: {e:?}");
+        }
+    }
+}
 
+struct WsContext {
+    idx: ConnIdx,
+    ws: WebSocketImpl,
+    /// The sender is used to send the transport events outside (to the userspace).
+    event_tx: WsIncomingSender,
+    /// The stream of internal events that may come from either WebSocket transport or outside (userspace, such as outgoing messages).
+    state_event_rx: StateEventListener,
+}
+
+impl WsContext {
     /// Send the `event` to the corresponding `WebSocketReceiver` instance.
     fn notify_listener(&mut self, event: WebSocketEvent) {
         if !self.event_tx.is_closed() {
@@ -381,13 +404,6 @@ impl WsContext {
         let error = WebSocketEvent::Error(WebSocketError::InvalidIncoming { description });
         self.notify_listener(error);
     }
-
-    fn close_ws(&self, closure_code: u16) {
-        if let Err(e) = self.ws.close_with_code(closure_code) {
-            // TODO figure out how to extract an error description without stack trace
-            error!("Unexpected error when closing WebSocket: {:?}", e);
-        }
-    }
 }
 
 /// `WsContext` is not thread-safety `Send` because [`WebSocket::ws`] is not `Send` by default.
@@ -403,7 +419,7 @@ impl StateEventListener {
     /// Combine the `outgoing_stream` and `ws_stream` into one stream of the internal events.
     /// `ws_stream` - is a stream of the `WebSocket` events.
     /// `outgoing_stream` - is a stream of the outgoing messages came from outside (userspace).
-    fn new(outgoing_stream: WsOutgoingReceiver, ws_stream: WsTransportReceiver, shutdown_rx: ShutdownRx) -> Self {
+    fn new(outgoing_stream: WsOutgoingReceiver, ws_stream: WsTransportReceiver, shutdown_rx: impl ShutdownFut) -> Self {
         use futures::stream::select;
 
         let mapperd_outgoing = outgoing_stream.map(StateEvent::OutgoingMessage);
@@ -462,19 +478,13 @@ impl From<CloseEvent> for WsTransportEvent {
 
 struct ConnectingState;
 struct OpenState;
-struct ClosingState {
-    reason: ClosureReason,
-}
 struct ClosedState {
     reason: ClosureReason,
 }
 
 impl TransitionFrom<ConnectingState> for OpenState {}
-impl TransitionFrom<ConnectingState> for ClosingState {}
 impl TransitionFrom<ConnectingState> for ClosedState {}
-impl TransitionFrom<OpenState> for ClosingState {}
 impl TransitionFrom<OpenState> for ClosedState {}
-impl TransitionFrom<ClosingState> for ClosedState {}
 
 #[async_trait]
 impl LastState for ClosedState {
@@ -482,8 +492,14 @@ impl LastState for ClosedState {
     type Result = ();
 
     async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> Self::Result {
-        debug!("WebSocket idx={} => ClosedState", ctx.idx);
-        ctx.notify_listener(WebSocketEvent::Closed { reason: self.reason })
+        debug!("WebScoket idx={} => ClosedState", ctx.idx);
+        // Notify the listener that the connection has been closed to prevent new outgoing messages.
+        ctx.notify_listener(WebSocketEvent::Closed {
+            reason: self.reason.clone(),
+        });
+
+        // Please note that we don't need to close websocket via `ctx.ws.close_with_code()`.
+        // It will be closed on [`WsContext::drop`] right after the state machine is finished.
     }
 }
 
@@ -496,8 +512,8 @@ impl State for ConnectingState {
         debug!("WebSocket idx={} => ConnectingState", ctx.idx);
         while let Some(event) = ctx.state_event_rx.receive_one().await {
             match event {
-                // there is no need to keep the connection, so close the socket and change the state into `ClosingState`
-                StateEvent::UserSideClosed => return Self::change_state(ClosingState::normal_closure()),
+                // there is no need to keep the connection, so close the socket and change the state into `ClosedState`
+                StateEvent::UserSideClosed => return Self::change_state(ClosedState::normal_closure()),
                 StateEvent::OutgoingMessage(outgoing) => ctx.send_unexpected_outgoing_back(outgoing, "ConnectingState"),
                 StateEvent::WsTransportEvent(WsTransportEvent::Establish) => return Self::change_state(OpenState),
                 StateEvent::WsTransportEvent(WsTransportEvent::Close { code }) => {
@@ -507,7 +523,7 @@ impl State for ConnectingState {
                     match error {
                         // if an underlying error has occurred, it's better to close the socket
                         WsTransportError::UnderlyingError => {
-                            return Self::change_state(ClosingState::on_underlying_error())
+                            return Self::change_state(ClosedState::on_underlying_error())
                         },
                         WsTransportError::ErrorDecodingIncoming(_error) => error!(
                             "Unexpected incoming message while the socket idx={} state is ConnectingState",
@@ -522,7 +538,6 @@ impl State for ConnectingState {
             }
         }
         error!("StateEventListener is closed unexpectedly");
-        ctx.close_ws(ABNORMAL_CLOSURE_CODE);
         Self::change_state(ClosedState::unexpected_closure())
     }
 }
@@ -540,10 +555,10 @@ impl State for OpenState {
         // wait for the `WsTransportEvent::Established` event or another one
         while let Some(event) = ctx.state_event_rx.receive_one().await {
             match event {
-                // there is no need to keep the connection, so close the socket and change the state into `ClosingState`
-                StateEvent::UserSideClosed => return Self::change_state(ClosingState::normal_closure()),
+                // there is no need to keep the connection, so close the socket and change the state into `ClosedState`
+                StateEvent::UserSideClosed => return Self::change_state(ClosedState::normal_closure()),
                 StateEvent::OutgoingMessage(outgoing) => {
-                    if let Err(e) = ctx.send_to_ws(outgoing) {
+                    if let Err(e) = ctx.ws.send_to_ws(outgoing) {
                         error!("{:?}", e);
                         ctx.notify_listener(WebSocketEvent::Error(e));
                     }
@@ -558,7 +573,7 @@ impl State for OpenState {
                     match error {
                         // if an underlying error has occurred, it's better to close the socket
                         WsTransportError::UnderlyingError => {
-                            return Self::change_state(ClosingState::on_underlying_error())
+                            return Self::change_state(ClosedState::on_underlying_error())
                         },
                         WsTransportError::ErrorDecodingIncoming(error) => ctx.notify_about_invalid_incoming(error),
                     }
@@ -569,60 +584,24 @@ impl State for OpenState {
             }
         }
 
-        error!("StateEventListener is closed unexpectedly");
-        ctx.close_ws(ABNORMAL_CLOSURE_CODE);
-        Self::change_state(ClosedState::unexpected_closure())
-    }
-}
-
-#[async_trait]
-impl State for ClosingState {
-    type Ctx = WsContext;
-    type Result = ();
-
-    async fn on_changed(self: Box<Self>, ctx: &mut Self::Ctx) -> StateResult<Self::Ctx, Self::Result> {
-        debug!("WebScoket idx={} => ClosingState", ctx.idx);
-        // notify the listener about the changed state to prevent new outgoing messages
-        ctx.notify_listener(WebSocketEvent::Closing {
-            reason: self.reason.clone(),
-        });
-        ctx.close_ws(NORMAL_CLOSURE_CODE);
-
-        // wait for the `WsTransportEvent::Close` event or another one
-        while let Some(event) = ctx.state_event_rx.receive_one().await {
-            match event {
-                StateEvent::UserSideClosed => (), // ignore this event because we are waiting for the connection to close already
-                StateEvent::OutgoingMessage(outgoing) => ctx.send_unexpected_outgoing_back(outgoing, "ClosingState"),
-                // it doesn't matter with which status code the transport was closed because we already have an actual [`Self::reason`]
-                StateEvent::WsTransportEvent(WsTransportEvent::Close { .. }) => {
-                    return Self::change_state(ClosedState::from_reason(self.reason))
-                },
-                // ignore a transport error because we are waiting for the connection to close already
-                StateEvent::WsTransportEvent(WsTransportEvent::Error(_error)) => (),
-                StateEvent::WsTransportEvent(event) => error!("Unexpected WsTransportEvent: {:?}", event),
-            }
-        }
-
         error!("StateEventListener is closed unexpectedly");
         Self::change_state(ClosedState::unexpected_closure())
     }
 }
 
-impl ClosingState {
-    fn normal_closure() -> ClosingState {
-        ClosingState {
+impl ClosedState {
+    fn normal_closure() -> ClosedState {
+        ClosedState {
             reason: ClosureReason::NormalClosure,
         }
     }
 
-    fn on_underlying_error() -> ClosingState {
-        ClosingState {
+    fn on_underlying_error() -> ClosedState {
+        ClosedState {
             reason: ClosureReason::ClientClosedOnUnderlyingError,
         }
     }
-}
 
-impl ClosedState {
     fn unexpected_closure() -> ClosedState {
         ClosedState {
             reason: ClosureReason::ClientReachedUnexpectedState,
@@ -634,8 +613,6 @@ impl ClosedState {
             reason: ClosureReason::from_status_code(code),
         }
     }
-
-    fn from_reason(reason: ClosureReason) -> ClosedState { ClosedState { reason } }
 }
 
 fn decode_incoming(incoming: MessageEvent) -> Result<Json, String> {
@@ -675,8 +652,9 @@ where
 
 mod tests {
     use super::*;
-    use common::log::wasm_log::register_wasm_log;
-    use common::{custom_futures::FutureTimerExt, log::debug};
+    use common::custom_futures::timeout::FutureTimerExt;
+    use common::executor::abortable_queue::AbortableQueue;
+    use common::log::{debug, wasm_log::register_wasm_log};
     use common::{WasmUnwrapErrExt, WasmUnwrapExt};
     use lazy_static::lazy_static;
     use serde_json::json;
@@ -694,8 +672,14 @@ mod tests {
         register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
-        let (mut outgoing_tx, mut incoming_rx) =
-            spawn_ws_transport(conn_idx, "wss://electrum1.cipig.net:30017").expect("!spawn_ws_transport");
+        let abortable_system = AbortableQueue::default();
+
+        let (mut outgoing_tx, mut incoming_rx) = spawn_ws_transport(
+            conn_idx,
+            "wss://electrum1.cipig.net:30017",
+            &abortable_system.weak_spawner(),
+        )
+        .expect("!spawn_ws_transport");
 
         match incoming_rx.next().timeout_secs(5.).await.unwrap_w() {
             Some((_conn_idx, WebSocketEvent::Establish)) => (),
@@ -734,13 +718,6 @@ mod tests {
             .expect("shutdown_rx must not be dropped");
         let mut incoming_rx = incoming_rx.inner;
 
-        match incoming_rx.next().timeout_secs(0.5).await.unwrap_w() {
-            Some((_conn_idx, WebSocketEvent::Closing { reason })) if reason == ClosureReason::NormalClosure => (),
-            other => panic!(
-                "Expected 'Closing' event with 'ClientClosed' reason, found: {:?}",
-                other
-            ),
-        }
         match incoming_rx.next().timeout_secs(0.5).await.unwrap_w() {
             Some((_conn_idx, WebSocketEvent::Closed { reason })) if reason == ClosureReason::NormalClosure => (),
             other => panic!("Expected 'Closed' event with 'ClientClosed' reason, found: {:?}", other),
@@ -752,23 +729,17 @@ mod tests {
         register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
+        let abortable_system = AbortableQueue::default();
+
         // TODO check if outgoing messages are ignored non-open states
-        let (_outgoing_tx, mut incoming_rx) =
-            spawn_ws_transport(conn_idx, "ws://electrum1.cipig.net:10017").expect("!spawn_ws_transport");
+        let (_outgoing_tx, mut incoming_rx) = spawn_ws_transport(
+            conn_idx,
+            "ws://electrum1.cipig.net:10017",
+            &abortable_system.weak_spawner(),
+        )
+        .expect("!spawn_ws_transport");
 
         match incoming_rx.next().timeout_secs(5.).await.unwrap_w() {
-            Some((
-                _conn_idx,
-                WebSocketEvent::Closing {
-                    reason: _reason @ ClosureReason::ClientClosedOnUnderlyingError,
-                },
-            )) => (),
-            other => panic!(
-                "Expected 'Closing' event with 'ClosedOnUnderlyingError' reason, found: {:?}",
-                other
-            ),
-        }
-        match incoming_rx.next().timeout_secs(0.5).await.unwrap_w() {
             Some((
                 _conn_idx,
                 WebSocketEvent::Closed {
@@ -787,8 +758,10 @@ mod tests {
         register_wasm_log();
         let conn_idx = CONN_IDX.fetch_add(1, Ordering::Relaxed);
 
-        let error =
-            spawn_ws_transport(conn_idx, "invalid address").expect_err("!spawn_ws_transport but should be error");
+        let abortable_system = AbortableQueue::default();
+
+        let error = spawn_ws_transport(conn_idx, "invalid address", &abortable_system.weak_spawner())
+            .expect_err("!spawn_ws_transport but should be error");
         match error.into_inner() {
             InitWsError::InvalidUrl { url, reason } if url == "invalid address" => debug!("InvalidUrl: {}", reason),
             e => panic!("Expected ''InitWsError::InvalidUrl, found: {:?}", e),
diff --git a/mm2src/mm2_number/Cargo.toml b/mm2src/mm2_number/Cargo.toml
index fb569ce4e3..0303fd20d8 100644
--- a/mm2src/mm2_number/Cargo.toml
+++ b/mm2src/mm2_number/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 bigdecimal = { version = "0.3", features = ["serde"] }
@@ -11,5 +12,5 @@ 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"
+serde = { version = "1", features = ["serde_derive"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
diff --git a/mm2src/mm2_number/src/mm_number.rs b/mm2src/mm2_number/src/mm_number.rs
index 1d4ed18614..64bf5d112f 100644
--- a/mm2src/mm2_number/src/mm_number.rs
+++ b/mm2src/mm2_number/src/mm_number.rs
@@ -379,4 +379,19 @@ mod tests {
         assert_eq!(actual.number_rat, expected.number_rat);
         // Fraction doesn't implement `PartialEq` trait
     }
+
+    #[test]
+    fn test_from_non_str_decimal() {
+        let json_str = r#"{"num":218998218471824891289891282187398.99999999128948218418948571392148}"#;
+
+        #[derive(Deserialize)]
+        struct Helper {
+            num: MmNumber,
+        }
+
+        let actual: Helper = json::from_str(json_str).unwrap();
+        let expected = MmNumber::from("218998218471824891289891282187398.99999999128948218418948571392148");
+
+        assert_eq!(actual.num, expected);
+    }
 }
diff --git a/mm2src/mm2_number/src/mm_number_multi_repr.rs b/mm2src/mm2_number/src/mm_number_multi_repr.rs
index 2508c0016a..501a7626ba 100644
--- a/mm2src/mm2_number/src/mm_number_multi_repr.rs
+++ b/mm2src/mm2_number/src/mm_number_multi_repr.rs
@@ -6,7 +6,7 @@ use num_rational::BigRational;
 use serde::Serialize;
 
 /// MmNumber representation in all available forms.
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct MmNumberMultiRepr {
     pub decimal: BigDecimal,
     pub rational: BigRational,
diff --git a/mm2src/mm2_rpc/Cargo.toml b/mm2src/mm2_rpc/Cargo.toml
index 7abf19ab99..2f08a6d9b9 100644
--- a/mm2src/mm2_rpc/Cargo.toml
+++ b/mm2src/mm2_rpc/Cargo.toml
@@ -3,7 +3,8 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 common = { path = "../common" }
@@ -12,7 +13,7 @@ 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"] }
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 ser_error = { path = "../derives/ser_error" }
 ser_error_derive = { path = "../derives/ser_error_derive" }
 
diff --git a/mm2src/mm2_test_helpers/Cargo.toml b/mm2src/mm2_test_helpers/Cargo.toml
index 23a355e305..9b8e284947 100644
--- a/mm2src/mm2_test_helpers/Cargo.toml
+++ b/mm2src/mm2_test_helpers/Cargo.toml
@@ -3,24 +3,29 @@ 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
+[lib]
+doctest = false
 
 [dependencies]
 bytes = "1.1"
 cfg-if = "1.0"
 common = { path = "../common" }
+crypto = { path = "../crypto" }
 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_metrics = { path = "../mm2_metrics" }
 mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number" }
 rand = { version = "0.7", features = ["std", "small_rng", "wasm-bindgen"] }
 regex = "1"
+rpc = { path = "../mm2_bitcoin/rpc" }
 serde = "1"
-serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_derive = "1"
+serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 uuid = { version = "0.7", features = ["serde", "v4"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/mm2src/mm2_test_helpers/dummy_files/iris_nimda_history.json b/mm2src/mm2_test_helpers/dummy_files/iris_nimda_history.json
new file mode 100644
index 0000000000..c3a6ff1580
--- /dev/null
+++ b/mm2src/mm2_test_helpers/dummy_files/iris_nimda_history.json
@@ -0,0 +1,286 @@
+[
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032403838613735653161306166373662636161386266353566313437616266616262313362323964646333316465323161373431363835333966373135643032343240980c",
+        "tx_hash": "B06D02A1449B07E89D15E709C347E0EE72A944687942E5A10467EC096D067FE7",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.01",
+        "spent_by_me": "0.01",
+        "received_by_me": "0",
+        "my_balance_change": "-0.01",
+        "block_height": 6175147,
+        "timestamp": 1669934633,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.027385",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "3930374535314439384537304239343431413230443630420000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SendHtlcAmount",
+                "token_id": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032406466313465616234366366623230663736613465336233393537656234326137666130646435366137386466623038656134323034666334383762663536323040980c",
+        "tx_hash": "26E7CA4A95C70316195E8C8A3249351710B1BFE89AE9B910463BC8280C0AA9CF",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.01",
+        "spent_by_me": "0.01",
+        "received_by_me": "0",
+        "my_balance_change": "-0.01",
+        "block_height": 6175115,
+        "timestamp": 1669934472,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.028433",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "4138433845353931363133303743353941344143374536320000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SendHtlcAmount",
+                "token_id": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301240364636394643303235393632413032463736363741414142393932313245393434454244444436434143314235354431443336333139383341413433454145421a4030646432663130353032343463386235316363636239316535363734386336373032343634393263383465323835656234353365363166373630623730356432",
+        "tx_hash": "459F88CACCD57756DDFE2164AABBA2C3D463D0FBA5D85DFD79488416A9BD54FC",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.01",
+        "spent_by_me": "0",
+        "received_by_me": "0.01",
+        "my_balance_change": "0.01",
+        "block_height": 6175070,
+        "timestamp": 1669934246,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026403",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "3436313245464444363537373544434341433838463935340000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SignClaimHtlc",
+                "token_id": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032403738646661636564613462346362373336366362626638643436336237393061666566363566656538613764356464356264616633613365303766343330623640980c",
+        "tx_hash": "25D9A1F1C9383AC7D56E3E19F3D6B9ED3F52F7D0E9225ABBEA0258FF75E28FC2",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.01",
+        "spent_by_me": "0.01",
+        "received_by_me": "0",
+        "my_balance_change": "-0.01",
+        "block_height": 6148309,
+        "timestamp": 1669798875,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.028433",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "3931453345363544374341333833394331463141394435320000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SendHtlcAmount",
+                "token_id": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316567307167617a37336a737676727676747a713478383233686d7a387161706c64643078347a1a0a0a036e696d1203313030",
+        "tx_hash": "D83D8143CAD8C225F3BC24C6DCA324DB2F63C97A21AE2C030328266E9415E50A",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [
+            "iaa1eg0qgaz73jsvvrvvtzq4x823hmz8qapldd0x4z"
+        ],
+        "total_amount": "0.0001",
+        "spent_by_me": "0.0001",
+        "received_by_me": "0",
+        "my_balance_change": "-0.0001",
+        "block_height": 6148307,
+        "timestamp": 1669798865,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.025763",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "3643343243423346353232433844414333343138443338440000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": "2dee652b-6892-46a9-b54a-b3333c6ce7f6"
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d120731303030303030",
+        "tx_hash": "7A43C30967D30B12B749111F217A670C0B47B7C5F272BCD82C442C1554351CB7",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "2",
+        "spent_by_me": "0",
+        "received_by_me": "2",
+        "my_balance_change": "2",
+        "block_height": 6148055,
+        "timestamp": 1669797598,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.022114",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "4631313139343742323142303344373639303343333441370000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d1207313030303030301a100a05756e79616e120731303030303030",
+        "tx_hash": "3057F075161ECD149F4F5A629F852D5E7E57411DECE7AD35CC7D11E7EB06E0BF",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "2",
+        "spent_by_me": "0",
+        "received_by_me": "2",
+        "my_balance_change": "2",
+        "block_height": 6148039,
+        "timestamp": 1669797517,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026861",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "3236413546344639343144434531363135373046373530330000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d1207313030303030301a100a05756e79616e120731303030303030",
+        "tx_hash": "14FA04603223A5753DD60ADCE2593FD4AFA0A386E008AF7130916152F11D5748",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "1",
+        "spent_by_me": "0",
+        "received_by_me": "1",
+        "my_balance_change": "1",
+        "block_height": 6148028,
+        "timestamp": 1669797462,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026861",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "4344413036444433353735413332323330363430414634310000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d120731303030303030",
+        "tx_hash": "3DC1E9372E873C69E009B89C3DE232E9E12D0FC941BB98582B729A5D64DB6308",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "1",
+        "spent_by_me": "0",
+        "received_by_me": "1",
+        "my_balance_change": "1",
+        "block_height": 6148010,
+        "timestamp": 1669797371,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.022114",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "4339384239303045393643333738453237333945314344330000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d120731303030303030",
+        "tx_hash": "E75EF2C47E8627B18840606A8F3502D5643984334B2FB5D8C69FF3D1F2B48473",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "1",
+        "spent_by_me": "0",
+        "received_by_me": "1",
+        "my_balance_change": "1",
+        "block_height": 6147988,
+        "timestamp": 1669797261,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.02316",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-NIMDA",
+        "internal_id": "4136303630343838314237323638453734433246453537450000000000000000",
+        "transaction_type": {
+            "TokenTransfer": "e13c266c61de5e79cf37a99b94d4d4462d6857fe8a5dbdde9e041ae01b14a7db"
+        },
+        "memo": ""
+    }
+]
\ No newline at end of file
diff --git a/mm2src/mm2_test_helpers/dummy_files/iris_test_history.json b/mm2src/mm2_test_helpers/dummy_files/iris_test_history.json
new file mode 100644
index 0000000000..6577282ea3
--- /dev/null
+++ b/mm2src/mm2_test_helpers/dummy_files/iris_test_history.json
@@ -0,0 +1,426 @@
+[
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0f0a05756e79616e1206313030303030",
+        "tx_hash": "FA10C0D7C13F4D7A08DEB88368EB8DE3A0610EB42B2A44B7BF17D9C17ABF7DCF",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "0.122145",
+        "spent_by_me": "0.122145",
+        "received_by_me": "0.1",
+        "my_balance_change": "-0.022145",
+        "block_height": 6649830,
+        "timestamp": 1672328326,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.022145",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3338384245443830413744344633314337443043303141460000000000000000",
+        "transaction_type": "StandardTransfer",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301240353136384331423544333836313243373835414530364141344130363036443537433444454343373939333834314338344544313932363138303941333335361a4064323032323032336639656565633338393561326637323063383463613363383638653632656232393139666262613732376262333464623434313739333232",
+        "tx_hash": "072AB56BE582BB1EF82193D6EDF855A0311E53D9240EBEEE5E7844898C54DADD",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.037215",
+        "spent_by_me": "0.027215",
+        "received_by_me": "0.01",
+        "my_balance_change": "-0.017215",
+        "block_height": 6175150,
+        "timestamp": 1669934648,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.027215",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3644333931323846453142423238354542363542413237300000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SignClaimHtlc",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032403838613735653161306166373662636161386266353566313437616266616262313362323964646333316465323161373431363835333966373135643032343240980c",
+        "tx_hash": "B06D02A1449B07E89D15E709C347E0EE72A944687942E5A10467EC096D067FE7",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.027385",
+        "spent_by_me": "0.027385",
+        "received_by_me": "0",
+        "my_balance_change": "-0.027385",
+        "block_height": 6175147,
+        "timestamp": 1669934633,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.027385",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "0000000000000000423036443032413134343942303745383944313545373039",
+        "transaction_type": "FeeForTokenTx",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032406466313465616234366366623230663736613465336233393537656234326137666130646435366137386466623038656134323034666334383762663536323040980c",
+        "tx_hash": "26E7CA4A95C70316195E8C8A3249351710B1BFE89AE9B910463BC8280C0AA9CF",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.028433",
+        "spent_by_me": "0.028433",
+        "received_by_me": "0",
+        "my_balance_change": "-0.028433",
+        "block_height": 6175115,
+        "timestamp": 1669934472,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.028433",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "0000000000000000323645374341344139354337303331363139354538433841",
+        "transaction_type": "FeeForTokenTx",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301240364636394643303235393632413032463736363741414142393932313245393434454244444436434143314235354431443336333139383341413433454145421a4030646432663130353032343463386235316363636239316535363734386336373032343634393263383465323835656234353365363166373630623730356432",
+        "tx_hash": "459F88CACCD57756DDFE2164AABBA2C3D463D0FBA5D85DFD79488416A9BD54FC",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.026403",
+        "spent_by_me": "0.026403",
+        "received_by_me": "0",
+        "my_balance_change": "-0.026403",
+        "block_height": 6175070,
+        "timestamp": 1669934246,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026403",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "0000000000000000343539463838434143434435373735364444464532313634",
+        "transaction_type": "FeeForTokenTx",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0e0a05756e79616e1205313030303032403835306338333863393930363661323466373330363866623537336638356337353836323036613733366330353331323030396233323437313834643130656340980c",
+        "tx_hash": "8A4BD1D952AC833C4C11313580CAC61374C80D1641D6EBD459DE73AFA7DF47F2",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.03856",
+        "spent_by_me": "0.03856",
+        "received_by_me": "0",
+        "my_balance_change": "-0.03856",
+        "block_height": 6175068,
+        "timestamp": 1669934236,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.02856",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3533313331314334433333384341323539443144423441380000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SendHtlcAmount",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316567307167617a37336a737676727676747a713478383233686d7a387161706c64643078347a1a0c0a05756e79616e1203313030",
+        "tx_hash": "734623F6744A44ABA5D551233B409400CF69EC8858302E9AE868A8400E925D51",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [
+            "iaa1eg0qgaz73jsvvrvvtzq4x823hmz8qapldd0x4z"
+        ],
+        "total_amount": "0.022185",
+        "spent_by_me": "0.022185",
+        "received_by_me": "0",
+        "my_balance_change": "-0.022185",
+        "block_height": 6175065,
+        "timestamp": 1669934221,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.022085",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3332313535443541424134344134343736463332363433370000000000000000",
+        "transaction_type": "StandardTransfer",
+        "memo": "505b8d6e-43db-46b7-96d3-5150e7ac2036"
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866321240413231314538373937463739314534434439333241423539424239333545324138354644453843393638374143463644383345373933424545373438463936431a4037626266353433313865643235643530366131393565363432636433343736613835303438393833623030346334653534336663313938313866333130353237",
+        "tx_hash": "252D31A8AFEF8B4C8D9058E9EFAF4ED5A41DB7C032B3849A87375F1DE2B8B9C1",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.000001",
+        "spent_by_me": "0",
+        "received_by_me": "0.000001",
+        "my_balance_change": "0.000001",
+        "block_height": 6173346,
+        "timestamp": 1669925588,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026446",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3945383530394438433442384645464138413133443235320000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "ClaimHtlcAmount",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301240384636304534433336384335344539343233344145424135394331344531384146413138443437303530314434383944444641364539363635444135323738451a4064363034613132626531616239643966343531306435343832666232323762613530363238373531326466333561626337303730313763366439306165303837",
+        "tx_hash": "6BA67D4C7A0F48E5D85EE18EF5A649ED456B539D902828D56849B57DCFF5914B",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.026426",
+        "spent_by_me": "0.026426",
+        "received_by_me": "0",
+        "my_balance_change": "-0.026426",
+        "block_height": 6148319,
+        "timestamp": 1669798925,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026426",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "4538314545353844354538344630413743344437364142360000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SignClaimHtlc",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316572666e6b6a736d616c6b7774766a3434716e6672326472667a6474346e396c6468306b6a762a0a0a05756e79616e12013132403834373331663565393739643965616263343838393234356131613165663932396430386437383832353163353133633834303632373535313032343765326540e807",
+        "tx_hash": "F1C633D16C1578A16450555A06349989A4B1E2223D7AAA2FE12396A5F855FD9B",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.028456",
+        "spent_by_me": "0.028456",
+        "received_by_me": "0",
+        "my_balance_change": "-0.028456",
+        "block_height": 6148318,
+        "timestamp": 1669798920,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.028455",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "4135353530353436314138373531433631443333364331460000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SendHtlcAmount",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301240304544424136304632423642383739324133333739423232453445323144373243343145413530464436353331433243383445413135353937303834373432391a4034353138383334373164316536383461323334663362323063626638646137393338636330643038383562626237326266303837363465386431356536353138",
+        "tx_hash": "10D92256317083E49F06A9DD2184714DEEE9C55A505CFEF037BE8E87E9FB82ED",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.03648",
+        "spent_by_me": "0.02648",
+        "received_by_me": "0.01",
+        "my_balance_change": "-0.01648",
+        "block_height": 6148311,
+        "timestamp": 1669798885,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.02648",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "4444394136304639344533383037313336353232394430310000000000000000",
+        "transaction_type": {
+            "CustomTendermintMsg": {
+                "msg_type": "SignClaimHtlc",
+                "token_id": null
+            }
+        },
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316530727838376d646a37397a656a65777563346a6737716c39756432323836673275733866322a0c0a036e696d1205313030303032403738646661636564613462346362373336366362626638643436336237393061666566363566656538613764356464356264616633613365303766343330623640980c",
+        "tx_hash": "25D9A1F1C9383AC7D56E3E19F3D6B9ED3F52F7D0E9225ABBEA0258FF75E28FC2",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.028433",
+        "spent_by_me": "0.028433",
+        "received_by_me": "0",
+        "my_balance_change": "-0.028433",
+        "block_height": 6148309,
+        "timestamp": 1669798875,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.028433",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "0000000000000000323544394131463143393338334143374435364533453139",
+        "transaction_type": "FeeForTokenTx",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a726130122a696161316567307167617a37336a737676727676747a713478383233686d7a387161706c64643078347a1a0a0a036e696d1203313030",
+        "tx_hash": "D83D8143CAD8C225F3BC24C6DCA324DB2F63C97A21AE2C030328266E9415E50A",
+        "from": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "to": [],
+        "total_amount": "0.025763",
+        "spent_by_me": "0.025763",
+        "received_by_me": "0",
+        "my_balance_change": "-0.025763",
+        "block_height": 6148307,
+        "timestamp": 1669798865,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.025763",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "0000000000000000443833443831343343414438433232354633424332344336",
+        "transaction_type": "FeeForTokenTx",
+        "memo": "2dee652b-6892-46a9-b54a-b3333c6ce7f6"
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d1207313030303030301a100a05756e79616e120731303030303030",
+        "tx_hash": "3057F075161ECD149F4F5A629F852D5E7E57411DECE7AD35CC7D11E7EB06E0BF",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "2",
+        "spent_by_me": "0",
+        "received_by_me": "2",
+        "my_balance_change": "2",
+        "block_height": 6148039,
+        "timestamp": 1669797517,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026861",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3236413546344639343144434531363135373046373530330000000000000001",
+        "transaction_type": "StandardTransfer",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161316530727838376d646a37397a656a65777563346a6737716c3975643232383667327573386632122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a0e0a036e696d1207313030303030301a100a05756e79616e120731303030303030",
+        "tx_hash": "14FA04603223A5753DD60ADCE2593FD4AFA0A386E008AF7130916152F11D5748",
+        "from": [
+            "iaa1e0rx87mdj79zejewuc4jg7ql9ud2286g2us8f2"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "1",
+        "spent_by_me": "0",
+        "received_by_me": "1",
+        "my_balance_change": "1",
+        "block_height": 6148028,
+        "timestamp": 1669797462,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.026861",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "4344413036444433353735413332323330363430414634310000000000000001",
+        "transaction_type": "StandardTransfer",
+        "memo": ""
+    },
+    {
+        "tx_hex": "0a2a696161317039703230667468306c7665647634736d7733327339377079386e74657230716e7774727538122a696161317a36303967397a386566346a6c6b63666767333663326c6a67636d6e6135306c32796a7261301a120a05756e79616e1209313030303030303030",
+        "tx_hash": "AEABA70DB11EAE7D4C47E9F892C99280EF64E0DA58E1B0286DC8A190166A1218",
+        "from": [
+            "iaa1p9p20fth0lvedv4smw32s97py8nter0qnwtru8"
+        ],
+        "to": [
+            "iaa1z609g9z8ef4jlkcfgg36c2ljgcmna50l2yjra0"
+        ],
+        "total_amount": "100",
+        "spent_by_me": "0",
+        "received_by_me": "100",
+        "my_balance_change": "100",
+        "block_height": 6147959,
+        "timestamp": 1669797114,
+        "fee_details": {
+            "type": "Tendermint",
+            "coin": "IRIS-TEST",
+            "amount": "0.2",
+            "gas_limit": 100000
+        },
+        "coin": "IRIS-TEST",
+        "internal_id": "3846394537344334443745414531314244303741424145410000000000000000",
+        "transaction_type": "StandardTransfer",
+        "memo": "test"
+    }
+]
\ No newline at end of file
diff --git a/mm2src/mm2_main/src/mm2_tests/electrums.rs b/mm2src/mm2_test_helpers/src/electrums.rs
similarity index 79%
rename from mm2src/mm2_main/src/mm2_tests/electrums.rs
rename to mm2src/mm2_test_helpers/src/electrums.rs
index 20728e4f23..c47b970579 100644
--- a/mm2src/mm2_main/src/mm2_tests/electrums.rs
+++ b/mm2src/mm2_test_helpers/src/electrums.rs
@@ -1,4 +1,4 @@
-use serde_json::Value as Json;
+use serde_json::{json, Value as Json};
 
 #[cfg(target_arch = "wasm32")]
 pub fn rick_electrums() -> Vec<Json> {
@@ -38,6 +38,25 @@ pub fn morty_electrums() -> Vec<Json> {
     ]
 }
 
+#[allow(dead_code)]
+#[cfg(target_arch = "wasm32")]
+pub fn btc_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:30000", "protocol": "WSS" }),
+        json!({ "url": "electrum2.cipig.net:30000", "protocol": "WSS" }),
+        json!({ "url": "electrum3.cipig.net:30000", "protocol": "WSS" }),
+    ]
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub fn btc_electrums() -> Vec<Json> {
+    vec![
+        json!({ "url": "electrum1.cipig.net:10000" }),
+        json!({ "url": "electrum2.cipig.net:10000" }),
+        json!({ "url": "electrum3.cipig.net:10000" }),
+    ]
+}
+
 #[allow(dead_code)]
 #[cfg(target_arch = "wasm32")]
 pub fn tbtc_electrums() -> Vec<Json> {
diff --git a/mm2src/mm2_test_helpers/src/for_tests.rs b/mm2src/mm2_test_helpers/src/for_tests.rs
index 3a7caf0fe7..2680ced419 100644
--- a/mm2src/mm2_test_helpers/src/for_tests.rs
+++ b/mm2src/mm2_test_helpers/src/for_tests.rs
@@ -1,25 +1,31 @@
 //! Helpers used in the unit and integration tests.
 
+use crate::electrums::qtum_electrums;
+use crate::structs::*;
+use common::custom_futures::repeatable::{Ready, Retry};
+use common::executor::Timer;
+use common::log::debug;
+use common::{cfg_native, now_float, now_ms, repeatable, PagingOptionsEnum};
+use common::{get_utc_timestamp, log};
+use crypto::CryptoCtx;
 use gstuff::{try_s, ERR, ERRL};
 use http::{HeaderMap, StatusCode};
 use lazy_static::lazy_static;
+use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
+use mm2_metrics::{MetricType, MetricsJson};
 use mm2_number::BigDecimal;
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use serde_json::{self as json, json, Value as Json};
 use std::collections::HashMap;
+use std::convert::TryFrom;
+use std::env;
 use std::net::IpAddr;
 use std::num::NonZeroUsize;
 use std::process::Child;
 use std::sync::Mutex;
 use uuid::Uuid;
 
-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 common::block_on;
     use common::log::dashboard_path;
@@ -33,16 +39,16 @@ cfg_native! {
     use gstuff::ISATTY;
     use http::Request;
     use regex::Regex;
-    use std::env;
     use std::fs;
     use std::net::Ipv4Addr;
     use std::path::{Path, PathBuf};
     use std::process::Command;
 }
 
-pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
+pub const MAKER_SUCCESS_EVENTS: [&str; 12] = [
     "Started",
     "Negotiated",
+    "MakerPaymentInstructionsReceived",
     "TakerFeeValidated",
     "MakerPaymentSent",
     "TakerPaymentReceived",
@@ -54,7 +60,7 @@ pub const MAKER_SUCCESS_EVENTS: [&str; 11] = [
     "Finished",
 ];
 
-pub const MAKER_ERROR_EVENTS: [&str; 13] = [
+pub const MAKER_ERROR_EVENTS: [&str; 15] = [
     "StartFailed",
     "NegotiateFailed",
     "TakerFeeValidateFailed",
@@ -66,14 +72,17 @@ pub const MAKER_ERROR_EVENTS: [&str; 13] = [
     "TakerPaymentSpendFailed",
     "TakerPaymentSpendConfirmFailed",
     "MakerPaymentWaitRefundStarted",
+    "MakerPaymentRefundStarted",
     "MakerPaymentRefunded",
     "MakerPaymentRefundFailed",
+    "MakerPaymentRefundFinished",
 ];
 
-pub const TAKER_SUCCESS_EVENTS: [&str; 10] = [
+pub const TAKER_SUCCESS_EVENTS: [&str; 11] = [
     "Started",
     "Negotiated",
     "TakerFeeSent",
+    "TakerPaymentInstructionsReceived",
     "MakerPaymentReceived",
     "MakerPaymentWaitConfirmStarted",
     "MakerPaymentValidatedAndConfirmed",
@@ -83,7 +92,7 @@ pub const TAKER_SUCCESS_EVENTS: [&str; 10] = [
     "Finished",
 ];
 
-pub const TAKER_ERROR_EVENTS: [&str; 13] = [
+pub const TAKER_ERROR_EVENTS: [&str; 15] = [
     "StartFailed",
     "NegotiateFailed",
     "TakerFeeSendFailed",
@@ -95,25 +104,57 @@ pub const TAKER_ERROR_EVENTS: [&str; 13] = [
     "TakerPaymentWaitForSpendFailed",
     "MakerPaymentSpendFailed",
     "TakerPaymentWaitRefundStarted",
+    "TakerPaymentRefundStarted",
     "TakerPaymentRefunded",
     "TakerPaymentRefundFailed",
+    "TakerPaymentRefundFinished",
 ];
 
 pub const RICK: &str = "RICK";
+pub const RICK_ELECTRUM_ADDRS: &[&str] = &[
+    "electrum1.cipig.net:10017",
+    "electrum2.cipig.net:10017",
+    "electrum3.cipig.net:10017",
+];
 pub const MORTY: &str = "MORTY";
+pub const MORTY_ELECTRUM_ADDRS: &[&str] = &[
+    "electrum1.cipig.net:10018",
+    "electrum2.cipig.net:10018",
+    "electrum3.cipig.net:10018",
+];
 pub const ZOMBIE_TICKER: &str = "ZOMBIE";
 pub const ARRR: &str = "ARRR";
 pub const ZOMBIE_ELECTRUMS: &[&str] = &["zombie.sirseven.me:10033"];
 pub const ZOMBIE_LIGHTWALLETD_URLS: &[&str] = &["http://zombie.sirseven.me:443"];
 pub const PIRATE_ELECTRUMS: &[&str] = &["pirate.sirseven.me:10032"];
 pub const PIRATE_LIGHTWALLETD_URLS: &[&str] = &["http://pirate.sirseven.me:443"];
-const DEFAULT_RPC_PASSWORD: &str = "pass";
+pub const DEFAULT_RPC_PASSWORD: &str = "pass";
+pub const QRC20_ELECTRUMS: &[&str] = &[
+    "electrum1.cipig.net:10071",
+    "electrum2.cipig.net:10071",
+    "electrum3.cipig.net:10071",
+];
+pub const TBTC_ELECTRUMS: &[&str] = &[
+    "electrum1.cipig.net:10068",
+    "electrum2.cipig.net:10068",
+    "electrum3.cipig.net:10068",
+];
+
+pub const ETH_MAINNET_NODE: &str = "https://mainnet.infura.io/v3/c01c1b4cf66642528547624e1d6d9d6b";
+pub const ETH_MAINNET_SWAP_CONTRACT: &str = "0x24abe4c71fc658c91313b6552cd40cd808b3ea80";
+
+pub const ETH_DEV_NODES: &[&str] = &["http://195.201.0.6:8565"];
+pub const ETH_DEV_SWAP_CONTRACT: &str = "0xa09ad3cd7e96586ebd05a2607ee56b56fb2db8fd";
+
+pub const ETH_SEPOLIA_NODE: &[&str] = &["https://rpc-sepolia.rockx.com/"];
+pub const ETH_SEPOLIA_SWAP_CONTRACT: &str = "0xA25E0e06fB139CDc2f9f11675877DaD9EdD1C352";
+pub const ETH_SEPOLIA_TOKEN_CONTRACT: &str = "0x948BF5172383F1Bc0Fdf3aBe0630b855694A5D2c";
+
+pub const BCHD_TESTNET_URLS: &[&str] = &["https://bchd-testnet.greyh.at:18335"];
 
 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 {
@@ -128,11 +169,70 @@ impl Mm2TestConf {
                 "i_am_seed": true,
             }),
             rpc_password: DEFAULT_RPC_PASSWORD.into(),
-            local: None,
+        }
+    }
+
+    pub fn seednode_using_watchers(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,
+                "use_watchers": true,
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
+        }
+    }
+
+    pub fn seednode_with_hd_account(passphrase: &str, hd_account_id: u32, coins: &Json) -> Self {
+        Mm2TestConf {
+            conf: json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "passphrase": passphrase,
+                "coins": coins,
+                "rpc_password": DEFAULT_RPC_PASSWORD,
+                "i_am_seed": true,
+                "hd_account_id": hd_account_id,
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
         }
     }
 
     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(),
+        }
+    }
+
+    pub fn watcher_light_node(passphrase: &str, coins: &Json, seednodes: &[&str], conf: WatcherConf) -> Self {
+        Mm2TestConf {
+            conf: json!({
+                "gui": "nogui",
+                "netid": 9998,
+                "passphrase": passphrase,
+                "coins": coins,
+                "rpc_password": DEFAULT_RPC_PASSWORD,
+                "seednodes": seednodes,
+                "is_watcher": true,
+                "watcher_conf": conf
+            }),
+            rpc_password: DEFAULT_RPC_PASSWORD.into(),
+        }
+    }
+
+    pub fn light_node_with_hd_account(passphrase: &str, hd_account_id: u32, coins: &Json, seednodes: &[&str]) -> Self {
         Mm2TestConf {
             conf: json!({
                 "gui": "nogui",
@@ -141,9 +241,9 @@ impl Mm2TestConf {
                 "coins": coins,
                 "rpc_password": DEFAULT_RPC_PASSWORD,
                 "seednodes": seednodes,
+                "hd_account_id": hd_account_id,
             }),
             rpc_password: DEFAULT_RPC_PASSWORD.into(),
-            local: None,
         }
     }
 
@@ -157,11 +257,50 @@ impl Mm2TestConf {
                 "seednodes": seednodes,
             }),
             rpc_password: DEFAULT_RPC_PASSWORD.into(),
-            local: None,
         }
     }
 }
 
+pub struct Mm2TestConfForSwap;
+
+impl Mm2TestConfForSwap {
+    /// TODO consider moving it to read it from a env file.
+    const BOB_HD_PASSPHRASE: &'static str =
+        "involve work eager scene give acoustic tooth mimic dance smoke hold foster";
+    /// TODO consider moving it to read it from a env file.
+    const ALICE_HD_PASSPHRASE: &'static str =
+        "tank abandon bind salon remove wisdom net size aspect direct source fossil";
+
+    pub fn bob_conf_with_policy(priv_key_policy: Mm2InitPrivKeyPolicy, coins: &Json) -> Mm2TestConf {
+        match priv_key_policy {
+            Mm2InitPrivKeyPolicy::Iguana => {
+                let bob_passphrase = crate::get_passphrase!(".env.seed", "BOB_PASSPHRASE").unwrap();
+                Mm2TestConf::seednode(&bob_passphrase, coins)
+            },
+            Mm2InitPrivKeyPolicy::GlobalHDAccount(hd_account_id) => {
+                Mm2TestConf::seednode_with_hd_account(Self::BOB_HD_PASSPHRASE, hd_account_id, coins)
+            },
+        }
+    }
+
+    pub fn alice_conf_with_policy(priv_key_policy: Mm2InitPrivKeyPolicy, coins: &Json, bob_ip: &str) -> Mm2TestConf {
+        match priv_key_policy {
+            Mm2InitPrivKeyPolicy::Iguana => {
+                let alice_passphrase = crate::get_passphrase!(".env.client", "ALICE_PASSPHRASE").unwrap();
+                Mm2TestConf::light_node(&alice_passphrase, coins, &[bob_ip])
+            },
+            Mm2InitPrivKeyPolicy::GlobalHDAccount(hd_account_id) => {
+                Mm2TestConf::light_node_with_hd_account(Self::ALICE_HD_PASSPHRASE, hd_account_id, coins, &[bob_ip])
+            },
+        }
+    }
+}
+
+pub enum Mm2InitPrivKeyPolicy {
+    Iguana,
+    GlobalHDAccount(u32),
+}
+
 pub fn zombie_conf() -> Json {
     json!({
         "coin":"ZOMBIE",
@@ -184,10 +323,18 @@ pub fn zombie_conf() -> Json {
                     "hrp_sapling_payment_address": "zs",
                     "b58_pubkey_address_prefix": [ 28, 184 ],
                     "b58_script_address_prefix": [ 28, 189 ]
-                }
+                },
+                "check_point_block": {
+                    "height": 290000,
+                    "time": 1664200629,
+                    "hash": "106BAA72C53E7FA52E30E6D3D15B37001207E3CF3B9FCE9BAB6C6D4AF9ED9200",
+                    "sapling_tree": "017797D05B070D29A47EFEBE3FAD3F29345D31BE608C46A5131CD55D201A631C13000D000119CE6220D0CB0F82AD6466B677828A0B4C2983662DAB181A86F913F7E9FB9C28000139C4399E4CA741CBABBDDAEB6DCC3541BA902343E394160EEECCDF20C289BA65011823D28B592E9612A6C3CF4778F174E10B1B714B4FF85E6E58EE19DD4A0D5734016FA4682B0007E61B63A0442B85E0B8C0CE2409E665F219013B5E24E385F6066B00000001A325043E11CD6A431A0BD99141C4C6E9632A156185EB9B0DBEF665EEC803DD6F00000103C11FCCC90C2EC1A126635F708311EDEF9B93D3E752E053D3AA9EFA0AF9D526"
+                },
+                "z_derivation_path": "m/32'/133'",
             }
         },
-        "required_confirmations":0
+        "required_confirmations":0,
+        "derivation_path": "m/44'/133'",
     })
 }
 
@@ -233,6 +380,7 @@ pub fn rick_conf() -> Json {
         "required_confirmations":0,
         "txversion":4,
         "overwintered":1,
+        "derivation_path": "m/44'/141'",
         "protocol":{
             "type":"UTXO"
         }
@@ -246,12 +394,394 @@ pub fn morty_conf() -> Json {
         "required_confirmations":0,
         "txversion":4,
         "overwintered":1,
+        "derivation_path": "m/44'/141'",
+        "protocol":{
+            "type":"UTXO"
+        }
+    })
+}
+
+pub fn kmd_conf(tx_fee: u64) -> Json {
+    json!({
+        "coin":"KMD",
+        "txversion":4,
+        "overwintered":1,
+        "txfee":tx_fee,
+        "protocol":{
+            "type":"UTXO"
+        }
+    })
+}
+
+pub fn mycoin_conf(tx_fee: u64) -> Json {
+    json!({
+        "coin":"MYCOIN",
+        "asset":"MYCOIN",
+        "txversion":4,
+        "overwintered":1,
+        "txfee":tx_fee,
+        "protocol":{
+            "type":"UTXO"
+        }
+    })
+}
+
+pub fn mycoin1_conf(tx_fee: u64) -> Json {
+    json!({
+        "coin":"MYCOIN1",
+        "asset":"MYCOIN1",
+        "txversion":4,
+        "overwintered":1,
+        "txfee":tx_fee,
         "protocol":{
             "type":"UTXO"
         }
     })
 }
 
+pub fn atom_testnet_conf() -> Json {
+    json!({
+        "coin":"ATOM",
+        "avg_blocktime": 5,
+        "protocol":{
+            "type":"TENDERMINT",
+            "protocol_data": {
+                "decimals": 6,
+                "denom": "uatom",
+                "account_prefix": "cosmos",
+                "chain_id": "theta-testnet-001",
+            },
+        }
+    })
+}
+
+pub fn btc_segwit_conf() -> Json {
+    json!({
+        "coin": "BTC-segwit",
+        "name": "bitcoin",
+        "fname": "Bitcoin",
+        "rpcport": 8332,
+        "pubtype": 0,
+        "p2shtype": 5,
+        "wiftype": 128,
+        "segwit": true,
+        "bech32_hrp": "bc",
+        "address_format": {
+            "format": "segwit"
+        },
+        "orderbook_ticker": "BTC",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "mm2": 1,
+        "required_confirmations": 1,
+        "avg_blocktime": 10,
+        "derivation_path": "m/84'/0'",
+        "protocol": {
+            "type": "UTXO"
+        }
+    })
+}
+
+pub fn btc_with_spv_conf() -> Json {
+    json!({
+        "coin": "BTC",
+        "asset":"BTC",
+        "pubtype": 0,
+        "p2shtype": 5,
+        "wiftype": 128,
+        "segwit": true,
+        "bech32_hrp": "bc",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "required_confirmations": 0,
+        "protocol": {
+            "type": "UTXO"
+        },
+        "spv_conf": {
+            "starting_block_header": {
+                "height": 0,
+                "hash": "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f",
+                "bits": 486604799,
+                "time": 1231006505,
+            },
+            "validation_params": {
+                "difficulty_check": true,
+                "constant_difficulty": false,
+                "difficulty_algorithm": "Bitcoin Mainnet"
+            }
+        }
+    })
+}
+
+pub fn btc_with_sync_starting_header() -> Json {
+    json!({
+        "coin": "BTC",
+        "asset":"BTC",
+        "pubtype": 0,
+        "p2shtype": 5,
+        "wiftype": 128,
+        "segwit": true,
+        "bech32_hrp": "bc",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "required_confirmations": 0,
+        "protocol": {
+            "type": "UTXO"
+        },
+        "spv_conf": {
+            "starting_block_header": {
+                "height": 764064,
+                "hash": "00000000000000000006da48b920343944908861fa05b28824922d9e60aaa94d",
+                "bits": 386375189,
+                "time": 1668986059,
+            },
+            "max_stored_block_headers": 3000,
+            "validation_params": {
+                "difficulty_check": true,
+                "constant_difficulty": false,
+                "difficulty_algorithm": "Bitcoin Mainnet"
+            }
+        }
+    })
+}
+
+pub fn tbtc_conf() -> Json {
+    json!({
+        "coin": "tBTC",
+        "asset":"tBTC",
+        "pubtype": 111,
+        "p2shtype": 196,
+        "wiftype": 239,
+        "segwit": true,
+        "bech32_hrp": "tb",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "required_confirmations": 0,
+        "protocol": {
+            "type": "UTXO"
+        }
+    })
+}
+
+pub fn tbtc_segwit_conf() -> Json {
+    json!({
+        "coin": "tBTC-Segwit",
+        "asset":"tBTC-Segwit",
+        "pubtype": 111,
+        "p2shtype": 196,
+        "wiftype": 239,
+        "segwit": true,
+        "bech32_hrp": "tb",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "required_confirmations": 0,
+        "address_format": {
+            "format": "segwit"
+        },
+        "protocol": {
+            "type": "UTXO"
+        },
+        "orderbook_ticker": "tBTC",
+    })
+}
+
+pub fn tbtc_with_spv_conf() -> Json {
+    json!({
+        "coin": "tBTC-TEST",
+        "asset":"tBTC-TEST",
+        "pubtype": 111,
+        "p2shtype": 196,
+        "wiftype": 239,
+        "segwit": true,
+        "bech32_hrp": "tb",
+        "txfee": 0,
+        "estimate_fee_mode": "ECONOMICAL",
+        "required_confirmations": 0,
+        "enable_spv_proof": true,
+        "protocol": {
+            "type": "UTXO"
+        },
+        "spv_conf": {
+            "starting_block_header": {
+                "height": 0,
+                "hash": "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943",
+                "bits": 486604799,
+                "time": 1296688602,
+            },
+            "validation_params": {
+                "difficulty_check": true,
+                "constant_difficulty": false,
+                "difficulty_algorithm": "Bitcoin Testnet"
+            }
+        }
+    })
+}
+
+pub fn eth_testnet_conf() -> Json {
+    json!({
+        "coin": "ETH",
+        "name": "ethereum",
+        "derivation_path": "m/44'/60'",
+        "protocol": {
+            "type": "ETH"
+        }
+    })
+}
+
+pub fn eth_jst_testnet_conf() -> Json {
+    json!({
+        "coin": "JST",
+        "name": "jst",
+        "derivation_path": "m/44'/60'",
+        "protocol": {
+            "type": "ERC20",
+            "protocol_data": {
+                "platform": "ETH",
+                "contract_address": "0x2b294F029Fde858b2c62184e8390591755521d8E"
+            }
+        }
+    })
+}
+
+pub fn eth_jst_conf(contract_address: &str) -> Json {
+    json!({
+        "coin": "JST",
+        "name": "jst",
+        "protocol": {
+            "type": "ERC20",
+            "protocol_data": {
+                "platform": "ETH",
+                "contract_address": contract_address
+            }
+        }
+    })
+}
+
+pub fn iris_testnet_conf() -> Json {
+    json!({
+        "coin": "IRIS-TEST",
+        "avg_blocktime": 5,
+        "derivation_path": "m/44'/566'",
+        "protocol":{
+            "type":"TENDERMINT",
+            "protocol_data": {
+                "decimals": 6,
+                "denom": "unyan",
+                "account_prefix": "iaa",
+                "chain_id": "nyancat-9",
+            },
+        }
+    })
+}
+
+pub fn iris_nimda_testnet_conf() -> Json {
+    json!({
+        "coin": "IRIS-NIMDA",
+        "derivation_path": "m/44'/566'",
+        "protocol": {
+            "type": "TENDERMINTTOKEN",
+            "protocol_data": {
+                "platform": "IRIS-TEST",
+                "decimals": 6,
+                "denom": "nim",
+            },
+        }
+    })
+}
+
+pub fn usdc_ibc_iris_testnet_conf() -> Json {
+    json!({
+        "coin":"USDC-IBC-IRIS",
+        "protocol":{
+            "type":"TENDERMINTTOKEN",
+            "protocol_data": {
+                "platform": "IRIS-TEST",
+                "decimals": 6,
+                "denom": "ibc/5C465997B4F582F602CD64E12031C6A6E18CAF1E6EDC9B5D808822DC0B5F850C",
+            },
+        }
+    })
+}
+
+/// `245` is SLP coin type within the derivation path.
+pub fn tbch_for_slp_conf() -> Json {
+    json!({
+        "coin": "tBCH",
+        "pubtype": 0,
+        "p2shtype": 5,
+        "mm2": 1,
+        "derivation_path": "m/44'/245'",
+        "protocol": {
+            "type": "BCH",
+            "protocol_data": {
+                "slp_prefix": "slptest"
+            }
+        },
+        "address_format": {
+            "format": "cashaddress",
+            "network": "bchtest"
+        }
+    })
+}
+
+pub fn tbch_usdf_conf() -> Json {
+    json!({
+        "coin": "USDF",
+        "protocol": {
+            "type": "SLPTOKEN",
+            "protocol_data": {
+                "decimals": 4,
+                "token_id": "bb309e48930671582bea508f9a1d9b491e49b69be3d6f372dc08da2ac6e90eb7",
+                "platform": "tBCH",
+                "required_confirmations": 1
+            }
+        }
+    })
+}
+
+pub fn tbnb_conf() -> Json {
+    json!({
+        "coin": "tBNB",
+        "name": "binancesmartchaintest",
+        "avg_blocktime": 0.25,
+        "chain_id": 97,
+        "mm2": 1,
+        "required_confirmations": 0,
+        "protocol": {
+            "type": "ETH"
+        }
+    })
+}
+
+pub fn tqrc20_conf() -> Json {
+    json!({
+        "coin": "QRC20",
+        "required_confirmations": 0,
+        "pubtype": 120,
+        "p2shtype": 50,
+        "wiftype": 128,
+        "txfee": 0,
+        "mm2": 1,
+        "mature_confirmations": 2000,
+        "derivation_path": "m/44'/2301'",
+        "protocol": {
+            "type": "QRC20",
+            "protocol_data": {
+                "platform": "QTUM",
+                "contract_address": "0xd362e096e873eb7907e205fadc6175c6fec7bc44"
+            }
+        }
+    })
+}
+
+pub fn mm_ctx_with_iguana(passphrase: Option<&str>) -> MmArc {
+    const DEFAULT_IGUANA_PASSPHRASE: &str = "123";
+
+    let ctx = MmCtxBuilder::default().into_mm_arc();
+    CryptoCtx::init_with_iguana_passphrase(ctx.clone(), passphrase.unwrap_or(DEFAULT_IGUANA_PASSPHRASE)).unwrap();
+    ctx
+}
+
 #[cfg(target_arch = "wasm32")]
 pub fn mm_ctx_with_custom_db() -> MmArc { MmCtxBuilder::new().with_test_db_namespace().into_mm_arc() }
 
@@ -261,8 +791,13 @@ pub fn mm_ctx_with_custom_db() -> MmArc {
     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)));
+
+    let connection = Connection::open_in_memory().unwrap();
+    let _ = ctx.shared_sqlite_conn.pin(Arc::new(Mutex::new(connection)));
+
     ctx
 }
 
@@ -453,7 +988,7 @@ impl MarketMakerIt {
             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)
+            let child = try_s!(Command::new(executable)
                 .arg("test_mm_start")
                 .arg("--nocapture")
                 .current_dir(&folder)
@@ -556,22 +1091,27 @@ impl MarketMakerIt {
     /// The difference from standard wait_for_log is this function keeps working
     /// after process is stopped
     #[cfg(not(target_arch = "wasm32"))]
-    pub async fn wait_for_log_after_stop<F>(&mut self, timeout_sec: f64, pred: F) -> Result<(), String>
+    pub async fn wait_for_log_after_stop<F>(&self, timeout_sec: f64, pred: F) -> Result<(), String>
     where
         F: Fn(&str) -> bool,
     {
-        let start = now_float();
+        use common::try_or_ready_err;
+
         let ms = 50.min((timeout_sec * 1000.) as u64 / 20 + 10);
-        loop {
-            let mm_log = try_s!(self.log_as_utf8());
+
+        repeatable!(async {
+            let mm_log = try_or_ready_err!(self.log_as_utf8());
             if pred(&mm_log) {
-                return Ok(());
-            }
-            if now_float() - start > timeout_sec {
-                return ERR!("Timeout expired waiting for a log condition");
+                return Ready(Ok(()));
             }
-            Timer::sleep(ms as f64 / 1000.).await
-        }
+            Retry(())
+        })
+        .repeat_every_ms(ms)
+        .with_timeout_secs(timeout_sec)
+        .await
+        .map_err(|e| ERRL!("{:?}", e))
+        // Convert `Result<Result<(), String>, String>` to `Result<(), String>`
+        .flatten()
     }
 
     /// Busy-wait on the instance in-memory log until the `pred` returns `true` or `timeout_sec` expires.
@@ -656,7 +1196,7 @@ impl MarketMakerIt {
 
     /// 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,
@@ -675,6 +1215,27 @@ impl MarketMakerIt {
         Ok(())
     }
 
+    #[cfg(target_arch = "wasm32")]
+    pub async fn stop_and_wait_for_ctx_is_dropped(self, timeout_ms: u64) -> Result<(), String> {
+        try_s!(self.stop().await);
+        let ctx_weak = self.ctx.weak();
+        drop(self);
+
+        let started_at = now_ms();
+        repeatable!(async {
+            if MmArc::from_weak(&ctx_weak).is_none() {
+                let took_ms = now_ms() - started_at;
+                log!("stop] MmCtx was dropped in {took_ms}ms");
+                return Ready(());
+            }
+            Retry(())
+        })
+        .repeat_every_secs(0.05)
+        .with_timeout_ms(timeout_ms)
+        .await
+        .map_err(|e| ERRL!("{:?}", e))
+    }
+
     /// 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"))]
@@ -781,7 +1342,7 @@ where
     F: Fn(&str) -> bool,
 {
     let start = now_float();
-    let ms = 50.min((timeout_sec * 1000.) as u32 / 20 + 10);
+    let ms = 50.min((timeout_sec * 1000.) as u64 / 20 + 10);
     let mut buf = String::with_capacity(128);
     let mut found = false;
     loop {
@@ -861,13 +1422,10 @@ pub fn mm_dump(log_path: &Path) -> (RaiiDump, RaiiDump) {
 
 /// A typical MM instance.
 #[cfg(not(target_arch = "wasm32"))]
-pub fn mm_spat(
-    local_start: LocalStart,
-    conf_mod: &dyn Fn(Json) -> Json,
-) -> (&'static str, MarketMakerIt, RaiiDump, RaiiDump) {
+pub fn mm_spat() -> (&'static str, MarketMakerIt, RaiiDump, RaiiDump) {
     let passphrase = "SPATsRps3dhEtXwtnpRCKF";
     let mm = MarketMakerIt::start(
-        conf_mod(json! ({
+        json!({
             "gui": "nogui",
             "passphrase": passphrase,
             "rpccors": "http://localhost:4000",
@@ -877,26 +1435,15 @@ pub fn mm_spat(
             ],
             "i_am_seed": true,
             "rpc_password": "pass",
-        })),
+        }),
         "pass".into(),
-        match common::var("LOCAL_THREAD_MM") {
-            Ok(ref e) if e == "1" => Some(local_start),
-            _ => None,
-        },
+        None,
     )
     .unwrap();
     let (dump_log, dump_dashboard) = mm_dump(&mm.log_path);
     (passphrase, mm, dump_log, dump_dashboard)
 }
 
-#[cfg(target_arch = "wasm32")]
-pub fn mm_spat(
-    _local_start: LocalStart,
-    _conf_mod: &dyn Fn(Json) -> Json,
-) -> (&'static str, MarketMakerIt, RaiiDump, RaiiDump) {
-    unimplemented!()
-}
-
 /// 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 {
@@ -908,7 +1455,7 @@ pub async fn enable_electrum(mm: &MarketMakerIt, coin: &str, tx_history: bool, u
 /// fresh list of servers at https://github.com/jl777/coins/blob/master/electrums/.
 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,
@@ -931,7 +1478,7 @@ pub async fn enable_electrum_json(mm: &MarketMakerIt, coin: &str, tx_history: bo
 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,
@@ -976,7 +1523,9 @@ pub fn from_env_file(env: Vec<u8>) -> (Option<String>, Option<String>) {
 #[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))
+        option_env!($env)
+            .map(|pass| pass.to_string())
+            .ok_or_else(|| ERRL!("No such '{}' environment variable", $env))
     };
 }
 
@@ -1006,7 +1555,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,
@@ -1021,6 +1570,29 @@ pub async fn enable_native(mm: &MarketMakerIt, coin: &str, urls: &[&str]) -> Jso
     json::from_str(&native.1).unwrap()
 }
 
+pub async fn enable_eth_coin(
+    mm: &MarketMakerIt,
+    coin: &str,
+    urls: &[&str],
+    swap_contract_address: &str,
+    fallback_swap_contract: Option<&str>,
+) -> Json {
+    let enable = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "enable",
+            "coin": coin,
+            "urls": urls,
+            "swap_contract_address": swap_contract_address,
+            "fallback_swap_contract": fallback_swap_contract,
+            "mm2": 1,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(enable.0, StatusCode::OK, "'enable' failed: {}", enable.1);
+    json::from_str(&enable.1).unwrap()
+}
+
 pub async fn enable_spl(mm: &MarketMakerIt, coin: &str) -> Json {
     let req = json!({
         "userpass": mm.userpass,
@@ -1038,7 +1610,7 @@ pub async fn enable_spl(mm: &MarketMakerIt, coin: &str) -> Json {
 
 pub async fn enable_slp(mm: &MarketMakerIt, coin: &str) -> Json {
     let enable = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "enable_slp",
             "mmrpc": "2.0",
@@ -1053,9 +1625,24 @@ pub async fn enable_slp(mm: &MarketMakerIt, coin: &str) -> Json {
     json::from_str(&enable.1).unwrap()
 }
 
+#[allow(clippy::upper_case_acronyms)]
+#[derive(Serialize)]
+pub enum ElectrumProtocol {
+    /// TCP
+    TCP,
+    /// SSL/TLS
+    SSL,
+    /// Insecure WebSocket.
+    WS,
+    /// Secure WebSocket.
+    WSS,
+}
+
 #[derive(Serialize)]
 pub struct ElectrumRpcRequest {
     pub url: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub protocol: Option<ElectrumProtocol>,
 }
 
 #[derive(Serialize)]
@@ -1065,10 +1652,25 @@ pub enum UtxoRpcMode {
     Electrum { servers: Vec<ElectrumRpcRequest> },
 }
 
+#[cfg(not(target_arch = "wasm32"))]
 fn electrum_servers_rpc(servers: &[&str]) -> Vec<ElectrumRpcRequest> {
     servers
         .iter()
-        .map(|url| ElectrumRpcRequest { url: url.to_string() })
+        .map(|url| ElectrumRpcRequest {
+            url: url.to_string(),
+            protocol: None,
+        })
+        .collect()
+}
+
+#[cfg(target_arch = "wasm32")]
+fn electrum_servers_rpc(servers: &[&str]) -> Vec<ElectrumRpcRequest> {
+    servers
+        .iter()
+        .map(|url| ElectrumRpcRequest {
+            url: url.to_string(),
+            protocol: Some(ElectrumProtocol::WSS),
+        })
         .collect()
 }
 
@@ -1090,7 +1692,7 @@ pub async fn enable_bch_with_tokens(
     let slp_requests: Vec<_> = tokens.iter().map(|ticker| json!({ "ticker": ticker })).collect();
 
     let enable = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "enable_bch_with_tokens",
             "mmrpc": "2.0",
@@ -1122,7 +1724,7 @@ pub async fn enable_solana_with_tokens(
     tx_history: bool,
 ) -> Json {
     let spl_requests: Vec<_> = tokens.iter().map(|ticker| json!({ "ticker": ticker })).collect();
-    let req = json! ({
+    let req = json!({
         "userpass": mm.userpass,
         "method": "enable_solana_with_tokens",
         "mmrpc": "2.0",
@@ -1154,7 +1756,7 @@ pub async fn my_tx_history_v2(
 ) -> Json {
     let paging = paging.unwrap_or(PagingOptionsEnum::PageNumber(NonZeroUsize::new(1).unwrap()));
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "my_tx_history",
             "mmrpc": "2.0",
@@ -1178,7 +1780,7 @@ pub async fn z_coin_tx_history(
 ) -> Json {
     let paging = paging.unwrap_or_default();
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "z_coin_tx_history",
             "mmrpc": "2.0",
@@ -1196,7 +1798,7 @@ pub async fn z_coin_tx_history(
 
 pub async fn enable_native_bch(mm: &MarketMakerIt, coin: &str, bchd_urls: &[&str]) -> Json {
     let native = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "enable",
             "coin": coin,
@@ -1210,11 +1812,11 @@ pub async fn enable_native_bch(mm: &MarketMakerIt, coin: &str, bchd_urls: &[&str
     json::from_str(&native.1).unwrap()
 }
 
-pub async fn enable_lightning(mm: &MarketMakerIt, coin: &str) -> Json {
-    let enable = mm
-        .rpc(&json! ({
+pub async fn init_lightning(mm: &MarketMakerIt, coin: &str) -> Json {
+    let request = mm
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "enable_lightning",
+            "method": "task::enable_lightning::init",
             "mmrpc": "2.0",
             "params": {
                 "ticker": coin,
@@ -1225,8 +1827,34 @@ pub async fn enable_lightning(mm: &MarketMakerIt, coin: &str) -> Json {
         }))
         .await
         .unwrap();
-    assert_eq!(enable.0, StatusCode::OK, "'enable_lightning' failed: {}", enable.1);
-    json::from_str(&enable.1).unwrap()
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_lightning::init' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_lightning_status(mm: &MarketMakerIt, task_id: u64) -> Json {
+    let request = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "task::enable_lightning::status",
+            "mmrpc": "2.0",
+            "params": {
+                "task_id": task_id,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_lightning::status' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
 }
 
 /// Use a separate (unique) temporary folder for each MM.
@@ -1236,6 +1864,7 @@ pub async fn enable_lightning(mm: &MarketMakerIt, coin: &str) -> Json {
 #[cfg(not(target_arch = "wasm32"))]
 pub fn new_mm2_temp_folder_path(ip: Option<IpAddr>) -> PathBuf {
     let now = common::now_ms();
+    #[allow(deprecated)]
     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),
@@ -1274,17 +1903,9 @@ pub fn find_metrics_in_json(
     })
 }
 
-/// Helper function requesting my swap status and checking it's events
-pub async fn check_my_swap_status(
-    mm: &MarketMakerIt,
-    uuid: &str,
-    expected_success_events: &[&str],
-    expected_error_events: &[&str],
-    maker_amount: BigDecimal,
-    taker_amount: BigDecimal,
-) {
+pub async fn my_swap_status(mm: &MarketMakerIt, uuid: &str) -> Json {
     let response = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "my_swap_status",
             "params": {
@@ -1294,7 +1915,63 @@ pub async fn check_my_swap_status(
         .await
         .unwrap();
     assert!(response.0.is_success(), "!status of {}: {}", uuid, response.1);
-    let status_response: Json = json::from_str(&response.1).unwrap();
+    json::from_str(&response.1).unwrap()
+}
+
+pub async fn wait_for_swap_contract_negotiation(mm: &MarketMakerIt, swap: &str, expected_contract: Json, until: i64) {
+    let events = loop {
+        if get_utc_timestamp() > until {
+            panic!("Timed out");
+        }
+
+        let swap_status = my_swap_status(mm, swap).await;
+        let events = swap_status["result"]["events"].as_array().unwrap();
+        if events.len() < 2 {
+            Timer::sleep(1.).await;
+            continue;
+        }
+
+        break events.clone();
+    };
+    assert_eq!(events[1]["event"]["type"], Json::from("Negotiated"));
+    assert_eq!(
+        events[1]["event"]["data"]["maker_coin_swap_contract_addr"],
+        expected_contract
+    );
+    assert_eq!(
+        events[1]["event"]["data"]["taker_coin_swap_contract_addr"],
+        expected_contract
+    );
+}
+
+pub async fn wait_for_swap_negotiation_failure(mm: &MarketMakerIt, swap: &str, until: i64) {
+    let events = loop {
+        if get_utc_timestamp() > until {
+            panic!("Timed out");
+        }
+
+        let swap_status = my_swap_status(mm, swap).await;
+        let events = swap_status["result"]["events"].as_array().unwrap();
+        if events.len() < 2 {
+            Timer::sleep(1.).await;
+            continue;
+        }
+
+        break events.clone();
+    };
+    assert_eq!(events[1]["event"]["type"], Json::from("NegotiateFailed"));
+}
+
+/// Helper function requesting my swap status and checking it's events
+pub async fn check_my_swap_status(
+    mm: &MarketMakerIt,
+    uuid: &str,
+    expected_success_events: &[&str],
+    expected_error_events: &[&str],
+    maker_amount: BigDecimal,
+    taker_amount: BigDecimal,
+) {
+    let status_response = my_swap_status(mm, uuid).await;
     let success_events: Vec<String> = json::from_value(status_response["result"]["success_events"].clone()).unwrap();
     assert_eq!(expected_success_events, success_events.as_slice());
     let error_events: Vec<String> = json::from_value(status_response["result"]["error_events"].clone()).unwrap();
@@ -1316,18 +1993,7 @@ pub async fn check_my_swap_status_amounts(
     maker_amount: BigDecimal,
     taker_amount: BigDecimal,
 ) {
-    let response = mm
-        .rpc(&json! ({
-            "userpass": mm.userpass,
-            "method": "my_swap_status",
-            "params": {
-                "uuid": uuid,
-            }
-        }))
-        .await
-        .unwrap();
-    assert!(response.0.is_success(), "!status of {}: {}", uuid, response.1);
-    let status_response: Json = json::from_str(&response.1).unwrap();
+    let status_response = my_swap_status(mm, &uuid.to_string()).await;
 
     let events_array = status_response["result"]["events"].as_array().unwrap();
     let actual_maker_amount = json::from_value(events_array[0]["event"]["data"]["maker_amount"].clone()).unwrap();
@@ -1343,7 +2009,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,
@@ -1369,7 +2035,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,
         }))
@@ -1413,9 +2079,23 @@ pub async fn wait_till_history_has_records(mm: &MarketMakerIt, coin: &str, expec
     }
 }
 
+pub async fn orderbook(mm: &MarketMakerIt, base: &str, rel: &str) -> Json {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "orderbook",
+            "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 orderbook_v2(mm: &MarketMakerIt, base: &str, rel: &str) -> Json {
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "orderbook",
             "mmrpc": "2.0",
@@ -1432,14 +2112,38 @@ pub async fn orderbook_v2(mm: &MarketMakerIt, base: &str, rel: &str) -> Json {
 
 pub async fn best_orders_v2(mm: &MarketMakerIt, coin: &str, action: &str, volume: &str) -> Json {
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "best_orders",
             "mmrpc": "2.0",
             "params": {
                 "coin": coin,
                 "action": action,
-                "volume": volume,
+                "request_by": {
+                    "type": "volume",
+                    "value": volume,
+                }
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'best_orders' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn best_orders_v2_by_number(mm: &MarketMakerIt, coin: &str, action: &str, number: usize) -> Json {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "best_orders",
+            "mmrpc": "2.0",
+            "params": {
+                "coin": coin,
+                "action": action,
+                "request_by": {
+                    "type": "number",
+                    "value": number,
+                }
             }
         }))
         .await
@@ -1450,9 +2154,9 @@ pub async fn best_orders_v2(mm: &MarketMakerIt, coin: &str, action: &str, volume
 
 pub async fn init_withdraw(mm: &MarketMakerIt, coin: &str, to: &str, amount: &str) -> Json {
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "init_withdraw",
+            "method": "task::withdraw::init",
             "mmrpc": "2.0",
             "params": {
                 "coin": coin,
@@ -1462,15 +2166,35 @@ pub async fn init_withdraw(mm: &MarketMakerIt, coin: &str, to: &str, amount: &st
         }))
         .await
         .unwrap();
-    assert_eq!(request.0, StatusCode::OK, "'init_withdraw' failed: {}", request.1);
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::withdraw::init' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn withdraw_v1(mm: &MarketMakerIt, coin: &str, to: &str, amount: &str) -> TransactionDetails {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "withdraw",
+            "coin": coin,
+            "to": to,
+            "amount": amount,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'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! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "withdraw_status",
+            "method": "task::withdraw::status",
             "mmrpc": "2.0",
             "params": {
                 "task_id": task_id,
@@ -1478,15 +2202,20 @@ pub async fn withdraw_status(mm: &MarketMakerIt, task_id: u64) -> Json {
         }))
         .await
         .unwrap();
-    assert_eq!(request.0, StatusCode::OK, "'withdraw_status' failed: {}", request.1);
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::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! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "init_z_coin",
+            "method": "task::enable_z_coin::init",
             "mmrpc": "2.0",
             "params": {
                 "ticker": coin,
@@ -1499,15 +2228,20 @@ pub async fn init_z_coin_native(mm: &MarketMakerIt, coin: &str) -> Json {
         }))
         .await
         .unwrap();
-    assert_eq!(request.0, StatusCode::OK, "'init_z_coin' failed: {}", request.1);
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_z_coin::init' 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! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "init_z_coin",
+            "method": "task::enable_z_coin::init",
             "mmrpc": "2.0",
             "params": {
                 "ticker": coin,
@@ -1524,15 +2258,20 @@ pub async fn init_z_coin_light(mm: &MarketMakerIt, coin: &str, electrums: &[&str
         }))
         .await
         .unwrap();
-    assert_eq!(request.0, StatusCode::OK, "'init_z_coin' failed: {}", request.1);
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_z_coin::init' 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! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
-            "method": "init_z_coin_status",
+            "method": "task::enable_z_coin::status",
             "mmrpc": "2.0",
             "params": {
                 "task_id": task_id,
@@ -1540,13 +2279,18 @@ pub async fn init_z_coin_status(mm: &MarketMakerIt, task_id: u64) -> Json {
         }))
         .await
         .unwrap();
-    assert_eq!(request.0, StatusCode::OK, "'init_z_coin_status' failed: {}", request.1);
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_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! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method":"sign_message",
             "mmrpc":"2.0",
@@ -1564,7 +2308,7 @@ pub async fn sign_message(mm: &MarketMakerIt, coin: &str) -> Json {
 
 pub async fn verify_message(mm: &MarketMakerIt, coin: &str, signature: &str, address: &str) -> Json {
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method":"verify_message",
             "mmrpc":"2.0",
@@ -1585,7 +2329,7 @@ pub async fn verify_message(mm: &MarketMakerIt, coin: &str, signature: &str, add
 
 pub async fn send_raw_transaction(mm: &MarketMakerIt, coin: &str, tx: &str) -> Json {
     let request = mm
-        .rpc(&json! ({
+        .rpc(&json!({
             "userpass": mm.userpass,
             "method": "send_raw_transaction",
             "coin": coin,
@@ -1601,3 +2345,511 @@ pub async fn send_raw_transaction(mm: &MarketMakerIt, coin: &str, tx: &str) -> J
     );
     json::from_str(&request.1).unwrap()
 }
+
+pub async fn my_balance(mm: &MarketMakerIt, coin: &str) -> MyBalanceResponse {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "my_balance",
+            "coin": coin
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'my_balance' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn get_shared_db_id(mm: &MarketMakerIt) -> GetSharedDbIdResult {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "get_shared_db_id",
+            "mmrpc": "2.0",
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'get_shared_db_id' failed: {}", request.1);
+    let res: RpcSuccessResponse<_> = json::from_str(&request.1).unwrap();
+    res.result
+}
+
+pub async fn max_maker_vol(mm: &MarketMakerIt, coin: &str) -> RpcResponse {
+    let rc = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "mmrpc": "2.0",
+            "method": "max_maker_vol",
+            "params": {
+                "coin": coin,
+            }
+        }))
+        .await
+        .unwrap();
+    RpcResponse::new("max_maker_vol", rc)
+}
+
+pub async fn disable_coin(mm: &MarketMakerIt, coin: &str) -> DisableResult {
+    let req = json! ({
+        "userpass": mm.userpass,
+        "method": "disable_coin",
+        "coin": coin,
+    });
+    let disable = mm.rpc(&req).await.unwrap();
+    assert_eq!(disable.0, StatusCode::OK, "!disable_coin: {}", disable.1);
+    let res: Json = json::from_str(&disable.1).unwrap();
+    json::from_value(res["result"].clone()).unwrap()
+}
+
+/// Checks whether the `disable_coin` RPC fails.
+/// Returns a `DisableCoinError` error.
+pub async fn disable_coin_err(mm: &MarketMakerIt, coin: &str) -> DisableCoinError {
+    let disable = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "disable_coin",
+            "coin": coin,
+        }))
+        .await
+        .unwrap();
+    assert!(!disable.0.is_success(), "'disable_coin' should have failed");
+    json::from_str(&disable.1).unwrap()
+}
+
+pub async fn assert_coin_not_found_on_balance(mm: &MarketMakerIt, coin: &str) {
+    let balance = mm
+        .rpc(&json! ({
+            "userpass": mm.userpass,
+            "method": "my_balance",
+            "coin": coin
+        }))
+        .await
+        .unwrap();
+    assert_eq!(balance.0, StatusCode::INTERNAL_SERVER_ERROR);
+    assert!(balance.1.contains(&format!("No such coin: {coin}")));
+}
+
+pub async fn enable_tendermint(
+    mm: &MarketMakerIt,
+    coin: &str,
+    ibc_assets: &[&str],
+    rpc_urls: &[&str],
+    tx_history: bool,
+) -> Json {
+    let ibc_requests: Vec<_> = ibc_assets.iter().map(|ticker| json!({ "ticker": ticker })).collect();
+
+    let request = json!({
+        "userpass": mm.userpass,
+        "method": "enable_tendermint_with_assets",
+        "mmrpc": "2.0",
+        "params": {
+            "ticker": coin,
+            "tokens_params": ibc_requests,
+            "rpc_urls": rpc_urls,
+            "tx_history": tx_history
+        }
+    });
+    println!(
+        "enable_tendermint_with_assets request {}",
+        json::to_string(&request).unwrap()
+    );
+
+    let request = mm.rpc(&request).await.unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'enable_tendermint_with_assets' failed: {}",
+        request.1
+    );
+    println!("enable_tendermint_with_assets response {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn get_tendermint_my_tx_history(mm: &MarketMakerIt, coin: &str, limit: usize, page_number: usize) -> Json {
+    let request = json!({
+        "userpass": mm.userpass,
+        "method": "my_tx_history",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": coin,
+            "limit": limit,
+            "paging_options": {
+                "PageNumber": page_number
+            },
+        }
+    });
+    println!(
+        "tendermint 'my_tx_history' request {}",
+        json::to_string(&request).unwrap()
+    );
+
+    let request = mm.rpc(&request).await.unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "tendermint 'my_tx_history' failed: {}",
+        request.1
+    );
+
+    println!("tendermint 'my_tx_history' response {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn enable_tendermint_token(mm: &MarketMakerIt, coin: &str) -> Json {
+    let request = json!({
+        "userpass": mm.userpass,
+        "method": "enable_tendermint_token",
+        "mmrpc": "2.0",
+        "params": {
+            "ticker": coin,
+            "activation_params": {}
+        }
+    });
+    println!("enable_tendermint_token request {}", json::to_string(&request).unwrap());
+
+    let request = mm.rpc(&request).await.unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'enable_tendermint_token' failed: {}",
+        request.1
+    );
+    println!("enable_tendermint_token response {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_utxo_electrum(mm: &MarketMakerIt, coin: &str, servers: Vec<Json>) -> Json {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "task::enable_utxo::init",
+            "mmrpc": "2.0",
+            "params": {
+                "ticker": coin,
+                "activation_params": {
+                    "mode": {
+                        "rpc": "Electrum",
+                        "rpc_data": {
+                            "servers": servers
+                        }
+                    }
+                },
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_utxo::init' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn init_utxo_status(mm: &MarketMakerIt, task_id: u64) -> Json {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "task::enable_utxo::status",
+            "mmrpc": "2.0",
+            "params": {
+                "task_id": task_id,
+            }
+        }))
+        .await
+        .unwrap();
+    assert_eq!(
+        request.0,
+        StatusCode::OK,
+        "'task::enable_utxo::status' failed: {}",
+        request.1
+    );
+    json::from_str(&request.1).unwrap()
+}
+
+/// Note that mm2 ignores `volume` if `max` is true.
+pub async fn set_price(
+    mm: &MarketMakerIt,
+    base: &str,
+    rel: &str,
+    price: &str,
+    vol: &str,
+    max: bool,
+) -> SetPriceResponse {
+    let request = mm
+        .rpc(&json!({
+            "userpass": mm.userpass,
+            "method": "setprice",
+            "base": base,
+            "rel": rel,
+            "price": price,
+            "volume": vol,
+            "max": max,
+        }))
+        .await
+        .unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'setprice' failed: {}", request.1);
+    json::from_str(&request.1).unwrap()
+}
+
+pub async fn start_swaps(
+    maker: &mut MarketMakerIt,
+    taker: &mut MarketMakerIt,
+    pairs: &[(&'static str, &'static str)],
+    maker_price: f64,
+    taker_price: f64,
+    volume: f64,
+) -> Vec<String> {
+    let mut uuids = vec![];
+
+    // issue sell request on Bob side by setting base/rel price
+    for (base, rel) in pairs.iter() {
+        common::log::info!("Issue maker {}/{} sell request", base, rel);
+        let rc = maker
+            .rpc(&json!({
+                "userpass": maker.userpass,
+                "method": "setprice",
+                "base": base,
+                "rel": rel,
+                "price": maker_price,
+                "volume": volume
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!setprice: {}", rc.1);
+    }
+
+    for (base, rel) in pairs.iter() {
+        common::log::info!(
+            "Trigger taker subscription to {}/{} orderbook topic first and sleep for 1 second",
+            base,
+            rel
+        );
+        let rc = taker
+            .rpc(&json!({
+                "userpass": taker.userpass,
+                "method": "orderbook",
+                "mmrpc": "2.0",
+                "params": {
+                    "base": base,
+                    "rel": rel,
+                },
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!orderbook: {}", rc.1);
+        Timer::sleep(1.).await;
+        common::log::info!("Issue taker {}/{} buy request", base, rel);
+        let rc = taker
+            .rpc(&json!({
+                "userpass": taker.userpass,
+                "method": "buy",
+                "base": base,
+                "rel": rel,
+                "volume": volume,
+                "price": taker_price
+            }))
+            .await
+            .unwrap();
+        assert!(rc.0.is_success(), "!buy: {}", rc.1);
+        let buy_json: Json = serde_json::from_str(&rc.1).unwrap();
+        uuids.push(buy_json["result"]["uuid"].as_str().unwrap().to_owned());
+    }
+
+    for uuid in uuids.iter() {
+        // ensure the swaps are started
+        let expected_log = format!("Taker swap {} has successfully started", uuid);
+        taker
+            .wait_for_log(10., |log| log.contains(&expected_log))
+            .await
+            .unwrap();
+        let expected_log = format!("Maker swap {} has successfully started", uuid);
+        maker
+            .wait_for_log(10., |log| log.contains(&expected_log))
+            .await
+            .unwrap()
+    }
+
+    uuids
+}
+
+pub async fn wait_for_swaps_finish_and_check_status(
+    maker: &mut MarketMakerIt,
+    taker: &mut MarketMakerIt,
+    uuids: &[impl AsRef<str>],
+    volume: f64,
+    maker_price: f64,
+) {
+    for uuid in uuids.iter() {
+        maker
+            .wait_for_log(900., |log| {
+                log.contains(&format!("[swap uuid={}] Finished", uuid.as_ref()))
+            })
+            .await
+            .unwrap();
+
+        taker
+            .wait_for_log(900., |log| {
+                log.contains(&format!("[swap uuid={}] Finished", uuid.as_ref()))
+            })
+            .await
+            .unwrap();
+
+        log!("Waiting a few second for the fresh swap status to be saved..");
+        Timer::sleep(3.33).await;
+
+        log!("Checking taker status..");
+        check_my_swap_status(
+            taker,
+            uuid.as_ref(),
+            &TAKER_SUCCESS_EVENTS,
+            &TAKER_ERROR_EVENTS,
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume * maker_price).unwrap(),
+        )
+        .await;
+
+        log!("Checking maker status..");
+        check_my_swap_status(
+            maker,
+            uuid.as_ref(),
+            &MAKER_SUCCESS_EVENTS,
+            &MAKER_ERROR_EVENTS,
+            BigDecimal::try_from(volume).unwrap(),
+            BigDecimal::try_from(volume * maker_price).unwrap(),
+        )
+        .await;
+    }
+}
+
+pub async fn test_qrc20_history_impl(local_start: Option<LocalStart>) {
+    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,"txfee": 0,"mm2": 1,"mature_confirmations":2000,
+         "protocol":{"type":"QRC20","protocol_data":{"platform":"QTUM","contract_address":"0xd362e096e873eb7907e205fadc6175c6fec7bc44"}}},
+    ]);
+
+    let mut mm = MarketMakerIt::start_async(
+        json! ({
+            "gui": "nogui",
+            "netid": 9998,
+            "myipaddr": env::var ("BOB_TRADE_IP") .ok(),
+            "rpcip": env::var ("BOB_TRADE_IP") .ok(),
+            "passphrase": passphrase,
+            "coins": coins,
+            "rpc_password": "pass",
+            "metrics_interval": 30.,
+        }),
+        "pass".into(),
+        local_start,
+    )
+    .await
+    .unwrap();
+    let (_dump_log, _dump_dashboard) = mm.mm_dump();
+
+    #[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,
+        "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("qfkXE2cNFEwPFQqvBcqs8m9KrkNa9KV4xi")
+    );
+
+    // Wait till tx_history will not be loaded
+    mm.wait_for_log(22., |log| log.contains("history has been loaded successfully"))
+        .await
+        .unwrap();
+
+    // let the MarketMaker save the history to the file
+    Timer::sleep(1.).await;
+
+    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,
+        "RPC «my_tx_history» failed with status «{}», response «{}»",
+        tx_history.0,
+        tx_history.1
+    );
+    debug!("{:?}", tx_history.1);
+    let tx_history_json: Json = json::from_str(&tx_history.1).unwrap();
+    let tx_history_result = &tx_history_json["result"];
+
+    let mut expected = vec![
+        // https://testnet.qtum.info/tx/45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d2
+        "45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d200000000000000020000000000000000",
+        // https://testnet.qtum.info/tx/45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d2
+        "45d722e615feb853d608033ffc20fd51c9ee86e2321cfa814ba5961190fb57d200000000000000020000000000000001",
+        // https://testnet.qtum.info/tx/abcb51963e720fdfed7b889cea79947ba3cabd7b8b384f6b5adb41a3f4b5d61b
+        "abcb51963e720fdfed7b889cea79947ba3cabd7b8b384f6b5adb41a3f4b5d61b00000000000000020000000000000000",
+        // https://testnet.qtum.info/tx/4ea5392d03a9c35126d2d5a8294c3c3102cfc6d65235897c92ca04c5515f6be5
+        "4ea5392d03a9c35126d2d5a8294c3c3102cfc6d65235897c92ca04c5515f6be500000000000000020000000000000000",
+        // https://testnet.qtum.info/tx/9156f5f1d3652c27dca0216c63177da38de5c9e9f03a5cfa278bf82882d2d3d8
+        "9156f5f1d3652c27dca0216c63177da38de5c9e9f03a5cfa278bf82882d2d3d800000000000000020000000000000000",
+        // https://testnet.qtum.info/tx/35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac
+        "35e03bc529528a853ee75dde28f27eec8ed7b152b6af7ab6dfa5d55ea46f25ac00000000000000010000000000000000",
+        // https://testnet.qtum.info/tx/39104d29d77ba83c5c6c63ab7a0f096301c443b4538dc6b30140453a40caa80a
+        "39104d29d77ba83c5c6c63ab7a0f096301c443b4538dc6b30140453a40caa80a00000000000000000000000000000000",
+        // https://testnet.qtum.info/tx/d9965e3496a8a4af2d462424b989694b3146d78c61654b99bbadba64464f75cb
+        "d9965e3496a8a4af2d462424b989694b3146d78c61654b99bbadba64464f75cb00000000000000000000000000000000",
+        // https://testnet.qtum.info/tx/c2f346d3d2aadc35f5343d0d493a139b2579175496d685ec30734d161e62f7a1
+        "c2f346d3d2aadc35f5343d0d493a139b2579175496d685ec30734d161e62f7a100000000000000000000000000000000",
+    ];
+
+    assert_eq!(tx_history_result["total"].as_u64().unwrap(), expected.len() as u64);
+    for tx in tx_history_result["transactions"].as_array().unwrap() {
+        // pop front item
+        let expected_tx = expected.remove(0);
+        assert_eq!(tx["internal_id"].as_str().unwrap(), expected_tx);
+    }
+}
+
+pub async fn get_locked_amount(mm: &MarketMakerIt, coin: &str) -> GetLockedAmountResponse {
+    let request = json!({
+        "userpass": mm.userpass,
+        "method": "get_locked_amount",
+        "mmrpc": "2.0",
+        "params": {
+            "coin": coin
+        }
+    });
+    println!("get_locked_amount request {}", json::to_string(&request).unwrap());
+
+    let request = mm.rpc(&request).await.unwrap();
+    assert_eq!(request.0, StatusCode::OK, "'get_locked_amount' failed: {}", request.1);
+    println!("get_locked_amount response {}", request.1);
+    let response: RpcV2Response<GetLockedAmountResponse> = json::from_str(&request.1).unwrap();
+    response.result
+}
diff --git a/mm2src/mm2_test_helpers/src/lib.rs b/mm2src/mm2_test_helpers/src/lib.rs
index a7d5bfa6ac..92da032370 100644
--- a/mm2src/mm2_test_helpers/src/lib.rs
+++ b/mm2src/mm2_test_helpers/src/lib.rs
@@ -1 +1,7 @@
+#![feature(result_flattening)]
+
+#[macro_use] extern crate serde_derive;
+
+pub mod electrums;
 pub mod for_tests;
+pub mod structs;
diff --git a/mm2src/mm2_main/src/mm2_tests/structs.rs b/mm2src/mm2_test_helpers/src/structs.rs
similarity index 78%
rename from mm2src/mm2_main/src/mm2_tests/structs.rs
rename to mm2src/mm2_test_helpers/src/structs.rs
index 30b9ffdc67..d26dc9b77b 100644
--- a/mm2src/mm2_main/src/mm2_tests/structs.rs
+++ b/mm2src/mm2_test_helpers/src/structs.rs
@@ -1,12 +1,16 @@
 #![allow(dead_code, unused_variables)]
 
-/// 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
+//! 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 http::{HeaderMap, StatusCode};
 use mm2_number::{BigDecimal, BigRational, Fraction, MmNumber};
 use rpc::v1::types::H256 as H256Json;
+use serde::de::DeserializeOwned;
 use serde_json::Value as Json;
 use std::collections::{HashMap, HashSet};
+use std::fmt;
 use std::num::NonZeroUsize;
 use uuid::Uuid;
 
@@ -31,6 +35,48 @@ pub struct RpcErrorResponse<E> {
     pub id: Option<usize>,
 }
 
+/// This RPC response helper is useful in those tests that handle `Success` and `Error` both responses.
+#[derive(Debug)]
+pub struct RpcResponse {
+    rpc_name: String,
+    status_code: StatusCode,
+    payload: String,
+}
+
+impl RpcResponse {
+    pub fn new(rpc_name: &str, rc: (StatusCode, String, HeaderMap)) -> RpcResponse {
+        RpcResponse {
+            rpc_name: rpc_name.to_string(),
+            status_code: rc.0,
+            payload: rc.1,
+        }
+    }
+
+    #[track_caller]
+    pub fn unwrap<T>(self) -> T
+    where
+        T: fmt::Debug + DeserializeOwned,
+    {
+        assert!(self.status_code.is_success(), "!{}: {}", self.rpc_name, self.payload);
+        let res: RpcSuccessResponse<T> = serde_json::from_str(&self.payload).unwrap();
+        res.result
+    }
+
+    #[track_caller]
+    pub fn unwrap_err<E>(self) -> RpcErrorResponse<E>
+    where
+        E: fmt::Debug + DeserializeOwned,
+    {
+        assert!(
+            !self.status_code.is_success(),
+            "'{}' should have failed, but got: {}",
+            self.rpc_name,
+            self.payload
+        );
+        serde_json::from_str(&self.payload).unwrap()
+    }
+}
+
 #[derive(Deserialize)]
 #[serde(deny_unknown_fields)]
 #[serde(tag = "type", content = "data")]
@@ -484,6 +530,7 @@ pub struct MakerPreimage {
 #[derive(Debug, Deserialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
+#[allow(clippy::large_enum_variant)]
 pub enum TradePreimageResult {
     TakerPreimage(TakerPreimage),
     MakerPreimage(MakerPreimage),
@@ -519,6 +566,28 @@ pub struct MaxTakerVolResponse {
     pub coin: String,
 }
 
+#[derive(Debug, Deserialize, PartialEq)]
+#[serde(deny_unknown_fields)]
+pub struct MaxMakerVolResponse {
+    pub coin: String,
+    pub volume: MmNumberMultiRepr,
+    pub balance: MmNumberMultiRepr,
+    pub locked_by_swaps: MmNumberMultiRepr,
+}
+
+pub mod max_maker_vol_error {
+    use mm2_number::BigDecimal;
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(deny_unknown_fields)]
+    pub struct NotSufficientBalance {
+        pub coin: String,
+        pub available: BigDecimal,
+        pub required: BigDecimal,
+        pub locked_by_swaps: Option<BigDecimal>,
+    }
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct RawTransactionResult {
@@ -534,15 +603,27 @@ pub mod raw_transaction_error {
     }
 }
 
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+pub enum CustomTendermintMsgType {
+    SendHtlcAmount,
+    ClaimHtlcAmount,
+    SignClaimHtlc,
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum TransactionType {
     StakingDelegation,
     RemoveDelegation,
     StandardTransfer,
     TokenTransfer(String),
+    FeeForTokenTx,
+    CustomTendermintMsg {
+        msg_type: CustomTendermintMsgType,
+        token_id: Option<String>,
+    },
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct TransactionDetails {
     pub tx_hex: String,
@@ -559,6 +640,7 @@ pub struct TransactionDetails {
     pub coin: String,
     pub internal_id: String,
     pub transaction_type: TransactionType,
+    pub memo: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -577,7 +659,7 @@ pub struct IguanaWalletBalance {
     pub balance: CoinBalance,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum Bip44Chain {
     External = 0,
     Internal = 1,
@@ -607,6 +689,13 @@ pub struct HDAddressBalance {
     pub balance: CoinBalance,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct HDAccountAddressId {
+    pub account_id: u32,
+    pub chain: Bip44Chain,
+    pub address_id: u32,
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields, tag = "wallet_type")]
 pub enum EnableCoinBalance {
@@ -616,12 +705,28 @@ pub enum EnableCoinBalance {
 
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
-pub struct ZcoinActivationResult {
+pub struct CoinActivationResult {
     pub ticker: String,
     pub current_block: u64,
     pub wallet_balance: EnableCoinBalance,
 }
 
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct UtxoStandardActivationResult {
+    pub ticker: String,
+    pub current_block: u64,
+    pub wallet_balance: EnableCoinBalance,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct LightningActivationResult {
+    pub platform_coin: String,
+    pub address: String,
+    pub balance: CoinBalance,
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct InitTaskResult {
@@ -638,7 +743,26 @@ pub enum MmRpcResult<T> {
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields, tag = "status", content = "details")]
 pub enum InitZcoinStatus {
-    Ready(MmRpcResult<ZcoinActivationResult>),
+    Ok(CoinActivationResult),
+    Error(Json),
+    InProgress(Json),
+    UserActionRequired(Json),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "status", content = "details")]
+pub enum InitUtxoStatus {
+    Ok(UtxoStandardActivationResult),
+    Error(Json),
+    InProgress(Json),
+    UserActionRequired(Json),
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields, tag = "status", content = "details")]
+pub enum InitLightningStatus {
+    Ok(LightningActivationResult),
+    Error(Json),
     InProgress(Json),
     UserActionRequired(Json),
 }
@@ -646,7 +770,8 @@ pub enum InitZcoinStatus {
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields, tag = "status", content = "details")]
 pub enum WithdrawStatus {
-    Ready(MmRpcResult<TransactionDetails>),
+    Ok(TransactionDetails),
+    Error(Json),
     InProgress(Json),
     UserActionRequired(Json),
 }
@@ -723,6 +848,12 @@ pub struct GetPublicKeyHashResult {
     pub public_key_hash: String,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct GetSharedDbIdResult {
+    pub shared_db_id: String,
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct RpcV2Response<T> {
@@ -827,6 +958,7 @@ pub type ZcoinHistoryRes = MyTxHistoryV2Response<ZcoinTransactionDetails, i64>;
 #[serde(deny_unknown_fields)]
 pub struct MyTxHistoryV2Response<Tx, Id> {
     pub coin: String,
+    pub target: MyTxHistoryTarget,
     pub current_block: u64,
     pub transactions: Vec<Tx>,
     pub sync_status: Json,
@@ -837,6 +969,16 @@ pub struct MyTxHistoryV2Response<Tx, Id> {
     pub paging_options: PagingOptionsEnum<Id>,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
+pub enum MyTxHistoryTarget {
+    Iguana,
+    AccountId { account_id: u32 },
+    AddressId(HDAccountAddressId),
+    AddressDerivationPath(String),
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct UtxoFeeDetails {
@@ -852,7 +994,7 @@ pub struct MmVersion {
     pub datetime: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields, tag = "address_type", content = "address_data")]
 pub enum OrderbookAddress {
     Transparent(String),
@@ -884,7 +1026,7 @@ pub struct AggregatedOrderbookEntryV2 {
     pub rel_max_volume_aggr: MmNumberMultiRepr,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Eq, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct MmNumberMultiRepr {
     pub decimal: BigDecimal,
@@ -892,6 +1034,20 @@ pub struct MmNumberMultiRepr {
     pub fraction: Fraction,
 }
 
+impl<T> From<T> for MmNumberMultiRepr
+where
+    MmNumber: From<T>,
+{
+    fn from(number: T) -> Self {
+        let mm_number = MmNumber::from(number);
+        MmNumberMultiRepr {
+            decimal: mm_number.to_decimal(),
+            rational: mm_number.to_ratio(),
+            fraction: mm_number.to_fraction(),
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct OrderbookV2Response {
@@ -931,3 +1087,96 @@ pub struct VerificationResponse {
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct WithdrawResult {}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct TendermintActivationResult {
+    pub address: String,
+    pub current_block: u64,
+    pub balance: CoinBalance,
+    pub tokens_balances: HashMap<String, CoinBalance>,
+    pub ticker: String,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct GetLockedAmountResponse {
+    pub coin: String,
+    pub locked_amount: MmNumberMultiRepr,
+}
+
+pub mod gui_storage {
+    use mm2_number::BigDecimal;
+    use std::collections::BTreeSet;
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(tag = "type")]
+    #[serde(rename_all = "lowercase")]
+    pub enum AccountId {
+        Iguana,
+        HD { account_idx: u32 },
+        HW { device_pubkey: String },
+    }
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(deny_unknown_fields)]
+    pub struct AccountWithEnabledFlag {
+        pub account_id: AccountId,
+        pub name: String,
+        pub description: String,
+        pub balance_usd: BigDecimal,
+        pub enabled: bool,
+    }
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(deny_unknown_fields)]
+    pub struct AccountWithCoins {
+        pub account_id: AccountId,
+        pub name: String,
+        pub description: String,
+        pub balance_usd: BigDecimal,
+        pub coins: BTreeSet<String>,
+    }
+
+    #[derive(Debug, Deserialize, PartialEq)]
+    #[serde(deny_unknown_fields)]
+    pub struct AccountCoins {
+        pub account_id: AccountId,
+        pub coins: BTreeSet<String>,
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct WatcherConf {
+    #[serde(default = "common::sixty_f64")]
+    pub wait_taker_payment: f64,
+    #[serde(default = "common::one_f64")]
+    pub wait_maker_payment_spend_factor: f64,
+    #[serde(default = "common::one_and_half_f64")]
+    pub refund_start_factor: f64,
+    #[serde(default = "common::three_hundred_f64")]
+    pub search_interval: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct DisableResult {
+    pub coin: String,
+    pub cancelled_orders: HashSet<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct DisableCoinError {
+    pub error: String,
+    pub orders: DisableCoinOrders,
+    pub active_swaps: Vec<Uuid>,
+    pub dependent_tokens: Vec<String>,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct DisableCoinOrders {
+    matching: Vec<Uuid>,
+    cancelled: Vec<Uuid>,
+}
diff --git a/mm2src/rpc_task/Cargo.toml b/mm2src/rpc_task/Cargo.toml
index 3e6cedb00b..4bf524f86a 100644
--- a/mm2src/rpc_task/Cargo.toml
+++ b/mm2src/rpc_task/Cargo.toml
@@ -3,13 +3,13 @@ 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
+[lib]
+doctest = false
 
 [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" }
diff --git a/mm2src/rpc_task/src/handle.rs b/mm2src/rpc_task/src/handle.rs
index 42beb2fd5e..02657569c3 100644
--- a/mm2src/rpc_task/src/handle.rs
+++ b/mm2src/rpc_task/src/handle.rs
@@ -1,6 +1,6 @@
 use crate::manager::{RpcTaskManager, RpcTaskManagerWeak};
-use crate::{FinishedTaskResult, RpcTask, RpcTaskError, RpcTaskResult, TaskId, TaskStatus};
-use common::custom_futures::FutureTimerExt;
+use crate::{RpcTask, RpcTaskError, RpcTaskResult, TaskId, TaskStatus};
+use common::custom_futures::timeout::FutureTimerExt;
 use common::log::LogOnError;
 use futures::channel::oneshot;
 use mm2_err_handle::prelude::*;
@@ -15,11 +15,6 @@ pub struct RpcTaskHandle<Task: RpcTask> {
 }
 
 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>,
@@ -58,23 +53,24 @@ impl<Task: RpcTask> RpcTaskHandle<Task> {
         user_action_rx
             .timeout(timeout)
             .await?
-            .map_to_mm(|_canceled| RpcTaskError::Canceled)
+            .map_to_mm(|_canceled| RpcTaskError::Cancelled)
     }
 
     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();
+        let task_status = Self::prepare_task_result(result);
+        self.lock_and_then(|mut task_manager| task_manager.update_task_status(self.task_id, task_status))
+            .warn_log();
+    }
+
+    pub(crate) fn on_cancelled(self) {
+        self.lock_and_then(|mut task_manager| task_manager.on_task_cancelling_finished(self.task_id))
+            .warn_log();
     }
 
-    fn prepare_task_result(
-        result: Result<Task::Item, MmError<Task::Error>>,
-    ) -> FinishedTaskResult<Task::Item, Task::Error> {
+    fn prepare_task_result(result: Result<Task::Item, MmError<Task::Error>>) -> TaskStatus<Task> {
         match result {
-            Ok(task_item) => FinishedTaskResult::ok(task_item),
-            Err(task_error) => FinishedTaskResult::Err(task_error),
+            Ok(task_item) => TaskStatus::Ok(task_item),
+            Err(task_error) => TaskStatus::Error(task_error),
         }
     }
 }
diff --git a/mm2src/rpc_task/src/lib.rs b/mm2src/rpc_task/src/lib.rs
index e3efbafab4..b18fa15047 100644
--- a/mm2src/rpc_task/src/lib.rs
+++ b/mm2src/rpc_task/src/lib.rs
@@ -1,8 +1,7 @@
-use common::custom_futures::TimeoutError;
+use common::custom_futures::timeout::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;
@@ -19,7 +18,6 @@ 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<
@@ -50,7 +48,11 @@ pub enum RpcTaskError {
         actual: TaskStatusError,
         expected: TaskStatusError,
     },
-    Canceled,
+    #[display(fmt = "RPC 'task' is awaiting '{}' user action", expected)]
+    UnexpectedUserAction {
+        expected: String,
+    },
+    Cancelled,
     Internal(String),
 }
 
@@ -59,9 +61,14 @@ pub enum TaskStatusError {
     Idle,
     InProgress,
     AwaitingUserAction,
+    Cancelled,
     Finished,
 }
 
+impl TaskStatusError {
+    fn is_finished(&self) -> bool { matches!(self, TaskStatusError::Finished) }
+}
+
 impl From<TimeoutError> for RpcTaskError {
     fn from(e: TimeoutError) -> Self { RpcTaskError::Timeout(e.duration) }
 }
@@ -74,7 +81,8 @@ where
     Item: Serialize,
     Error: SerMmErrorType,
 {
-    Ready(FinishedTaskResult<Item, Error>),
+    Ok(Item),
+    Error(MmError<Error>),
     InProgress(InProgressStatus),
     UserActionRequired(AwaitingStatus),
 }
@@ -84,13 +92,16 @@ where
     Item: Serialize,
     Error: SerMmErrorType,
 {
+    pub fn is_ready(&self) -> bool { matches!(self, RpcTaskStatus::Ok(_) | RpcTaskStatus::Error(_)) }
+
     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::Ok(result) => RpcTaskStatus::Ok(result),
+            RpcTaskStatus::Error(error) => RpcTaskStatus::Error(error.map(f)),
             RpcTaskStatus::InProgress(in_progress) => RpcTaskStatus::InProgress(in_progress),
             RpcTaskStatus::UserActionRequired(awaiting) => RpcTaskStatus::UserActionRequired(awaiting),
         }
@@ -98,7 +109,8 @@ where
 }
 
 enum TaskStatus<Task: RpcTaskTypes> {
-    Ready(FinishedTaskResult<Task::Item, Task::Error>),
+    Ok(Task::Item),
+    Error(MmError<Task::Error>),
     InProgress(Task::InProgressStatus),
     UserActionRequired {
         awaiting_status: Task::AwaitingStatus,
diff --git a/mm2src/rpc_task/src/manager.rs b/mm2src/rpc_task/src/manager.rs
index 5b1617b181..207c1ffba6 100644
--- a/mm2src/rpc_task/src/manager.rs
+++ b/mm2src/rpc_task/src/manager.rs
@@ -1,9 +1,8 @@
 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 crate::{AtomicTaskId, RpcTask, RpcTaskError, RpcTaskHandle, RpcTaskResult, RpcTaskStatus, RpcTaskStatusAlias,
+            TaskAbortHandle, TaskAbortHandler, TaskId, TaskStatus, TaskStatusError, UserActionSender};
+use common::executor::SpawnFuture;
+use common::log::{debug, info};
 use futures::channel::oneshot;
 use futures::future::{select, Either};
 use mm2_err_handle::prelude::*;
@@ -12,6 +11,16 @@ use std::collections::HashMap;
 use std::sync::atomic::Ordering;
 use std::sync::{Arc, Mutex, Weak};
 
+macro_rules! unexpected_task_status {
+    ($task_id:expr, actual = $actual:ident, expected = $expected:ident) => {
+        MmError::err(RpcTaskError::UnexpectedTaskStatus {
+            task_id: $task_id,
+            actual: TaskStatusError::$actual,
+            expected: TaskStatusError::$expected,
+        })
+    };
+}
+
 pub type RpcTaskManagerShared<Task> = Arc<Mutex<RpcTaskManager<Task>>>;
 pub(crate) type RpcTaskManagerWeak<Task> = Weak<Mutex<RpcTaskManager<Task>>>;
 
@@ -30,7 +39,10 @@ impl<Task: RpcTask> Default for RpcTaskManager<Task> {
 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> {
+    pub fn spawn_rpc_task<F>(this: &RpcTaskManagerShared<Task>, spawner: &F, mut task: Task) -> RpcTaskResult<TaskId>
+    where
+        F: SpawnFuture,
+    {
         let initial_task_status = task.initial_status();
         let (task_id, task_abort_handler) = {
             let mut task_manager = this
@@ -60,12 +72,13 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
                     task_handle.finish(task_result);
                 },
                 None => {
-                    debug!("RPC task '{}' has been aborted", task_id);
-                    task_handle.abort();
+                    info!("RPC task '{}' has been aborted", task_id);
+                    task.cancel().await;
+                    task_handle.on_cancelled();
                 },
             }
         };
-        spawn(fut);
+        spawner.spawn(fut);
         Ok(task_id)
     }
 
@@ -78,15 +91,15 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
         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
-            },
+            // Don't return an `RpcTaskStatus::Cancelled` status,
+            // instead return `None` as there is no such task for the user already.
+            TaskStatusExt::Cancelling { .. } => return None,
+            TaskStatusExt::Ok(result) => RpcTaskStatus::Ok(result.clone()),
+            TaskStatusExt::Error(error) => RpcTaskStatus::Error(error.clone()),
         };
+        if rpc_status.is_ready() && forget_if_ready {
+            entry.remove();
+        }
         Some(rpc_status)
     }
 
@@ -96,10 +109,33 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
 
     /// 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))
+        let task = self.tasks.remove(&task_id);
+
+        match task {
+            Some(finished_task @ TaskStatusExt::Ok(_) | finished_task @ TaskStatusExt::Error(_)) => {
+                // Return the task result to the `tasks` container.
+                self.tasks.insert(task_id, finished_task);
+                unexpected_task_status!(task_id, actual = Finished, expected = InProgress)
+            },
+            Some(TaskStatusExt::InProgress { .. }) => {
+                let new_task = TaskStatusExt::Cancelling { _action_sender: None };
+                self.tasks.insert(task_id, new_task);
+                Ok(())
+            },
+            Some(TaskStatusExt::Awaiting { action_sender, .. }) => {
+                let new_task = TaskStatusExt::Cancelling {
+                    _action_sender: Some(action_sender),
+                };
+                self.tasks.insert(task_id, new_task);
+                Ok(())
+            },
+            Some(cancelling_task @ TaskStatusExt::Cancelling { .. }) => {
+                // Return the task result to the `tasks` container.
+                self.tasks.insert(task_id, cancelling_task);
+                unexpected_task_status!(task_id, actual = Cancelled, expected = InProgress)
+            },
+            None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
+        }
     }
 
     pub(crate) fn register_task(
@@ -109,11 +145,7 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
         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::Occupied(_entry) => unexpected_task_status!(task_id, actual = InProgress, expected = Idle),
             Entry::Vacant(entry) => {
                 entry.insert(TaskStatusExt::InProgress {
                     status: task_initial_in_progress_status,
@@ -126,7 +158,8 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
 
     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::Ok(result) => self.on_task_finished(task_id, Ok(result)),
+            TaskStatus::Error(error) => self.on_task_finished(task_id, Err(error)),
             TaskStatus::InProgress(in_progress) => self.update_in_progress_status(task_id, in_progress),
             TaskStatus::UserActionRequired {
                 awaiting_status,
@@ -135,27 +168,28 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
         }
     }
 
-    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,
+    pub(crate) fn on_task_cancelling_finished(&mut self, task_id: TaskId) -> RpcTaskResult<()> {
+        match self.tasks.remove(&task_id) {
+            Some(TaskStatusExt::Cancelling { .. }) => Ok(()),
+            _ => {
+                let error = format!("Cancelled task '{task_id}' was not in `Cancelling` status");
+                MmError::err(RpcTaskError::Internal(error))
+            },
         }
     }
 
     fn on_task_finished(
         &mut self,
         task_id: TaskId,
-        task_result: FinishedTaskResult<Task::Item, Task::Error>,
+        task_result: MmResult<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);
+        let task_status = match task_result {
+            Ok(result) => TaskStatusExt::Ok(result),
+            Err(error) => TaskStatusExt::Error(error),
+        };
+        if self.tasks.insert(task_id, task_status).is_none() {
+            let error = format!("Finished task '{task_id}' was not ongoing");
+            return MmError::err(RpcTaskError::Internal(error));
         }
         Ok(())
     }
@@ -169,14 +203,15 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
                     .insert(task_id, TaskStatusExt::InProgress { status, abort_handle });
                 Ok(())
             },
-            Some(ready @ TaskStatusExt::Ready(_)) => {
+            Some(cancelling @ TaskStatusExt::Cancelling { .. }) => {
+                // Return the task result to the tasks container.
+                self.tasks.insert(task_id, cancelling);
+                unexpected_task_status!(task_id, actual = Cancelled, expected = InProgress)
+            },
+            Some(ready @ TaskStatusExt::Ok(_) | ready @ TaskStatusExt::Error(_)) => {
                 // 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,
-                })
+                unexpected_task_status!(task_id, actual = Finished, expected = InProgress)
             },
             None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
         }
@@ -203,9 +238,17 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
                 Ok(())
             },
             Some(unexpected) => {
+                let actual_status = unexpected.task_status_err();
+
                 // 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))
+
+                let error = RpcTaskError::UnexpectedTaskStatus {
+                    task_id,
+                    actual: actual_status,
+                    expected: TaskStatusError::InProgress,
+                };
+                MmError::err(error)
             },
             None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
         }
@@ -223,16 +266,24 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
                 let result = action_sender
                     .send(user_action)
                     // The task seems to be canceled/aborted for some reason.
-                    .map_to_mm(|_user_action| RpcTaskError::Canceled);
+                    .map_to_mm(|_user_action| RpcTaskError::Cancelled);
                 // Insert new in-progress status to the tasks container.
                 self.tasks
                     .insert(task_id, TaskStatusExt::InProgress { status, abort_handle });
                 result
             },
             Some(unexpected) => {
+                let actual_status = unexpected.task_status_err();
+
                 // 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))
+
+                let error = RpcTaskError::UnexpectedTaskStatus {
+                    task_id,
+                    actual: actual_status,
+                    expected: TaskStatusError::AwaitingUserAction,
+                };
+                MmError::err(error)
             },
             None => MmError::err(RpcTaskError::NoSuchTask(task_id)),
         }
@@ -242,6 +293,8 @@ impl<Task: RpcTask> RpcTaskManager<Task> {
 /// `TaskStatus` extended with `TaskAbortHandle`.
 /// This is stored in the [`RpcTaskManager::tasks`] container.
 enum TaskStatusExt<Task: RpcTaskTypes> {
+    Ok(Task::Item),
+    Error(MmError<Task::Error>),
     InProgress {
         status: Task::InProgressStatus,
         abort_handle: TaskAbortHandle,
@@ -252,5 +305,21 @@ enum TaskStatusExt<Task: RpcTaskTypes> {
         abort_handle: TaskAbortHandle,
         next_in_progress_status: Task::InProgressStatus,
     },
-    Ready(FinishedTaskResult<Task::Item, Task::Error>),
+    /// `Cancelling` status is set on [`RpcTaskManager::cancel_task`].
+    /// This status is used to save the task state before it's actually canceled on [`RpcTaskHandle::on_canceled`],
+    /// in particular, to fix https://github.com/KomodoPlatform/atomicDEX-API/issues/1580.
+    Cancelling {
+        _action_sender: Option<UserActionSender<Task::UserAction>>,
+    },
+}
+
+impl<Task: RpcTaskTypes> TaskStatusExt<Task> {
+    fn task_status_err(&self) -> TaskStatusError {
+        match self {
+            TaskStatusExt::Ok(_) | TaskStatusExt::Error(_) => TaskStatusError::Finished,
+            TaskStatusExt::InProgress { .. } => TaskStatusError::InProgress,
+            TaskStatusExt::Awaiting { .. } => TaskStatusError::AwaitingUserAction,
+            TaskStatusExt::Cancelling { .. } => TaskStatusError::Cancelled,
+        }
+    }
 }
diff --git a/mm2src/rpc_task/src/rpc_common.rs b/mm2src/rpc_task/src/rpc_common.rs
index 35995beb8e..6a43d51b49 100644
--- a/mm2src/rpc_task/src/rpc_common.rs
+++ b/mm2src/rpc_task/src/rpc_common.rs
@@ -7,7 +7,9 @@ use derive_more::Display;
 #[derive(Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum RpcTaskStatusError {
+    #[display(fmt = "No such task '{}'", _0)]
     NoSuchTask(TaskId),
+    #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
 
@@ -25,7 +27,9 @@ impl HttpStatusCode for RpcTaskStatusError {
 #[derive(Display, Serialize, SerializeErrorType)]
 #[serde(tag = "error_type", content = "error_data")]
 pub enum RpcTaskUserActionError {
+    #[display(fmt = "No such task '{}'", _0)]
     NoSuchTask(TaskId),
+    #[display(fmt = "Internal error: {}", _0)]
     Internal(String),
 }
 
@@ -47,6 +51,44 @@ impl HttpStatusCode for RpcTaskUserActionError {
     }
 }
 
+/// In most cases, the RPC task status request may fail with the following errors.
+/// 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 CancelRpcTaskError {
+    #[display(fmt = "No such task '{}'", _0)]
+    NoSuchTask(TaskId),
+    #[display(fmt = "Task is finished already")]
+    TaskFinished(TaskId),
+    #[display(fmt = "Internal error: {}", _0)]
+    Internal(String),
+}
+
+impl From<RpcTaskError> for CancelRpcTaskError {
+    fn from(e: RpcTaskError) -> Self {
+        match e {
+            RpcTaskError::NoSuchTask(task_id) => CancelRpcTaskError::NoSuchTask(task_id),
+            RpcTaskError::UnexpectedTaskStatus {
+                task_id,
+                actual,
+                expected,
+                ..
+            } if actual.is_finished() && !expected.is_finished() => CancelRpcTaskError::TaskFinished(task_id),
+            rpc_err => CancelRpcTaskError::Internal(rpc_err.to_string()),
+        }
+    }
+}
+
+impl HttpStatusCode for CancelRpcTaskError {
+    fn status_code(&self) -> StatusCode {
+        match self {
+            CancelRpcTaskError::NoSuchTask(_) => StatusCode::NOT_FOUND,
+            CancelRpcTaskError::TaskFinished(_) => StatusCode::CONFLICT,
+            CancelRpcTaskError::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)]
@@ -63,6 +105,13 @@ pub struct RpcTaskUserActionRequest<UserAction> {
     pub user_action: UserAction,
 }
 
+/// In most cases, the RPC task status request consists of `task_id` field only.
+/// Please do not add new fields unless they are used in most cases.
+#[derive(Deserialize)]
+pub struct CancelRpcTaskRequest {
+    pub task_id: TaskId,
+}
+
 /// 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)]
diff --git a/mm2src/rpc_task/src/task.rs b/mm2src/rpc_task/src/task.rs
index 8ede7ffae1..860257515f 100644
--- a/mm2src/rpc_task/src/task.rs
+++ b/mm2src/rpc_task/src/task.rs
@@ -15,5 +15,8 @@ pub trait RpcTaskTypes {
 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>>;
+    /// The method is invoked when the task has been cancelled.
+    async fn cancel(self);
+
+    async fn run(&mut self, task_handle: &RpcTaskHandle<Self>) -> Result<Self::Item, MmError<Self::Error>>;
 }
diff --git a/mm2src/trezor/Cargo.toml b/mm2src/trezor/Cargo.toml
index 2c0a5e1b03..4740477291 100644
--- a/mm2src/trezor/Cargo.toml
+++ b/mm2src/trezor/Cargo.toml
@@ -3,7 +3,8 @@ name = "trezor"
 version = "0.1.1"
 edition = "2018"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+doctest = false
 
 [dependencies]
 async-trait = "0.1"
diff --git a/mm2src/trezor/src/client.rs b/mm2src/trezor/src/client.rs
index e79aa594d4..cb4bcc3bf5 100644
--- a/mm2src/trezor/src/client.rs
+++ b/mm2src/trezor/src/client.rs
@@ -1,5 +1,6 @@
 //! This file is inspired by https://github.com/tezedge/tezedge-client/blob/master/trezor_api/src/client.rs
 
+use crate::device_info::TrezorDeviceInfo;
 use crate::error::OperationFailure;
 use crate::proto::messages::MessageType;
 use crate::proto::messages_common as proto_common;
@@ -9,6 +10,7 @@ use crate::response::TrezorResponse;
 use crate::result_handler::ResultHandler;
 use crate::transport::Transport;
 use crate::{TrezorError, TrezorResult};
+use common::now_ms;
 use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard};
 use mm2_err_handle::prelude::*;
 use std::sync::Arc;
@@ -30,12 +32,26 @@ impl TrezorClient {
 
     /// 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<'_>> {
+    /// Returns `TrezorDeviceInfo` and `TrezorSession`.
+    pub async fn init_new_session(&self) -> TrezorResult<(TrezorDeviceInfo, TrezorSession<'_>)> {
         let mut session = TrezorSession {
             inner: self.inner.lock().await,
         };
-        session.initialize_device().await?;
-        Ok(session)
+        let features = session.initialize_device().await?;
+        Ok((TrezorDeviceInfo::from(features), session))
+    }
+
+    /// Occupies the Trezor device for further interactions by locking a mutex.
+    pub async fn session(&self) -> TrezorSession<'_> {
+        TrezorSession {
+            inner: self.inner.lock().await,
+        }
+    }
+
+    /// Checks if the Trezor device is vacant (not occupied).
+    /// Returns `None` if it is occupied already.
+    pub fn try_session_if_not_occupied(&self) -> Option<TrezorSession<'_>> {
+        self.inner.try_lock().map(|inner| TrezorSession { inner })
     }
 }
 
@@ -48,6 +64,9 @@ pub struct TrezorSession<'a> {
 }
 
 impl<'a> TrezorSession<'a> {
+    #[cfg(target_arch = "wasm32")]
+    pub async fn is_connected(&mut self) -> TrezorResult<bool> { self.inner.transport.is_connected().await }
+
     /// 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>(
@@ -70,13 +89,17 @@ impl<'a> TrezorSession<'a> {
                 let req_msg = resp.into_message()?;
                 Ok(TrezorResponse::new_pin_matrix_request(self, req_msg, result_handler))
             },
+            MessageType::PassphraseRequest => {
+                let req_msg = resp.into_message()?;
+                Ok(TrezorResponse::new_passphrase_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> {
+    async fn call_raw<S: TrezorMessage>(&mut self, message: S) -> TrezorResult<ProtoMessage> {
         let mut buf = Vec::with_capacity(message.encoded_len());
         message.encode(&mut buf)?;
 
@@ -85,6 +108,24 @@ impl<'a> TrezorSession<'a> {
         self.inner.transport.read_message().await
     }
 
+    pub async fn ping<'b>(&'b mut self) -> TrezorResult<TrezorResponse<'a, 'b, ()>> {
+        let ping_message = format!("With love, {}", now_ms());
+        let req = proto_management::Ping {
+            message: Some(ping_message.clone()),
+            button_protection: None,
+        };
+
+        let result_handler = ResultHandler::<()>::new(move |pong: proto_common::Success| {
+            if pong.message == Some(ping_message.clone()) {
+                Ok(())
+            } else {
+                let error = format!("Expected '{ping_message}' PONG message, found: {:?}", pong.message);
+                MmError::err(TrezorError::Failure(OperationFailure::Other(error)))
+            }
+        });
+        self.call(req, result_handler).await
+    }
+
     /// Initialize the device.
     ///
     /// The Initialize packet will cause the device to stop what it is currently doing
@@ -94,16 +135,18 @@ impl<'a> TrezorSession<'a> {
     /// # Usage
     ///
     /// Must be called before sending requests to Trezor.
-    async fn initialize_device<'b>(&'b mut self) -> TrezorResult<proto_management::Features> {
+    async fn initialize_device(&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()
+        let features = self.call(req, result_handler).await?.ok()?;
+
+        Ok(features)
     }
 
-    pub(crate) async fn cancel_last_op<'b>(&'b mut self) {
+    pub(crate) async fn cancel_last_op(&mut self) {
         let req = proto_management::Cancel {};
         let result_handler = ResultHandler::new(|_m: proto_common::Failure| Ok(()));
         // Ignore result.
diff --git a/mm2src/trezor/src/device_info.rs b/mm2src/trezor/src/device_info.rs
new file mode 100644
index 0000000000..76f82f6ee2
--- /dev/null
+++ b/mm2src/trezor/src/device_info.rs
@@ -0,0 +1,21 @@
+use crate::proto::messages_management::Features;
+
+#[derive(Debug, Clone, Serialize)]
+pub struct TrezorDeviceInfo {
+    /// The device model.
+    model: Option<String>,
+    /// Name given to the device.
+    device_name: Option<String>,
+    /// Unique device identifier.
+    device_id: Option<String>,
+}
+
+impl From<Features> for TrezorDeviceInfo {
+    fn from(features: Features) -> Self {
+        TrezorDeviceInfo {
+            model: features.model,
+            device_name: features.label,
+            device_id: features.device_id,
+        }
+    }
+}
diff --git a/mm2src/trezor/src/lib.rs b/mm2src/trezor/src/lib.rs
index 8b61f37df2..c3847c0542 100644
--- a/mm2src/trezor/src/lib.rs
+++ b/mm2src/trezor/src/lib.rs
@@ -1,6 +1,7 @@
 #[macro_use] extern crate serde_derive;
 
 pub mod client;
+pub mod device_info;
 pub mod error;
 mod proto;
 pub mod response;
diff --git a/mm2src/trezor/src/proto/mod.rs b/mm2src/trezor/src/proto/mod.rs
index a85a76f2ef..ab80efff8f 100644
--- a/mm2src/trezor/src/proto/mod.rs
+++ b/mm2src/trezor/src/proto/mod.rs
@@ -83,6 +83,8 @@ trezor_message_impl!(PinMatrixRequest, MessageType::PinMatrixRequest);
 trezor_message_impl!(PinMatrixAck, MessageType::PinMatrixAck);
 trezor_message_impl!(ButtonRequest, MessageType::ButtonRequest);
 trezor_message_impl!(ButtonAck, MessageType::ButtonAck);
+trezor_message_impl!(PassphraseRequest, MessageType::PassphraseRequest);
+trezor_message_impl!(PassphraseAck, MessageType::PassphraseAck);
 // Bitcoin
 trezor_message_impl!(GetAddress, MessageType::GetAddress);
 trezor_message_impl!(Address, MessageType::Address);
diff --git a/mm2src/trezor/src/response.rs b/mm2src/trezor/src/response.rs
index 81599c13f8..0fda4c1c16 100644
--- a/mm2src/trezor/src/response.rs
+++ b/mm2src/trezor/src/response.rs
@@ -29,6 +29,7 @@ pub enum TrezorResponse<'a, 'b, T> {
     Ready(T),
     ButtonRequest(ButtonRequest<'a, 'b, T>),
     PinMatrixRequest(PinMatrixRequest<'a, 'b, T>),
+    PassphraseRequest(PassphraseRequest<'a, 'b, T>),
 }
 
 impl<'a, 'b, T: 'static> TrezorResponse<'a, 'b, T> {
@@ -42,6 +43,9 @@ impl<'a, 'b, T: 'static> TrezorResponse<'a, 'b, T> {
             TrezorResponse::PinMatrixRequest(_) => MmError::err(TrezorError::UnexpectedInteractionRequest(
                 TrezorUserInteraction::PinMatrix3x3,
             )),
+            TrezorResponse::PassphraseRequest(_) => MmError::err(TrezorError::UnexpectedInteractionRequest(
+                TrezorUserInteraction::PassphraseRequest,
+            )),
         }
     }
 
@@ -63,10 +67,28 @@ impl<'a, 'b, T: 'static> TrezorResponse<'a, 'b, T> {
                         TrezorUserInteraction::PinMatrix3x3,
                     ));
                 },
+                Self::PassphraseRequest(_) => {
+                    return MmError::err(TrezorError::UnexpectedInteractionRequest(
+                        TrezorUserInteraction::PassphraseRequest,
+                    ));
+                },
             };
         }
     }
 
+    /// Returns `Some(T)` if the result is ready, otherwise cancels the request.
+    pub async fn cancel_if_not_ready(self) -> Option<T> {
+        match self {
+            TrezorResponse::Ready(val) => {
+                return Some(val);
+            },
+            TrezorResponse::ButtonRequest(button) => button.cancel().await,
+            TrezorResponse::PinMatrixRequest(pin) => pin.cancel().await,
+            TrezorResponse::PassphraseRequest(pass) => pass.cancel().await,
+        }
+        None
+    }
+
     pub(crate) fn new_button_request(
         session: &'b mut TrezorSession<'a>,
         message: proto_common::ButtonRequest,
@@ -90,6 +112,18 @@ impl<'a, 'b, T: 'static> TrezorResponse<'a, 'b, T> {
             result_handler,
         })
     }
+
+    pub(crate) fn new_passphrase_request(
+        session: &'b mut TrezorSession<'a>,
+        message: proto_common::PassphraseRequest,
+        result_handler: ResultHandler<T>,
+    ) -> Self {
+        TrezorResponse::PassphraseRequest(PassphraseRequest {
+            session,
+            message,
+            result_handler,
+        })
+    }
 }
 
 #[async_trait]
@@ -114,6 +148,10 @@ where
                         let pin_response = processor.on_pin_request().await?;
                         pin_req.ack_pin(pin_response.pin).await?
                     },
+                    TrezorResponse::PassphraseRequest(passphrase_req) => {
+                        let passphrase_response = processor.on_passphrase_request().await?;
+                        passphrase_req.ack_passphrase(passphrase_response.passphrase).await?
+                    },
                 };
             }
         };
@@ -175,3 +213,29 @@ impl<'a, 'b, T: 'static> PinMatrixRequest<'a, 'b, T> {
 
     pub async fn cancel(self) { self.session.cancel_last_op().await }
 }
+
+/// A Passphrase request message sent by the device.
+pub struct PassphraseRequest<'a, 'b, T> {
+    session: &'b mut TrezorSession<'a>,
+    message: proto_common::PassphraseRequest,
+    result_handler: ResultHandler<T>,
+}
+
+impl<'a, 'b, T> fmt::Debug for PassphraseRequest<'a, 'b, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{:?}", self.message) }
+}
+
+impl<'a, 'b, T: 'static> PassphraseRequest<'a, 'b, T> {
+    /// Ack the request with a Passphrase and get the next message from the device.
+    pub async fn ack_passphrase(self, passphrase: String) -> TrezorResult<TrezorResponse<'a, 'b, T>> {
+        #[allow(deprecated)]
+        let req = proto_common::PassphraseAck {
+            passphrase: Some(passphrase),
+            state: None,
+            on_device: None,
+        };
+        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
index 1059a0acc9..5ad235ad83 100644
--- a/mm2src/trezor/src/response_processor.rs
+++ b/mm2src/trezor/src/response_processor.rs
@@ -1,3 +1,4 @@
+use crate::user_interaction::TrezorPassphraseResponse;
 use crate::{TrezorError, TrezorPinMatrix3x3Response};
 use async_trait::async_trait;
 use derive_more::Display;
@@ -24,6 +25,8 @@ pub trait TrezorRequestProcessor {
 
     async fn on_pin_request(&self) -> MmResult<TrezorPinMatrix3x3Response, TrezorProcessingError<Self::Error>>;
 
+    async fn on_passphrase_request(&self) -> MmResult<TrezorPassphraseResponse, TrezorProcessingError<Self::Error>>;
+
     async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<Self::Error>>;
 }
 
diff --git a/mm2src/trezor/src/transport/mod.rs b/mm2src/trezor/src/transport/mod.rs
index df066c748e..985c4c871f 100644
--- a/mm2src/trezor/src/transport/mod.rs
+++ b/mm2src/trezor/src/transport/mod.rs
@@ -37,6 +37,9 @@ pub trait Transport {
 
     async fn write_message(&mut self, message: ProtoMessage) -> TrezorResult<()>;
     async fn read_message(&mut self) -> TrezorResult<ProtoMessage>;
+
+    #[cfg(target_arch = "wasm32")]
+    async fn is_connected(&mut self) -> TrezorResult<bool>;
 }
 
 /// The Trezor session identifier.
diff --git a/mm2src/trezor/src/transport/protocol.rs b/mm2src/trezor/src/transport/protocol.rs
index eaab782a1c..6c553e5d76 100644
--- a/mm2src/trezor/src/transport/protocol.rs
+++ b/mm2src/trezor/src/transport/protocol.rs
@@ -32,6 +32,11 @@ pub struct ProtocolV1<L: Link> {
     pub link: L,
 }
 
+#[cfg(target_arch = "wasm32")]
+impl<L: Link> ProtocolV1<L> {
+    pub(crate) fn link(&self) -> &L { &self.link }
+}
+
 #[async_trait]
 impl<L: Link + Send> Protocol for ProtocolV1<L> {
     /// Protocol V1 doesn't support sessions.
@@ -66,7 +71,7 @@ impl<L: Link + Send> Protocol for ProtocolV1<L> {
 
     async fn read(&mut self) -> TrezorResult<ProtoMessage> {
         let chunk = self.link.read_chunk(CHUNK_LEN).await?;
-        if chunk.len() < CHUNK_HEADER_LEN as usize {
+        if chunk.len() < CHUNK_HEADER_LEN {
             return MmError::err(TrezorError::ProtocolError(format!(
                 "Invalid chunk length '{}', expected at least '{}'",
                 chunk.len(),
diff --git a/mm2src/trezor/src/transport/webusb.rs b/mm2src/trezor/src/transport/webusb.rs
index 6fa29c64ae..6c438cea74 100644
--- a/mm2src/trezor/src/transport/webusb.rs
+++ b/mm2src/trezor/src/transport/webusb.rs
@@ -3,7 +3,6 @@ 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::*;
@@ -31,6 +30,8 @@ impl Transport for WebUsbTransport {
     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 }
+
+    async fn is_connected(&mut self) -> TrezorResult<bool> { self.protocol.link().is_connected().await }
 }
 
 struct WebUsbLink {
@@ -44,14 +45,14 @@ struct WebUsbLink {
 impl Link for WebUsbLink {
     async fn write_chunk(&mut self, chunk: Vec<u8>) -> TrezorResult<()> {
         if !self.device.is_open().await? {
-            self.reconnect().await?;
+            return MmError::err(TrezorError::DeviceDisconnected);
         }
         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?;
+            return MmError::err(TrezorError::DeviceDisconnected);
         }
         Ok(self.device.read_chunk(self.endpoint_number, chunk_len).await?)
     }
@@ -61,25 +62,7 @@ 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);
-    }
+    pub async fn is_connected(&self) -> TrezorResult<bool> { self.device.is_open().await.mm_err(TrezorError::from) }
 
     /// Configure the WebUSB device.
     async fn establish_connection(&self, first: bool) -> TrezorResult<()> {
diff --git a/mm2src/trezor/src/trezor_rpc_task.rs b/mm2src/trezor/src/trezor_rpc_task.rs
index 1dcd3275fb..a84c7dd4a1 100644
--- a/mm2src/trezor/src/trezor_rpc_task.rs
+++ b/mm2src/trezor/src/trezor_rpc_task.rs
@@ -1,4 +1,5 @@
 use crate::response_processor::{TrezorProcessingError, TrezorRequestProcessor};
+use crate::user_interaction::TrezorPassphraseResponse;
 use crate::TrezorPinMatrix3x3Response;
 use async_trait::async_trait;
 use mm2_err_handle::prelude::*;
@@ -7,25 +8,40 @@ use std::time::Duration;
 
 pub use rpc_task::{RpcTask, RpcTaskError, RpcTaskHandle};
 
-const DEFAULT_PIN_REQUEST_TIMEOUT: Duration = Duration::from_secs(300);
+const DEFAULT_USER_ACTION_TIMEOUT: Duration = Duration::from_secs(300);
+
+pub trait TryIntoUserAction:
+    TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>
+    + TryInto<TrezorPassphraseResponse, Error = RpcTaskError>
+    + Send
+{
+}
+
+impl<T> TryIntoUserAction for T where
+    T: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError>
+        + TryInto<TrezorPassphraseResponse, Error = RpcTaskError>
+        + Send
+{
+}
 
 pub struct TrezorRequestStatuses<InProgressStatus, AwaitingStatus> {
     pub on_button_request: InProgressStatus,
     pub on_pin_request: AwaitingStatus,
+    pub on_passphrase_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,
+    user_action_timeout: Duration,
 }
 
 #[async_trait]
 impl<'a, Task> TrezorRequestProcessor for TrezorRpcTaskProcessor<'a, Task>
 where
     Task: RpcTask,
-    Task::UserAction: TryInto<TrezorPinMatrix3x3Response, Error = RpcTaskError> + Send,
+    Task::UserAction: TryIntoUserAction + Send,
 {
     type Error = RpcTaskError;
 
@@ -36,7 +52,7 @@ where
     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())
+            .wait_for_user_action(self.user_action_timeout, self.statuses.on_pin_request.clone())
             .await
             .mm_err(TrezorProcessingError::ProcessorError)?;
         let pin_response: TrezorPinMatrix3x3Response = user_action
@@ -45,6 +61,18 @@ where
         Ok(pin_response)
     }
 
+    async fn on_passphrase_request(&self) -> MmResult<TrezorPassphraseResponse, TrezorProcessingError<Self::Error>> {
+        let user_action = self
+            .task_handle
+            .wait_for_user_action(self.user_action_timeout, self.statuses.on_passphrase_request.clone())
+            .await
+            .mm_err(TrezorProcessingError::ProcessorError)?;
+        let passphrase_response: TrezorPassphraseResponse = user_action
+            .try_into()
+            .map_to_mm(TrezorProcessingError::ProcessorError)?;
+        Ok(passphrase_response)
+    }
+
     async fn on_ready(&self) -> MmResult<(), TrezorProcessingError<RpcTaskError>> {
         self.update_in_progress_status(self.statuses.on_ready.clone())
     }
@@ -58,12 +86,12 @@ impl<'a, Task: RpcTask> TrezorRpcTaskProcessor<'a, Task> {
         TrezorRpcTaskProcessor {
             task_handle,
             statuses,
-            pin_timeout: DEFAULT_PIN_REQUEST_TIMEOUT,
+            user_action_timeout: DEFAULT_USER_ACTION_TIMEOUT,
         }
     }
 
-    pub fn with_pin_timeout(mut self, pin_timeout: Duration) -> Self {
-        self.pin_timeout = pin_timeout;
+    pub fn with_user_action_timeout(mut self, pin_timeout: Duration) -> Self {
+        self.user_action_timeout = pin_timeout;
         self
     }
 
diff --git a/mm2src/trezor/src/user_interaction.rs b/mm2src/trezor/src/user_interaction.rs
index 8bca7d3bca..19a7decf0c 100644
--- a/mm2src/trezor/src/user_interaction.rs
+++ b/mm2src/trezor/src/user_interaction.rs
@@ -5,6 +5,7 @@ use derive_more::Display;
 pub enum TrezorUserInteraction {
     ButtonRequest,
     PinMatrix3x3,
+    PassphraseRequest,
     Other(String),
 }
 
@@ -17,3 +18,10 @@ pub enum TrezorUserInteraction {
 pub struct TrezorPinMatrix3x3Response {
     pub pin: String,
 }
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct TrezorPassphraseResponse {
+    /// A non-empty passphrase if the user is willing to use a hidden wallet,
+    /// otherwise an empty passphrase.
+    pub passphrase: String,
+}
diff --git a/mm2src/trezor/src/utxo/mod.rs b/mm2src/trezor/src/utxo/mod.rs
index b59aba04f3..c0c8088bd4 100644
--- a/mm2src/trezor/src/utxo/mod.rs
+++ b/mm2src/trezor/src/utxo/mod.rs
@@ -1,5 +1,3 @@
-use derive_more::Display;
-
 mod prev_tx;
 mod sign_utxo;
 mod unsigned_tx;
@@ -8,14 +6,8 @@ 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 use utxo_command::IGNORE_XPUB_MAGIC;
 
 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
index 46731723d0..74c0fe99bb 100644
--- a/mm2src/trezor/src/utxo/prev_tx.rs
+++ b/mm2src/trezor/src/utxo/prev_tx.rs
@@ -54,9 +54,6 @@ impl PrevTxOutput {
 }
 
 /// 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.
@@ -67,6 +64,8 @@ pub struct PrevTx {
     pub version: u32,
     /// Transaction lock_time.
     pub lock_time: u32,
+    /// Expiry height. Only for Decred and Zcash.
+    pub expiry: Option<u32>,
     /// only for Zcash, nVersionGroupId.
     pub version_group_id: Option<u32>,
     /// only for Zcash, BRANCH_ID.
@@ -89,7 +88,7 @@ impl PrevTx {
             inputs_count: self.inputs.len() as u32,
             outputs_count: self.outputs.len() as u32,
             extra_data_len,
-            expiry: None,
+            expiry: self.expiry,
             version_group_id: self.version_group_id,
             timestamp: None,
             branch_id: self.branch_id,
diff --git a/mm2src/trezor/src/utxo/unsigned_tx.rs b/mm2src/trezor/src/utxo/unsigned_tx.rs
index 0e6d99e5dc..2573a3d2bc 100644
--- a/mm2src/trezor/src/utxo/unsigned_tx.rs
+++ b/mm2src/trezor/src/utxo/unsigned_tx.rs
@@ -1,6 +1,5 @@
 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::*;
@@ -107,14 +106,17 @@ impl UnsignedTxInput {
 }
 
 /// 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,
+    /// This field is `None` if the output is a change.
+    pub address: Option<String>,
+    /// BIP-32 path to derive the key from master node.
+    /// This field is set if the output is a change, otherwise it's `None`.
+    pub address_derivation_path: Option<DerivationPath>,
     /// Amount to spend in satoshis.
     pub amount: u64,
     /// Output script type.
@@ -123,9 +125,13 @@ pub struct TxOutput {
 
 impl TxOutput {
     fn to_proto(&self) -> proto_bitcoin::TxAckOutput {
+        let address_n = match self.address_derivation_path {
+            Some(ref address_n) => serialize_derivation_path(address_n),
+            None => Vec::new(),
+        };
         let output = proto_bitcoin::TxOutput {
-            address: Some(self.address.clone()),
-            address_n: Vec::new(),
+            address: self.address.clone(),
+            address_n,
             amount: self.amount,
             script_type: Some(proto_bitcoin::OutputScriptType::from(self.script_type) as i32),
             multisig: None,
@@ -140,12 +146,11 @@ impl TxOutput {
 }
 
 /// 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,
+    pub coin: String,
     /// Transaction inputs.
     pub inputs: Vec<UnsignedTxInput>,
     /// Transaction outputs.
@@ -154,6 +159,8 @@ pub struct UnsignedUtxoTx {
     pub version: u32,
     /// Transaction lock_time.
     pub lock_time: u32,
+    /// Expiry height. Only for Decred and Zcash.
+    pub expiry: Option<u32>,
     /// only for Zcash, nVersionGroupId.
     pub version_group_id: Option<u32>,
     /// only for Zcash, BRANCH_ID.
@@ -166,10 +173,10 @@ impl UnsignedUtxoTx {
         proto_bitcoin::SignTx {
             outputs_count: self.outputs.len() as u32,
             inputs_count: self.inputs.len() as u32,
-            coin_name: Some(self.coin.to_string()),
+            coin_name: Some(self.coin.clone()),
             version: Some(self.version),
             lock_time: Some(self.lock_time),
-            expiry: None,
+            expiry: self.expiry,
             overwintered: None,
             version_group_id: self.version_group_id,
             timestamp: None,
diff --git a/mm2src/trezor/src/utxo/utxo_command.rs b/mm2src/trezor/src/utxo/utxo_command.rs
index f2103ff8f2..f513e831e7 100644
--- a/mm2src/trezor/src/utxo/utxo_command.rs
+++ b/mm2src/trezor/src/utxo/utxo_command.rs
@@ -1,21 +1,22 @@
 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};
 
+pub const IGNORE_XPUB_MAGIC: bool = true;
+
 // Bitcoin(UTXO) operations.
 impl<'a> TrezorSession<'a> {
     pub async fn get_utxo_address<'b>(
         &'b mut self,
         path: DerivationPath,
-        coin: TrezorUtxoCoin,
+        coin: String,
         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()),
+            coin_name: Some(coin),
             show_display: Some(show_display),
             multisig: None,
             script_type: None,
@@ -28,16 +29,18 @@ impl<'a> TrezorSession<'a> {
     pub async fn get_public_key<'b>(
         &'b mut self,
         path: DerivationPath,
-        coin: TrezorUtxoCoin,
+        coin: String,
         ecdsa_curve: EcdsaCurve,
+        show_display: bool,
+        ignore_xpub_magic: bool,
     ) -> 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()),
+            show_display: Some(show_display),
+            coin_name: Some(coin),
             script_type: None,
-            ignore_xpub_magic: None,
+            ignore_xpub_magic: Some(ignore_xpub_magic),
         };
 
         let result_handler = ResultHandler::new(|m: proto_bitcoin::PublicKey| Ok(m.xpub));
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7744a7653b..0f36ce4d60 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-02-01"
+channel = "nightly-2022-10-29"
 components = ["rustfmt", "clippy"]
diff --git a/wasm_build/index.html b/wasm_build/index.html
index 6e7fe3a75f..bd19234020 100644
--- a/wasm_build/index.html
+++ b/wasm_build/index.html
@@ -12,6 +12,7 @@
     <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>
+    <button id="wid_stop_mm2_button" disabled="disabled">Stop MM2</button>
     <br>
     <br>
     <label for="wid_rpc_input">RPC payload JSON</label>
diff --git a/wasm_build/script.js b/wasm_build/script.js
index 4257e1f619..8346f2a012 100644
--- a/wasm_build/script.js
+++ b/wasm_build/script.js
@@ -10,13 +10,14 @@ import init, {
     mm2_main_status,
     mm2_rpc,
     mm2_version,
+    mm2_stop,
     LogLevel,
     Mm2MainErr,
     MainStatus,
     Mm2RpcErr
-} from "./deps/pkg/mm2.js";
+} from "./deps/pkg/mm2lib.js";
 
-const LOG_LEVEL = LogLevel.Debug;
+const LOG_LEVEL = LogLevel.Info;
 
 // Loads the wasm file, so we use the
 // default export to inform it where the wasm file is located on the
@@ -104,18 +105,25 @@ function handle_log(level, line) {
 function spawn_mm2_status_checking() {
     setInterval(function () {
         const run_button = document.getElementById("wid_run_mm2_button");
+        const stop_button = document.getElementById("wid_stop_mm2_button");
         const rpc_button = document.getElementById("wid_mm2_rpc_button");
 
         const status = mm2_main_status();
         switch (status) {
             case MainStatus.NotRunning:
+                rpc_button.disabled = true;
+                stop_button.disabled = true;
+                run_button.disabled = false;
+                break;
             case MainStatus.NoContext:
             case MainStatus.NoRpc:
                 rpc_button.disabled = true;
-                run_button.disabled = false;
+                stop_button.disabled = false;
+                run_button.disabled = true;
                 break;
             case MainStatus.RpcIsUp:
                 rpc_button.disabled = false;
+                stop_button.disabled = false;
                 run_button.disabled = true;
                 break;
             default:
@@ -146,6 +154,15 @@ init_wasm().then(function () {
         await run_mm2(params);
     });
 
+    const stop_mm2_button = document.getElementById("wid_stop_mm2_button");
+    stop_mm2_button.addEventListener('click', async () => {
+        try {
+            await mm2_stop();
+        } catch (e) {
+            alert(`Error on 'mm2_stop': ${e}`);
+        }
+    });
+
     const rpc_request_button = document.getElementById("wid_mm2_rpc_button");
     rpc_request_button.addEventListener('click', async () => {
         const request_payload = document.getElementById("wid_rpc_input").value;