Merge branch 'amber-dev' of http://github.com/ambertime/amberchain in…

…to amber-dev
ItMrj · Sep 11, 2018 · d9e7d5e · d9e7d5e
2 parents 71c105c + 84a5c3b
commit d9e7d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/core/main.cpp b/src/core/main.cpp
@@ -4512,11 +4512,12 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
                             return false;
                         }
                     }
-                    else if (txFee > 0)
-                    {
-                        LogInvalidBlock(block, pindex, "AcceptBlock(): FAIL.  Block should have an admin fee in the coinbase tx if there is a tx fee.\n");
-                        return false;
-                    }
+                    // remove this check temporarily, as it was causing problems
+                    // else if (txFee > 0 && adminFeeRatio > 0)
+                    // {
+                    //     LogInvalidBlock(block, pindex, "AcceptBlock(): FAIL.  Block should have an admin fee in the coinbase tx if there is a tx fee.\n");
+                    //     return false;
+                    // }
                 }
             }
         }

diff --git a/src/rpc/rpcstreams.cpp b/src/rpc/rpcstreams.cpp
@@ -3337,7 +3337,8 @@ Value appendrawsendfrom(const Array& params, bool fHelp)
     Array unspentItems = listunspent(listunspent_params, fHelp).get_array();
 
     std::string rawtx = params[0].get_str();
-    unsigned int nSize = rawtx.length();
+    // we estimate that this function will add around 500 bytes to the TX (generous allowance)
+    unsigned int nSize = rawtx.length() + 500;
 
     // estimate the needed tx fee
     unsigned int minRelayTxFee = StreamUtils::GetMinimumRelayTxFee();