Skip to content

Commit c333b0d

Browse files
committed
misc: update to locked Xelis deps, adopt unified FFI lib API
1 parent 775b11f commit c333b0d

File tree

5 files changed

+60
-22
lines changed

5 files changed

+60
-22
lines changed

lib/wallets/crypto_currency/coins/xelis.dart

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ class Xelis extends ElectrumCurrency {
1919
_id = "xelisTestNet";
2020
_name = "tXelis";
2121
_ticker = "XET";
22+
case CryptoCurrencyNetwork.stage:
23+
_id = "xelisStageNet";
24+
_name = "sXelis";
25+
_ticker = "XET";
2226
default:
2327
throw Exception("Unsupported network: $network");
2428
}
@@ -79,6 +83,22 @@ class Xelis extends ElectrumCurrency {
7983
isPrimary: isPrimary,
8084
);
8185

86+
case CryptoCurrencyNetwork.test:
87+
return NodeModel(
88+
host: "stagenet-node.xelis.io",
89+
port: 443,
90+
name: DefaultNodes.defaultName,
91+
id: DefaultNodes.buildId(this),
92+
useSSL: true,
93+
enabled: true,
94+
coinName: identifier,
95+
isFailover: true,
96+
isDown: false,
97+
torEnabled: false,
98+
clearnetEnabled: true,
99+
isPrimary: isPrimary,
100+
);
101+
82102
default:
83103
throw Exception("Unsupported network: $network");
84104
}
@@ -93,7 +113,7 @@ class Xelis extends ElectrumCurrency {
93113
@override
94114
bool validateAddress(String address) {
95115
try {
96-
return libXelis.isAddressValid(address: address);
116+
return libXelis.isAddressValid(address: address, network: network);
97117
} catch (_) {
98118
return false;
99119
}
@@ -133,7 +153,11 @@ class Xelis extends ElectrumCurrency {
133153
Uri defaultBlockExplorer(String txid) {
134154
switch (network) {
135155
case CryptoCurrencyNetwork.main:
136-
return Uri.parse("https://explorer.xelis.io/txs/$txid");
156+
return Uri.parse("https://explorer.xelis.io/tx/$txid");
157+
case CryptoCurrencyNetwork.test:
158+
return Uri.parse("https://testnet-explorer.xelis.io/tx/$txid");
159+
case CryptoCurrencyNetwork.stage:
160+
return Uri.parse("https://stagenet-explorer.xelis.io/tx/$txid");
137161
default:
138162
throw Exception(
139163
"Unsupported network for defaultBlockExplorer(): $network",

lib/wl_gen/interfaces/lib_xelis_interface.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/foundation.dart';
2+
import 'package:xelis_dart_sdk/src/data_transfer_objects/get_asset/max_supply_mode.dart';
23

34
import '../../providers/progress_report/xelis_table_progress_provider.dart';
45
import '../../wallets/crypto_currency/crypto_currency.dart';
@@ -18,7 +19,7 @@ abstract class LibXelisInterface {
1819

1920
Stream<XelisTableProgressState> createProgressReportStream();
2021

21-
bool isAddressValid({required String address});
22+
bool isAddressValid({required String address, required CryptoCurrencyNetwork network});
2223

2324
bool validateSeedWord(String word);
2425

@@ -296,7 +297,7 @@ final class NewAsset extends Event {
296297
// final xelis_sdk.AssetData asset;
297298
final String name;
298299
final int decimals;
299-
final int? maxSupply;
300+
final MaxSupplyMode? maxSupply;
300301

301302
NewAsset(this.name, this.decimals, this.maxSupply);
302303
}

pubspec.lock

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,14 +1163,22 @@ packages:
11631163
description: flutter
11641164
source: sdk
11651165
version: "0.0.0"
1166+
freezed:
1167+
dependency: "direct overridden"
1168+
description:
1169+
name: freezed
1170+
sha256: "03dd9b7423ff0e31b7e01b2204593e5e1ac5ee553b6ea9d8184dff4a26b9fb07"
1171+
url: "https://pub.dev"
1172+
source: hosted
1173+
version: "3.2.4"
11661174
freezed_annotation:
1167-
dependency: transitive
1175+
dependency: "direct overridden"
11681176
description:
11691177
name: freezed_annotation
1170-
sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
1178+
sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8"
11711179
url: "https://pub.dev"
11721180
source: hosted
1173-
version: "2.4.4"
1181+
version: "3.1.0"
11741182
frontend_server_client:
11751183
dependency: transitive
11761184
description:
@@ -2462,10 +2470,10 @@ packages:
24622470
dependency: transitive
24632471
description:
24642472
name: very_good_analysis
2465-
sha256: e479fbc0941009262343db308133e121bf8660c2c81d48dd8e952df7b7e1e382
2473+
sha256: "96245839dbcc45dfab1af5fa551603b5c7a282028a64746c19c547d21a7f1e3a"
24662474
url: "https://pub.dev"
24672475
source: hosted
2468-
version: "9.0.0"
2476+
version: "10.0.0"
24692477
vm_service:
24702478
dependency: transitive
24712479
description:
@@ -2613,23 +2621,22 @@ packages:
26132621
source: hosted
26142622
version: "1.1.0"
26152623
xelis_dart_sdk:
2616-
dependency: transitive
2624+
dependency: "direct main"
26172625
description:
2618-
path: "."
2619-
ref: HEAD
2620-
resolved-ref: "62f1c16a2762b9d4e9db24d101035b28a2dcc69e"
2621-
url: "https://github.com/Tritonn204/xelis-dart-sdk"
2622-
source: git
2623-
version: "0.29.0"
2626+
name: xelis_dart_sdk
2627+
sha256: "2393fcd3dfe9175e34ed60e1a1f8821fb63d6a99d66894b9a24cdfc8cb4a6a4b"
2628+
url: "https://pub.dev"
2629+
source: hosted
2630+
version: "0.30.9"
26242631
xelis_flutter:
26252632
dependency: "direct main"
26262633
description:
26272634
path: "."
2628-
ref: b09b3ffd89bc6390f6d565b967c2ae1052a4bdd2
2629-
resolved-ref: b09b3ffd89bc6390f6d565b967c2ae1052a4bdd2
2635+
ref: "v0.2.0"
2636+
resolved-ref: "4aeeebc80a1b364b2105799cd1b08d159725bfac"
26302637
url: "https://github.com/xelis-project/xelis-flutter-ffi.git"
26312638
source: git
2632-
version: "0.1.1"
2639+
version: "0.2.0"
26332640
xml:
26342641
dependency: transitive
26352642
description:

scripts/app_config/templates/pubspec.template.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ dependencies:
3030
# %%END_ENABLE_FROST%%
3131

3232
# %%ENABLE_XEL%%
33+
# xelis_dart_sdk: 0.30.9
34+
## git:
35+
## url: https://github.com/xelis-project/xelis-dart-sdk.git
36+
## ref: f1da98f8bad8b9ad3645661a23f9efb83e44b0c9
3337
# xelis_flutter:
3438
# git:
3539
# url: https://github.com/xelis-project/xelis-flutter-ffi.git
36-
# ref: b09b3ffd89bc6390f6d565b967c2ae1052a4bdd2
40+
# ref: v0.2.0
3741
# %%END_ENABLE_XEL%%
3842

3943
# %%ENABLE_FIRO%%
@@ -341,6 +345,8 @@ dependency_overrides:
341345

342346
# xelis override
343347
json_rpc_2: ^4.0.0
348+
freezed: ^3.1.0
349+
freezed_annotation: ^3.1.0
344350

345351
# %%ENABLE_ISAR%%
346352
# isar_community:

tool/wl_templates/XEL_lib_xelis_interface_impl.template.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ final class _LibXelisInterfaceImpl extends LibXelisInterface {
116116
}
117117

118118
@override
119-
bool isAddressValid({required String address}) =>
120-
x_utils.isAddressValid(strAddress: address);
119+
bool isAddressValid({required String address, required CryptoCurrencyNetwork network}) =>
120+
x_utils.isAddressValid(strAddress: address, network: network.xelisNetwork);
121121

122122
@override
123123
bool validateSeedWord(String word) {

0 commit comments

Comments
 (0)