From 01afd46076bc5fdd9bb4dda82c81e096d312624f Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 14:31:19 +0100 Subject: [PATCH 1/7] fix!: rename ark_project into arkproject and wallet_kit into walletkit --- examples/nft_marketplace/lib/main.dart | 4 ++-- examples/nft_marketplace/lib/screens/home_screen.dart | 4 ++-- examples/nft_marketplace/pubspec.yaml | 4 ++-- examples/wallet_app/lib/main.dart | 2 +- examples/wallet_app/lib/screens/home_screen.dart | 2 +- examples/wallet_app/pubspec.yaml | 2 +- packages/ark_project/example/ark_example.dart | 2 +- packages/ark_project/pubspec.yaml | 2 +- packages/wallet_kit/lib/services/wallet_service.dart | 3 ++- packages/wallet_kit/lib/ui/button.dart | 4 +++- packages/wallet_kit/lib/ui/input.dart | 3 ++- packages/wallet_kit/lib/ui/modal.dart | 3 ++- packages/wallet_kit/lib/wallet_kit.dart | 3 ++- .../wallet_kit/lib/wallet_screens/add_wallet_screen.dart | 6 +++++- .../lib/wallet_screens/create_wallet_screen.dart | 4 +++- .../wallet_kit/lib/wallet_screens/password_screen.dart | 4 +++- .../lib/wallet_screens/protect_wallet_screen.dart | 5 ++++- .../lib/wallet_screens/recover_wallet_screen.dart | 6 +++++- .../wallet_kit/lib/wallet_screens/settings_screen.dart | 4 +++- .../wallet_kit/lib/wallet_state/wallet_provider.dart | 5 +++-- packages/wallet_kit/lib/wallet_state/wallet_state.dart | 3 ++- packages/wallet_kit/lib/widgets/account_address.dart | 5 ++++- packages/wallet_kit/lib/widgets/icon.dart | 3 ++- packages/wallet_kit/lib/widgets/nft_details.dart | 5 +++-- packages/wallet_kit/lib/widgets/nft_list.dart | 5 +++-- packages/wallet_kit/lib/widgets/send_eth_button.dart | 6 +++++- packages/wallet_kit/lib/widgets/token_icon.dart | 3 ++- packages/wallet_kit/lib/widgets/token_list.dart | 5 ++++- packages/wallet_kit/lib/widgets/wallet_body.dart | 6 +++++- packages/wallet_kit/lib/widgets/wallet_list.dart | 9 +++++++-- packages/wallet_kit/lib/widgets/wallet_selector.dart | 4 +++- packages/wallet_kit/pubspec.yaml | 4 ++-- packages/wallet_kit/test/utils/format_address_test.dart | 2 +- packages/wallet_kit/test/utils/group_by_test.dart | 2 +- 34 files changed, 92 insertions(+), 42 deletions(-) diff --git a/examples/nft_marketplace/lib/main.dart b/examples/nft_marketplace/lib/main.dart index 152d23ea..d1923637 100644 --- a/examples/nft_marketplace/lib/main.dart +++ b/examples/nft_marketplace/lib/main.dart @@ -4,8 +4,8 @@ import 'package:go_router/go_router.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:nft_marketplace/config.dart'; import 'package:nft_marketplace/screens/home_screen.dart'; -import 'package:wallet_kit/wallet_kit.dart'; -import 'package:ark_project/ark_project.dart'; +import 'package:walletkit/wallet_kit.dart'; +import 'package:arkproject/ark_project.dart'; void main() async { await init(); diff --git a/examples/nft_marketplace/lib/screens/home_screen.dart b/examples/nft_marketplace/lib/screens/home_screen.dart index 053fd0ca..52118fd7 100644 --- a/examples/nft_marketplace/lib/screens/home_screen.dart +++ b/examples/nft_marketplace/lib/screens/home_screen.dart @@ -1,10 +1,10 @@ -import 'package:ark_project/ark_project.dart'; +import 'package:arkproject/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:nft_marketplace/config.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; part 'home_screen.g.dart'; diff --git a/examples/nft_marketplace/pubspec.yaml b/examples/nft_marketplace/pubspec.yaml index 1defb773..f9e074a2 100644 --- a/examples/nft_marketplace/pubspec.yaml +++ b/examples/nft_marketplace/pubspec.yaml @@ -28,11 +28,11 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - ark_project: ^0.1.0+2 + arkproject: ^0.1.0+2 starknet: ^0.1.1 starknet_provider: ^0.1.1 secure_store: ^0.1.2+1 - wallet_kit: ^0.0.3 + walletkit: ^0.0.3 flutter: sdk: flutter diff --git a/examples/wallet_app/lib/main.dart b/examples/wallet_app/lib/main.dart index 1576e43f..adaa6b08 100644 --- a/examples/wallet_app/lib/main.dart +++ b/examples/wallet_app/lib/main.dart @@ -3,7 +3,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; import './screens/home_screen.dart'; diff --git a/examples/wallet_app/lib/screens/home_screen.dart b/examples/wallet_app/lib/screens/home_screen.dart index b79c9884..8c105fa1 100644 --- a/examples/wallet_app/lib/screens/home_screen.dart +++ b/examples/wallet_app/lib/screens/home_screen.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; class HomeScreen extends HookConsumerWidget { const HomeScreen({super.key}); diff --git a/examples/wallet_app/pubspec.yaml b/examples/wallet_app/pubspec.yaml index 5e69bf1c..bb9ac284 100644 --- a/examples/wallet_app/pubspec.yaml +++ b/examples/wallet_app/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - wallet_kit: ^0.0.3 + walletkit: ^0.0.3 cupertino_icons: ^1.0.2 hive_flutter: ^1.1.0 hooks_riverpod: ^2.6.1 diff --git a/packages/ark_project/example/ark_example.dart b/packages/ark_project/example/ark_example.dart index cc919db1..56c191ac 100644 --- a/packages/ark_project/example/ark_example.dart +++ b/packages/ark_project/example/ark_example.dart @@ -1,4 +1,4 @@ -import 'package:ark_project/ark_project.dart'; +import 'package:arkproject/ark_project.dart'; import 'package:dotenv/dotenv.dart'; final env = DotEnv(includePlatformEnvironment: true)..load(); diff --git a/packages/ark_project/pubspec.yaml b/packages/ark_project/pubspec.yaml index 7c81633c..dbbb584e 100644 --- a/packages/ark_project/pubspec.yaml +++ b/packages/ark_project/pubspec.yaml @@ -1,4 +1,4 @@ -name: ark_project +name: arkproject description: Ark SDK for Dart and Flutter apps. version: 0.1.0+2 repository: https://github.com/focustree/starknet.dart diff --git a/packages/wallet_kit/lib/services/wallet_service.dart b/packages/wallet_kit/lib/services/wallet_service.dart index c4784576..db4fafdc 100644 --- a/packages/wallet_kit/lib/services/wallet_service.dart +++ b/packages/wallet_kit/lib/services/wallet_service.dart @@ -4,7 +4,8 @@ import 'package:starknet/starknet.dart' as s; import 'package:starknet_provider/starknet_provider.dart'; import 'package:uuid/uuid.dart'; import 'package:bip39/bip39.dart' as bip39; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_kit.dart'; class WalletService { static Future addWallet({ diff --git a/packages/wallet_kit/lib/ui/button.dart b/packages/wallet_kit/lib/ui/button.dart index 8d826229..63bf206e 100644 --- a/packages/wallet_kit/lib/ui/button.dart +++ b/packages/wallet_kit/lib/ui/button.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:wallet_kit/ui/index.dart'; + +import 'icon.dart'; +import 'theme.dart'; class PrimaryButton extends CustomButton { const PrimaryButton({ diff --git a/packages/wallet_kit/lib/ui/input.dart b/packages/wallet_kit/lib/ui/input.dart index 80316c95..22aba686 100644 --- a/packages/wallet_kit/lib/ui/input.dart +++ b/packages/wallet_kit/lib/ui/input.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import 'theme.dart'; class TextInput extends StatelessWidget { final TextEditingController? controller; diff --git a/packages/wallet_kit/lib/ui/modal.dart b/packages/wallet_kit/lib/ui/modal.dart index 696c8478..26ad87dc 100644 --- a/packages/wallet_kit/lib/ui/modal.dart +++ b/packages/wallet_kit/lib/ui/modal.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import 'button.dart'; Future showBottomModal({ required BuildContext context, diff --git a/packages/wallet_kit/lib/wallet_kit.dart b/packages/wallet_kit/lib/wallet_kit.dart index b2489c03..263012cf 100644 --- a/packages/wallet_kit/lib/wallet_kit.dart +++ b/packages/wallet_kit/lib/wallet_kit.dart @@ -3,7 +3,8 @@ library wallet_kit; import 'package:flutter/material.dart'; import 'package:starknet/starknet.dart'; import 'package:starknet_provider/starknet_provider.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import 'wallet_screens/password_screen.dart'; export 'wallet_state/index.dart'; export 'wallet_screens/index.dart'; diff --git a/packages/wallet_kit/lib/wallet_screens/add_wallet_screen.dart b/packages/wallet_kit/lib/wallet_screens/add_wallet_screen.dart index 193245b8..56975965 100644 --- a/packages/wallet_kit/lib/wallet_screens/add_wallet_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/add_wallet_screen.dart @@ -1,6 +1,10 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../services/wallet_service.dart'; +import '../ui/index.dart'; +import 'create_wallet_screen.dart'; +import 'recover_wallet_screen.dart'; class AddWalletScreen extends StatelessWidget { const AddWalletScreen({Key? key}) : super(key: key); diff --git a/packages/wallet_kit/lib/wallet_screens/create_wallet_screen.dart b/packages/wallet_kit/lib/wallet_screens/create_wallet_screen.dart index e2aedb50..2234b205 100644 --- a/packages/wallet_kit/lib/wallet_screens/create_wallet_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/create_wallet_screen.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import 'protect_wallet_screen.dart'; const space = SizedBox(height: 16); diff --git a/packages/wallet_kit/lib/wallet_screens/password_screen.dart b/packages/wallet_kit/lib/wallet_screens/password_screen.dart index e0a1f0c4..0ef85b94 100644 --- a/packages/wallet_kit/lib/wallet_screens/password_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/password_screen.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:secure_store/secure_store.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import '../wallet_state/wallet_provider.dart'; Future showPasswordModal(BuildContext context) async { return showBottomModal( diff --git a/packages/wallet_kit/lib/wallet_screens/protect_wallet_screen.dart b/packages/wallet_kit/lib/wallet_screens/protect_wallet_screen.dart index 04b252f1..b4473639 100644 --- a/packages/wallet_kit/lib/wallet_screens/protect_wallet_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/protect_wallet_screen.dart @@ -2,7 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:secure_store/secure_store.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import '../wallet_state/index.dart'; +import 'password_screen.dart'; class ProtectWalletScreen extends HookConsumerWidget { final String seedPhrase; diff --git a/packages/wallet_kit/lib/wallet_screens/recover_wallet_screen.dart b/packages/wallet_kit/lib/wallet_screens/recover_wallet_screen.dart index 294de45c..4ce07595 100644 --- a/packages/wallet_kit/lib/wallet_screens/recover_wallet_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/recover_wallet_screen.dart @@ -1,7 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import '../wallet_state/index.dart'; +import '../widgets/icon.dart'; +import 'protect_wallet_screen.dart'; class RecoverWalletScreen extends HookConsumerWidget { const RecoverWalletScreen({super.key}); diff --git a/packages/wallet_kit/lib/wallet_screens/settings_screen.dart b/packages/wallet_kit/lib/wallet_screens/settings_screen.dart index 97fff4f8..73c38a86 100644 --- a/packages/wallet_kit/lib/wallet_screens/settings_screen.dart +++ b/packages/wallet_kit/lib/wallet_screens/settings_screen.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import '../wallet_state/index.dart'; class SettingsScreen extends HookConsumerWidget { const SettingsScreen({super.key}); diff --git a/packages/wallet_kit/lib/wallet_state/wallet_provider.dart b/packages/wallet_kit/lib/wallet_state/wallet_provider.dart index f5736868..b30b4a77 100644 --- a/packages/wallet_kit/lib/wallet_state/wallet_provider.dart +++ b/packages/wallet_kit/lib/wallet_state/wallet_provider.dart @@ -3,8 +3,9 @@ import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:secure_store/secure_store.dart'; import 'package:starknet/starknet.dart' as s; import 'package:starknet_provider/starknet_provider.dart' as sp; -import 'package:wallet_kit/utils/persisted_notifier_state.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../utils/persisted_notifier_state.dart'; +import '../wallet_kit.dart'; part 'wallet_provider.g.dart'; diff --git a/packages/wallet_kit/lib/wallet_state/wallet_state.dart b/packages/wallet_kit/lib/wallet_state/wallet_state.dart index 3bd51c8b..010c23a0 100644 --- a/packages/wallet_kit/lib/wallet_state/wallet_state.dart +++ b/packages/wallet_kit/lib/wallet_state/wallet_state.dart @@ -1,7 +1,8 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:secure_store/secure_store.dart'; import 'package:starknet/starknet.dart'; -import 'package:wallet_kit/utils/persisted_notifier_state.dart'; + +import '../utils/persisted_notifier_state.dart'; part 'wallet_state.freezed.dart'; part 'wallet_state.g.dart'; diff --git a/packages/wallet_kit/lib/widgets/account_address.dart b/packages/wallet_kit/lib/widgets/account_address.dart index 61e6a5b3..eac8ec76 100644 --- a/packages/wallet_kit/lib/widgets/account_address.dart +++ b/packages/wallet_kit/lib/widgets/account_address.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../ui/index.dart'; +import '../utils/index.dart'; +import '../wallet_state/index.dart'; class AccountAddress extends HookConsumerWidget { const AccountAddress({super.key}); diff --git a/packages/wallet_kit/lib/widgets/icon.dart b/packages/wallet_kit/lib/widgets/icon.dart index fa3a86ea..e176e90c 100644 --- a/packages/wallet_kit/lib/widgets/icon.dart +++ b/packages/wallet_kit/lib/widgets/icon.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_state/wallet_state.dart'; class WalletTypeIcon extends StatelessWidget { final WalletType type; diff --git a/packages/wallet_kit/lib/widgets/nft_details.dart b/packages/wallet_kit/lib/widgets/nft_details.dart index 76614d22..f8d1e9c1 100644 --- a/packages/wallet_kit/lib/widgets/nft_details.dart +++ b/packages/wallet_kit/lib/widgets/nft_details.dart @@ -1,9 +1,10 @@ -import 'package:ark_project/ark_project.dart'; +import 'package:arkproject/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:starknet/starknet.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_kit.dart'; part 'nft_details.g.dart'; diff --git a/packages/wallet_kit/lib/widgets/nft_list.dart b/packages/wallet_kit/lib/widgets/nft_list.dart index 9dce5d2a..29410dfe 100644 --- a/packages/wallet_kit/lib/widgets/nft_list.dart +++ b/packages/wallet_kit/lib/widgets/nft_list.dart @@ -1,8 +1,9 @@ -import 'package:ark_project/ark_project.dart'; +import 'package:arkproject/ark_project.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_state/index.dart'; part 'nft_list.g.dart'; diff --git a/packages/wallet_kit/lib/widgets/send_eth_button.dart b/packages/wallet_kit/lib/widgets/send_eth_button.dart index 2380b395..4ba7cf0f 100644 --- a/packages/wallet_kit/lib/widgets/send_eth_button.dart +++ b/packages/wallet_kit/lib/widgets/send_eth_button.dart @@ -1,8 +1,12 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; import 'package:starknet/starknet.dart' as s; +import '../services/index.dart'; +import '../ui/index.dart'; +import '../wallet_screens/index.dart'; +import '../wallet_state/index.dart'; + final recipientAddress = s.Felt.fromHexString( '0x0367c0c4603A29Bc5aCa8E07C6a2776d7c0D325945aBB4F772F448b345Ca4cF7'); diff --git a/packages/wallet_kit/lib/widgets/token_icon.dart b/packages/wallet_kit/lib/widgets/token_icon.dart index 2635dc27..eb7b6f96 100644 --- a/packages/wallet_kit/lib/widgets/token_icon.dart +++ b/packages/wallet_kit/lib/widgets/token_icon.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../services/index.dart'; class TokenIcon extends StatelessWidget { final TokenSymbol symbol; diff --git a/packages/wallet_kit/lib/widgets/token_list.dart b/packages/wallet_kit/lib/widgets/token_list.dart index 77b543f9..12b36d16 100644 --- a/packages/wallet_kit/lib/widgets/token_list.dart +++ b/packages/wallet_kit/lib/widgets/token_list.dart @@ -1,7 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../services/index.dart'; +import '../wallet_state/index.dart'; +import 'token_icon.dart'; class TokenList extends HookConsumerWidget { const TokenList({super.key}); diff --git a/packages/wallet_kit/lib/widgets/wallet_body.dart b/packages/wallet_kit/lib/widgets/wallet_body.dart index 795fd6ac..6f6fc4f6 100644 --- a/packages/wallet_kit/lib/widgets/wallet_body.dart +++ b/packages/wallet_kit/lib/widgets/wallet_body.dart @@ -1,7 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_state/index.dart'; +import 'nft_details.dart'; +import 'nft_list.dart'; +import 'token_list.dart'; class WalletBody extends HookConsumerWidget { const WalletBody({super.key}); diff --git a/packages/wallet_kit/lib/widgets/wallet_list.dart b/packages/wallet_kit/lib/widgets/wallet_list.dart index 2e748c2c..c8f1a017 100644 --- a/packages/wallet_kit/lib/widgets/wallet_list.dart +++ b/packages/wallet_kit/lib/widgets/wallet_list.dart @@ -5,8 +5,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; -import 'package:wallet_kit/wallet_screens/settings_screen.dart'; +import '../services/index.dart'; +import '../ui/index.dart'; +import '../utils/index.dart'; +import '../wallet_screens/index.dart'; +import '../wallet_screens/settings_screen.dart'; +import '../wallet_state/index.dart'; +import 'icon.dart'; enum WalletListRoute { walletList, diff --git a/packages/wallet_kit/lib/widgets/wallet_selector.dart b/packages/wallet_kit/lib/widgets/wallet_selector.dart index 301069ea..851f461d 100644 --- a/packages/wallet_kit/lib/widgets/wallet_selector.dart +++ b/packages/wallet_kit/lib/widgets/wallet_selector.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; + +import '../wallet_state/index.dart'; +import 'wallet_list.dart'; class WalletSelector extends HookConsumerWidget { const WalletSelector({ diff --git a/packages/wallet_kit/pubspec.yaml b/packages/wallet_kit/pubspec.yaml index 7f648642..0a2a6ce6 100644 --- a/packages/wallet_kit/pubspec.yaml +++ b/packages/wallet_kit/pubspec.yaml @@ -1,4 +1,4 @@ -name: wallet_kit +name: walletkit description: A new Flutter package project. version: 0.0.3 homepage: "https://starknetdart.dev" @@ -8,7 +8,7 @@ environment: flutter: ">=1.17.0" dependencies: - ark_project: ^0.1.0+2 + arkproject: ^0.1.0+2 starknet: ^0.1.1 starknet_provider: ^0.1.1 secure_store: ^0.1.2+1 diff --git a/packages/wallet_kit/test/utils/format_address_test.dart b/packages/wallet_kit/test/utils/format_address_test.dart index fef8d3be..3923c2fd 100644 --- a/packages/wallet_kit/test/utils/format_address_test.dart +++ b/packages/wallet_kit/test/utils/format_address_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:wallet_kit/utils/format_address.dart'; +import 'package:walletkit/utils/index.dart'; void main() { test('formatAddress should format long addresses starting with "0x"', () { diff --git a/packages/wallet_kit/test/utils/group_by_test.dart b/packages/wallet_kit/test/utils/group_by_test.dart index f80e40d5..8315c11a 100644 --- a/packages/wallet_kit/test/utils/group_by_test.dart +++ b/packages/wallet_kit/test/utils/group_by_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:wallet_kit/utils/group_by.dart'; +import 'package:walletkit/utils/group_by.dart'; void main() { test('groupBy should group values by the given key', () { From feddbe5f4a579ae77021dc99a575e4d6fa71ff9d Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 14:58:36 +0100 Subject: [PATCH 2/7] fix(walletkit): asset path --- packages/wallet_kit/lib/widgets/icon.dart | 2 +- packages/wallet_kit/lib/widgets/token_icon.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wallet_kit/lib/widgets/icon.dart b/packages/wallet_kit/lib/widgets/icon.dart index e176e90c..d49f27fc 100644 --- a/packages/wallet_kit/lib/widgets/icon.dart +++ b/packages/wallet_kit/lib/widgets/icon.dart @@ -24,7 +24,7 @@ class WalletTypeIcon extends StatelessWidget { @override Widget build(BuildContext context) { return SvgPicture.asset( - "packages/wallet_kit/assets/images/wallets/${type.name}.svg", + "packages/walletkit/assets/images/wallets/${type.name}.svg", width: width, fit: fit, // ignore: deprecated_member_use diff --git a/packages/wallet_kit/lib/widgets/token_icon.dart b/packages/wallet_kit/lib/widgets/token_icon.dart index eb7b6f96..fc27363e 100644 --- a/packages/wallet_kit/lib/widgets/token_icon.dart +++ b/packages/wallet_kit/lib/widgets/token_icon.dart @@ -13,7 +13,7 @@ class TokenIcon extends StatelessWidget { @override Widget build(BuildContext context) { return SvgPicture.asset( - "packages/wallet_kit/assets/images/crypto/${symbol.name}.svg", + "packages/walletkit/assets/images/crypto/${symbol.name}.svg", width: size, height: size, ); From fb13d8b865181e4a1238a8fd3d08d65d9c3c3706 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 14:59:35 +0100 Subject: [PATCH 3/7] fix(docs): update mobile wallet example with new package name --- docs/examples/mobile-wallet.mdx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/examples/mobile-wallet.mdx b/docs/examples/mobile-wallet.mdx index bfae0279..a190574f 100644 --- a/docs/examples/mobile-wallet.mdx +++ b/docs/examples/mobile-wallet.mdx @@ -17,7 +17,7 @@ Run it locally with `flutter run` to make sure it is properly configured. 3. Add necessary dependencies ```bash -flutter pub add wallet_kit hive_flutter hooks_riverpod flutter_dotenv +flutter pub add walletkit hive_flutter hooks_riverpod flutter_dotenv ``` 4. Create a `.env` file in the root of your wallet_app project @@ -44,7 +44,7 @@ Here is the value for `starknet-devnet 0.2.0` 6. Update Android minimun SDK version -`secure_store` package used by `wallet_kit` require Android minimum SDK version set to at least 23, you need to modify `android/app/build.gradle`: +`secure_store` package used by `walletkit` require Android minimum SDK version set to at least 23, you need to modify `android/app/build.gradle`: ``` defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). @@ -93,13 +93,13 @@ Future main() async { } ``` -Now let's intialize `wallet_kit` and `hive` in our `main` function +Now let's intialize `walletkit` and `hive` in our `main` function ```dart import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -144,7 +144,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; import './screens/home_screen.dart'; @@ -195,12 +195,12 @@ class WalletApp extends HookConsumerWidget { } ``` -Create a `screens/` folder and add `home_screen.dart` file with a pre-built layout from `wallet_kit`, as well as `WalletSelector`, `AccountAddress`, `WalletBody` and `SendEthButton`: +Create a `screens/` folder and add `home_screen.dart` file with a pre-built layout from `walletkit`, as well as `WalletSelector`, `AccountAddress`, `WalletBody` and `SendEthButton`: ```dart import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:wallet_kit/wallet_kit.dart'; +import 'package:walletkit/wallet_kit.dart'; class HomeScreen extends HookConsumerWidget { const HomeScreen({super.key}); From 4c9a2ae2247a88eaf10326508b0c5d948033b4f7 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 16:29:34 +0100 Subject: [PATCH 4/7] wallet_kit: update generated files --- packages/wallet_kit/ios/Runner/GeneratedPluginRegistrant.m | 6 +++--- .../macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/wallet_kit/ios/Runner/GeneratedPluginRegistrant.m b/packages/wallet_kit/ios/Runner/GeneratedPluginRegistrant.m index 3b68906d..fb5ab529 100644 --- a/packages/wallet_kit/ios/Runner/GeneratedPluginRegistrant.m +++ b/packages/wallet_kit/ios/Runner/GeneratedPluginRegistrant.m @@ -24,8 +24,8 @@ @import secure_store; #endif -#if __has_include() -#import +#if __has_include() +#import #else @import webview_flutter_wkwebview; #endif @@ -36,7 +36,7 @@ + (void)registerWithRegistry:(NSObject*)registry { [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]]; [PointerInterceptorIosPlugin registerWithRegistrar:[registry registrarForPlugin:@"PointerInterceptorIosPlugin"]]; [SecureStorePlugin registerWithRegistrar:[registry registrarForPlugin:@"SecureStorePlugin"]]; - [FLTWebViewFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTWebViewFlutterPlugin"]]; + [WebViewFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"WebViewFlutterPlugin"]]; } @end diff --git a/packages/wallet_kit/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/wallet_kit/macos/Flutter/GeneratedPluginRegistrant.swift index c9ab4607..5ac8085d 100644 --- a/packages/wallet_kit/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/wallet_kit/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,5 +12,5 @@ import webview_flutter_wkwebview func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SecureStorePlugin.register(with: registry.registrar(forPlugin: "SecureStorePlugin")) - FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) } From e9fe8e0baa13b556accf7da7435196291231eba4 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 16:36:02 +0100 Subject: [PATCH 5/7] fix(CI): rename ark_project into ark_project --- examples/nft_marketplace/lib/main.dart | 2 +- examples/nft_marketplace/lib/screens/home_screen.dart | 2 +- packages/ark_project/example/ark_example.dart | 2 +- packages/ark_project/lib/{ark_project.dart => arkproject.dart} | 0 packages/wallet_kit/lib/widgets/nft_details.dart | 2 +- packages/wallet_kit/lib/widgets/nft_list.dart | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename packages/ark_project/lib/{ark_project.dart => arkproject.dart} (100%) diff --git a/examples/nft_marketplace/lib/main.dart b/examples/nft_marketplace/lib/main.dart index d1923637..e799b259 100644 --- a/examples/nft_marketplace/lib/main.dart +++ b/examples/nft_marketplace/lib/main.dart @@ -5,7 +5,7 @@ import 'package:hive_flutter/hive_flutter.dart'; import 'package:nft_marketplace/config.dart'; import 'package:nft_marketplace/screens/home_screen.dart'; import 'package:walletkit/wallet_kit.dart'; -import 'package:arkproject/ark_project.dart'; +import 'package:arkproject/arkproject.dart'; void main() async { await init(); diff --git a/examples/nft_marketplace/lib/screens/home_screen.dart b/examples/nft_marketplace/lib/screens/home_screen.dart index 52118fd7..df6d2658 100644 --- a/examples/nft_marketplace/lib/screens/home_screen.dart +++ b/examples/nft_marketplace/lib/screens/home_screen.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/ark_project.dart'; +import 'package:arkproject/arkproject.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; diff --git a/packages/ark_project/example/ark_example.dart b/packages/ark_project/example/ark_example.dart index 56c191ac..62638ee7 100644 --- a/packages/ark_project/example/ark_example.dart +++ b/packages/ark_project/example/ark_example.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/ark_project.dart'; +import 'package:arkproject/arkproject.dart'; import 'package:dotenv/dotenv.dart'; final env = DotEnv(includePlatformEnvironment: true)..load(); diff --git a/packages/ark_project/lib/ark_project.dart b/packages/ark_project/lib/arkproject.dart similarity index 100% rename from packages/ark_project/lib/ark_project.dart rename to packages/ark_project/lib/arkproject.dart diff --git a/packages/wallet_kit/lib/widgets/nft_details.dart b/packages/wallet_kit/lib/widgets/nft_details.dart index f8d1e9c1..fe7b6793 100644 --- a/packages/wallet_kit/lib/widgets/nft_details.dart +++ b/packages/wallet_kit/lib/widgets/nft_details.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/ark_project.dart'; +import 'package:arkproject/arkproject.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/packages/wallet_kit/lib/widgets/nft_list.dart b/packages/wallet_kit/lib/widgets/nft_list.dart index 29410dfe..0d791573 100644 --- a/packages/wallet_kit/lib/widgets/nft_list.dart +++ b/packages/wallet_kit/lib/widgets/nft_list.dart @@ -1,4 +1,4 @@ -import 'package:arkproject/ark_project.dart'; +import 'package:arkproject/arkproject.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; From f8e920419ac5427046f16bad4f00073aef1280f1 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 16:43:39 +0100 Subject: [PATCH 6/7] doc: fixup --- docs/how-to-contribute.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/how-to-contribute.mdx b/docs/how-to-contribute.mdx index cb85c618..20c2ea50 100644 --- a/docs/how-to-contribute.mdx +++ b/docs/how-to-contribute.mdx @@ -97,7 +97,7 @@ Then kill the devnet, that's it the `assets/devnet-dump.json` has been updated! - `starknet` contains the core logic with crypto hash functions and the main utility classes. - `starknet_provider` contains the main package that we use to interact with the Starknet rpc nodes. - `secure_store` manages the secure storage of the private key using different methods depending on the platform. - - `wallet_kit` is a higher level ui kit to manage wallets and transactions in a flutter app. + - `walletkit` is a higher level ui kit to manage wallets and transactions in a flutter app. - `/examples` contains examples of apps using the packages. They should be accompanied by a tutorial in the docs to reproduce the app from scratch. - `/docs` contains the documentation of the project. Docs are automatically deployed when we merge to main. @@ -119,7 +119,7 @@ Tools need to be at the right version to avoid any incompability: - [Cairo Compiler Version](https://github.com/starkware-libs/cairo/releases): `2.6.2` - [Scarb](https://github.com/software-mansion/scarb/releases): `2.6.2` -- [Starknet Devnet](https://github.com/0xSpaceShard/starknet-devnet-rs/releases): `0.5.0` +- [Starknet Devnet](https://github.com/0xSpaceShard/starknet-devnet-rs/releases): `0.1.2` - [Starkli](https://github.com/xJonathanLEI/starkli/releases): `0.2.9` - [Sierra](https://docs.starknet.io/documentation/starknet_versions/version_notes/): `1.5.0` - [Starknet](https://docs.starknet.io/documentation/starknet_versions/version_notes/): `0.13.1.1` From 7f1b32beab82929de6a7ea1d88ee662940aef939 Mon Sep 17 00:00:00 2001 From: Patrice Tisserand Date: Mon, 3 Feb 2025 16:56:49 +0100 Subject: [PATCH 7/7] examples: update generated files --- .../macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../wallet_app/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/nft_marketplace/macos/Flutter/GeneratedPluginRegistrant.swift b/examples/nft_marketplace/macos/Flutter/GeneratedPluginRegistrant.swift index c9ab4607..5ac8085d 100644 --- a/examples/nft_marketplace/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/examples/nft_marketplace/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,5 +12,5 @@ import webview_flutter_wkwebview func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SecureStorePlugin.register(with: registry.registrar(forPlugin: "SecureStorePlugin")) - FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) } diff --git a/examples/wallet_app/macos/Flutter/GeneratedPluginRegistrant.swift b/examples/wallet_app/macos/Flutter/GeneratedPluginRegistrant.swift index c9ab4607..5ac8085d 100644 --- a/examples/wallet_app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/examples/wallet_app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -12,5 +12,5 @@ import webview_flutter_wkwebview func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SecureStorePlugin.register(with: registry.registrar(forPlugin: "SecureStorePlugin")) - FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin")) + WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) }