From f3150072f5cafd53fa064b7cfc80ef3a84460fb2 Mon Sep 17 00:00:00 2001
From: Francisco Gindre <francisco.gindre@gmail.com>
Date: Fri, 4 Mar 2022 17:09:39 -0300
Subject: [PATCH 1/3] Expose property nullProgress for ECC Reference Wallet

Update podspec

Changelog

bump swift version

use libzcashlc 0.0.2
---
 .../Service/LightWalletGRPCService.swift                    | 4 ++++
 .../ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift  | 6 ------
 ZcashLightClientKit.podspec                                 | 6 +++---
 changelog.md                                                | 2 ++
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Sources/ZcashLightClientKit/Service/LightWalletGRPCService.swift b/Sources/ZcashLightClientKit/Service/LightWalletGRPCService.swift
index 87adb34e..dacd8e71 100644
--- a/Sources/ZcashLightClientKit/Service/LightWalletGRPCService.swift
+++ b/Sources/ZcashLightClientKit/Service/LightWalletGRPCService.swift
@@ -83,6 +83,10 @@ public struct BlockProgress: Equatable {
     }
 }
 
+public extension BlockProgress {
+    static let nullProgress = BlockProgress(startHeight: 0, targetHeight: 0, progressHeight: 0)
+}
+
 public class LightWalletGRPCService {
     let channel: Channel
     let connectionManager: ConnectionStatusManager
diff --git a/Sources/ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift b/Sources/ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift
index d3d61a91..a2f7fa17 100644
--- a/Sources/ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift
+++ b/Sources/ZcashLightClientKit/Synchronizer/SDKSynchronizer.swift
@@ -921,12 +921,6 @@ extension ConnectionState {
     }
 }
 
-extension BlockProgress {
-    static var nullProgress: Self {
-        return .init(startHeight: 0, targetHeight: 0, progressHeight: 0)
-    }
-}
-
 private struct NullEnhancementProgress: EnhancementProgress {
     var totalTransactions: Int { 0 }
     var enhancedTransactions: Int { 0 }
diff --git a/ZcashLightClientKit.podspec b/ZcashLightClientKit.podspec
index 8be6dad5..e0b02940 100644
--- a/ZcashLightClientKit.podspec
+++ b/ZcashLightClientKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'ZcashLightClientKit'
-    s.version          = '0.13.0-beta.1'
+    s.version          = '0.13.0-beta.2'
     s.summary          = 'Zcash Light Client wallet SDK for iOS'
   
     s.description      = <<-DESC
@@ -16,11 +16,11 @@ Pod::Spec.new do |s|
     s.source           = { :git => 'https://github.com/zcash/ZcashLightClientKit.git', :tag => s.version.to_s }
 
     s.source_files = 'Sources/ZcashLightClientKit/**/*.{swift,h}'
-    s.swift_version = '5.4'
+    s.swift_version = '5.5'
     s.ios.deployment_target = '12.0'
     s.dependency 'gRPC-Swift', '= 1.0.0'
     s.dependency 'SQLite.swift', '~> 0.12.2' 
-    s.dependency 'libzcashlc', '0.0.1'
+    s.dependency 'libzcashlc', '0.0.2'
     s.static_framework = true
 
 end
diff --git a/changelog.md b/changelog.md
index 26d3df0c..7bdf6108 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+# 0.13.0-beta.2
+- [Enhancement] Fix: make BlockProgress `.nullProgress` static property public for ECC Reference Wallet CombineSynchonizer 
 # 0.13.0-beta.1
 - [Enhancement] PR #338. Rust-less build. Check for new documentation on how to benefit from this huge change
 - [Enhancement] Swift Package Manager Support!

From 42d1797c73c3fe10773a8fa412f1eea9b99adb1a Mon Sep 17 00:00:00 2001
From: Francisco Gindre <francisco.gindre@gmail.com>
Date: Fri, 11 Mar 2022 16:28:16 -0300
Subject: [PATCH 2/3] Update README.md: remove private Spec Repo installation
 step.

---
 README.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 86ad394d..89818538 100644
--- a/README.md
+++ b/README.md
@@ -24,14 +24,7 @@ Add a package with the source "https://github.com/zcash/ZcashLightClientKit.git"
 
 ## Cocoapods Support
 
-1. Add the following to the top of your podfile to resolve downstream dependencies.
-
-```ruby
-source "https://github.com/dh-ecc/CocoaPodsSpecs.git"
-source "https://cdn.cocoapods.org/"
-```
-
-2. Add `pod "ZcashLightClientKit", ~> "0.13.0"` to the target you want to add the kit too.
+Add `pod "ZcashLightClientKit", ~> "0.13.0"` to the target you want to add the kit too.
 
 # Testing
 

From dd4724055fb5b635084a7a95d8482deac7f20afc Mon Sep 17 00:00:00 2001
From: Francisco Gindre <francisco.gindre@gmail.com>
Date: Fri, 11 Mar 2022 18:37:19 -0300
Subject: [PATCH 3/3] increase timeout of build step

---
 .github/workflows/swift.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 31040232..bacbfb7f 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
       timeout-minutes: 1
     - name: Build ZcashLightClientKit Swift Package
-      timeout-minutes: 10
+      timeout-minutes: 15
       run: swift build -v
     - name: Run OfflineTests suite
       timeout-minutes: 5