diff --git a/Package.resolved b/Package.resolved
index fb896e91..4145e366 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/grpc/grpc-swift.git",
         "state": {
           "branch": null,
-          "revision": "5cc08ebf77e68598bfe4c793927d0f2838598607",
-          "version": "1.6.1"
+          "revision": "466cc881f1760ed8c0e685900ed62dab7846a571",
+          "version": "1.8.0"
         }
       },
       {
@@ -51,8 +51,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "6e94a7be32891d1b303a3fcfde8b5bf64d162e74",
-          "version": "1.19.1"
+          "revision": "108ac15087ea9b79abb6f6742699cf31de0e8772",
+          "version": "1.22.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824",
-          "version": "1.18.0"
+          "revision": "e1499bc69b9040b29184f7f2996f7bab467c1639",
+          "version": "1.19.0"
         }
       },
       {
diff --git a/Package.swift b/Package.swift
index c8a5640f..6c6019d6 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.0.0"),
+        .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.8.0"),
         .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.13.0"),
         .package(name:"libzcashlc", url: "https://github.com/zcash-hackworks/zcash-light-client-ffi.git", from: "0.0.3"),
     ],
diff --git a/Sources/ZcashLightClientKit/Service/ProtoBuf/compact_formats.pb.swift b/Sources/ZcashLightClientKit/Service/ProtoBuf/compact_formats.pb.swift
index ca943bab..8897fd3b 100644
--- a/Sources/ZcashLightClientKit/Service/ProtoBuf/compact_formats.pb.swift
+++ b/Sources/ZcashLightClientKit/Service/ProtoBuf/compact_formats.pb.swift
@@ -40,16 +40,16 @@ struct CompactBlock {
   var height: UInt64 = 0
 
   /// the ID (hash) of this block, same as in block explorers
-  var hash: Data = Data()
+  var hash: Data = SwiftProtobuf.Internal.emptyData
 
   /// the ID (hash) of this block's predecessor
-  var prevHash: Data = Data()
+  var prevHash: Data = SwiftProtobuf.Internal.emptyData
 
   /// Unix epoch time when the block was mined
   var time: UInt32 = 0
 
   /// (hash, prevHash, and time) OR (full header)
-  var header: Data = Data()
+  var header: Data = SwiftProtobuf.Internal.emptyData
 
   /// zero or more compact transactions from this block
   var vtx: [CompactTx] = []
@@ -71,7 +71,7 @@ struct CompactTx {
   var index: UInt64 = 0
 
   /// the ID (hash) of this transaction, same as in block explorers
-  var hash: Data = Data()
+  var hash: Data = SwiftProtobuf.Internal.emptyData
 
   /// The transaction fee: present if server can provide. In the case of a
   /// stateless server and a transaction with transparent inputs, this will be
@@ -99,7 +99,7 @@ struct CompactSpend {
   // methods supported on all messages.
 
   /// nullifier (see the Zcash protocol specification)
-  var nf: Data = Data()
+  var nf: Data = SwiftProtobuf.Internal.emptyData
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -114,13 +114,13 @@ struct CompactOutput {
   // methods supported on all messages.
 
   /// note commitment u-coordinate
-  var cmu: Data = Data()
+  var cmu: Data = SwiftProtobuf.Internal.emptyData
 
   /// ephemeral public key
-  var epk: Data = Data()
+  var epk: Data = SwiftProtobuf.Internal.emptyData
 
   /// ciphertext and zkproof
-  var ciphertext: Data = Data()
+  var ciphertext: Data = SwiftProtobuf.Internal.emptyData
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -145,17 +145,14 @@ extension CompactBlock: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularUInt32Field(value: &self.protoVersion) }()
-      case 2: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self.hash) }()
-      case 4: try { try decoder.decodeSingularBytesField(value: &self.prevHash) }()
-      case 5: try { try decoder.decodeSingularUInt32Field(value: &self.time) }()
-      case 6: try { try decoder.decodeSingularBytesField(value: &self.header) }()
-      case 7: try { try decoder.decodeRepeatedMessageField(value: &self.vtx) }()
+      case 1: try decoder.decodeSingularUInt32Field(value: &self.protoVersion)
+      case 2: try decoder.decodeSingularUInt64Field(value: &self.height)
+      case 3: try decoder.decodeSingularBytesField(value: &self.hash)
+      case 4: try decoder.decodeSingularBytesField(value: &self.prevHash)
+      case 5: try decoder.decodeSingularUInt32Field(value: &self.time)
+      case 6: try decoder.decodeSingularBytesField(value: &self.header)
+      case 7: try decoder.decodeRepeatedMessageField(value: &self.vtx)
       default: break
       }
     }
