Skip to content

Commit

Permalink
Merge pull request #258 from pocketnetteam/0.21.todo
Browse files Browse the repository at this point in the history
Filling Sqlite DB with missing Transaction data from Bitcoin DB
  • Loading branch information
andyoknen authored Jun 1, 2022
2 parents 9dfaaef + b049782 commit 039f41f
Show file tree
Hide file tree
Showing 174 changed files with 5,102 additions and 2,587 deletions.
39 changes: 36 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ mine1.sh
mine2.sh

*.exe
*.pdb
src/pocketcoin
src/pocketcoind
src/pocketcoin-cli
src/pocketcoin-gui
src/pocketcoin-node
src/pocketcoin-tx
src/pocketcoin-wallet
src/test/fuzz/*
!src/test/fuzz/*.*
src/test/test_pocketcoin
src/test/test_pocketcoin_fuzzy
src/qt/test/test_pocketcoin-qt

# autoreconf
Expand All @@ -33,13 +38,15 @@ build-aux/m4/ltversion.m4
build-aux/missing
build-aux/compile
build-aux/test-driver
config.cache
config.log
config.status
configure
libtool
src/config/pocketcoin-config.h
src/config/pocketcoin-config.h.in
src/config/stamp-h1
src/obj
share/setup.nsi
share/qt/Info.plist

Expand Down Expand Up @@ -71,10 +78,10 @@ src/qt/pocketcoin-qt.includes
*.pyc
*.o
*.o-*
*.patch
*.a
*.pb.cc
*.pb.h
*.dat

*.log
*.trs
Expand All @@ -83,6 +90,10 @@ src/qt/pocketcoin-qt.includes
*.json.h
*.raw.h

# Only ignore unexpected patches
*.patch
!depends/patches/**/*.patch

#libtool object files
*.lo
*.la
Expand All @@ -92,10 +103,14 @@ src/qt/pocketcoin-qt.includes
src/**/Makefile
Makefile
doc/Makefile
pocketcoin-qt
!depends/Makefile
src/qt/pocketcoin-qt
Pocketcoin-Qt.app
background.tiff*

# Qt Creator
Makefile.am.user

# Unit-tests
Makefile.test
pocketcoin-qt_test
Expand All @@ -107,27 +122,45 @@ qrc_*.cpp
.DS_Store
build

# Previous releases
releases

#lcov
*.gcno
*.gcda
/*.info
test_pocketcoin.coverage/
total.coverage/
fuzz.coverage/
coverage_percent.txt
/cov_tool_wrapper.sh
qa-assets/

#build tests
linux-coverage-build
linux-build
win32-build
test/config.ini
test/cache/*
test/.mypy_cache/

!src/leveldb*/Makefile

/doc/doxygen/

libpocketcoinconsensus.pc
contrib/devtools/split-debug.sh

# Output from running db4 installation
db4/

# clang-check
*.plist

osx_volname
dist/
*.background.tiff

/confdefs.h
/build_msvc/pocketcoind/testdb
/build_msvc/pocketcoind/dbMessage
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ add_compile_definitions(CLIENT_VERSION_MAJOR=${_CLIENT_VERSION_MAJOR}
COPYRIGHT_HOLDERS_FINAL=${_COPYRIGHT_HOLDERS_FINAL}
HOMEPAGE=${_HOMEPAGE})

