Debugging

2018-02-13 21:29:42 +02:00
parent 8f8b5a2ac6
commit 8683bd8d11
12 changed files with 318 additions and 118 deletions
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -473,7 +473,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
    }
 }

-int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,int32_t height,uint256 txhash,int32_t i,int32_t j,uint64_t *voutmaskp,int32_t *specialtxp,int32_t *notarizedheightp,uint64_t value,int32_t notarized,uint64_t signedmask)
+int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen,int32_t height,uint256 txhash,int32_t i,int32_t j,uint64_t *voutmaskp,int32_t *specialtxp,int32_t *notarizedheightp,uint64_t value,int32_t notarized,uint64_t signedmask,uint32_t timestamp)
 {
    static uint256 zero; static FILE *signedfp;
    int32_t opretlen,nid,k,len = 0; uint256 kmdtxid,desttxid; uint8_t crypto777[33]; struct komodo_state *sp; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN];
@@ -499,7 +499,7 @@ int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scr
            *specialtxp = 1;
            //printf(">>>>>>>> ");
        }
-        else if ( komodo_chosennotary(&nid,height,scriptbuf + 1) >= 0 )
+        else if ( komodo_chosennotary(&nid,height,scriptbuf + 1,timestamp) >= 0 )
        {
            //printf("found notary.k%d\n",k);
            if ( notaryid < 64 )
@@ -741,7 +741,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
 #else
                    memcpy(scriptbuf,(uint8_t *)&block.vtx[i].vout[j].scriptPubKey[0],len);
 #endif
-                    notaryid = komodo_voutupdate(&isratification,notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,&notarizedheight,(uint64_t)block.vtx[i].vout[j].nValue,notarized,signedmask);
+                    notaryid = komodo_voutupdate(&isratification,notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,&notarizedheight,(uint64_t)block.vtx[i].vout[j].nValue,notarized,signedmask,(uint32_t)chainActive.Tip()->GetBlockTime());
                    if ( 0 && i > 0 )
                    {
                        for (k=0; k<len; k++)
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -763,11 +763,11 @@ int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width)
    return(n);
 }

-int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33])
+int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33],uint32_t timestamp)
 {
    int32_t i,notaryid=0,minerid,limit,nid; uint8_t _pubkey33[33];
    if ( height >= 225000 )
-        komodo_chosennotary(&notaryid,height,_pubkey33);
+        komodo_chosennotary(&notaryid,height,_pubkey33,timestamp);
    if ( height >= 34000 && notaryid >= 0 )
    {
        if ( height < 79693 )
@@ -777,7 +777,7 @@ int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33])
        else limit = 66;
        for (i=1; i<limit; i++)
        {
-            komodo_chosennotary(&nid,height-i,_pubkey33);
+            komodo_chosennotary(&nid,height-i,_pubkey33,timestamp);
            if ( nid == notaryid ) //komodo_minerid(height-i,_pubkey33)
            {
                if ( (0) && notaryid > 0 )
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -719,6 +719,27 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
        }
        return(0);
    }
+    if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_COMMISSION != 0 )
+    {
+        total = 0;
+        for (i=1; i<txn_count; i++)
+        {
+            n = block.vtx[i].vout.size();
+            for (j=0; j<n; j++)
+                total += block.vtx[i].vout[j].nValue;
+        }
+        if ( (checktoshis = (total * ASSETCHAINS_COMMISSION) / COIN) != 0 )
+        {
+            if ( block.vtx[0].vout.size() != 2 || block.vtx[0].vout[1].nValue != checktoshis )
+                return(-1);
+            if ( block.vtx[0].vout[1].scriptPubKey.size() != 35 )
+                return(-1);
+            script = (uint8_t *)block.vtx[0].vout[1].scriptPubKey.data();
+            if ( script[0] != 33 || script[34] != OP_CHECKSIG || memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) != 0 )
+                return(-1);
+        }
+    }
+
    //fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block.vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE);
    offset += komodo_scriptitemlen(&opretlen,&script[offset]);
    //printf("offset.%d opretlen.%d [%02x %02x %02x %02x]\n",offset,opretlen,script[0],script[1],script[2],script[3]);
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -21,7 +21,7 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n
 char *komodo_issuemethod(char *userpass,char *method,char *params,uint16_t port);
 void komodo_init(int32_t height);
 void komodo_assetchain_pubkeys(char *jsonstr);
-int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33);
+int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
 int32_t komodo_isrealtime(int32_t *kmdheightp);
 uint64_t komodo_paxtotal();
 int32_t komodo_longestchain();
@@ -45,14 +45,14 @@ 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;
-std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES;
-uint8_t NOTARY_PUBKEY33[33];
+std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY;
+uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33];

 char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint16_t ASSETCHAINS_PORT;
 uint32_t ASSETCHAIN_INIT;
 uint32_t ASSETCHAINS_MAGIC = 2387029918;
-uint64_t ASSETCHAINS_SUPPLY = 10;
+uint64_t ASSETCHAINS_ENDSUBSIDY,ASSETCHAINS_REWARD,ASSETCHAINS_HALVING,ASSETCHAINS_DECAY,ASSETCHAINS_COMMISSION,ASSETCHAINS_SUPPLY = 10;

 uint32_t KOMODO_INITDONE;
 char KMDUSERPASS[4096],BTCUSERPASS[4096]; uint16_t KMD_PORT = 7771,BITCOIND_PORT = 7771;
--- a/src/komodo_interest.h
+++ b/src/komodo_interest.h
@@ -19,8 +19,9 @@
 #define dstr(x) ((double)(x) / SATOSHIDEN)

 #define KOMODO_ENDOFERA 7777777
-#define KOMODO_INTEREST ((uint64_t)(0.05 * COIN))   // 5%
+#define KOMODO_INTEREST ((uint64_t)5000000) //((uint64_t)(0.05 * COIN))   // 5%
 int64_t MAX_MONEY = 200000000 * 100000000LL;
+extern uint8_t NOTARY_PUBKEY33[];

 #ifdef notanymore
 uint64_t komodo_earned_interest(int32_t height,int64_t paidinterest)