@@ -211,15 +208,12 @@ extension CompactTx: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularUInt64Field(value: &self.index) }()
-      case 2: try { try decoder.decodeSingularBytesField(value: &self.hash) }()
-      case 3: try { try decoder.decodeSingularUInt32Field(value: &self.fee) }()
-      case 4: try { try decoder.decodeRepeatedMessageField(value: &self.spends) }()
-      case 5: try { try decoder.decodeRepeatedMessageField(value: &self.outputs) }()
+      case 1: try decoder.decodeSingularUInt64Field(value: &self.index)
+      case 2: try decoder.decodeSingularBytesField(value: &self.hash)
+      case 3: try decoder.decodeSingularUInt32Field(value: &self.fee)
+      case 4: try decoder.decodeRepeatedMessageField(value: &self.spends)
+      case 5: try decoder.decodeRepeatedMessageField(value: &self.outputs)
       default: break
       }
     }
@@ -263,11 +257,8 @@ extension CompactSpend: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularBytesField(value: &self.nf) }()
+      case 1: try decoder.decodeSingularBytesField(value: &self.nf)
       default: break
       }
     }
@@ -297,13 +288,10 @@ extension CompactOutput: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularBytesField(value: &self.cmu) }()
-      case 2: try { try decoder.decodeSingularBytesField(value: &self.epk) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self.ciphertext) }()
+      case 1: try decoder.decodeSingularBytesField(value: &self.cmu)
+      case 2: try decoder.decodeSingularBytesField(value: &self.epk)
+      case 3: try decoder.decodeSingularBytesField(value: &self.ciphertext)
       default: break
       }
     }
diff --git a/Sources/ZcashLightClientKit/Service/ProtoBuf/service.pb.swift b/Sources/ZcashLightClientKit/Service/ProtoBuf/service.pb.swift
index d94abce4..13e8e800 100644
--- a/Sources/ZcashLightClientKit/Service/ProtoBuf/service.pb.swift
+++ b/Sources/ZcashLightClientKit/Service/ProtoBuf/service.pb.swift
@@ -33,7 +33,7 @@ struct BlockID {
 
   var height: UInt64 = 0
 
-  var hash: Data = Data()
+  var hash: Data = SwiftProtobuf.Internal.emptyData
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -95,7 +95,7 @@ struct TxFilter {
   var index: UInt64 = 0
 
   /// transaction ID (hash, txid)
-  var hash: Data = Data()
+  var hash: Data = SwiftProtobuf.Internal.emptyData
 
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
@@ -112,7 +112,7 @@ struct RawTransaction {
   // methods supported on all messages.
 
   /// exact data returned by Zcash 'getrawtransaction'
-  var data: Data = Data()
+  var data: Data = SwiftProtobuf.Internal.emptyData
 
   /// height that the transaction was mined (or -1)
   var height: UInt64 = 0
@@ -367,11 +367,11 @@ struct GetAddressUtxosReply {
 
   var address: String = String()
 
-  var txid: Data = Data()
+  var txid: Data = SwiftProtobuf.Internal.emptyData
 
   var index: Int32 = 0
 
-  var script: Data = Data()
+  var script: Data = SwiftProtobuf.Internal.emptyData
 
   var valueZat: Int64 = 0
 
@@ -407,12 +407,9 @@ extension BlockID: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
-      case 2: try { try decoder.decodeSingularBytesField(value: &self.hash) }()
+      case 1: try decoder.decodeSingularUInt64Field(value: &self.height)
+      case 2: try decoder.decodeSingularBytesField(value: &self.hash)
       default: break
       }
     }
@@ -445,12 +442,9 @@ extension BlockRange: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularMessageField(value: &self._start) }()
-      case 2: try { try decoder.decodeSingularMessageField(value: &self._end) }()
+      case 1: try decoder.decodeSingularMessageField(value: &self._start)
+      case 2: try decoder.decodeSingularMessageField(value: &self._end)
       default: break
       }
     }
