Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b2dfb627cc | |||
| d0a76f8ae2 |
+1
-1
@@ -8,7 +8,7 @@
|
||||
// These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it
|
||||
#define CLIENT_VERSION_MAJOR 5
|
||||
#define CLIENT_VERSION_MINOR 9
|
||||
#define CLIENT_VERSION_REVISION 14
|
||||
#define CLIENT_VERSION_REVISION 16
|
||||
#define CLIENT_VERSION_BUILD 0
|
||||
|
||||
// Converts the parameter X to a string after macro replacement on X has been performed.
|
||||
|
||||
+30
-1
@@ -3771,8 +3771,9 @@ bool FastImportBlockFile()
|
||||
int64_t nFees = 0;
|
||||
unsigned int nTxPos = nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK, CLIENT_VERSION)
|
||||
- (2 * GetSizeOfCompactSize(0)) + GetSizeOfCompactSize(block.vtx.size());
|
||||
for (const CTransaction& tx : block.vtx)
|
||||
for (size_t nTxIdx = 0; nTxIdx < block.vtx.size(); nTxIdx++)
|
||||
{
|
||||
const CTransaction& tx = block.vtx[nTxIdx];
|
||||
uint256 hashTx = tx.GetHash();
|
||||
CDiskTxPos posThisTx(1, nBlockPos, nTxPos);
|
||||
txdb.UpdateTxIndex(hashTx, CTxIndex(posThisTx, tx.vout.size()));
|
||||
@@ -3790,6 +3791,18 @@ bool FastImportBlockFile()
|
||||
CUtxoEntry utxo;
|
||||
if (txdb.ReadUtxo(txin.prevout.hash, txin.prevout.n, utxo))
|
||||
nTxValueIn += utxo.nValue;
|
||||
if (fAddressIndex && !utxo.scriptPubKey.empty() && utxo.nValue != 0)
|
||||
{
|
||||
int nAType; uint160 aHash;
|
||||
if (GetAddressFromScript(utxo.scriptPubKey, nAType, aHash))
|
||||
{
|
||||
txdb.EraseAddressUtxo(nAType, aHash, txin.prevout.hash, txin.prevout.n);
|
||||
int64_t nABal = 0;
|
||||
txdb.ReadAddressBalance(nAType, aHash, nABal);
|
||||
nABal -= utxo.nValue;
|
||||
txdb.WriteAddressBalance(nAType, aHash, nABal);
|
||||
}
|
||||
}
|
||||
txdb.EraseUtxo(txin.prevout.hash, txin.prevout.n);
|
||||
}
|
||||
nBlockValueIn += nTxValueIn;
|
||||
@@ -3808,6 +3821,20 @@ bool FastImportBlockFile()
|
||||
utxo.fCoinStake = tx.IsCoinStake();
|
||||
utxo.nTxTime = tx.nTime;
|
||||
txdb.WriteUtxo(hashTx, k, utxo);
|
||||
if (fAddressIndex && !tx.vout[k].scriptPubKey.empty() && tx.vout[k].nValue != 0)
|
||||
{
|
||||
int nAType; uint160 aHash;
|
||||
if (GetAddressFromScript(tx.vout[k].scriptPubKey, nAType, aHash))
|
||||
{
|
||||
txdb.WriteAddressUtxo(nAType, aHash, hashTx, k,
|
||||
tx.vout[k].nValue, pindexNew->nHeight, tx.vout[k].scriptPubKey);
|
||||
int64_t nABal = 0;
|
||||
txdb.ReadAddressBalance(nAType, aHash, nABal);
|
||||
nABal += tx.vout[k].nValue;
|
||||
txdb.WriteAddressBalance(nAType, aHash, nABal);
|
||||
txdb.WriteAddressTxId(nAType, aHash, pindexNew->nHeight, (int)nTxIdx, hashTx);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3859,6 +3886,8 @@ bool FastImportBlockFile()
|
||||
// Final commit
|
||||
if (pindexBest)
|
||||
{
|
||||
if (fAddressIndex)
|
||||
UpdateAddressIndexSyncState(txdb, pindexBest);
|
||||
txdb.WriteHashBestChain(hashBestChain);
|
||||
|
||||
// Write sync checkpoint
|
||||
|
||||
@@ -1453,6 +1453,7 @@ void TrianglesGUI::menuOperationsRequested()
|
||||
QAction* unlockWalletStaking = menu.addAction(QIcon(":/menu_16/unlock"), tr("&Unlock Wallet...").remove('&').remove("..."));
|
||||
QAction* lockWallet = menu.addAction(QIcon(":/menu_16/lock"), tr("&Lock Wallet...").remove('&').remove("..."));
|
||||
QAction* changePassword = menu.addAction(QIcon(":/menu_16/passphrase"), tr("&Change Passphrase...").remove('&').remove("..."));
|
||||
QAction* hdSeed = menu.addAction(QIcon(":/menu_16/passphrase"), tr("Seed Phrase (HD Backup)..."));
|
||||
QAction* signMessage = menu.addAction(QIcon(":/menu_16/sign"), tr("Sign &message...").remove('&').remove("..."));
|
||||
QAction* verifySignature = menu.addAction(QIcon(":/menu_16/verify"), tr("&Verify message...").remove('&').remove("..."));
|
||||
|
||||
@@ -1513,6 +1514,10 @@ void TrianglesGUI::menuOperationsRequested()
|
||||
if (walletModel->getEncryptionStatus() == WalletModel::Unlocked || walletModel->getEncryptionStatus() == WalletModel::Locked)
|
||||
changePassphrase();
|
||||
}
|
||||
else if (selected == hdSeed)
|
||||
{
|
||||
hdSeedManager();
|
||||
}
|
||||
else if (selected == signMessage)
|
||||
{
|
||||
gotoSignMessageTab();
|
||||
|
||||
Reference in New Issue
Block a user