@@ -82,7 +83,7 @@ uint64_t komodo_moneysupply(int32_t height)
 uint64_t _komodo_interestnew(uint64_t nValue,uint32_t nLockTime,uint32_t tiptime)
 {
    int32_t minutes; uint64_t interest = 0;
-    if ( tiptime > nLockTime && (minutes= (tiptime - nLockTime) / 60) >= 60 )
+    if ( nLockTime >= LOCKTIME_THRESHOLD && tiptime > nLockTime && (minutes= (tiptime - nLockTime) / 60) >= 60 )
    {
        if ( minutes > 365 * 24 * 60 )
            minutes = 365 * 24 * 60;
@@ -152,7 +153,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin
                        interest = (numerator * minutes) / ((uint64_t)365 * 24 * 60);
                        interestnew = _komodo_interestnew(nValue,nLockTime,tiptime);
                        if ( interest < interestnew )
-                            printf("path0 current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
+                            printf("pathA current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
                    }
                    else interest = _komodo_interestnew(nValue,nLockTime,tiptime);
                }
@@ -162,7 +163,7 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin
                    interest = (numerator / denominator) / COIN;
                    interestnew = _komodo_interestnew(nValue,nLockTime,tiptime);
                    if ( interest < interestnew )
-                        printf("path0 current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
+                        printf("pathB current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
                }
                else interest = _komodo_interestnew(nValue,nLockTime,tiptime);
            }
@@ -187,8 +188,8 @@ uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uin
                    interest = ((numerator * minutes) / ((uint64_t)365 * 24 * 60));
                    //fprintf(stderr,"interest %llu %.8f <- numerator.%llu minutes.%d\n",(long long)interest,(double)interest/COIN,(long long)numerator,(int32_t)minutes);
                    interestnew = _komodo_interestnew(nValue,nLockTime,tiptime);
-                    if ( interest < interestnew )//|| (interestnew < 0.9999*interest && (interest-interestnew) > 50000) )
-                        printf("path1 current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
+                    if ( interest < interestnew )
+                        fprintf(stderr,"pathC current interest %.8f vs new %.8f for ht.%d %.8f locktime.%u tiptime.%u\n",dstr(interest),dstr(interestnew),txheight,dstr(nValue),nLockTime,tiptime);
                }
                else interest = _komodo_interestnew(nValue,nLockTime,tiptime);
            }
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -58,7 +58,7 @@ const char *Notaries_genesis[][2] =
    { "titomane_SH", "035f49d7a308dd9a209e894321f010d21b7793461b0c89d6d9231a3fe5f68d9960" },
 };

-const char *Notaries_elected[][2] =
+const char *Notaries_elected0[][2] =
 {
    { "0_jl777_testA", "03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828" },
    { "0_jl777_testB", "02ebfc784a4ba768aad88d44d1045d240d47b26e248cafaf1c5169a42d7a61d344" },
@@ -126,62 +126,99 @@ const char *Notaries_elected[][2] =
    { "xxspot2_XX", "03d85b221ea72ebcd25373e7961f4983d12add66a92f899deaf07bab1d8b6f5573" }
 };

-int32_t komodo_electednotary(uint8_t *pubkey33,int32_t height)
-{
-    char pubkeystr[67]; int32_t i; uint8_t legacy33[33];
-    for (i=0; i<33; i++)
-        sprintf(&pubkeystr[i*2],"%02x",pubkey33[i]);
-    pubkeystr[66] = 0;
-    //printf("%s vs\n",pubkeystr);
-    for (i=0; i<sizeof(Notaries_elected)/sizeof(*Notaries_elected); i++)
-    {
-        if ( strcmp(pubkeystr,(char *)Notaries_elected[i][1]) == 0 )
-        {
-            //printf("i.%d -> elected %s\n",i,(char *)Notaries_elected[i][1]);
-            return(i);
-        }
-    }
-    /*if ( height < 300000 )
-    {
-        for (i=0; i<sizeof(Notaries_genesis)/sizeof(*Notaries_genesis); i++)
-        {
-            if ( strcmp(pubkeystr,(char *)Notaries_genesis[i][1]) == 0 )
-            {
-                //printf("i.%d -> elected %s\n",i,(char *)Notaries_elected[i][1]);
-                return(i+64);
-            }
-        }
-        decode_hex(legacy33,33,(char *)"0252b6185bf8ea7efe8bbc345ddc8da87329149f30233088387abd716d4aa9e974");
-        if ( memcmp(pubkey33,legacy33,33) == 0 )
-            return(128);
-    }*/
-    return(-1);
-}
+#define KOMODO_NOTARIES_TIMESTAMP1 1600000000
+#define KOMODO_NOTARIES_HEIGHT1 ((800000 / KOMODO_ELECTION_GAP) * KOMODO_ELECTION_GAP)