@@ -484,13 +478,10 @@ extension TxFilter: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularMessageField(value: &self._block) }()
-      case 2: try { try decoder.decodeSingularUInt64Field(value: &self.index) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self.hash) }()
+      case 1: try decoder.decodeSingularMessageField(value: &self._block)
+      case 2: try decoder.decodeSingularUInt64Field(value: &self.index)
+      case 3: try decoder.decodeSingularBytesField(value: &self.hash)
       default: break
       }
     }
@@ -527,12 +518,9 @@ extension RawTransaction: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularBytesField(value: &self.data) }()
-      case 2: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
+      case 1: try decoder.decodeSingularBytesField(value: &self.data)
+      case 2: try decoder.decodeSingularUInt64Field(value: &self.height)
       default: break
       }
     }
@@ -565,12 +553,9 @@ extension SendResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt32Field(value: &self.errorCode) }()
-      case 2: try { try decoder.decodeSingularStringField(value: &self.errorMessage) }()
+      case 1: try decoder.decodeSingularInt32Field(value: &self.errorCode)
+      case 2: try decoder.decodeSingularStringField(value: &self.errorMessage)
       default: break
       }
     }
@@ -653,24 +638,21 @@ extension LightdInfo: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementatio
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.version) }()
-      case 2: try { try decoder.decodeSingularStringField(value: &self.vendor) }()
-      case 3: try { try decoder.decodeSingularBoolField(value: &self.taddrSupport) }()
-      case 4: try { try decoder.decodeSingularStringField(value: &self.chainName) }()
-      case 5: try { try decoder.decodeSingularUInt64Field(value: &self.saplingActivationHeight) }()
-      case 6: try { try decoder.decodeSingularStringField(value: &self.consensusBranchID) }()
-      case 7: try { try decoder.decodeSingularUInt64Field(value: &self.blockHeight) }()
-      case 8: try { try decoder.decodeSingularStringField(value: &self.gitCommit) }()
-      case 9: try { try decoder.decodeSingularStringField(value: &self.branch) }()
-      case 10: try { try decoder.decodeSingularStringField(value: &self.buildDate) }()
-      case 11: try { try decoder.decodeSingularStringField(value: &self.buildUser) }()
-      case 12: try { try decoder.decodeSingularUInt64Field(value: &self.estimatedHeight) }()
-      case 13: try { try decoder.decodeSingularStringField(value: &self.zcashdBuild) }()
-      case 14: try { try decoder.decodeSingularStringField(value: &self.zcashdSubversion) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.version)
+      case 2: try decoder.decodeSingularStringField(value: &self.vendor)
+      case 3: try decoder.decodeSingularBoolField(value: &self.taddrSupport)
+      case 4: try decoder.decodeSingularStringField(value: &self.chainName)
+      case 5: try decoder.decodeSingularUInt64Field(value: &self.saplingActivationHeight)
+      case 6: try decoder.decodeSingularStringField(value: &self.consensusBranchID)
+      case 7: try decoder.decodeSingularUInt64Field(value: &self.blockHeight)
+      case 8: try decoder.decodeSingularStringField(value: &self.gitCommit)
+      case 9: try decoder.decodeSingularStringField(value: &self.branch)
+      case 10: try decoder.decodeSingularStringField(value: &self.buildDate)
+      case 11: try decoder.decodeSingularStringField(value: &self.buildUser)
+      case 12: try decoder.decodeSingularUInt64Field(value: &self.estimatedHeight)
+      case 13: try decoder.decodeSingularStringField(value: &self.zcashdBuild)
+      case 14: try decoder.decodeSingularStringField(value: &self.zcashdSubversion)
       default: break
       }
     }
