Only expose confidential address functions when Elements support is enabled

Author: jgriffiths

include/wally_address.h

@@ -120,6 +120,7 @@ WALLY_CORE_API int wally_wif_to_address(
     uint32_t version,
     char **output);
 
+#ifdef BUILD_ELEMENTS
 /**
  * Extract the address from a confidential address.
  *
@@ -161,6 +162,7 @@ WALLY_CORE_API int wally_confidential_addr_from_addr(
     const unsigned char *pub_key,
     size_t pub_key_len,
     char **output);
+#endif /* BUILD_ELEMENTS */
 
 #ifdef __cplusplus
 }

src/Makefile.am

@@ -244,7 +244,6 @@ if RUN_PYTHON_TESTS
 	$(AM_V_at)$(PYTHON_TEST) test/test_bip32.py
 	$(AM_V_at)$(PYTHON_TEST) test/test_bip38.py
 	$(AM_V_at)$(PYTHON_TEST) test/test_bip39.py
-	$(AM_V_at)$(PYTHON_TEST) test/test_confidential_addr.py
 	$(AM_V_at)$(PYTHON_TEST) test/test_hash.py
 	$(AM_V_at)$(PYTHON_TEST) test/test_hex.py
 	$(AM_V_at)$(PYTHON_TEST) test/test_hmac.py
@@ -261,6 +260,7 @@ if USE_SWIG_PYTHON
 	$(AM_V_at)$(PYTHON_SWIGTEST) swig_python/contrib/mnemonic.py
 	$(AM_V_at)$(PYTHON_SWIGTEST) swig_python/contrib/tx.py
 if BUILD_ELEMENTS
+	$(AM_V_at)$(PYTHON_TEST) test/test_confidential_addr.py
 	$(AM_V_at)$(PYTHON_SWIGTEST) swig_python/contrib/elements_tx.py
 endif
 endif

src/elements.c

@@ -350,8 +350,6 @@ int wally_asset_surjectionproof(const unsigned char *output_asset, size_t output
     return ret;
 }
 
-#endif /* BUILD_ELEMENTS */
-
 int wally_confidential_addr_to_addr(
     const char *address,
     uint32_t prefix,
@@ -448,3 +446,5 @@ int wally_confidential_addr_from_addr(
     wally_clear(buf, sizeof(buf));
     return ret;
 }
+
+#endif /* BUILD_ELEMENTS */

src/swig_java/jni_elements_extra.java_in

@@ -40,6 +40,12 @@
                            outputs.get(0), outputs.get(1), outputs.get(2));
   }
 
+  public final static byte[] confidential_addr_to_ec_public_key(String addr, int prefix) {
+      final byte[] buf = new byte[EC_PUBLIC_KEY_LEN];
+      confidential_addr_to_ec_public_key(addr, prefix, buf);
+      return buf;
+  }
+
   public final static boolean tx_elements_input_is_pegin(final Object tx_input) {
       return _tx_elements_input_is_pegin(tx_input) != 0;
   }

src/swig_java/jni_extra.java_in

@@ -242,8 +242,4 @@
       _cleanup(0);
   }
 
-  public final static byte[] confidential_addr_to_ec_public_key(String addr, int prefix) {
-      final byte[] buf = new byte[EC_PUBLIC_KEY_LEN];
-      confidential_addr_to_ec_public_key(addr, prefix, buf);
-      return buf;
-  }
+

src/swig_python/python_extra.py_in

@@ -205,6 +205,6 @@ if is_elements_build():
     tx_get_output_surjectionproof = _wrap_bin(tx_get_output_surjectionproof, tx_get_output_surjectionproof_len, resize=True)
     tx_get_output_rangeproof = _wrap_bin(tx_get_output_rangeproof, tx_get_output_rangeproof_len, resize=True)
 
-confidential_addr_to_ec_public_key = _wrap_bin(confidential_addr_to_ec_public_key, EC_PUBLIC_KEY_LEN)
+    confidential_addr_to_ec_public_key = _wrap_bin(confidential_addr_to_ec_public_key, EC_PUBLIC_KEY_LEN)
 
 WALLY_SATOSHI_MAX = WALLY_BTC_MAX * WALLY_SATOSHI_PER_BTC