-int32_t komodo_ratify_threshold(int32_t height,uint64_t signedmask)
+const char *Notaries_elected1[][2] =
 {
-    int32_t htind,numnotaries,i,wt = 0;
-    htind = height / KOMODO_ELECTION_GAP;
-    numnotaries = Pubkeys[htind].numnotaries;
-    for (i=0; i<numnotaries; i++)
-        if ( ((1LL << i) & signedmask) != 0 )
-            wt++;
-    if ( wt > (numnotaries >> 1) || (wt > 7 && (signedmask & 1) != 0) )
-        return(1);
-    else return(0);
-}
+    { "0_jl777_testA", "03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828" },
+    { "0_jl777_testB", "02ebfc784a4ba768aad88d44d1045d240d47b26e248cafaf1c5169a42d7a61d344" },
+    { "0_kolo_testA", "0287aa4b73988ba26cf6565d815786caf0d2c4af704d7883d163ee89cd9977edec" },
+    { "artik_AR", "029acf1dcd9f5ff9c455f8bb717d4ae0c703e089d16cf8424619c491dff5994c90" },
+    { "artik_EU", "03f54b2c24f82632e3cdebe4568ba0acf487a80f8a89779173cdb78f74514847ce" },
+    { "artik_NA", "0224e31f93eff0cc30eaf0b2389fbc591085c0e122c4d11862c1729d090106c842" },
+    { "artik_SH", "02bdd8840a34486f38305f311c0e2ae73e84046f6e9c3dd3571e32e58339d20937" },
+    { "badass_EU", "0209d48554768dd8dada988b98aca23405057ac4b5b46838a9378b95c3e79b9b9e" },
+    { "badass_NA", "02afa1a9f948e1634a29dc718d218e9d150c531cfa852843a1643a02184a63c1a7" },
+    { "badass_SH", "026b49dd3923b78a592c1b475f208e23698d3f085c4c3b4906a59faf659fd9530b" },
+    { "crackers_EU", "03bc819982d3c6feb801ec3b720425b017d9b6ee9a40746b84422cbbf929dc73c3" }, // 10
+    { "crackers_NA", "03205049103113d48c7c7af811b4c8f194dafc43a50d5313e61a22900fc1805b45" },
+    { "crackers_SH", "02be28310e6312d1dd44651fd96f6a44ccc269a321f907502aae81d246fabdb03e" },
+    { "durerus_EU", "02bcbd287670bdca2c31e5d50130adb5dea1b53198f18abeec7211825f47485d57" },
+    { "etszombi_AR", "031c79168d15edabf17d9ec99531ea9baa20039d0cdc14d9525863b83341b210e9" },
+    { "etszombi_EU", "0281b1ad28d238a2b217e0af123ce020b79e91b9b10ad65a7917216eda6fe64bf7" }, // 15
+    { "etszombi_SH", "025d7a193c0757f7437fad3431f027e7b5ed6c925b77daba52a8755d24bf682dde" },
+    { "farl4web_EU", "0300ecf9121cccf14cf9423e2adb5d98ce0c4e251721fa345dec2e03abeffbab3f" },
+    { "farl4web_SH", "0396bb5ed3c57aa1221d7775ae0ff751e4c7dc9be220d0917fa8bbdf670586c030" },
+    { "fullmoon_AR", "0254b1d64840ce9ff6bec9dd10e33beb92af5f7cee628f999cb6bc0fea833347cc" },
+    { "fullmoon_NA", "031fb362323b06e165231c887836a8faadb96eda88a79ca434e28b3520b47d235b" }, // 20
+    { "fullmoon_SH", "030e12b42ec33a80e12e570b6c8274ce664565b5c3da106859e96a7208b93afd0d" },
+    { "grewal_NA", "03adc0834c203d172bce814df7c7a5e13dc603105e6b0adabc942d0421aefd2132" },
+    { "grewal_SH", "03212a73f5d38a675ee3cdc6e82542a96c38c3d1c79d25a1ed2e42fcf6a8be4e68" },
+    { "indenodes_AR", "02ec0fa5a40f47fd4a38ea5c89e375ad0b6ddf4807c99733c9c3dc15fb978ee147" },
+    { "indenodes_EU", "0221387ff95c44cb52b86552e3ec118a3c311ca65b75bf807c6c07eaeb1be8303c" },
+    { "indenodes_NA", "02698c6f1c9e43b66e82dbb163e8df0e5a2f62f3a7a882ca387d82f86e0b3fa988" },
+    { "indenodes_SH", "0334e6e1ec8285c4b85bd6dae67e17d67d1f20e7328efad17ce6fd24ae97cdd65e" },
+    { "jeezy_EU", "023cb3e593fb85c5659688528e9a4f1c4c7f19206edc7e517d20f794ba686fd6d6" },
+    { "jsgalt_NA", "027b3fb6fede798cd17c30dbfb7baf9332b3f8b1c7c513f443070874c410232446" },
+    { "karasugoi_NA", "02a348b03b9c1a8eac1b56f85c402b041c9bce918833f2ea16d13452309052a982" }, // 30
+    { "kashifali_EU", "033777c52a0190f261c6f66bd0e2bb299d30f012dcb8bfff384103211edb8bb207" },
+    { "kolo_AR", "03016d19344c45341e023b72f9fb6e6152fdcfe105f3b4f50b82a4790ff54e9dc6" },
+    { "kolo_SH", "02aa24064500756d9b0959b44d5325f2391d8e95c6127e109184937152c384e185" },
+    { "metaphilibert_AR", "02adad675fae12b25fdd0f57250b0caf7f795c43f346153a31fe3e72e7db1d6ac6" },
+    { "movecrypto_AR", "022783d94518e4dc77cbdf1a97915b29f427d7bc15ea867900a76665d3112be6f3" },
+    { "movecrypto_EU", "021ab53bc6cf2c46b8a5456759f9d608966eff87384c2b52c0ac4cc8dd51e9cc42" },
+    { "movecrypto_NA", "02efb12f4d78f44b0542d1c60146738e4d5506d27ec98a469142c5c84b29de0a80" },
+    { "movecrypto_SH", "031f9739a3ebd6037a967ce1582cde66e79ea9a0551c54731c59c6b80f635bc859" },
+    { "muros_AR", "022d77402fd7179335da39479c829be73428b0ef33fb360a4de6890f37c2aa005e" },
+    { "noashh_AR", "029d93ef78197dc93892d2a30e5a54865f41e0ca3ab7eb8e3dcbc59c8756b6e355" }, // 40
+    { "noashh_EU", "02061c6278b91fd4ac5cab4401100ffa3b2d5a277e8f71db23401cc071b3665546" },
+    { "noashh_NA", "033c073366152b6b01535e15dd966a3a8039169584d06e27d92a69889b720d44e1" },
+    { "nxtswe_EU", "032fb104e5eaa704a38a52c126af8f67e870d70f82977e5b2f093d5c1c21ae5899" },
+    { "polycryptoblog_NA", "02708dcda7c45fb54b78469673c2587bfdd126e381654819c4c23df0e00b679622" },
+    { "pondsea_AR", "032e1c213787312099158f2d74a89e8240a991d162d4ce8017d8504d1d7004f735" },
+    { "pondsea_EU", "0225aa6f6f19e543180b31153d9e6d55d41bc7ec2ba191fd29f19a2f973544e29d" },
+    { "pondsea_NA", "031bcfdbb62268e2ff8dfffeb9ddff7fe95fca46778c77eebff9c3829dfa1bb411" },
+    { "pondsea_SH", "02209073bc0943451498de57f802650311b1f12aa6deffcd893da198a544c04f36" },
+    { "popcornbag_AR", "02761f106fb34fbfc5ddcc0c0aa831ed98e462a908550b280a1f7bd32c060c6fa3" },
+    { "popcornbag_NA", "03c6085c7fdfff70988fda9b197371f1caf8397f1729a844790e421ee07b3a93e8" }, // 50
+    { "ptytrader_NA", "0328c61467148b207400b23875234f8a825cce65b9c4c9b664f47410b8b8e3c222" },
+    { "ptytrader_SH", "0250c93c492d8d5a6b565b90c22bee07c2d8701d6118c6267e99a4efd3c7748fa4" },
+    { "rnr_AR", "029bdb08f931c0e98c2c4ba4ef45c8e33a34168cb2e6bf953cef335c359d77bfcd" },
+    { "rnr_EU", "03f5c08dadffa0ffcafb8dd7ffc38c22887bd02702a6c9ac3440deddcf2837692b" },
+    { "rnr_NA", "02e17c5f8c3c80f584ed343b8dcfa6d710dfef0889ec1e7728ce45ce559347c58c" },
+    { "rnr_SH", "037536fb9bdfed10251f71543fb42679e7c52308bcd12146b2568b9a818d8b8377" },
+    { "titomane_AR", "03cda6ca5c2d02db201488a54a548dbfc10533bdc275d5ea11928e8d6ab33c2185" },
+    { "titomane_EU", "02e41feded94f0cc59f55f82f3c2c005d41da024e9a805b41105207ef89aa4bfbd" },
+    { "titomane_SH", "035f49d7a308dd9a209e894321f010d21b7793461b0c89d6d9231a3fe5f68d9960" },
+    { "vanbreuk_EU", "024f3cad7601d2399c131fd070e797d9cd8533868685ddbe515daa53c2e26004c3" }, // 60
+    { "xrobesx_NA", "03f0cc6d142d14a40937f12dbd99dbd9021328f45759e26f1877f2a838876709e1" },
+    { "xxspot1_XX", "02ef445a392fcaf3ad4176a5da7f43580e8056594e003eba6559a713711a27f955" },
+    { "xxspot2_XX", "03d85b221ea72ebcd25373e7961f4983d12add66a92f899deaf07bab1d8b6f5573" }
+};

