Document 2027 awards roadmap direction

contrib/build-linux.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 JOBS="${JOBS:-1}"
 MODE="${MODE:-daemon}"
+DAEMON_TARGETS="${DAEMON_TARGETS:-agrariand agrarian-cli agrarian-tx}"
 HOST="${HOST:-$("$ROOT/depends/config.guess")}"
 PREFIX="$ROOT/depends/$HOST"
 BASE_CONFIG="$PREFIX/share/config.site"
@@ -50,7 +51,7 @@ case "$MODE" in
       --disable-bench \
       --disable-zmq \
       --with-miniupnpc=no \
-      CXXFLAGS="${CXXFLAGS:--O0 -g0 --param ggc-min-expand=1 --param ggc-min-heapsize=32768}"
+      CXXFLAGS="${CXXFLAGS:--O0 -g0 --param ggc-min-expand=20 --param ggc-min-heapsize=131072}"
 
     echo "Cleaning stale target objects before compiling..."
     make clean
@@ -65,5 +66,9 @@ case "$MODE" in
     ;;
 esac
 
+if [[ "$MODE" == "daemon" ]]; then
+  make -C src -j"$JOBS" $DAEMON_TARGETS
+else
   make -j"$JOBS"
+fi
 echo "Linux $MODE build complete."

src/chainparams.cpp

@@ -217,7 +217,7 @@ public:
 
         convertSeed6(vFixedSeeds, pnSeed6_main, ARRAYLEN(pnSeed6_main));
 
-        fMiningRequiresPeers = true;
+        fMiningRequiresPeers = false;
         fAllowMinDifficultyBlocks = false;
         fDefaultConsistencyChecks = false;
         fRequireStandard = true;

src/primitives/block.cpp

@@ -15,10 +15,7 @@
 
 uint256 CBlockHeader::GetHash() const
 {
-    if(nVersion < 4)
     return HashQuark(BEGIN(nVersion), END(nNonce));
-
-    return Hash(BEGIN(nVersion), END(nAccumulatorCheckpoint));
 }
 
 uint256 CBlock::BuildMerkleTree(bool* fMutated) const

src/rpc/mining.cpp

@@ -460,7 +460,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     if (strMode != "template")
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
 
-    if (vNodes.empty())
+    if (vNodes.empty() && Params().MiningRequiresPeers())
         throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Agrarian is not connected!");
 
     if (IsInitialBlockDownload())
@@ -605,6 +605,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("curtime", pblock->GetBlockTime()));
     result.push_back(Pair("bits", strprintf("%08x", pblock->nBits)));
     result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight + 1)));
+    result.push_back(Pair("acc_checkpoint", pblock->nAccumulatorCheckpoint.GetHex()));
     result.push_back(Pair("votes", aVotes));
 
 

src/wallet/rpcwallet.cpp

