diff --git a/lib/globals.dart b/lib/globals.dart
index df962821d3d4fb696c97d1a973e0a6b5af791de7..17458113dad1fbc56c6e772eca7113e1109dc35f 100644
--- a/lib/globals.dart
+++ b/lib/globals.dart
@@ -14,7 +14,7 @@ late String appVersion;
late SharedPreferences prefs;
late String endPointGVA;
const int pinLength = 5;
-const String appLang = 'french';
+const String appLang = 'english';
late Box<WalletData> walletBox;
late Box<ChestData> chestBox;
@@ -37,3 +37,6 @@ Color orangeC = const Color(0xffd07316);
Color yellowC = const Color(0xffFFD68E);
Color floattingYellow = const Color(0xffEFEFBF);
Color backgroundColor = const Color(0xFFF5F5F5);
+
+// Substrate settings
+const int ss58 = 42;
diff --git a/lib/providers/generate_wallets.dart b/lib/providers/generate_wallets.dart
index 43a389a599cc4d51d9112d0d2148d0ba0d553a2b..e56367d586b75ae000a80b37047d89b1deb976ff 100644
--- a/lib/providers/generate_wallets.dart
+++ b/lib/providers/generate_wallets.dart
@@ -1,21 +1,23 @@
import 'dart:math';
import 'dart:typed_data';
-import 'package:durt/durt.dart';
+import 'package:durt/durt.dart' as durt;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/models/bip39_words.dart';
import 'package:gecko/models/chest_data.dart';
import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
import 'package:pdf/pdf.dart';
import 'package:pdf/widgets.dart' as pw;
import 'package:printing/printing.dart';
+import 'package:provider/provider.dart';
import "package:unorm_dart/unorm_dart.dart" as unorm;
class GenerateWalletsProvider with ChangeNotifier {
GenerateWalletsProvider();
// NewWallet generatedWallet;
- NewWallet? actualWallet;
+ durt.NewWallet? actualWallet;
FocusNode walletNameFocus = FocusNode();
Color? askedWordColor = Colors.black;
@@ -37,7 +39,7 @@ class GenerateWalletsProvider with ChangeNotifier {
bool isCesiumIDVisible = false;
bool isCesiumPWDVisible = false;
bool canImport = false;
- late CesiumWallet cesiumWallet;
+ late durt.CesiumWallet cesiumWallet;
// Import Chest
TextEditingController cellController0 = TextEditingController();
@@ -55,7 +57,7 @@ class GenerateWalletsProvider with ChangeNotifier {
bool isFirstTimeSentenceComplete = true;
Future storeHDWChest(
- NewWallet _wallet, String _name, BuildContext context) async {
+ String address, String _name, BuildContext context) async {
int chestNumber = 0;
chestBox.toMap().forEach((key, value) {
if (!value.isCesium!) {
@@ -70,7 +72,7 @@ class GenerateWalletsProvider with ChangeNotifier {
chestName = 'Coffre à Ğecko ${chestNumber + 1}';
}
ChestData thisChest = ChestData(
- dewif: _wallet.dewif,
+ dewif: address,
name: chestName,
defaultWallet: 0,
imageName: '${chestNumber % 8}.png',
@@ -152,11 +154,11 @@ class GenerateWalletsProvider with ChangeNotifier {
notifyListeners();
}
- Future<NewWallet?> generateWallet(String generatedMnemonic,
+ Future<durt.NewWallet?> generateWallet(String generatedMnemonic,
{required bool isImport}) async {
try {
- actualWallet = await Dewif().generateDewif(
- generatedMnemonic, randomSecretCode(pinLength),
+ actualWallet = await durt.Dewif().generateDewif(
+ generatedMnemonic, durt.randomSecretCode(pinLength),
lang: appLang);
} catch (e) {
log.e(e);
@@ -172,7 +174,7 @@ class GenerateWalletsProvider with ChangeNotifier {
}
String changePinCode({required bool reload}) {
- pin.text = randomSecretCode(pinLength);
+ pin.text = durt.randomSecretCode(pinLength);
if (reload) {
notifyListeners();
}
@@ -219,7 +221,7 @@ class GenerateWalletsProvider with ChangeNotifier {
Future<void> generateCesiumWalletPubkey(
String _cesiumID, String _cesiumPWD) async {
- cesiumWallet = CesiumWallet(_cesiumID, _cesiumPWD);
+ cesiumWallet = durt.CesiumWallet(_cesiumID, _cesiumPWD);
String _walletPubkey = cesiumWallet.pubkey;
cesiumPubkey.text = _walletPubkey;
@@ -257,8 +259,8 @@ class GenerateWalletsProvider with ChangeNotifier {
}
log.d(pin.text);
- NewWallet cesiumDewif =
- await Dewif().generateCesiumDewif(cesiumWallet.seed, pin.text);
+ durt.NewWallet cesiumDewif =
+ await durt.Dewif().generateCesiumDewif(cesiumWallet.seed, pin.text);
ChestData cesiumChest = ChestData(
dewif: cesiumDewif.dewif,
@@ -293,8 +295,11 @@ class GenerateWalletsProvider with ChangeNotifier {
notifyListeners();
}
- List<String> generateWordList() {
- generatedMnemonic = generateMnemonic(lang: appLang);
+ Future<List<String>> generateWordList(BuildContext context) async {
+ SubstrateSdk _sdk =
+ Provider.of<SubstrateSdk>(context, listen: false);
+
+ generatedMnemonic = await _sdk.generateMnemonic(lang: appLang);
List<String> _wordsList = [];
String word;
int _nbr = 1;
@@ -333,8 +338,8 @@ class GenerateWalletsProvider with ChangeNotifier {
cellController0.text = cellController1.text = cellController2.text =
cellController3.text = cellController4.text = cellController5.text =
cellController6.text = cellController7.text = cellController8.text =
- cellController9.text = cellController10.text =
- cellController11.text = '';
+ cellController9.text =
+ cellController10.text = cellController11.text = '';
isFirstTimeSentenceComplete = true;
notifyListeners();
}
@@ -374,7 +379,7 @@ class GenerateWalletsProvider with ChangeNotifier {
inputMnemonic = inputMnemonic.replaceAll('é', 'eÌ');
inputMnemonic = inputMnemonic.replaceAll('è', 'è');
- NewWallet? generatedWallet =
+ durt.NewWallet? generatedWallet =
await generateWallet(inputMnemonic, isImport: true);
if (generatedWallet == null) {
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index a4739e1dce72a58d7d5b63360a358139f4c90b65..b8da790b56efbe55bc836d4e5b9364f6c6b270d7 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -9,10 +9,11 @@ import 'package:polkawallet_sdk/api/types/networkParams.dart';
import 'package:polkawallet_sdk/api/types/txInfoData.dart';
import 'package:polkawallet_sdk/polkawallet_sdk.dart';
import 'package:polkawallet_sdk/storage/keyring.dart';
+import 'package:polkawallet_sdk/storage/types/keyPairData.dart';
import 'package:truncate/truncate.dart';
class SubstrateSdk with ChangeNotifier {
- final List subNode = ['127.0.0.1:9944', '192.168.1.72:9944'];
+ final List subNode = ['192.168.1.72:9944'];
final bool isSsl = false;
final int ss58 = 42;
@@ -65,11 +66,16 @@ class SubstrateSdk with ChangeNotifier {
});
}
- Future<bool> importAccount(
- {bool fromMnemonic = false, String derivePath = ''}) async {
+ Future<String> importAccount(
+ {String mnemonic = '',
+ bool fromMnemonic = false,
+ String derivePath = ''}) async {
// toy exercise immense month enter answer table prefer speed cycle gold phone
final clipboardData = await Clipboard.getData(Clipboard.kTextPlain);
- if (clipboardData!.text!.split(' ').length == 12) {
+ if (mnemonic != '') {
+ fromMnemonic = true;
+ generatedMnemonic = mnemonic;
+ } else if (clipboardData!.text!.split(' ').length == 12) {
fromMnemonic = true;
generatedMnemonic = clipboardData.text!;
}
@@ -86,7 +92,7 @@ class SubstrateSdk with ChangeNotifier {
importIsLoading = true;
notifyListeners();
- if (clipboardData.text != null) jsonKeystore.text = clipboardData.text!;
+ if (clipboardData?.text != null) jsonKeystore.text = clipboardData!.text!;
var json = await sdk.api.keyring
.importAccount(keyring,
keyType: keytype,
@@ -99,10 +105,11 @@ class SubstrateSdk with ChangeNotifier {
importIsLoading = false;
notifyListeners();
});
- if (json == null) return false;
+ if (json == null) return '';
print(json);
+ late KeyPairData? keyPairData;
try {
- await sdk.api.keyring.addAccount(
+ keyPairData = await sdk.api.keyring.addAccount(
keyring,
keyType: keytype,
acc: json,
@@ -117,7 +124,7 @@ class SubstrateSdk with ChangeNotifier {
importIsLoading = false;
await Future.delayed(const Duration(milliseconds: 20));
notifyListeners();
- return true;
+ return keyPairData!.address!;
}
void reload() {
@@ -151,7 +158,7 @@ class SubstrateSdk with ChangeNotifier {
}
}
- Future<String> generateMnemonic() async {
+ Future<String> generateMnemonic({String lang = 'english'}) async {
final gen = await sdk.api.keyring.generateMnemonic(ss58);
generatedMnemonic = gen.mnemonic!;
diff --git a/lib/screens/myWallets/confirm_wallet_storage.dart b/lib/screens/myWallets/confirm_wallet_storage.dart
index 3dab6ad60440071ce9e4b17311dc5d6a775c367d..822f37f7fcecaf8ba2f6827539a1e7295d0d66e8 100644
--- a/lib/screens/myWallets/confirm_wallet_storage.dart
+++ b/lib/screens/myWallets/confirm_wallet_storage.dart
@@ -135,7 +135,7 @@ class ConfirmStoreWallet extends StatelessWidget with ChangeNotifier {
walletName.text != '')
? () async {
_generateWalletProvider.storeHDWChest(
- generatedWallet!,
+ generatedWallet!.dewif,
walletName.text,
context);
_generateWalletProvider.isAskedWordValid =
diff --git a/lib/screens/myWallets/generate_wallets.dart b/lib/screens/myWallets/generate_wallets.dart
index 8851268af0c0db4b18dd845fa28d8b5bdfe7f1e5..aab97e233d52ff3a03e84d5bec1df048ad6ccb42 100644
--- a/lib/screens/myWallets/generate_wallets.dart
+++ b/lib/screens/myWallets/generate_wallets.dart
@@ -28,7 +28,7 @@ class GenerateFastChestScreen extends StatelessWidget {
Provider.of<GenerateWalletsProvider>(context);
if (_generateWalletProvider.mnemonicController.text == '') {
- _generateWalletProvider.generateWordList();
+ _generateWalletProvider.generateWordList(context);
_generateWalletProvider.mnemonicController.text =
_generateWalletProvider.generatedMnemonic!;
_generateWalletProvider.pin.text = randomSecretCode(pinLength);
@@ -61,7 +61,7 @@ class GenerateFastChestScreen extends StatelessWidget {
child: FloatingActionButton(
heroTag: "buttonGenerateWallet",
onPressed: () {
- _generateWalletProvider.generateWordList();
+ _generateWalletProvider.generateWordList(context);
_generateWalletProvider.mnemonicController.text =
_generateWalletProvider.generatedMnemonic!;
},
diff --git a/lib/screens/onBoarding/12.dart b/lib/screens/onBoarding/12.dart
index 383270261f3eb7fa542308cb24886cfb94acb976..8dc0ab6b3d3735bcecd8377322dd10ff7530144c 100644
--- a/lib/screens/onBoarding/12.dart
+++ b/lib/screens/onBoarding/12.dart
@@ -1,12 +1,12 @@
// ignore_for_file: file_names
import 'dart:async';
-import 'package:durt/durt.dart';
import 'package:flutter/services.dart';
import 'package:flutter/material.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/providers/generate_wallets.dart';
import 'package:gecko/providers/my_wallets.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
import 'package:gecko/providers/wallet_options.dart';
import 'package:gecko/screens/common_elements.dart';
import 'package:gecko/screens/onBoarding/13_congratulations.dart';
@@ -61,6 +61,7 @@ class OnboardingStepFourteen extends StatelessWidget {
Provider.of<MyWalletsProvider>(context);
GenerateWalletsProvider _generateWalletProvider =
Provider.of<GenerateWalletsProvider>(context);
+ SubstrateSdk _sdk = Provider.of<SubstrateSdk>(context, listen: false);
final int? _currentChest = _myWalletProvider.getCurrentChest();
@@ -117,12 +118,11 @@ class OnboardingStepFourteen extends StatelessWidget {
log.d(_pin + ' || ' + _generateWalletProvider.pin.text);
if (_pin.toUpperCase() == _generateWalletProvider.pin.text) {
pinColor = Colors.green[500];
- NewWallet generatedWallet = await Dewif().generateDewif(
- _generateWalletProvider.generatedMnemonic!,
- _generateWalletProvider.pin.text,
- lang: appLang);
+ final address = await _sdk.importAccount(
+ fromMnemonic: true,
+ mnemonic: _generateWalletProvider.generatedMnemonic!);
await _generateWalletProvider.storeHDWChest(
- generatedWallet, 'Mon portefeuille courant', context);
+ address, 'Mon portefeuille courant', context);
_myWalletProvider.readAllWallets(_currentChest);
// scheduleMicrotask(() {
// _walletOptions.reloadBuild();
diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart
index 27cc83d63787d9d1a8abe9c204d5cc3423d1ab84..a64482a4bbe4381b811fc648d77dc7e54b43edf8 100644
--- a/lib/screens/onBoarding/7.dart
+++ b/lib/screens/onBoarding/7.dart
@@ -118,7 +118,21 @@ Widget sentanceArray(BuildContext context) {
GenerateWalletsProvider _generateWalletProvider =
Provider.of<GenerateWalletsProvider>(context);
- List formatedArray = _generateWalletProvider.generateWordList();
+ // List formatedArray = _generateWalletProvider.generateWordList();
+ // List formatedArray = [
+ // '0:',
+ // '1:',
+ // '2:',
+ // '3:',
+ // '4:',
+ // '5:',
+ // '6:',
+ // '7:',
+ // '8:',
+ // '9:',
+ // '10:',
+ // '11:',
+ // ];
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
@@ -132,32 +146,40 @@ Widget sentanceArray(BuildContext context) {
)),
// color: Colors.grey[300],
padding: const EdgeInsets.all(20),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- mainAxisSize: MainAxisSize.max,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: <Widget>[
- Row(children: <Widget>[
- arrayCell(formatedArray[0]),
- arrayCell(formatedArray[1]),
- arrayCell(formatedArray[2]),
- arrayCell(formatedArray[3]),
- ]),
- const SizedBox(height: 15),
- Row(children: <Widget>[
- arrayCell(formatedArray[4]),
- arrayCell(formatedArray[5]),
- arrayCell(formatedArray[6]),
- arrayCell(formatedArray[7]),
- ]),
- const SizedBox(height: 15),
- Row(children: <Widget>[
- arrayCell(formatedArray[8]),
- arrayCell(formatedArray[9]),
- arrayCell(formatedArray[10]),
- arrayCell(formatedArray[11]),
- ]),
- ]),
+ child: FutureBuilder(
+ future: _generateWalletProvider.generateWordList(context),
+ builder: (BuildContext context, AsyncSnapshot<List> _data) {
+ if (!_data.hasData) {
+ return const Text('');
+ } else {
+ return Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ mainAxisSize: MainAxisSize.max,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: <Widget>[
+ Row(children: <Widget>[
+ arrayCell(_data.data![0]),
+ arrayCell(_data.data![1]),
+ arrayCell(_data.data![2]),
+ arrayCell(_data.data![3]),
+ ]),
+ const SizedBox(height: 15),
+ Row(children: <Widget>[
+ arrayCell(_data.data![4]),
+ arrayCell(_data.data![5]),
+ arrayCell(_data.data![6]),
+ arrayCell(_data.data![7]),
+ ]),
+ const SizedBox(height: 15),
+ Row(children: <Widget>[
+ arrayCell(_data.data![8]),
+ arrayCell(_data.data![9]),
+ arrayCell(_data.data![10]),
+ arrayCell(_data.data![11]),
+ ]),
+ ]);
+ }
+ }),
),
);
}
diff --git a/lib/screens/substrate_sandbox.dart b/lib/screens/substrate_sandbox.dart
index 04036ca45ca713ea640981ab528f24a1a0d10d1b..44346e0f7789b4fa485d4c9f32d92a660c98fe94 100644
--- a/lib/screens/substrate_sandbox.dart
+++ b/lib/screens/substrate_sandbox.dart
@@ -122,7 +122,7 @@ class SubstrateSandBox extends StatelessWidget {
_sub.reload();
snack(
context,
- res
+ res != ''
? 'Portefeuille importé'
: 'Le format de trousseau est invalide');
}
diff --git a/pubspec.lock b/pubspec.lock
index 296b2dd0bfc4418c2592359cc009c0c7ba9e0b2c..ebbad4562c8d622f7c5fc494a33f7bf9a1909352 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -42,7 +42,7 @@ packages:
name: assorted_layout_widgets
url: "https://pub.dartlang.org"
source: hosted
- version: "5.5.0"
+ version: "5.7.1"
async:
dependency: transitive
description:
@@ -98,7 +98,7 @@ packages:
name: build
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.1"
+ version: "2.3.0"
build_config:
dependency: transitive
description:
@@ -112,7 +112,7 @@ packages:
name: build_daemon
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.1"
+ version: "3.1.0"
build_resolvers:
dependency: transitive
description:
@@ -126,7 +126,7 @@ packages:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.7"
+ version: "2.1.10"
build_runner_core:
dependency: transitive
description:
@@ -147,14 +147,14 @@ packages:
name: built_value
url: "https://pub.dartlang.org"
source: hosted
- version: "8.1.4"
+ version: "8.2.3"
carousel_slider:
dependency: "direct main"
description:
name: carousel_slider
url: "https://pub.dartlang.org"
source: hosted
- version: "4.0.0"
+ version: "4.1.1"
characters:
dependency: transitive
description:
@@ -217,7 +217,7 @@ packages:
name: connectivity_plus
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.1"
+ version: "2.3.0"
connectivity_plus_linux:
dependency: transitive
description:
@@ -231,7 +231,7 @@ packages:
name: connectivity_plus_macos
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.1"
+ version: "1.2.2"
connectivity_plus_platform_interface:
dependency: transitive
description:
@@ -294,7 +294,7 @@ packages:
name: dbus
url: "https://pub.dartlang.org"
source: hosted
- version: "0.7.1"
+ version: "0.7.3"
desktop_window:
dependency: "direct main"
description:
@@ -308,7 +308,7 @@ packages:
name: dio
url: "https://pub.dartlang.org"
source: hosted
- version: "4.0.4"
+ version: "4.0.6"
durt:
dependency: "direct main"
description:
@@ -361,13 +361,20 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
+ flutter_hooks:
+ dependency: transitive
+ description:
+ name: flutter_hooks
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.18.3"
flutter_inappwebview:
dependency: transitive
description:
name: flutter_inappwebview
url: "https://pub.dartlang.org"
source: hosted
- version: "5.3.2"
+ version: "5.4.3+4"
flutter_lints:
dependency: "direct main"
description:
@@ -445,63 +452,63 @@ packages:
name: gql
url: "https://pub.dartlang.org"
source: hosted
- version: "0.13.0"
+ version: "0.13.1"
gql_dedupe_link:
dependency: transitive
description:
name: gql_dedupe_link
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.0"
+ version: "2.0.2"
gql_error_link:
dependency: transitive
description:
name: gql_error_link
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.0"
+ version: "0.2.2"
gql_exec:
dependency: transitive
description:
name: gql_exec
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.0"
+ version: "0.4.0"
gql_http_link:
dependency: transitive
description:
name: gql_http_link
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.0"
+ version: "0.4.2"
gql_link:
dependency: transitive
description:
name: gql_link
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.0"
+ version: "0.4.2"
gql_transform_link:
dependency: transitive
description:
name: gql_transform_link
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.0"
+ version: "0.2.2"
graphql:
dependency: transitive
description:
name: graphql
url: "https://pub.dartlang.org"
source: hosted
- version: "5.0.1"
+ version: "5.1.1"
graphql_flutter:
dependency: "direct main"
description:
name: graphql_flutter
url: "https://pub.dartlang.org"
source: hosted
- version: "5.0.1"
+ version: "5.1.0"
graphs:
dependency: transitive
description:
@@ -522,7 +529,7 @@ packages:
name: hive
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.6"
+ version: "2.1.0"
hive_flutter:
dependency: "direct main"
description:
@@ -592,7 +599,14 @@ packages:
name: image_picker
url: "https://pub.dartlang.org"
source: hosted
- version: "0.8.4+10"
+ version: "0.8.5"
+ image_picker_android:
+ dependency: transitive
+ description:
+ name: image_picker_android
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.8.4+11"
image_picker_for_web:
dependency: transitive
description:
@@ -600,6 +614,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.6"
+ image_picker_ios:
+ dependency: transitive
+ description:
+ name: image_picker_ios
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.8.5"
image_picker_platform_interface:
dependency: transitive
description:
@@ -674,7 +695,7 @@ packages:
name: json_annotation
url: "https://pub.dartlang.org"
source: hosted
- version: "4.4.0"
+ version: "4.5.0"
lints:
dependency: transitive
description:
@@ -730,14 +751,14 @@ packages:
name: mime
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.1"
+ version: "1.0.2"
mobx:
dependency: transitive
description:
name: mobx
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.6+1"
+ version: "2.0.7"
nested:
dependency: transitive
description:
@@ -765,7 +786,7 @@ packages:
name: normalize
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.0"
+ version: "0.6.0+1"
package_config:
dependency: transitive
description:
@@ -849,7 +870,7 @@ packages:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.12"
+ version: "2.0.13"
path_provider_ios:
dependency: transitive
description:
@@ -898,7 +919,7 @@ packages:
name: pdf
url: "https://pub.dartlang.org"
source: hosted
- version: "3.7.1"
+ version: "3.7.4"
permission_handler:
dependency: "direct main"
description:
@@ -926,14 +947,14 @@ packages:
name: pin_code_fields
url: "https://pub.dartlang.org"
source: hosted
- version: "7.3.0"
+ version: "7.4.0"
pinenacl:
dependency: transitive
description:
name: pinenacl
url: "https://pub.dartlang.org"
source: hosted
- version: "0.3.3"
+ version: "0.3.4"
platform:
dependency: transitive
description:
@@ -954,16 +975,14 @@ packages:
name: pointycastle
url: "https://pub.dartlang.org"
source: hosted
- version: "3.5.1"
+ version: "3.6.0"
polkawallet_sdk:
dependency: "direct main"
description:
- path: "."
- ref: fixAndroidActivityVersion
- resolved-ref: "05d80150def4d5b3cac02ba4db96a39550719c9b"
- url: "git://github.com/poka-IT/sdk.git"
- source: git
- version: "0.4.2"
+ name: polkawallet_sdk
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.4.5"
pool:
dependency: transitive
description:
@@ -977,7 +996,7 @@ packages:
name: printing
url: "https://pub.dartlang.org"
source: hosted
- version: "5.7.2"
+ version: "5.8.0"
process:
dependency: transitive
description:
@@ -998,7 +1017,7 @@ packages:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
pubspec_parse:
dependency: transitive
description:
@@ -1019,7 +1038,7 @@ packages:
name: qr
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.0"
+ version: "3.0.1"
qr_flutter:
dependency: "direct main"
description:
@@ -1135,7 +1154,7 @@ packages:
name: shelf
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.0"
shelf_packages_handler:
dependency: transitive
description:
@@ -1168,21 +1187,21 @@ packages:
name: sliver_tools
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.5"
+ version: "0.2.6"
source_gen:
dependency: transitive
description:
name: source_gen
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.1"
+ version: "1.2.2"
source_helper:
dependency: transitive
description:
name: source_helper
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.1"
+ version: "1.3.2"
source_map_stack_trace:
dependency: transitive
description:
@@ -1343,7 +1362,7 @@ packages:
name: web_socket_channel
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.2.0"
webdriver:
dependency: transitive
description:
@@ -1364,14 +1383,14 @@ packages:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
- version: "3.0.1"
+ version: "3.0.2"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.3"
+ version: "2.8.6"
webview_flutter_platform_interface:
dependency: transitive
description:
@@ -1385,20 +1404,20 @@ packages:
name: webview_flutter_wkwebview
url: "https://pub.dartlang.org"
source: hosted
- version: "2.7.1"
+ version: "2.7.3"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
- version: "2.4.1"
+ version: "2.5.2"
window_size:
dependency: "direct main"
description:
path: "plugins/window_size"
ref: HEAD
- resolved-ref: a738913c8ce2c9f47515382d40827e794a334274
+ resolved-ref: "5c51870ced62a00e809ba4b81a846a052d241c9f"
url: "git://github.com/google/flutter-desktop-embedding.git"
source: git
version: "0.1.0"
@@ -1424,5 +1443,5 @@ packages:
source: hosted
version: "3.1.0"
sdks:
- dart: ">=2.15.0 <3.0.0"
- flutter: ">=2.8.0"
+ dart: ">=2.16.0 <3.0.0"
+ flutter: ">=2.8.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 07bfa99885688e2960953bc688e22bda3bca2f8b..bb3e3e52ece7de34e1f82f96251e359cd77d0991 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -42,7 +42,7 @@ dependencies:
pdf: ^3.7.1
permission_handler: ^8.3.0
pin_code_fields: ^7.3.0
- printing: ^5.7.2
+ printing: ^5.8.0
provider: ^6.0.1
# qrscan: ^0.3.2
qrscan:
@@ -57,8 +57,8 @@ dependencies:
ref: master # branch name
responsive_builder: ^0.4.1
responsive_framework: ^0.1.4
- sentry: ^6.0.0
- sentry_flutter: ^6.0.0
+ sentry: 6.3.0
+ sentry_flutter: 6.3.0
shared_preferences: ^2.0.7
super_tooltip: ^1.0.1
sync_http: ^0.3.0
@@ -71,11 +71,10 @@ dependencies:
desktop_window: ^0.4.0
durt: ^0.1.6
package_info_plus: ^1.4.2
- polkawallet_sdk: #^0.4.1 ## Wait for merging PR: https://github.com/polkawallet-io/sdk/pull/19
- # path: ../substrate-sdk
- git:
- url: git://github.com/poka-IT/sdk.git
- ref: fixAndroidActivityVersion
+ polkawallet_sdk: ^0.4.5 ## Wait for merging PR: https://github.com/polkawallet-io/sdk/pull/19
+ # git:
+ # url: git://github.com/poka-IT/sdk.git
+ # ref: fixAndroidActivityVersion
flutter_icons:
android: true