Skip to content

Commit

Permalink
Merge pull request #252 from Fonta1n3/v1.1.2
Browse files Browse the repository at this point in the history 
V1.1.2
  • Loading branch information
@Fonta1n3
Fonta1n3 authored Jul 11, 2024
2 parents c3f2431 + d745288 commit 6531b6f
Show file tree
Hide file tree
Showing 30 changed files with 1,184 additions and 514 deletions.
57 changes: 37 additions & 20 deletions FullyNoded.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,15 @@
0A6B365B27B1AA0C00CD4F3A /* AddressInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6B365A27B1AA0B00CD4F3A /* AddressInfo.swift */; };
0A6B365D27B2020F00CD4F3A /* JMUtxo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6B365C27B2020F00CD4F3A /* JMUtxo.swift */; };
0A6B365F27BD94CB00CD4F3A /* JMTx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6B365E27BD94CA00CD4F3A /* JMTx.swift */; };
0A6E59832C3C6AB4007750F2 /* URKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0A6E59822C3C6AB4007750F2 /* URKit */; };
0A6E59862C3CFE00007750F2 /* Bbqr in Frameworks */ = {isa = PBXBuildFile; productRef = 0A6E59852C3CFE00007750F2 /* Bbqr */; };
0A6EF69B294E30F300D30E93 /* StreamManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A6EF69A294E30F300D30E93 /* StreamManager.swift */; };
0A77138426AD9C5E005CC23D /* BlindPsbt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A77138326AD9C5E005CC23D /* BlindPsbt.swift */; };
0A77138626AE5E85005CC23D /* WalletInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A77138526AE5E85005CC23D /* WalletInfo.swift */; };
0A8850FE2A41FB040078A603 /* secp256k1 in Frameworks */ = {isa = PBXBuildFile; productRef = 0A8850FD2A41FB040078A603 /* secp256k1 */; };
0A8850FF2A4201C10078A603 /* LibWally.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD438842A41F7F90004F923 /* LibWally.xcframework */; };
0A8851002A4201C10078A603 /* LibWally.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0AD438842A41F7F90004F923 /* LibWally.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
0A9FDC9126A84CE30050C4AE /* WalletTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9FDC9026A84CE30050C4AE /* WalletTypes.swift */; };
0AB0B694290C374F00A1C201 /* URKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0AB0B693290C374F00A1C201 /* URKit */; };
0AD8AD5029FF45B200F1ADD8 /* InvoiceSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AD8AD4F29FF45B200F1ADD8 /* InvoiceSettingsViewController.swift */; };
0AD9490A273C051B00AF83F5 /* ExternalFNWalletsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AD94909273C051B00AF83F5 /* ExternalFNWalletsViewController.swift */; };
0AE19ED725F4AC0D000F0AD4 /* WalletRecoveryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE19ED625F4AC0D000F0AD4 /* WalletRecoveryViewController.swift */; };
Expand Down Expand Up @@ -396,8 +397,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0AB0B694290C374F00A1C201 /* URKit in Frameworks */,
0A6E59832C3C6AB4007750F2 /* URKit in Frameworks */,
0A8850FE2A41FB040078A603 /* secp256k1 in Frameworks */,
0A6E59862C3CFE00007750F2 /* Bbqr in Frameworks */,
D06D788C25B817B500769157 /* LifeHash in Frameworks */,
0AF73248291AF7D9009F6296 /* RNCryptor in Frameworks */,
0A8850FF2A4201C10078A603 /* LibWally.xcframework in Frameworks */,
Expand Down Expand Up @@ -1017,9 +1019,10 @@
name = FullyNoded;
packageProductDependencies = (
D06D788B25B817B500769157 /* LifeHash */,
0AB0B693290C374F00A1C201 /* URKit */,
0AF73247291AF7D9009F6296 /* RNCryptor */,
0A8850FD2A41FB040078A603 /* secp256k1 */,
0A6E59822C3C6AB4007750F2 /* URKit */,
0A6E59852C3CFE00007750F2 /* Bbqr */,
);
productName = BitSense;
productReference = D00B9A242111427200E8B95A /* FullyNoded.app */;
Expand Down Expand Up @@ -1093,9 +1096,10 @@
mainGroup = D00B9A1B2111427200E8B95A;
packageReferences = (
D06D788A25B817B500769157 /* XCRemoteSwiftPackageReference "LifeHash" */,
0AB0B692290C374F00A1C201 /* XCRemoteSwiftPackageReference "URKit" */,
0AF73246291AF7D9009F6296 /* XCRemoteSwiftPackageReference "RNCryptor" */,
0A8850FC2A41FB030078A603 /* XCRemoteSwiftPackageReference "secp256k1.swift" */,
0A6E59812C3C6AB4007750F2 /* XCRemoteSwiftPackageReference "URKit" */,
0A6E59842C3CFE00007750F2 /* XCRemoteSwiftPackageReference "bbqr-swift" */,
);
productRefGroup = D00B9A252111427200E8B95A /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1534,12 +1538,12 @@
INFOPLIST_KEY_CFBundleDisplayName = "Fully Noded";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.484;
MARKETING_VERSION = 1.487;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.fontaine.FullyNoded;
"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = com.fontaine.fullynodedmacos;
Expand Down Expand Up @@ -1581,12 +1585,12 @@
INFOPLIST_KEY_CFBundleDisplayName = "Fully Noded";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_PREPROCESS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.484;
MARKETING_VERSION = 1.487;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.fontaine.FullyNoded;
"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = com.fontaine.fullynodedmacos;
Expand Down Expand Up @@ -1684,19 +1688,27 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
0A8850FC2A41FB030078A603 /* XCRemoteSwiftPackageReference "secp256k1.swift" */ = {
0A6E59812C3C6AB4007750F2 /* XCRemoteSwiftPackageReference "URKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/jb55/secp256k1.swift.git";
repositoryURL = "https://github.com/BlockchainCommons/URKit.git";
requirement = {
branch = main;
kind = branch;
kind = upToNextMajorVersion;
minimumVersion = 14.0.2;
};
};
0AB0B692290C374F00A1C201 /* XCRemoteSwiftPackageReference "URKit" */ = {
0A6E59842C3CFE00007750F2 /* XCRemoteSwiftPackageReference "bbqr-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/bitcoinppl/bbqr-swift.git";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.3.1;
};
};
0A8850FC2A41FB030078A603 /* XCRemoteSwiftPackageReference "secp256k1.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Fonta1n3/URKit";
repositoryURL = "https://github.com/jb55/secp256k1.swift.git";
requirement = {
branch = master;
branch = main;
kind = branch;
};
};
Expand All @@ -1719,16 +1731,21 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
0A6E59822C3C6AB4007750F2 /* URKit */ = {
isa = XCSwiftPackageProductDependency;
package = 0A6E59812C3C6AB4007750F2 /* XCRemoteSwiftPackageReference "URKit" */;
productName = URKit;
};
0A6E59852C3CFE00007750F2 /* Bbqr */ = {
isa = XCSwiftPackageProductDependency;
package = 0A6E59842C3CFE00007750F2 /* XCRemoteSwiftPackageReference "bbqr-swift" */;
productName = Bbqr;
};
0A8850FD2A41FB040078A603 /* secp256k1 */ = {
isa = XCSwiftPackageProductDependency;
package = 0A8850FC2A41FB030078A603 /* XCRemoteSwiftPackageReference "secp256k1.swift" */;
productName = secp256k1;
};
0AB0B693290C374F00A1C201 /* URKit */ = {
isa = XCSwiftPackageProductDependency;
package = 0AB0B692290C374F00A1C201 /* XCRemoteSwiftPackageReference "URKit" */;
productName = URKit;
};
0AF73247291AF7D9009F6296 /* RNCryptor */ = {
isa = XCSwiftPackageProductDependency;
package = 0AF73246291AF7D9009F6296 /* XCRemoteSwiftPackageReference "RNCryptor" */;
Expand Down
62 changes: 58 additions & 4 deletions FullyNoded.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"originHash" : "80d738e01d019027b7e2198930ba90237b181310c1fceceb2bbaca0d1aae4117",
"originHash" : "dbc57cb905ea6d2c86cdcb51ff9b9cf19432f8eab192b534539f6a1f065226c0",
"pins" : [
{
"identity" : "bbqr-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/bitcoinppl/bbqr-swift.git",
"state" : {
"revision" : "83b828077ecc4f5d2cf8889da5543a61b4a60a3c",
"version" : "0.3.1"
}
},
{
"identity" : "bc-lifehash",
"kind" : "remoteSourceControl",
Expand All @@ -10,6 +19,33 @@
"version" : "0.4.1"
}
},
{
"identity" : "bcswiftdcbor",
"kind" : "remoteSourceControl",
"location" : "https://github.com/BlockchainCommons/BCSwiftDCBOR",
"state" : {
"revision" : "922746297fe733019b42b9083275eb2837296a7d",
"version" : "1.0.5"
}
},
{
"identity" : "bcswiftfloat16",
"kind" : "remoteSourceControl",
"location" : "https://github.com/blockchaincommons/BCSwiftFloat16",
"state" : {
"revision" : "71f380285d88a876f9cdf4e34e2e9e77d7ca4aef",
"version" : "1.0.0"
}
},
{
"identity" : "bcswifttags",
"kind" : "remoteSourceControl",
"location" : "https://github.com/BlockchainCommons/BCSwiftTags",
"state" : {
"revision" : "edb94b337d03e01c871db895c65d8fd3b6d43c9c",
"version" : "0.1.2"
}
},
{
"identity" : "lifehash",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -37,13 +73,31 @@
"revision" : "40b4b38b3b1c83f7088c76189a742870e0ca06a9"
}
},
{
"identity" : "swift-collections",
"kind" : "remoteSourceControl",
"location" : "https://github.com/wolfmcnally/swift-collections",
"state" : {
"revision" : "53a8adc54374f620002a3b6401d39e0feb3c57ae",
"version" : "1.1.0"
}
},
{
"identity" : "swift-numberkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/wolfmcnally/swift-numberkit.git",
"state" : {
"revision" : "34a26297c200489779929b7fd7d4d30b63e87e69",
"version" : "2.4.3"
}
},
{
"identity" : "urkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Fonta1n3/URKit",
"location" : "https://github.com/BlockchainCommons/URKit.git",
"state" : {
"branch" : "master",
"revision" : "1d74d3e758130ac7e20f9b66221866928c81ef96"
"revision" : "c98261c7b2db42ccfbbba0853379826b86aaffc4",
"version" : "14.0.2"
}
}
],
Expand Down
Loading

0 comments on commit 6531b6f

Please sign in to comment.