mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-03 17:40:43 +00:00
Cw 110 integrate simple swap exchange (#459)
* add support for SimpleSwap exchange * fix edit receive amount field * fixed merge conflicts * Fix issues from code review
This commit is contained in:
parent
7fae9cf9bb
commit
d9905a7cf3
15 changed files with 307 additions and 17 deletions
BIN
assets/images/simpleSwap.png
Normal file
BIN
assets/images/simpleSwap.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.9 KiB |
|
@ -14,6 +14,9 @@ class ExchangeProviderDescription extends EnumerableItem<int>
|
||||||
static const sideShift =
|
static const sideShift =
|
||||||
ExchangeProviderDescription(title: 'SideShift', raw: 3);
|
ExchangeProviderDescription(title: 'SideShift', raw: 3);
|
||||||
|
|
||||||
|
static const simpleSwap =
|
||||||
|
ExchangeProviderDescription(title: 'SimpleSwap', raw: 4);
|
||||||
|
|
||||||
static ExchangeProviderDescription deserialize({int raw}) {
|
static ExchangeProviderDescription deserialize({int raw}) {
|
||||||
switch (raw) {
|
switch (raw) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -24,6 +27,8 @@ class ExchangeProviderDescription extends EnumerableItem<int>
|
||||||
return morphToken;
|
return morphToken;
|
||||||
case 3:
|
case 3:
|
||||||
return sideShift;
|
return sideShift;
|
||||||
|
case 4:
|
||||||
|
return simpleSwap;
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,8 +47,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
|
||||||
if (amount == 0) {
|
if (amount == 0) {
|
||||||
return 0.0;
|
return 0.0;
|
||||||
}
|
}
|
||||||
final fromCurrency = normalizeCryptoCurrency(from);
|
final fromCurrency = _normalizeCryptoCurrency(from);
|
||||||
final toCurrency = normalizeCryptoCurrency(to);
|
final toCurrency = _normalizeCryptoCurrency(to);
|
||||||
final url =
|
final url =
|
||||||
apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency;
|
apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency;
|
||||||
final response = await get(url);
|
final response = await get(url);
|
||||||
|
@ -136,8 +136,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
|
||||||
Future<String> _createQuote(SideShiftRequest request) async {
|
Future<String> _createQuote(SideShiftRequest request) async {
|
||||||
final url = apiBaseUrl + quotePath;
|
final url = apiBaseUrl + quotePath;
|
||||||
final headers = {'Content-Type': 'application/json'};
|
final headers = {'Content-Type': 'application/json'};
|
||||||
final depositMethod = normalizeCryptoCurrency(request.depositMethod);
|
final depositMethod = _normalizeCryptoCurrency(request.depositMethod);
|
||||||
final settleMethod = normalizeCryptoCurrency(request.settleMethod);
|
final settleMethod = _normalizeCryptoCurrency(request.settleMethod);
|
||||||
final body = {
|
final body = {
|
||||||
'depositMethod': depositMethod,
|
'depositMethod': depositMethod,
|
||||||
'settleMethod': settleMethod,
|
'settleMethod': settleMethod,
|
||||||
|
@ -166,8 +166,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
|
||||||
@override
|
@override
|
||||||
Future<Limits> fetchLimits(
|
Future<Limits> fetchLimits(
|
||||||
{CryptoCurrency from, CryptoCurrency to, bool isFixedRateMode}) async {
|
{CryptoCurrency from, CryptoCurrency to, bool isFixedRateMode}) async {
|
||||||
final fromCurrency = normalizeCryptoCurrency(from);
|
final fromCurrency = _normalizeCryptoCurrency(from);
|
||||||
final toCurrency = normalizeCryptoCurrency(to);
|
final toCurrency = _normalizeCryptoCurrency(to);
|
||||||
final url = apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency;
|
final url = apiBaseUrl + rangePath + '/' + fromCurrency + '/' + toCurrency;
|
||||||
final response = await get(url);
|
final response = await get(url);
|
||||||
|
|
||||||
|
@ -247,7 +247,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
|
||||||
@override
|
@override
|
||||||
String get title => 'SideShift';
|
String get title => 'SideShift';
|
||||||
|
|
||||||
static String normalizeCryptoCurrency(CryptoCurrency currency) {
|
static String _normalizeCryptoCurrency(CryptoCurrency currency) {
|
||||||
switch (currency) {
|
switch (currency) {
|
||||||
case CryptoCurrency.zaddr:
|
case CryptoCurrency.zaddr:
|
||||||
return 'zaddr';
|
return 'zaddr';
|
||||||
|
|
217
lib/exchange/simpleswap/simpleswap_exchange_provider.dart
Normal file
217
lib/exchange/simpleswap/simpleswap_exchange_provider.dart
Normal file
|
@ -0,0 +1,217 @@
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:cake_wallet/exchange/exchange_pair.dart';
|
||||||
|
import 'package:cake_wallet/exchange/exchange_provider.dart';
|
||||||
|
import 'package:cake_wallet/exchange/exchange_provider_description.dart';
|
||||||
|
import 'package:cake_wallet/exchange/simpleswap/simpleswap_request.dart';
|
||||||
|
import 'package:cake_wallet/exchange/trade_not_created_exeption.dart';
|
||||||
|
import 'package:cake_wallet/exchange/trade_not_found_exeption.dart';
|
||||||
|
import 'package:cake_wallet/exchange/trade_state.dart';
|
||||||
|
import 'package:cw_core/crypto_currency.dart';
|
||||||
|
import 'package:cake_wallet/exchange/trade_request.dart';
|
||||||
|
import 'package:cake_wallet/exchange/trade.dart';
|
||||||
|
import 'package:cake_wallet/exchange/limits.dart';
|
||||||
|
import 'package:cake_wallet/.secrets.g.dart' as secrets;
|
||||||
|
import 'package:http/http.dart';
|
||||||
|
|
||||||
|
class SimpleSwapExchangeProvider extends ExchangeProvider {
|
||||||
|
SimpleSwapExchangeProvider()
|
||||||
|
: super(
|
||||||
|
pairList: CryptoCurrency.all
|
||||||
|
.map((i) =>
|
||||||
|
CryptoCurrency.all.map((k) => ExchangePair(from: i, to: k, reverse: true)).where((c) => c != null))
|
||||||
|
.expand((i) => i)
|
||||||
|
.toList());
|
||||||
|
|
||||||
|
static const apiAuthority = 'api.simpleswap.io';
|
||||||
|
static const getEstimatePath = '/v1/get_estimated';
|
||||||
|
static const rangePath = '/v1/get_ranges';
|
||||||
|
static const getExchangePath = '/v1/get_exchange';
|
||||||
|
static const createExchangePath = '/v1/create_exchange';
|
||||||
|
static const apiKey = secrets.simpleSwapApiKey;
|
||||||
|
|
||||||
|
@override
|
||||||
|
ExchangeProviderDescription get description =>
|
||||||
|
ExchangeProviderDescription.simpleSwap;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<double> calculateAmount(
|
||||||
|
{CryptoCurrency from, CryptoCurrency to, double amount, bool isFixedRateMode, bool isReceiveAmount}) async {
|
||||||
|
try {
|
||||||
|
if (amount == 0) {
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
|
final fromCurrency = _normalizeCryptoCurrency(from);
|
||||||
|
final toCurrency = _normalizeCryptoCurrency(to);
|
||||||
|
final params = <String, String>{
|
||||||
|
'api_key': apiKey,
|
||||||
|
'currency_from': fromCurrency,
|
||||||
|
'currency_to': toCurrency,
|
||||||
|
'amount': amount.toString(),
|
||||||
|
'fixed': isFixedRateMode.toString()
|
||||||
|
};
|
||||||
|
final uri = Uri.https(apiAuthority, getEstimatePath, params);
|
||||||
|
|
||||||
|
final response = await get(uri);
|
||||||
|
|
||||||
|
if (response.body == null) return 0.00;
|
||||||
|
final data = json.decode(response.body) as String;
|
||||||
|
|
||||||
|
return double.parse(data);
|
||||||
|
} catch (_) {
|
||||||
|
return 0.00;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<bool> checkIsAvailable() async {
|
||||||
|
final uri = Uri.https(apiAuthority, getEstimatePath, <String, String>{'api_key': apiKey});
|
||||||
|
final response = await get(uri);
|
||||||
|
|
||||||
|
return !(response.statusCode == 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Trade> createTrade({TradeRequest request, bool isFixedRateMode}) async {
|
||||||
|
final _request = request as SimpleSwapRequest;
|
||||||
|
final headers = {
|
||||||
|
'Content-Type': 'application/json'};
|
||||||
|
final params = <String, String>{
|
||||||
|
'api_key': apiKey,
|
||||||
|
};
|
||||||
|
final body = <String, dynamic>{
|
||||||
|
"currency_from": _normalizeCryptoCurrency(_request.from),
|
||||||
|
"currency_to": _normalizeCryptoCurrency(_request.to),
|
||||||
|
"amount": _request.amount,
|
||||||
|
"fixed": isFixedRateMode,
|
||||||
|
"user_refund_address": _request.refundAddress,
|
||||||
|
"address_to": _request.address
|
||||||
|
};
|
||||||
|
final uri = Uri.https(apiAuthority, createExchangePath, params);
|
||||||
|
|
||||||
|
final response = await post(uri, headers: headers, body: json.encode(body));
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
if (response.statusCode == 400) {
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final error = responseJSON['message'] as String;
|
||||||
|
|
||||||
|
throw TradeNotCreatedException(description, description: error);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw TradeNotCreatedException(description);
|
||||||
|
}
|
||||||
|
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final id = responseJSON['id'] as String;
|
||||||
|
final inputAddress = responseJSON['address_from'] as String;
|
||||||
|
final settleAddress = responseJSON['user_refund_address'] as String;
|
||||||
|
|
||||||
|
return Trade(
|
||||||
|
id: id,
|
||||||
|
provider: description,
|
||||||
|
from: _request.from,
|
||||||
|
to: _request.to,
|
||||||
|
inputAddress: inputAddress,
|
||||||
|
refundAddress: settleAddress,
|
||||||
|
state: TradeState.created,
|
||||||
|
amount: _request.amount,
|
||||||
|
createdAt: DateTime.now(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Limits> fetchLimits({CryptoCurrency from, CryptoCurrency to, bool isFixedRateMode}) async {
|
||||||
|
final fromCurrency = _normalizeCryptoCurrency(from);
|
||||||
|
final toCurrency = _normalizeCryptoCurrency(to);
|
||||||
|
final params = <String, dynamic>{
|
||||||
|
'api_key': apiKey,
|
||||||
|
'fixed': isFixedRateMode.toString(),
|
||||||
|
'currency_from': fromCurrency,
|
||||||
|
'currency_to': toCurrency,
|
||||||
|
};
|
||||||
|
final uri = Uri.https(apiAuthority, rangePath, params);
|
||||||
|
|
||||||
|
final response = await get(uri);
|
||||||
|
|
||||||
|
if (response.statusCode == 500) {
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final error = responseJSON['message'] as String;
|
||||||
|
|
||||||
|
throw Exception('$error');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final min = responseJSON['min'] != null ? double.tryParse(responseJSON['min'] as String) : null;
|
||||||
|
final max = responseJSON['max'] != null ? double.parse(responseJSON['max'] as String) : null;
|
||||||
|
|
||||||
|
return Limits(min: min, max: max);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Trade> findTradeById({String id}) async {
|
||||||
|
final params = {'api_key': apiKey, 'id': id};
|
||||||
|
final uri = Uri.https(apiAuthority, getExchangePath, params);
|
||||||
|
final response = await get(uri);
|
||||||
|
|
||||||
|
if (response.statusCode == 404) {
|
||||||
|
throw TradeNotFoundException(id, provider: description);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.statusCode == 400) {
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final error = responseJSON['message'] as String;
|
||||||
|
|
||||||
|
throw TradeNotFoundException(id, provider: description, description: error);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response.statusCode != 200) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
final responseJSON = json.decode(response.body) as Map<String, dynamic>;
|
||||||
|
final fromCurrency = responseJSON['currency_from'] as String;
|
||||||
|
final from = CryptoCurrency.fromString(fromCurrency);
|
||||||
|
final toCurrency = responseJSON['currency_to'] as String;
|
||||||
|
final to = CryptoCurrency.fromString(toCurrency);
|
||||||
|
final inputAddress = responseJSON['address_from'] as String;
|
||||||
|
final expectedSendAmount = responseJSON['expected_amount'].toString();
|
||||||
|
final status = responseJSON['status'] as String;
|
||||||
|
final state = TradeState.deserialize(raw: status);
|
||||||
|
|
||||||
|
return Trade(
|
||||||
|
id: id,
|
||||||
|
from: from,
|
||||||
|
to: to,
|
||||||
|
provider: description,
|
||||||
|
inputAddress: inputAddress,
|
||||||
|
amount: expectedSendAmount,
|
||||||
|
state: state,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool get isAvailable => true;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get title => 'SimpleSwap';
|
||||||
|
|
||||||
|
static String _normalizeCryptoCurrency(CryptoCurrency currency) {
|
||||||
|
switch (currency) {
|
||||||
|
case CryptoCurrency.zaddr:
|
||||||
|
return 'zec';
|
||||||
|
case CryptoCurrency.zec:
|
||||||
|
return 'zec';
|
||||||
|
case CryptoCurrency.bnb:
|
||||||
|
return currency.tag.toLowerCase();
|
||||||
|
case CryptoCurrency.usdterc20:
|
||||||
|
return 'usdterc';
|
||||||
|
default:
|
||||||
|
return currency.title.toLowerCase();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
20
lib/exchange/simpleswap/simpleswap_request.dart
Normal file
20
lib/exchange/simpleswap/simpleswap_request.dart
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
import 'package:cake_wallet/exchange/trade_request.dart';
|
||||||
|
import 'package:cw_core/crypto_currency.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class SimpleSwapRequest extends TradeRequest {
|
||||||
|
SimpleSwapRequest({
|
||||||
|
@required this.from,
|
||||||
|
@required this.to,
|
||||||
|
@required this.address,
|
||||||
|
@required this.amount,
|
||||||
|
@required this.refundAddress,
|
||||||
|
});
|
||||||
|
|
||||||
|
CryptoCurrency from;
|
||||||
|
CryptoCurrency to;
|
||||||
|
String address;
|
||||||
|
String amount;
|
||||||
|
String toAmount;
|
||||||
|
String refundAddress;
|
||||||
|
}
|
|
@ -90,6 +90,9 @@ class TradeRow extends StatelessWidget {
|
||||||
case ExchangeProviderDescription.sideShift:
|
case ExchangeProviderDescription.sideShift:
|
||||||
image = Image.asset('assets/images/sideshift.png', width: 36, height: 36);
|
image = Image.asset('assets/images/sideshift.png', width: 36, height: 36);
|
||||||
break;
|
break;
|
||||||
|
case ExchangeProviderDescription.simpleSwap:
|
||||||
|
image = Image.asset('assets/images/simpleSwap.png', width: 36, height: 36);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
image = null;
|
image = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -744,7 +744,9 @@ class ExchangePage extends BasePage {
|
||||||
});
|
});
|
||||||
|
|
||||||
_receiveAmountFocus.addListener(() {
|
_receiveAmountFocus.addListener(() {
|
||||||
|
if(receiveAmountController.text.isNotEmpty){
|
||||||
exchangeViewModel.isFixedRateMode = true;
|
exchangeViewModel.isFixedRateMode = true;
|
||||||
|
}
|
||||||
exchangeViewModel.changeReceiveAmount(
|
exchangeViewModel.changeReceiveAmount(
|
||||||
amount: receiveAmountController.text);
|
amount: receiveAmountController.text);
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
import 'dart:ui';
|
import 'dart:ui';
|
||||||
import 'package:cake_wallet/exchange/exchange_provider.dart';
|
import 'package:cake_wallet/exchange/exchange_provider.dart';
|
||||||
import 'package:cake_wallet/exchange/exchange_template.dart';
|
|
||||||
import 'package:cake_wallet/src/screens/base_page.dart';
|
import 'package:cake_wallet/src/screens/base_page.dart';
|
||||||
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
|
|
||||||
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
|
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -19,9 +17,7 @@ import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
|
||||||
import 'package:cake_wallet/src/screens/exchange/widgets/exchange_card.dart';
|
import 'package:cake_wallet/src/screens/exchange/widgets/exchange_card.dart';
|
||||||
import 'package:cake_wallet/src/widgets/primary_button.dart';
|
import 'package:cake_wallet/src/widgets/primary_button.dart';
|
||||||
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
|
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
|
||||||
import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
|
|
||||||
import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
|
import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
|
||||||
import 'package:cake_wallet/core/address_validator.dart';
|
|
||||||
import 'package:cake_wallet/core/amount_validator.dart';
|
import 'package:cake_wallet/core/amount_validator.dart';
|
||||||
import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
|
import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,9 @@ class PresentProviderPicker extends StatelessWidget {
|
||||||
case ExchangeProviderDescription.sideShift:
|
case ExchangeProviderDescription.sideShift:
|
||||||
images.add(Image.asset('assets/images/sideshift.png', width: 20));
|
images.add(Image.asset('assets/images/sideshift.png', width: 20));
|
||||||
break;
|
break;
|
||||||
|
case ExchangeProviderDescription.simpleSwap:
|
||||||
|
images.add(Image.asset('assets/images/simpleSwap.png', width: 20));
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,9 @@ abstract class TradeFilterStoreBase with Store {
|
||||||
TradeFilterStoreBase(
|
TradeFilterStoreBase(
|
||||||
{this.displayXMRTO = true,
|
{this.displayXMRTO = true,
|
||||||
this.displayChangeNow = true,
|
this.displayChangeNow = true,
|
||||||
this.displayMorphToken = true});
|
this.displayMorphToken = true,
|
||||||
|
this.displaySimpleSwap = true,
|
||||||
|
});
|
||||||
|
|
||||||
@observable
|
@observable
|
||||||
bool displayXMRTO;
|
bool displayXMRTO;
|
||||||
|
@ -22,6 +24,9 @@ abstract class TradeFilterStoreBase with Store {
|
||||||
@observable
|
@observable
|
||||||
bool displayMorphToken;
|
bool displayMorphToken;
|
||||||
|
|
||||||
|
@observable
|
||||||
|
bool displaySimpleSwap;
|
||||||
|
|
||||||
@action
|
@action
|
||||||
void toggleDisplayExchange(ExchangeProviderDescription provider) {
|
void toggleDisplayExchange(ExchangeProviderDescription provider) {
|
||||||
switch (provider) {
|
switch (provider) {
|
||||||
|
@ -34,13 +39,16 @@ abstract class TradeFilterStoreBase with Store {
|
||||||
case ExchangeProviderDescription.morphToken:
|
case ExchangeProviderDescription.morphToken:
|
||||||
displayMorphToken = !displayMorphToken;
|
displayMorphToken = !displayMorphToken;
|
||||||
break;
|
break;
|
||||||
|
case ExchangeProviderDescription.simpleSwap:
|
||||||
|
displaySimpleSwap = !displaySimpleSwap;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
List<TradeListItem> filtered({List<TradeListItem> trades, WalletBase wallet}) {
|
List<TradeListItem> filtered({List<TradeListItem> trades, WalletBase wallet}) {
|
||||||
final _trades =
|
final _trades =
|
||||||
trades.where((item) => item.trade.walletId == wallet.id).toList();
|
trades.where((item) => item.trade.walletId == wallet.id).toList();
|
||||||
final needToFilter = !displayChangeNow || !displayXMRTO || !displayMorphToken;
|
final needToFilter = !displayChangeNow || !displayXMRTO || !displayMorphToken || !displaySimpleSwap;
|
||||||
|
|
||||||
return needToFilter
|
return needToFilter
|
||||||
? _trades
|
? _trades
|
||||||
|
@ -52,7 +60,10 @@ abstract class TradeFilterStoreBase with Store {
|
||||||
ExchangeProviderDescription.changeNow) ||
|
ExchangeProviderDescription.changeNow) ||
|
||||||
(displayMorphToken &&
|
(displayMorphToken &&
|
||||||
item.trade.provider ==
|
item.trade.provider ==
|
||||||
ExchangeProviderDescription.morphToken))
|
ExchangeProviderDescription.morphToken)
|
||||||
|
||(displaySimpleSwap &&
|
||||||
|
item.trade.provider ==
|
||||||
|
ExchangeProviderDescription.simpleSwap))
|
||||||
.toList()
|
.toList()
|
||||||
: _trades;
|
: _trades;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
|
||||||
|
import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
|
||||||
import 'package:cw_core/wallet_base.dart';
|
import 'package:cw_core/wallet_base.dart';
|
||||||
import 'package:cw_core/crypto_currency.dart';
|
import 'package:cw_core/crypto_currency.dart';
|
||||||
import 'package:cake_wallet/exchange/changenow/changenow_exchange_provider.dart';
|
import 'package:cake_wallet/exchange/changenow/changenow_exchange_provider.dart';
|
||||||
|
@ -37,6 +39,12 @@ abstract class ExchangeTradeViewModelBase with Store {
|
||||||
case ExchangeProviderDescription.morphToken:
|
case ExchangeProviderDescription.morphToken:
|
||||||
_provider = MorphTokenExchangeProvider(trades: trades);
|
_provider = MorphTokenExchangeProvider(trades: trades);
|
||||||
break;
|
break;
|
||||||
|
case ExchangeProviderDescription.sideShift:
|
||||||
|
_provider = SideShiftExchangeProvider();
|
||||||
|
break;
|
||||||
|
case ExchangeProviderDescription.simpleSwap:
|
||||||
|
_provider = SimpleSwapExchangeProvider();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
items = ObservableList<ExchangeTradeItem>();
|
items = ObservableList<ExchangeTradeItem>();
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
|
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
|
||||||
import 'package:cake_wallet/exchange/sideshift/sideshift_request.dart';
|
import 'package:cake_wallet/exchange/sideshift/sideshift_request.dart';
|
||||||
|
import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
|
||||||
|
import 'package:cake_wallet/exchange/simpleswap/simpleswap_request.dart';
|
||||||
import 'package:cw_core/wallet_base.dart';
|
import 'package:cw_core/wallet_base.dart';
|
||||||
import 'package:cw_core/crypto_currency.dart';
|
import 'package:cw_core/crypto_currency.dart';
|
||||||
import 'package:cw_core/sync_status.dart';
|
import 'package:cw_core/sync_status.dart';
|
||||||
|
@ -35,7 +37,7 @@ abstract class ExchangeViewModelBase with Store {
|
||||||
this.tradesStore, this._settingsStore) {
|
this.tradesStore, this._settingsStore) {
|
||||||
const excludeDepositCurrencies = [CryptoCurrency.xhv];
|
const excludeDepositCurrencies = [CryptoCurrency.xhv];
|
||||||
const excludeReceiveCurrencies = [CryptoCurrency.xlm, CryptoCurrency.xrp, CryptoCurrency.bnb, CryptoCurrency.xhv];
|
const excludeReceiveCurrencies = [CryptoCurrency.xlm, CryptoCurrency.xrp, CryptoCurrency.bnb, CryptoCurrency.xhv];
|
||||||
providerList = [ChangeNowExchangeProvider(), SideShiftExchangeProvider()];
|
providerList = [ChangeNowExchangeProvider(), SideShiftExchangeProvider(), SimpleSwapExchangeProvider()];
|
||||||
_initialPairBasedOnWallet();
|
_initialPairBasedOnWallet();
|
||||||
isDepositAddressEnabled = !(depositCurrency == wallet.currency);
|
isDepositAddressEnabled = !(depositCurrency == wallet.currency);
|
||||||
isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
|
isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
|
||||||
|
@ -267,6 +269,18 @@ abstract class ExchangeViewModelBase with Store {
|
||||||
currency = depositCurrency;
|
currency = depositCurrency;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (provider is SimpleSwapExchangeProvider) {
|
||||||
|
request = SimpleSwapRequest(
|
||||||
|
from: depositCurrency,
|
||||||
|
to: receiveCurrency,
|
||||||
|
amount: depositAmount?.replaceAll(',', '.'),
|
||||||
|
address: receiveAddress,
|
||||||
|
refundAddress: depositAddress,
|
||||||
|
);
|
||||||
|
amount = depositAmount;
|
||||||
|
currency = depositCurrency;
|
||||||
|
}
|
||||||
|
|
||||||
if (provider is XMRTOExchangeProvider) {
|
if (provider is XMRTOExchangeProvider) {
|
||||||
request = XMRTOTradeRequest(
|
request = XMRTOTradeRequest(
|
||||||
from: depositCurrency,
|
from: depositCurrency,
|
||||||
|
@ -459,6 +473,6 @@ abstract class ExchangeViewModelBase with Store {
|
||||||
isReceiveAmountEditable = false;
|
isReceiveAmountEditable = false;
|
||||||
}*/
|
}*/
|
||||||
//isReceiveAmountEditable = false;
|
//isReceiveAmountEditable = false;
|
||||||
isReceiveAmountEditable = provider is ChangeNowExchangeProvider;
|
isReceiveAmountEditable = provider is ChangeNowExchangeProvider || provider is SimpleSwapExchangeProvider;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ import 'package:cake_wallet/exchange/exchange_provider.dart';
|
||||||
import 'package:cake_wallet/exchange/exchange_provider_description.dart';
|
import 'package:cake_wallet/exchange/exchange_provider_description.dart';
|
||||||
import 'package:cake_wallet/exchange/morphtoken/morphtoken_exchange_provider.dart';
|
import 'package:cake_wallet/exchange/morphtoken/morphtoken_exchange_provider.dart';
|
||||||
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
|
import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart';
|
||||||
|
import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
|
||||||
import 'package:cake_wallet/exchange/trade.dart';
|
import 'package:cake_wallet/exchange/trade.dart';
|
||||||
import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
|
import 'package:cake_wallet/exchange/xmrto/xmrto_exchange_provider.dart';
|
||||||
import 'package:cake_wallet/utils/date_formatter.dart';
|
import 'package:cake_wallet/utils/date_formatter.dart';
|
||||||
|
@ -35,6 +36,9 @@ abstract class TradeDetailsViewModelBase with Store {
|
||||||
case ExchangeProviderDescription.sideShift:
|
case ExchangeProviderDescription.sideShift:
|
||||||
_provider = SideShiftExchangeProvider();
|
_provider = SideShiftExchangeProvider();
|
||||||
break;
|
break;
|
||||||
|
case ExchangeProviderDescription.simpleSwap:
|
||||||
|
_provider = SimpleSwapExchangeProvider();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
items = ObservableList<StandartListItem>();
|
items = ObservableList<StandartListItem>();
|
||||||
|
@ -112,6 +116,12 @@ abstract class TradeDetailsViewModelBase with Store {
|
||||||
title: 'Track', value: buildURL, onTap: () => launch(buildURL)));
|
title: 'Track', value: buildURL, onTap: () => launch(buildURL)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (trade.provider == ExchangeProviderDescription.simpleSwap) {
|
||||||
|
final buildURL = 'https://simpleswap.io/exchange?id=${trade.id.toString()}';
|
||||||
|
items.add(TrackTradeListItem(
|
||||||
|
title: 'Track', value: buildURL, onTap: () => launch(buildURL)));
|
||||||
|
}
|
||||||
|
|
||||||
if (trade.createdAt != null) {
|
if (trade.createdAt != null) {
|
||||||
items.add(StandartListItem(
|
items.add(StandartListItem(
|
||||||
title: S.current.trade_details_created_at,
|
title: S.current.trade_details_created_at,
|
||||||
|
|
|
@ -25,6 +25,7 @@ class SecretKey {
|
||||||
SecretKey('moonPaySecretKey', () => ''),
|
SecretKey('moonPaySecretKey', () => ''),
|
||||||
SecretKey('sideShiftAffiliateId', () => ''),
|
SecretKey('sideShiftAffiliateId', () => ''),
|
||||||
SecretKey('sideShiftApiKey', () => ''),
|
SecretKey('sideShiftApiKey', () => ''),
|
||||||
|
SecretKey('simpleSwapApiKey', () => '')
|
||||||
];
|
];
|
||||||
|
|
||||||
final String name;
|
final String name;
|
||||||
|
|
Loading…
Reference in a new issue