Merge pull request #127 from jl777/dev

sync dev

src/ac/our

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=OUR $1 $2 $3 $4 $5 $6

src/assetchains.json

@@ -224,5 +224,21 @@
    "addnode": [
      "37.187.225.231"
    ]
- }
+ },
+ {
+   "ac_name": "OUR",
+   "ac_reward": "1478310502",
+   "ac_halving": "525600",
+   "ac_cc": "42",
+   "ac_supply": "100000000",
+   "ac_perc": "77700",
+   "ac_staked": "93",
+   "ac_pubkey": "02652a3f3e00b3a1875a918314f0bac838d6dd189a346fa623f5efe9541ac0b98c",
+   "ac_public": "1",
+   "addnode": [
+     "51.255.195.65",
+     "217.182.129.38",
+     "37.187.225.231"
+    ]
+  }
 ]

src/assetchains.old

@@ -46,3 +46,5 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=DION -ac_supply=3900000000 -ac_reward=22260000000 -ac_staked=100 -ac_cc=1 -ac_end=4300000000 -addnode=51.75.124.34 &
 ./komodod -pubkey=$pubkey -ac_name=ZEX -ac_cc=2 -ac_founders=1 -ac_halving=525600 -ac_reward=13000000000 -ac_pubkey=039d4a50cc70d1184e462a22edb3b66385da97cc8059196f8305c184a3e21440af -addnode=5.9.102.210 &
 ./komodod -pubkey=$pubkey -ac_name=KSB -ac_supply=1000000000 -ac_end=1 -ac_public=1 -addnode=37.187.225.231 &
+./komodod -pubkey=$pubkey -ac_name=OUR -ac_reward=1478310502 -ac_halving=525600 -ac_cc=42 -ac_supply=100000000 -ac_perc=77700 -ac_staked=93 -ac_pubkey=02652a3f3e00b3a1875a918314f0bac838d6dd189a346fa623f5efe9541ac0b98c -ac_public=1 -addnode=51.255.195.65 -addnode=217.182.129.38 -addnode=37.187.225.231 &
+

src/cc/assets.cpp

@@ -145,6 +145,13 @@ bool AssetsValidate(struct CCcontract_info *cpAssets,Eval* eval,const CTransacti
     numvouts = tx.vout.size();
     outputs = inputs = 0;
     preventCCvins = preventCCvouts = -1;
+    
+    // add specific chains exceptions for old token support:
+    if (strcmp(ASSETCHAINS_SYMBOL, "SEC") == 0 && chainActive.Height() <= 144073)
+        return true;
+    
+    if (strcmp(ASSETCHAINS_SYMBOL, "MGNX") == 0 && chainActive.Height() <= 210190)
+        return true;
 
 	if (numvouts == 0)
 		return eval->Invalid("AssetValidate: no vouts");

src/fiat/our

@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=OUR $1 $2 $3 $4 $5 $6

src/komodo.h

@@ -707,7 +707,7 @@ int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scr
                     komodo_stateupdate(height,0,0,0,zero,0,0,0,0,0,0,0,0,0,0,sp->MoM,sp->MoMdepth);
                     if ( ASSETCHAINS_SYMBOL[0] != 0 )
                         printf("[%s] ht.%d NOTARIZED.%d %s.%s %sTXID.%s lens.(%d %d) MoM.%s %d\n",ASSETCHAINS_SYMBOL,height,*notarizedheightp,ASSETCHAINS_SYMBOL[0]==0?"KMD":ASSETCHAINS_SYMBOL,srchash.ToString().c_str(),ASSETCHAINS_SYMBOL[0]==0?"BTC":"KMD",desttxid.ToString().c_str(),opretlen,len,sp->MoM.ToString().c_str(),sp->MoMdepth);
-                    if (RemoveOrphanedBlocks(*notarizedheightp))
+                    if ( 0 && RemoveOrphanedBlocks(*notarizedheightp))
                     {
                         //fprintf(stderr, "Sucessfully removed all known orphaned blocks before height %d\n",*notarizedheightp);
                     }

src/main.cpp

@@ -3254,6 +3254,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         //fprintf(stderr,"checkblock failure in connectblock futureblock.%d\n",futureblock);
         return false;
     }
+    // check pindex->CONTEXT_VALIDATED flag
     if ( fCheckPOW != 0 && !ContextualCheckBlock(block, state, pindex->pprev) ) // Activate Jan 15th, 2019
     {
         fprintf(stderr,"ContextualCheckBlock failed ht.%d\n",(int32_t)pindex->GetHeight());