Prepare release (#65)

* lock dependency versions

* fixes to scripts

* Fix txId string extension

Example/ZcashLightClientSample/Podfile.lock

@@ -30,12 +30,12 @@ PODS:
     - gRPC-Core (~> 1.23.0)
     - SwiftProtobuf (~> 1.7.0)
   - SwiftProtobuf (1.7.0)
-  - ZcashLightClientKit (0.0.1):
-    - SQLite.swift
-    - SwiftGRPC
-  - ZcashLightClientKit/Tests (0.0.1):
-    - SQLite.swift
-    - SwiftGRPC
+  - ZcashLightClientKit (0.1.0):
+    - SQLite.swift (~> 0.12.2)
+    - SwiftGRPC (~> 0.10.0)
+  - ZcashLightClientKit/Tests (0.1.0):
+    - SQLite.swift (~> 0.12.2)
+    - SwiftGRPC (~> 0.10.0)
 
 DEPENDENCIES:
   - KRProgressHUD
@@ -72,7 +72,7 @@ SPEC CHECKSUMS:
   SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
   SwiftGRPC: f8fcfecb547c96cc6913de619f95fa3cd09838ee
   SwiftProtobuf: 4fd9645e69b72cbae6ec8da5be0cdd20ca6565dd
-  ZcashLightClientKit: ec2438a02fe464bb42b9d55f5001f905e2dcb0e2
+  ZcashLightClientKit: e2618890fe28d7f2067765d315ebaa25ccf033f5
 
 PODFILE CHECKSUM: 5a1fb98512fa179a4e83d67d14dd402f6d129a4d
 

Example/ZcashLightClientSample/ZcashLightClientSample/List Transactions/TransactionsDataSource.swift

@@ -64,6 +64,6 @@ class TransactionsDataSource: NSObject, UITableViewDataSource {
     }
     
     func transactionString(_ tx: TransactionEntity) -> String {
-        tx.transactionId.hexEncodedString()
+        tx.transactionId.toHexStringTxId()
     }
 }

Scripts/build_librustzcash_xcode.sh

@@ -33,10 +33,10 @@ fi
 
 echo "Building Rust backend"
 echo ""
-echo "cargo build $FEATURE_FLAGS --release && cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml $FEATURE_FLAGS --release"
+echo "cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml $FEATURE_FLAGS --release"
 
 if [ ! -f ${ZCASH_LIB_RUST_BUILD_PATH}/universal/release/${ZCASH_LIB_RUST_NAME} ]; then
-    cargo build --release $FEATURE_FLAGS && cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml --release
+    cargo lipo --manifest-path ${PODS_TARGET_SRCROOT}/Cargo.toml --release
     persist_environment
 fi
 

Scripts/script_commons.sh

@@ -70,6 +70,7 @@ function existing_build_mismatch {
     fi
     # There's a TESTNET flag and we are on a MAINNET Environment 
     if [ -f "$ZCASH_LIB_RUST_BUILD_PATH/$ZCASH_BUILD_TYPE_TESTNET_FLAG" ] && [[ "$ZCASH_NETWORK_ENVIRONMENT" = "$ZCASH_MAINNET" ]]
+    then
         warn_mismatch $ZCASH_TESTNET $ZCASH_NETWORK_ENVIRONMENT
         return 0 # build mismatch in place 
     fi

ZcashLightClientKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'ZcashLightClientKit'
-    s.version          = '0.0.1'
+    s.version          = '0.1.0'
     s.summary          = 'Zcash Light Client wallet SDK for iOS'
   
     s.description      = <<-DESC
@@ -21,8 +21,8 @@ Pod::Spec.new do |s|
     s.module_map = 'ZcashLightClientKit.modulemap'
     s.swift_version = '5.1'
     s.ios.deployment_target = '12.0'
-    s.dependency 'SwiftGRPC'
-    s.dependency 'SQLite.swift'    
+    s.dependency 'SwiftGRPC', '~> 0.10.0'
+    s.dependency 'SQLite.swift', '~> 0.12.2' 
     s.ios.vendored_libraries = 'lib/libzcashlc.a'
     s.preserve_paths = ['Scripts', 'rust','docs','Cargo.*','ZcashLightClientKit/Stencil']
     s.prepare_command = <<-CMD
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
          :script => 'sh ${PODS_TARGET_SRCROOT}/Scripts/generate_test_constants.sh && ${PODS_TARGET_SRCROOT}/Scripts/build_librustzcash_xcode.sh --testing}',
          :execution_position => :before_compile
       }
-      test_spec.dependency 'SwiftGRPC'
-      test_spec.dependency 'SQLite.swift'
+      test_spec.dependency 'SwiftGRPC', '~> 0.10.0'
+      test_spec.dependency 'SQLite.swift', '~> 0.12.2'
   end
 end

ZcashLightClientKit/Extensions/Data+Zcash.swift

@@ -10,7 +10,31 @@ import Foundation
 public extension Data {
     
     func toHexStringTxId() -> String {
-        String(self.hexEncodedString().reversed())
+        self.hexEncodedString().toTxIdString()
     }
     
 }
+extension String {
+    func toTxIdString() -> String {
+        var id = ""
+        self.reversed().pairs.map {
+            $0.reversed()
+        }.forEach { (reversed) in
+            id.append(String(reversed))
+        }
+        return id
+    }
+}
+
+extension Collection {
+    var pairs: [SubSequence] {
+        var startIndex = self.startIndex
+        let count = self.count
+        let n = count / 2 + count % 2
+        return (0..<n).map { _ in
+            let endIndex = index(startIndex, offsetBy: 2, limitedBy: self.endIndex) ?? self.endIndex
+            defer { startIndex = endIndex }
+            return self[startIndex..<endIndex]
+        }
+    }
+}