@@ -751,12 +733,9 @@ extension TransparentAddressBlockFilter: SwiftProtobuf.Message, SwiftProtobuf._M
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.address) }()
-      case 2: try { try decoder.decodeSingularMessageField(value: &self._range) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.address)
+      case 2: try decoder.decodeSingularMessageField(value: &self._range)
       default: break
       }
     }
@@ -788,11 +767,8 @@ extension Duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt64Field(value: &self.intervalUs) }()
+      case 1: try decoder.decodeSingularInt64Field(value: &self.intervalUs)
       default: break
       }
     }
@@ -821,12 +797,9 @@ extension PingResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementat
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt64Field(value: &self.entry) }()
-      case 2: try { try decoder.decodeSingularInt64Field(value: &self.exit) }()
+      case 1: try decoder.decodeSingularInt64Field(value: &self.entry)
+      case 2: try decoder.decodeSingularInt64Field(value: &self.exit)
       default: break
       }
     }
@@ -858,11 +831,8 @@ extension Address: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.address) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.address)
       default: break
       }
     }
@@ -890,11 +860,8 @@ extension AddressList: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementati
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeRepeatedStringField(value: &self.addresses) }()
+      case 1: try decoder.decodeRepeatedStringField(value: &self.addresses)
       default: break
       }
     }
@@ -922,11 +889,8 @@ extension Balance: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt64Field(value: &self.valueZat) }()
+      case 1: try decoder.decodeSingularInt64Field(value: &self.valueZat)
       default: break
       }
     }
@@ -954,11 +918,8 @@ extension Exclude: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeRepeatedBytesField(value: &self.txid) }()
+      case 1: try decoder.decodeRepeatedBytesField(value: &self.txid)
       default: break
       }
     }
@@ -990,15 +951,12 @@ extension TreeState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.network) }()
-      case 2: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
-      case 3: try { try decoder.decodeSingularStringField(value: &self.hash) }()
-      case 4: try { try decoder.decodeSingularUInt32Field(value: &self.time) }()
-      case 5: try { try decoder.decodeSingularStringField(value: &self.tree) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.network)
+      case 2: try decoder.decodeSingularUInt64Field(value: &self.height)
+      case 3: try decoder.decodeSingularStringField(value: &self.hash)
+      case 4: try decoder.decodeSingularUInt32Field(value: &self.time)
+      case 5: try decoder.decodeSingularStringField(value: &self.tree)
       default: break
       }
     }
@@ -1044,13 +1002,10 @@ extension GetAddressUtxosArg: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeRepeatedStringField(value: &self.addresses) }()
-      case 2: try { try decoder.decodeSingularUInt64Field(value: &self.startHeight) }()
-      case 3: try { try decoder.decodeSingularUInt32Field(value: &self.maxEntries) }()
+      case 1: try decoder.decodeRepeatedStringField(value: &self.addresses)
+      case 2: try decoder.decodeSingularUInt64Field(value: &self.startHeight)
+      case 3: try decoder.decodeSingularUInt32Field(value: &self.maxEntries)
       default: break
       }
     }
@@ -1091,16 +1046,13 @@ extension GetAddressUtxosReply: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularBytesField(value: &self.txid) }()
-      case 2: try { try decoder.decodeSingularInt32Field(value: &self.index) }()
-      case 3: try { try decoder.decodeSingularBytesField(value: &self.script) }()
-      case 4: try { try decoder.decodeSingularInt64Field(value: &self.valueZat) }()
-      case 5: try { try decoder.decodeSingularUInt64Field(value: &self.height) }()
-      case 6: try { try decoder.decodeSingularStringField(value: &self.address) }()
+      case 1: try decoder.decodeSingularBytesField(value: &self.txid)
+      case 2: try decoder.decodeSingularInt32Field(value: &self.index)
+      case 3: try decoder.decodeSingularBytesField(value: &self.script)
+      case 4: try decoder.decodeSingularInt64Field(value: &self.valueZat)
+      case 5: try decoder.decodeSingularUInt64Field(value: &self.height)
+      case 6: try decoder.decodeSingularStringField(value: &self.address)
       default: break
       }
     }
