Merge pull request #29 from allanclempe/release/2.4.0

Release/2.4.0

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

ios/Runner.xcodeproj/project.pbxproj

@@ -158,7 +158,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

lib/components/form/paper_radio.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 typedef OnRadioChanged = void Function(
   dynamic value,

lib/components/wallet/balance.dart

@@ -1,8 +1,8 @@
 import 'package:etherwallet/components/copyButton/copy_button.dart';
 import 'package:etherwallet/utils/eth_amount_formatter.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
 
 class Balance extends StatelessWidget {
   const Balance({

lib/components/wallet/change_network.dart

@@ -1,6 +1,5 @@
 import 'package:etherwallet/model/network_type.dart';
 import 'package:etherwallet/utils/wallet_icons.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class ChangeNetwork extends StatelessWidget {

lib/components/wallet/confirm_mnemonic.dart

@@ -1,7 +1,6 @@
 import 'package:etherwallet/components/form/paper_form.dart';
 import 'package:etherwallet/components/form/paper_input.dart';
 import 'package:etherwallet/components/form/paper_validation_summary.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 

lib/components/wallet/display_mnemonic.dart

@@ -1,5 +1,4 @@
 import 'package:etherwallet/components/copyButton/copy_button.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 

lib/main.dart

@@ -17,7 +17,7 @@ Future<void> main() async {
 }
 
 class MainApp extends StatelessWidget {
-  MainApp(this.stores, {Key? key}) : super(key: key);
+  const MainApp(this.stores, {Key? key}) : super(key: key);
 
   final List<SingleChildWidget> stores;
 

lib/service/address_service.dart

@@ -1,8 +1,8 @@
-import 'package:etherwallet/service/configuration_service.dart';
 import 'package:bip39/bip39.dart' as bip39;
+import 'package:convert/convert.dart';
 import 'package:ed25519_hd_key/ed25519_hd_key.dart';
+import 'package:etherwallet/service/configuration_service.dart';
 import 'package:hex/hex.dart';
-import 'package:convert/convert.dart';
 import 'package:web3dart/credentials.dart';
 
 abstract class IAddressService {

lib/service/contract_locator.dart

@@ -2,11 +2,11 @@ import 'package:etherwallet/app_config.dart';
 import 'package:etherwallet/model/network_type.dart';
 import 'package:etherwallet/service/contract_service.dart';
 import 'package:etherwallet/utils/contract_parser.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:http/http.dart';
 import 'package:web3dart/web3dart.dart';
 import 'package:web_socket_channel/io.dart';
-import 'package:http/http.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
 
 class ContractLocator {
   ContractLocator._();

lib/service/contract_service.dart

@@ -8,7 +8,7 @@ typedef TransferEvent = void Function(
 );
 
 abstract class IContractService {
-  Future<Credentials> getCredentials(String privateKey);
+  EthPrivateKey getCredentials(String privateKey);
   Future<String?> send(
       String privateKey, EthereumAddress receiver, BigInt amount,
       {TransferEvent? onTransfer, Function(Object exeception)? onError});
@@ -29,14 +29,14 @@ class ContractService implements IContractService {
   ContractFunction _sendFunction() => contract.function('transfer');
 
   @override
-  Future<Credentials> getCredentials(String privateKey) =>
-      client.credentialsFromPrivateKey(privateKey);
+  EthPrivateKey getCredentials(String privateKey) =>
+      EthPrivateKey.fromHex(privateKey);
 
   @override
   Future<String?> send(
       String privateKey, EthereumAddress receiver, BigInt amount,
       {TransferEvent? onTransfer, Function(Object exeception)? onError}) async {
-    final credentials = await getCredentials(privateKey);
+    final credentials = getCredentials(privateKey);
     final from = await credentials.extractAddress();
     final networkId = await client.getNetworkId();
 

lib/utils/contract_parser.dart

@@ -3,6 +3,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:web3dart/contracts.dart';
 import 'package:web3dart/credentials.dart';
 
+// ignore: avoid_classes_with_only_static_members
 class ContractParser {
   static Future<DeployedContract> fromAssets(
       String path, String contractAddress) async {

lib/wallet_transfer_page.dart

@@ -1,9 +1,9 @@
 import 'package:etherwallet/components/wallet/transfer_form.dart';
 import 'package:etherwallet/context/transfer/wallet_transfer_provider.dart';
 import 'package:etherwallet/model/network_type.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
 
 import 'components/wallet/loading.dart';
 

pubspec.lock

@@ -401,6 +401,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -692,7 +699,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   timing:
     dependency: transitive
     description:
@@ -790,7 +797,7 @@ packages:
       name: web3dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.5"
   web_socket_channel:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.3.0+10
+version: 2.4.0+11
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
@@ -28,9 +28,10 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.4
-  web3dart: ^2.3.3
+  web3dart: ^2.3.5
   provider: ^6.0.2
   qr_flutter: ^4.0.0
+  # used to generate pneumonic phrase
   bip39: ^1.0.6
   hex: ^0.2.0
   shared_preferences: ^2.0.12
@@ -46,6 +47,7 @@ dependencies:
   built_collection: ^5.1.1
   ed25519_hd_key: ^2.2.0
 
+
 dev_dependencies:
   flutter_test:
     sdk: flutter