fix FFI

sphinx-ffi/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.3"
 authors = ["Evan Feenstra <[email protected]>"]
 edition = "2018"
 
-# [lib]
-# name = "sphinxrs"
-# crate-type = ["staticlib", "cdylib"]
+[lib]
+name = "sphinxrs"
+crate-type = ["staticlib", "cdylib"]
 
 [features]
 default = ["ffi", "std"]

sphinx-ffi/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    uniffi::generate_scaffolding("src/sphinxrs.udl").unwrap();
+}

sphinx-ffi/src/sphinxrs.swift

@@ -793,11 +793,11 @@ public func `nodeKeys`(`net`: String, `seed`: String) throws -> Keys {
     )
 }
 
-public func `mnemonicFromEntropy`(`seed`: String) throws -> String {
+public func `mnemonicFromEntropy`(`entropy`: String) throws -> String {
     return try  FfiConverterString.lift(
         try rustCallWithError(FfiConverterTypeSphinxError.lift) {
     uniffi_sphinxrs_fn_func_mnemonic_from_entropy(
-        FfiConverterString.lower(`seed`),$0)
+        FfiConverterString.lower(`entropy`),$0)
 }
     )
 }
@@ -811,6 +811,24 @@ public func `entropyFromMnemonic`(`mnemonic`: String) throws -> String {
     )
 }
 
+public func `mnemonicToSeed`(`mnemonic`: String) throws -> String {
+    return try  FfiConverterString.lift(
+        try rustCallWithError(FfiConverterTypeSphinxError.lift) {
+    uniffi_sphinxrs_fn_func_mnemonic_to_seed(
+        FfiConverterString.lower(`mnemonic`),$0)
+}
+    )
+}
+
+public func `entropyToSeed`(`entropy`: String) throws -> String {
+    return try  FfiConverterString.lift(
+        try rustCallWithError(FfiConverterTypeSphinxError.lift) {
+    uniffi_sphinxrs_fn_func_entropy_to_seed(
+        FfiConverterString.lower(`entropy`),$0)
+}
+    )
+}
+
 public func `buildRequest`(`msg`: String, `secret`: String, `nonce`: UInt64) throws -> String {
     return try  FfiConverterString.lift(
         try rustCallWithError(FfiConverterTypeSphinxError.lift) {
@@ -884,12 +902,18 @@ private var initializationResult: InitializationResult {
     if (uniffi_sphinxrs_checksum_func_node_keys() != 21192) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_sphinxrs_checksum_func_mnemonic_from_entropy() != 16221) {
+    if (uniffi_sphinxrs_checksum_func_mnemonic_from_entropy() != 32309) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_sphinxrs_checksum_func_entropy_from_mnemonic() != 33294) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_sphinxrs_checksum_func_mnemonic_to_seed() != 23084) {
+        return InitializationResult.apiChecksumMismatch
+    }
+    if (uniffi_sphinxrs_checksum_func_entropy_to_seed() != 33710) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_sphinxrs_checksum_func_build_request() != 31264) {
         return InitializationResult.apiChecksumMismatch
     }

sphinx-ffi/src/sphinxrs.udl

@@ -45,10 +45,14 @@ namespace sphinxrs {
   [Throws=SphinxError]
   Keys node_keys(string net, string seed);
   [Throws=SphinxError]
-  string mnemonic_from_entropy(string seed);
+  string mnemonic_from_entropy(string entropy);
   [Throws=SphinxError]
   string entropy_from_mnemonic(string mnemonic);
   [Throws=SphinxError]
+  string mnemonic_to_seed(string mnemonic);
+  [Throws=SphinxError]
+  string entropy_to_seed(string entropy);
+  [Throws=SphinxError]
   string build_request(string msg, string secret, u64 nonce);
   [Throws=SphinxError]
   string parse_response(string res);

sphinx-ffi/src/sphinxrsFFI.h

@@ -73,10 +73,14 @@ RustBuffer uniffi_sphinxrs_fn_func_decrypt(RustBuffer ciphertext, RustBuffer sec
 );
 RustBuffer uniffi_sphinxrs_fn_func_node_keys(RustBuffer net, RustBuffer seed, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_sphinxrs_fn_func_mnemonic_from_entropy(RustBuffer seed, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_sphinxrs_fn_func_mnemonic_from_entropy(RustBuffer entropy, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_sphinxrs_fn_func_entropy_from_mnemonic(RustBuffer mnemonic, RustCallStatus *_Nonnull out_status
 );
+RustBuffer uniffi_sphinxrs_fn_func_mnemonic_to_seed(RustBuffer mnemonic, RustCallStatus *_Nonnull out_status
+);
+RustBuffer uniffi_sphinxrs_fn_func_entropy_to_seed(RustBuffer entropy, RustCallStatus *_Nonnull out_status
+);
 RustBuffer uniffi_sphinxrs_fn_func_build_request(RustBuffer msg, RustBuffer secret, uint64_t nonce, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_sphinxrs_fn_func_parse_response(RustBuffer res, RustCallStatus *_Nonnull out_status
@@ -113,6 +117,12 @@ uint16_t uniffi_sphinxrs_checksum_func_mnemonic_from_entropy(void
 );
 uint16_t uniffi_sphinxrs_checksum_func_entropy_from_mnemonic(void
 
+);
+uint16_t uniffi_sphinxrs_checksum_func_mnemonic_to_seed(void
+
+);
+uint16_t uniffi_sphinxrs_checksum_func_entropy_to_seed(void
+
 );
 uint16_t uniffi_sphinxrs_checksum_func_build_request(void