.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -1,7 +1,24 @@
-Bata Core integration/staging tree
+Links
 ==================================
 
-https://fixedtradecoin.org
+https://bata.io
+
+https://bata.digital
+
+https://batacrypto.imgbb.com/
+
+https://bata.io/links/
+
+Blockchain Explorer: https://chainz.cryptoid.info/bta/
+
+https://coinmarketcap.com/currencies/bata/
+
+https://www.coingecko.com/en/coins/bata
+
+https://bitcointalk.org/index.php?topic=2297895.msg23319563#msg23319563
+
+Bata Core integration/staging tree
+==================================
 
 Linux Build Instructions and Notes
 ==================================
@@ -32,7 +49,7 @@ Build
 ----------------------
 1.  Clone the source:
 
-        git clone https://github.com/bata/bata.git
+        git clone https://github.com/BTA-BATA/Bataoshi.git
 
 2.  Build Bata Core:
 
@@ -58,3 +75,91 @@ See (doc/build-osx.md) for instructions on building on Mac OS X.
 Windows (64/32 bit) Build Instructions and Notes
 =====================================
 See (doc/build-windows.md) for instructions on building on Windows 64/32 bit.
+
+
+
+Coin Specs
+=====================================
+
+
+Multi-algo
+
+Independent algorithm chains
+
+Six Algorithm/s:  
+
+Sha256d
+Scrypt
+Nist5
+Lyra2z
+x11
+x16r
+
+Dynamic Blocks
+
+Based on block height and difficulty ( means no cheap blocks )
+
+Instamine protection
+
+Instamine protection will trigger after 5 blocks of single algo are mined in short period of time.
+
+Deadlock protection
+
+Difficulty is reduced even when no new blocks are found, new blocks are mined much faster even after very high hashrate period. This prevents "stuck chain" issues.
+
+Spork control over block processing
+
+The  ability to stop the blockchain anytime by sporks manually if any kind of dangerous activity in network is detected. We have full control of block processing without need to wallet upgrade.
+
+
+Masternode Collateral  : 10,000 BTA
+Masternode Reward : Dynamic reward of up to 0.25 BTA
+
+Circulating 5,055,187 BTA (25/07/2021)
+
+Max Supply: 10,000,000 BTA
+
+First block 2015-05-08 22:20:38
+
+
+
+
+Mining Pool Requirements
+=====================================
+
+
+Each wallet requires separate address.
+
+1% Dev fee to: B689SM77Pe56wJze6KPywtKkva9rhPZZUc - Or blocks will be rejected
+----------------------
+
+
+Pools have to start daemons with parameter "algo=sha256d" (or scrypt, nist5, lyra2z, x11, x16r) in conf file or in command line directly.
+
+ Pools can check their settings with RPC command 
+
+        getmininginfo:
+        {
+          "blocks": 1110073,
+          "currentblockweight": 4000,
+          "currentblocktx": 0,
+          "difficulty": 6.964176971960165,
+          "algo": "lyra2z",
+          "networkhashps": 94.36438084953204,
+          "pooledtx": 0,
+          "chain": "main",
+          "warnings": ""
+        }(edited)
+
+
+Please check if you have this commit applied on yiimp (if using yiimp):
+
+        https://github.com/tpruvot/yiimp/commit/9dbce85dcc2137e563e87659f9827aa7e4be3244
+        GitHub
+        stratum: dev/charity fees for coins with masternodes (#276) · tpr...
+
+
+
+
+
+

configure.ac

@@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 17)
-define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 15)
+define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_BUILD, 17)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2018)
+define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bata Core]])
 AC_INIT([Bata Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bata/bata/issues],[bitcoin],[https://bata.io/])

depends/packages/zeromq.mk

@@ -1,8 +1,8 @@
 package=zeromq
-$(package)_version=4.2.3
+$(package)_version=4.3.1
 $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=8f1e2b2aade4dbfde98d82366d61baef2f62e812530160d2e6d0a5bb24e40bc0
+$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
 $(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch
 
 define $(package)_set_vars

doc/dependencies.md

@@ -26,5 +26,5 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
 | Qt | [5.9.6](https://download.qt.io/official_releases/qt/) | 5.x | No |  |  |
 | XCB |  |  |  |  | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) |
 | xkbcommon |  |  |  |  | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L86) (Linux only) |
-| ZeroMQ | [4.2.3](https://github.com/zeromq/libzmq/releases) |  | No |  |  |
+| ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) |  | No |  |  |
 | zlib | [1.2.11](https://zlib.net/) |  |  |  | No |

doc/release-notes.md

@@ -2,7 +2,7 @@ Bitcoin Core version 0.17.x is now available from:
 
   <https://bitcoincore.org/bin/bitcoin-core-0.17.x/>
 
-This is a new major version release, including new features, various bugfixes
+This is a new minor version release, including new features, various bugfixes
 and performance improvements, as well as updated translations.
 
 Please report bugs using the issue tracker at GitHub:
@@ -60,7 +60,16 @@ support versions of macOS older than 10.10.
 Notable changes
 ===============
 
-(todo)
+Documentation
+-------------
+
+- A new document introduces Bitcoin Core's BIP174
+  [Partially-Signed Bitcoin Transactions (PSBT)](https://github.com/bitcoin/bitcoin/blob/0.17/doc/psbt.md)
+  interface, which is used to allow multiple programs to collaboratively
+  work to create, sign, and broadcast new transactions.  This is useful
+  for offline (cold storage) wallets, multisig wallets, coinjoin
+  implementations, and many other cases where two or more programs need
+  to interact to generate a complete transaction.
 
 0.17.x change log
 =================

src/Makefile.test.include

@@ -97,6 +97,7 @@ BITCOIN_TESTS =\
 if ENABLE_WALLET
 BITCOIN_TESTS += \
   wallet/test/accounting_tests.cpp \
+  wallet/test/db_tests.cpp \
   wallet/test/psbt_wallet_tests.cpp \
   wallet/test/wallet_tests.cpp \
   wallet/test/wallet_crypto_tests.cpp \

src/bench/coin_selection.cpp

@@ -33,7 +33,7 @@ static void addCoin(const CAmount& nValue, const CWallet& wallet, std::vector<Ou
 // (https://github.com/bitcoin/bitcoin/issues/7883#issuecomment-224807484)
 static void CoinSelection(benchmark::State& state)
 {
-    const CWallet wallet("dummy", WalletDatabase::CreateDummy());
+    const CWallet wallet(WalletLocation(), WalletDatabase::CreateDummy());
     LOCK(wallet.cs_wallet);
 
     // Add coins.
@@ -57,7 +57,7 @@ static void CoinSelection(benchmark::State& state)
 }
 
 typedef std::set<CInputCoin> CoinSet;
-static const CWallet testWallet("dummy", WalletDatabase::CreateDummy());
+static const CWallet testWallet(WalletLocation(), WalletDatabase::CreateDummy());
 std::vector<std::unique_ptr<CWalletTx>> wtxn;
 
 // Copied from src/wallet/test/coinselector_tests.cpp

src/bitcoind.cpp

@@ -23,6 +23,9 @@
 #include <walletinitinterface.h>
 
 #include <stdio.h>
+// VELES BEGIN
+#include <masternodeconfig.h>
+// VELES END
 
 /* Introduction text for doxygen: */
 
@@ -107,6 +110,17 @@ static bool AppInit(int argc, char* argv[])
             return false;
         }
 
+        // VELES BEGIN
+        // Dash
+        // parse masternode.conf
+        std::string strErr;
+        if(!masternodeConfig.read(strErr)) {
+            fprintf(stderr,"Error reading masternode configuration file: %s\n", strErr.c_str());
+            return false;
+        }
+        //
+        // VELES END
+
         // Error out when loose non-argument tokens are encountered on command line
         for (int i = 1; i < argc; i++) {
             if (!IsSwitchChar(argv[i][0])) {

src/init.cpp

@@ -335,10 +335,10 @@ void Shutdown()
         LogPrintf("%s: Unable to remove pidfile: %s\n", __func__, e.what());
     }
 #endif
+    g_wallet_init_interface.Close();
     UnregisterAllValidationInterfaces();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
     GetMainSignals().UnregisterWithMempoolSignals(mempool);
-    g_wallet_init_interface.Close();
     globalVerifyHandle.reset();
     ECC_Stop();
     LogPrintf("%s: done\n", __func__);
@@ -587,7 +587,7 @@ void SetupServerArgs()
 std::string LicenseInfo()
 {
     const std::string URL_SOURCE_CODE = "<https://github.com/bata/bata>";
-    const std::string URL_WEBSITE = "<https://fixedtradecoin.org>";
+    const std::string URL_WEBSITE = "<https://bata.io>";
 
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" +
            "\n" +

src/masternodeman.cpp

@@ -151,7 +151,10 @@ bool CMasternodeMan::PoSeBan(const COutPoint &outpoint)
 
 void CMasternodeMan::Check()
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs);
+    LOCK2(cs_main, cs);
+    // FXTC END
 
     LogPrint(BCLog::MASTERNODE, "CMasternodeMan::Check -- nLastWatchdogVoteTime=%d, IsWatchdogActive()=%d\n", nLastWatchdogVoteTime, IsWatchdogActive());
 
@@ -1452,7 +1455,10 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
 
 void CMasternodeMan::UpdateLastPaid(const CBlockIndex* pindex)
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs);
+    LOCK2(cs_main, cs);
+    // FXTC END
 
     if(fLiteMode || !masternodeSync.IsWinnersListSynced() || mapMasternodes.empty()) return;
 
@@ -1510,7 +1516,10 @@ void CMasternodeMan::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
 
 void CMasternodeMan::CheckMasternode(const CPubKey& pubKeyMasternode, bool fForce)
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs)
+    LOCK2(cs_main, cs);
+    // FXTC END
     for (auto& mnpair : mapMasternodes) {
         if (mnpair.second.pubKeyMasternode == pubKeyMasternode) {
             mnpair.second.Check(fForce);