DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
jl777
2018-02-13 22:42:34 +02:00
parent e169b65ff0
commit e34a9d43fe
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -114,3 +114,5 @@ libzcashconsensus.pc
src/fiat/-usd src/fiat/-usd
contrib/debian/files contrib/debian/files
contrib/debian/substvars contrib/debian/substvars
src/rpcmisc~.cpp

2
src/komodo_bitcoind.h
View File

@@ -662,7 +662,7 @@ uint32_t komodo_chainactive_timestamp()
{ {
if ( chainActive.Tip() != 0 ) if ( chainActive.Tip() != 0 )
return((uint32_t)chainActive.Tip()->GetBlockTime()); return((uint32_t)chainActive.Tip()->GetBlockTime());
else return(0); else return(0);
} }
CBlockIndex *komodo_chainactive(int32_t height) CBlockIndex *komodo_chainactive(int32_t height)

3
src/rpcmisc.cpp
View File

@@ -46,6 +46,7 @@ int32_t Jumblr_secretaddradd(char *secretaddr);
uint64_t komodo_interestsum(); uint64_t komodo_interestsum();
int32_t komodo_longestchain(); int32_t komodo_longestchain();
int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp); int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp);
uint32_t komodo_chainactive_timestamp();
int32_t komodo_whoami(char *pubkeystr,int32_t height,uint32_t timestamp); int32_t komodo_whoami(char *pubkeystr,int32_t height,uint32_t timestamp);
extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE; extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE;
extern char ASSETCHAINS_SYMBOL[]; extern char ASSETCHAINS_SYMBOL[];
@@ -139,7 +140,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("errors", GetWarnings("statusbar"))); obj.push_back(Pair("errors", GetWarnings("statusbar")));
{ {
char pubkeystr[65]; int32_t notaryid; char pubkeystr[65]; int32_t notaryid;
if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight,(int32_t)(uint32_t)(uint32_t)chainActive.Tip()->GetBlocktime())) >= 0 ) if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight,komodo_chainactive_timestamp())) >= 0 )
{ {
obj.push_back(Pair("notaryid", notaryid)); obj.push_back(Pair("notaryid", notaryid));
obj.push_back(Pair("pubkey", pubkeystr)); obj.push_back(Pair("pubkey", pubkeystr));