diff --git a/analysis_options.yaml b/analysis_options.yaml index be68a4f26..bc8a41cf8 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -22,6 +22,7 @@ analyzer: lib/solana/cw_solana.dart, lib/tron/cw_tron.dart, lib/wownero/cw_wownero.dart, + lib/zano/cw_wownero.dart, ] language: strict-casts: true diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock index 4836556d3..6a8e7d5c4 100644 --- a/cw_bitcoin/pubspec.lock +++ b/cw_bitcoin/pubspec.lock @@ -1047,10 +1047,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock index f5a57e1c9..f023dc153 100644 --- a/cw_core/pubspec.lock +++ b/cw_core/pubspec.lock @@ -738,10 +738,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock index 9907c0dba..ee52d1821 100644 --- a/cw_monero/pubspec.lock +++ b/cw_monero/pubspec.lock @@ -511,8 +511,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" - resolved-ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" + ref: "8d3a64e05d60924272275d5674db5345f701ba2d" + resolved-ref: "8d3a64e05d60924272275d5674db5345f701ba2d" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" @@ -845,10 +845,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml index 565879926..bd453f029 100644 --- a/cw_monero/pubspec.yaml +++ b/cw_monero/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7 + ref: 8d3a64e05d60924272275d5674db5345f701ba2d path: impls/monero.dart mutex: ^3.1.0 ledger_flutter_plus: ^1.4.1 diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock index 65ff3baa6..17a0bd0e2 100644 --- a/cw_wownero/pubspec.lock +++ b/cw_wownero/pubspec.lock @@ -471,8 +471,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" - resolved-ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" + ref: "8d3a64e05d60924272275d5674db5345f701ba2d" + resolved-ref: "8d3a64e05d60924272275d5674db5345f701ba2d" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml index 02669d78b..821b31d24 100644 --- a/cw_wownero/pubspec.yaml +++ b/cw_wownero/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7 # monero_c hash + ref: 8d3a64e05d60924272275d5674db5345f701ba2d # monero_c hash path: impls/monero.dart mutex: ^3.1.0 diff --git a/cw_zano/pubspec.lock b/cw_zano/pubspec.lock index f5453f4db..941ae549c 100644 --- a/cw_zano/pubspec.lock +++ b/cw_zano/pubspec.lock @@ -476,8 +476,8 @@ packages: dependency: "direct main" description: path: "impls/monero.dart" - ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" - resolved-ref: "35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7" + ref: "8d3a64e05d60924272275d5674db5345f701ba2d" + resolved-ref: "8d3a64e05d60924272275d5674db5345f701ba2d" url: "https://github.com/mrcyjanek/monero_c" source: git version: "0.0.0" @@ -770,10 +770,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.2.4" watcher: dependency: "direct overridden" description: diff --git a/cw_zano/pubspec.yaml b/cw_zano/pubspec.yaml index 6e469e554..102140ae3 100644 --- a/cw_zano/pubspec.yaml +++ b/cw_zano/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: monero: git: url: https://github.com/mrcyjanek/monero_c - ref: 35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7 # monero_c hash + ref: 8d3a64e05d60924272275d5674db5345f701ba2d # monero_c hash path: impls/monero.dart dev_dependencies: flutter_test: diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 52b44e53e..42b9fa84c 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,6 +6,7 @@ import FlutterMacOS import Foundation import connectivity_plus +import cw_mweb import device_info_plus import devicelocale import fast_scanner @@ -23,6 +24,7 @@ import wakelock_plus func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + CwMwebPlugin.register(with: registry.registrar(forPlugin: "CwMwebPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin")) MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh index eda7230c3..1ec86897a 100755 --- a/scripts/prepare_moneroc.sh +++ b/scripts/prepare_moneroc.sh @@ -8,7 +8,7 @@ if [[ ! -d "monero_c" ]]; then git clone https://github.com/mrcyjanek/monero_c --branch master cd monero_c - git checkout 35ded9142e3915c7cdf6d64c7a0f0d797fcac8c7 + git checkout 8d3a64e05d60924272275d5674db5345f701ba2d git reset --hard git submodule update --init --force --recursive ./apply_patches.sh monero