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

make function, so IS notaty can update on era change

Browse Source
This commit is contained in:
blackjok3r
2018-11-03 20:42:59 +08:00
parent 152d34f3a4
commit 16b97d7f22
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/komodo_notary.h
View File

@@ -706,13 +706,7 @@ void komodo_init(int32_t height)
pubkey2addr((char *)Raddress,(uint8_t *)pubkey33); pubkey2addr((char *)Raddress,(uint8_t *)pubkey33);
CBitcoinAddress address(Raddress); CBitcoinAddress address(Raddress);
NOTARY_ADDRESS = address.ToString(); NOTARY_ADDRESS = address.ToString();
std::string notaryname; updateStakedNotary();
if (StakedNotaryID(notaryname, Raddress) != -1 ) {
IS_STAKED_NOTARY = 1;
IS_KOMODO_NOTARY = 0;
} else {
IS_STAKED_NOTARY = 0;
}
#endif #endif
if ( height >= 0 ) if ( height >= 0 )
{ {

20
src/notaries_staked.cpp
View File

@@ -4,7 +4,8 @@
#include <cstring> #include <cstring>
extern char NOTARYADDRS[18][64]; extern char NOTARYADDRS[18][64];
extern int32_t STAKED_ERA; extern std::string NOTARY_ADDRESS;
extern int32_t STAKED_ERA,IS_STAKED_NOTARY,IS_KOMODO_NOTARY;
// Era 1 set of pubkeys // Era 1 set of pubkeys
const char *notaries_STAKED1[][2] = const char *notaries_STAKED1[][2] =
@@ -114,6 +115,19 @@ int is_STAKED(const char *chain_name) {
return(STAKED); return(STAKED);
}; };
int updateStakedNotary() {
std::string notaryname;
pthread_mutex_lock(&komodo_mutex);
if (StakedNotaryID(notaryname,(char *)NOTARY_ADDRESS.c_str()) != -1 ) {
IS_STAKED_NOTARY = 1;
IS_KOMODO_NOTARY = 0;
} else {
IS_STAKED_NOTARY = 0;
}
pthread_mutex_unlock(&komodo_mutex);
return(0);
}
int STAKED_era(int timestamp) int STAKED_era(int timestamp)
{ {
int era; int era;
@@ -128,8 +142,10 @@ int STAKED_era(int timestamp)
else else
era = 0; era = 0;
// if we are in a gap, return era 0, this allows to invalidate notarizations when in GAP. // if we are in a gap, return era 0, this allows to invalidate notarizations when in GAP.
if ( era > STAKED_ERA ) if ( era > STAKED_ERA ) {
STAKED_ERA = era; STAKED_ERA = era;
updateStakedNotary();
}
return(era); return(era);
}; };

1
src/notaries_staked.h
View File

@@ -25,6 +25,7 @@ extern int num_notaries_STAKED4;
int is_STAKED(const char *chain_name); int is_STAKED(const char *chain_name);
int STAKED_era(int timestamp); int STAKED_era(int timestamp);
void updateStakedNotary();
int8_t StakedNotaryID(std::string &notaryname, char *Raddress); int8_t StakedNotaryID(std::string &notaryname, char *Raddress);
int8_t ScanStakedArray(const char *notaries_chosen[][2],int num_notaries,char *Raddress,std::string &notaryname); int8_t ScanStakedArray(const char *notaries_chosen[][2],int num_notaries,char *Raddress,std::string &notaryname);