diff --git a/CLibWally.xcframework/ios-arm64/Headers/module.modulemap b/CLibWally.xcframework/ios-arm64/Headers/module.modulemap deleted file mode 100644 index e77900571..000000000 --- a/CLibWally.xcframework/ios-arm64/Headers/module.modulemap +++ /dev/null @@ -1,13 +0,0 @@ -module CLibWally { - header "wally_address.h" - header "wally_bip32.h" - header "wally_bip38.h" - header "wally_bip39.h" - header "wally_core.h" - header "wally_crypto.h" - header "wally_psbt.h" - header "wally_script.h" - header "wally_transaction.h" - - export * -} diff --git a/CLibWally.xcframework/ios-arm64/libwallycore.a b/CLibWally.xcframework/ios-arm64/libwallycore.a deleted file mode 100644 index bbd2a7551..000000000 Binary files a/CLibWally.xcframework/ios-arm64/libwallycore.a and /dev/null differ diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/module.modulemap b/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/module.modulemap deleted file mode 100644 index e77900571..000000000 --- a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/module.modulemap +++ /dev/null @@ -1,13 +0,0 @@ -module CLibWally { - header "wally_address.h" - header "wally_bip32.h" - header "wally_bip38.h" - header "wally_bip39.h" - header "wally_core.h" - header "wally_crypto.h" - header "wally_psbt.h" - header "wally_script.h" - header "wally_transaction.h" - - export * -} diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/libwallycore.a b/CLibWally.xcframework/ios-x86_64-maccatalyst/libwallycore.a deleted file mode 100644 index 0dc0ad2ba..000000000 Binary files a/CLibWally.xcframework/ios-x86_64-maccatalyst/libwallycore.a and /dev/null differ diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/module.modulemap b/CLibWally.xcframework/ios-x86_64-simulator/Headers/module.modulemap deleted file mode 100644 index e77900571..000000000 --- a/CLibWally.xcframework/ios-x86_64-simulator/Headers/module.modulemap +++ /dev/null @@ -1,13 +0,0 @@ -module CLibWally { - header "wally_address.h" - header "wally_bip32.h" - header "wally_bip38.h" - header "wally_bip39.h" - header "wally_core.h" - header "wally_crypto.h" - header "wally_psbt.h" - header "wally_script.h" - header "wally_transaction.h" - - export * -} diff --git a/CLibWally.xcframework/ios-x86_64-simulator/libwallycore.a b/CLibWally.xcframework/ios-x86_64-simulator/libwallycore.a deleted file mode 100644 index 25e5866f2..000000000 Binary files a/CLibWally.xcframework/ios-x86_64-simulator/libwallycore.a and /dev/null differ diff --git a/CLibWally.xcframework/macos-x86_64/Headers/module.modulemap b/CLibWally.xcframework/macos-x86_64/Headers/module.modulemap deleted file mode 100644 index e77900571..000000000 --- a/CLibWally.xcframework/macos-x86_64/Headers/module.modulemap +++ /dev/null @@ -1,13 +0,0 @@ -module CLibWally { - header "wally_address.h" - header "wally_bip32.h" - header "wally_bip38.h" - header "wally_bip39.h" - header "wally_core.h" - header "wally_crypto.h" - header "wally_psbt.h" - header "wally_script.h" - header "wally_transaction.h" - - export * -} diff --git a/CLibWally.xcframework/macos-x86_64/libwallycore.a b/CLibWally.xcframework/macos-x86_64/libwallycore.a deleted file mode 100644 index ea0d79a35..000000000 Binary files a/CLibWally.xcframework/macos-x86_64/libwallycore.a and /dev/null differ diff --git a/FullyNoded.xcodeproj/project.pbxproj b/FullyNoded.xcodeproj/project.pbxproj index b7c95b7cb..38300051c 100644 --- a/FullyNoded.xcodeproj/project.pbxproj +++ b/FullyNoded.xcodeproj/project.pbxproj @@ -22,6 +22,10 @@ D0126FF022443D1100412629 /* whitePlus.png in Resources */ = {isa = PBXBuildFile; fileRef = D0126FEF22443D1100412629 /* whitePlus.png */; }; D0126FF622446E3800412629 /* InvoiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0126FF522446E3800412629 /* InvoiceViewController.swift */; }; D0126FF82244842000412629 /* bWhite.png in Resources */ = {isa = PBXBuildFile; fileRef = D0126FF72244842000412629 /* bWhite.png */; }; + D016AE4825AFFCA400A59E93 /* LibWally.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016AE4425AFFCA000A59E93 /* LibWally.xcframework */; }; + D016AE4925AFFCA400A59E93 /* LibWally.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D016AE4425AFFCA000A59E93 /* LibWally.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D016AE7525B0284300A59E93 /* Tor.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D016AE7225B0284000A59E93 /* Tor.xcframework */; }; + D016AE7625B0284300A59E93 /* Tor.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D016AE7225B0284000A59E93 /* Tor.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D0196DD721B5AB300081E0AB /* KeyPadButtonView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D0196DD621B5AB300081E0AB /* KeyPadButtonView.xib */; }; D0196DDB21B5AC5F0081E0AB /* KeyPad.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0196DDA21B5AC5F0081E0AB /* KeyPad.swift */; }; D01EB4F325AD685700ADF6E4 /* TransactionLabelMemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01EB4F225AD685700ADF6E4 /* TransactionLabelMemoViewController.swift */; }; @@ -56,12 +60,7 @@ D039D3C823322F1300D1ED18 /* NodeStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = D039D3C723322F1300D1ED18 /* NodeStruct.swift */; }; D039D3CA2332440D00D1ED18 /* HDMusigStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = D039D3C92332440D00D1ED18 /* HDMusigStruct.swift */; }; D03F65F124EFB25100901D06 /* KeySendViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03F65F024EFB25100901D06 /* KeySendViewController.swift */; }; - D03FC07C2508850600450B45 /* Tor-3.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03FC07A250883D900450B45 /* Tor-3.xcframework */; }; - D03FC07D2508850600450B45 /* Tor-3.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D03FC07A250883D900450B45 /* Tor-3.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D0410617224ED189004AC0D0 /* ObjectiveCHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D0410616224ED189004AC0D0 /* ObjectiveCHeader.m */; }; - D042B9372570DAA600E6DDE3 /* CLibWally.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D042B9352570DAA500E6DDE3 /* CLibWally.xcframework */; }; - D042B9382570DAA900E6DDE3 /* LibWally.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D042B9342570DAA500E6DDE3 /* LibWally.xcframework */; }; - D042B9392570DAA900E6DDE3 /* LibWally.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D042B9342570DAA500E6DDE3 /* LibWally.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; D042FABC250C9F0600E99D9B /* Torrc.swift in Sources */ = {isa = PBXBuildFile; fileRef = D042FABB250C9F0600E99D9B /* Torrc.swift */; }; D044ED78235AF42D00300D62 /* ImportStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = D044ED77235AF42D00300D62 /* ImportStruct.swift */; }; D0452AD42246C7830013E225 /* clear.png in Resources */ = {isa = PBXBuildFile; fileRef = D0452AD32246C7820013E225 /* clear.png */; }; @@ -180,14 +179,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - D01A861624FE86F0009D2510 /* Embed Frameworks */ = { + D016AE4A25AFFCA400A59E93 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - D03FC07D2508850600450B45 /* Tor-3.xcframework in Embed Frameworks */, - D042B9392570DAA900E6DDE3 /* LibWally.xcframework in Embed Frameworks */, + D016AE4925AFFCA400A59E93 /* LibWally.xcframework in Embed Frameworks */, + D016AE7625B0284300A59E93 /* Tor.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -215,6 +214,8 @@ D0126FEF22443D1100412629 /* whitePlus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = whitePlus.png; sourceTree = ""; }; D0126FF522446E3800412629 /* InvoiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvoiceViewController.swift; sourceTree = ""; }; D0126FF72244842000412629 /* bWhite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bWhite.png; sourceTree = ""; }; + D016AE4425AFFCA000A59E93 /* LibWally.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = LibWally.xcframework; sourceTree = ""; }; + D016AE7225B0284000A59E93 /* Tor.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Tor.xcframework; sourceTree = ""; }; D0196DD621B5AB300081E0AB /* KeyPadButtonView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KeyPadButtonView.xib; sourceTree = ""; }; D0196DDA21B5AC5F0081E0AB /* KeyPad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPad.swift; sourceTree = ""; }; D01EB4F225AD685700ADF6E4 /* TransactionLabelMemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionLabelMemoViewController.swift; sourceTree = ""; }; @@ -251,13 +252,9 @@ D039D3C723322F1300D1ED18 /* NodeStruct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeStruct.swift; sourceTree = ""; }; D039D3C92332440D00D1ED18 /* HDMusigStruct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HDMusigStruct.swift; sourceTree = ""; }; D03F65F024EFB25100901D06 /* KeySendViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeySendViewController.swift; sourceTree = ""; }; - D03FC07A250883D900450B45 /* Tor-3.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = "Tor-3.xcframework"; sourceTree = ""; }; D0410615224ED188004AC0D0 /* FullyNoded-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FullyNoded-Bridging-Header.h"; sourceTree = ""; }; D0410616224ED189004AC0D0 /* ObjectiveCHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectiveCHeader.m; sourceTree = ""; }; - D042B9342570DAA500E6DDE3 /* LibWally.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = LibWally.xcframework; sourceTree = ""; }; - D042B9352570DAA500E6DDE3 /* CLibWally.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = CLibWally.xcframework; sourceTree = ""; }; D042FABB250C9F0600E99D9B /* Torrc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Torrc.swift; sourceTree = ""; }; - D042FAC1250DA86D00E99D9B /* .torrc */ = {isa = PBXFileReference; lastKnownFileType = text; path = .torrc; sourceTree = ""; }; D044ED77235AF42D00300D62 /* ImportStruct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportStruct.swift; sourceTree = ""; }; D0452AD32246C7820013E225 /* clear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clear.png; sourceTree = ""; }; D0452AD52246E0370013E225 /* whiteBroom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = whiteBroom.png; sourceTree = ""; }; @@ -371,9 +368,8 @@ buildActionMask = 2147483647; files = ( D0C1F9132531E5970079C2B8 /* URKit in Frameworks */, - D03FC07C2508850600450B45 /* Tor-3.xcframework in Frameworks */, - D042B9372570DAA600E6DDE3 /* CLibWally.xcframework in Frameworks */, - D042B9382570DAA900E6DDE3 /* LibWally.xcframework in Frameworks */, + D016AE7525B0284300A59E93 /* Tor.xcframework in Frameworks */, + D016AE4825AFFCA400A59E93 /* LibWally.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -854,11 +850,9 @@ D08C1FBB211147F600B7CA79 /* Frameworks */ = { isa = PBXGroup; children = ( - D042B9352570DAA500E6DDE3 /* CLibWally.xcframework */, - D042B9342570DAA500E6DDE3 /* LibWally.xcframework */, + D016AE7225B0284000A59E93 /* Tor.xcframework */, + D016AE4425AFFCA000A59E93 /* LibWally.xcframework */, D026E5C7253A79DB001F1054 /* AuthenticationServices.framework */, - D042FAC1250DA86D00E99D9B /* .torrc */, - D03FC07A250883D900450B45 /* Tor-3.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -956,7 +950,7 @@ D00B9A212111427200E8B95A /* Frameworks */, D00B9A222111427200E8B95A /* Resources */, D08C1FBE2111480100B7CA79 /* ShellScript */, - D01A861624FE86F0009D2510 /* Embed Frameworks */, + D016AE4A25AFFCA400A59E93 /* Embed Frameworks */, ); buildRules = ( ); @@ -1428,7 +1422,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 284; + CURRENT_PROJECT_VERSION = 286; DEVELOPMENT_TEAM = 8JHDU5M9KD; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -1439,7 +1433,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.364; + MARKETING_VERSION = 1.366; PRODUCT_BUNDLE_IDENTIFIER = com.fontaine.FullyNoded; "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = com.fontaine.fullynodedmacos; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1464,7 +1458,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 284; + CURRENT_PROJECT_VERSION = 286; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 8JHDU5M9KD; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; @@ -1477,7 +1471,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.364; + MARKETING_VERSION = 1.366; PRODUCT_BUNDLE_IDENTIFIER = com.fontaine.FullyNoded; "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = com.fontaine.fullynodedmacos; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/FullyNoded/Base.lproj/Main.storyboard b/FullyNoded/Base.lproj/Main.storyboard index f6a753b43..e45830220 100644 --- a/FullyNoded/Base.lproj/Main.storyboard +++ b/FullyNoded/Base.lproj/Main.storyboard @@ -5447,7 +5447,7 @@ If you add a fingerprint your extended key will derive addresses as if it is an - + @@ -5547,7 +5547,7 @@ If you add a fingerprint your extended key will derive addresses as if it is an - + diff --git a/FullyNoded/View Controllers/Home/Home Screen/MainMenuViewController.swift b/FullyNoded/View Controllers/Home/Home Screen/MainMenuViewController.swift index 32da17edf..a70995ff9 100644 --- a/FullyNoded/View Controllers/Home/Home Screen/MainMenuViewController.swift +++ b/FullyNoded/View Controllers/Home/Home Screen/MainMenuViewController.swift @@ -66,6 +66,7 @@ class MainMenuViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + mainMenu.delegate = self mainMenu.alpha = 0 mainMenu.tableFooterView = UIView(frame: .zero) diff --git a/LibWally.xcframework/Info.plist b/LibWally.xcframework/Info.plist index 9e9860aa4..e27a2b15a 100644 --- a/LibWally.xcframework/Info.plist +++ b/LibWally.xcframework/Info.plist @@ -6,55 +6,58 @@ LibraryIdentifier - macos-x86_64 + ios-arm64 LibraryPath LibWally.framework SupportedArchitectures - x86_64 + arm64 SupportedPlatform - macos + ios LibraryIdentifier - ios-x86_64-maccatalyst + macos-arm64_x86_64 LibraryPath LibWally.framework SupportedArchitectures + arm64 x86_64 SupportedPlatform - ios - SupportedPlatformVariant - maccatalyst + macos LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath LibWally.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-x86_64-simulator + ios-arm64_x86_64-maccatalyst LibraryPath LibWally.framework SupportedArchitectures + arm64 x86_64 SupportedPlatform ios SupportedPlatformVariant - simulator + maccatalyst CFBundlePackageType diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally-Swift.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally-Swift.h index c6791aa34..21654ef5c 100644 --- a/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally-Swift.h +++ b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally-Swift.h @@ -1,4 +1,6 @@ -// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) +// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +#ifndef LIBWALLY_SWIFT_H +#define LIBWALLY_SWIFT_H #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -207,3 +209,4 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # pragma clang attribute pop #endif #pragma clang diagnostic pop +#endif diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally.h index c8fce4e14..6e7b012f6 100644 --- a/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally.h +++ b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/LibWally.h @@ -14,3 +14,14 @@ FOUNDATION_EXPORT double LibWallyVersionNumber; FOUNDATION_EXPORT const unsigned char LibWallyVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import + +#import "wally_transaction.h" +#import "wally_address.h" +#import "wally_bip32.h" +#import "wally_bip38.h" +#import "wally_bip39.h" +#import "wally_core.h" +#import "wally_crypto.h" +#import "wally_psbt.h" +#import "wally_script.h" +#import "wally_symmetric.h" diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_address.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_address.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_address.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_address.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_bip32.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip32.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_bip32.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip32.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_bip38.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip38.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_bip38.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip38.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_bip39.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip39.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_bip39.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_bip39.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_core.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_core.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_core.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_core.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_crypto.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_crypto.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_crypto.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_crypto.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_psbt.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_psbt.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_psbt.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_psbt.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_script.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_script.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_script.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_script.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_symmetric.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_symmetric.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_symmetric.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_symmetric.h diff --git a/CLibWally.xcframework/ios-arm64/Headers/wally_transaction.h b/LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_transaction.h similarity index 100% rename from CLibWally.xcframework/ios-arm64/Headers/wally_transaction.h rename to LibWally.xcframework/ios-arm64/LibWally.framework/Headers/wally_transaction.h diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Info.plist b/LibWally.xcframework/ios-arm64/LibWally.framework/Info.plist index 2d53ebe2c..d1a6c132a 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Info.plist and b/LibWally.xcframework/ios-arm64/LibWally.framework/Info.plist differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/LibWally b/LibWally.xcframework/ios-arm64/LibWally.framework/LibWally index 152ef8a58..0ffb50d4b 100755 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/LibWally and b/LibWally.xcframework/ios-arm64/LibWally.framework/LibWally differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo index 536e9d172..a3b2efac5 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo index 536e9d172..a3b2efac5 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftdoc b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftdoc index 11eb524be..917406860 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftdoc and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftinterface b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftinterface index 19305343b..da0dae03b 100644 --- a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftinterface +++ b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target arm64-apple-ios13.6 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftmodule b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftmodule index 8f2945cbf..749188a95 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftmodule and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc index 11eb524be..917406860 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface index 19305343b..da0dae03b 100644 --- a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface +++ b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target arm64-apple-ios13.6 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule index 8f2945cbf..749188a95 100644 Binary files a/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule and b/LibWally.xcframework/ios-arm64/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Headers b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Headers similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Headers rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Headers diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/LibWally b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/LibWally similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/LibWally rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/LibWally diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Modules b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Modules similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Modules rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Modules diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Resources b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Resources similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Resources rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Resources diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h similarity index 98% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h index c6791aa34..21654ef5c 100644 --- a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally-Swift.h @@ -1,4 +1,6 @@ -// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) +// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +#ifndef LIBWALLY_SWIFT_H +#define LIBWALLY_SWIFT_H #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -207,3 +209,4 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # pragma clang attribute pop #endif #pragma clang diagnostic pop +#endif diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h similarity index 63% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h index c8fce4e14..6e7b012f6 100644 --- a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/LibWally.h @@ -14,3 +14,14 @@ FOUNDATION_EXPORT double LibWallyVersionNumber; FOUNDATION_EXPORT const unsigned char LibWallyVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import + +#import "wally_transaction.h" +#import "wally_address.h" +#import "wally_bip32.h" +#import "wally_bip38.h" +#import "wally_bip39.h" +#import "wally_core.h" +#import "wally_crypto.h" +#import "wally_psbt.h" +#import "wally_script.h" +#import "wally_symmetric.h" diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_address.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_address.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_address.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_address.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip32.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip32.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip32.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip32.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip38.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip38.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip38.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip38.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip39.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip39.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_bip39.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_bip39.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_core.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_core.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_core.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_core.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_crypto.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_crypto.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_crypto.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_crypto.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_psbt.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_psbt.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_psbt.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_psbt.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_script.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_script.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_script.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_script.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_symmetric.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_symmetric.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_symmetric.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_symmetric.h diff --git a/CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_transaction.h b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_transaction.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-maccatalyst/Headers/wally_transaction.h rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Headers/wally_transaction.h diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally new file mode 100755 index 000000000..0a1c7798c Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-macabi.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-macabi.swiftsourceinfo index dbf32cd71..ba0378350 100644 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-macabi.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo new file mode 100644 index 000000000..ba0378350 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo new file mode 100644 index 000000000..765044693 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo index dbf32cd71..765044693 100644 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftdoc new file mode 100644 index 000000000..c0b315312 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftinterface new file mode 100644 index 000000000..0079f5166 --- /dev/null +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftmodule new file mode 100644 index 000000000..3aac8c8f6 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-ios-macabi.swiftmodule differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc new file mode 100644 index 000000000..c0b315312 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface new file mode 100644 index 000000000..0079f5166 --- /dev/null +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule new file mode 100644 index 000000000..3aac8c8f6 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc similarity index 56% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc index 4b3b98e76..b1455fd3d 100644 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftdoc differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface similarity index 96% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface index 891f1975d..0fd191dc2 100644 --- a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-ios13.6-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-ios14.2-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule new file mode 100644 index 000000000..f0b9e079b Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc similarity index 56% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc index 4b3b98e76..b1455fd3d 100644 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface similarity index 96% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface index 891f1975d..0fd191dc2 100644 --- a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-ios13.6-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-ios14.2-macabi -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule new file mode 100644 index 000000000..f0b9e079b Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/module.modulemap b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/module.modulemap similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/module.modulemap rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/module.modulemap diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Resources/Info.plist b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist similarity index 83% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Resources/Info.plist rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist index ff259b272..26ec2cfbc 100644 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Resources/Info.plist +++ b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist @@ -27,22 +27,23 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11E503a + 12C33 + DTPlatformName + macosx DTPlatformVersion - GM + 11.1 DTSDKBuild - 19E258 + 20C63 DTSDKName - macosx10.15 + macosx11.1 DTXcode - 1141 + 1230 DTXcodeBuild - 11E503a + 12C33 LSMinimumSystemVersion - 10.15 + 11.0 UIDeviceFamily - 1 2 6 diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/Current b/LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/Current similarity index 100% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/Current rename to LibWally.xcframework/ios-arm64_x86_64-maccatalyst/LibWally.framework/Versions/Current diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h similarity index 98% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h index c6791aa34..21654ef5c 100644 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h @@ -1,4 +1,6 @@ -// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) +// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +#ifndef LIBWALLY_SWIFT_H +#define LIBWALLY_SWIFT_H #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -207,3 +209,4 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # pragma clang attribute pop #endif #pragma clang diagnostic pop +#endif diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally.h similarity index 63% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally.h index c8fce4e14..6e7b012f6 100644 --- a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally.h +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/LibWally.h @@ -14,3 +14,14 @@ FOUNDATION_EXPORT double LibWallyVersionNumber; FOUNDATION_EXPORT const unsigned char LibWallyVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import + +#import "wally_transaction.h" +#import "wally_address.h" +#import "wally_bip32.h" +#import "wally_bip38.h" +#import "wally_bip39.h" +#import "wally_core.h" +#import "wally_crypto.h" +#import "wally_psbt.h" +#import "wally_script.h" +#import "wally_symmetric.h" diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_address.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_address.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_address.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_address.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip32.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip32.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip32.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip32.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip38.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip38.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip38.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip38.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip39.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip39.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_bip39.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_bip39.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_core.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_core.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_core.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_core.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_crypto.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_crypto.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_crypto.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_crypto.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_psbt.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_psbt.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_psbt.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_psbt.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_script.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_script.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_script.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_script.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_symmetric.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_symmetric.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_symmetric.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_symmetric.h diff --git a/CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_transaction.h b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_transaction.h similarity index 100% rename from CLibWally.xcframework/ios-x86_64-simulator/Headers/wally_transaction.h rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Headers/wally_transaction.h diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Info.plist b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Info.plist similarity index 71% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Info.plist rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Info.plist index 62a883096..fb7f79306 100644 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Info.plist and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Info.plist differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/LibWally b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/LibWally new file mode 100755 index 000000000..7fe5dc9fa Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/LibWally differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo new file mode 100644 index 000000000..05d45f86c Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo new file mode 100644 index 000000000..05d45f86c Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo new file mode 100644 index 000000000..dcaa08569 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo new file mode 100644 index 000000000..dcaa08569 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftdoc new file mode 100644 index 000000000..bbc9c7775 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftinterface new file mode 100644 index 000000000..ccc8b850d --- /dev/null +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftmodule new file mode 100644 index 000000000..afe630c5e Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftmodule differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc new file mode 100644 index 000000000..bbc9c7775 Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftdoc differ diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface new file mode 100644 index 000000000..ccc8b850d --- /dev/null +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-ios14.2-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule new file mode 100644 index 000000000..afe630c5e Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/arm64.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc similarity index 55% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 081dc6afa..42ce012a1 100644 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface similarity index 96% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 1632f8b88..126d8ad87 100644 --- a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-ios13.6-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-ios14.2-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule new file mode 100644 index 000000000..8b224e2dc Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc similarity index 55% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc index 081dc6afa..42ce012a1 100644 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftdoc differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface similarity index 96% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface index 1632f8b88..126d8ad87 100644 --- a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-ios13.6-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-ios14.2-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule new file mode 100644 index 000000000..8b224e2dc Binary files /dev/null and b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/module.modulemap b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/module.modulemap similarity index 100% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/module.modulemap rename to LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/Modules/module.modulemap diff --git a/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources new file mode 100644 index 000000000..097cc7cd8 --- /dev/null +++ b/LibWally.xcframework/ios-arm64_x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources @@ -0,0 +1,333 @@ + + + + + files + + Headers/LibWally-Swift.h + + Ui1U2aeMAxyJrMaQ/WZi924Dusk= + + Headers/LibWally.h + + gbk2xMAMyvUNckMlGPRdgy0zuc4= + + Headers/wally_address.h + + nDyIc2C/+2RqeN+upuCdHRhIf7c= + + Headers/wally_bip32.h + + 3hlzBxH+5tucsVu7WCP+EHf1ZNQ= + + Headers/wally_bip38.h + + m/7N4ObnJOGQjBZ9hHVboJx8TPY= + + Headers/wally_bip39.h + + pY0ZRF0At1Vu7fGHodB6mGhVD7I= + + Headers/wally_core.h + + seiUhWWcj6qJ+Il5eDxUbejBbeQ= + + Headers/wally_crypto.h + + B0udWTEtiNOhnvIS/VQBv5+4XUw= + + Headers/wally_psbt.h + + x6NqCQukrAqAKjY+gsntLLZzDTQ= + + Headers/wally_script.h + + kBMBtp1goIC8KjDVAngeb+edtBM= + + Headers/wally_symmetric.h + + CFPOozsW5zllDdqapCky6XWoJb0= + + Headers/wally_transaction.h + + 08wXMmDUOUPHhuXqnCJCoSNxicI= + + Info.plist + + EOG+yIfzYrBo6J7qIrjSSgEAHBw= + + Modules/LibWally.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo + + K2ObW6qx9sKsiI7RTJw9XM9B5mw= + + Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo + + K2ObW6qx9sKsiI7RTJw9XM9B5mw= + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftdoc + + 5DMCFCUxGRGEE6Ne/x6Nzm38Zbw= + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftinterface + + a9//EHe9qzf1p46iCQua0iOQ0NI= + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftmodule + + Zs0zmSTvBoxt43Q+2D5jm+cjloU= + + Modules/LibWally.swiftmodule/arm64.swiftdoc + + 5DMCFCUxGRGEE6Ne/x6Nzm38Zbw= + + Modules/LibWally.swiftmodule/arm64.swiftinterface + + a9//EHe9qzf1p46iCQua0iOQ0NI= + + Modules/LibWally.swiftmodule/arm64.swiftmodule + + Zs0zmSTvBoxt43Q+2D5jm+cjloU= + + Modules/module.modulemap + + It/CyY7WGaBjUzOMBD5S22M4Fm0= + + + files2 + + Headers/LibWally-Swift.h + + hash2 + + SVKqMejW2WQ2UFIyDs33dNE8aTU5skMJzfysfVlZywY= + + + Headers/LibWally.h + + hash2 + + j7/fA96K6/+H8bxe5Eg0wexAd25wuvL+CfDmde8NW7s= + + + Headers/wally_address.h + + hash2 + + wku/+hr5ObKMDJz75zXnRDreIe7UrPEhfSYSc2Oo/Ik= + + + Headers/wally_bip32.h + + hash2 + + CgYuFa2OmebVeNhu+gT6GjIJVQJkpRSFMUGDVs7GXl0= + + + Headers/wally_bip38.h + + hash2 + + 7zvdn9yQ0aJ7w9/TvgR8YIRQlFJfzKVL0hmkgBD7Xwo= + + + Headers/wally_bip39.h + + hash2 + + 6SqKIylQuRCno1PLqkAdJxn/gvZ9C68FjEB1M+1P1zE= + + + Headers/wally_core.h + + hash2 + + PVNE7IfbO8+RjNUm9xUKMQep8RjqQ/QVbJqLqhzoAZE= + + + Headers/wally_crypto.h + + hash2 + + 5zenXTEnQGSACCrYyHqyCThKYXCsb+FWYmQ7oAiv2Ig= + + + Headers/wally_psbt.h + + hash2 + + t5LpDXsooGb4fCg5Zlv021briFJoTMA7QtM9GBWKtDw= + + + Headers/wally_script.h + + hash2 + + CD8tW99QIBfYGwwV9Jk9ZA8xj9/tJ7Cx66kl/OQ6k9c= + + + Headers/wally_symmetric.h + + hash2 + + H/OKOOUUfV8IwLG+KO0ns/IcDdcjh0gHHtNzF700L/o= + + + Headers/wally_transaction.h + + hash2 + + rf2NzVYEyxyPkHaHzvQpiVuP8QNcBL4NlAo+nRx40PU= + + + Modules/LibWally.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo + + hash2 + + Gl+wRKUSxfDR5SN19Rr+sRVAvqHyrXivKmcBmg9ENPk= + + + Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo + + hash2 + + Gl+wRKUSxfDR5SN19Rr+sRVAvqHyrXivKmcBmg9ENPk= + + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftdoc + + hash2 + + +O9sMybwz8rcKomBqPy8V5CDAIeV4JEiWtksGnHfZDM= + + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftinterface + + hash2 + + 9m7bNIC056GOwfu80lFkvi2kMpVhGfG7kf2KAuLdmTY= + + + Modules/LibWally.swiftmodule/arm64-apple-ios-simulator.swiftmodule + + hash2 + + SUyjILFY59FF2HjQR3YHtkBj9akmDdMeKVPcSs7wSGk= + + + Modules/LibWally.swiftmodule/arm64.swiftdoc + + hash2 + + +O9sMybwz8rcKomBqPy8V5CDAIeV4JEiWtksGnHfZDM= + + + Modules/LibWally.swiftmodule/arm64.swiftinterface + + hash2 + + 9m7bNIC056GOwfu80lFkvi2kMpVhGfG7kf2KAuLdmTY= + + + Modules/LibWally.swiftmodule/arm64.swiftmodule + + hash2 + + SUyjILFY59FF2HjQR3YHtkBj9akmDdMeKVPcSs7wSGk= + + + Modules/module.modulemap + + hash2 + + mH8nfUl2jx50BueZosMxnSoGPF46fKIBPKRe/Ziq8OI= + + + + rules + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally b/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally deleted file mode 100755 index a4cc5a78f..000000000 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/LibWally and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule b/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule deleted file mode 100644 index 8d54adae4..000000000 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-ios-macabi.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 8d54adae4..000000000 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/LibWally b/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/LibWally deleted file mode 100755 index ba35e1187..000000000 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/LibWally and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule deleted file mode 100644 index bb013848c..000000000 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index bb013848c..000000000 Binary files a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Modules/LibWally.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources b/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources deleted file mode 100644 index a0c7ebd7d..000000000 --- a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/_CodeSignature/CodeResources +++ /dev/null @@ -1,223 +0,0 @@ - - - - - files - - Headers/LibWally-Swift.h - - t/EwwvnFc9jtpzRci3JmQmNSlpg= - - Headers/LibWally.h - - c24FryZPBij5kiCsYwKSvuX4uYI= - - Info.plist - - ntDxYCxPoY8O1EPcO0h1lBF8Isw= - - Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo - - Jx8AjzSrJkUKXfCg4M0oEQPPZ6A= - - Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo - - Jx8AjzSrJkUKXfCg4M0oEQPPZ6A= - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - - R7N41MhUPUTYW7y5fBFJiPXxc50= - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - - S0rv//BCwfho1csYfsY8CsK7gJM= - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - - XpIJMGI++UlqNfUVKsG29g6aZNU= - - Modules/LibWally.swiftmodule/x86_64.swiftdoc - - R7N41MhUPUTYW7y5fBFJiPXxc50= - - Modules/LibWally.swiftmodule/x86_64.swiftinterface - - S0rv//BCwfho1csYfsY8CsK7gJM= - - Modules/LibWally.swiftmodule/x86_64.swiftmodule - - XpIJMGI++UlqNfUVKsG29g6aZNU= - - Modules/module.modulemap - - It/CyY7WGaBjUzOMBD5S22M4Fm0= - - - files2 - - Headers/LibWally-Swift.h - - hash2 - - ZMjcLfytAcvJn5Lx6cBXxW/+s/dwD79Gsd0QXE3Utp8= - - - Headers/LibWally.h - - hash2 - - RgATdNJyK5chmSnuGkvj0YduYA/setzK4HBontpS58U= - - - Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo - - hash2 - - DF0D32gUQwTU3E1/QLMeqtqxgiHAiegqRgjffLhcI0A= - - - Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo - - hash2 - - DF0D32gUQwTU3E1/QLMeqtqxgiHAiegqRgjffLhcI0A= - - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - - hash2 - - MoqPDsXJ8crH+5XXnlB5PT3pMgU+bYWD/EtZZuFIls0= - - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - - hash2 - - 6DmYaf+HPVIk6ct3n94EYKwoCCvVZkgqSOH2QNYAYDU= - - - Modules/LibWally.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - - hash2 - - v6NX8zOGv6oL2J20I03rWuMWGCE7AxeZzckNhTtm2H8= - - - Modules/LibWally.swiftmodule/x86_64.swiftdoc - - hash2 - - MoqPDsXJ8crH+5XXnlB5PT3pMgU+bYWD/EtZZuFIls0= - - - Modules/LibWally.swiftmodule/x86_64.swiftinterface - - hash2 - - 6DmYaf+HPVIk6ct3n94EYKwoCCvVZkgqSOH2QNYAYDU= - - - Modules/LibWally.swiftmodule/x86_64.swiftmodule - - hash2 - - v6NX8zOGv6oL2J20I03rWuMWGCE7AxeZzckNhTtm2H8= - - - Modules/module.modulemap - - hash2 - - mH8nfUl2jx50BueZosMxnSoGPF46fKIBPKRe/Ziq8OI= - - - - rules - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^.* - - ^.*\.lproj/ - - optional - - weight - 1000 - - ^.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Base\.lproj/ - - weight - 1010 - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Headers b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Headers similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Headers rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Headers diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/LibWally b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/LibWally similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/LibWally rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/LibWally diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Modules b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Modules similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Modules rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Modules diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Resources b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Resources similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Resources rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Resources diff --git a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h similarity index 98% rename from LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h index c6791aa34..21654ef5c 100644 --- a/LibWally.xcframework/ios-x86_64-simulator/LibWally.framework/Headers/LibWally-Swift.h +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally-Swift.h @@ -1,4 +1,6 @@ -// Generated by Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) +// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +#ifndef LIBWALLY_SWIFT_H +#define LIBWALLY_SWIFT_H #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -207,3 +209,4 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # pragma clang attribute pop #endif #pragma clang diagnostic pop +#endif diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally.h similarity index 63% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally.h index c8fce4e14..6e7b012f6 100644 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Headers/LibWally.h +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/LibWally.h @@ -14,3 +14,14 @@ FOUNDATION_EXPORT double LibWallyVersionNumber; FOUNDATION_EXPORT const unsigned char LibWallyVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import + +#import "wally_transaction.h" +#import "wally_address.h" +#import "wally_bip32.h" +#import "wally_bip38.h" +#import "wally_bip39.h" +#import "wally_core.h" +#import "wally_crypto.h" +#import "wally_psbt.h" +#import "wally_script.h" +#import "wally_symmetric.h" diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_address.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_address.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_address.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_address.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_bip32.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip32.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_bip32.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip32.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_bip38.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip38.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_bip38.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip38.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_bip39.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip39.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_bip39.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_bip39.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_core.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_core.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_core.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_core.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_crypto.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_crypto.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_crypto.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_crypto.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_psbt.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_psbt.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_psbt.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_psbt.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_script.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_script.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_script.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_script.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_symmetric.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_symmetric.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_symmetric.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_symmetric.h diff --git a/CLibWally.xcframework/macos-x86_64/Headers/wally_transaction.h b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_transaction.h similarity index 100% rename from CLibWally.xcframework/macos-x86_64/Headers/wally_transaction.h rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Headers/wally_transaction.h diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/LibWally b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/LibWally new file mode 100755 index 000000000..542e1bbed Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/LibWally differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo index 87e1edca6..99dc7f948 100644 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-ios-macabi.swiftsourceinfo and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo differ diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo index 87e1edca6..99dc7f948 100644 Binary files a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/arm64.swiftsourceinfo differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo index 31a9d1dec..791a18712 100644 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo similarity index 64% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo index 31a9d1dec..791a18712 100644 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo differ diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftdoc b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftdoc new file mode 100644 index 000000000..c075ebe0c Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftdoc differ diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftinterface b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftinterface new file mode 100644 index 000000000..e1272a7a7 --- /dev/null +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-macos11 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftmodule b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftmodule new file mode 100644 index 000000000..f17c23fa0 Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64-apple-macos.swiftmodule differ diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc new file mode 100644 index 000000000..c075ebe0c Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftdoc differ diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface new file mode 100644 index 000000000..e1272a7a7 --- /dev/null +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftinterface @@ -0,0 +1,326 @@ +// swift-interface-format-version: 1.0 +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target arm64-apple-macos11 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally +import Foundation +@_exported import LibWally +import Swift +public struct PSBTInput { + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public let signatures: [LibWally.PubKey : Foundation.Data]? + public let witnessScript: Foundation.Data? + public let isSegwit: Swift.Bool + public let amount: LibWally.Satoshi? + public func canSignOrigins(with hdKey: LibWally.HDKey) -> [LibWally.PubKey : LibWally.KeyOrigin]? + public func canSign(with hdKey: LibWally.HDKey) -> Swift.Bool +} +public struct LibWallyError : Foundation.LocalizedError { + public let description: Swift.String + public init(_ description: Swift.String) + public var errorDescription: Swift.String? { + get + } +} +public struct Transaction { + public let hash: Foundation.Data? + public let inputs: [LibWally.TxInput]? + public let outputs: [LibWally.TxOutput]? + public init(hex: Swift.String) throws + public init(inputs: [LibWally.TxInput], outputs: [LibWally.TxOutput]) + public var description: Swift.String? { + get + } + public var vbytes: Swift.Int? { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var feeRate: Swift.Float64? { + get + } + public func signed(with privKeys: [LibWally.HDKey]) throws -> LibWally.Transaction +} +public struct Key { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(wif: Swift.String, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public var wif: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } +} +public struct HDKey { + public init(base58: Swift.String, masterKeyFingerprint: Foundation.Data? = nil) throws + public init(seed: LibWally.BIP39Mnemonic.Seed, network: LibWally.Network = .mainnet) throws + public var network: LibWally.Network { + get + } + public var description: Swift.String { + get + } + public var isNeutered: Swift.Bool { + get + } + public var xpub: Swift.String { + get + } + public var pubKey: LibWally.PubKey { + get + } + public var privKey: LibWally.Key? { + get + } + public var xpriv: Swift.String? { + get + } + public var fingerprint: Foundation.Data { + get + } + public func derive(using path: LibWally.BIP32Path) throws -> LibWally.HDKey + public func address(type: LibWally.AddressType) -> LibWally.Address +} +extension Data { + @inlinable internal func withUnsafeByteBuffer(_ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } + } +} +@inlinable internal func withUnsafeByteBuffer(of value: T, _ body: (Swift.UnsafeBufferPointer) throws -> ResultType) rethrows -> ResultType { + try withUnsafeBytes(of: value) { rawBuf in + try body(rawBuf.bindMemory(to: UInt8.self)) + } +} +public struct PSBT : Swift.Equatable { + public let network: LibWally.Network + public let inputs: [LibWally.PSBTInput] + public let outputs: [LibWally.PSBTOutput] + public static func == (lhs: LibWally.PSBT, rhs: LibWally.PSBT) -> Swift.Bool + public init(psbt data: Foundation.Data, network: LibWally.Network) throws + public init(psbt string: Swift.String, network: LibWally.Network) throws + public var data: Foundation.Data { + get + } + public var description: Swift.String { + get + } + public var isComplete: Swift.Bool { + get + } + public var transaction: LibWally.Transaction { + get + } + public var fee: LibWally.Satoshi? { + get + } + public var transactionFinal: LibWally.Transaction? { + get + } + public func signed(with privKey: LibWally.Key) throws -> LibWally.PSBT + public func signed(with hdKey: LibWally.HDKey) throws -> LibWally.PSBT + public func finalized() throws -> LibWally.PSBT +} +public enum Network : Swift.Equatable { + case mainnet + case testnet + public static func == (a: LibWally.Network, b: LibWally.Network) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP32Path : Swift.Equatable { + public enum DerivationStep : Swift.Equatable { + case normal(Swift.UInt32) + case hardened(Swift.UInt32) + public var isHardened: Swift.Bool { + get + } + public static func == (a: LibWally.BIP32Path.DerivationStep, b: LibWally.BIP32Path.DerivationStep) -> Swift.Bool + } + public let components: [LibWally.BIP32Path.DerivationStep] + public let rawPath: [Swift.UInt32] + public let isRelative: Swift.Bool + public init(rawPath: [Swift.UInt32], isRelative: Swift.Bool) throws + public init(components: [LibWally.BIP32Path.DerivationStep], isRelative: Swift.Bool) throws + public init(component: LibWally.BIP32Path.DerivationStep, isRelative: Swift.Bool = true) throws + public init(index: Swift.Int, isRelative: Swift.Bool = true) throws + public init(string: Swift.String) throws + public var description: Swift.String { + get + } + public func chop(depth: Swift.Int) throws -> LibWally.BIP32Path + public static func == (a: LibWally.BIP32Path, b: LibWally.BIP32Path) -> Swift.Bool +} +public struct ScriptPubKey : Swift.Equatable { + public let data: Foundation.Data + public enum ScriptType { + case opReturn + case payToPubKeyHash + case payToScriptHash + case payToWitnessPubKeyHash + case payToWitnessScriptHash + case multiSig + public static func == (a: LibWally.ScriptPubKey.ScriptType, b: LibWally.ScriptPubKey.ScriptType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public var type: LibWally.ScriptPubKey.ScriptType? { + get + } + public init(hex: Swift.String) throws + public init(multisig pubKeys: [LibWally.PubKey], threshold: Swift.UInt, isBIP67: Swift.Bool = true) + public var description: Swift.String { + get + } + public init(_ data: Foundation.Data) + public var witnessProgram: Foundation.Data { + get + } + public static func == (a: LibWally.ScriptPubKey, b: LibWally.ScriptPubKey) -> Swift.Bool +} +public typealias Satoshi = Swift.UInt64 +public struct PSBTOutput : Swift.Identifiable { + public let txOutput: LibWally.TxOutput + public let origins: [LibWally.PubKey : LibWally.KeyOrigin]? + public var id: Swift.String { + get + } + public func isChange(signer: LibWally.HDKey, inputs: [LibWally.PSBTInput], cosigners: [LibWally.HDKey], threshold: Swift.UInt) -> Swift.Bool + public typealias ID = Swift.String +} +public struct TxOutput { + public let scriptPubKey: LibWally.ScriptPubKey + public var amount: LibWally.Satoshi + public let network: LibWally.Network + public var address: Swift.String? { + get + } + public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) + public func createWallyOutput() -> Swift.UnsafeMutablePointer +} +public struct Witness { + public let type: LibWally.Witness.WitnessType + public let signature: Foundation.Data + public let isDummy: Swift.Bool + public enum WitnessType { + case payToWitnessPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + } + public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) + public func createWallyStack() -> Swift.UnsafeMutablePointer + public init(type: LibWally.Witness.WitnessType) + public func signed(signature: Foundation.Data) -> LibWally.Witness + public var scriptCode: Foundation.Data { + get + } +} +public struct KeyOrigin : Swift.Equatable { + public let fingerprint: Foundation.Data + public let path: LibWally.BIP32Path + public static func == (a: LibWally.KeyOrigin, b: LibWally.KeyOrigin) -> Swift.Bool +} +public struct PubKey : Swift.Equatable, Swift.Hashable { + public let isCompressed: Swift.Bool + public let data: Foundation.Data + public let network: LibWally.Network + public init(_ data: Foundation.Data, network: LibWally.Network, isCompressed: Swift.Bool = true) throws + public static func == (a: LibWally.PubKey, b: LibWally.PubKey) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public struct BIP39Mnemonic : Swift.Equatable, Swift.CustomStringConvertible { + public let words: [Swift.String] + public var description: Swift.String { + get + } + public struct Entropy : Swift.Equatable, Swift.CustomStringConvertible { + public let data: Foundation.Data + public init(hex: Swift.String) throws + public init(_ data: Foundation.Data) + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Entropy, b: LibWally.BIP39Mnemonic.Entropy) -> Swift.Bool + } + public struct Seed : Swift.Equatable, Swift.CustomStringConvertible { + public init(hex: Swift.String) throws + public var description: Swift.String { + get + } + public static func == (a: LibWally.BIP39Mnemonic.Seed, b: LibWally.BIP39Mnemonic.Seed) -> Swift.Bool + } + public init(words: [Swift.String]) throws + public init(words: Swift.String) throws + public init(entropy: LibWally.BIP39Mnemonic.Entropy) throws + public var entropy: LibWally.BIP39Mnemonic.Entropy { + get + } + public func seedHex(passphrase: Swift.String? = nil) -> LibWally.BIP39Mnemonic.Seed + public static func == (a: LibWally.BIP39Mnemonic, b: LibWally.BIP39Mnemonic) -> Swift.Bool +} +public struct TxInput { + public let txHash: Foundation.Data + public let vout: Swift.UInt32 + public let sequence: Swift.UInt32 + public let amount: LibWally.Satoshi + public var scriptSig: LibWally.ScriptSig? + public var witness: LibWally.Witness? + public let scriptPubKey: LibWally.ScriptPubKey + public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws + public func createWallyInput() -> Swift.UnsafeMutablePointer + public var isSigned: Swift.Bool { + get + } +} +public enum AddressType { + case payToPubKeyHash + case payToScriptHashPayToWitnessPubKeyHash + case payToWitnessPubKeyHash + public static func == (a: LibWally.AddressType, b: LibWally.AddressType) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) +} +public protocol AddressProtocol { + var scriptPubKey: LibWally.ScriptPubKey { get } +} +public struct Address : LibWally.AddressProtocol { + public let network: LibWally.Network + public let scriptPubKey: LibWally.ScriptPubKey + public init(string: Swift.String) throws + public init(scriptPubKey: LibWally.ScriptPubKey, network: LibWally.Network) throws + public var description: Swift.String { + get + } +} +public struct ScriptSig { + public typealias Signature = Foundation.Data + public let type: LibWally.ScriptSig.ScriptSigType + public var signature: LibWally.ScriptSig.Signature? + public enum ScriptSigType : Swift.Equatable { + case payToPubKeyHash(LibWally.PubKey) + case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) + public static func == (a: LibWally.ScriptSig.ScriptSigType, b: LibWally.ScriptSig.ScriptSigType) -> Swift.Bool + } + public init(type: LibWally.ScriptSig.ScriptSigType) + public enum ScriptSigPurpose { + case signed + case feeWorstCase + public static func == (a: LibWally.ScriptSig.ScriptSigPurpose, b: LibWally.ScriptSig.ScriptSigPurpose) -> Swift.Bool + public var hashValue: Swift.Int { + get + } + public func hash(into hasher: inout Swift.Hasher) + } + public func render(purpose: LibWally.ScriptSig.ScriptSigPurpose) -> Foundation.Data? +} diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule new file mode 100644 index 000000000..f17c23fa0 Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/arm64.swiftmodule differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc similarity index 56% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc index 069d1bad8..ca57da690 100644 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface similarity index 95% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface index e4631d54d..8a5ab6bbe 100644 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-macos11 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule new file mode 100644 index 000000000..5a5eb6a4e Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc similarity index 56% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc index 069d1bad8..ca57da690 100644 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftdoc differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface similarity index 95% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface index e4631d54d..8a5ab6bbe 100644 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftinterface @@ -1,7 +1,6 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.2.2 (swiftlang-1103.0.32.6 clang-1103.0.32.51) -// swift-module-flags: -target x86_64-apple-macos10.15 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally -import CLibWally +// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// swift-module-flags: -target x86_64-apple-macos11 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -module-name LibWally import Foundation @_exported import LibWally import Swift @@ -204,7 +203,7 @@ public struct TxOutput { get } public init(scriptPubKey: LibWally.ScriptPubKey, amount: LibWally.Satoshi, network: LibWally.Network) - public func createWallyOutput() -> Swift.UnsafeMutablePointer + public func createWallyOutput() -> Swift.UnsafeMutablePointer } public struct Witness { public let type: LibWally.Witness.WitnessType @@ -215,7 +214,7 @@ public struct Witness { case payToScriptHashPayToWitnessPubKeyHash(LibWally.PubKey) } public init(type: LibWally.Witness.WitnessType, signature: Foundation.Data, isDummy: Swift.Bool = false) - public func createWallyStack() -> Swift.UnsafeMutablePointer + public func createWallyStack() -> Swift.UnsafeMutablePointer public init(type: LibWally.Witness.WitnessType) public func signed(signature: Foundation.Data) -> LibWally.Witness public var scriptCode: Foundation.Data { @@ -277,7 +276,7 @@ public struct TxInput { public var witness: LibWally.Witness? public let scriptPubKey: LibWally.ScriptPubKey public init(txHash: Foundation.Data, vout: Swift.UInt32, sequence: Swift.UInt32 = 0xffffffff, amount: LibWally.Satoshi, scriptSig: LibWally.ScriptSig?, witness: LibWally.Witness?, scriptPubKey: LibWally.ScriptPubKey) throws - public func createWallyInput() -> Swift.UnsafeMutablePointer + public func createWallyInput() -> Swift.UnsafeMutablePointer public var isSigned: Swift.Bool { get } diff --git a/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule new file mode 100644 index 000000000..5a5eb6a4e Binary files /dev/null and b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/module.modulemap b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/module.modulemap similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/module.modulemap rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Modules/module.modulemap diff --git a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Resources/Info.plist similarity index 81% rename from LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Resources/Info.plist index 492bb388b..92ee0c1a1 100644 --- a/LibWally.xcframework/ios-x86_64-maccatalyst/LibWally.framework/Versions/A/Resources/Info.plist +++ b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/A/Resources/Info.plist @@ -27,22 +27,20 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11E503a + 12C33 + DTPlatformName + macosx DTPlatformVersion - GM + 11.1 DTSDKBuild - 19E258 + 20C63 DTSDKName - macosx10.15 + macosx11.1 DTXcode - 1141 + 1230 DTXcodeBuild - 11E503a + 12C33 LSMinimumSystemVersion - 10.15 - UIDeviceFamily - - 2 - + 11 diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/Current b/LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/Current similarity index 100% rename from LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/Current rename to LibWally.xcframework/macos-arm64_x86_64/LibWally.framework/Versions/Current diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/LibWally b/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/LibWally deleted file mode 100755 index eb0ee0e85..000000000 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/LibWally and /dev/null differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule b/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule deleted file mode 100644 index 073871304..000000000 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule b/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 073871304..000000000 Binary files a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/Modules/LibWally.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/_CodeSignature/CodeResources b/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/_CodeSignature/CodeResources deleted file mode 100644 index 059e1e0a1..000000000 --- a/LibWally.xcframework/macos-x86_64/LibWally.framework/Versions/A/_CodeSignature/CodeResources +++ /dev/null @@ -1,205 +0,0 @@ - - - - - files - - Resources/Info.plist - - 0NCtXegki7dsUDLMS1HhnQTgVIs= - - - files2 - - Headers/LibWally-Swift.h - - hash2 - - ZMjcLfytAcvJn5Lx6cBXxW/+s/dwD79Gsd0QXE3Utp8= - - - Headers/LibWally.h - - hash2 - - RgATdNJyK5chmSnuGkvj0YduYA/setzK4HBontpS58U= - - - Modules/LibWally.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo - - hash2 - - KGoJG4q/w3rIGDsnzNNpIWInFl5qpyShyHv6lfE/icw= - - - Modules/LibWally.swiftmodule/Project/x86_64.swiftsourceinfo - - hash2 - - KGoJG4q/w3rIGDsnzNNpIWInFl5qpyShyHv6lfE/icw= - - - Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftdoc - - hash2 - - qxsQe6gijNw3NZDaUKq1I1NbCEqHNC1QrWamoSCiKRw= - - - Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftinterface - - hash2 - - hDi9NnGpfqfGKeDS5iQxjHtUjIBuH1HXLNfYfNP49o8= - - - Modules/LibWally.swiftmodule/x86_64-apple-macos.swiftmodule - - hash2 - - bI0rYmPIGy2A4J84AWv56QsrhM8hPus8HrI1kEe9mlE= - - - Modules/LibWally.swiftmodule/x86_64.swiftdoc - - hash2 - - qxsQe6gijNw3NZDaUKq1I1NbCEqHNC1QrWamoSCiKRw= - - - Modules/LibWally.swiftmodule/x86_64.swiftinterface - - hash2 - - hDi9NnGpfqfGKeDS5iQxjHtUjIBuH1HXLNfYfNP49o8= - - - Modules/LibWally.swiftmodule/x86_64.swiftmodule - - hash2 - - bI0rYmPIGy2A4J84AWv56QsrhM8hPus8HrI1kEe9mlE= - - - Modules/module.modulemap - - hash2 - - mH8nfUl2jx50BueZosMxnSoGPF46fKIBPKRe/Ziq8OI= - - - Resources/Info.plist - - hash2 - - TxoPo18gz3RM8Aev0Zaph/DCclPgRrO4/ZKNEkutkCE= - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/Tor-3.xcframework/Info.plist b/Tor-3.xcframework/Info.plist deleted file mode 100644 index de06f9831..000000000 --- a/Tor-3.xcframework/Info.plist +++ /dev/null @@ -1,53 +0,0 @@ - - - - - AvailableLibraries - - - LibraryIdentifier - ios-x86_64-maccatalyst - LibraryPath - Tor.framework - SupportedArchitectures - - x86_64 - - SupportedPlatform - ios - SupportedPlatformVariant - maccatalyst - - - LibraryIdentifier - ios-arm64 - LibraryPath - Tor.framework - SupportedArchitectures - - arm64 - - SupportedPlatform - ios - - - LibraryIdentifier - ios-x86_64-simulator - LibraryPath - Tor.framework - SupportedArchitectures - - x86_64 - - SupportedPlatform - ios - SupportedPlatformVariant - simulator - - - CFBundlePackageType - XFWK - XCFrameworkFormatVersion - 1.0 - - diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Info.plist b/Tor-3.xcframework/ios-arm64/Tor.framework/Info.plist deleted file mode 100644 index 36656acb5..000000000 Binary files a/Tor-3.xcframework/ios-arm64/Tor.framework/Info.plist and /dev/null differ diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Tor b/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Tor deleted file mode 100755 index 433de145d..000000000 Binary files a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Tor and /dev/null differ diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Info.plist b/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Info.plist deleted file mode 100644 index aa479eba5..000000000 Binary files a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Info.plist and /dev/null differ diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Tor b/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Tor deleted file mode 100755 index daef74dd3..000000000 Binary files a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Tor and /dev/null differ diff --git a/CLibWally.xcframework/Info.plist b/Tor.xcframework/Info.plist similarity index 74% rename from CLibWally.xcframework/Info.plist rename to Tor.xcframework/Info.plist index 83b368e6e..8ebf874ff 100644 --- a/CLibWally.xcframework/Info.plist +++ b/Tor.xcframework/Info.plist @@ -5,12 +5,10 @@ AvailableLibraries - HeadersPath - Headers LibraryIdentifier ios-arm64 LibraryPath - libwallycore.a + Tor.framework SupportedArchitectures arm64 @@ -19,30 +17,26 @@ ios - HeadersPath - Headers LibraryIdentifier - ios-x86_64-maccatalyst + macos-arm64_x86_64 LibraryPath - libwallycore.a + Tor.framework SupportedArchitectures + arm64 x86_64 SupportedPlatform - ios - SupportedPlatformVariant - maccatalyst + macos - HeadersPath - Headers LibraryIdentifier - ios-x86_64-simulator + ios-arm64_x86_64-simulator LibraryPath - libwallycore.a + Tor.framework SupportedArchitectures + arm64 x86_64 SupportedPlatform @@ -51,18 +45,19 @@ simulator - HeadersPath - Headers LibraryIdentifier - macos-x86_64 + ios-arm64_x86_64-maccatalyst LibraryPath - libwallycore.a + Tor.framework SupportedArchitectures + arm64 x86_64 SupportedPlatform - macos + ios + SupportedPlatformVariant + maccatalyst CFBundlePackageType diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORCircuit.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORCircuit.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORCircuit.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORCircuit.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORConfiguration.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORConfiguration.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORConfiguration.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORConfiguration.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORController.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORController.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORController.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORController.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORLogging.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORLogging.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORLogging.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORLogging.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORNode.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORNode.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORNode.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORNode.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORThread.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/TORThread.h similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/TORThread.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/TORThread.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h b/Tor.xcframework/ios-arm64/Tor.framework/Headers/Tor.h similarity index 61% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h rename to Tor.xcframework/ios-arm64/Tor.framework/Headers/Tor.h index b675cf9d4..cd7819303 100644 --- a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h +++ b/Tor.xcframework/ios-arm64/Tor.framework/Headers/Tor.h @@ -1,13 +1,18 @@ // -// Tor.h -// Tor -// -// Created by Conrad Kramer on 8/10/15. +// BCTor.h +// BCTor // +// Created by Wolf McNally on 1/10/21. // #import +//! Project version number for BCTor. +FOUNDATION_EXPORT double BCTorVersionNumber; + +//! Project version string for BCTor. +FOUNDATION_EXPORT const unsigned char BCTorVersionString[]; + #ifdef __cplusplus #define TOR_EXTERN extern "C" __attribute__((visibility ("default"))) #else diff --git a/Tor.xcframework/ios-arm64/Tor.framework/Info.plist b/Tor.xcframework/ios-arm64/Tor.framework/Info.plist new file mode 100644 index 000000000..2c406378c Binary files /dev/null and b/Tor.xcframework/ios-arm64/Tor.framework/Info.plist differ diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Modules/module.modulemap b/Tor.xcframework/ios-arm64/Tor.framework/Modules/module.modulemap similarity index 100% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Modules/module.modulemap rename to Tor.xcframework/ios-arm64/Tor.framework/Modules/module.modulemap diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Tor b/Tor.xcframework/ios-arm64/Tor.framework/Tor similarity index 60% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Tor rename to Tor.xcframework/ios-arm64/Tor.framework/Tor index 2edb70026..02e4a794d 100755 Binary files a/Tor-3.xcframework/ios-arm64/Tor.framework/Tor and b/Tor.xcframework/ios-arm64/Tor.framework/Tor differ diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Headers b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Headers similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Headers rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Headers diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Modules b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Modules similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Modules rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Modules diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Resources b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Resources similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Resources rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Resources diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Tor b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Tor similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Tor rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Tor diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORCircuit.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORCircuit.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORCircuit.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORCircuit.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORConfiguration.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORConfiguration.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORConfiguration.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORConfiguration.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORController.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORController.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORController.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORController.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORLogging.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORLogging.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORLogging.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORLogging.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORNode.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORNode.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORNode.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORNode.h diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORThread.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORThread.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORThread.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/TORThread.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/Tor.h b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h similarity index 61% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/Tor.h rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h index b675cf9d4..cd7819303 100644 --- a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/Tor.h +++ b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Headers/Tor.h @@ -1,13 +1,18 @@ // -// Tor.h -// Tor -// -// Created by Conrad Kramer on 8/10/15. +// BCTor.h +// BCTor // +// Created by Wolf McNally on 1/10/21. // #import +//! Project version number for BCTor. +FOUNDATION_EXPORT double BCTorVersionNumber; + +//! Project version string for BCTor. +FOUNDATION_EXPORT const unsigned char BCTorVersionString[]; + #ifdef __cplusplus #define TOR_EXTERN extern "C" __attribute__((visibility ("default"))) #else diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Modules/module.modulemap b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Modules/module.modulemap similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Modules/module.modulemap rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Modules/module.modulemap diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist similarity index 74% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist index a897ee2a7..56d9c2069 100644 --- a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist +++ b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Resources/Info.plist @@ -3,13 +3,13 @@ BuildMachineOSBuild - 19G2021 + 19E242d CFBundleDevelopmentRegion en CFBundleExecutable Tor CFBundleIdentifier - org.torproject.Tor + blockchaincommons.BCTor CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -17,31 +17,31 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 403.6.1 - CFBundleSignature - ???? + 1.0 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 69896.510039050 + 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11E801a + 12C33 + DTPlatformName + macosx DTPlatformVersion - GM + 11.1 DTSDKBuild - 19G68 + 20C63 DTSDKName - macosx10.15 + macosx11.1 DTXcode - 1170 + 1230 DTXcodeBuild - 11E801a + 12C33 LSMinimumSystemVersion - 10.15 + 11.0 UIDeviceFamily 2 diff --git a/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Tor b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Tor new file mode 100755 index 000000000..3f2a2a2fe Binary files /dev/null and b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/A/Tor differ diff --git a/Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/Current b/Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/Current similarity index 100% rename from Tor-3.xcframework/ios-x86_64-maccatalyst/Tor.framework/Versions/Current rename to Tor.xcframework/ios-arm64_x86_64-maccatalyst/Tor.framework/Versions/Current diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORCircuit.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORCircuit.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORCircuit.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORCircuit.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORConfiguration.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORConfiguration.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORConfiguration.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORConfiguration.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORController.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORController.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORController.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORController.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORLogging.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORLogging.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORLogging.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORLogging.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORNode.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORNode.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORNode.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORNode.h diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORThread.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORThread.h similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Headers/TORThread.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/TORThread.h diff --git a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/Tor.h b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/Tor.h similarity index 61% rename from Tor-3.xcframework/ios-arm64/Tor.framework/Headers/Tor.h rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/Tor.h index b675cf9d4..cd7819303 100644 --- a/Tor-3.xcframework/ios-arm64/Tor.framework/Headers/Tor.h +++ b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Headers/Tor.h @@ -1,13 +1,18 @@ // -// Tor.h -// Tor -// -// Created by Conrad Kramer on 8/10/15. +// BCTor.h +// BCTor // +// Created by Wolf McNally on 1/10/21. // #import +//! Project version number for BCTor. +FOUNDATION_EXPORT double BCTorVersionNumber; + +//! Project version string for BCTor. +FOUNDATION_EXPORT const unsigned char BCTorVersionString[]; + #ifdef __cplusplus #define TOR_EXTERN extern "C" __attribute__((visibility ("default"))) #else diff --git a/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Info.plist b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Info.plist new file mode 100644 index 000000000..97237483f Binary files /dev/null and b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Info.plist differ diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Modules/module.modulemap b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Modules/module.modulemap similarity index 100% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/Modules/module.modulemap rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Modules/module.modulemap diff --git a/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Tor b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Tor new file mode 100755 index 000000000..c27049798 Binary files /dev/null and b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/Tor differ diff --git a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/_CodeSignature/CodeResources b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/_CodeSignature/CodeResources similarity index 83% rename from Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/_CodeSignature/CodeResources rename to Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/_CodeSignature/CodeResources index 78714aa74..2d4eee3b8 100644 --- a/Tor-3.xcframework/ios-x86_64-simulator/Tor.framework/_CodeSignature/CodeResources +++ b/Tor.xcframework/ios-arm64_x86_64-simulator/Tor.framework/_CodeSignature/CodeResources @@ -30,11 +30,11 @@ Headers/Tor.h - 19Lq5QXkpZ9nW/TGeGYBiNMUKPs= + TST3OEKcyV3GjbdHXoCaEaddrUQ= Info.plist - UAUeb//4BhAeYxZcpsxOrY3HABY= + mGYVR3hEhJHi2pkIuIlrpAZxYTI= Modules/module.modulemap @@ -45,10 +45,6 @@ Headers/TORCircuit.h - hash - - 4ttOoTI1PQIqNVQL6PB7D5e3Zx8= - hash2 GP5jH7+o8JinV5rtLnRekkwyvBTXdLjp6QRb0pV+wGI= @@ -56,10 +52,6 @@ Headers/TORConfiguration.h - hash - - X+q11iVYfVUX4SWPawSPFCziTKU= - hash2 AwIoBfcY1dy3qJ8E1wbjW4fXLt+cpsCQAYU5qMjzrr0= @@ -67,10 +59,6 @@ Headers/TORController.h - hash - - RmzSS4gu+kga5fUIi2stmoTCcug= - hash2 vNU4G7UsqPvypkCffnZCEtASEhDt11mfYxzXswLvxOI= @@ -78,10 +66,6 @@ Headers/TORLogging.h - hash - - XjfOObd0K54yX9v6EEuULCvsXpM= - hash2 Esou6YMro6Kdn0ccZAt9F2bUNAcXV9VimY3OUYb/dfo= @@ -89,10 +73,6 @@ Headers/TORNode.h - hash - - L9BalNqBmKTSEKJIFQAKuNXCMPk= - hash2 1qFwhsi+ZyMDjMeD8nr5mxmNida2gLcx2OuRmi8iucw= @@ -100,10 +80,6 @@ Headers/TORThread.h - hash - - CnwTqQwdQFqrEZNHHpuq+rUNByY= - hash2 1jPUFS2cbJMQ9g9bb0hVnRYadS8k0LNISIxitVTzCDQ= @@ -111,21 +87,13 @@ Headers/Tor.h - hash - - 19Lq5QXkpZ9nW/TGeGYBiNMUKPs= - hash2 - jAaBplbfUj9xaXaxF5qwtoVGtYajYpfCkq0qfA54emk= + S5a7i7ldsYUey5euI7cinlQgBIXM7FSp+fCwn32JZQk= Modules/module.modulemap - hash - - jfsg6+ggymRqQvxisvUBPZHim0U= - hash2 yeZULOAu2MiW4CAPp3DTXTqEoB+fjIKykCLCRdWRsPQ= diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Headers b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Headers new file mode 120000 index 000000000..a177d2a6b --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Modules b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Modules new file mode 120000 index 000000000..5736f3186 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Modules @@ -0,0 +1 @@ +Versions/Current/Modules \ No newline at end of file diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Resources b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Tor b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Tor new file mode 120000 index 000000000..3388cbced --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Tor @@ -0,0 +1 @@ +Versions/Current/Tor \ No newline at end of file diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORCircuit.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORCircuit.h new file mode 100644 index 000000000..a2fadff10 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORCircuit.h @@ -0,0 +1,358 @@ +// +// TORCircuit.h +// Tor +// +// Created by Benjamin Erhart on 11.12.19. +// +// Documentation this class is modelled after: +// https://torproject.gitlab.io/torspec/control-spec.html#circuit-status-changed + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(TorCircuit) +@interface TORCircuit : NSObject + +/** + Regular expression to identify and extract ID, status and circuit path consisting of "LongNames". + + Syntax of node "LongNames": + https://torproject.gitlab.io/torspec/control-spec.html#general-use-tokens + */ +@property (class, readonly) NSRegularExpression *mainInfoRegex; + +/** + - Tag: statusLaunched + Circuit ID assigned to new circuit. + */ +@property (class, readonly) NSString *statusLaunched; + +/** + All hops finished, can now accept streams. + */ +@property (class, readonly) NSString *statusBuilt; + +/** + All hops finished, waiting to see if a circuit with a better guard will be usable. + */ +@property (class, readonly) NSString *statusGuardWait; + +/** + One more hop has been completed. + */ +@property (class, readonly) NSString *statusExtended; + +/** + Circuit closed (was not built). + */ +@property (class, readonly) NSString *statusFailed; + +/** + Circuit closed (was built). + */ +@property (class, readonly) NSString *statusClosed; + +/** + One-hop circuit, used for tunneled directory conns. + */ +@property (class, readonly) NSString *buildFlagOneHopTunnel; + +/** + Internal circuit, not to be used for exiting streams. + */ +@property (class, readonly) NSString *buildFlagIsInternal; + +/** + This circuit must use only high-capacity nodes. + */ +@property (class, readonly) NSString *buildFlagNeedCapacity; + +/** + This circuit must use only high-uptime nodes. + */ +@property (class, readonly) NSString *buildFlagNeedUptime; + +/** + Circuit for AP and/or directory request streams. + */ +@property (class, readonly) NSString *purposeGeneral; + +/** + HS client-side introduction-point circuit. + */ +@property (class, readonly) NSString *purposeHsClientIntro; + +/** + HS client-side rendezvous circuit; carries AP streams. + */ +@property (class, readonly) NSString *purposeHsClientRend; + +/** + HS service-side introduction-point circuit. + */ +@property (class, readonly) NSString *purposeHsServiceIntro; + +/** + HS service-side rendezvous circuit. + */ +@property (class, readonly) NSString *purposeHsServiceRend; + +/** + Reachability-testing circuit; carries no traffic. + */ +@property (class, readonly) NSString *purposeTesting; + +/** + Circuit built by a controller. + */ +@property (class, readonly) NSString *purposeController; + +/** + Circuit being kept around to see how long it takes. + */ +@property (class, readonly) NSString *purposeMeasureTimeout; + +/** + Client-side introduction-point circuit state: Connecting to intro point. + */ +@property (class, readonly) NSString *hsStateHsciConnecting; + +/** + Client-side introduction-point circuit state: Sent INTRODUCE1; waiting for reply from IP. + */ +@property (class, readonly) NSString *hsStateHsciIntroSent; + +/** + Client-side introduction-point circuit state: Received reply from IP relay; closing. + */ +@property (class, readonly) NSString *hsStateHsciDone; + +/** + Client-side rendezvous-point circuit state: Connecting to or waiting for reply from RP. + */ +@property (class, readonly) NSString *hsStateHscrConnecting; + +/** + Client-side rendezvous-point circuit state: Established RP; waiting for introduction. + */ +@property (class, readonly) NSString *hsStateHscrEstablishedIdle; + +/** + Client-side rendezvous-point circuit state: Introduction sent to HS; waiting for rend. + */ +@property (class, readonly) NSString *hsStateHscrEstablishedWaiting; + +/** +Client-side rendezvous-point circuit state: Connected to HS. +*/ +@property (class, readonly) NSString *hsStateHscrJoined; + +/** + Service-side introduction-point circuit state: Connecting to intro point. + */ +@property (class, readonly) NSString *hsStateHssiConnecting; + +/** + Service-side introduction-point circuit state: Established intro point. + */ +@property (class, readonly) NSString *hsStateHssiEstablished; + +/** + Service-side rendezvous-point circuit state: Connecting to client's rend point. + */ +@property (class, readonly) NSString *hsStateHssrConnecting; + +/** + Service-side rendezvous-point circuit state: Connected to client's RP circuit. + */ +@property (class, readonly) NSString *hsStateHssrJoined; + +/** + No reason given. + */ +@property (class, readonly) NSString *reasonNone; + +/** + Tor protocol violation. + */ +@property (class, readonly) NSString *reasonTorProtocol; + +/** + Internal error. + */ +@property (class, readonly) NSString *reasonInternal; + +/** + A client sent a TRUNCATE command. + */ +@property (class, readonly) NSString *reasonRequested; + +/** + Not currently operating; trying to save bandwidth. + */ +@property (class, readonly) NSString *reasonHibernating; + +/** + Out of memory, sockets, or circuit IDs. + */ +@property (class, readonly) NSString *reasonResourceLimit; + +/** + Unable to reach relay. + */ +@property (class, readonly) NSString *reasonConnectFailed; + +/** + Connected to relay, but its OR identity was not as expected. + */ +@property (class, readonly) NSString *reasonOrIdentity; + +/** + The OR connection that was carrying this circuit died. + */ +@property (class, readonly) NSString *reasonOrConnClosed; + +/** + Circuit construction took too long. + */ +@property (class, readonly) NSString *reasonTimeout; + +/** + The circuit has expired for being dirty or old. + */ +@property (class, readonly) NSString *reasonFinished; + +/** + The circuit was destroyed w/o client TRUNCATE. + */ +@property (class, readonly) NSString *reasonDestroyed; + +/** + Not enough nodes to make circuit. + */ +@property (class, readonly) NSString *reasonNoPath; + +/** + Request for unknown hidden service. + */ +@property (class, readonly) NSString *reasonNoSuchService; + +/** + As @c reasonTimeout, except that we had left the circuit open for measurement purposes to see how long it would take to finish. + */ +@property (class, readonly) NSString *reasonMeasurementExpired; + + +/** + The raw data this object is constructed from. The unchanged argument from @c initFromString:. + */ +@property (readonly, nullable) NSString *raw; + +/** +The circuit ID. Currently only numbers beginning with "1" but Tor spec says, that could change. + */ +@property (readonly, nullable) NSString *circuitId; + +/** + The circuit status. Should be one of @c statusLaunched, @c statusBuilt, @c statusGuardWait, + @c statusExtended, @c statusFailed or @c statusClosed . + */ +@property (readonly, nullable) NSString *status; + +/** + The circuit path as a list of @c TORNode objects. + */ +@property (readonly, nullable) NSArray *nodes; + +/** + Build flags of the circuit. Can be any of @c buildFlagOneHopTunnel, @c buildFlagIsInternal, + @c buildFlagNeedCapacity, @c buildFlagNeedUptime or a flag which was unknown at the time of + writing of this class. +*/ +@property (readonly, nullable) NSArray *buildFlags; + +/** + Circuit purpose. May be one of @c purposeGeneral, @c purposeHsClientIntro, + @c purposeHsClientRend, @c purposeHsServiceIntro, @c purposeHsServiceRend, + @c purposeTesting, @c purposeController or, @c purposeMeasureTimeout. + */ +@property (readonly, nullable) NSString *purpose; + +/** + Circuit hidden service state. May be one of @c hsStateHsciConnecting, @c hsStateHsciIntroSent, + @c hsStateHsciDone, @c hsStateHscrConnecting, @c hsStateHscrEstablishedIdle, + @c hsStateHscrEstablishedWaiting, @c hsStateHscrJoined, @c hsStateHssiConnecting, + @c hsStateHssiEstablished, @c hsStateHssrConnecting, @c hsStateHssrJoined + or a state which was unknown at the time of writing of this class. + */ +@property (readonly, nullable) NSString *hsState; + +/** + The rendevouz query. + + Should be equal the onion address this circuit was used for minus the @c .onion postfix. + */ +@property (readonly, nullable) NSString *rendQuery; + +/** + The circuit's timestamp at which the circuit was created or cannibalized. + */ +@property (readonly, nullable) NSDate *timeCreated; + +/** + The @c reason field is provided only for @c FAILED and @c CLOSED events, and only if + extended events are enabled. + + May be any one of @c reasonNone, @c reasonTorProtocol, @c reasonInternal, + @c reasonRequested, @c reasonHibernating, @c reasonResourceLimit, + @c reasonConnectFailed, @c reasonOrIdentity, @c reasonOrConnClosed, + @c reasonTimeout, @c reasonFinished, @c reasonDestroyed, @c reasonNoPath, + @c reasonNoSuchService, @c reasonMeasurementExpired or a reason which was unknown at the + time of writing of this class. + */ +@property (readonly, nullable) NSString *reason; + +/** + The @c remoteReason field is provided only when we receive a @c DESTROY or @c TRUNCATE cell, and + only if extended events are enabled. It contains the actual reason given by the remote OR for closing the circuit. + + May be any one of @c reasonNone, @c reasonTorProtocol, @c reasonInternal, + @c reasonRequested, @c reasonHibernating, @c reasonResourceLimit, + @c reasonConnectFailed, @c reasonOrIdentity, @c reasonOrConnClosed, + @c reasonTimeout, @c reasonFinished, @c reasonDestroyed, @c reasonNoPath, + @c reasonNoSuchService, @c reasonMeasurementExpired or a reason which was unknown at the + time of writing of this class. + */ +@property (readonly, nullable) NSString *remoteReason; + +/** + The @c socksUsername and @c socksPassword fields indicate the credentials that were used by a + SOCKS client to connect to Tor’s SOCKS port and initiate this circuit. + */ +@property (readonly, nullable) NSString *socksUsername; + +/** +The @c socksUsername and @c socksPassword fields indicate the credentials that were used by a +SOCKS client to connect to Tor’s SOCKS port and initiate this circuit. +*/ +@property (readonly, nullable) NSString *socksPassword; + + +/** +Extracts all circuit info from a string which should be the response to a "GETINFO circuit-status". + +See https://torproject.gitlab.io/torspec/control-spec.html#getinfo + +@param circuits: A string as returned by "GETINFO circuit-status". +*/ ++ (NSArray *)circuitsFromString:(NSString *)circuitsString; + + +- (instancetype)initFromString:(NSString *)circuitString; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORConfiguration.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORConfiguration.h new file mode 100644 index 000000000..8b1ace1ff --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORConfiguration.h @@ -0,0 +1,25 @@ +// +// TORConfiguration.h +// Tor +// +// Created by Conrad Kramer on 8/10/15. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(TorConfiguration) +@interface TORConfiguration : NSObject + +@property (nonatomic, copy, nullable) NSURL *dataDirectory; +@property (nonatomic, copy, nullable) NSURL *controlSocket; +@property (nonatomic, copy, nullable) NSURL *socksURL; +@property (nonatomic, copy, nullable) NSNumber *cookieAuthentication; + +@property (nonatomic, copy, null_resettable) NSDictionary *options; +@property (nonatomic, copy, null_resettable) NSArray *arguments; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORController.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORController.h new file mode 100644 index 000000000..0a554039a --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORController.h @@ -0,0 +1,93 @@ +// +// TORController.h +// Tor +// +// Created by Conrad Kramer on 5/10/14. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef BOOL (^TORObserverBlock)(NSArray *codes, NSArray *lines, BOOL *stop); + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000 || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 +TOR_EXTERN NSErrorDomain const TORControllerErrorDomain; +#else +TOR_EXTERN NSString * const TORControllerErrorDomain; +#endif + +NS_SWIFT_NAME(TorController) +@interface TORController : NSObject + +@property (nonatomic, readonly, copy) NSOrderedSet *events; +@property (nonatomic, readonly, getter=isConnected) BOOL connected; + +- (instancetype)init NS_UNAVAILABLE; +- (instancetype)initWithSocketURL:(NSURL *)url NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithSocketHost:(NSString *)host port:(in_port_t)port NS_DESIGNATED_INITIALIZER; + +- (BOOL)connect:(out NSError **)error; +- (void)disconnect; + +// Commands +- (void)authenticateWithData:(NSData *)data completion:(void (^__nullable)(BOOL success, NSError * __nullable error))completion; +- (void)resetConfForKey:(NSString *)key completion:(void (^__nullable)(BOOL success, NSError * __nullable error))completion; +- (void)setConfForKey:(NSString *)key withValue:(NSString *)value completion:(void (^__nullable)(BOOL success, NSError * __nullable error))completion; +- (void)setConfs:(NSArray *)configs completion:(void (^__nullable)(BOOL success, NSError * __nullable error))completion; +- (void)listenForEvents:(NSArray *)events completion:(void (^__nullable)(BOOL success, NSError * __nullable error))completion; +- (void)getInfoForKeys:(NSArray *)keys completion:(void (^)(NSArray *values))completion; // TODO: Provide errors +- (void)getSessionConfiguration:(void (^)(NSURLSessionConfiguration * __nullable configuration))completion; +- (void)sendCommand:(NSString *)command arguments:(nullable NSArray *)arguments data:(nullable NSData *)data observer:(TORObserverBlock)observer; + +/** + Get a list of all currently available circuits with detailed information about their nodes. + + @note There's no clear way to determine, which circuit actually was used by a specific request. + + @param completion: The callback upon completion of the task. + @param circuits: A list of `TORCircuit`s . Empty if no circuit could be found. + */ +- (void)getCircuits:(void (^)(NSArray * _Nonnull circuits))completion; + +/** + Resets the Tor connection: Sends "SIGNAL RELOAD" and "SIGNAL NEWNYM" to the Tor thread. + + See https://torproject.gitlab.io/torspec/control-spec.html#signal + + @param completion: Completion callback. + @param success: true, if signal calls where successful, false if not. + */ +- (void)resetConnection:(void (^__nullable)(BOOL success))completion; + +/** + Try to close a list of circuits identified by their IDs. + + If some closings weren't successful, the most obvious reason would be, that the circuit with the given + ID doesn't exist (anymore). So in many circumstances, you can still consider that an ok outcome. + + @param circuitIds: List of circuit IDs. + @param completion: Completion callback. + @param success: true, if *all* closings were successful, false, if *at least one* closing failed. + */ +- (void)closeCircuitsByIds:(NSArray *)circuitIds completion:(void (^__nullable)(BOOL success))completion; + +/** + Try to close a list of given circuits. + + The given circuits are invalid afterwards, as you just closed them. You should throw them away on completion. + +@param circuits: List of circuits to close. +@param completion: Completion callback. +@param success: true, if *all* closings were successful, false, if *at least one* closing failed. +*/ +- (void)closeCircuits:(NSArray *)circuits completion:(void (^__nullable)(BOOL success))completion; + +// Observers +- (id)addObserverForCircuitEstablished:(void (^)(BOOL established))block; +- (id)addObserverForStatusEvents:(BOOL (^)(NSString *type, NSString *severity, NSString *action, NSDictionary * __nullable arguments))block; +- (void)removeObserver:(nullable id)observer; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORLogging.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORLogging.h new file mode 100644 index 000000000..078d55022 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORLogging.h @@ -0,0 +1,23 @@ +// +// TORLogging.h +// Tor +// +// Created by Benjamin Erhart on 9/9/17. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef void(* tor_log_cb)(os_log_type_t severity, const char* msg); + +extern void TORInstallEventLogging(void); + +extern void TORInstallEventLoggingCallback(tor_log_cb cb); + +extern void TORInstallTorLogging(void); + +extern void TORInstallTorLoggingCallback(tor_log_cb cb); + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORNode.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORNode.h new file mode 100644 index 000000000..e6cb9e039 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORNode.h @@ -0,0 +1,79 @@ +// +// TORNode.h +// Tor +// +// Created by Benjamin Erhart on 09.12.19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(TorNode) +@interface TORNode : NSObject + +/** +Regular expression to identify and extract a valid IPv4 address. + +Taken from https://nbviewer.jupyter.org/github/rasbt/python_reference/blob/master/tutorials/useful_regex.ipynb +*/ +@property (class, nonatomic, readonly) NSRegularExpression *ipv4Regex; + +/** +Regular expression to identify and extract a valid IPv6 address. + +Taken from https://nbviewer.jupyter.org/github/rasbt/python_reference/blob/master/tutorials/useful_regex.ipynb +*/ +@property (class, nonatomic, readonly) NSRegularExpression *ipv6Regex; + +/** + The fingerprint aka. ID of a Tor node. + */ +@property (nonatomic, nullable) NSString *fingerprint; + +/** + The nickname of a Tor node. + */ +@property (nonatomic, nullable) NSString *nickName; + +/** + The IPv4 address of a Tor node. + */ +@property (nonatomic, nullable) NSString *ipv4Address; + +/** + The IPv6 address of a Tor node. + */ +@property (nonatomic, nullable) NSString *ipv6Address; + +/** + The country code of a Tor node's country. + */ +@property (nonatomic, nullable) NSString *countryCode; + +/** + The localized country name of a Tor node's country. + */ +@property (nonatomic, readonly, nullable) NSString *localizedCountryName; + +/** + Create a `TORNode` object from a "LongName" node string which should contain the fingerprint and the nickname. + + See https://torproject.gitlab.io/torspec/control-spec.html#general-use-tokens + + @param longName: A "LongName" identifying a Tor node. + */ +- (instancetype)initFromString:(NSString *)longName; + +/** + Acquires IPv4 and IPv6 addresses from the given string. + + See https://torproject.gitlab.io/torspec/control-spec.html#getinfo + + @param response: Should be the response of a `ns/id/` call. + */ +- (void)acquireIpAddressesFromNsResponse:(NSString *)response; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORThread.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORThread.h new file mode 100644 index 000000000..d40b91f13 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/TORThread.h @@ -0,0 +1,28 @@ +// +// TORThread.h +// Tor +// +// Created by Conrad Kramer on 7/19/15. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@class TORConfiguration; + +NS_SWIFT_NAME(TorThread) +@interface TORThread : NSThread + +#if __has_feature(objc_class_property) +@property (class, readonly, nullable) TORThread *activeThread; +#else ++ (nullable TORThread *)activeThread; +#endif + +- (instancetype)initWithConfiguration:(nullable TORConfiguration *)configuration; +- (instancetype)initWithArguments:(nullable NSArray *)arguments NS_DESIGNATED_INITIALIZER; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/Tor.h b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/Tor.h new file mode 100644 index 000000000..cd7819303 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Headers/Tor.h @@ -0,0 +1,27 @@ +// +// BCTor.h +// BCTor +// +// Created by Wolf McNally on 1/10/21. +// + +#import + +//! Project version number for BCTor. +FOUNDATION_EXPORT double BCTorVersionNumber; + +//! Project version string for BCTor. +FOUNDATION_EXPORT const unsigned char BCTorVersionString[]; + +#ifdef __cplusplus +#define TOR_EXTERN extern "C" __attribute__((visibility ("default"))) +#else +#define TOR_EXTERN extern __attribute__((visibility ("default"))) +#endif + +#import +#import +#import +#import +#import +#import diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Modules/module.modulemap b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Modules/module.modulemap new file mode 100644 index 000000000..5bca7e860 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Tor { + umbrella header "Tor.h" + + export * + module * { export * } +} diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Resources/Info.plist b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..ade397ff8 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,46 @@ + + + + + BuildMachineOSBuild + 19E242d + CFBundleDevelopmentRegion + en + CFBundleExecutable + Tor + CFBundleIdentifier + blockchaincommons.BCTor + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Tor + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 1 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 12C33 + DTPlatformName + macosx + DTPlatformVersion + 11.1 + DTSDKBuild + 20C63 + DTSDKName + macosx11.1 + DTXcode + 1230 + DTXcodeBuild + 12C33 + LSMinimumSystemVersion + 11 + + diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Tor b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Tor new file mode 100755 index 000000000..310baa95e Binary files /dev/null and b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/A/Tor differ diff --git a/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/Current b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/Tor.xcframework/macos-arm64_x86_64/Tor.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file