Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
SkaZun committed Jan 22, 2019
2 parents c785c06 + 19af61a commit 4a1f073362522e300fa8265513be2782a6714bfb
Showing with 1,744 additions and 736 deletions.
  1. +1 −1 .gitignore
  2. +0 −265 CONTRIBUTING.md
  3. +1 −1 COPYING
  4. +1 −1 INSTALL
  5. +1 −1 README.md
  6. +0 −1 _config.yml
  7. +3 −3 configure.ac
  8. +5 −5 contrib/debian/control
  9. +1 −1 contrib/debian/esbcoin-qt.desktop.desktop.desktop
  10. +3 −3 contrib/debian/examples/esbcoin.conf
  11. +4 −4 contrib/devtools/README.md
  12. +1 −1 contrib/seeds/makeseeds.py
  13. +181 −0 depends/Makefile
  14. +35 −0 depends/patches/boost/darwin_boost_atomic-1.patch
  15. +55 −0 depends/patches/boost/darwin_boost_atomic-2.patch
  16. +29 −0 depends/patches/native_biplist/sorted_list.patch
  17. +86 −0 depends/patches/native_cdrkit/cdrkit-deterministic.patch
  18. +72 −0 depends/patches/native_mac_alias/python3.patch
  19. +49 −0 depends/patches/qt/fix-xcb-include-order.patch
  20. +11 −0 depends/patches/qt/fix_qt_pkgconfig.patch
  21. +44 −0 depends/patches/qt/mingw-uuidof.patch
  22. +37 −0 depends/patches/qt/pidlist_absolute.patch
  23. +10 −0 depends/patches/qt46/stlfix.patch
  24. +35 −0 depends/patches/xextproto/fix_aarch64_build.patch
  25. +22 −0 depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch
  26. +22 −0 depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch
  27. +1 −1 doc/Doxyfile
  28. +2 −2 doc/README.md
  29. +3 −3 doc/README_windows.md
  30. +5 −6 doc/release-notes.md
  31. +0 −37 index.md
  32. +1 −1 share/genbuild.sh
  33. +1 −1 share/qt/Info.plist.in
  34. +1 −1 src/Makefile.am
  35. +1 −7 src/Makefile.qt.include
  36. +1 −1 src/clientversion.cpp
  37. +3 −3 src/clientversion.h
  38. +2 −2 src/esbcoin-cli-res.rc
  39. +2 −2 src/esbcoin-cli.cpp
  40. +1 −1 src/esbcoin-tx.cpp
  41. +2 −2 src/esbcoind-res.rc
  42. +3 −3 src/esbcoind.cpp
  43. +5 −5 src/init.cpp
  44. +1 −1 src/net.cpp
  45. +3 −3 src/qt/askpassphrasedialog.cpp
  46. +122 −63 src/qt/bitcoingui.cpp
  47. +1 −2 src/qt/bitcoingui.h
  48. +3 −1 src/qt/blockexplorer.cpp
  49. +1 −1 src/qt/editaddressdialog.cpp
  50. +5 −5 src/qt/esbcoin.cpp
  51. +4 −4 src/qt/esbcoin.qrc
  52. +7 −7 src/qt/esbcoinstrings.cpp
  53. +5 −5 src/qt/forms/bip38tooldialog.ui
  54. +0 −13 src/qt/forms/blockexplorer.ui
  55. +4 −4 src/qt/forms/coincontroldialog.ui
  56. +1 −1 src/qt/forms/helpmessagedialog.ui
  57. +3 −3 src/qt/forms/intro.ui
  58. +2 −2 src/qt/forms/multisenddialog.ui
  59. +1 −1 src/qt/forms/multisigdialog.ui
  60. +5 −5 src/qt/forms/obfuscationconfig.ui
  61. +148 −7 src/qt/forms/optionsdialog.ui
  62. +1 −1 src/qt/forms/overviewpage.ui
  63. +2 −2 src/qt/forms/receivecoinsdialog.ui
  64. +1 −1 src/qt/forms/rpcconsole.ui
  65. +10 −10 src/qt/forms/sendcoinsdialog.ui
  66. +2 −2 src/qt/forms/sendcoinsentry.ui
  67. +4 −4 src/qt/forms/signverifymessagedialog.ui
  68. +1 −1 src/qt/forms/toolspage.ui
  69. +11 −11 src/qt/forms/tradingdialog.ui
  70. +3 −2 src/qt/guiconstants.h
  71. +10 −3 src/qt/guiutil.cpp
  72. +1 −1 src/qt/intro.cpp
  73. +3 −3 src/qt/obfuscationconfig.cpp
  74. +87 −0 src/qt/optionsdialog.cpp
  75. +11 −0 src/qt/optionsdialog.h
  76. +43 −0 src/qt/optionsmodel.cpp
  77. +5 −1 src/qt/optionsmodel.h
  78. +15 −7 src/qt/overviewpage.cpp
  79. +18 −0 src/qt/receivecoinsdialog.cpp
  80. +6 −3 src/qt/receivecoinsdialog.h
  81. +36 −23 src/qt/recentrequeststablemodel.cpp
  82. +4 −2 src/qt/recentrequeststablemodel.h
  83. +85 −16 src/qt/res/css/default.css
  84. +109 −32 src/qt/res/dark/css/dark.css
  85. BIN src/qt/res/dark/icons/esbcoin.icns
  86. BIN src/qt/res/dark/icons/esbcoin_testnet.ico
  87. BIN src/qt/res/dark/icons/esbcoin_testnet.png
  88. BIN src/qt/res/dark/images/about.png
  89. BIN src/qt/res/dark/images/esbcoin_logo_horizontal.png
  90. BIN src/qt/res/dark/images/splash.png
  91. BIN src/qt/res/dark/images/splash_testnet.png
  92. +4 −4 src/qt/res/esbcoin-qt-res.rc
  93. BIN src/qt/res/icons/esbcoin.icns
  94. BIN src/qt/res/icons/esbcoin_testnet.ico
  95. BIN src/qt/res/icons/esbcoin_testnet.png
  96. BIN src/qt/res/images/about.png
  97. BIN src/qt/res/images/esbcoin_logo_horizontal.png
  98. BIN src/qt/res/images/splash.png
  99. BIN src/qt/res/images/splash_testnet.png
  100. +1 −1 src/qt/rpcconsole.cpp
  101. +1 −1 src/qt/sendcoinsdialog.cpp
  102. +7 −7 src/qt/splashscreen.cpp
  103. +1 −1 src/qt/test/test_main.cpp
  104. +2 −2 src/qt/toolspage.cpp
  105. +7 −3 src/qt/transactiontablemodel.cpp
  106. +5 −5 src/qt/transactionview.cpp
  107. +3 −3 src/qt/utilitydialog.cpp
  108. +0 −8 src/qt/walletframe.cpp
  109. +0 −2 src/qt/walletframe.h
  110. +114 −39 src/qt/walletmodel.cpp
  111. +25 −3 src/qt/walletmodel.h
  112. +5 −6 src/qt/walletview.cpp
  113. +5 −5 src/qt/walletview.h
  114. +1 −1 src/qt/winshutdownmonitor.cpp
  115. +6 −6 src/rpcdump.cpp
  116. +1 −1 src/rpcmasternode.cpp
  117. +3 −3 src/rpcmining.cpp
  118. +3 −3 src/rpcmisc.cpp
  119. +2 −2 src/rpcnet.cpp
  120. +2 −2 src/rpcrawtransaction.cpp
  121. +1 −1 src/timedata.cpp
  122. +18 −9 src/wallet.cpp
