Version 1.1.0.0 update

This commit is contained in:
transcoder
2014-02-12 04:09:36 -07:00
parent 58decdbca7
commit f03acc635f
481 changed files with 156398 additions and 57772 deletions

View File

@@ -2,6 +2,8 @@
#define WALLETMODEL_H
#include <QObject>
#include <vector>
#include <map>
#include "allocators.h" /* for SecureString */
@@ -9,6 +11,12 @@ class OptionsModel;
class AddressTableModel;
class TransactionTableModel;
class CWallet;
class CKeyID;
class CPubKey;
class COutput;
class COutPoint;
class uint256;
class CCoinControl;
QT_BEGIN_NAMESPACE
class QTimer;
@@ -26,6 +34,7 @@ public:
class WalletModel : public QObject
{
Q_OBJECT
public:
explicit WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent = 0);
~WalletModel();
@@ -53,8 +62,8 @@ public:
OptionsModel *getOptionsModel();
AddressTableModel *getAddressTableModel();
TransactionTableModel *getTransactionTableModel();
qint64 getBalance() const;
qint64 getBalance(const CCoinControl *coinControl=NULL) const;
qint64 getUnconfirmedBalance() const;
qint64 getImmatureBalance() const;
int getNumTransactions() const;
@@ -66,7 +75,7 @@ public:
// Return status record for SendCoins, contains error id + information
struct SendCoinsReturn
{
SendCoinsReturn(StatusCode status,
SendCoinsReturn(StatusCode status=Aborted,
qint64 fee=0,
QString hex=QString()):
status(status), fee(fee), hex(hex) {}
@@ -76,7 +85,7 @@ public:
};
// Send coins to a list of recipients
SendCoinsReturn sendCoins(const QList<SendCoinsRecipient> &recipients);
SendCoinsReturn sendCoins(const QList<SendCoinsRecipient> &recipients, const CCoinControl *coinControl=NULL);
// Wallet encryption
bool setWalletEncrypted(bool encrypted, const SecureString &passphrase);
@@ -108,6 +117,15 @@ public:
UnlockContext requestUnlock();
bool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
void getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs);
void listCoins(std::map<QString, std::vector<COutput> >& mapCoins) const;
bool isLockedCoin(uint256 hash, unsigned int n) const;
void lockCoin(COutPoint& output);
void unlockCoin(COutPoint& output);
void listLockedCoins(std::vector<COutPoint>& vOutpts);
private:
CWallet *wallet;
@@ -147,8 +165,8 @@ signals:
// this means that the unlocking failed or was cancelled.
void requireUnlock();
// Asynchronous error notification
void error(const QString &title, const QString &message, bool modal);
// Asynchronous message notification
void message(const QString &title, const QString &message, unsigned int style);
public slots:
/* Wallet status might have changed */
@@ -161,5 +179,4 @@ public slots:
void pollBalanceChanged();
};
#endif // WALLETMODEL_H