Implement BCH and SLP tx history. Refactoring. #701 (#1175)

* WIP. * WIP. Added SqliteTxHistoryStorage. * WIP. Implementing BCH and SLP tx history fetching as state machine. * WIP. * WIP. Tests fail. * WIP. Refactoring. * WIP. * WIP. * WIP. * WIP. * WIP. * WIP. Fixes after merging dev. * WIP. * WIP. Adding tests. * WIP. Updated toolchain. Adding block timestamp method to coins. * WIP. Implementing my_tx_history_v2_rpc. * WIP. Fixes after merging dev. * WIP. Implementing my_tx_history 2.0 RPC. * WIP. * WIP. Implementing querying history from SQLite. * WIP. Added db_common crate. * WIP. RPC 2.0 is ready. Some tests left todo. * Finish tests. Fix Clippy. * Fix WASM. * Add a couple of allows for my_tx_history_v2 under WASM.
KomodoPlatform · Dec 28, 2021 · 383878a · 383878a
1 parent be163e1
commit 383878a
Show file tree

Hide file tree

Showing 86 changed files with 3,812 additions and 911 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,6 +61,7 @@ crc = "1.8"
 crc32fast = { version = "1.2", features = ["std", "nightly"] }
 crossbeam = "0.7"
 crypto = { path = "mm2src/crypto" }
+db_common = { path = "mm2src/db_common" }
 derive_more = "0.99"
 either = "1.6"
 ethereum-types = { version = "0.4", default-features = false, features = ["std", "serialize"] }
@@ -109,7 +110,6 @@ serialization = { path = "mm2src/mm2_bitcoin/serialization" }
 serialization_derive = { path = "mm2src/mm2_bitcoin/serialization_derive" }
 sp-runtime-interface = { version = "3.0.0", default-features = false, features = ["disable_target_static_assertions"] }
 sp-trie = { version = "3.0", default-features = false }
-sql-builder = "3.1.1"
 
 trie-db = { version = "0.22.6", default-features = false }
 trie-root = "0.16.0"
@@ -147,6 +147,7 @@ members = [
     "mm2src/coins/utxo_signer",
     "mm2src/coins_activation",
     "mm2src/crypto",
+    "mm2src/db_common",
     "mm2src/derives/ser_error",
     "mm2src/derives/ser_error_derive",
     "mm2src/floodsub",

diff --git a/azure-pipelines-build-stage-job.yml b/azure-pipelines-build-stage-job.yml
@@ -40,7 +40,6 @@ jobs:
         displayName: 'Build MM2 Release'
       # Build WASM.
       - bash: |
-          cargo clean -p mm2-libp2p -p mm2 --target=wasm32-unknown-unknown
           wasm-pack build --release --target web --out-dir target/target-wasm-release
         displayName: 'Build MM2 WASM Release'
         condition: eq( variables['Agent.OS'], 'Linux' )
@@ -56,7 +55,6 @@ jobs:
       # Explicit --test-threads=16 makes testing process slightly faster on agents that have <16 CPU cores.
       # Always run tests on mm2.1 branch and PRs
       - bash: |
-          cargo clean -p mm2-libp2p -p mm2
           cargo test --all -- --test-threads=16
         displayName: 'Test MM2'
         timeoutInMinutes: 22

diff --git a/etomic_build/client/enable_tBCH_USDF b/etomic_build/client/enable_tBCH_USDF
@@ -0,0 +1,20 @@
+#!/bin/bash
+source userpass
+curl --url "http://127.0.0.1:7783" --data '{
+     "userpass": "'$userpass'",
+     "method": "enable_bch_with_tokens",
+     "mmrpc": "2.0",
+     "params": {
+         "ticker": "tBCH",
+         "allow_slp_unsafe_conf": true,
+         "bchd_urls": [],
+         "mode": {
+             "rpc": "Electrum",
+             "rpc_data":{
+                 "servers": [{"url":"electroncash.de:50003"},{"url":"tbch.loping.net:60001"},{"url":"blackie.c3-soft.com:60001"},{"url":"bch0.kister.net:51001"},{"url":"testnet.imaginary.cash:50001"}]
+             }
+         },
+         "tx_history": true,
+         "slp_tokens_requests": [{"ticker":"USDF"}]
+     }
+ }'
diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml
@@ -26,6 +26,7 @@ cfg-if = "1.0"
 chain = { path = "../mm2_bitcoin/chain" }
 common = { path = "../common" }
 crypto = { path = "../crypto" }
+db_common = { path = "../db_common" }
 derive_more = "0.99"
 ethabi = { git = "https://github.com/artemii235/ethabi" }
 ethcore-transaction = { git = "https://github.com/artemii235/parity-ethereum.git" }

diff --git a/mm2src/coins/eth.rs b/mm2src/coins/eth.rs
@@ -18,6 +18,7 @@
 //
 //  Copyright © 2017-2019 SuperNET. All rights reserved.
 //
+use async_trait::async_trait;
 use bigdecimal::BigDecimal;
 use bitcrypto::sha256;
 use common::custom_futures::TimedAsyncMutex;
@@ -659,6 +660,7 @@ impl Deref for EthCoin {
     fn deref(&self) -> &EthCoinImpl { &*self.0 }
 }
 