@@ -1148,11 +1100,8 @@ extension GetAddressUtxosReplyList: SwiftProtobuf.Message, SwiftProtobuf._Messag
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeRepeatedMessageField(value: &self.addressUtxos) }()
+      case 1: try decoder.decodeRepeatedMessageField(value: &self.addressUtxos)
       default: break
       }
     }
diff --git a/Tests/TestUtils/proto/darkside.pb.swift b/Tests/TestUtils/proto/darkside.pb.swift
index b417de70..89e317d4 100644
--- a/Tests/TestUtils/proto/darkside.pb.swift
+++ b/Tests/TestUtils/proto/darkside.pb.swift
@@ -126,13 +126,10 @@ extension DarksideMetaState: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt32Field(value: &self.saplingActivation) }()
-      case 2: try { try decoder.decodeSingularStringField(value: &self.branchID) }()
-      case 3: try { try decoder.decodeSingularStringField(value: &self.chainName) }()
+      case 1: try decoder.decodeSingularInt32Field(value: &self.saplingActivation)
+      case 2: try decoder.decodeSingularStringField(value: &self.branchID)
+      case 3: try decoder.decodeSingularStringField(value: &self.chainName)
       default: break
       }
     }
@@ -168,11 +165,8 @@ extension DarksideBlock: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementa
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.block) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.block)
       default: break
       }
     }
@@ -200,11 +194,8 @@ extension DarksideBlocksURL: SwiftProtobuf.Message, SwiftProtobuf._MessageImplem
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularStringField(value: &self.url) }()
+      case 1: try decoder.decodeSingularStringField(value: &self.url)
       default: break
       }
     }
@@ -233,12 +224,9 @@ extension DarksideTransactionsURL: SwiftProtobuf.Message, SwiftProtobuf._Message
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt32Field(value: &self.height) }()
-      case 2: try { try decoder.decodeSingularStringField(value: &self.url) }()
+      case 1: try decoder.decodeSingularInt32Field(value: &self.height)
+      case 2: try decoder.decodeSingularStringField(value: &self.url)
       default: break
       }
     }
@@ -270,11 +258,8 @@ extension DarksideHeight: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt32Field(value: &self.height) }()
+      case 1: try decoder.decodeSingularInt32Field(value: &self.height)
       default: break
       }
     }
@@ -304,13 +289,10 @@ extension DarksideEmptyBlocks: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
 
   mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
-      // The use of inline closures is to circumvent an issue where the compiler
-      // allocates stack space for every case branch when no optimizations are
-      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeSingularInt32Field(value: &self.height) }()
-      case 2: try { try decoder.decodeSingularInt32Field(value: &self.nonce) }()
-      case 3: try { try decoder.decodeSingularInt32Field(value: &self.count) }()
+      case 1: try decoder.decodeSingularInt32Field(value: &self.height)
+      case 2: try decoder.decodeSingularInt32Field(value: &self.nonce)
+      case 3: try decoder.decodeSingularInt32Field(value: &self.count)
       default: break
       }
     }
diff --git a/ZcashLightClientKit.podspec b/ZcashLightClientKit.podspec
index df3f9902..3c8a5152 100644
--- a/ZcashLightClientKit.podspec
+++ b/ZcashLightClientKit.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
     s.resource_bundles = { 'Resources' => 'Sources/ZcashLightClientKit/Resources/*' }
     s.swift_version = '5.5'
     s.ios.deployment_target = '12.0'
-    s.dependency 'gRPC-Swift', '~> 1.0'
+    s.dependency 'gRPC-Swift', '~> 1.8'
     s.dependency 'SQLite.swift', '~> 0.12.2' 
     s.dependency 'libzcashlc', '0.0.3'
     s.static_framework = true