WIP: Publish UTXORD wallet

.gitignore

@@ -5,6 +5,7 @@
 **/*.in
 .idea/*
 build/**
+build_*/**
 **/*.lo
 **/*.la
 **/.deps/**

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "node"]
 	path = node
-	url = ../l15-node.git
+	url = ../bitcoin.git
 [submodule "contrib/secp256k1"]
 	path = contrib/secp256k1
 	url = ../secp256k1-zkp.git

Makefile.am

@@ -1,26 +1,37 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 
-SUBDIRS = contrib node src test
+VERSION_MODULE = version.cpp
+BUILT_SOURCES = $(VERSION_MODULE)
+
+SUBDIRS =
+
+if BUILD_SECP256K1
+SUBDIRS += $(SECP256K1_PATH)
+endif
+
+SUBDIRS += $(NODE_PATH) src
 
 AM_CPPFLAGS = \
  -I$(top_srcdir)/src/common \
  -I$(top_srcdir)/src/core \
- -I$(top_srcdir)/contrib/secp256k1/include \
+ -I$(top_srcdir)/$(SECP256K1_PATH)/include \
  -I$(top_srcdir)/contrib/cli11 \
  -I$(top_srcdir)/contrib/cex \
- -I$(top_srcdir)/node/src \
- -I$(top_srcdir)/node/src/univalue/include \
- -I$(top_srcdir)/node/src/consensus \
- -I$(top_srcdir)/node/src/script \
- -I$(top_srcdir)/node/src/support
+ -I$(top_srcdir)/$(NODE_PATH)/src \
+ -I$(top_srcdir)/$(NODE_PATH)/src/univalue/include \
+ -I$(top_srcdir)/$(NODE_PATH)/src/consensus \
+ -I$(top_srcdir)/$(NODE_PATH)/src/script \
+ -I$(top_srcdir)/$(NODE_PATH)/src/support
 
 
-AM_LDFLAGS=-L$(top_builddir)/node/src -L$(top_builddir)/node/src/crypto
+AM_LDFLAGS=-L$(top_builddir)/$(NODE_PATH)/src
 
 L15_LIBS =
 
 if BUILD_TOOLS
 
+SUBDIRS += test
+
 L15_LIBS += \
 $(top_builddir)/src/tools/libl15-tools.la \
 $(top_builddir)/src/api/libl15-api.la
@@ -30,31 +41,18 @@ endif
 L15_LIBS += \
 $(top_builddir)/src/core/libl15-core.la  \
 $(top_builddir)/src/common/libl15-common.la \
-$(top_builddir)/node/src/libbitcoinconsensus.la \
-$(top_builddir)/contrib/secp256k1/libsecp256k1.la \
-$(top_builddir)/node/src/libunivalue.la
+$(top_builddir)/$(NODE_PATH)/src/libbitcoinconsensus.la \
+$(top_builddir)/$(NODE_PATH)/src/libunivalue.la
 
 #$(top_builddir)/node/src/crypto/libbitcoin_crypto_base.la
 
-if BUILD_INSCRIBEIT
-
-AM_CPPFLAGS += -I$(top_srcdir)/src/inscribeit
-
-L15_LIBS += \
-$(top_builddir)/src/inscribeit/libl15-inscribeit.la
-
-endif
-
 if BUILD_TOOLS
 
 AM_CPPFLAGS += \
  -I$(top_srcdir)/src/api \
  -I$(top_srcdir)/src/tools
 
 L15_LIBS += \
-$(top_builddir)/node/src/crypto/libbitcoin_crypto_avx2.la \
-$(top_builddir)/node/src/crypto/libbitcoin_crypto_x86_shani.la \
-$(top_builddir)/node/src/crypto/libbitcoin_crypto_sse41.la \
 $(BOOST_FILESYSTEM_LIB)
 
 bin_PROGRAMS = l15-cli
@@ -63,3 +61,18 @@ l15_cli_SOURCES = src/cli.cpp
 l15_cli_LDADD = $(L15_LIBS)
 
 endif
+
+lib_LTLIBRARIES = libl15.la
+
+$(VERSION_MODULE): $(top_srcdir)/version.sh Makefile
+	echo '#include "version.hpp"' >$@
+	(echo 'const char* const l15::Version::core_version = "'; $< $(top_srcdir); echo '";') | tr -d '\n' >>$@; echo >>$@
+	(echo 'const char* const l15::Version::node_version = "'; $< $(top_srcdir)/$(NODE_PATH); echo '";')| tr -d '\n' >>$@; echo >>$@
+	(echo 'const char* const l15::Version::secp256k1_version = "'; $< $(top_srcdir)/$(SECP256K1_PATH); echo '";')| tr -d '\n' >>$@; echo >>$@
+
+
+nodist_libl15_la_SOURCES = $(VERSION_MODULE)
+libl15_la_LDFLAGS = -avoid-version
+libl15_la_LIBADD = $(L15_LIBS)
+
+#CLEANFILES = $(VERSION_MODULE)

build-aux/m4/ax_cxx_compile_stdcxx.m4

@@ -52,7 +52,8 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
   m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
         [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
         [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [$1], [20], [ax_cxx_compile_alternatives="20"],
+        [$1], [20], [ax_cxx_compile_alternatives="20 2a"],
+        [$1], [23], [ax_cxx_compile_alternatives="2b"],
         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
   m4_if([$2], [], [],
         [$2], [ext], [],
@@ -177,6 +178,15 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
 )
 
+dnl  Test body for checking C++23 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_23],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_23
+)
 
 dnl  Tests for new features in C++11
 
@@ -1003,3 +1013,33 @@ namespace cxx20
 #endif  // __cplusplus < 202002L
 
 ]])
+
+
+dnl  Tests for new features in C++23
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_23], [[
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 202100L
+
+#error "This is not a C++23 compiler"
+
+#else
+
+#include <version>
+
+namespace cxx23
+{
+
+// As C++23 supports feature test macros in the standard, there is no
+// immediate need to actually test for feature availability on the
+// Autoconf side.
+
+}  // namespace cxx23
+
+#endif  // __cplusplus < 202302L
+
+]])

build-aux/m4/ax_subdirs_configure.m4

@@ -259,7 +259,7 @@ AC_DEFUN([AX_SUBDIRS_CONFIGURE],
       # Options that must be removed.
       m4_ifnblank([$5], [m4_foreach(opt, [$5], [ax_args=$(echo $ax_args | sed "s,'opt',,")
       ])])
-      AS_VAR_APPEND([ax_args], [" '--srcdir=$ac_srcdir'"])
+      AS_VAR_APPEND([ax_args], [" '--srcdir=$ac_abs_srcdir'"])
 
       # Add the subdirectory to the list of target subdirectories.
       ax_subconfigures="$ax_subconfigures $ax_dir"
@@ -297,11 +297,11 @@ AC_DEFUN([AX_SUBDIRS_CONFIGURE],
         cd "$ax_dir"
 
         # Check for guested configure; otherwise get Cygnus style configure.
-        if test -f "$ac_srcdir/configure.gnu"; then
-          ax_sub_configure=$ac_srcdir/configure.gnu
-        elif test -f "$ac_srcdir/configure"; then
-          ax_sub_configure=$ac_srcdir/configure
-        elif test -f "$ac_srcdir/configure.in"; then
+        if test -f "$ac_abs_srcdir/configure.gnu"; then
+          ax_sub_configure=$ac_abs_srcdir/configure.gnu
+        elif test -f "$ac_abs_srcdir/configure"; then
+          ax_sub_configure=$ac_abs_srcdir/configure
+        elif test -f "$ac_abs_srcdir/configure.in"; then
           # This should be Cygnus configure.
           ax_sub_configure=$ac_aux_dir/configure
         else

build-aux/m4/ax_zmq.m4

@@ -44,7 +44,8 @@ AC_DEFUN([AX_ZMQ], [
                 [xyes],[with_zmq=yes],
                 [xno],[with_zmq=no],
                 [with_zmq=yes; ZMQ_LDFLAGS="-L${withval}/lib"; ZMQ_CPPFLAGS="-I${withval}/include"]
-    )])
+    )],
+    [with_zmq=yes])
 
     HAVE_ZMQ=0
     if test "$with_zmq" != "no"; then