+#[async_trait]
 impl SwapOps for EthCoin {
     fn send_taker_fee(&self, fee_addr: &[u8], amount: BigDecimal, _uuid: &[u8]) -> TransactionFut {
         let address = try_fus!(addr_from_raw_pubkey(fee_addr));
@@ -986,7 +988,7 @@ impl SwapOps for EthCoin {
         Box::new(fut.boxed().compat())
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
         _time_lock: u32,
         _other_pub: &[u8],
@@ -999,7 +1001,7 @@ impl SwapOps for EthCoin {
         self.search_for_swap_tx_spend(tx, swap_contract_address, search_from_block)
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
         _time_lock: u32,
         _other_pub: &[u8],

diff --git a/mm2src/coins/eth/web3_transport.rs b/mm2src/coins/eth/web3_transport.rs
@@ -114,7 +114,7 @@ impl<T: Future> Future for SendFuture<T> {
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> { self.0.poll() }
 }
 
-unsafe impl<T> Send for SendFuture<T> {}
+unsafe impl<T> Send for SendFuture<T> where T: Send {}
 unsafe impl<T> Sync for SendFuture<T> {}
 
 impl Transport for Web3Transport {

diff --git a/mm2src/coins/for_tests/tBCH_tx_history_fixtures.json b/mm2src/coins/for_tests/tBCH_tx_history_fixtures.json
diff --git a/mm2src/coins/lightning.rs b/mm2src/coins/lightning.rs
@@ -10,6 +10,7 @@ use crate::utxo::{sat_from_big_decimal, FeePolicy, UtxoCommonOps, UtxoTxGenerati
 use crate::{BalanceFut, CoinBalance, FeeApproxStage, FoundSwapTxSpend, HistorySyncState, MarketCoinOps, MmCoin,
             NegotiateSwapContractAddrErr, SwapOps, TradeFee, TradePreimageFut, TradePreimageValue, TransactionEnum,
             TransactionFut, UtxoStandardCoin, ValidateAddressResult, WithdrawFut, WithdrawRequest};
+use async_trait::async_trait;
 use bigdecimal::BigDecimal;
 use bitcoin::blockdata::script::Script;
 use bitcoin::hash_types::Txid;
@@ -116,6 +117,7 @@ impl LightningCoin {
     fn platform_coin(&self) -> &UtxoStandardCoin { &self.platform_fields.platform_coin }
 }
 
+#[async_trait]
 impl SwapOps for LightningCoin {
     fn send_taker_fee(&self, _fee_addr: &[u8], _amount: BigDecimal, _uuid: &[u8]) -> TransactionFut { unimplemented!() }
 
@@ -232,7 +234,7 @@ impl SwapOps for LightningCoin {
         unimplemented!()
     }
 
-    fn search_for_swap_tx_spend_my(
+    async fn search_for_swap_tx_spend_my(
         &self,
         _time_lock: u32,
         _other_pub: &[u8],
@@ -244,7 +246,7 @@ impl SwapOps for LightningCoin {
         unimplemented!()
     }
 
-    fn search_for_swap_tx_spend_other(
+    async fn search_for_swap_tx_spend_other(
         &self,
         _time_lock: u32,
         _other_pub: &[u8],

diff --git a/mm2src/coins/lightning/ln_utils.rs b/mm2src/coins/lightning/ln_utils.rs
@@ -159,11 +159,11 @@ impl EventHandler for LightningEventHandler {
                 // Give the funding transaction back to LDK for opening the channel.
                 match self
                     .channel_manager
-                    .funding_transaction_generated(&temporary_channel_id, funding_tx.clone())
+                    .funding_transaction_generated(temporary_channel_id, funding_tx.clone())
                 {
                     Ok(_) => {
                         let txid = funding_tx.txid();
-                        self.filter.register_tx(&txid, &output_script);
+                        self.filter.register_tx(&txid, output_script);
                         let output_to_be_registered = TxOut {
                             value: *channel_value_satoshis,
                             script_pubkey: output_script.clone(),
@@ -260,7 +260,7 @@ pub async fn start_lightning(
     let broadcaster = Arc::new(platform_coin.clone());
 
     // Initialize Persist
-    let ln_data_dir = my_ln_data_dir(&ctx, &ticker)
+    let ln_data_dir = my_ln_data_dir(ctx, &ticker)
         .as_path()
         .to_str()
         .ok_or("Data dir is a non-UTF-8 string")
@@ -455,7 +455,7 @@ pub async fn start_lightning(
 
     // If node is restarting read other nodes data from disk and reconnect to channel nodes/peers if possible.
     if restarting_node {
-        let mut nodes_data = read_nodes_data_from_file(&nodes_data_path(&ctx, &ticker))?;
+        let mut nodes_data = read_nodes_data_from_file(&nodes_data_path(ctx, &ticker))?;
         for (pubkey, node_addr) in nodes_data.drain() {
             for chan_info in channel_manager.list_channels() {
                 if pubkey == chan_info.counterparty.node_id {
@@ -542,7 +542,7 @@ async fn process_tx_for_unconfirmation(txid: Txid, filter: Arc<PlatformFields>,
         .platform_coin
         .as_ref()
         .rpc_client
-        .get_transaction_bytes(H256::from(txid.as_hash().into_inner()).reversed())
+        .get_transaction_bytes(&H256::from(txid.as_hash().into_inner()).reversed())
         .compat()
         .await
         .map_err(|e| e.into_inner())
@@ -597,7 +597,7 @@ async fn process_txs_confirmations(
             .platform_coin
             .as_ref()
             .rpc_client
-            .get_transaction_bytes(rpc_txid.clone())
+            .get_transaction_bytes(&rpc_txid)
             .compat()
             .await
         {