# TODO missing bug report url
# TODO (build): missing bug report url
project (
Pocketnet-Core
VERSION ${_CLIENT_VERSION_MAJOR}.${_CLIENT_VERSION_MINOR}.${_CLIENT_VERSION_REVISION}
Expand Down
7 changes: 3 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ POCKETCOIND_BIN=$(top_builddir)/src/$(POCKETCOIN_DAEMON_NAME)$(EXEEXT)
POCKETCOIN_QT_BIN=$(top_builddir)/src/qt/$(POCKETCOIN_GUI_NAME)$(EXEEXT)
POCKETCOIN_CLI_BIN=$(top_builddir)/src/$(POCKETCOIN_CLI_NAME)$(EXEEXT)
POCKETCOIN_TX_BIN=$(top_builddir)/src/$(POCKETCOIN_TX_NAME)$(EXEEXT)
POCKETCOIN_WALLET_BIN=$(top_builddir)/src/$(POCKETCOIN_WALLET_TOOL_NAME)$(EXEEXT)
# POCKETCOIN_WALLET_BIN=$(top_builddir)/src/$(POCKETCOIN_WALLET_TOOL_NAME)$(EXEEXT)
POCKETCOIN_WIN_INSTALLER=$(PACKAGE)_$(PACKAGE_VERSION)_win_x64_setup.exe
POCKETCOIN_LINUX_INSTALLER = $(PACKAGE)_$(PACKAGE_VERSION)_linux_x64
POCKETCOIN_LINUX_INSTALLER_NAME = $(PACKAGE)_$(PACKAGE_VERSION)_linux_x64
Expand Down Expand Up @@ -81,7 +81,6 @@ $(POCKETCOIN_WIN_INSTALLER): all-recursive
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(POCKETCOIN_QT_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(POCKETCOIN_CLI_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(POCKETCOIN_TX_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(POCKETCOIN_WALLET_BIN) $(top_builddir)/release
@test -f $(MAKENSIS) && echo 'OutFile "$@"' | cat $(top_builddir)/share/setup.nsi - | $(MAKENSIS) -V2 - || \
echo error: could not build $@
@echo built $@
Expand Down Expand Up @@ -196,8 +195,8 @@ $(POCKETCOIN_CLI_BIN): FORCE
$(POCKETCOIN_TX_BIN): FORCE
$(MAKE) -C src $(@F)

$(POCKETCOIN_WALLET_BIN): FORCE
$(MAKE) -C src $(@F)
# $(POCKETCOIN_WALLET_BIN): FORCE
# $(MAKE) -C src $(@F)

if USE_LCOV
LCOV_FILTER_PATTERN = \
Expand Down
8 changes: 4 additions & 4 deletions build_msvc/pocketcoin_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#define CLIENT_VERSION_MAJOR 0

/* Minor version */
#define CLIENT_VERSION_MINOR 20
#define CLIENT_VERSION_MINOR 21

/* Build revision */
#define CLIENT_VERSION_REVISION 19
#define CLIENT_VERSION_REVISION 0

/* Version Build */
#define CLIENT_VERSION_BUILD 0
Expand Down Expand Up @@ -346,7 +346,7 @@
#define PACKAGE_NAME "Pocketnet Core"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Pocketnet Core 0.20.19"
#define PACKAGE_STRING "Pocketnet Core 0.21.0"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pocketcoin"
Expand All @@ -355,7 +355,7 @@
#define PACKAGE_URL "https://github.com/pocketnetteam"

/* Define to the version of this package. */
#define PACKAGE_VERSION "0.20.19"
#define PACKAGE_VERSION "0.21.0"

/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
Expand Down
32 changes: 14 additions & 18 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ POCKETCOIN_DAEMON_NAME=pocketcoind
POCKETCOIN_GUI_NAME=pocketcoin-qt
POCKETCOIN_CLI_NAME=pocketcoin-cli
POCKETCOIN_TX_NAME=pocketcoin-tx
POCKETCOIN_WALLET_TOOL_NAME=pocketcoin-wallet
# POCKETCOIN_WALLET_TOOL_NAME=pocketcoin-wallet

dnl Unless the user specified ARFLAGS, force it to be cr
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
Expand Down Expand Up @@ -117,7 +117,7 @@ AC_ARG_ENABLE([wallet],
[enable_wallet=$enableval],
[enable_wallet=yes])

# TODO (team): we are using bundled sqlite so explicitly disable it here to avoid autotools finding it on system
# We are using bundled sqlite so explicitly disable it here to avoid autotools finding it on system
# AC_ARG_WITH([sqlite],
# [AS_HELP_STRING([--with-sqlite=yes|no|auto],
# [enable sqlite wallet support (default: auto, i.e., enabled if wallet is enabled and sqlite is found)])],
Expand Down Expand Up @@ -257,7 +257,7 @@ AC_ARG_WITH([mpgen],

AC_ARG_ENABLE([multiprocess],
[AS_HELP_STRING([--enable-multiprocess],
[build multiprocess pocketcoin-node, pocketcoin-wallet, and pocketcoin-gui executables in addition to monolithic pocketcoind and pocketcoin-qt executables. Requires libmultiprocess library. Experimental (default is no)])],
[build multiprocess pocketcoin-node, and pocketcoin-gui executables in addition to monolithic pocketcoind and pocketcoin-qt executables. Requires libmultiprocess library. Experimental (default is no)])],
[enable_multiprocess=$enableval],
[enable_multiprocess=no])

Expand Down Expand Up @@ -545,7 +545,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils],
[build pocketcoin-cli pocketcoin-tx pocketcoin-wallet (default=yes)])],
[build pocketcoin-cli pocketcoin-tx (default=yes)])],
[build_pocketcoin_utils=$withval],
[build_pocketcoin_utils=yes])

