diff --git a/miner-app/pubspec.lock b/miner-app/pubspec.lock index c624f81f3..42242a968 100644 --- a/miner-app/pubspec.lock +++ b/miner-app/pubspec.lock @@ -295,10 +295,10 @@ packages: dependency: transitive description: name: flutter_rust_bridge - sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e" + sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a url: "https://pub.dev" source: hosted - version: "2.11.1" + version: "2.12.0" flutter_secure_storage: dependency: transitive description: @@ -564,10 +564,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" native_toolchain_c: dependency: transitive description: @@ -791,7 +791,7 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" - rust_lib_resonance_network_wallet: + rust_lib_quantus_wallet: dependency: transitive description: path: "../quantus_sdk/rust_builder" @@ -967,10 +967,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" typed_data: dependency: transitive description: diff --git a/mobile-app/android/app/build.gradle b/mobile-app/android/app/build.gradle index ee20ad8d6..8ff9b5450 100644 --- a/mobile-app/android/app/build.gradle +++ b/mobile-app/android/app/build.gradle @@ -90,5 +90,5 @@ dependencies { apply from: "../../../quantus_sdk/rust_builder/cargokit/gradle/plugin.gradle" cargokit { manifestDir = "../../../quantus_sdk/rust" - libname = "rust_lib_resonance_network_wallet" + libname = "rust_lib_quantus_wallet" } diff --git a/mobile-app/fix_ios_build.sh b/mobile-app/fix_ios_build.sh new file mode 100644 index 000000000..e69a4f23e --- /dev/null +++ b/mobile-app/fix_ios_build.sh @@ -0,0 +1,5 @@ +# Due to a bug in Flutter, it can't migrate to SPM sometimes +# if this happens, do this.. +# See also https://github.com/flutter/flutter/issues/162196 + +flutter build ios --config-only \ No newline at end of file diff --git a/mobile-app/ios/Runner.xcodeproj/project.pbxproj b/mobile-app/ios/Runner.xcodeproj/project.pbxproj index c7658d5c0..2ef555971 100644 --- a/mobile-app/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile-app/ios/Runner.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3EB5255C5F1F1513728E6747 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9580F7AEEA7699162A02D8FF /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -56,6 +57,7 @@ 68138D4BA211BBE4928DCB99 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7B158D4527F6BD4C2533FF77 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 9580F7AEEA7699162A02D8FF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -83,6 +85,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 3EB5255C5F1F1513728E6747 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -114,6 +117,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( + 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, @@ -203,13 +207,15 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 52CEAAE956158F7EC6981CFF /* [CP] Embed Pods Frameworks */, - D8ADC208C23E118C9A22C81C /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -243,6 +249,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -346,23 +355,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$PROJECT_DIR/../tool/generate_version.sh\"\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - D8ADC208C23E118C9A22C81C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; E20B4FB1A7C79433CBBF421D /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -782,6 +774,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/mobile-app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile-app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..d46b0f766 --- /dev/null +++ b/mobile-app/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,122 @@ +{ + "pins" : [ + { + "identity" : "abseil-cpp-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/abseil-cpp-binary.git", + "state" : { + "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5", + "version" : "1.2024072200.0" + } + }, + { + "identity" : "app-check", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/app-check.git", + "state" : { + "revision" : "61b85103a1aeed8218f17c794687781505fbbef5", + "version" : "11.2.0" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk", + "state" : { + "revision" : "d10045cace0b4c335c4efa8f7df7e9a9fc5a7c60", + "version" : "12.13.0" + } + }, + { + "identity" : "google-ads-on-device-conversion-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk", + "state" : { + "revision" : "19dffda9a9caf8d86570ff846535902d8509d7bf", + "version" : "3.5.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "c2c76bebcfbb90d90ea10599f934f9af160e1604", + "version" : "12.13.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "617af071af9aa1d6a091d59a202910ac482128f9", + "version" : "10.1.0" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "60da361632d0de02786f709bdc0c4df340f7613e", + "version" : "8.1.0" + } + }, + { + "identity" : "grpc-binary", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/grpc-binary.git", + "state" : { + "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6", + "version" : "1.69.1" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a", + "version" : "5.3.0" + } + }, + { + "identity" : "interop-ios-for-google-sdks", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/interop-ios-for-google-sdks.git", + "state" : { + "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe", + "version" : "101.0.0" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", + "version" : "1.22.5" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", + "version" : "2.30910.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", + "version" : "2.4.0" + } + } + ], + "version" : 2 +} diff --git a/mobile-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/mobile-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index e3773d42e..c3fedb29c 100644 --- a/mobile-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/mobile-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + { ExternalLibraryLoaderConfig get defaultExternalLibraryLoaderConfig => kDefaultExternalLibraryLoaderConfig; @override - String get codegenVersion => '2.11.1'; + String get codegenVersion => '2.12.0'; @override int get rustContentHash => 623793143; static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig( - stem: 'rust_lib_resonance_network_wallet', + stem: 'rust_lib_quantus_wallet', ioDirectory: 'rust/target/release/', webPrefix: 'pkg/', + wasmBindgenName: 'wasm_bindgen', ); } diff --git a/quantus_sdk/lib/src/rust/frb_generated.io.dart b/quantus_sdk/lib/src/rust/frb_generated.io.dart index 558fef7ce..3ec4249a9 100644 --- a/quantus_sdk/lib/src/rust/frb_generated.io.dart +++ b/quantus_sdk/lib/src/rust/frb_generated.io.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.11.1. +// @generated by `flutter_rust_bridge`@ 2.12.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/quantus_sdk/lib/src/rust/frb_generated.web.dart b/quantus_sdk/lib/src/rust/frb_generated.web.dart index 079fccbca..0da556119 100644 --- a/quantus_sdk/lib/src/rust/frb_generated.web.dart +++ b/quantus_sdk/lib/src/rust/frb_generated.web.dart @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.11.1. +// @generated by `flutter_rust_bridge`@ 2.12.0. // ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field diff --git a/quantus_sdk/pubspec.lock b/quantus_sdk/pubspec.lock index 7a95d46ad..cb6da31d4 100644 --- a/quantus_sdk/pubspec.lock +++ b/quantus_sdk/pubspec.lock @@ -295,10 +295,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e" + sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a url: "https://pub.dev" source: hosted - version: "2.11.1" + version: "2.12.0" flutter_secure_storage: dependency: "direct main" description: @@ -516,10 +516,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" native_toolchain_c: dependency: transitive description: @@ -736,7 +736,7 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.2" - rust_lib_resonance_network_wallet: + rust_lib_quantus_wallet: dependency: "direct main" description: path: rust_builder @@ -904,10 +904,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.11" typed_data: dependency: transitive description: diff --git a/quantus_sdk/pubspec.yaml b/quantus_sdk/pubspec.yaml index 685e90180..175722fb6 100644 --- a/quantus_sdk/pubspec.yaml +++ b/quantus_sdk/pubspec.yaml @@ -12,9 +12,9 @@ dependencies: flutter: sdk: flutter - rust_lib_resonance_network_wallet: + rust_lib_quantus_wallet: path: ./rust_builder - flutter_rust_bridge: ^2.11.1 + flutter_rust_bridge: ^2.12.0 # Shared (canonical versions in melos.yaml) # DO NOT UPDATE polkadart - newer versions are incompatible with our ML-DSA diff --git a/quantus_sdk/rust/Cargo.lock b/quantus_sdk/rust/Cargo.lock index a5d425abe..3552cb57f 100644 --- a/quantus_sdk/rust/Cargo.lock +++ b/quantus_sdk/rust/Cargo.lock @@ -1242,9 +1242,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flutter_rust_bridge" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde126295b2acc5f0a712e265e91b6fdc0ed38767496483e592ae7134db83725" +checksum = "a0884853aae8a6517b5b58cf36f55da487f2fe110e1686938eb29b6640aae4a5" dependencies = [ "allo-isolate", "android_logger", @@ -1271,9 +1271,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f0420326b13675321b194928bb7830043b68cf8b810e1c651285c747abb080" +checksum = "6b5ce32f35f710ced8c5aa557f023f1a624e737b5460cee2b70fcd3a8df09e1b" dependencies = [ "hex", "md-5", @@ -2938,7 +2938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] -name = "rust_lib_resonance_network_wallet" +name = "rust_lib_quantus_wallet" version = "0.1.0" dependencies = [ "anyhow", diff --git a/quantus_sdk/rust/Cargo.toml b/quantus_sdk/rust/Cargo.toml index 10c4c1d7d..4a98973a1 100644 --- a/quantus_sdk/rust/Cargo.toml +++ b/quantus_sdk/rust/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rust_lib_resonance_network_wallet" +name = "rust_lib_quantus_wallet" version = "0.1.0" edition = "2021" @@ -12,7 +12,7 @@ qp-poseidon-core = "1.4.0" qp-rusty-crystals-dilithium = { version = "2.4.0", default-features = false } qp-rusty-crystals-hdwallet = { version = "2.3.1" } -flutter_rust_bridge = "=2.11.1" +flutter_rust_bridge = "=2.12.0" hex = "0.4.3" nam-tiny-hderive = "0.3.1-nam.0" sp-core = { version = "39.0.0", default-features = true} diff --git a/quantus_sdk/rust/src/frb_generated.rs b/quantus_sdk/rust/src/frb_generated.rs index 414ef0bcf..27c154ab8 100644 --- a/quantus_sdk/rust/src/frb_generated.rs +++ b/quantus_sdk/rust/src/frb_generated.rs @@ -1,5 +1,5 @@ // This file is automatically generated, so please do not edit it. -// @generated by `flutter_rust_bridge`@ 2.11.1. +// @generated by `flutter_rust_bridge`@ 2.12.0. #![allow( non_camel_case_types, @@ -20,6 +20,7 @@ clippy::deref_addrof, clippy::explicit_auto_deref, clippy::borrow_deref_ref, + clippy::uninlined_format_args, clippy::needless_borrow )] @@ -37,7 +38,7 @@ flutter_rust_bridge::frb_generated_boilerplate!( default_rust_opaque = RustOpaqueMoi, default_rust_auto_opaque = RustAutoOpaqueMoi, ); -pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.11.1"; +pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.12.0"; pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 623793143; // Section: executor @@ -1152,7 +1153,7 @@ impl SseDecode for Vec { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { let mut len_ = ::sse_decode(deserializer); - let mut ans_ = vec![]; + let mut ans_ = Vec::with_capacity(len_ as usize); for idx_ in 0..len_ { ans_.push(::sse_decode(deserializer)); } @@ -1164,7 +1165,7 @@ impl SseDecode for Vec> { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { let mut len_ = ::sse_decode(deserializer); - let mut ans_ = vec![]; + let mut ans_ = Vec::with_capacity(len_ as usize); for idx_ in 0..len_ { ans_.push(>::sse_decode(deserializer)); } @@ -1176,7 +1177,7 @@ impl SseDecode for Vec { // Codec=Sse (Serialization based), see doc to use other codecs fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self { let mut len_ = ::sse_decode(deserializer); - let mut ans_ = vec![]; + let mut ans_ = Vec::with_capacity(len_ as usize); for idx_ in 0..len_ { ans_.push(::sse_decode(deserializer)); } @@ -1731,7 +1732,7 @@ impl SseEncode for i32 { #[cfg(not(target_family = "wasm"))] mod io { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.11.1. + // @generated by `flutter_rust_bridge`@ 2.12.0. // Section: imports @@ -1768,7 +1769,7 @@ pub use io::*; #[cfg(target_family = "wasm")] mod web { // This file is automatically generated, so please do not edit it. - // @generated by `flutter_rust_bridge`@ 2.11.1. + // @generated by `flutter_rust_bridge`@ 2.12.0. // Section: imports diff --git a/quantus_sdk/rust_builder/android/build.gradle b/quantus_sdk/rust_builder/android/build.gradle index 52f892c7f..b3f24e294 100644 --- a/quantus_sdk/rust_builder/android/build.gradle +++ b/quantus_sdk/rust_builder/android/build.gradle @@ -1,6 +1,6 @@ // The Android Gradle Plugin builds the native code with the Android NDK. -group 'com.flutter_rust_bridge.rust_lib_resonance_network_wallet' +group 'com.flutter_rust_bridge.rust_lib_quantus_wallet' version '1.0' buildscript { @@ -26,7 +26,7 @@ apply plugin: 'com.android.library' android { if (project.android.hasProperty("namespace")) { - namespace 'com.flutter_rust_bridge.rust_lib_resonance_network_wallet' + namespace 'com.flutter_rust_bridge.rust_lib_quantus_wallet' } // Bumping the plugin compileSdkVersion requires all clients of this plugin @@ -52,5 +52,5 @@ android { apply from: "../cargokit/gradle/plugin.gradle" cargokit { manifestDir = "../../rust" - libname = "rust_lib_resonance_network_wallet" + libname = "rust_lib_quantus_wallet" } diff --git a/quantus_sdk/rust_builder/android/settings.gradle b/quantus_sdk/rust_builder/android/settings.gradle index cf85e560a..539e78dbd 100644 --- a/quantus_sdk/rust_builder/android/settings.gradle +++ b/quantus_sdk/rust_builder/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'rust_lib_resonance_network_wallet' +rootProject.name = 'rust_lib_quantus_wallet' diff --git a/quantus_sdk/rust_builder/android/src/main/AndroidManifest.xml b/quantus_sdk/rust_builder/android/src/main/AndroidManifest.xml index daf122b79..db70b3667 100644 --- a/quantus_sdk/rust_builder/android/src/main/AndroidManifest.xml +++ b/quantus_sdk/rust_builder/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="com.flutter_rust_bridge.rust_lib_quantus_wallet"> diff --git a/quantus_sdk/rust_builder/ios/rust_lib_resonance_network_wallet.podspec b/quantus_sdk/rust_builder/ios/rust_lib_quantus_wallet.podspec similarity index 84% rename from quantus_sdk/rust_builder/ios/rust_lib_resonance_network_wallet.podspec rename to quantus_sdk/rust_builder/ios/rust_lib_quantus_wallet.podspec index b12b659af..f632a6616 100644 --- a/quantus_sdk/rust_builder/ios/rust_lib_resonance_network_wallet.podspec +++ b/quantus_sdk/rust_builder/ios/rust_lib_quantus_wallet.podspec @@ -1,9 +1,9 @@ # # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. -# Run `pod lib lint rust_lib_resonance_network_wallet.podspec` to validate before publishing. +# Run `pod lib lint rust_lib_quantus_wallet.podspec` to validate before publishing. # Pod::Spec.new do |s| - s.name = 'rust_lib_resonance_network_wallet' + s.name = 'rust_lib_quantus_wallet' s.version = '0.0.1' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC @@ -29,17 +29,17 @@ A new Flutter FFI plugin project. s.script_phase = { :name => 'Build Rust library', # First argument is relative path to the `rust` folder, second is name of rust library - :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_resonance_network_wallet', + :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_quantus_wallet', :execution_position => :before_compile, :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'], # Let XCode know that the static library referenced in -force_load below is # created by this build step. - :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_resonance_network_wallet.a"], + :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_quantus_wallet.a"], } s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', # Flutter.framework does not contain a i386 slice. 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', - 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_resonance_network_wallet.a', + 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_quantus_wallet.a', } end \ No newline at end of file diff --git a/quantus_sdk/rust_builder/linux/CMakeLists.txt b/quantus_sdk/rust_builder/linux/CMakeLists.txt index bb8979783..e7096260d 100644 --- a/quantus_sdk/rust_builder/linux/CMakeLists.txt +++ b/quantus_sdk/rust_builder/linux/CMakeLists.txt @@ -4,16 +4,16 @@ cmake_minimum_required(VERSION 3.10) # Project-level configuration. -set(PROJECT_NAME "rust_lib_resonance_network_wallet") +set(PROJECT_NAME "rust_lib_quantus_wallet") project(${PROJECT_NAME} LANGUAGES CXX) include("../cargokit/cmake/cargokit.cmake") -apply_cargokit(${PROJECT_NAME} ../../rust rust_lib_resonance_network_wallet "") +apply_cargokit(${PROJECT_NAME} ../../rust rust_lib_quantus_wallet "") # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. -set(rust_lib_resonance_network_wallet_bundled_libraries +set(rust_lib_quantus_wallet_bundled_libraries "${${PROJECT_NAME}_cargokit_lib}" PARENT_SCOPE ) diff --git a/quantus_sdk/rust_builder/macos/rust_lib_resonance_network_wallet.podspec b/quantus_sdk/rust_builder/macos/rust_lib_quantus_wallet.podspec similarity index 83% rename from quantus_sdk/rust_builder/macos/rust_lib_resonance_network_wallet.podspec rename to quantus_sdk/rust_builder/macos/rust_lib_quantus_wallet.podspec index 846f4d082..d93020a2f 100644 --- a/quantus_sdk/rust_builder/macos/rust_lib_resonance_network_wallet.podspec +++ b/quantus_sdk/rust_builder/macos/rust_lib_quantus_wallet.podspec @@ -1,9 +1,9 @@ # # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. -# Run `pod lib lint rust_lib_resonance_network_wallet.podspec` to validate before publishing. +# Run `pod lib lint rust_lib_quantus_wallet.podspec` to validate before publishing. # Pod::Spec.new do |s| - s.name = 'rust_lib_resonance_network_wallet' + s.name = 'rust_lib_quantus_wallet' s.version = '0.0.1' s.summary = 'A new Flutter FFI plugin project.' s.description = <<-DESC @@ -28,17 +28,17 @@ A new Flutter FFI plugin project. s.script_phase = { :name => 'Build Rust library', # First argument is relative path to the `rust` folder, second is name of rust library - :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_resonance_network_wallet', + :script => 'sh "$PODS_TARGET_SRCROOT/../cargokit/build_pod.sh" ../../rust rust_lib_quantus_wallet', :execution_position => :before_compile, :input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'], # Let XCode know that the static library referenced in -force_load below is # created by this build step. - :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_resonance_network_wallet.a"], + :output_files => ["${BUILT_PRODUCTS_DIR}/librust_lib_quantus_wallet.a"], } s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', # Flutter.framework does not contain a i386 slice. 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', - 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_resonance_network_wallet.a', + 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/librust_lib_quantus_wallet.a', } end \ No newline at end of file diff --git a/quantus_sdk/rust_builder/pubspec.yaml b/quantus_sdk/rust_builder/pubspec.yaml index 7441d9086..54650e58d 100644 --- a/quantus_sdk/rust_builder/pubspec.yaml +++ b/quantus_sdk/rust_builder/pubspec.yaml @@ -1,4 +1,4 @@ -name: rust_lib_resonance_network_wallet +name: rust_lib_quantus_wallet description: "Utility to build Rust code" version: 0.0.1 publish_to: none diff --git a/quantus_sdk/rust_builder/windows/CMakeLists.txt b/quantus_sdk/rust_builder/windows/CMakeLists.txt index 386d183ad..02dc64ece 100644 --- a/quantus_sdk/rust_builder/windows/CMakeLists.txt +++ b/quantus_sdk/rust_builder/windows/CMakeLists.txt @@ -5,16 +5,16 @@ cmake_minimum_required(VERSION 3.14) # Project-level configuration. -set(PROJECT_NAME "rust_lib_resonance_network_wallet") +set(PROJECT_NAME "rust_lib_quantus_wallet") project(${PROJECT_NAME} LANGUAGES CXX) include("../cargokit/cmake/cargokit.cmake") -apply_cargokit(${PROJECT_NAME} ../../../../../../../quantus_sdk/rust rust_lib_resonance_network_wallet "") +apply_cargokit(${PROJECT_NAME} ../../../../../../../quantus_sdk/rust rust_lib_quantus_wallet "") # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. -set(rust_lib_resonance_network_wallet_bundled_libraries +set(rust_lib_quantus_wallet_bundled_libraries "${${PROJECT_NAME}_cargokit_lib}" PARENT_SCOPE )