Automatically fix stuck swaps

app/locales/en-US/swap.json

@@ -4,6 +4,8 @@
 	"timedOut": "Swap timed out",
 	"title": "Swap",
 	"details": {
+		"aliceclaim": "Alice Claim",
+		"alicereclaim": "Alice Reclaim",
 		"alicepayment": "Alice Payment",
 		"alicespend": "Alice Spend",
 		"bobdeposit": "Bob Deposit",
@@ -35,7 +37,11 @@
 		"completed": "Completed",
 		"failed": "Failed",
 		"matched": "Matched",
+		"reverted": "Reverted",
 		"pending": "Pending",
 		"unmatched": "Unmatched"
+	},
+	"statusInformation": {
+		"reverted": "The swap was reverted due to connectivity issues."
 	}
 }

app/renderer/api.js

@@ -350,6 +350,17 @@ export default class Api {
 		return getCurrency(opts.symbol).etomic ? this._withdrawEth(opts) : this._withdrawBtcFork(opts);
 	}
 
+	kickstart(opts) {
+		ow(opts.requestId, ow.number.positive.finite.label('requestId'));
+		ow(opts.quoteId, ow.number.positive.finite.label('quoteId'));
+
+		return this.request({
+			method: 'kickstart',
+			requestid: opts.requestId,
+			quoteid: opts.quoteId,
+		});
+	}
+
 	listUnspent(coin, address) {
 		ow(coin, symbolPredicate.label('coin'));
 		ow(address, ow.string.label('address'));
@@ -376,14 +387,4 @@ export default class Api {
 		this.queue.pause();
 		this.queue.clear();
 	}
-
-	subscribeToSwap(uuid) {
-		ow(uuid, uuidPredicate.label('uuid'));
-
-		if (!this.socket) {
-			throw new Error('Swap subscriptions require the socket to be enabled');
-		}
-
-		return this.socket.subscribeToSwap(uuid);
-	}
 }

app/renderer/components/SwapDetails.js