-int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height)
+int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp)
 {
    int32_t i,htind,n; uint64_t mask = 0; struct knotary_entry *kp,*tmp;
-    if ( height >= 180000 || ASSETCHAINS_SYMBOL[0] != 0 )
+    if ( height >= KOMODO_NOTARIES_HARDCODED || ASSETCHAINS_SYMBOL[0] != 0 )
    {
-        n = (int32_t)(sizeof(Notaries_elected)/sizeof(*Notaries_elected));
-        for (i=0; i<n; i++)
-            decode_hex(pubkeys[i],33,(char *)Notaries_elected[i][1]);
+        if ( timestamp < KOMODO_NOTARIES_TIMESTAMP1 || height < KOMODO_NOTARIES_HEIGHT1 )
+        {
+            n = (int32_t)(sizeof(Notaries_elected0)/sizeof(*Notaries_elected0));
+            for (i=0; i<n; i++)
+                decode_hex(pubkeys[i],33,(char *)Notaries_elected0[i][1]);
+        }
+        else // if ( timestamp < KOMODO_NOTARIES_TIMESTAMP2 || height < KOMODO_NOTARIES_HEIGHT2 )
+        {
+            n = (int32_t)(sizeof(Notaries_elected1)/sizeof(*Notaries_elected1));
+            for (i=0; i<n; i++)
+                decode_hex(pubkeys[i],33,(char *)Notaries_elected1[i][1]);
+        }
        return(n);
    }
    htind = height / KOMODO_ELECTION_GAP;
+    if ( htind >= KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP )
+        htind = (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP) - 1;
    pthread_mutex_lock(&komodo_mutex);
    n = Pubkeys[htind].numnotaries;
    HASH_ITER(hh,Pubkeys[htind].Notaries,kp,tmp)
@@ -199,6 +236,38 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height)
    return(-1);
 }

+int32_t komodo_electednotary(int32_t *numnotariesp,uint8_t *pubkey33,int32_t height,uint32_t timestamp)
+{
+    char pubkeystr[67]; int32_t i,n; uint8_t pubkeys[64][33];
+    for (i=0; i<33; i++)
+        sprintf(&pubkeystr[i*2],"%02x",pubkey33[i]);
+    pubkeystr[66] = 0;
+    //printf("%s vs\n",pubkeystr);
+    n = komodo_notaries(pubkeys,height,timestamp);
+    *numnotariesp = n;
+    for (i=0; i<n; i++)
+    {
+        if ( memcmp(pubkey33,pubkeys[i],33) == 0 )
+            return(i);
+    }
+    return(-1);
+}
+
+int32_t komodo_ratify_threshold(int32_t height,uint64_t signedmask)
+{
+    int32_t htind,numnotaries,i,wt = 0;
+    htind = height / KOMODO_ELECTION_GAP;
+    if ( htind >= KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP )
+        htind = (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP) - 1;
+    numnotaries = Pubkeys[htind].numnotaries;
+    for (i=0; i<numnotaries; i++)
+        if ( ((1LL << i) & signedmask) != 0 )
+            wt++;
+    if ( wt > (numnotaries >> 1) || (wt > 7 && (signedmask & 1) != 0) )
+        return(1);
+    else return(0);
+}
+
 void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num)
 {
    static int32_t hwmheight;
@@ -212,6 +281,8 @@ void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num)
        height /= KOMODO_ELECTION_GAP;
        height = ((height + 1) * KOMODO_ELECTION_GAP);
        htind = (height / KOMODO_ELECTION_GAP);
+        if ( htind >= KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP )
+            htind = (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP) - 1;
        //printf("htind.%d activation %d from %d vs %d | hwmheight.%d %s\n",htind,height,origheight,(((origheight+KOMODO_ELECTION_GAP/2)/KOMODO_ELECTION_GAP)+1)*KOMODO_ELECTION_GAP,hwmheight,ASSETCHAINS_SYMBOL);
    } else htind = 0;
    pthread_mutex_lock(&komodo_mutex);
@@ -244,7 +315,7 @@ void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num)
        hwmheight = origheight;
 }

-int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33)
+int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp)
 {
    // -1 if not notary, 0 if notary, 1 if special notary
    struct knotary_entry *kp; int32_t numnotaries=0,htind,modval = -1;
@@ -255,18 +326,19 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33)
        printf("komodo_chosennotary ht.%d illegal\n",height);
        return(-1);
    }
