mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-03 09:19:22 +00:00
monero.dart clean
This commit is contained in:
parent
368c4055ee
commit
b6a9ce58db
18 changed files with 44 additions and 29 deletions
3
.fvmrc
Normal file
3
.fvmrc
Normal file
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"flutter": "3.16.0"
|
||||
}
|
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -59,3 +59,6 @@ libtor_ffi.dll
|
|||
flutter_libsparkmobile.dll
|
||||
secp256k1.dll
|
||||
/libisar.so
|
||||
|
||||
# FVM Version Cache
|
||||
.fvm/
|
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
|
@ -1,3 +1,4 @@
|
|||
{
|
||||
"dart.lineLength": 80,
|
||||
"dart.flutterSdkPath": ".fvm/versions/3.16.0"
|
||||
}
|
|
@ -45,7 +45,12 @@ android {
|
|||
lintOptions {
|
||||
disable 'InvalidPackage'
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
pickFirst 'lib/x86/libc++_shared.so'
|
||||
pickFirst 'lib/x86_64/libc++_shared.so'
|
||||
pickFirst 'lib/armeabi-v7a/libc++_shared.so'
|
||||
pickFirst 'lib/arm64-v8a/libc++_shared.so'
|
||||
}
|
||||
defaultConfig {
|
||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||
applicationId "com.cypherstack.stackwallet"
|
||||
|
|
|
@ -23,7 +23,8 @@
|
|||
android:requestLegacyExternalStorage="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:allowBackup="false"
|
||||
android:fullBackupContent="false">
|
||||
android:fullBackupContent="false"
|
||||
android:extractNativeLibs="true">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:screenOrientation="portrait"
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/aarch64-linux-android_libwallet2_api_c.so
|
|
@ -0,0 +1 @@
|
|||
../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/arm-linux-androideabi_libwallet2_api_c.so
|
|
@ -0,0 +1 @@
|
|||
../../../../../../crypto_plugins/flutter_libmonero/scripts/monero_c/release/monero/x86_64-linux-android_libwallet2_api_c.so
|
|
@ -4,6 +4,7 @@ import 'package:stackwallet/utilities/default_nodes.dart';
|
|||
import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
||||
import 'package:stackwallet/wallets/crypto_currency/crypto_currency.dart';
|
||||
import 'package:stackwallet/wallets/crypto_currency/intermediate/cryptonote_currency.dart';
|
||||
import 'package:monero/monero.dart' as monero;
|
||||
|
||||
class Monero extends CryptonoteCurrency {
|
||||
Monero(super.network) {
|
||||
|
@ -20,7 +21,7 @@ class Monero extends CryptonoteCurrency {
|
|||
|
||||
@override
|
||||
bool validateAddress(String address) {
|
||||
return monero_wallet.validateAddress(address);
|
||||
return monero.Wallet_addressValid(address, 0);
|
||||
}
|
||||
|
||||
@override
|
||||
|
|
|
@ -20,7 +20,7 @@ class Wownero extends CryptonoteCurrency {
|
|||
|
||||
@override
|
||||
bool validateAddress(String address) {
|
||||
return wownero_wallet.validateAddress(address);
|
||||
return wownero_wallet.addressValid(address);
|
||||
}
|
||||
|
||||
@override
|
||||
|
|
|
@ -330,7 +330,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
|
|||
// date: DateTime.now().subtract(const Duration(
|
||||
// days:
|
||||
// 2))); // subtract a couple days to ensure we have a buffer for SWB
|
||||
final bufferedCreateHeight = getSeedHeightSync(wallet!.seed.trim());
|
||||
// TODO(mrcyjanek): implement
|
||||
final bufferedCreateHeight = 1; //getSeedHeightSync(wallet!.seed.trim());
|
||||
|
||||
await info.updateRestoreHeight(
|
||||
newRestoreHeight: bufferedCreateHeight,
|
||||
|
@ -441,7 +442,8 @@ class WowneroWallet extends CryptonoteWallet with CwBasedInterface {
|
|||
|
||||
// extract seed height from 14 word seed
|
||||
if (seedLength == 14) {
|
||||
height = getSeedHeightSync(mnemonic.trim());
|
||||
// TODO(mrcyjanek): implement
|
||||
height = 1; // getSeedHeightSync(mnemonic.trim());
|
||||
} else {
|
||||
height = max(height, 0);
|
||||
}
|
||||
|
|
|
@ -6,9 +6,6 @@ import FlutterMacOS
|
|||
import Foundation
|
||||
|
||||
import connectivity_plus
|
||||
import cw_monero
|
||||
import cw_shared_external
|
||||
import cw_wownero
|
||||
import desktop_drop
|
||||
import device_info_plus
|
||||
import devicelocale
|
||||
|
@ -27,9 +24,6 @@ import window_size
|
|||
|
||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||
ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
|
||||
CwMoneroPlugin.register(with: registry.registrar(forPlugin: "CwMoneroPlugin"))
|
||||
CwSharedExternalPlugin.register(with: registry.registrar(forPlugin: "CwSharedExternalPlugin"))
|
||||
CwWowneroPlugin.register(with: registry.registrar(forPlugin: "CwWowneroPlugin"))
|
||||
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
|
||||
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
|
||||
DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
|
||||
|
|
|
@ -171,7 +171,7 @@ SPEC CHECKSUMS:
|
|||
device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
|
||||
devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
|
||||
flutter_libepiccash: be1560a04150c5cc85bcf08d236ec2b3d1f5d8da
|
||||
flutter_libsparkmobile: 8ae86b0ccc7e52c9db6b53e258ee2977deb184ab
|
||||
flutter_libsparkmobile: df2d36af1691379c81249e7be7b68be3c81d388b
|
||||
flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
|
||||
flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
|
||||
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
|
||||
|
@ -189,4 +189,4 @@ SPEC CHECKSUMS:
|
|||
|
||||
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
|
||||
|
||||
COCOAPODS: 1.11.3
|
||||
COCOAPODS: 1.15.2
|
||||
|
|
|
@ -268,7 +268,7 @@
|
|||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastSwiftUpdateCheck = 0920;
|
||||
LastUpgradeCheck = 1300;
|
||||
LastUpgradeCheck = 1430;
|
||||
ORGANIZATIONNAME = "";
|
||||
TargetAttributes = {
|
||||
331C80D4294CF70F00263BE5 = {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1300"
|
||||
LastUpgradeVersion = "1430"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
20
pubspec.lock
20
pubspec.lock
|
@ -374,13 +374,6 @@ packages:
|
|||
relative: true
|
||||
source: path
|
||||
version: "0.0.1"
|
||||
cw_shared_external:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: "crypto_plugins/flutter_libmonero/cw_shared_external"
|
||||
relative: true
|
||||
source: path
|
||||
version: "0.0.1"
|
||||
cw_wownero:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
@ -674,8 +667,8 @@ packages:
|
|||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: "3f986ca1a94bdac5d31373454c989cc2f5842de8"
|
||||
resolved-ref: "3f986ca1a94bdac5d31373454c989cc2f5842de8"
|
||||
ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c"
|
||||
resolved-ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c"
|
||||
url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
|
||||
source: git
|
||||
version: "0.0.1"
|
||||
|
@ -1147,6 +1140,15 @@ packages:
|
|||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
monero:
|
||||
dependency: transitive
|
||||
description:
|
||||
path: "."
|
||||
ref: "342bad5d91d8476f0e32a57ae944f2cfe34d4241"
|
||||
resolved-ref: "342bad5d91d8476f0e32a57ae944f2cfe34d4241"
|
||||
url: "https://git.mrcyjanek.net/mrcyjanek/monero.dart"
|
||||
source: git
|
||||
version: "0.0.0"
|
||||
mutex:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
|
|
@ -30,7 +30,7 @@ dependencies:
|
|||
flutter_libsparkmobile:
|
||||
git:
|
||||
url: https://github.com/cypherstack/flutter_libsparkmobile.git
|
||||
ref: 3f986ca1a94bdac5d31373454c989cc2f5842de8
|
||||
ref: 65a6676e37f1bcaf2e293afbd50e50c81394276c
|
||||
|
||||
flutter_libmonero:
|
||||
path: ./crypto_plugins/flutter_libmonero
|
||||
|
|
|
@ -6,9 +6,9 @@ set -e
|
|||
source ../rust_version.sh
|
||||
set_rust_to_1671
|
||||
|
||||
(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh ) &
|
||||
(cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh ) &
|
||||
(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh ) &
|
||||
(cd ../../crypto_plugins/flutter_liblelantus/scripts/macos && ./build_all.sh )
|
||||
(cd ../../crypto_plugins/flutter_libepiccash/scripts/macos && ./build_all.sh )
|
||||
(cd ../../crypto_plugins/flutter_libmonero/scripts/macos/ && ./build_all.sh )
|
||||
|
||||
wait
|
||||
echo "Done building"
|
||||
|
|
Loading…
Reference in a new issue