Expand All @@ -561,11 +561,11 @@ AC_ARG_ENABLE([util-tx],
[build_pocketcoin_tx=$enableval],
[build_pocketcoin_tx=$build_pocketcoin_utils])

AC_ARG_ENABLE([util-wallet],
[AS_HELP_STRING([--enable-util-wallet],
[build pocketcoin-wallet])],
[build_pocketcoin_wallet=$enableval],
[build_pocketcoin_wallet=$build_pocketcoin_utils])
# AC_ARG_ENABLE([util-wallet],
# [AS_HELP_STRING([--enable-util-wallet],
# [build pocketcoin-wallet])],
# [build_pocketcoin_wallet=$enableval],
# [build_pocketcoin_wallet=$build_pocketcoin_utils])

AC_ARG_WITH([libs],
[AS_HELP_STRING([--with-libs],
Expand All @@ -579,7 +579,7 @@ AC_ARG_WITH([daemon],
[build_pocketcoind=$withval],
[build_pocketcoind=yes])

dnl TODO openssl is removed out of bitcoin
dnl Restore openssl that was removed from bitcoin 0.21
AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing))

Expand All @@ -601,6 +601,7 @@ case $host in
AC_CHECK_LIB([uuid], [main],, AC_MSG_ERROR(libuuid missing))
AC_CHECK_LIB([advapi32], [CryptAcquireContextW],, AC_MSG_ERROR(libadvapi32 missing))
AC_CHECK_LIB([ws2_32], [WSAStartup],, AC_MSG_ERROR(libws2_32 missing))
AC_CHECK_LIB([mswsock], [main],, AC_MSG_ERROR(libmswsock missing))
AC_CHECK_LIB([shlwapi], [PathRemoveFileSpecW],, AC_MSG_ERROR(libshlwapi missing))
AC_CHECK_LIB([iphlpapi], [GetAdaptersAddresses],, AC_MSG_ERROR(libiphlpapi missing))

Expand Down Expand Up @@ -1263,11 +1264,7 @@ if test x$have_miniupnpc != xno; then
fi
fi

if test x$build_pocketcoin_wallet$build_pocketcoin_cli$build_pocketcoin_tx$build_pocketcoind$pocketcoin_enable_qt$use_tests$use_bench = xnonononononono; then
use_boost=no
else
use_boost=yes
fi
use_boost=yes

if test x$use_boost = xyes; then

Expand Down Expand Up @@ -1580,7 +1577,7 @@ if test x$build_pocketcoin_wallet$build_pocketcoin_cli$build_pocketcoin_tx$build
AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests])
fi

# TODO (team) hardcoded cause we use sqlite anyway
# Forced using sqlite
AC_DEFINE([USE_SQLITE],[1],[Define if sqlite support should be compiled in])

AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
Expand Down Expand Up @@ -1630,7 +1627,7 @@ AC_SUBST(POCKETCOIN_DAEMON_NAME)
AC_SUBST(POCKETCOIN_GUI_NAME)
AC_SUBST(POCKETCOIN_CLI_NAME)
AC_SUBST(POCKETCOIN_TX_NAME)
AC_SUBST(POCKETCOIN_WALLET_TOOL_NAME)
# AC_SUBST(POCKETCOIN_WALLET_TOOL_NAME)

AC_SUBST(RELDFLAGS)
AC_SUBST(DEBUG_CPPFLAGS)
Expand Down Expand Up @@ -1714,7 +1711,6 @@ if test x$need_bundled_univalue = xyes; then
AC_CONFIG_SUBDIRS([src/univalue])
fi

# TODO probably make this optional
AC_CONFIG_SUBDIRS([src/sqlite])

ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --with-bignum=no --enable-module-recovery --enable-module-schnorrsig --enable-experimental"
Expand Down
1 change: 0 additions & 1 deletion contrib/seeds/nodes_main.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
216.108.231.40
135.181.196.243
65.21.56.203
65.21.57.14
Expand Down
2 changes: 2 additions & 0 deletions depends/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ i686*
mips*
arm*
aarch64*
powerpc*
riscv32*
riscv64*
s390x*
Loading

0 comments on commit 039f41f

Please sign in to comment.