-    if ( height >= 180000 )
+    if ( height >= KOMODO_NOTARIES_HARDCODED || ASSETCHAINS_SYMBOL[0] != 0 )
    {
-        if ( (*notaryidp= komodo_electednotary(pubkey33,height)) >= 0 )
+        if ( (*notaryidp= komodo_electednotary(&numnotaries,pubkey33,height,timestamp)) >= 0 && numnotaries != 0 )
        {
-            numnotaries = (int32_t)(sizeof(Notaries_elected)/sizeof(*Notaries_elected));
            modval = ((height % numnotaries) == *notaryidp);
            return(modval);
        }
    }
-    if ( height >= 250000 )//300000 )
+    if ( height >= 250000 )
        return(-1);
    htind = height / KOMODO_ELECTION_GAP;
+    if ( htind >= KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP )
+        htind = (KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP) - 1;
    pthread_mutex_lock(&komodo_mutex);
    HASH_FIND(hh,Pubkeys[htind].Notaries,pubkey33,33,kp);
    pthread_mutex_unlock(&komodo_mutex);
@@ -405,7 +477,7 @@ void komodo_init(int32_t height)
        //    Minerids[i] = -2;
        didinit = 1;
    }
-    else if ( 0 && height == KOMODO_MAINNET_START )
+    /*else if ( 0 && height == KOMODO_MAINNET_START )
    {
        n = (int32_t)(sizeof(Notaries_elected)/sizeof(*Notaries_elected));
        for (k=0; k<n; k++)
@@ -416,11 +488,11 @@ void komodo_init(int32_t height)
        }
        printf("set MAINNET notaries.%d\n",k);
        komodo_notarysinit(KOMODO_MAINNET_START,pubkeys,k);
-    }
+    }*/
    komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,0,0,0,0,0);
 }

-void komodo_assetchain_pubkeys(char *jsonstr)
+/*void komodo_assetchain_pubkeys(char *jsonstr)
 {
    cJSON *array; int32_t i,n; uint8_t pubkeys[64][33]; char *hexstr;
    memset(pubkeys,0,sizeof(pubkeys));
@@ -452,4 +524,4 @@ void komodo_assetchain_pubkeys(char *jsonstr)
    }
    //else if ( jsonstr != 0 )
    //    fprintf(stderr,"assetchain pubkeys couldnt parse.(%s)\n",jsonstr);
-}
+}*/
--- a/src/komodo_structs.h
+++ b/src/komodo_structs.h
@@ -26,7 +26,8 @@

 #define GENESIS_NBITS 0x1f00ffff
 #define KOMODO_MINRATIFY ((height < 90000) ? 7 : 11)
-#define KOMODO_MAXBLOCKS 5000000
+#define KOMODO_NOTARIES_HARDCODED 180000 // DONT CHANGE
+#define KOMODO_MAXBLOCKS 250000 // DONT CHANGE

 #define KOMODO_EVENT_RATIFY 'P'
 #define KOMODO_EVENT_NOTARIZED 'N'
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1426,15 +1426,20 @@ uint16_t komodo_userpass(char *userpass,char *symbol)
    return(port);
 }

-uint32_t komodo_assetmagic(char *symbol,uint64_t supply)
+uint32_t komodo_assetmagic(char *symbol,uint64_t supply,uint8_t *extraptr,int32_t extralen)
 {
-    uint8_t buf[512]; int32_t len = 0;
+    uint8_t buf[512]; uint32_t crc0=0; int32_t len = 0; bits256 hash;
    if ( strcmp(symbol,"KMD") == 0 )
        return(0x8de4eef9);
    len = iguana_rwnum(1,&buf[len],sizeof(supply),(void *)&supply);
    strcpy((char *)&buf[len],symbol);
    len += strlen(symbol);
-    return(calc_crc32(0,buf,len));
+    if ( extraptr != 0 && extralen != 0 )
+    {
+        vcalc_sha256(0,hash.bytes,extraptr,extralen);
+        crc0 = hash.uints[0];
+    }
+    return(calc_crc32(crc0,buf,len));
 }

 /*int32_t komodo_shortflag(char *symbol)
@@ -1457,18 +1462,18 @@ uint16_t komodo_assetport(uint32_t magic)
    else return(8000 + (magic % 7777));
 }

-uint16_t komodo_port(char *symbol,uint64_t supply,uint32_t *magicp)
+uint16_t komodo_port(char *symbol,uint64_t supply,uint32_t *magicp,uint8_t *extraptr,int32_t extralen)
 {
    if ( symbol == 0 || symbol[0] == 0 || strcmp("KMD",symbol) == 0 )
    {
        *magicp = 0x8de4eef9;
        return(7770);
    }
-    *magicp = komodo_assetmagic(symbol,supply);
+    *magicp = komodo_assetmagic(symbol,supply,extraptr,extralen);
    return(komodo_assetport(*magicp));
 }

-void komodo_ports(uint16_t ports[MAX_CURRENCIES])
+/*void komodo_ports(uint16_t ports[MAX_CURRENCIES])
 {
    int32_t i; uint32_t magic;
    for (i=0; i<MAX_CURRENCIES; i++)
@@ -1477,18 +1482,18 @@ void komodo_ports(uint16_t ports[MAX_CURRENCIES])
        printf("%u ",ports[i]);
    }
    printf("ports\n");
-}
+}*/

 char *iguanafmtstr = (char *)"curl --url \"http://127.0.0.1:7778\" --data \"{\\\"conf\\\":\\\"%s.conf\\\",\\\"path\\\":\\\"${HOME#\"/\"}/.komodo/%s\\\",\\\"unitval\\\":\\\"20\\\",\\\"zcash\\\":1,\\\"RELAY\\\":1,\\\"VALIDATE\\\":1,\\\"prefetchlag\\\":-1,\\\"poll\\\":100,\\\"active\\\":1,\\\"agent\\\":\\\"iguana\\\",\\\"method\\\":\\\"addcoin\\\",\\\"startpend\\\":4,\\\"endpend\\\":4,\\\"services\\\":129,\\\"maxpeers\\\":8,\\\"newcoin\\\":\\\"%s\\\",\\\"name\\\":\\\"%s\\\",\\\"hasheaders\\\":1,\\\"useaddmultisig\\\":0,\\\"netmagic\\\":\\\"%s\\\",\\\"p2p\\\":%u,\\\"rpc\\\":%u,\\\"pubval\\\":60,\\\"p2shval\\\":85,\\\"wifval\\\":188,\\\"txfee_satoshis\\\":\\\"10000\\\",\\\"isPoS\\\":0,\\\"minoutput\\\":10000,\\\"minconfirms\\\":2,\\\"genesishash\\\":\\\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\\\",\\\"protover\\\":170002,\\\"genesisblock\\\":\\\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\\\",\\\"debug\\\":0,\\\"seedipaddr\\\":\\\"%s\\\"}\"";


