Skip to content

Commit f95b48a

Browse files
committed
WIP: update changes from the dart client
1 parent 2ab5ace commit f95b48a

4 files changed

Lines changed: 25 additions & 28 deletions

File tree

app/lib/services/stellar_service.dart

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,11 @@ Future<String> getBalanceByAccountId(String accountId) async {
100100
}
101101

102102
Future<Stream<OrderBook>> listOrderBook(
103-
String secret, String sellingAssetCode, String buyingAssetCode) async {
104-
final stream = await getOrderBook();
103+
String secret, Asset sellingAsset, Asset buyingAsset) async {
104+
final stream = await getOrderBook(
105+
horizonUrl: 'https://horizon.stellar.org/',
106+
sellingAsset: sellingAsset,
107+
buyingAsset: buyingAsset);
105108

106109
return stream.map((orderBookResponse) {
107110
return OrderBook(
@@ -212,7 +215,8 @@ Future<List<Offer>> getActiveOrders(String secret) async {
212215

213216
Future<List<Offer>> getOrdersHistory(String secret) async {
214217
final client = Client(NetworkType.PUBLIC, secret);
215-
final orders = await client.getTradingHistory(client.accountId);
218+
final orders = await getTradingHistory(
219+
network: NetworkType.PUBLIC, accountId: client.accountId);
216220
return orders.map((order) => Offer.fromTradeResponse(order)).toList();
217221
}
218222

@@ -226,22 +230,14 @@ Future<bool> createOrder(String secret, String sellingAssetCode,
226230
price: price);
227231
}
228232

229-
Future<bool> cancelOrder(String secret, String sellingAssetCode,
230-
String buyingAssetCode, String offerID) async {
233+
Future<bool> cancelOrder(String secret, String offerID) async {
231234
final client = Client(NetworkType.PUBLIC, secret);
232-
return await client.cancelOrder(
233-
sellingAssetCode: sellingAssetCode,
234-
buyingAssetCode: buyingAssetCode,
235-
offerId: offerID);
235+
return await client.cancelOrder(offerId: offerID);
236236
}
237237

238-
Future<bool> updateOrder(String secret, String sellingAssetCode,
239-
String buyingAssetCode, String amount, String price, String offerID) async {
238+
Future<bool> updateOrder(
239+
String secret, String amount, String price, String offerID) async {
240240
final client = Client(NetworkType.PUBLIC, secret);
241241
return await client.updateOrder(
242-
sellingAssetCode: sellingAssetCode,
243-
buyingAssetCode: buyingAssetCode,
244-
amount: amount,
245-
price: price,
246-
offerId: offerID);
242+
amount: amount, price: price, offerId: offerID);
247243
}

app/lib/widgets/market/buy_tft.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ class _BuyTFTWidgetState extends State<BuyTFTWidget> {
115115
}
116116

117117
bool _checkForChanges() {
118-
final boolean = (amountController.text != widget.offer!.amount) ||
119-
(priceController.text != widget.offer!.price);
120-
return boolean;
118+
final boolean = (amountController.text != widget.offer!.amount) ||
119+
(priceController.text != widget.offer!.price);
120+
return boolean;
121121
}
122122

123123
_createOrder() async {
@@ -192,13 +192,8 @@ class _BuyTFTWidgetState extends State<BuyTFTWidget> {
192192
loading = true;
193193
});
194194
try {
195-
final success = await Stellar.updateOrder(
196-
widget.wallet.stellarSecret,
197-
'USDC',
198-
'TFT',
199-
amountController.text,
200-
priceController.text,
201-
widget.offer!.id);
195+
final success = await Stellar.updateOrder(widget.wallet.stellarSecret,
196+
amountController.text, priceController.text, widget.offer!.id);
202197
if (success) {
203198
showDialog(
204199
barrierDismissible: false,

app/lib/widgets/market/order_book.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:stellar_flutter_sdk/stellar_flutter_sdk.dart';
23
import 'package:threebotlogin/models/order_book.dart';
34
import 'package:threebotlogin/services/stellar_service.dart';
45

@@ -21,7 +22,12 @@ class _OrderbookWidgetState extends State<OrderbookWidget> {
2122
}
2223

2324
void _loadOrderBook() async {
24-
_orderBookStream = await listOrderBook(widget.secret, 'USDC', 'TFT');
25+
_orderBookStream = await listOrderBook(
26+
widget.secret,
27+
AssetTypeCreditAlphaNum4(
28+
'USDC', 'GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN'),
29+
AssetTypeCreditAlphaNum4(
30+
'TFT', 'GBOVQKJYHXRR3DX6NOX2RRYFRCUMSADGDESTDNBDS6CDVLGVESRTAC47'));
2531
setState(() {});
2632
}
2733

app/lib/widgets/market/order_details.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class _OrderDetailsWidgetState extends State<OrderDetailsWidget> {
3232
});
3333
try {
3434
final success = await Stellar.cancelOrder(
35-
widget.selectedWallet.stellarSecret, 'USDC', 'TFT', widget.offer.id);
35+
widget.selectedWallet.stellarSecret, widget.offer.id);
3636
OrderNotifier.emitUpdate();
3737
if (success) {
3838
showDialog(

0 commit comments

Comments
 (0)