ETH/ERC20/UTXO swaps with watcher rewards

CHANGELOG.md

@@ -8,6 +8,9 @@
 - Some enhancements were done for `enable_bch_with_tokens`,`enable_eth_with_tokens`,`enable_tendermint_with_assets` RPCs in [#1762](https://github.com/KomodoPlatform/atomicDEX-API/pull/1762)
   - A new parameter `get_balances` was added to the above methods requests, when this parameter is set to `false`, balances will not be returned in the response. The default value for this parameter is `true` to ensure backward compatibility.
   - Token balances requests are now performed concurrently for the above methods.
+- Swap watcher nodes [#1750](https://github.com/KomodoPlatform/atomicDEX-API/pull/1750)
+  - PoC for ETH/UTXO and ERC20/UTXO swaps with rewards
+  - Improved protocol to let only the taker pay the reward
 - Add passive parent coin state for keeping tokens active when platform is disabled [#1763](https://github.com/KomodoPlatform/atomicDEX-API/pull/1763)
 
 

mm2src/coins/Cargo.toml

@@ -16,6 +16,7 @@ enable-solana = [
 	"dep:spl-associated-token-account"
 ]
 default = []
+run-docker-tests = []
 
 [lib]
 name = "coins"
@@ -148,6 +149,7 @@ winapi = "0.3"
 
 [dev-dependencies]
 mm2_test_helpers = { path = "../mm2_test_helpers" }
+wasm-timer = "0.2.4"
 
 [build-dependencies]
 prost-build = { version = "0.10.4", default-features = false }

mm2src/coins/coin_errors.rs

@@ -19,6 +19,7 @@ pub enum ValidatePaymentError {
     Transport(String),
     // Transaction has wrong properties, for example, it has been sent to a wrong address
     WrongPaymentTx(String),
+    WatcherRewardError(String),
 }
 
 impl From<rlp::DecoderError> for ValidatePaymentError {

mm2src/coins/eth/eth_tests.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::IguanaPrivKey;
-use common::block_on;
+use common::{block_on, now_sec_u32};
 use mm2_core::mm_ctx::{MmArc, MmCtxBuilder};
 use mm2_test_helpers::for_tests::{ETH_MAINNET_NODE, ETH_MAINNET_SWAP_CONTRACT};
 use mocktopus::mocking::*;
@@ -254,7 +254,7 @@ fn send_and_refund_erc20_payment() {
     }));
     let maker_payment_args = SendPaymentArgs {
         time_lock_duration: 0,
-        time_lock: (now_ms() / 1000) as u32 - 200,
+        time_lock: now_sec_u32() - 200,
         other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
         secret_hash: &[1; 20],
         amount: "0.001".parse().unwrap(),
@@ -271,7 +271,7 @@ fn send_and_refund_erc20_payment() {
 
     let maker_refunds_payment_args = RefundPaymentArgs {
         payment_tx: &payment.tx_hex(),
-        time_lock: (now_ms() / 1000) as u32 - 200,
+        time_lock: now_sec_u32() - 200,
         other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
         secret_hash: &[1; 20],
         swap_contract_address: &coin.swap_contract_address(),
@@ -325,7 +325,7 @@ fn send_and_refund_eth_payment() {
     }));
     let send_maker_payment_args = SendPaymentArgs {
         time_lock_duration: 0,
-        time_lock: (now_ms() / 1000) as u32 - 200,
+        time_lock: now_sec_u32() - 200,
         other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
         secret_hash: &[1; 20],
         amount: "0.001".parse().unwrap(),
@@ -342,7 +342,7 @@ fn send_and_refund_eth_payment() {
     block_on(Timer::sleep(60.));
     let maker_refunds_payment_args = RefundPaymentArgs {
         payment_tx: &payment.tx_hex(),
-        time_lock: (now_ms() / 1000) as u32 - 200,
+        time_lock: now_sec_u32() - 200,
         other_pubkey: &DEX_FEE_ADDR_RAW_PUBKEY,
         secret_hash: &[1; 20],
         swap_contract_address: &coin.swap_contract_address(),
@@ -466,7 +466,7 @@ fn test_wait_for_payment_spend_timeout() {
     };
 
     let coin = EthCoin(Arc::new(coin));
-    let wait_until = (now_ms() / 1000) - 1;
+    let wait_until = now_sec() - 1;
     let from_block = 1;
     // raw transaction bytes of https://etherscan.io/tx/0x0869be3e5d4456a29d488a533ad6c118620fef450f36778aecf31d356ff8b41f
     let tx_bytes = [
@@ -483,14 +483,15 @@ fn test_wait_for_payment_spend_timeout() {
     ];
 
     assert!(coin
-        .wait_for_htlc_tx_spend(
-            &tx_bytes,
-            &[],
+        .wait_for_htlc_tx_spend(WaitForHTLCTxSpendArgs {
+            tx_bytes: &tx_bytes,
+            secret_hash: &[],
             wait_until,
             from_block,
-            &coin.swap_contract_address(),
-            TAKER_PAYMENT_SPEND_SEARCH_INTERVAL
-        )
+            swap_contract_address: &coin.swap_contract_address(),
+            check_every: TAKER_PAYMENT_SPEND_SEARCH_INTERVAL,
+            watcher_reward: false
+        })
         .wait()
         .is_err());
 }

mm2src/coins/eth/swap_contract_abi.json

@@ -1,30 +1,4 @@
 [
-	{
-		"anonymous": false,
-		"inputs": [
-			{
-				"indexed": false,
-				"internalType": "string",
-				"name": "message",
-				"type": "string"
-			}
-		],
-		"name": "Log",
-		"type": "event"
-	},
-	{
-		"anonymous": false,
-		"inputs": [
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "number",
-				"type": "uint256"
-			}
-		],
-		"name": "LogNumber",
-		"type": "event"
-	},
 	{
 		"anonymous": false,
 		"inputs": [
@@ -139,6 +113,21 @@
 				"internalType": "uint64",
 				"name": "_lockTime",
 				"type": "uint64"
+			},
+			{
+				"internalType": "enum EtomicSwap.RewardTargetOnSpend",
+				"name": "_rewardTarget",
+				"type": "uint8"
+			},
+			{
+				"internalType": "bool",
+				"name": "_sendsContractRewardOnSpend",
+				"type": "bool"
+			},
+			{
+				"internalType": "uint256",
+				"name": "_rewardAmount",
+				"type": "uint256"
 			}
 		],
 		"name": "erc20PaymentReward",
@@ -196,9 +185,19 @@
 				"name": "_lockTime",
 				"type": "uint64"
 			},
+			{
+				"internalType": "enum EtomicSwap.RewardTargetOnSpend",
+				"name": "_rewardTarget",
+				"type": "uint8"
+			},
+			{
+				"internalType": "bool",
+				"name": "_sendsContractRewardOnSpend",
+				"type": "bool"
+			},
 			{
 				"internalType": "uint256",
-				"name": "_watcherReward",
+				"name": "_rewardAmount",
 				"type": "uint256"
 			}
 		],
@@ -272,9 +271,19 @@
 				"name": "_receiver",
 				"type": "address"
 			},
+			{
+				"internalType": "enum EtomicSwap.RewardTargetOnSpend",
+				"name": "_rewardTarget",
+				"type": "uint8"
+			},
+			{
+				"internalType": "bool",
+				"name": "_sendsContractRewardOnSpend",
+				"type": "bool"
+			},
 			{
 				"internalType": "uint256",
-				"name": "_watcherReward",
+				"name": "_rewardAmount",
 				"type": "uint256"
 			}
 		],
@@ -348,9 +357,19 @@
 				"name": "_receiver",
 				"type": "address"
 			},
+			{
+				"internalType": "enum EtomicSwap.RewardTargetOnSpend",
+				"name": "_rewardTarget",
+				"type": "uint8"
+			},
+			{
+				"internalType": "bool",
+				"name": "_sendsReward",
+				"type": "bool"
+			},
 			{
 				"internalType": "uint256",
-				"name": "_watcherReward",
+				"name": "_rewardAmount",
 				"type": "uint256"
 			}
 		],