Fix fwd decls and wally_bzero wrapping

include/wally.hpp

@@ -512,8 +512,8 @@ inline int bip340_tagged_hash(const BYTES& bytes, const TAG& tag, BYTES_OUT& byt
 }
 
 template <class BYTES>
-inline int bzero(const BYTES& bytes, size_t bytes_len) {
-    int ret = ::wally_bzero(detail::get_p(bytes), bytes_len);
+inline int bzero(BYTES& bytes) {
+    int ret = ::wally_bzero(bytes.data(), bytes.size());
     return detail::check_ret(__FUNCTION__, ret);
 }
 

include/wally_psbt.h

@@ -61,8 +61,6 @@ extern "C" {
 
 #define WALLY_SCALAR_OFFSET_LEN 32 /* Length of a PSET scalar offset */
 
-struct ext_key;
-
 #ifdef SWIG
 struct wally_psbt_input;
 struct wally_psbt_output;

include/wally_transaction.h

@@ -81,6 +81,8 @@ extern "C" {
 
 struct wally_map;
 #ifdef SWIG
+struct wally_tx_witness_item;
+struct wally_tx_witness_stack;
 struct wally_tx_input;
 struct wally_tx_output;
 struct wally_tx;

src/swig_java/swig.i

@@ -328,6 +328,7 @@ static jobjectArray create_jstringArray(JNIEnv *jenv, char **p, size_t len) {
 %apply(char *STRING, size_t LENGTH) { (unsigned char* s2c_opening_out, size_t s2c_opening_out_len) };
 %apply(char *STRING, size_t LENGTH) { (unsigned char* scalar, size_t scalar_len) };
 %apply(char *STRING, size_t LENGTH) { (unsigned char* vbf_out, size_t vbf_out_len) };
+%apply(char *STRING, size_t LENGTH) { (void* bytes, size_t bytes_len) };
 %ignore bip32_key_from_base58;
 %ignore bip32_key_from_base58_n;
 %ignore bip32_key_from_parent;

src/swig_python/swig.i

@@ -395,6 +395,7 @@ static void destroy_words(PyObject *obj) { (void)obj; }
 %pybuffer_nullable_binary(const unsigned char* vbf, size_t vbf_len);
 %pybuffer_nullable_binary(const unsigned char* whitelistproof, size_t whitelistproof_len);
 %pybuffer_nullable_binary(const unsigned char* witness, size_t witness_len);
+%pybuffer_nullable_binary(void* bytes, size_t bytes_len);
 %pybuffer_output_binary(unsigned char* abf_out, size_t abf_out_len);
 %pybuffer_output_binary(unsigned char* asset_out, size_t asset_out_len);
 %pybuffer_output_binary(unsigned char* bytes_out, size_t len);

tools/build_wrappers.py

@@ -149,7 +149,7 @@ def is_array(func, arg, n, num_args, types):
 
 
 def is_buffer(func, arg, n, num_args):
-    return is_array(func, arg, n, num_args, [u'const unsigned char*', u'unsigned char*'])
+    return is_array(func, arg, n, num_args, [u'const unsigned char*', u'unsigned char*', u'void*'])
 
 
 def is_int_buffer(func, arg, n, num_args):