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

try reverse

Browse Source
This commit is contained in:
blackjok3r
2018-11-30 00:48:04 +08:00
parent caad5eaee1
commit a4e70bd464
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.am
View File

@@ -276,8 +276,8 @@ obj/build.h: FORCE
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
# server: zcashd # server: zcashd
libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -DSERVER libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -DSERVER libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_server_a_SOURCES = \ libbitcoin_server_a_SOURCES = \
sendalert.cpp \ sendalert.cpp \
addrman.cpp \ addrman.cpp \
@@ -581,9 +581,9 @@ endif
# bitcoin-cli binary # # bitcoin-cli binary #
komodo_cli_SOURCES = bitcoin-cli.cpp komodo_cli_SOURCES = bitcoin-cli.cpp
komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) komodo_cli_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) -DCLI
komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) komodo_cli_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -DCLI
komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) komodo_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -DCLI
# wallet-utility binary # # wallet-utility binary #
if ENABLE_WALLET if ENABLE_WALLET

18
src/notaries_staked.cpp
View File

@@ -36,7 +36,11 @@ int32_t STAKED_era(int timestamp)
return(0); return(0);
}; };
#ifdef SERVER #ifdef CLI
int8_t updateStakedNotary() {
return(-1);
}
#else
int8_t updateStakedNotary() { int8_t updateStakedNotary() {
std::string notaryname; std::string notaryname;
char Raddress[18]; uint8_t pubkey33[33]; char Raddress[18]; uint8_t pubkey33[33];
@@ -46,10 +50,6 @@ int8_t updateStakedNotary() {
NOTARY_ADDRESS.assign(Raddress); NOTARY_ADDRESS.assign(Raddress);
return(StakedNotaryID(notaryname,Raddress)); return(StakedNotaryID(notaryname,Raddress));
} }
#else
int8_t updateStakedNotary() {
return(-1);
}
#endif #endif
int8_t StakedNotaryID(std::string &notaryname, char *Raddress) { int8_t StakedNotaryID(std::string &notaryname, char *Raddress) {
@@ -150,24 +150,24 @@ void UpdateNotaryAddrs(uint8_t pubkeys[64][33],int8_t numNotaries) {
if ( pubkeys[0][0] == 0 ) if ( pubkeys[0][0] == 0 )
{ {
// null pubkeys, era 0. // null pubkeys, era 0.
#ifdef SERVER
pthread_mutex_lock(&staked_mutex); pthread_mutex_lock(&staked_mutex);
memset(NOTARYADDRS,0,sizeof(NOTARYADDRS)); memset(NOTARYADDRS,0,sizeof(NOTARYADDRS));
NUM_NOTARIES = 0; NUM_NOTARIES = 0;
pthread_mutex_unlock(&staked_mutex); pthread_mutex_unlock(&staked_mutex);
#endif
} }
else else
{ {
// staked era is set. // staked era is set.
#ifdef SERVER
pthread_mutex_lock(&staked_mutex); pthread_mutex_lock(&staked_mutex);
for (int i = 0; i<numNotaries; i++) { for (int i = 0; i<numNotaries; i++) {
#ifdef CLI
NUM_NOTARIES = 0;
#else
pubkey2addr((char *)NOTARYADDRS[i],(uint8_t *)pubkeys[i]); pubkey2addr((char *)NOTARYADDRS[i],(uint8_t *)pubkeys[i]);
NUM_NOTARIES = numNotaries; NUM_NOTARIES = numNotaries;
#endif
} }
pthread_mutex_unlock(&staked_mutex); pthread_mutex_unlock(&staked_mutex);
#endif
} }
} }