diff --git a/android/.project b/android/.project index 4f11206e8..17c95d4b1 100644 --- a/android/.project +++ b/android/.project @@ -14,15 +14,4 @@ org.eclipse.buildship.core.gradleprojectnature - - - 1723563577231 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs index 590ce5e1d..9d2efc8e7 100644 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -1,13 +1,2 @@ -arguments=--init-script /var/folders/4v/g721xt952ys396fxzwv8s5_c0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/4v/g721xt952ys396fxzwv8s5_c0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-13.0.1.jdk/Contents/Home -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true +eclipse.preferences.version=1 \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 28edf4628..417c522a6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -464,7 +464,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = 562DC258Q6; + DEVELOPMENT_TEAM = 32J6BB6VUS; DISABLED_ARCHS = x86_64; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; @@ -483,7 +483,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet; + PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -610,7 +610,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = 562DC258Q6; + DEVELOPMENT_TEAM = 32J6BB6VUS; DISABLED_ARCHS = x86_64; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; @@ -629,7 +629,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet; + PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -648,7 +648,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = 562DC258Q6; + DEVELOPMENT_TEAM = 32J6BB6VUS; DISABLED_ARCHS = x86_64; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/Flutter", ); MARKETING_VERSION = 1.0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.fotolockr.cakewallet; + PRODUCT_BUNDLE_IDENTIFIER = "com.fotolockr.cakewallet"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/lib/zano/zano.dart b/lib/zano/zano.dart deleted file mode 100644 index 69999cb3c..000000000 --- a/lib/zano/zano.dart +++ /dev/null @@ -1,56 +0,0 @@ -import 'package:cake_wallet/utils/language_list.dart'; -import 'package:cake_wallet/view_model/send/output.dart'; -import 'package:collection/collection.dart'; -import 'package:cw_core/crypto_currency.dart'; -import 'package:cw_core/monero_transaction_priority.dart'; -import 'package:cw_core/output_info.dart'; -import 'package:cw_core/transaction_history.dart'; -import 'package:cw_core/transaction_info.dart'; -import 'package:cw_core/transaction_priority.dart'; -import 'package:cw_core/wallet_base.dart'; -import 'package:cw_core/wallet_credentials.dart'; -import 'package:cw_core/wallet_info.dart'; -import 'package:cw_core/wallet_service.dart'; -import 'package:hive/hive.dart'; - -import 'package:cw_zano/mnemonics/english.dart'; -import 'package:cw_zano/model/zano_asset.dart'; -import 'package:cw_zano/model/zano_transaction_credentials.dart'; -import 'package:cw_zano/model/zano_transaction_info.dart'; -import 'package:cw_zano/zano_formatter.dart'; -import 'package:cw_zano/zano_wallet.dart'; -import 'package:cw_zano/zano_wallet_service.dart'; - -part 'cw_zano.dart'; - -Zano? zano = CWZano(); - -abstract class Zano { - TransactionPriority getDefaultTransactionPriority(); - TransactionPriority deserializeMoneroTransactionPriority({required int raw}); - List getTransactionPriorities(); - List getWordList(String language); - - WalletCredentials createZanoRestoreWalletFromKeysCredentials({ - required String name, - required String spendKey, - required String viewKey, - required String address, - required String password, - required String language, - required int height}); - WalletCredentials createZanoRestoreWalletFromSeedCredentials({required String name, required String password, required int height, required String mnemonic}); - WalletCredentials createZanoNewWalletCredentials({required String name, String password}); - Object createZanoTransactionCredentials({required List outputs, required TransactionPriority priority, required CryptoCurrency currency}); - double formatterIntAmountToDouble({required int amount, required CryptoCurrency currency, required bool forFee}); - int formatterParseAmount({required String amount, required CryptoCurrency currency}); - WalletService createZanoWalletService(Box walletInfoSource); - CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo tx); - List getZanoAssets(WalletBase wallet); - String getZanoAssetAddress(CryptoCurrency asset); - Future changeZanoAssetAvailability(WalletBase wallet, CryptoCurrency token); - Future addZanoAssetById(WalletBase wallet, String assetId); - Future deleteZanoAsset(WalletBase wallet, CryptoCurrency token); - Future getZanoAsset(WalletBase wallet, String contractAddress); - String getAddress(WalletBase wallet); -} diff --git a/scripts/android/build_haven_all.sh b/scripts/android/build_haven_all.sh index bdda7f9b1..daadadc6b 100755 --- a/scripts/android/build_haven_all.sh +++ b/scripts/android/build_haven_all.sh @@ -6,5 +6,3 @@ ./build_sodium.sh ./build_zmq.sh ./build_haven.sh -./build_zano.sh -./copy_zano_libs.sh