-int32_t komodo_whoami(char *pubkeystr,int32_t height)
+int32_t komodo_whoami(char *pubkeystr,int32_t height,uint32_t timestamp)
 {
    int32_t i,notaryid;
    for (i=0; i<33; i++)
        sprintf(&pubkeystr[i<<1],"%02x",NOTARY_PUBKEY33[i]);
    pubkeystr[66] = 0;
-    komodo_chosennotary(&notaryid,height,NOTARY_PUBKEY33);
+    komodo_chosennotary(&notaryid,height,NOTARY_PUBKEY33,timestamp);
    return(notaryid);
 }

@@ -1505,7 +1510,7 @@ char *argv0names[] =
 void komodo_args(char *argv0)
 {
    extern int64_t MAX_MONEY;
-    std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len,n;
+    std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[256],*extraptr=0; FILE *fp; int32_t i,baseid,len,n,extralen = 0;
    IS_KOMODO_NOTARY = GetBoolArg("-notary", false);
    if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 )
        fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n");
@@ -1513,8 +1518,8 @@ void komodo_args(char *argv0)
    if ( strlen(NOTARY_PUBKEY.c_str()) == 66 )
    {
        USE_EXTERNAL_PUBKEY = 1;
-        KOMODO_PAX = 1;
-    } else KOMODO_PAX = GetArg("-pax",0);
+        //KOMODO_PAX = 1;
+    } //else KOMODO_PAX = GetArg("-pax",0);
    name = GetArg("-ac_name","");
    if ( argv0 != 0 )
    {
@@ -1537,6 +1542,45 @@ void komodo_args(char *argv0)
    if ( name.c_str()[0] != 0 )
    {
        ASSETCHAINS_SUPPLY = GetArg("-ac_supply",10);
+        ASSETCHAINS_ENDSUBSIDY = GetArg("-ac_end",0);
+        ASSETCHAINS_REWARD = GetArg("-ac_reward",0);
+        ASSETCHAINS_HALVING = GetArg("-ac_halving",0);
+        ASSETCHAINS_DECAY = GetArg("-ac_decay",0);
+        ASSETCHAINS_COMMISSION = GetArg("-ac_perc",0);
+        ASSETCHAINS_OVERRIDE_PUBKEY = GetArg("-ac_pubkey","");
+        if ( ASSETCHAINS_HALVING != 0 && ASSETCHAINS_HALVING < 10000 )
+        {
+            ASSETCHAINS_HALVING = 10000;
+            printf("ASSETCHAINS_HALVING must be at least 10000 blocks\n");
+        }
+        if ( ASSETCHAINS_DECAY == 100000000 && ASSETCHAINS_ENDSUBSIDY == 0 )
+        {
+            ASSETCHAINS_DECAY = 0;
+            printf("ASSETCHAINS_DECAY of 100000000 means linear and that needs ASSETCHAINS_ENDSUBSIDY\n");
+        }
+        else if ( ASSETCHAINS_DECAY > 100000000 )
+        {
+            ASSETCHAINS_DECAY = 0;
+            printf("ASSETCHAINS_DECAY cant be more than 100000000\n");
+        }
+        if ( strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) == 66 && ASSETCHAINS_COMMISSION > 0 && ASSETCHAINS_COMMISSION <= 1000000 )
+            decode_hex(ASSETCHAINS_OVERRIDE_PUBKEY33,33,(char *)ASSETCHAINS_OVERRIDE_PUBKEY.c_str());
+        else
+        {
+            ASSETCHAINS_COMMISSION = 0;
+            printf("ASSETCHAINS_COMMISSION needs an ASETCHAINS_OVERRIDE_PUBKEY\n");
+        }
+        if ( ASSETCHAINS_ENDSUBSIDY != 0 || ASSETCHAINS_REWARD != 0 || ASSETCHAINS_HALVING != 0 || ASSETCHAINS_DECAY != 0 || ASSETCHAINS_COMMISSION != 0 )
+        {
+            printf("end.%d reward.%llu halving.%llu decay.%llu perc.%llu\n",ASSETCHAINS_ENDSUBSIDY,(long long)ASSETCHAINS_REWARD,(long long)ASSETCHAINS_HALVING,(long long)ASSETCHAINS_DECAY,(long long)ASSETCHAINS_COMMISSION);
+            extraptr = extrabuf;
+            memcpy(extraptr,ASSETCHAINS_OVERRIDE_PUBKEY33,33), extralen = 33;
+            extralen += iguana_rwnum(1,&extraptr[extralen],sizeof(ASSETCHAINS_ENDSUBSIDY),(void *)&ASSETCHAINS_ENDSUBSIDY);
+            extralen += iguana_rwnum(1,&extraptr[extralen],sizeof(ASSETCHAINS_REWARD),(void *)&ASSETCHAINS_REWARD);
+            extralen += iguana_rwnum(1,&extraptr[extralen],sizeof(ASSETCHAINS_HALVING),(void *)&ASSETCHAINS_HALVING);
+            extralen += iguana_rwnum(1,&extraptr[extralen],sizeof(ASSETCHAINS_DECAY),(void *)&ASSETCHAINS_DECAY);
+            extralen += iguana_rwnum(1,&extraptr[extralen],sizeof(ASSETCHAINS_COMMISSION),(void *)&ASSETCHAINS_COMMISSION);
+        }
        addn = GetArg("-seednode","");
        if ( strlen(addn.c_str()) > 0 )
            ASSETCHAINS_SEED = 1;
@@ -1545,7 +1589,7 @@ void komodo_args(char *argv0)
            MAX_MONEY = komodo_maxallowed(baseid);
        else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN;
        //printf("baseid.%d MAX_MONEY.%s %.8f\n",baseid,ASSETCHAINS_SYMBOL,(double)MAX_MONEY/SATOSHIDEN);
-        ASSETCHAINS_PORT = komodo_port(ASSETCHAINS_SYMBOL,ASSETCHAINS_SUPPLY,&ASSETCHAINS_MAGIC);
+        ASSETCHAINS_PORT = komodo_port(ASSETCHAINS_SYMBOL,ASSETCHAINS_SUPPLY,&ASSETCHAINS_MAGIC,extraptr,extralen);
        while ( (dirname= (char *)GetDataDir(false).string().c_str()) == 0 || dirname[0] == 0 )
        {
            fprintf(stderr,"waiting for datadir\n");
@@ -1564,8 +1608,8 @@ void komodo_args(char *argv0)
            COINBASE_MATURITY = 1;
 						LogPrintf("ASSETCHAINS_PORT %s %u\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_PORT);
        }
-        ASSETCHAINS_NOTARIES = GetArg("-ac_notaries","");
-        komodo_assetchain_pubkeys((char *)ASSETCHAINS_NOTARIES.c_str());
+        //ASSETCHAINS_NOTARIES = GetArg("-ac_notaries","");
+        //komodo_assetchain_pubkeys((char *)ASSETCHAINS_NOTARIES.c_str());
        iguana_rwnum(1,magic,sizeof(ASSETCHAINS_MAGIC),(void *)&ASSETCHAINS_MAGIC);
        for (i=0; i<4; i++)
            sprintf(&magicstr[i<<1],"%02x",magic[i]);
@@ -1615,7 +1659,7 @@ void komodo_args(char *argv0)
                break;
        }
    }
