Switch back to upstream libwally-swift

Sjors · Jan 8, 2020 · 7f31392 · 7f31392
1 parent 93758f7
commit 7f31392
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 35 deletions.
diff --git a/NthKey.xcodeproj/project.pbxproj b/NthKey.xcodeproj/project.pbxproj
@@ -24,7 +24,6 @@
 		A27D4BFA23A2BA1A0055B0B8 /* BitcoinCoreImport.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27D4BF923A2BA1A0055B0B8 /* BitcoinCoreImport.swift */; };
 		A27D4BFC23A2BECC0055B0B8 /* BitcoinCoreImportTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A27D4BFB23A2BECC0055B0B8 /* BitcoinCoreImportTests.swift */; };
 		A285870623AD0B0300930566 /* psbt-128.png in Resources */ = {isa = PBXBuildFile; fileRef = A285870523AD0B0300930566 /* psbt-128.png */; };
-		A285870923AD1AE200930566 /* PSBTOutput.swift in Sources */ = {isa = PBXBuildFile; fileRef = A285870823AD1AE200930566 /* PSBTOutput.swift */; };
 		A285870D23AD31C600930566 /* Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = A285870C23AD31C600930566 /* Destination.swift */; };
 		A29DAAC12391657F006B38D9 /* KeychainEntropyItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A29DAAC02391657F006B38D9 /* KeychainEntropyItem.swift */; };
 		A29DAAC3239180CC006B38D9 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A29DAAC2239180CC006B38D9 /* README.md */; };
@@ -87,7 +86,6 @@
 		A27D4BF923A2BA1A0055B0B8 /* BitcoinCoreImport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitcoinCoreImport.swift; sourceTree = "<group>"; };
 		A27D4BFB23A2BECC0055B0B8 /* BitcoinCoreImportTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitcoinCoreImportTests.swift; sourceTree = "<group>"; };
 		A285870523AD0B0300930566 /* psbt-128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "psbt-128.png"; sourceTree = "<group>"; };
-		A285870823AD1AE200930566 /* PSBTOutput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PSBTOutput.swift; sourceTree = "<group>"; };
 		A285870C23AD31C600930566 /* Destination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Destination.swift; sourceTree = "<group>"; };
 		A29DAAC02391657F006B38D9 /* KeychainEntropyItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainEntropyItem.swift; sourceTree = "<group>"; };
 		A29DAAC2239180CC006B38D9 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
@@ -191,7 +189,6 @@
 			children = (
 				A285870423AD0AF800930566 /* Artwork */,
 				A29DAAC2239180CC006B38D9 /* README.md */,
-				A285870723AD1ACC00930566 /* Extensions */,
 				A27180B323A2939A00E9F443 /* Model */,
 				A27180B423A293BC00E9F443 /* View */,
 				A206E804238D65F300786824 /* AppDelegate.swift */,
@@ -269,14 +266,6 @@
 			path = Artwork;
 			sourceTree = "<group>";
 		};
-		A285870723AD1ACC00930566 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				A285870823AD1AE200930566 /* PSBTOutput.swift */,
-			);
-			path = Extensions;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -523,7 +512,6 @@
 				A206E805238D65F300786824 /* AppDelegate.swift in Sources */,
 				A206E807238D65F300786824 /* SceneDelegate.swift in Sources */,
 				A206E80C238D65F300786824 /* ContentView.swift in Sources */,
-				A285870923AD1AE200930566 /* PSBTOutput.swift in Sources */,
 				A27D4BF823A2B7040055B0B8 /* UserDefaultsManager.swift in Sources */,
 				A27D4BF623A2B4F30055B0B8 /* SettingsView.swift in Sources */,
 				A2C8546023B157F2008E4AA1 /* PSBTManager.swift in Sources */,

diff --git a/NthKey/Extensions/PSBTOutput.swift b/NthKey/Extensions/PSBTOutput.swift
diff --git a/Podfile b/Podfile
@@ -5,7 +5,7 @@ target 'NthKey' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
 
-  pod 'LibWally', :git => 'https://github.com/sjors/LibWally-Swift.git', :branch => 'dev', :submodules => true
+  pod 'LibWally', :git => 'https://github.com/blockchain/LibWally-Swift.git', :submodules => true
   pod 'OutputDescriptors', :git => 'https://github.com/sjors/output-descriptors-swift.git', :tag => "v0.0.1"
 
   target 'NthKeyTests' do

diff --git a/Podfile.lock b/Podfile.lock
@@ -3,22 +3,21 @@ PODS:
   - OutputDescriptors (0.0.1)
 
 DEPENDENCIES:
-  - LibWally (from `https://github.com/sjors/LibWally-Swift.git`, branch `dev`)
+  - LibWally (from `https://github.com/blockchain/LibWally-Swift.git`)
   - OutputDescriptors (from `https://github.com/sjors/output-descriptors-swift.git`, tag `v0.0.1`)
 
 EXTERNAL SOURCES:
   LibWally:
-    :branch: dev
-    :git: https://github.com/sjors/LibWally-Swift.git
+    :git: https://github.com/blockchain/LibWally-Swift.git
     :submodules: true
   OutputDescriptors:
     :git: https://github.com/sjors/output-descriptors-swift.git
     :tag: v0.0.1
 
 CHECKOUT OPTIONS:
   LibWally:
-    :commit: 108aa89a410a4baa702084775620a3cb7d577ef4
-    :git: https://github.com/sjors/LibWally-Swift.git
+    :commit: b981f29b8f519e47b0f857f3ae67e19ccb7beacd
+    :git: https://github.com/blockchain/LibWally-Swift.git
     :submodules: true
   OutputDescriptors:
     :git: https://github.com/sjors/output-descriptors-swift.git
@@ -28,6 +27,6 @@ SPEC CHECKSUMS:
   LibWally: 37b7c926e9aa02cc7d4c5a2a2a3a4f8925ea5038
   OutputDescriptors: 700e55b31d3997fb2bf6d9d84f6172ac17a3d573
 
-PODFILE CHECKSUM: 78445aaf8828dc3585fc34c67f604e3a7781db01
+PODFILE CHECKSUM: 28356c2863737004c5c6459e16ada5f04aac5fb8
 
 COCOAPODS: 1.8.4