merge master: fix bad block generation for too many new accounts in full blocks

Author: CoinFuMasterShifu

src/node/block/body/generator.cpp

@@ -134,27 +134,30 @@ BodyContainer BlockGenerator::gen_block(NonzeroHeight height,
         throw std::runtime_error("Too many payments");
     }
 
-    // filter valid payments to survive self send
-    std::vector<TransferTxExchangeMessage> validTransfers;
-    for (auto& pmsg : transfers) {
-        if (nas.getId(pmsg.toAddr, true).value() == pmsg.from_id()) {
-            // This should not be possible because self sending transactions
-            // are detected on entering mempool.
-            spdlog::warn("Impossible self send detected.");
-            continue;
-        }
-        validTransfers.push_back(pmsg);
-    }
 
     TransferSection trs;
-    for (auto& pmsg : validTransfers) {
+    for (auto& pmsg : transfers) {
         size_t size { 10 + nas.binarysize() + RewardSection::binary_size + trs.binarysize() };
         assert(size <= MAXBLOCKSIZE);
         size_t remaining = MAXBLOCKSIZE - size;
         if (remaining < 99)
             break;
         bool allowNewAddress { remaining >= 99 + 20 };
         auto toId = nas.getId(pmsg.toAddr, allowNewAddress);
+
+        // filter out invalid self send 
+        if (toId == pmsg.from_id()) {
+            // This should not be possible because self sending transactions
+            // are detected on entering mempool.
+            spdlog::warn("Impossible self send detected.");
+            // we can continue because nas.getId only assigns a new id to an address if that address
+            // has not existed before and this cannot happen for toId == pmsg.from_id() because in this case
+            // the sender must have positive balance (there are no zero value transactions) and therefore
+            // has existed in the chain before.
+            // => we know that  nas.getId did not assign a new account id to pmsg.toAddr so we can continue without
+            // violating block policy that every account Id must be referred.
+            continue;
+        }
         if (!toId)
             break;
 

src/node/chainserver/state/transactions/block_applier.cpp

@@ -298,7 +298,7 @@ Preparation BlockApplier::Preparer::prepare(const BodyView& bv, const NonzeroHei
     for (size_t i = 0; i < newAccounts.size(); ++i) {
         auto& acc = newAccounts[i];
         if (acc.in().is_zero()) {
-            throw Error(EIDPOLICY); // id was not referred
+            throw Error(EIDNOTREFERENCED); // id was not referred
         }
         if (acc.out() > Funds::zero()) // Not (acc.out() > acc.in()) because we do not like chains of new accounts
             throw Error(EBALANCE); // insufficient balance

src/shared/src/general/errors.hpp

@@ -40,7 +40,7 @@
     XX(17, EMROOT, "merkle root mismatch")                                         \
     XX(18, ENOBLOCK, "peer did not provide block")                                 \
     XX(19, EUNREQUESTED, "received unrequested message")                           \
-    XX(20, EIDPOLICY, "block transaction id policy violated")                      \
+    XX(20, EIDNOTREFERENCED, "account id not referenced")                          \
     XX(21, EADDRPOLICY, "new address policy violated")                             \
     XX(22, EBALANCE, "insufficient balance")                                       \
     XX(23, ECORRUPTEDSIG, "corrupted signature")                                   \
@@ -128,6 +128,7 @@
     XX(128, EFROZENACC, "account is frozen and can't send")                        \
     XX(129, EHEADERRANGE, "invalid header range")                                  \
     XX(130, ERTCDISABLED, "WebRTC disabled, cannot receive message")               \
+    XX(131, EIDPOLICY, "block transaction id policy violated")                     \
     XX(198, EBATCHSIZE2, "invalid batch size")                                     \
     XX(199, EBATCHSIZE3, "invalid batch size")                                     \
     /*200 - 299: Errors not leading to ban*/                                       \