Skip to content

Commit b1f3347

Browse files
Fix imagens and transactions
Accept 0 fee transactions with more size and fix QT image bug.
1 parent 9559095 commit b1f3347

File tree

6 files changed

+3
-4
lines changed

6 files changed

+3
-4
lines changed

src/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000;
6161
/** Default for accepting alerts from the P2P network. */
6262
static const bool DEFAULT_ALERTS = true;
6363
/** The maximum size for transactions we're willing to relay/mine */
64-
static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
64+
static const unsigned int MAX_STANDARD_TX_SIZE = 1000000;
6565
/** The maximum allowed number of signature check operations in a block (network rule) */
6666
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE / 50;
6767
/** Maximum number of signature check operations in an IsStandard() P2SH script */

src/qt/res/images/splash.png

-378 KB
Loading

src/qt/res/images/walletFrame.png

-378 KB
Loading
-378 KB
Loading

src/qt/splashscreen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle* networkStyle)
3636

3737
// define text to place
3838
QString titleText = tr("BitBlocks Core");
39-
QString versionText = QString(tr("Version v2.0-MAIN")).arg(QString::fromStdString(FormatFullVersion()));
39+
QString versionText = QString(tr("Version: 1.0")).arg(QString::fromStdString(FormatFullVersion()));
4040
QString copyrightTextBtc = QChar(0xA9) + QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
4141
QString copyrightTextDash = QChar(0xA9) + QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Dash Core developers"));
4242
QString copyrightTextPivx = QChar(0xA9) + QString(" 2015-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The PIVX Core developers"));

src/wallet.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,8 +2293,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
22932293
// If we made it here and we aren't even able to meet the relay fee on the next pass, give up
22942294
// because we must be at the maximum allowed fee.
22952295
if (nFeeNeeded < ::minRelayTxFee.GetFee(nBytes)) {
2296-
strFailReason = _("Transaction too large for fee policy");
2297-
return false;
2296+
22982297
}
22992298

23002299
if (nFeeRet >= nFeeNeeded) // Done, enough fee included

0 commit comments

Comments
 (0)