@@ -68,7 +68,6 @@ libconftest.dylib*
*.pyc
*.o
*.o-*
*.patch
.esbcoin
*.a
*.pb.cc
@@ -123,6 +122,7 @@ cache/
share/BitcoindComparisonTool.jar

!src/leveldb*/Makefile
!depends/Makefile

.vscode
.cproject

This file was deleted.

Oops, something went wrong.
@@ -2,7 +2,7 @@ Copyright (c) 2009-2015 Bitcoin Developers
Copyright (c) 2014-2015 Dash Developers
Copyright (c) 2015-2017 PIVX Developers
Copyright (C) 2017-2018 The XDNA Core Developers
Copyright (c) 2018-2019 e-Sport Betting Coin developers
Copyright (c) 2018-2019 ESBC Core developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1,4 +1,4 @@
Building esbcoin
Building ESBC

Use the autogen script to prepare the build environment.

@@ -1,4 +1,4 @@
e-Sport Betting Coin integration/staging repository
ESBC Core integration/staging repository
======================================
More information at (http://esbproject.online/)
Visit our ANN thread at [BitcoinTalk](https://bitcointalk.org/index.php?topic=4889530.0), join ou group at [Discord] (https://discord.gg/C6t23JH).

This file was deleted.

Oops, something went wrong.
@@ -3,10 +3,10 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 4)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_BUILD, 6)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([ESportBettingCoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[http://esbproject.online/],[esbcoin])
define(_COPYRIGHT_YEAR, 2019)
AC_INIT([ESBC Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[http://esbproject.online/],[esbcoin])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/esbcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
@@ -21,14 +21,14 @@ Build-Depends: debhelper,
libprotobuf-dev, protobuf-compiler
Standards-Version: 1.0
Homepage: http://esbproject.online/
Vcs-Git: https://github.com/BlockchainFor/ESportBettingCoin.git
Vcs-Browser: https://github.com/BlockchainFor/ESportBettingCoin
Vcs-Git: https://github.com/BlockchainFor/ESBC2.git
Vcs-Browser: https://github.com/BlockchainFor/ESBC2

Package: esbcoind
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer network based digital currency - daemon
ESportBettingCoin is a free open source peer-to-peer electronic cash system that
ESBC daemon is a free open source peer-to-peer electronic cash system that
is completely decentralized, without the need for a central server or
trusted parties. Users hold the crypto keys to their own money and
transact directly with each other, with the help of a P2P network to
@@ -44,7 +44,7 @@ Package: esbcoin-qt
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: peer-to-peer network based digital currency - Qt GUI
ESportBettingCoin is a free open source peer-to-peer electronic cash system that
ESBC wallet is a free open source peer-to-peer electronic cash system that
is completely decentralized, without the need for a central server or
trusted parties. Users hold the crypto keys to their own money and
transact directly with each other, with the help of a P2P network to
@@ -53,4 +53,4 @@ Description: peer-to-peer network based digital currency - Qt GUI
Full transaction history is stored locally at each client. This
requires 1+ GB of space, slowly growing.
.
This package provides esbcoin-qt, a GUI for ESportBettingCoin based on Qt.
This package provides esbcoin-qt, a GUI for ESBC wallet based on Qt.
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Name=esbcoin
Comment=ESportBettingCoin P2P Cryptocurrency
Comment=ESBC P2P Cryptocurrency
Exec=esbcoin-qt %u
Terminal=false
Type=Application
@@ -4,7 +4,7 @@

# Network-related settings:

# Run on the test network instead of the real ESportBettingCoin network.
# Run on the test network instead of the real ESBC network.
#testnet=0

# Run a regression test network
@@ -101,14 +101,14 @@
# both prior transactions and several dozen future transactions.
#keypool=100

# Pay an optional transaction fee every time you send ESportBettingCoins. Transactions with fees
# Pay an optional transaction fee every time you send ESBC. Transactions with fees
# are more likely than free transactions to be included in generated blocks, so may
# be validated sooner.
#paytxfee=0.00

# User interface options

# Start ESportBettingCoin minimized
# Start ESBC wallet minimized
#min=1

# Minimize to the system tray
Oops, something went wrong.

0 comments on commit 4a1f073

Please sign in to comment.