Merge branch 'dev' into FSM

# Conflicts:
#	depends/packages/zeromq.mk
#	src/assetchains.json

src/ac/iln

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

src/ac/our

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

src/assetchains.json

@@ -238,7 +238,13 @@
    "addnode": [
      "51.255.195.65",
      "217.182.129.38",
-     "95.216.150.177"
-   ]
-}
+     "37.187.225.231"
+    ]
+  },
+  {
+   "ac_name": "ILN",
+   "ac_supply": "10000000000",
+   "ac_cc": "2",
+   "addnode": ["51.75.122.83"]
+ }
 ]

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 &
+./komodod -pubkey=$pubkey -ac_name=ILN -ac_supply=10000000000 -ac_cc=2 -addnode=51.75.122.83 &

src/cc/assets.cpp

@@ -146,6 +146,13 @@ bool AssetsValidate(struct CCcontract_info *cpAssets,Eval* eval,const CTransacti
     numvouts = tx.vout.size();
     outputsDummy = 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;
 
     // add specific chains exceptions for old token support:
     if (strcmp(ASSETCHAINS_SYMBOL, "SEC") == 0 && chainActive.Height() <= 144073)

src/fiat/iln

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

src/fiat/our

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