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

fux stupid error

Browse Source
This commit is contained in:
blackjok3r
2018-09-24 19:55:23 +08:00
parent 8496fdbeed
commit d75be221a0
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crosschain_authority.cpp
View File

@@ -7,7 +7,7 @@ int GetSymbolAuthority(const char* symbol)
{ {
if (strncmp(symbol, "TXSCL", 5) == 0) if (strncmp(symbol, "TXSCL", 5) == 0)
return CROSSCHAIN_TXSCL; return CROSSCHAIN_TXSCL;
if (is_STAKED() != 0) if (is_STAKED(symbol) != 0)
printf("RETURNED CROSSCHAIN STAKED AS TRUE\n"); printf("RETURNED CROSSCHAIN STAKED AS TRUE\n");
return CROSSCHAIN_STAKED; return CROSSCHAIN_STAKED;
return CROSSCHAIN_KOMODO; return CROSSCHAIN_KOMODO;

2
src/komodo_notary.h
View File

@@ -215,7 +215,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam
else if ( ASSETCHAINS_SYMBOL[0] == 0 ) else if ( ASSETCHAINS_SYMBOL[0] == 0 )
timestamp = 0; timestamp = 0;
// If this chain is not a staked chain, use the normal Komodo logic to determine notaries. This allows KMD to still sync and use its proper pubkeys for dPoW. // If this chain is not a staked chain, use the normal Komodo logic to determine notaries. This allows KMD to still sync and use its proper pubkeys for dPoW.
if (is_STAKED() == 0) if (is_STAKED(ASSETCHAINS_SYMBOL) == 0)
{ {
if ( height >= KOMODO_NOTARIES_HARDCODED || ASSETCHAINS_SYMBOL[0] != 0 ) if ( height >= KOMODO_NOTARIES_HARDCODED || ASSETCHAINS_SYMBOL[0] != 0 )
{ {

2
src/main.cpp
View File

@@ -5954,7 +5954,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
CAddress addrFrom; CAddress addrFrom;
uint64_t nNonce = 1; uint64_t nNonce = 1;
vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe; vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe;
if ( is_STAKED() != 0 ) if ( is_STAKED(ASSETCHAINS_SYMBOL) != 0 )
{ {
if (pfrom->nVersion < STAKEDMIN_PEER_PROTO_VERSION) if (pfrom->nVersion < STAKEDMIN_PEER_PROTO_VERSION)
{ {

6
src/notaries_staked.cpp
View File

@@ -2,8 +2,6 @@
#include "notaries_staked.h" #include "notaries_staked.h"
#include <cstring> #include <cstring>
extern char ASSETCHAINS_SYMBOL[65];
// Era 0 set of pubkeys // Era 0 set of pubkeys
const char *notaries_STAKED[][2] = const char *notaries_STAKED[][2] =
{ {
@@ -100,9 +98,9 @@ const char *notaries_STAKED3[][2] =
int num_notaries_STAKED3 = (sizeof(notaries_STAKED3)/sizeof(*notaries_STAKED3)); int num_notaries_STAKED3 = (sizeof(notaries_STAKED3)/sizeof(*notaries_STAKED3));
int is_STAKED() { int is_STAKED(const *char chain_name) {
int STAKED = 0; int STAKED = 0;
if ( (strncmp(ASSETCHAINS_SYMBOL, "STKD", 4) == 0) || (strncmp(ASSETCHAINS_SYMBOL, "STAKED", 6) == 0) ) if ( (strncmp(chain_name, "STKD", 4) == 0) || (strncmp(chain_name, "STAKED", 6) == 0) )
STAKED = 1; STAKED = 1;
return(STAKED); return(STAKED);
}; };

2
src/notaries_staked.h
View File

@@ -19,7 +19,7 @@ extern int num_notaries_STAKED2;
extern const char *notaries_STAKED3[][2]; extern const char *notaries_STAKED3[][2];
extern int num_notaries_STAKED3; extern int num_notaries_STAKED3;
int is_STAKED(); int is_STAKED(const *char chain_name);
int STAKED_era(int timestamp); int STAKED_era(int timestamp);
#endif #endif