Fix/expose constructors

airgap-it · Mar 3, 2021 · e06b72d · e06b72d
1 parent a632c1c
commit e06b72d
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 22 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/sapling-wasm"
   ],
-  "version": "0.0.5-beta.6"
+  "version": "0.0.5-beta.7"
 }
diff --git a/packages/sapling-android/app/build.gradle b/packages/sapling-android/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "0.0.5-beta06"
+        versionName "0.0.5-beta07"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/packages/sapling-ios/Sources/Sapling/Sapling.swift b/packages/sapling-ios/Sources/Sapling/Sapling.swift
@@ -1,23 +1,8 @@
 import SaplingFFI
 
 public struct Sapling {
-    public typealias Context = UnsafeMutableRawPointer
 
-    public typealias Seed = [UInt8]
-    public typealias ExtendedSpendingKey = [UInt8]
-    public typealias ExtendedFullViewingKey = [UInt8]
-    public typealias IncomingViewingKey = [UInt8]
-    public typealias OutgoingViewingKey = [UInt8]
-
-    public typealias Address = [UInt8]
-    public typealias Diversifier = [UInt8]
-    public typealias Index = [UInt8]
-
-    public typealias Rcm = [UInt8]
-    public typealias Esk = [UInt8]
-    public typealias Ar = [UInt8]
-    public typealias Anchor = [UInt8]
-    public typealias MerklePath = [UInt8]
+    public init() {}
 
     /* Commitment */
 
@@ -301,6 +286,24 @@ public struct Sapling {
 
         return key
     }
+
+    public typealias Context = UnsafeMutableRawPointer
+
+    public typealias Seed = [UInt8]
+    public typealias ExtendedSpendingKey = [UInt8]
+    public typealias ExtendedFullViewingKey = [UInt8]
+    public typealias IncomingViewingKey = [UInt8]
+    public typealias OutgoingViewingKey = [UInt8]
+
+    public typealias Address = [UInt8]
+    public typealias Diversifier = [UInt8]
+    public typealias Index = [UInt8]
+
+    public typealias Rcm = [UInt8]
+    public typealias Esk = [UInt8]
+    public typealias Ar = [UInt8]
+    public typealias Anchor = [UInt8]
+    public typealias MerklePath = [UInt8]
 
     public enum Error: Swift.Error {
         case computeCommitmentFailed

diff --git a/packages/sapling-wasm/package-lock.json b/packages/sapling-wasm/package-lock.json
diff --git a/packages/sapling-wasm/package.json b/packages/sapling-wasm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@airgap/sapling-wasm",
   "author": "Papers.ch <[email protected]>",
-  "version": "0.0.5-beta.6",
+  "version": "0.0.5-beta.7",
   "homepage": "https://www.airgap.it",
   "repository": {
     "type": "git",

diff --git a/packages/sapling/Cargo.toml b/packages/sapling/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "airgap_sapling"
-version = "0.0.5-beta.6"
+version = "0.0.5-beta.7"
 authors = ["Papers.ch <[email protected]>"]
 edition = "2018"
 

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -87,7 +87,7 @@ function check_versions () {
   load_versions
 
   if compare_versions; then
-    echo "Versions match."
+    echo -e "\n  Versions match."
     return 0
   else
     echo -e "\n  Versions mismatch."