@@ -914,9 +914,9 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
 
 UniValue sendmany(const UniValue& params, bool fHelp)
 {
-    if (fHelp || params.size() < 2 || params.size() > 4)
+    if (fHelp || params.size() < 2 || params.size() > 8)
         throw runtime_error(
-            "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" )\n"
+            "sendmany \"fromaccount\" {\"address\":amount,...} ( minconf \"comment\" subtractfeefrom )\n"
             "\nSend multiple times. Amounts are double-precision floating point numbers." +
             HelpRequiringPassphrase() + "\n"
 
@@ -929,6 +929,8 @@ UniValue sendmany(const UniValue& params, bool fHelp)
             "    }\n"
             "3. minconf                 (numeric, optional, default=1) Only use the balance confirmed at least this many times.\n"
             "4. \"comment\"             (string, optional) A comment\n"
+            "5. subtractfeefrom        (array, optional) A json array with addresses that pay the fee\n"
+            "\nAlso accepts Dash/PIVX-style sendmany arguments where comment is argument 5 and subtractfeefrom is argument 6.\n"
 
             "\nResult:\n"
             "\"transactionid\"          (string) The transaction id for the send. Only 1 transaction is created regardless of \n"
@@ -952,15 +954,31 @@ UniValue sendmany(const UniValue& params, bool fHelp)
 
     CWalletTx wtx;
     wtx.strFromAccount = strAccount;
-    if (params.size() > 3 && !params[3].isNull() && !params[3].get_str().empty())
+    int nCommentIndex = 3;
-        wtx.mapValue["comment"] = params[3].get_str();
+    int nSubtractFeeFromIndex = 4;
+    if (params.size() > 3 && params[3].isBool()) {
+        nCommentIndex = 4;
+        nSubtractFeeFromIndex = 5;
+    }
+
+    if (params.size() > nCommentIndex && !params[nCommentIndex].isNull() && params[nCommentIndex].isStr() && !params[nCommentIndex].get_str().empty())
+        wtx.mapValue["comment"] = params[nCommentIndex].get_str();
 
     set<CBitcoinAddress> setAddress;
+    set<string> setSubtractFeeFromAddress;
+    set<int> setSubtractFeeFromOutputs;
     vector<pair<CScript, CAmount> > vecSend;
 
+    if (params.size() > nSubtractFeeFromIndex && !params[nSubtractFeeFromIndex].isNull()) {
+        UniValue subtractFeeFrom = params[nSubtractFeeFromIndex].get_array();
+        for (unsigned int idx = 0; idx < subtractFeeFrom.size(); idx++)
+            setSubtractFeeFromAddress.insert(subtractFeeFrom[idx].get_str());
+    }
+
     CAmount totalAmount = 0;
     vector<string> keys = sendTo.getKeys();
-    for (const string& name_ : keys) {
+    for (unsigned int i = 0; i < keys.size(); i++) {
+        const string& name_ = keys[i];
         CBitcoinAddress address(name_);
         if (!address.IsValid())
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Agrarian address: ")+name_);
@@ -974,12 +992,21 @@ UniValue sendmany(const UniValue& params, bool fHelp)
         totalAmount += nAmount;
 
         vecSend.push_back(make_pair(scriptPubKey, nAmount));
+
+        if (setSubtractFeeFromAddress.count(name_))
+            setSubtractFeeFromOutputs.insert(i);
+    }
+
+    for (const string& name_ : setSubtractFeeFromAddress) {
+        if (!sendTo.exists(name_))
+            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, subtract fee from address not in send set: ")+name_);
     }
 
     EnsureWalletIsUnlocked();
 
-    // Check funds
+    // Check funds. Treat an empty fromaccount as whole-wallet spendable balance for
-    CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
+    // compatibility with modern Bitcoin-family payout callers.
+    CAmount nBalance = strAccount.empty() ? pwalletMain->GetBalance() : GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
     if (totalAmount > nBalance)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");
 
@@ -987,7 +1014,7 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     CReserveKey keyChange(pwalletMain);
     CAmount nFeeRequired = 0;
     string strFailReason;
-    bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, strFailReason);
+    bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, strFailReason, NULL, ALL_COINS, false, 0, &setSubtractFeeFromOutputs);
     if (!fCreated)
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, strFailReason);
     if (!pwalletMain->CommitTransaction(wtx, keyChange))

src/wallet/wallet.cpp

@@ -2094,11 +2094,13 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
     const CCoinControl* coinControl,
     AvailableCoinsType coin_type,
     bool useIX,