-		BITCOIND_PORT = GetArg("-rpcport", BaseParams().RPCPort());
+    BITCOIND_PORT = GetArg("-rpcport", BaseParams().RPCPort());
    //fprintf(stderr,"%s chain params initialized\n",ASSETCHAINS_SYMBOL);
 }

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1493,11 +1493,11 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex)
 //uint64_t komodo_moneysupply(int32_t height);
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern uint32_t ASSETCHAINS_MAGIC;
-extern uint64_t ASSETCHAINS_SUPPLY;
+extern uint64_t ASSETCHAINS_ENDSUBSIDY,ASSETCHAINS_REWARD,ASSETCHAINS_HALVING,ASSETCHAINS_LINEAR,ASSETCHAINS_COMMISSION,ASSETCHAINS_SUPPLY = 10;

 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
 {
-    CAmount nSubsidy = 3 * COIN;
+    int32_t numhalvings; uint64_t numerator; CAmount nSubsidy = 3 * COIN;
    if ( ASSETCHAINS_SYMBOL[0] == 0 )
    {
        if ( nHeight == 1 )
@@ -1510,7 +1510,38 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
    {
        if ( nHeight == 1 )
            return(ASSETCHAINS_SUPPLY * COIN + (ASSETCHAINS_MAGIC & 0xffffff));
-        else return(10000);
+        else if ( ASSETCHAINS_ENDSUBSIDY == 0 || nHeight < ASSETCHAINS_ENDSUBSIDY )
+        {
+            if ( ASSETCHAINS_REWARD == 0 )
+                return(10000);
+            else if ( ASSETCHAINS_ENDHEIGHT != 0 && nHeight >= ASSETCHAINS_ENDHEIGHT )
+                return(0);
+            else
+            {
+                nSubsidy = ASSETCHAINS_REWARD;
+                if ( ASSETCHAINS_HALVING != 0 )
+                {
+                    if ( (numhalvings= (nHeight / ASSETCHAINS_HALVING)) > 0 )
+                    {
+                        if ( numhalvings >= 64 && ASSETCHAINS_DECAY == 0 )
+                            return(0);
+                        if ( ASSETCHAINS_DECAY == 0 )
+                            nSubsidy >>= numhalvings;
+                        else if ( ASSETCHAINS_DECAY == 100000000 && ASSETCHAINS_ENDHEIGHT != 0 )
+                        {
+                            numerator = (ASSETCHAINS_ENDHEIGHT - nHeight);
+                            nSubsidy = (nSubidy * numerator) / ASSETCHAINS_ENDHEIGHT;
+                        }
+                        else
+                        {
+                            for (i=0; i<numhalvings&&nSubsidy!=0; i++)
+                                nSubsidy = (nSubsidy * ASSETCHAINS_DECAY) / 100000000;
+                        }
+                    }
+                }
+            }
+            return(nSubsidy);
+        } else return(0);
    }
 /*
    // Mining slow start
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -113,8 +113,8 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern std::string NOTARY_PUBKEY;
 extern uint8_t NOTARY_PUBKEY33[33];
 uint32_t Mining_start,Mining_height;
-int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33);
-int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]);
+int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
+int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33],uint32_t timestamp);
 int32_t komodo_pax_opreturn(int32_t height,uint8_t *opret,int32_t maxsize);
 uint64_t komodo_paxtotal();
 int32_t komodo_baseid(char *origbase);
@@ -396,9 +396,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
        // Add fees
        txNew.vout[0].nValue += nFees;
        txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
-        if ( ASSETCHAINS_SYMBOL[0] == 0 )
+        /*if ( ASSETCHAINS_SYMBOL[0] == 0 )
        {
-            /*int32_t i,opretlen; uint8_t opret[256],*ptr;
+            int32_t i,opretlen; uint8_t opret[256],*ptr;
            if ( (nHeight % 60) == 0 || komodo_gateway_deposits(&txNew,(char *)"KMD",1) == 0 )
            {
                if ( (opretlen= komodo_pax_opreturn((int32_t)nHeight,opret,sizeof(opret))) > 0 ) // have pricefeed
@@ -411,14 +411,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
                    txNew.vout[1].nValue = 0;
                    //fprintf(stderr,"opretlen.%d\n",opretlen);
                } //else printf("null opretlen for prices\n");
-            }*/
+            }
        }
        else if ( komodo_is_issuer() != 0 )
        {
            komodo_gateway_deposits(&txNew,ASSETCHAINS_SYMBOL,0);
            if ( txNew.vout.size() > 1 )
                fprintf(stderr,"%s txNew numvouts.%d\n",ASSETCHAINS_SYMBOL,(int32_t)txNew.vout.size());
-        }
+        }*/
        
        pblock->vtx[0] = txNew;
        pblocktemplate->vTxFees[0] = -nFees;
@@ -640,7 +640,7 @@ void static BitcoinMiner()

    unsigned int n = chainparams.EquihashN();
    unsigned int k = chainparams.EquihashK();
