Skip to content

Commit

Permalink
Merge pull request nav-io#169 from gogoex/blsct-adjustment
Browse files Browse the repository at this point in the history
Add missing objects and compiler flags for libblsct
  • Loading branch information
aguycalled authored Oct 23, 2024
2 parents 5a1cb60 + a20bf9b commit dec54ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1447,9 +1447,11 @@ libblsct_a_SOURCES = \
crypto/sha256_sse41.cpp \
crypto/sha256_x86_shani.cpp \
crypto/sha256.cpp \
hash.cpp \
primitives/transaction.cpp \
rpc/util.cpp \
script/interpreter.cpp \
script/miniscript.cpp \
script/script.cpp \
script/sign.cpp \
script/signingprovider.cpp \
Expand All @@ -1458,6 +1460,7 @@ libblsct_a_SOURCES = \
uint256.cpp \
util/rbf.cpp \
util/strencodings.cpp \
util/time.cpp \
wallet/coincontrol.cpp \
wallet/context.cpp \
wallet/crypter.cpp \
Expand Down Expand Up @@ -1491,8 +1494,9 @@ LIBUNIVALUE_BLSCT = libunivalue_blsct.a
noinst_LIBRARIES += $(LIBUNIVALUE_BLSCT)
libunivalue_blsct_a_SOURCES = $(UNIVALUE_LIB_SOURCES_INT) $(UNIVALUE_DIST_HEADERS_INT) $(UNIVALUE_LIB_HEADERS_INT) $(UNIVALUE_TEST_FILES_INT)
libunivalue_blsct_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)
libunivalue_blsct_a_CXXFLAGS = $(AM_CXXFLAGS) -fPIC

libblsct_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libblsct_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -fPIC
libblsct_a_CPPFLAGS = $(AM_CPPFLAGS) $(BLS_INCLUDES) $(BOOST_CPPFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT)

if ENABLE_SSE41
Expand Down
3 changes: 3 additions & 0 deletions src/blsct/external_api/blsct.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,9 @@ CMutableTransaction* deserialize_tx(
CMutableTransaction* tx = static_cast<CMutableTransaction*>(
malloc(sizeof(CMutableTransaction))
);
CMutableTransaction empty_tx;
std::memcpy(tx, &empty_tx, sizeof(CMutableTransaction));

DataStream st{};
TransactionSerParams params { .allow_witness = true };
ParamsStream ps {params, st};
Expand Down

0 comments on commit dec54ca

Please sign in to comment.