ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
jed
2012-10-15 16:15:19 -07:00
parent ac60bfbd43 36f6c4dac0
commit 856b36086f
6 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NetworkOPs.cpp
View File

@@ -901,7 +901,7 @@ Json::Value NetworkOPs::pubBootstrapAccountInfo(Ledger::ref lpAccepted, const Ne
jvObj["owner"] = getOwnerInfo(lpAccepted, naAccountID);
jvObj["ledger_closed_index"] = lpAccepted->getLedgerSeq();
jvObj["ledger_closed"] = lpAccepted->getHash().ToString();
jvObj["time"] = Json::Value::UInt(lpAccepted->getCloseTimeNC());
jvObj["ledger_closed_time"] = Json::Value::UInt(utFromSeconds(lpAccepted->getCloseTimeNC()));
return jvObj;
}
@@ -939,7 +939,7 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted)
jvObj["type"] = "ledgerClosed";
jvObj["ledger_closed_index"] = lpAccepted->getLedgerSeq();
jvObj["ledger_closed"] = lpAccepted->getHash().ToString();
jvObj["time"] = Json::Value::UInt(lpAccepted->getCloseTimeNC());
jvObj["ledger_closed_time"] = Json::Value::UInt(utFromSeconds(lpAccepted->getCloseTimeNC()));
BOOST_FOREACH(InfoSub* ispListener, mSubLedger)
{
@@ -964,7 +964,7 @@ void NetworkOPs::pubLedger(Ledger::ref lpAccepted)
jvObj["type"] = "ledgerClosedAccounts";
jvObj["ledger_closed_index"] = lpAccepted->getLedgerSeq();
jvObj["ledger_closed"] = lpAccepted->getHash().ToString();
jvObj["time"] = Json::Value::UInt(lpAccepted->getCloseTimeNC());
jvObj["ledger_closed_time"] = Json::Value::UInt(utFromSeconds(lpAccepted->getCloseTimeNC()));
jvObj["accounts"] = jvAccounts;
BOOST_FOREACH(InfoSub* ispListener, mSubLedgerAccounts)

3
src/PubKeyCache.cpp
View File

@@ -1,9 +1,6 @@
#include "PubKeyCache.h"
#include "Application.h"
#include <boost/interprocess/sync/scoped_lock.hpp>
CKey::pointer PubKeyCache::locate(const NewcoinAddress& id)
{
{ // is it in cache

5
src/RPCServer.cpp
View File

@@ -2046,9 +2046,14 @@ Json::Value RPCServer::doAccountTransactions(const Json::Value& params)
{
Transaction::pointer txn = theApp->getMasterTransaction().fetch(it->second, true);
if (!txn)
{
ret["transactions"].append(it->second.GetHex());
}
else
{
txn->setLedger(it->first);
ret["transactions"].append(txn->getJson(0));
}
}
return ret;

1
src/Wallet.cpp
View File

@@ -6,7 +6,6 @@
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <boost/interprocess/sync/scoped_lock.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/make_shared.hpp>

13
src/utils.cpp
View File

@@ -22,6 +22,7 @@ int iToSeconds(boost::posix_time::ptime ptWhen)
: (ptWhen-ptEpoch()).total_seconds();
}
// Convert our time in seconds to a ptime.
boost::posix_time::ptime ptFromSeconds(int iSeconds)
{
return iSeconds < 0
@@ -29,6 +30,18 @@ boost::posix_time::ptime ptFromSeconds(int iSeconds)
: ptEpoch() + boost::posix_time::seconds(iSeconds);
}
// Convert from our time to UNIX time in seconds.
uint64_t utFromSeconds(int iSeconds)
{
boost::posix_time::time_duration tdDelta =
boost::posix_time::ptime(boost::gregorian::date(2000, boost::gregorian::Jan, 1))
-boost::posix_time::ptime(boost::gregorian::date(1970, boost::gregorian::Jan, 1))
+boost::posix_time::seconds(iSeconds)
;
return tdDelta.total_seconds();
}
//
// Hex suport
//

1
src/utils.h
View File

@@ -90,6 +90,7 @@ extern uint32_t be32toh(uint32_t value);
boost::posix_time::ptime ptEpoch();
int iToSeconds(boost::posix_time::ptime ptWhen);
boost::posix_time::ptime ptFromSeconds(int iSeconds);
uint64_t utFromSeconds(int iSeconds);
/*
void intIPtoStr(int ip,std::string& retStr);