From 8510fea4476c2a0bfa9b7161191f9eea338956bf Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 14 Jun 2024 10:49:43 -0600 Subject: [PATCH 1/6] patch applied --- crypto_plugins/flutter_libmonero | 2 +- ios/MoneroWallet.framework/.gitignore | 1 + ios/MoneroWallet.framework/Info.plist | Bin 0 -> 793 bytes ios/WowneroWallet.framework/.gitignore | 1 + ios/WowneroWallet.framework/Info.plist | Bin 0 -> 793 bytes scripts/app_config/templates/pubspec.template | 8 ++++---- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 ios/MoneroWallet.framework/.gitignore create mode 100644 ios/MoneroWallet.framework/Info.plist create mode 100644 ios/WowneroWallet.framework/.gitignore create mode 100644 ios/WowneroWallet.framework/Info.plist diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 4b87151d4..09a59d938 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 4b87151d4914606b911f738a8236a6e54a6d8ecb +Subproject commit 09a59d9381e24224ebe545fc9d96dcf51185b7a4 diff --git a/ios/MoneroWallet.framework/.gitignore b/ios/MoneroWallet.framework/.gitignore new file mode 100644 index 000000000..38de9b351 --- /dev/null +++ b/ios/MoneroWallet.framework/.gitignore @@ -0,0 +1 @@ +MoneroWallet \ No newline at end of file diff --git a/ios/MoneroWallet.framework/Info.plist b/ios/MoneroWallet.framework/Info.plist new file mode 100644 index 0000000000000000000000000000000000000000..8858589f7070c754a01b0519387f9cab5f664005 GIT binary patch literal 793 zcmZXQ&rcIU6vtUcNFuadk3vEj@Mp#?9$l6SH&kckVuTD5sjMYb$}%;&g-9bW<~Q zZM}D^YevHoE&4RdtOSg=OldOi)#x7O!nLX6S7?U`$CO6nT8(<$D3gq+BC&RuLrZ$} z+R}_NCw^OacJCKcO2$~3Si7V{jeR%FrsAx=BRs!9QTILObWRro*A2_G6_4zi(o{?q zoVL)I<%d#;xBpMnSX|G)pjP0MZQfgPRoE`$)H9`YwNRnY1Lo0IxFoaaDsjm+HkkGv_d;rn^AA8S~!N+h|T!EDJ4$U?sLt)zkO#Du`Hc+9O4IFXu{|T z6m>O=!l9n16V9pMWbRJ*6kT;$&Km0Cf>O(<`HZSmsPjavWft<8Otuj>8EeJ*x~|H~ z;Y@>-dtgb|mt@71W-MXL#C189!&_uRSLS@rmMu=4j;xx>;q5B%?4|IRh)DH_w(tcP z)~+X?7WL`geF;lo^fcAg#e7D|5UcNFuadk3vEj@Mp#?9$l6SH&kckVuTD5sjMYb$}%;&g-9bW<~Q zZM}D^YevHoE&4RdtOSg=OldOi)#x7O!nLX6S7?U`$CO6nT8(<$D3gq+BC&RuLrZ$} z+R}_NCw^OacJCKcO2$~3Si7V{jeR%FrsAx=BRs!9QTILObWRro*A2_G6_4zi(o{?q zoVL)I<%d#;xBpMnSX|G)pjP0MZQfgPRoE`$)H9`YwNRnY1Lo0IxFoaaDsjm+HkkGv_d;rn^AA8S~!N+h|T!EDJ4$U?sLt)zkO#Du`Hc+9O4IFXu{|T z6m>O=!l9n16V9pMWbRJ*6kT;$&Km0Cf>O(<`HZSmsPjavWft<8Otuj>8EeJ*x~|H~ z;Y@>-dtgb|mt@71W-MXL#C189!&_uRSLS@rmMu=4j;xx>;q5B%?4|IRh)DH_w(tcP z)~+X?7WL`geF;lo^fcAg#e7D|5 Date: Fri, 14 Jun 2024 12:28:06 -0600 Subject: [PATCH 2/6] update ref --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index 09a59d938..f29b2dced 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit 09a59d9381e24224ebe545fc9d96dcf51185b7a4 +Subproject commit f29b2dceddc61ec5e97194c393ab7c0e9ba4eb8b From 91f4b97cd7bd91640203c91bd318b2aad03fd97c Mon Sep 17 00:00:00 2001 From: Julian Date: Tue, 18 Jun 2024 07:46:35 -0600 Subject: [PATCH 3/6] fix plists and convert to xml --- ios/MoneroWallet.framework/Info.plist | Bin 793 -> 1526 bytes ios/WowneroWallet.framework/Info.plist | Bin 793 -> 1529 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ios/MoneroWallet.framework/Info.plist b/ios/MoneroWallet.framework/Info.plist index 8858589f7070c754a01b0519387f9cab5f664005..de2be3211f8d9a3b7870502df299bc1c588e9cdf 100644 GIT binary patch literal 1526 zcmbVMU6YzH6n(D0g7PjA_M@E+t5XGMoYj?Cu-iU$vT()B29k!L%fD|xv5Mfdeapu^ z_ndq0N$k;kLbWZ3jIi`UH;sX=K^n4%r168k3a0(f`e@j*KRU}v@WXR8PDv&;Z#ACJ zCYs(y=qu+G5OM-X^X4-@&{PhD+$UYrH&XI12<>(|1D8=o$dWQJL!Mw9ge>MNSziH+ zNJhG%*=IkKqfR3d%3<$={RYKwoD&)?aJV5UEd6R{qw+%CXHqEHL+i%1tXmr$wg=#3 zI?mIGf&*Kij3{8ts85{P363Vs2fE?yqH===>6 z@}SbM#?;iRT+j(7af)RwE*M9nQ70znTv0;gQ7qR?B-xP=3xP|&91TOfjhf%mKh1^e zsLFMCe`oY3}JA0I;%kr|Y3l>sPDW5fJ;(FG@{OK5ky>00I$P}`sh zFAHX>CFe%}L)BI2C*$H_If3sy{*yEne@&IyO7dNON*4w&?`~R3uR>cDnRl)=xW&!7 z7bGP~o-F;YvRfX~YNmb?62cTGgcdF4BB_KJ#88=|UY4G#*VgH=eQvka>=}OLL_oCX gm|%`y2_=%i6&qub+@DRSPHLn54{D?8e;xLI1Bbl(yZ`_I literal 793 zcmZXQ&rcIU6vtUcNFuadk3vEj@Mp#?9$l6SH&kckVuTD5sjMYb$}%;&g-9bW<~Q zZM}D^YevHoE&4RdtOSg=OldOi)#x7O!nLX6S7?U`$CO6nT8(<$D3gq+BC&RuLrZ$} z+R}_NCw^OacJCKcO2$~3Si7V{jeR%FrsAx=BRs!9QTILObWRro*A2_G6_4zi(o{?q zoVL)I<%d#;xBpMnSX|G)pjP0MZQfgPRoE`$)H9`YwNRnY1Lo0IxFoaaDsjm+HkkGv_d;rn^AA8S~!N+h|T!EDJ4$U?sLt)zkO#Du`Hc+9O4IFXu{|T z6m>O=!l9n16V9pMWbRJ*6kT;$&Km0Cf>O(<`HZSmsPjavWft<8Otuj>8EeJ*x~|H~ z;Y@>-dtgb|mt@71W-MXL#C189!&_uRSLS@rmMu=4j;xx>;q5B%?4|IRh)DH_w(tcP z)~+X?7WL`geF;lo^fcAg#e7D|57Ahg@<3|vMTAxp}@40(ca5VCku$@&Ul zL^9G9%|82?9CaFzP!4+^>^CTe8Q}Vc}Oh887usr}L z({Y|g6dc$BWjujYzCf(1Zo)yGv_su@2y=;FDKs%Fwo5^<6{Zwq7km~ePO>H-nsC(@ zBP{qvjX~n@&G@@?>6$sJGpYnEif{W7HZ$KFgDyGGIQhRiJS7pw5ET3ZKb@~0yZHPK z6Y?O_uO`(LtBlYICUJ^oE-n~HqfsX&=Uh=jIHB#+KE8)4A~Pu6Dhp7Y#)kRxq6JX!c%Ww*SflX=xj&muozzDAPt-=$7d!0z2C(h@KL7v# literal 793 zcmZXQ&rcIU6vtUcNFuadk3vEj@Mp#?9$l6SH&kckVuTD5sjMYb$}%;&g-9bW<~Q zZM}D^YevHoE&4RdtOSg=OldOi)#x7O!nLX6S7?U`$CO6nT8(<$D3gq+BC&RuLrZ$} z+R}_NCw^OacJCKcO2$~3Si7V{jeR%FrsAx=BRs!9QTILObWRro*A2_G6_4zi(o{?q zoVL)I<%d#;xBpMnSX|G)pjP0MZQfgPRoE`$)H9`YwNRnY1Lo0IxFoaaDsjm+HkkGv_d;rn^AA8S~!N+h|T!EDJ4$U?sLt)zkO#Du`Hc+9O4IFXu{|T z6m>O=!l9n16V9pMWbRJ*6kT;$&Km0Cf>O(<`HZSmsPjavWft<8Otuj>8EeJ*x~|H~ z;Y@>-dtgb|mt@71W-MXL#C189!&_uRSLS@rmMu=4j;xx>;q5B%?4|IRh)DH_w(tcP z)~+X?7WL`geF;lo^fcAg#e7D|5 Date: Tue, 18 Jun 2024 07:48:44 -0600 Subject: [PATCH 4/6] update ios project template file with manually added xmr and wow frameworks --- .../ios/Runner.xcodeproj/project.pbxproj | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/scripts/app_config/templates/ios/Runner.xcodeproj/project.pbxproj b/scripts/app_config/templates/ios/Runner.xcodeproj/project.pbxproj index fdfcd1bfa..4b521cca2 100644 --- a/scripts/app_config/templates/ios/Runner.xcodeproj/project.pbxproj +++ b/scripts/app_config/templates/ios/Runner.xcodeproj/project.pbxproj @@ -18,8 +18,8 @@ 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; B49D91439948369648AB0603 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51604430FD0FD1FA5C4767A0 /* Pods_Runner.framework */; }; - CE6B5DF12BF26AAA00CF1F44 /* monero_libwallet2_api_c.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE6B5DEF2BF26AAA00CF1F44 /* monero_libwallet2_api_c.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - CE6B5DF22BF26AAA00CF1F44 /* wownero_libwallet2_api_c.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE6B5DF02BF26AAA00CF1F44 /* wownero_libwallet2_api_c.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + CEFE41202C20387E00086DB4 /* WowneroWallet.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE4F88332C202CF4007A8C67 /* WowneroWallet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + CEFE41212C20387E00086DB4 /* MoneroWallet.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE4F88302C202CEE007A8C67 /* MoneroWallet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -40,8 +40,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - CE6B5DF12BF26AAA00CF1F44 /* monero_libwallet2_api_c.dylib in CopyFiles */, - CE6B5DF22BF26AAA00CF1F44 /* wownero_libwallet2_api_c.dylib in CopyFiles */, + CEFE41202C20387E00086DB4 /* WowneroWallet.framework in CopyFiles */, + CEFE41212C20387E00086DB4 /* MoneroWallet.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -75,8 +75,8 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B999088F2ABE1E170012A442 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - CE6B5DEF2BF26AAA00CF1F44 /* monero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = monero_libwallet2_api_c.dylib; sourceTree = ""; }; - CE6B5DF02BF26AAA00CF1F44 /* wownero_libwallet2_api_c.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = wownero_libwallet2_api_c.dylib; sourceTree = ""; }; + CE4F88302C202CEE007A8C67 /* MoneroWallet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MoneroWallet.framework; sourceTree = ""; }; + CE4F88332C202CF4007A8C67 /* WowneroWallet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WowneroWallet.framework; sourceTree = ""; }; E6F536731AC506735EB76340 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -137,8 +137,8 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( - CE6B5DEF2BF26AAA00CF1F44 /* monero_libwallet2_api_c.dylib */, - CE6B5DF02BF26AAA00CF1F44 /* wownero_libwallet2_api_c.dylib */, + CE4F88332C202CF4007A8C67 /* WowneroWallet.framework */, + CE4F88302C202CEE007A8C67 /* MoneroWallet.framework */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, @@ -192,9 +192,9 @@ 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, + CE6B5DEA2BF26A3300CF1F44 /* CopyFiles */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, FD1CA371131604E6658D4146 /* [CP] Embed Pods Frameworks */, - CE6B5DEA2BF26A3300CF1F44 /* CopyFiles */, ); buildRules = ( ); @@ -341,6 +341,8 @@ "${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework", "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", "${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", "${BUILT_PRODUCTS_DIR}/stack_wallet_backup/stack_wallet_backup.framework", "${BUILT_PRODUCTS_DIR}/tor_ffi_plugin/tor_ffi_plugin.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", @@ -374,6 +376,8 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/stack_wallet_backup.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/tor_ffi_plugin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", @@ -486,6 +490,7 @@ "$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/../crypto_plugins/flutter_liblelantus/scripts/ios/mobileliblelantus", "$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios", + "$(PROJECT_DIR)", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -677,6 +682,7 @@ "$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/../crypto_plugins/flutter_liblelantus/scripts/ios/mobileliblelantus", "$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios/**", + "$(PROJECT_DIR)", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -760,6 +766,7 @@ "$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/../crypto_plugins/flutter_liblelantus/scripts/ios/mobileliblelantus/**", "$(PROJECT_DIR)/../crypto_plugins/flutter_libmonero/cw_shared_external/ios/External/ios", + "$(PROJECT_DIR)", ); HEADER_SEARCH_PATHS = ( "$(inherited)", From 6b368e334c911a52beb4e5d3a4b611e627b2a454 Mon Sep 17 00:00:00 2001 From: Julian Date: Tue, 18 Jun 2024 07:49:10 -0600 Subject: [PATCH 5/6] update ref --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index f29b2dced..b954d52b3 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit f29b2dceddc61ec5e97194c393ab7c0e9ba4eb8b +Subproject commit b954d52b32939eeb98a870b80b50d14fd83a65b6 From 1735fc194395489abc85fe19fbdafad82ab89f8f Mon Sep 17 00:00:00 2001 From: Julian Date: Tue, 18 Jun 2024 08:46:24 -0600 Subject: [PATCH 6/6] update ref --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index b954d52b3..adc7bf50a 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit b954d52b32939eeb98a870b80b50d14fd83a65b6 +Subproject commit adc7bf50abe4bbe90d5050b82fb5751937cbae4e