-    int32_t notaryid = -1;
+    uint8_t *script; uint64_t total,checktoshis; int32_t i,j,notaryid = -1;
    while ( (ASSETCHAIN_INIT == 0 || KOMODO_INITDONE == 0) ) //chainActive.Tip()->nHeight != 235300 &&
    {
        sleep(1);
@@ -648,7 +648,7 @@ void static BitcoinMiner()
            break;
    }
    //sleep(60);
-    komodo_chosennotary(&notaryid,chainActive.Tip()->nHeight,NOTARY_PUBKEY33);
+    komodo_chosennotary(&notaryid,chainActive.Tip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.Tip()->GetBlockTime());

    std::string solver;
    //if ( notaryid >= 0 || ASSETCHAINS_SYMBOL[0] != 0 )
@@ -741,14 +741,42 @@ void static BitcoinMiner()
            CBlock *pblock = &pblocktemplate->block;
            if ( ASSETCHAINS_SYMBOL[0] != 0 )
            {
-                if ( pblock->vtx.size() == 1 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT )
+                if ( ASSETCHAINS_REWARD == 0 )
                {
-                    static uint32_t counter;
-                    if ( counter++ < 10 )
-                        fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",ASSETCHAINS_SYMBOL);
-                    sleep(10);
-                    continue;
-                } else fprintf(stderr,"%s vouts.%d mining.%d vs %d\n",ASSETCHAINS_SYMBOL,(int32_t)pblock->vtx[0].vout.size(),Mining_height,ASSETCHAINS_MINHEIGHT);
+                    if ( pblock->vtx.size() == 1 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT )
+                    {
+                        static uint32_t counter;
+                        if ( counter++ < 10 )
+                            fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",ASSETCHAINS_SYMBOL);
+                        sleep(10);
+                        continue;
+                    } else fprintf(stderr,"%s vouts.%d mining.%d vs %d\n",ASSETCHAINS_SYMBOL,(int32_t)pblock->vtx[0].vout.size(),Mining_height,ASSETCHAINS_MINHEIGHT);
+                }
+                else if ( ASSETCHAINS_COMMISSION != 0 )
+                {
+                    total = 0;
+                    for (i=1; i<pblock->vtx.size(); i++)
+                    {
+                        n = pblock->vtx[i].vout.size();
+                        for (j=0; j<n; j++)
+                            total += pblock->vtx[i].vout[j].nValue;
+                    }
+                    if ( (checktoshis = (total * ASSETCHAINS_COMMISSION) / COIN) != 0 )
+                    {
+                        pblock->vtx[0].vout[1].nValue = checktoshis;
+                        pblock->vtx[0].vout.resize(2);
+                        pblock->vtx[0].vout[1].scriptPubKey.resize(35);
+                        script = (uint8_t *)pblock->vtx[0].vout[1].scriptPubKey.data();
+                        script[0] = 33;
+                        for (i=0; i<33; i++)
+                            script[i+1] = ASSETCHAINS_OVERRIDE_PUBKEY33[i];
+                        script[34] = OP_CHECKSIG;
+                    }
+                }
+                else
+                {
+                    pblock->vtx[0].vout.resize(1);
+                }
            }
            IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
            LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -115,13 +115,14 @@ bool CheckEquihashSolution(const CBlockHeader *pblock, const CChainParams& param
    return true;
 }

-int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33);
-int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33]);
+int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,uint32_t timestamp);
+int32_t komodo_is_special(int32_t height,uint8_t pubkey33[33],uint32_t timestamp);
 int32_t komodo_currentheight();
 CBlockIndex *komodo_chainactive(int32_t height);
 int8_t komodo_minerid(int32_t height,uint8_t *pubkey33);
 void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height);
 extern int32_t KOMODO_CHOSEN_ONE;
+extern char ASSETCHAINS_SYMBOL[];
 #define KOMODO_ELECTION_GAP 2000
 
 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height);
@@ -132,15 +133,16 @@ extern std::string NOTARY_PUBKEY;
 bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned int nBits, const Consensus::Params& params)
 {
    extern int32_t KOMODO_REWIND;
-    bool fNegative,fOverflow; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,duplicate,flag = 0, mids[66];
+    bool fNegative,fOverflow; int32_t i,nonzpkeys=0,nonz=0,special=0,special2=0,notaryid=-1,duplicate,flag = 0, mids[66]; uint32_t timestamp = 0;
    arith_uint256 bnTarget; CBlockIndex *pindex; uint8_t pubkeys[66][33];
-
+    if ( (pindex= chainActive.Tip()) != 0 )
+        timestamp = (uint32_t)pindex->GetBlockTime();
    bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
    if ( height == 0 )
        height = komodo_currentheight() + 1;
-    special = komodo_chosennotary(&notaryid,height,pubkey33);
-    flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height);
-    if ( height > 34000 ) // 0 -> non-special notary
+    special = komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
+    flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height,timestamp);
+    if ( height > 34000 && ASSETCHAINS_SYMBOL[0] == 0 ) // 0 -> non-special notary
    {
        for (i=0; i<33; i++)
        {
@@ -149,7 +151,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
        }
        if ( nonz == 0 )
            return(true); // will come back via different path with pubkey set
-        special2 = komodo_is_special(height,pubkey33);
+        special2 = komodo_is_special(height,pubkey33,timestamp);
        if ( notaryid >= 0 )
        {
            if ( height > 10000 && height < 80000 && (special != 0 || special2 > 0) )
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -46,7 +46,7 @@ int32_t Jumblr_secretaddradd(char *secretaddr);
 uint64_t komodo_interestsum();
 int32_t komodo_longestchain();
 int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp);
-int32_t komodo_whoami(char *pubkeystr,int32_t height);
+int32_t komodo_whoami(char *pubkeystr,int32_t height,uint32_t timestamp);
 extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE;
 extern char ASSETCHAINS_SYMBOL[];
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
@@ -139,7 +139,7 @@ UniValue getinfo(const UniValue& params, bool fHelp)
    obj.push_back(Pair("errors",        GetWarnings("statusbar")));
    {
        char pubkeystr[65]; int32_t notaryid;
-        if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight)) >= 0 )
+        if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight,(int32_t)(uint32_t)(uint32_t)chainActive.Tip()->GetBlocktime())) >= 0 )
        {
            obj.push_back(Pair("notaryid",        notaryid));
            obj.push_back(Pair("pubkey",        pubkeystr));