-    CAmount nFeePay)
+    CAmount nFeePay,
+    const std::set<int>* setSubtractFeeFromOutputs)
 {
     if (useIX && nFeePay < CENT) nFeePay = CENT;
 
     CAmount nValue = 0;
+    const bool fSubtractFeeFromAmount = setSubtractFeeFromOutputs && !setSubtractFeeFromOutputs->empty();
 
     for (const PAIRTYPE(CScript, CAmount) & s : vecSend) {
         if (nValue < 0) {
@@ -2126,13 +2128,29 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
                 txNew.vout.clear();
                 wtxNew.fFromMe = true;
 
-                CAmount nTotalValue = nValue + nFeeRet;
+                CAmount nTotalValue = nValue + (fSubtractFeeFromAmount ? 0 : nFeeRet);
                 double dPriority = 0;
 
                 // vouts to the payees
                 if (coinControl && !coinControl->fSplitBlock) {
-                    for (const PAIRTYPE(CScript, CAmount) & s : vecSend) {
+                    for (unsigned int i = 0; i < vecSend.size(); i++) {
-                        CTxOut txout(s.second, s.first);
+                        const PAIRTYPE(CScript, CAmount)& s = vecSend[i];
+                        CAmount nAmount = s.second;
+
+                        if(fSubtractFeeFromAmount && setSubtractFeeFromOutputs->count(i)) {
+                            CAmount nSubtractFee = nFeeRet / setSubtractFeeFromOutputs->size();
+                            if (i == (unsigned int)*setSubtractFeeFromOutputs->begin())
+                                nSubtractFee += nFeeRet % setSubtractFeeFromOutputs->size();
+
+                            nAmount -= nSubtractFee;
+                        }
+
+                        if (nAmount <= 0) {
+                            strFailReason = _("The transaction amount is too small to pay the fee");
+                            return false;
+                        }
+
+                        CTxOut txout(nAmount, s.first);
                         if (txout.IsDust(::minRelayTxFee)) {
                             strFailReason = _("Transaction amount too small");
                             return false;
@@ -2148,13 +2166,29 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
                     else
                         nSplitBlock = 1;
 
-                    for (const PAIRTYPE(CScript, CAmount) & s : vecSend) {
+                    for (unsigned int i = 0; i < vecSend.size(); i++) {
-                        for (int i = 0; i < nSplitBlock; i++) {
+                        const PAIRTYPE(CScript, CAmount)& s = vecSend[i];
-                            if (i == nSplitBlock - 1) {
+                        CAmount nAmount = s.second;
-                                uint64_t nRemainder = s.second % nSplitBlock;
+
-                                txNew.vout.push_back(CTxOut((s.second / nSplitBlock) + nRemainder, s.first));
+                        if(fSubtractFeeFromAmount && setSubtractFeeFromOutputs->count(i)) {
+                            CAmount nSubtractFee = nFeeRet / setSubtractFeeFromOutputs->size();
+                            if (i == (unsigned int)*setSubtractFeeFromOutputs->begin())
+                                nSubtractFee += nFeeRet % setSubtractFeeFromOutputs->size();
+
+                            nAmount -= nSubtractFee;
+                        }
+
+                        if (nAmount <= 0) {
+                            strFailReason = _("The transaction amount is too small to pay the fee");
+                            return false;
+                        }
+
+                        for (int j = 0; j < nSplitBlock; j++) {
+                            if (j == nSplitBlock - 1) {
+                                uint64_t nRemainder = nAmount % nSplitBlock;
+                                txNew.vout.push_back(CTxOut((nAmount / nSplitBlock) + nRemainder, s.first));
                             } else
-                                txNew.vout.push_back(CTxOut(s.second / nSplitBlock, s.first));
+                                txNew.vout.push_back(CTxOut(nAmount / nSplitBlock, s.first));
                         }
                     }
                 }

src/wallet/wallet.h

@@ -500,7 +500,8 @@ public:
         const CCoinControl* coinControl = NULL,
         AvailableCoinsType coin_type = ALL_COINS,
         bool useIX = false,
-        CAmount nFeePay = 0);
+        CAmount nFeePay = 0,
+        const std::set<int>* setSubtractFeeFromOutputs = NULL);
     bool CreateTransaction(CScript scriptPubKey, const CAmount& nValue, CWalletTx& wtxNew, CReserveKey& reservekey, CAmount& nFeeRet, std::string& strFailReason, const CCoinControl* coinControl = NULL, AvailableCoinsType coin_type = ALL_COINS, bool useIX = false, CAmount nFeePay = 0);
     bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey, std::string strCommand = "tx");
     bool AddAccountingEntry(const CAccountingEntry&, CWalletDB & pwalletdb);