@@ -52,33 +52,32 @@ class SwapDetails extends React.Component {
 		const {swap} = this.props;
 		const {baseCurrency, quoteCurrency} = swap;
 
-		let hasTransactions = false;
-		const transactions = swapTransactions.map(stage => {
-			const tx = swap.transactions.find(tx => tx.stage === stage);
-
-			if (!tx) {
-				return (
-					<React.Fragment key={stage}>
-						<div className="arrow">→</div>
-						<div className="item">
-							<h6>{t(`details.${stage}`)}</h6>
-						</div>
-					</React.Fragment>
-				);
-			}
+		const transactions = swap.transactions.map(tx => (
+			<React.Fragment key={tx.stage}>
+				<div className="arrow completed">→</div>
+				<div className="item completed" title={tx.txid}>
+					<h6>{t(`details.${tx.stage}`)}</h6>
+					<p>{tx.amount}<br/>{tx.coin}</p>
+				</div>
+			</React.Fragment>
+		));
 
-			hasTransactions = true;
+		if (swap.status === 'swapping') {
+			swapTransactions.forEach(stage => {
+				const tx = swap.transactions.find(tx => tx.stage === stage);
 
-			return (
-				<React.Fragment key={stage}>
-					<div className="arrow completed">→</div>
-					<div className="item completed" title={tx.txid}>
-						<h6>{t(`details.${stage}`)}</h6>
-						<p>{tx.amount}<br/>{tx.coin}</p>
-					</div>
-				</React.Fragment>
-			);
-		});
+				if (!tx) {
+					transactions.push(
+						<React.Fragment key={stage}>
+							<div className="arrow">→</div>
+							<div className="item">
+								<h6>{t(`details.${stage}`)}</h6>
+							</div>
+						</React.Fragment>
+					);
+				}
+			});
+		}
 
 		const prices = ['requested', 'broadcast', 'executed'].map(value => {
 			if (!swap[value].price) {
@@ -136,6 +135,9 @@ class SwapDetails extends React.Component {
 									</React.Fragment>
 								)}
 							</p>
+							{swap.statusInformation && (
+								<p>{swap.statusInformation}</p>
+							)}
 						</div>
 						<div className="section details">
 							<div className="offer-wrapper">
@@ -151,7 +153,7 @@ class SwapDetails extends React.Component {
 									</p>
 								)}
 							</div>
-							{hasTransactions && (
+							{(transactions.length > 0) && (
 								<React.Fragment>
 									<h4>{t('details.transactions')}</h4>
 									<div className="transactions">

app/renderer/containers/Exchange.js

@@ -1,6 +1,7 @@
 /* eslint-disable react/no-access-state-in-setstate */
 import {is, api, activeWindow, appLaunchTimestamp} from 'electron-util';
 import _ from 'lodash';
+import {isPast, addHours} from 'date-fns';
 import SuperContainer from 'containers/SuperContainer';
 import appContainer from 'containers/App';
 import {translate} from '../translate';
@@ -22,12 +23,23 @@ class ExchangeContainer extends SuperContainer {
 				askdepth: 0,
 			},
 			isSendingOrder: false,
+			doneInitialKickstart: false,
 		};
 	}
 
-	componentDidInitialMount() {
-		this.setSwapHistory();
+	async componentDidInitialMount() {
+		await this.setSwapHistory();
 		appContainer.swapDB.on('change', this.setSwapHistory);
+		appContainer.api.socket.on('message', message => {
+			const uuids = this.state.swapHistory.map(swap => swap.uuid);
+			if (uuids.includes(message.uuid)) {
+				appContainer.swapDB.updateSwapData(message);
+			}
+		});
+
+		fireEvery({minutes: 15}, async () => {
+			await this.kickstartStuckSwaps();
+		});
 	}
 
 	constructor() {
@@ -49,6 +61,23 @@ class ExchangeContainer extends SuperContainer {
 		});
 	}
 
+	async kickstartStuckSwaps() {
+		const {doneInitialKickstart} = this.state;
+		this.state.swapHistory
+			.filter(swap => (
+				swap.status === 'swapping' &&
+				(!doneInitialKickstart || isPast(addHours(swap.timeStarted, 4)))
+			))
+			.forEach(async swap => {
+				const {requestId, quoteId} = swap;
+				await appContainer.api.kickstart({requestId, quoteId});
+			});
+
+		if (!doneInitialKickstart) {
+			this.setState({doneInitialKickstart: true});
+		}
+	}
+
 	setSwapHistory = async () => {
 		this.setState({swapHistory: await appContainer.swapDB.getSwaps()});
 	};

app/renderer/marketmaker-socket.js

@@ -1,8 +1,6 @@
 import Emittery from 'emittery';
 import pEvent from 'p-event';
 import readBlob from 'read-blob';
-import pAny from 'p-any';
-import delay from 'delay';
 
 class MarketmakerSocket {
 	constructor(endpoint) {
@@ -32,52 +30,6 @@ class MarketmakerSocket {
 	}
 
 	getResponse = queueId => this._ee.once(`id_${queueId}`);
-
-	// Returns an EventEmitter that will emit events as the status of the swap progresses
-	// Important events:
-	//  - 'progress': All messages related to the swap.
-	//  - 'connected': The swap has been matched.
-	//  - 'update': The atomic swap has advanced a step, the step flag is in the `update` property.
-	//  - 'finished': The atomic swap level has successfully completed.
-	//  - 'failed': The atomic swap has failed, the error code is in the property `error`.
-	//
-	// Any other message with a `method` property will also be emitted via en event of the same name.
-	subscribeToSwap(uuid) {
-		if (typeof uuid === 'undefined') {
-			throw new TypeError(`uuid is required`);
-		}
-
-		const swapEmitter = new Emittery();
-
-		const removeListener = this.on('message', message => {
-			if (message.uuid !== uuid) {
-				return;
-			}
-
-			swapEmitter.emit('progress', message);
-			if (message.method) {
-				swapEmitter.emit(message.method, message);
-			}
-			if (message.method === 'tradestatus' && message.status === 'finished') {
-				swapEmitter.emit('completed', message);
-			}
-		});
-
-		// We should wait for 10 minutes before removing the listener
-		// to handle edge cases where swaps can breifly have an incorrect
-		// status due to communication issues:
-		// https://github.com/jl777/SuperNET/issues/756
-		const TEN_MINUTES = 1000 * 60 * 10;
-		pAny([
-			swapEmitter.once('failed'),
-			swapEmitter.once('completed'),
-		]).then(async () => {
-			await delay(TEN_MINUTES);
-			removeListener();
-		});
-
-		return swapEmitter;
-	}
 }
 
 export default MarketmakerSocket;