|
|
@ -47,10 +47,6 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100; |
|
|
|
|
|
|
|
int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,KOMODO_PASSPORT_INITDONE,KOMODO_PAX,KOMODO_EXCHANGEWALLET,KOMODO_REWIND; |
|
|
|
int32_t KOMODO_LASTMINED,prevKOMODO_LASTMINED,JUMBLR_PAUSE; |
|
|
|
<<<<<<< HEAD |
|
|
|
uint32_t ASSETCHAINS_CC; |
|
|
|
======= |
|
|
|
>>>>>>> dev |
|
|
|
std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY; |
|
|
|
uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33]; |
|
|
|
|
|
|
|