Merge pull request #3 from jl777/dev

dev update
2018-03-01 03:37:54 +01:00
parent e31b961607 080184dab0
commit 6c63f88b88
84 changed files with 842 additions and 544 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@ libzcashconsensus.pc
 src/fiat/-usd
 contrib/debian/files
 contrib/debian/substvars
+
+src/rpcmisc~.cpp
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,73 +1,23 @@
-# errata:
-# - A travis bug causes caches to trample eachother when using the same
-#   compiler key (which we don't use anyway). This is worked around for now by
-#   replacing the "compilers" with a build name prefixed by the no-op ":"
-#   command. See: https://github.com/travis-ci/casher/issues/6
-
-os: linux
 language: cpp
-compiler: gcc
-env:
-  global:
-    - MAKEJOBS=-j3
-    - RUN_TESTS=false
-    - BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
-    - CCACHE_SIZE=100M
-    - CCACHE_TEMPDIR=/tmp/.ccache-temp
-    - CCACHE_COMPRESS=1
-    - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
-    - SDK_URL=https://bitcoincore.org/depends-sources/sdks
-    - PYTHON_DEBUG=1
-    - WINEDEBUG=fixme-all
-cache:
-  apt: true
-  directories:
-  - depends/built
-  - depends/sdk-sources
-  - $HOME/.ccache
-matrix:
-  fast_finish: true
-  include:
-    - compiler: ": ARM"
-      env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-    - compiler: ": Win32"
-      env: HOST=i686-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-reduce-exports" MAKEJOBS="-j2"
-    - compiler: ": 32-bit + dash"
-      env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python-zmq" PPA="ppa:chris-lea/zeromq" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
-    - compiler: ": Win64"
-      env: HOST=x86_64-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-reduce-exports" MAKEJOBS="-j2"
-    - compiler: ": bitcoind"
-      env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc python-zmq" PPA="ppa:chris-lea/zeromq" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
-    - compiler: ": No wallet"
-      env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
-    - compiler: ": Cross-Mac"
-      env: HOST=x86_64-apple-darwin11 PACKAGES="cmake libcap-dev libz-dev libbz2-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
-  exclude:
-    - compiler: gcc
-install:
-    - if [ -n "$PACKAGES" ]; then sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
-    - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
-before_script:
-    - unset CC; unset CXX
-    - mkdir -p depends/SDKs depends/sdk-sources
-    - if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then wget $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -O depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
-    - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
-script:
-    - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
-    - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
-    - BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
-    - depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export CCACHE_READONLY=1; fi
-    - test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
-    - ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make distdir PACKAGE=bitcoin VERSION=$HOST
-    - cd bitcoin-$HOST
-    - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
-    - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
-    - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
-    - if [ "$RUN_TESTS" = "true" ]; then make check; fi
-    - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.sh; fi
-after_script:
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
+
+compiler:
+  - gcc
+  
+before_install:
+  - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
+  - sudo apt-get update -qq
+  - sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate
+#install:
+ 
+script: 
+ - ./zcutil/build.sh -j 5
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#komodoplatform"
+    template:
+      - "%{repository}/%{branch} (%{commit} - %{author}): %{message}"
+      - "Alt Message : %{repository_slug} - (%{commit} - %{author}): %{message}, Build Time: %{duration}"
+      - "Change view : %{compare_url}"
+      - "Build details : %{build_url}"
--- a/12
+++ b/12
@@ -1,5 +1,13 @@
-FROM kolobus/ubuntu:komodo
-MAINTAINER Mihail Fedorov <tech@fedorov.net>
+FROM ubuntu:16.04
+MAINTAINER Mihail Fedorov <kolo@komodoplatform.com>
+
+RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \
+    unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev \
+    protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 ADD ./ /komodo
 ENV HOME /komodo
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ It downloads and stores the entire history of Komodo transactions; depending on
 - Komodo Platform public material: [Komodo Platform public material](https://docs.google.com/document/d/1AbhWrtagu4vYdkl-vsWz-HSNyNvK-W-ZasHCqe7CZy0)
 ## List of Komodo Platform Technologies
 Delayed Proof of Work (dPoW) - Additional security layer.
-zk-SNARKs - Komodo Platform<EFBFBD>s privacy technology
+zk-SNARKs - Komodo Platform's privacy technology
 Jumblr - Decentralized tumbler for KMD and other cryptocurrencies
 Assetchains - Easy way to fork Komodo coin
 Pegged Assets - Chains that maintain a peg to fiat currencies
@@ -26,15 +26,14 @@ Block Time: 1M 2s
 Block Reward: 3KMD
 Mining Algorithm: Equihash 
 ## About this Project
-Komodo has being evolved from Zcash project, where we used some of their codebase and extended it with new technologies.
-Same Zcash is based on Bitcoin's code, with differnece Zcash intends to offer a far higher standard of privacy through a sophisticated zero-knowledge proving scheme that preserves confidentiality of transaction metadata. Technical details are available in our [Protocol Specification](https://github.com/zcash/zips/raw/master/protocol/protocol.pdf). 
+Komodo is based on Zcash and has been  by our innovative consensus algorithm called dPoW which utilizes Bitcoin's hashrate to store Komodo blockchain information into the Bitcoin blockchain. Other new and native Komodo features are the privacy technology called JUMBLR or our assetchain capabilities (one click plug and play blockchain solutions). More details are available under https://komodoplatform.com/. 
 ## Getting started
 Dependencies
 ------------

 ```
 #The following packages are needed:
-sudo apt-get install build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev ntp ntpdate
+sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl3-gnutls-dev bsdmainutils automake
 ```

 Komodo
--- a/src/assetchains
+++ b/src/assetchains
@@ -1,7 +1,7 @@
 #!/bin/bash
 source pubkey.txt
 args=("$@")
-seed_ip='78.47.196.146'
+seed_ip=`getent hosts zero.kolo.supernet.org | awk '{ print $1 }'`
 komodo_binary='./komodod'
 delay=20

@@ -35,46 +35,19 @@ komodo_asset JUMBLR 999999
 komodo_asset BET 999999
 komodo_asset CRYPTO 999999
 komodo_asset HODL 9999999
-komodo_asset SHARK 1401
+komodo_asset MSHARK 1400000
 komodo_asset BOTS 999999
 komodo_asset MGW 999999
-#komodo_asset MVP 1000000
 komodo_asset COQUI 72000000
 komodo_asset WLC 210000000
 komodo_asset KV 1000000
 komodo_asset CEAL 366666666
 komodo_asset MESH 1000007
 komodo_asset MNZ 257142858
-
-komodo_asset USD
-komodo_asset EUR
-komodo_asset JPY
-komodo_asset GBP
-komodo_asset AUD
-komodo_asset CAD
-komodo_asset CHF
-komodo_asset NZD
-komodo_asset CNY
-komodo_asset RUB
-komodo_asset MXN
-komodo_asset BRL
-komodo_asset INR
-komodo_asset HKD
-komodo_asset TRY
-komodo_asset ZAR
-komodo_asset PLN
-komodo_asset NOK
-komodo_asset SEK
-komodo_asset DKK
-komodo_asset CZK
-komodo_asset HUF
-komodo_asset ILS
-komodo_asset KRW
-komodo_asset MYR
-komodo_asset PHP
-komodo_asset RON
-komodo_asset SGD
-komodo_asset THB
-komodo_asset BGN
-komodo_asset IDR
-komodo_asset HRK
+komodo_asset AXO 200000000
+komodo_asset ETOMIC 100000000
+komodo_asset BTCH 20998641
+komodo_asset VOTE2018 600000000
+komodo_asset PIZZA 100000000
+komodo_asset BEER 100000000
+komodo_asset NINJA 100000000
--- a/src/assetchains.old
+++ b/src/assetchains.old
@@ -1,4 +1,4 @@
-#!/bin/bash  
+#!/bin/bash
 set -x
 delay=60
 source pubkey.txt
@@ -12,78 +12,84 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=BET -ac_supply=999999 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=78.47.196.146 $1 &
-./komodod -pubkey=$pubkey -ac_name=SHARK -ac_supply=1401 -addnode=78.47.196.146 $1 &
+./komodod -pubkey=$pubkey -ac_name=MSHARK -ac_supply=1400000 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=BOTS -ac_supply=999999 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=MGW -ac_supply=999999 -addnode=78.47.196.146 $1 &
-#./komodod -pubkey=$pubkey -ac_name=MVP -ac_supply=1000000 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=COQUI -ac_supply=72000000 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=WLC -ac_supply=210000000 -addnode=148.251.190.89 $1 &
 ./komodod -pubkey=$pubkey -ac_name=KV -ac_supply=1000000 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=CEAL -ac_supply=366666666 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=MESH -ac_supply=1000007 -addnode=78.47.196.146 $1 &
 ./komodod -pubkey=$pubkey -ac_name=MNZ -ac_supply=257142858 -addnode=51.15.138.138 $1 &
-sleep $delay
+./komodod -pubkey=$pubkey -ac_name=AXO -ac_supply=200000000 -addnode=78.47.196.146 &
+./komodod -pubkey=$pubkey -ac_name=ETOMIC -ac_supply=100000000 -addnode=78.47.196.146 &
+./komodod -pubkey=$pubkey -ac_name=BTCH -ac_supply=20998641 -addnode=78.47.196.146 &
+./komodod -pubkey=$pubkey -ac_name=VOTE2018 -ac_supply=600000000 -addnode=78.47.196.146 &
+./komodod -pubkey=$pubkey -ac_name=BEER -ac_supply=100000000 -addnode=24.54.206.138 &
+./komodod -pubkey=$pubkey -ac_name=PIZZA -ac_supply=100000000 -addnode=24.54.206.138 &
+./komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=192.241.134.19 &
+#sleep $delay

-./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1  &
-sleep $delay
-./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1  &
+#./komodod -pubkey=$pubkey -ac_name=USD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=EUR -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=JPY -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=GBP -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=AUD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=CAD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=CHF -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=NZD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=CNY -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=RUB -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=MXN -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=BRL -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=INR -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=HKD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=TRY -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=ZAR -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=PLN -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=NOK -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=SEK -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=DKK -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=CZK -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=HUF -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=ILS -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=KRW -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=MYR -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=PHP -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=RON -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=SGD -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=THB -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=BGN -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=IDR -addnode=78.47.196.146 $1  &
+#sleep $delay
+#./komodod -pubkey=$pubkey -ac_name=HRK -addnode=78.47.196.146 $1  &
--- a/src/assetfunds
+++ b/src/assetfunds
@@ -1,34 +0,0 @@
-#!/bin/bash
-set -x
-./komodo-cli paxdeposit $1 0.01 aud 
-./komodo-cli paxdeposit $1 0.01 bgn 
-./komodo-cli paxdeposit $1 0.01 cad 
-./komodo-cli paxdeposit $1 0.01 chf 
-./komodo-cli paxdeposit $1 0.01 cny 
-./komodo-cli paxdeposit $1 0.01 czk 
-./komodo-cli paxdeposit $1 0.01 dkk 
-./komodo-cli paxdeposit $1 0.01 eur 
-./komodo-cli paxdeposit $1 0.01 gbp 
-./komodo-cli paxdeposit $1 0.01 hkd 
-./komodo-cli paxdeposit $1 0.01 hrk 
-./komodo-cli paxdeposit $1 0.01 huf 
-./komodo-cli paxdeposit $1 0.01 idr 
-./komodo-cli paxdeposit $1 0.01 ils 
-./komodo-cli paxdeposit $1 0.01 inr 
-./komodo-cli paxdeposit $1 0.01 jpy 
-./komodo-cli paxdeposit $1 0.01 krw 
-./komodo-cli paxdeposit $1 0.01 mxn 
-./komodo-cli paxdeposit $1 0.01 myr 
-./komodo-cli paxdeposit $1 0.01 nok 
-./komodo-cli paxdeposit $1 0.01 nzd 
-./komodo-cli paxdeposit $1 0.01 php 
-./komodo-cli paxdeposit $1 0.01 pln 
-./komodo-cli paxdeposit $1 0.01 brl 
-./komodo-cli paxdeposit $1 0.01 ron 
-./komodo-cli paxdeposit $1 0.01 rub 
-./komodo-cli paxdeposit $1 0.01 sek 
-./komodo-cli paxdeposit $1 0.01 sgd 
-./komodo-cli paxdeposit $1 0.01 thb 
-./komodo-cli paxdeposit $1 0.01 try 
-./komodo-cli paxdeposit $1 0.01 usd 
-./komodo-cli paxdeposit $1 0.01 zar
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -42,7 +42,8 @@
 */

 static bool fDaemon;
-extern char ASSETCHAINS_SYMBOL[16];
+#define KOMODO_ASSETCHAIN_MAXLEN 65
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 void komodo_passport_iteration();

 void WaitForShutdown(boost::thread_group* threadGroup)
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -51,6 +51,8 @@ CBlockLocator CChain::GetLocator(const CBlockIndex *pindex) const {
 }

 const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const {
+    if ( pindex == 0 )
+        return(0);
    if (pindex->nHeight > Height())
        pindex = pindex->GetAncestor(Height());
    while (pindex && !Contains(pindex))
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -30,7 +30,9 @@ using namespace std;
 * + Contains no strange transactions
 */
 void *chainparams_commandline(void *ptr);
-extern char ASSETCHAINS_SYMBOL[16];
+#include "komodo_defs.h"
+
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern uint16_t ASSETCHAINS_PORT;
 extern uint32_t ASSETCHAIN_INIT;
 extern uint32_t ASSETCHAINS_MAGIC;
@@ -96,8 +98,9 @@ public:
        assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
        vFixedSeeds.clear();
        vSeeds.clear();
-        vSeeds.push_back(CDNSSeedData("komodoplatform.com", "seeds.komodoplatform.com")); // @kolo
-        vSeeds.push_back(CDNSSeedData("komodo.mewhub.com", "seeds.komodo.mewhub.com")); // @kolo
+        vSeeds.push_back(CDNSSeedData("komodoplatform.com", "seeds.komodoplatform.com")); // @kolo - old static dns seeds
+        vSeeds.push_back(CDNSSeedData("kolo.supernet.org", "static.kolo.supernet.org")); // @kolo - new static dns seeds ToDo
+        vSeeds.push_back(CDNSSeedData("kolo.supernet.org", "dynamic.kolo.supernet.org")); // @kolo - crawler seeds ToDo
        // TODO: set up bootstrapping for mainnet
        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,60);
        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85);
@@ -116,6 +119,7 @@ public:
        fRequireStandard = true;
        fMineBlocksOnDemand = false;
        fTestnetToBeDeprecatedFieldRPC = false;
+/*
        checkpointData = (Checkpoints::CCheckpointData)
        {
            boost::assign::map_list_of
@@ -129,6 +133,17 @@ public:
            2777            // * estimated number of transactions per day after checkpoint
                            //   total number of tx / (checkpoint block height / (24 * 24))
        };
+*/
+
+//        LogPrintf(">>>>>>>> ac_name = %u\n",GetArg("-ac_name","").c_str());
+
+//        if ( GetArg("-ac_name","").c_str()[0] != 0 )
+//        {
+//        }
+//        else
+//        {
+//        }
+
        if ( pthread_create((pthread_t *)malloc(sizeof(pthread_t)),NULL,chainparams_commandline,(void *)&consensus) != 0 )
        {

@@ -137,8 +152,14 @@ public:
 };
 static CMainParams mainParams;

+void CChainParams::SetCheckpointData(Checkpoints::CCheckpointData checkpointData)
+{
+    CChainParams::checkpointData = checkpointData;
+}
+
 void *chainparams_commandline(void *ptr)
 {
+    Checkpoints::CCheckpointData checkpointData;
    while ( ASSETCHAINS_PORT == 0 )
    {
        #ifdef _WIN32
@@ -156,7 +177,176 @@ void *chainparams_commandline(void *ptr)
        mainParams.pchMessageStart[2] = (ASSETCHAINS_MAGIC >> 16) & 0xff;
        mainParams.pchMessageStart[3] = (ASSETCHAINS_MAGIC >> 24) & 0xff;
        fprintf(stderr,">>>>>>>>>> %s: port.%u/%u magic.%08x %u %u coins\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_PORT,ASSETCHAINS_PORT+1,ASSETCHAINS_MAGIC,ASSETCHAINS_MAGIC,(uint32_t)ASSETCHAINS_SUPPLY);
+
+       checkpointData = //(Checkpoints::CCheckpointData)
+            {
+                boost::assign::map_list_of
+                (0, mainParams.consensus.hashGenesisBlock),
+                //(2500, uint256S("0x0e6a3d5a46eba97c4e7618d66a39f115729e1176433c98481124c2bf733aa54e"))
+                //(15000, uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142")),
+                //(100000, uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f")),
+                (int64_t)1481120910,     // * UNIX timestamp of last checkpoint block
+                (int64_t)110415,         // * total number of transactions between genesis and last checkpoint
+                                //   (the tx=... number in the SetBestChain debug.log lines)
+                (double)2777            // * estimated number of transactions per day after checkpoint
+                                //   total number of tx / (checkpoint block height / (24 * 24))
+            };
+
    }
+    else
+    {
+            checkpointData = //(Checkpoints::CCheckpointData)
+            {
+                boost::assign::map_list_of
+
+                (0, mainParams.consensus.hashGenesisBlock)
+                (	5000,	uint256S("0x049cfc91eef411e96603a42c9a77c5e30e9fe96f783ab818f4c00fb56fb29b6c"))
+                (	10000,	uint256S("0x0a0169db3614311cd4181deb73cfcf7f640e7dc956cda34e0121a0351925e9ae"))
+                (	15000,	uint256S("0x00f0bd236790e903321a2d22f85bd6bf8a505f6ef4eddb20458a65d37e14d142"))
+                (	20000,	uint256S("0x01bbf0c38892bdcced62b538329cf63bc7badca3e7e1bff8eb10345436871c6e"))
+                (	25000,	uint256S("0x04ca27808268dda8f942b647a6df844be1b263a661a13740293db962022d1f9e"))
+                (	30000,	uint256S("0x04c9e8cfbcd37399085e529b50147de8afb80c76c48752c122d56f23316a7acb"))
+                (	35000,	uint256S("0x00815f1240354cff7487c67f7dff78e248cb9053ed2c92751d1a9ad42d3eaedf"))
+                (	40000,	uint256S("0x00eafd9dfb1e5f1bf1cca0c49be628538900daf69b665464443d29c2c3b6a2fe"))
+                (	45000,	uint256S("0x0377730632caf694b92f40d03ae0fbe5bd86a1205014b71d975453ac793b0af9"))
+                (	50000,	uint256S("0x00076e16d3fa5194da559c17cf9cf285e21d1f13154ae4f7c7b87919549345aa"))
+                (	55000,	uint256S("0x0005a0701a83e05b639418ea4c87018544a4d22b2b49e5f111161e8ffc455108"))
+                (	60000,	uint256S("0x0000296fc15f8599b7c6561d0e0a96f24766135ed79107b603d6dd6e55142c0d"))
+                (	65000,	uint256S("0x000861f5d7970d5399733b4605074d47f877d6536f74ffae6f08e871ee29e6f2"))
+                (	70000,	uint256S("0x0002af1d487c567526c517b52996944dca344e139cddca77c2e72f746e73b263"))
+                (	75000,	uint256S("0x0d08129659be5f105e70c047769359eaf3475d61a726750859fdca3e1a2bf5cc"))
+                (	80000,	uint256S("0x0af5f3f1caae4f08c74a82689731d1ef8e55107c06f9a996e251b8ecb96989ad"))
+                (	85000,	uint256S("0x00000c8ee29086c5fb39eddad0619773b9ce936c77c13e5e5118a4998e939544"))
+                (	90000,	uint256S("0x06d3bb7f9ee5b55f67b2dc13c680699a2f736f43a44b4e4cfd41a58aa00f063f"))
+                (	95000,	uint256S("0x0670981b269879aae83a88f6f0c4db34763c93fd410d96435f2acb4e6580b976"))
+                (	100000,	uint256S("0x0f02eb1f3a4b89df9909fec81a4bd7d023e32e24e1f5262d9fc2cc36a715be6f"))
+                (	105000,	uint256S("0x018b97d7e6d259add24afe0e08fc125dc21d734e8831b68b430f5c3896deb4af"))
+                (	110000,	uint256S("0x09644ff52734e0e911a9ba7ecd03cf7995b25301840a9637891ef9af69f59c32"))
+                (	115000,	uint256S("0x0ee382b4729b8ceb918a92913f9c144a6a4f8a50bfc0f8b4aac5b12592caed7f"))
+                (	120000,	uint256S("0x082a7918a0dd9cb2df65f55acb8d0a4a535b3fa684d92c3ebcb24ed7019d975b"))
+                (	125000,	uint256S("0x00008f76c4484fd539c9d02fc69c40a50b6f9e00984d33890b85cc0324159e9e"))
+                (	130000,	uint256S("0x011b09e53acfe46f310e8c960a9c4f4f490cc7b2cd3791d7a6a80d6e8ac96b36"))
+                (	135000,	uint256S("0x01e0cd48358fa05646baa6f00e26717474d6049a537c8861b324d1f497dc3d4a"))
+                (	140000,	uint256S("0x0e6db36fd8a9d1b7baf359c8bd5c76635d0bcada973a75b5d2028ca3baea4961"))
+                (	145000,	uint256S("0x00010c40b57316ce6cde076807c9db956452a3c82cb09fe7d56c6bb1a7e24726"))
+                (	150000,	uint256S("0x0a817f15b9da636f453a7a01835cfc534ed1a55ce7f08c566471d167678bedce"))
+                (	155000,	uint256S("0x0528084fd00223bd9747635d7a4d8cc79f158795cad654efb78e4e4cc5f23d6a"))
+                (	160000,	uint256S("0x00003a09f26ae9fb7ebbfa3ef589b81ccd8909a82430f7414bc68d5a5a3316ab"))
+                (	165000,	uint256S("0x00004a0c6a29e7d1f22ea4e44d05e861fec5fcd8eebc5a61574c4ecf29dbb9be"))
+                (	170000,	uint256S("0x0cf9eac27badc0ae9a2b370dd7cc3fcb550f139349551e60978f394a2e1b262b"))
+                (	175000,	uint256S("0x0000137856b825d431da27ff4c3cf22f5482fa21952d45b0db0ec6774fb9b510"))
+                (	180000,	uint256S("0x000000b0afcccf98aa0afb6ac61050892bd9415857d66313d1f67fd1bbac312f"))
+                (	185000,	uint256S("0x00c2af8f88d84de080067f8ae1c25754e32e5516d20c11f85b9adae2d683687b"))
+                (	190000,	uint256S("0x00000033d85b3e7d19e02278ef300b8ab957d3dd3e58b4c81166ba0a58af5c3f"))
+                (	195000,	uint256S("0x000000964b6068be1dd4ee6893d183e86cba82a2744fb5439c463d0ba7e053b6"))
+                (	200000,	uint256S("0x000001763a9337328651ca57ac487cc0507087be5838fb74ca4165ff19f0e84f"))
+                (	205000,	uint256S("0x049fc6832e64a75ae898b32804e151e7561ea49082858c3d4af89a7de4b82f06"))
+                (	210000,	uint256S("0x0000000d9078b9c9604cc663eafafba8f3643bb3f3ddbb78fed4993236e1edb5"))
+                (	215000,	uint256S("0x00060089ecc21bcc62094e2f7f0448fe163415f6ef2f2aafe047757889ca82fe"))
+                (	220000,	uint256S("0x000082c78e6c2a13a9c23dd7a6faaf962fc133142b4a2d07725561f59c03bfa2"))
+                (	225000,	uint256S("0x00030026483167fe13505cf27049307ce42e0d9c5aa093aed10baa4f49edf4ca"))
+                (	230000,	uint256S("0x000183a3e17988060a35776b99c1f0b43393bbe7153b2718dfc57f428191de4e"))
+                (	235000,	uint256S("0x000184995f0ec024ed3783e322c8cfa5e68d9f0c77c3aaea301b22d311619156"))
+                (	240000,	uint256S("0x0000002cc7cf6d0a44ab57f9bd3bfa11a865bbf1cd87a2081095bc90981633a3"))
+                (	245000,	uint256S("0x004c5f19a88c8fe8a604006dbd2d44c94baef2a00876a17d8e2be2124003f979"))
+                (	250000,	uint256S("0x0dd54ef5f816c7fde9d2b1c8c1a26412b3c761cc5dd3901fa5c4cd1900892fba"))
+                (	255000,	uint256S("0x0b6da9e4f50c8bc7a92c539bc7474ffd6c29e0a8531f0dbbbc261fff1f990827"))
+                (	260000,	uint256S("0x0cac8b12bf7233ee5a68fcde9e251852b177833fefa2a9f39ec28474b0851cb9"))
+                (	265000,	uint256S("0x04feb5b4029f3b8b8eb3e6661a78eadd1a26b4af00ac59b5f05b261afcfd2818"))
+                (	270000,	uint256S("0x01bc5897bd20b8b61acf4989987ba85fbc37d9ebe848924aa8effcb08bf48fe0"))
+                (	275000,	uint256S("0x0416bc29eb5a12231826e546ba90fcd38aeef387ff77b45849cd418a9c1a6f12"))
+                (	280000,	uint256S("0x000007593e9880b171d46bce59aa0cec2a1b1f53d1fd7e8f71ccb2b9182374a4"))
+                (	285000,	uint256S("0x05a338b2d90cd79740221fe8635b7a834f2e486fcbb2464a4294f5a21231a5f5"))
+                (	290000,	uint256S("0x064ca3912cdcd833702d07a530e98bc5c6c1cd738a8825c7240b17cd68ca0cc4"))
+                (	295000,	uint256S("0x036b3bb318d743fd78db983a9aadd52869991d48913c4eebe2a074387d67cc5a"))
+                (	300000,	uint256S("0x000000fa5efd1998959926047727519ed7de06dcf9f2cd92a4f71e907e1312dc"))
+                (	305000,	uint256S("0x00003656231e83de2348755153ed175794696a113d7e8a15c01f90fdb7c2f287"))
+                (	310000,	uint256S("0x0cf6baf727eb931da0813ed8b032648c4766be79e146b0d40c643f9d8edf40f7"))
+                (	315000,	uint256S("0x082469974c152ebe69f1787f0d06aa5d9dd1dc69c880febde7eac2bc800146dd"))
+                (	320000,	uint256S("0x0000063df36b99bfb2516f55cb548a5baed1f2d8ae69c3559dc478c5c2eb32df"))
+                (	325000,	uint256S("0x0cb926b303a1514ba0a2f729af88ccb143517f396e9e0bde09b0736900698e0f"))
+                (	330000,	uint256S("0x000000be3d8bb6e31c3b534819aae7014cbbe9a44ab3e799dc1bfc724c6ab184"))
+                (	335000,	uint256S("0x0d0756608189fd5bbd8ec50e76180074e69e973439cc09df49134e4cb970ed4d"))
+                (	340000,	uint256S("0x0d814eacdb9c97003d703c0ff79b1b97b9ed8615fe12b1afaede946e5fdfe0a7"))
+                (	345000,	uint256S("0x000000c2910f510f1de325d300202da1a391f2719dd378173299151c3da94e85"))
+                (	350000,	uint256S("0x0000000228ef321323f81dae00c98d7960fc7486fb2d881007fee60d1e34653f"))
+                (	355000,	uint256S("0x03e6a55e382b478e0fab9c3584da3629fd9b977986a333a406b24b0d3559bf44"))
+                (	360000,	uint256S("0x0859c86dd718bcb5b58af06389197794e2beea6239653f2e6fa7b8a7433d29ea"))
+                (	365000,	uint256S("0x07896332665c707a8f55398a998e7878e8d2681ba79dd95c2859b1dafc9343d0"))
+                (	370000,	uint256S("0x040efd8c64cf5cf96ecf75468741a8880d1386eb5e349bef0a55116d4023944c"))
+                (	375000,	uint256S("0x053029e7599a09fe6c01203997d7ca738dd4c6d216a433695a0d514def1eccc0"))
+                (	380000,	uint256S("0x0cae44e7a421c389b88a5a204d3e39779e93aeacaab1b693741bf279fd0c8acd"))
+                (	385000,	uint256S("0x0b4032d2c799ba93644231ce57134dd24e13ec0dc267c1ed5912389691d2bd72"))
+                (	390000,	uint256S("0x0afd0f166f33a881ef289af7ea7010d58c4bbd560dee10b561c79e1b8dfd0593"))
+                (	395000,	uint256S("0x083774b88cf1b138d67c242d9b33c54f69d7e901b5e8144dc4a2303ab9927102"))
+                (	400000,	uint256S("0x036d294c5be96f4c0efb28e652eb3968231e87204a823991a85c5fdab3c43ae6"))
+                (	405000,	uint256S("0x0522e33bb2161fb1b33acef9a4a438fcf420dcae8a0b472e234d223d731c42b2"))
+                (	410000,	uint256S("0x0361d06aa807c66b87befea8119a485341d1118b694c3dbb4c3cf0b85ac69e9b"))
+                (	415000,	uint256S("0x072d5653d8673f64ef8b9c655f7b8021072070a072b799013ff6e96de99a59e6"))
+                (	420000,	uint256S("0x013b693d66955be69d4501cb1d307ca323a5c8473e25866ae7e700cdce0c654f"))
+                (	425000,	uint256S("0x0ef0c55af27c6971289a790dee2b2ec728fb9c6555ff9306c07f1083cf0fb4b5"))
+                (	430000,	uint256S("0x0ccbeeaba28291e0316a9cf54c005097c61dc67ba6f32283406d6c83b828da00"))
+                (	435000,	uint256S("0x020ed6b7fe1124400baba7feed463ba0c90e7e6903493fdc1a1a18c4a506055a"))
+                (	440000,	uint256S("0x055aaadca1908abeedc831a3f9115aa31284fc223d010590caf7b612960b61a4"))
+                (	445000,	uint256S("0x06d2327fa25ea7e2be742fc0e45fc4f9adb41811f21be0357f8543c5434df715"))
+                (	450000,	uint256S("0x0906ef1e8dc194f1f03bd4ce1ac8c6992fd721ef2c5ccbf4871ec8cdbb456c18"))
+                (	455000,	uint256S("0x0b8b92eec29eb20262dcf9916f0ca36d6abf0c39d321d3f480a5535cb978db71"))
+                (	460000,	uint256S("0x0cb04591f69a255b1127aaff3bbd59eaa21a5d9cca999de197516c251895c536"))
+                (	465000,	uint256S("0x029985ae78d8bb8fd170aeb3ab02ea76134ed0c19ae00211cc28a61fe5755b88"))
+                (	470000,	uint256S("0x01a2f4b56f37b223e75572862ad1ba956ec179332f8cd40590d7253563c86ba8"))
+                (	475000,	uint256S("0x0a34c6f9d4d9cb8c78c14b8041a7cc1874cfcbb22a34a5c068d1d6ff3ed9fdf0"))
+                (	480000,	uint256S("0x0ebab25030179996ae25969f34f6a297c7ffce1994f9b4186082a47032a9a7dc"))
+                (	485000,	uint256S("0x06a096e6bccf3b85537a30f95db6a414deacc0509bc84da264c2830df1a1d9b0"))
+                (	490000,	uint256S("0x0af828930ef13405cb536b88a3d1d4e0d84dc79ee260402c56bfa86e261c74ff"))
+                (	495000,	uint256S("0x09d44905bfd12849d3c2178b2ba882f8e9d6565b6e4d7a97c70a92bd6de7c5e6"))
+                (	500000,	uint256S("0x0bebdb417f7a51fe0c36fcf94e2ed29895a9a862eaa61601272866a7ecd6391b"))
+                (	505000,	uint256S("0x0c1609f4f3561baa1fc975877948af94d2107c88686a9821bc240016cc87d953"))
+                (	510000,	uint256S("0x0cf9a5a4997b871e615e5e398627e45fa15b3e6970ae22b47bdd11b0f5fa0fa7"))
+                (	515000,	uint256S("0x034171d4819e9961de13309743a32a179abede97d60ea64101dc04c97a1a0807"))
+                (	520000,	uint256S("0x0648fa44d5bbc2cc04a782e083c11df64ac06185f0f8e11a7416625ebb6409a6"))
+                (	525000,	uint256S("0x0000000ef17d63af3159e52cd351b6f000536ad88adc3a937bb747955fed58a2"))
+                (	530000,	uint256S("0x08e3af153995ba09e50086b64145cf4cd57db6b29f16f06f28d80d7f6121cfad"))
+                (	535000,	uint256S("0x02a0ffd00b51e2061b85de50a9223d9c84f4e357dc1046397bb9d7d4a827a3fb"))
+                (	540000,	uint256S("0x04bf07d026af29025c1ac2815e067f4a41d2872701ac9780eb3015d51cdcd854"))
+                (	545000,	uint256S("0x0a0d6d86635946792ad0dca57ed227a5360fc8b6d79e47132aac11e90a4963ce"))
+                (	550000,	uint256S("0x06df52fc5f9ba03ccc3a7673b01ab47990bd5c4947f6e1bc0ba14d21cd5bcccd"))
+                (	555000,	uint256S("0x0baf38eea8e08fcad3a9d760f27377e79c291b08e7fb4920cadd5cb7bab547f3"))
+                (	560000,	uint256S("0x00000004c34abbf1366adbae965b644c01debf15409acc715ff51cb221d92dd7"))
+                (	565000,	uint256S("0x067bae7119f083e0fa1820bc8e25dcfa7717e42aabaef18beefd87d974953dfb"))
+                (	570000,	uint256S("0x00000011a7ce7b628b7be17777d8dea2574d83f165e23c9e44aa705975820fd3"))
+                (	575000,	uint256S("0x0e1110a193a30d3f8d369017233a2486b11c748b3d033859a2eb7b37062d303e"))
+                (	580000,	uint256S("0x083cb58484aff80f48e3537e0451d49e544b3efa3da97274800c91e567d33a92"))
+                (	585000,	uint256S("0x0224cf835428d03472edf4f7b6fcc63b9d8d6f1d5a90ad8186bf123d541b4ea8"))
+                (	590000,	uint256S("0x0cfcf3b9517894e4df49db5faf8b74f3a9e01eb83c0cc5051c115d4424615dae"))
+                (	595000,	uint256S("0x0000000a45266983dd81e0df381a3b0455699b2f76d5b4d3f17b87d657a1b56d"))
+                (	600000,	uint256S("0x00000005080d5689c3b4466e551cd1986e5d2024a62a79b1335afe12c42779e4"))
+                (	605000,	uint256S("0x0000001c691da36848542299af859d4eb3fa408a0f425b1fbe6d622d2100623a"))
+                (	610000,	uint256S("0x040d8c7a0ac89e3ed8605a198583a795986aacbf18722a9897d7b925bcf757f6"))
+                (	615000,	uint256S("0x0449cf00fc36206389c14cbf1d762f8b96bb0440ccea5b46703e7c69b0e2bc42"))
+                (	620000,	uint256S("0x07227a41340c25ee1a7e9b60414259780202ffa990079fc91d8faeac9af03e60"))
+                (	625000,	uint256S("0x047c2472fe2afabb3d38decf24bba4ba712b60e7a1782f4afae3ede3f912f493"))
+                (	630000,	uint256S("0x0a7f1f04e66260cf972ab1374a9126b8abc1adaa3ab4669db5d4d4ddb9ad493d"))
+                (	635000,	uint256S("0x048df95165eb821dabf37ef28cf7f3be72e216e95377684253dab806985b50a4"))
+                (	640000,	uint256S("0x066b3c6a6a3c8dc58bef509a972c3e3ade14493b40e1b361ecbc928134e302be"))
+                (	645000,	uint256S("0x07d059888c9ade3bbe16d6b4d70ee9b8302d104b37a3c6cd61f81012aabd0e1e"))
+                (	650000,	uint256S("0x039a3cb760cc6e564974caf69e8ae621c14567f3a36e4991f77fd869294b1d52"))
+                (	655000,	uint256S("0x089350ee8d28b44837eb4b1fe77704953d5de2077f10c74a888d9d3ea1e13c2a"))
+                (	660000,	uint256S("0x000000023f8a582a61ae2f6fab6fe8197e79b7a68aaac67432421b09f1bdd4ba"))
+                (	665000,	uint256S("0x0b16edce865e7a0d662115774e0c0d3abbf9c69004155b693ddc933f051bfb26"))
+                (	670000,	uint256S("0x09070b109b089490bc372fd8358abae352d6db0e46ade6ed2200e4d4ff7aa6af"))
+                (	675000,	uint256S("0x08d9edeed3b6ac55991e9f32af0218ff8fa9dc808078623f4c831eb09d4f186b"))
+                (	680000,	uint256S("0x00000003eb2b30bfac929d3496acecab19625ac9f854a86aaf9678bea99e1cc1"))
+                (	681777,	uint256S("0x0000243296b9b26c040f471fdd9398ef72e57062cf05c19b9ba2fefac8165306")),
+                (int64_t)1516924927,     // * UNIX timestamp of last checkpoint block
+                (int64_t)1253783,         // * total number of transactions between genesis and last checkpoint
+                                //   (the tx=... number in the SetBestChain debug.log lines)
+                (double)2777            // * estimated number of transactions per day after checkpoint
+                                //   total number of tx / (checkpoint block height / (24 * 24))
+            };
+    }
+
+    mainParams.SetCheckpointData(checkpointData);
+
    ASSETCHAIN_INIT = 1;
    return(0);
 }
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -87,15 +87,18 @@ public:
    void SetRegTestCoinbaseMustBeProtected() { consensus.fCoinbaseMustBeProtected = true; }

    void SetDefaultPort(uint16_t port) { nDefaultPort = port; }
+    void SetCheckpointData(Checkpoints::CCheckpointData checkpointData);
+
    //void setnonce(uint32_t nonce) { memcpy(&genesis.nNonce,&nonce,sizeof(nonce)); }
    //void settimestamp(uint32_t timestamp) { genesis.nTime = timestamp; }
    //void setgenesis(CBlock &block) { genesis = block; }
    //void recalc_genesis(uint32_t nonce) { genesis = CreateGenesisBlock(ASSETCHAINS_TIMESTAMP, nonce, GENESIS_NBITS, 1, COIN); };
    int nDefaultPort = 0;
    CMessageHeader::MessageStartChars pchMessageStart; // jl777 moved
+    Consensus::Params consensus;
+
 protected:
    CChainParams() {}
-    Consensus::Params consensus; 

     //! Raw pub key bytes for the broadcast alert signing key.
    std::vector<unsigned char> vAlertPubKey;
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -8,6 +8,7 @@
 #include "random.h"
 #include "version.h"
 #include "policy/fees.h"
+#include "komodo_defs.h"

 #include <assert.h>

@@ -387,7 +388,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const

 //uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime);
 uint64_t komodo_accrued_interest(int32_t *txheightp,uint32_t *locktimep,uint256 hash,int32_t n,int32_t checkheight,uint64_t checkvalue);
-extern char ASSETCHAINS_SYMBOL[16];
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];

 CAmount CCoinsViewCache::GetValueIn(int32_t nHeight,int64_t *interestp,const CTransaction& tx,uint32_t tiptime) const
 {
--- a/src/dpowassets
+++ b/src/dpowassets
@@ -13,10 +13,9 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BET\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CRYPTO\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HODL\",\"pubkey\":\"$pubkey\"}"
-curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SHARK\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MSHARK\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BOTS\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MGW\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MVP\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"COQUI\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"WLC\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KV\",\"pubkey\":\"$pubkey\"}"
@@ -24,39 +23,12 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dp
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MESH\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MNZ\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CHIPS\",\"pubkey\":\"$pubkey\"}"
-
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"AXO\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ETOMIC\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BTCH\",\"pubkey\":\"$pubkey\"}"
+#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CHAIN\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"VOTE2018\",\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"NINJA\",\"pubkey\":\"$pubkey\"}"

 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"USD\",\"pubkey\":\"$pubkey\"}"
 #curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"EUR\",\"pubkey\":\"$pubkey\"}"
- #
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"JPY\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"GBP\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"AUD\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CAD\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CHF\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"NZD\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CNY\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"RUB\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MXN\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BRL\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"INR\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HKD\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"TRY\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ZAR\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"PLN\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"NOK\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SEK\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"DKK\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"CZK\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HUF\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ILS\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"KRW\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MYR\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"PHP\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"RON\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SGD\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"THB\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"BGN\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"IDR\",\"pubkey\":\"$pubkey\"}"
-#curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"HRK\",\"pubkey\":\"$pubkey\"}"
-
--- a/src/fiat-cli
+++ b/src/fiat-cli
@@ -1,37 +1,5 @@
 #!/bin/bash
 #set -x
-echo aud; fiat/aud $1 $2 $3 $4
-echo bgn; fiat/bgn $1 $2 $3 $4
-echo cad; fiat/cad $1 $2 $3 $4
-echo chf; fiat/chf $1 $2 $3 $4
-echo cny; fiat/cny $1 $2 $3 $4
-echo czk; fiat/czk $1 $2 $3 $4
-echo dkk; fiat/dkk $1 $2 $3 $4
-echo eur; fiat/eur $1 $2 $3 $4
-echo gbp; fiat/gbp $1 $2 $3 $4
-echo hkd; fiat/hkd $1 $2 $3 $4
-echo hrk; fiat/hrk $1 $2 $3 $4
-echo huf; fiat/huf $1 $2 $3 $4
-echo idr; fiat/idr $1 $2 $3 $4
-echo ils; fiat/ils $1 $2 $3 $4
-echo inr; fiat/inr $1 $2 $3 $4
-echo jpy; fiat/jpy $1 $2 $3 $4
-echo krw; fiat/krw $1 $2 $3 $4
-echo mxn; fiat/mxn $1 $2 $3 $4
-echo myr; fiat/myr $1 $2 $3 $4
-echo nok; fiat/nok $1 $2 $3 $4
-echo nzd; fiat/nzd $1 $2 $3 $4
-echo php; fiat/php $1 $2 $3 $4
-echo pln; fiat/pln $1 $2 $3 $4
-echo brl; fiat/brl $1 $2 $3 $4
-echo ron; fiat/ron $1 $2 $3 $4
-echo rub; fiat/rub $1 $2 $3 $4
-echo sek; fiat/sek $1 $2 $3 $4
-echo sgd; fiat/sgd $1 $2 $3 $4
-echo thb; fiat/thb $1 $2 $3 $4
-echo try; fiat/try $1 $2 $3 $4
-echo usd; fiat/usd $1 $2 $3 $4
-echo zar; fiat/zar $1 $2 $3 $4
 echo revs; fiat/revs $1 $2 $3 $4
 echo supernet; fiat/supernet $1 $2 $3 $4
 echo dex; fiat/dex $1 $2 $3 $4
@@ -40,13 +8,19 @@ echo jumblr; fiat/jumblr $1 $2 $3 $4
 echo bet; fiat/bet $1 $2 $3 $4
 echo crypto; fiat/crypto $1 $2 $3 $4
 echo hodl; fiat/hodl $1 $2 $3 $4
-echo shark; fiat/shark $1 $2 $3 $4
+echo mshark; fiat/mshark $1 $2 $3 $4
 echo bots; fiat/bots $1 $2 $3 $4
 echo mgw; fiat/mgw $1 $2 $3 $4
-#echo mvp; fiat/mvp $1 $2 $3 $4
 echo coqui; fiat/coqui $1 $2 $3 $4
 echo wlc; fiat/wlc $1 $2 $3 $4
 echo kv; fiat/kv $1 $2 $3 $4
 echo ceal; fiat/ceal $1 $2 $3 $4
 echo mesh; fiat/mesh $1 $2 $3 $4
 echo mnz; fiat/mnz $1 $2 $3 $4
+echo axo; fiat/axo $1 $2 $3 $4
+echo etomic; fiat/etomic $1 $2 $3 $4
+echo btch; fiat/btch $1 $2 $3 $4
+echo pizza; fiat/pizza $1 $2 $3 $4
+echo beer; fiat/beer $1 $2 $3 $4
+echo vote2018; fiat/vote2018 $1 $2 $3 $4
+echo ninja; fiat/ninja $1 $2 $3 $4
--- a/src/fiat/aud
+++ b/src/fiat/aud
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=AUD $1 $2 $3 $4 $5 $6
--- a/src/fiat/axo
+++ b/src/fiat/axo
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=AXO $1 $2 $3 $4 $5 $6
--- a/src/fiat/beer
+++ b/src/fiat/beer
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=BEER $1 $2 $3 $4 $5 $6
--- a/src/fiat/bgn
+++ b/src/fiat/bgn
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=BGN $1 $2 $3 $4 $5 $6
--- a/src/fiat/brl
+++ b/src/fiat/brl
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=BRL $1 $2 $3 $4 $5 $6
--- a/src/fiat/btch
+++ b/src/fiat/btch
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=BTCH $1 $2 $3 $4 $5 $6
--- a/src/fiat/cad
+++ b/src/fiat/cad
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=CAD $1 $2 $3 $4 $5 $6
--- a/src/fiat/chf
+++ b/src/fiat/chf
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=CHF $1 $2 $3 $4 $5 $6
--- a/src/fiat/cny
+++ b/src/fiat/cny
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=CNY $1 $2 $3 $4 $5 $6
--- a/src/fiat/czk
+++ b/src/fiat/czk
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=CZK $1 $2 $3 $4 $5 $6
--- a/src/fiat/dkk
+++ b/src/fiat/dkk
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=DKK $1 $2 $3 $4 $5 $6
--- a/src/fiat/etomic
+++ b/src/fiat/etomic
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=ETOMIC $1 $2 $3 $4 $5 $6
--- a/src/fiat/eur
+++ b/src/fiat/eur
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=EUR $1 $2 $3 $4 $5 $6
--- a/src/fiat/gbp
+++ b/src/fiat/gbp
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=GBP $1 $2 $3 $4 $5 $6
--- a/src/fiat/hkd
+++ b/src/fiat/hkd
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=HKD $1 $2 $3 $4 $5 $6
--- a/src/fiat/hrk
+++ b/src/fiat/hrk
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=HRK $1 $2 $3 $4 $5 $6
--- a/src/fiat/huf
+++ b/src/fiat/huf
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=HUF $1 $2 $3 $4 $5 $6
--- a/src/fiat/idr
+++ b/src/fiat/idr
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=IDR $1 $2 $3 $4 $5 $6
--- a/src/fiat/ils
+++ b/src/fiat/ils
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=ILS $1 $2 $3 $4 $5 $6
--- a/src/fiat/inr
+++ b/src/fiat/inr
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=INR $1 $2 $3 $4 $5 $6
--- a/src/fiat/jpy
+++ b/src/fiat/jpy
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=JPY $1 $2 $3 $4 $5 $6
--- a/src/fiat/krw
+++ b/src/fiat/krw
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=KRW $1 $2 $3 $4 $5 $6
--- a/src/fiat/mshark
+++ b/src/fiat/mshark
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=MSHARK $1 $2 $3 $4 $5 $6
--- a/src/fiat/mvp
+++ b/src/fiat/mvp
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=MVP $1 $2 $3 $4 $5 $6
--- a/src/fiat/mxn
+++ b/src/fiat/mxn
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=MXN $1 $2 $3 $4 $5 $6
--- a/src/fiat/myr
+++ b/src/fiat/myr
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=MYR $1 $2 $3 $4 $5 $6
--- a/src/fiat/ninja
+++ b/src/fiat/ninja
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=NINJA $1 $2 $3 $4 $5 $6
--- a/src/fiat/nok
+++ b/src/fiat/nok
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=NOK $1 $2 $3 $4 $5 $6
--- a/src/fiat/nzd
+++ b/src/fiat/nzd
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=NZD $1 $2 $3 $4 $5 $6
--- a/src/fiat/php
+++ b/src/fiat/php
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=PHP $1 $2 $3 $4 $5 $6
--- a/src/fiat/pizza
+++ b/src/fiat/pizza
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=PIZZA $1 $2 $3 $4 $5 $6
--- a/src/fiat/pln
+++ b/src/fiat/pln
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=PLN $1 $2 $3 $4 $5 $6
--- a/src/fiat/ron
+++ b/src/fiat/ron
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=RON $1 $2 $3 $4 $5 $6
--- a/src/fiat/rub
+++ b/src/fiat/rub
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=RUB $1 $2 $3 $4 $5 $6
--- a/src/fiat/sek
+++ b/src/fiat/sek
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=SEK $1 $2 $3 $4 $5 $6
--- a/src/fiat/sgd
+++ b/src/fiat/sgd
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=SGD $1 $2 $3 $4 $5 $6
--- a/src/fiat/shark
+++ b/src/fiat/shark
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=SHARK $1 $2 $3 $4 $5 $6
--- a/src/fiat/thb
+++ b/src/fiat/thb
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=THB $1 $2 $3 $4 $5 $6
--- a/src/fiat/try
+++ b/src/fiat/try
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=TRY $1 $2 $3 $4 $5 $6
--- a/src/fiat/usd
+++ b/src/fiat/usd
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=USD $1 $2 $3 $4 $5 $6
--- a/src/fiat/vote2018
+++ b/src/fiat/vote2018
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=VOTE2018 $1 $2 $3 $4 $5 $6
--- a/src/fiat/zar
+++ b/src/fiat/zar
@@ -1,2 +0,0 @@
-#!/bin/bash
-./komodo-cli -ac_name=ZAR $1 $2 $3 $4 $5 $6
--- a/src/komodo-tx.cpp
+++ b/src/komodo-tx.cpp
@@ -27,6 +27,7 @@ using namespace std;
 #include "arith_uint256.h"
 #include "komodo_structs.h"
 #include "komodo_globals.h"
+#include "komodo_defs.h"

 #include "komodo_interest.h"

--- a/src/komodo.h
+++ b/src/komodo.h
@@ -15,6 +15,7 @@

 #ifndef H_KOMODO_H
 #define H_KOMODO_H
+#include "komodo_defs.h"

 #ifdef _WIN32
 #define printf(...)
@@ -56,14 +57,14 @@ int32_t komodo_parsestatefile(struct komodo_state *sp,FILE *fp,char *symbol,char

 void komodo_currentheight_set(int32_t height)
 {
-    char symbol[16],dest[16]; struct komodo_state *sp;
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
        sp->CURRENT_HEIGHT = height;
 }

 int32_t komodo_currentheight()
 {
-    char symbol[16],dest[16]; struct komodo_state *sp;
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
        return(sp->CURRENT_HEIGHT);
    else return(0);
@@ -328,7 +329,7 @@ int32_t komodo_parsestatefiledata(struct komodo_state *sp,uint8_t *filedata,long
 void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout)
 {
    static FILE *fp; static int32_t errs,didinit;
-    struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t retval,ht,func; uint8_t num,pubkeys[64][33];
+    struct komodo_state *sp; char fname[512],symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; int32_t retval,ht,func; uint8_t num,pubkeys[64][33];
    if ( didinit == 0 )
    {
        portable_mutex_init(&KOMODO_KV_mutex);
@@ -472,10 +473,10 @@ 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[16],dest[16];
+    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];
    if ( (sp= komodo_stateptr(symbol,dest)) == 0 )
        return(-1);
    if ( scriptlen == 35 && scriptbuf[0] == 33 && scriptbuf[34] == 0xac )
@@ -498,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 )
@@ -550,7 +551,7 @@ int32_t komodo_voutupdate(int32_t *isratificationp,int32_t notaryid,uint8_t *scr
                    if ( signedfp == 0 )
                    {
                        char fname[512];
-                        komodo_statefname(fname,(char *)"",(char *)"signedmasks");
+                        komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"signedmasks");
                        if ( (signedfp= fopen(fname,"rb+")) == 0 )
                            signedfp = fopen(fname,"wb");
                        else fseek(signedfp,0,SEEK_END);
@@ -633,7 +634,7 @@ int32_t komodo_notarycmp(uint8_t *scriptPubKey,int32_t scriptlen,uint8_t pubkeys
 void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
 {
    static int32_t hwmheight;
-    uint64_t signedmask,voutmask; char symbol[16],dest[16]; struct komodo_state *sp;
+    uint64_t signedmask,voutmask; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    uint8_t scriptbuf[4096],pubkeys[64][33],rmd160[20],scriptPubKey[35]; uint256 kmdtxid,zero,btctxid,txhash;
    int32_t i,j,k,numnotaries,notarized,scriptlen,isratification,nid,numvalid,specialtx,notarizedheight,notaryid,len,numvouts,numvins,height,txn_count;
    memset(&zero,0,sizeof(zero));
@@ -645,7 +646,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
        return;
    }
    //fprintf(stderr,"%s connect.%d\n",ASSETCHAINS_SYMBOL,pindex->nHeight);
-    numnotaries = komodo_notaries(pubkeys,pindex->nHeight);
+    numnotaries = komodo_notaries(pubkeys,pindex->nHeight,pindex->GetBlockTime());
    calc_rmd160_sha256(rmd160,pubkeys[0],33);
    if ( pindex->nHeight > hwmheight )
        hwmheight = pindex->nHeight;
@@ -691,8 +692,25 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
                  (numvalid >= KOMODO_MINRATIFY && ASSETCHAINS_SYMBOL[0] != 0) ||
                  numvalid > (numnotaries/5)) )
            {
-                if ( height > 500000 || ASSETCHAINS_SYMBOL[0] != 0 )
-                    printf("[%s] ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<< notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts);
+                if ( ASSETCHAINS_SYMBOL[0] != 0 )
+                {
+                    static FILE *signedfp;
+                    if ( signedfp == 0 )
+                    {
+                        char fname[512];
+                        komodo_statefname(fname,ASSETCHAINS_SYMBOL,(char *)"signedmasks");
+                        if ( (signedfp= fopen(fname,"rb+")) == 0 )
+                            signedfp = fopen(fname,"wb");
+                        else fseek(signedfp,0,SEEK_END);
+                    }
+                    if ( signedfp != 0 )
+                    {
+                        fwrite(&height,1,sizeof(height),signedfp);
+                        fwrite(&signedmask,1,sizeof(signedmask),signedfp);
+                        fflush(signedfp);
+                    }
+                     printf("[%s] ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d <<<<<<<<<<<  notarized\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts);
+                }
                notarized = 1;
            }
            if ( NOTARY_PUBKEY33[0] != 0 && ASSETCHAINS_SYMBOL[0] == 0 )
@@ -723,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
@@ -23,6 +23,8 @@
 #include <curl/easy.h>
 #endif

+#include "komodo_defs.h"
+
 //#define issue_curl(cmdstr) bitcoind_RPC(0,(char *)"curl",(char *)"http://127.0.0.1:7776",0,0,(char *)(cmdstr))

 struct MemoryStruct { char *memory; size_t size; };
@@ -559,7 +561,7 @@ uint32_t komodo_txtime(uint256 hash)

 void komodo_disconnect(CBlockIndex *pindex,CBlock& block)
 {
-    char symbol[16],dest[16]; struct komodo_state *sp;
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    //fprintf(stderr,"disconnect ht.%d\n",pindex->nHeight);
    komodo_init(pindex->nHeight);
    if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
@@ -656,6 +658,13 @@ int32_t komodo_blockload(CBlock& block,CBlockIndex *pindex)
    return(0);
 }

+uint32_t komodo_chainactive_timestamp()
+{
+    if ( chainActive.Tip() != 0 )
+        return((uint32_t)chainActive.Tip()->GetBlockTime());
+    else return(0);
+}
+
 CBlockIndex *komodo_chainactive(int32_t height)
 {
    if ( chainActive.Tip() != 0 )
@@ -701,27 +710,28 @@ void komodo_connectpindex(CBlockIndex *pindex)
        komodo_connectblock(pindex,block);
 }

-int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height);
-int32_t komodo_electednotary(uint8_t *pubkey33,int32_t height);
+int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
+int32_t komodo_electednotary(int32_t *numnotariesp,uint8_t *pubkey33,int32_t height,uint32_t timestamp);

 int8_t komodo_minerid(int32_t height,uint8_t *pubkey33)
 {
-    int32_t num,i; CBlockIndex *pindex; uint8_t _pubkey33[33],pubkeys[64][33];
+    int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t _pubkey33[33],pubkeys[64][33];
    if ( pubkey33 == 0 && (pindex= chainActive[height]) != 0 )
    {
+        timestamp = pindex->GetBlockTime();
        if ( pubkey33 == 0 )
        {
            pubkey33 = _pubkey33;
            komodo_index2pubkey33(pubkey33,pindex,height);
        }
-        if ( (num= komodo_notaries(pubkeys,height)) > 0 )
+        if ( (num= komodo_notaries(pubkeys,height,timestamp)) > 0 )
        {
            for (i=0; i<num; i++)
                if ( memcmp(pubkeys[i],pubkey33,33) == 0 )
                    return(i);
        }
    }
-    return(komodo_electednotary(pubkey33,height));
+    return(komodo_electednotary(&numnotaries,pubkey33,height,timestamp));
 }

 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height)
@@ -761,11 +771,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 )
@@ -775,7 +785,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_defs.h
+++ b/src/komodo_defs.h
@@ -0,0 +1,9 @@
+#ifndef KOMODO_DEFS_H
+#define KOMODO_DEFS_H
+
+#define ASSETCHAINS_MINHEIGHT 128
+#define KOMODO_ELECTION_GAP 2000
+#define ROUNDROBIN_DELAY 61
+#define KOMODO_ASSETCHAIN_MAXLEN 65
+
+#endif
--- a/src/komodo_events.h
+++ b/src/komodo_events.h
@@ -15,6 +15,7 @@

 #ifndef H_KOMODOEVENTS_H
 #define H_KOMODOEVENTS_H
+#include "komodo_defs.h"

 struct komodo_event *komodo_eventadd(struct komodo_state *sp,int32_t height,char *symbol,uint8_t type,uint8_t *data,uint16_t datalen)
 {
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -14,6 +14,7 @@
 ******************************************************************************/

 // paxdeposit equivalent in reverse makes opreturn and KMD does the same in reverse
+#include "komodo_defs.h"

 int32_t pax_fiatstatus(uint64_t *available,uint64_t *deposited,uint64_t *issued,uint64_t *withdrawn,uint64_t *approved,uint64_t *redeemed,char *base)
 {
@@ -105,7 +106,7 @@ void komodo_paxdelete(struct pax_transaction *pax)

 void komodo_gateway_deposit(char *coinaddr,uint64_t value,char *symbol,uint64_t fiatoshis,uint8_t *rmd160,uint256 txid,uint16_t vout,uint8_t type,int32_t height,int32_t otherheight,char *source,int32_t approved) // assetchain context
 {
-    struct pax_transaction *pax; uint8_t buf[35]; int32_t addflag = 0; struct komodo_state *sp; char str[16],dest[16],*s;
+    struct pax_transaction *pax; uint8_t buf[35]; int32_t addflag = 0; struct komodo_state *sp; char str[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN],*s;
    //if ( KOMODO_PAX == 0 )
    //    return;
    //if ( strcmp(symbol,ASSETCHAINS_SYMBOL) != 0 )
@@ -197,7 +198,7 @@ int32_t komodo_rwapproval(int32_t rwflag,uint8_t *opretbuf,struct pax_transactio

 int32_t komodo_issued_opreturn(char *base,uint256 *txids,uint16_t *vouts,int64_t *values,int64_t *srcvalues,int32_t *kmdheights,int32_t *otherheights,int8_t *baseids,uint8_t *rmd160s,uint8_t *opretbuf,int32_t opretlen,int32_t iskomodo)
 {
-    struct pax_transaction p,*pax; int32_t i,n=0,j,len=0,incr,height,otherheight; uint8_t type,rmd160[20]; uint64_t fiatoshis; char symbol[16];
+    struct pax_transaction p,*pax; int32_t i,n=0,j,len=0,incr,height,otherheight; uint8_t type,rmd160[20]; uint64_t fiatoshis; char symbol[KOMODO_ASSETCHAIN_MAXLEN];
    //if ( KOMODO_PAX == 0 )
    //    return(0);
    incr = 34 + (iskomodo * (2*sizeof(fiatoshis) + 2*sizeof(height) + 20 + 4));
@@ -290,7 +291,7 @@ int32_t komodo_paxcmp(char *symbol,int32_t kmdheight,uint64_t value,uint64_t che

 uint64_t komodo_paxtotal()
 {
-    struct pax_transaction *pax,*pax2,*tmp,*tmp2; char symbol[16],dest[16],*str; int32_t i,ht; int64_t checktoshis; uint64_t seed,total = 0; struct komodo_state *basesp;
+    struct pax_transaction *pax,*pax2,*tmp,*tmp2; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN],*str; int32_t i,ht; int64_t checktoshis; uint64_t seed,total = 0; struct komodo_state *basesp;
    if ( KOMODO_PASSPORT_INITDONE == 0 ) //KOMODO_PAX == 0 ||
        return(0);
    if ( komodo_isrealtime(&ht) == 0 )
@@ -464,7 +465,7 @@ int32_t komodo_pending_withdraws(char *opretstr) // todo: enforce deterministic

 int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t tokomodo)
 {
-    struct pax_transaction *pax,*tmp; char symbol[16],dest[16]; uint8_t *script,opcode,opret[16384],data[16384]; int32_t i,baseid,ht,len=0,opretlen=0,numvouts=1; struct komodo_state *sp; uint64_t available,deposited,issued,withdrawn,approved,redeemed,mask,sum = 0;
+    struct pax_transaction *pax,*tmp; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; uint8_t *script,opcode,opret[16384],data[16384]; int32_t i,baseid,ht,len=0,opretlen=0,numvouts=1; struct komodo_state *sp; uint64_t available,deposited,issued,withdrawn,approved,redeemed,mask,sum = 0;
    if ( KOMODO_PASSPORT_INITDONE == 0 )//KOMODO_PAX == 0 ||
        return(0);
    struct komodo_state *kmdsp = komodo_stateptrget((char *)"KMD");
@@ -652,7 +653,7 @@ void komodo_passport_iteration();
 int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above block is valid pax pricing
 {
    static uint256 array[64]; static int32_t numbanned,indallvouts;
-    int32_t i,j,k,n,ht,baseid,txn_count,activation,num,opretlen,offset=1,errs=0,matched=0,kmdheights[256],otherheights[256]; uint256 hash,txids[256]; char symbol[16],base[16]; uint16_t vouts[256]; int8_t baseids[256]; uint8_t *script,opcode,rmd160s[256*20]; uint64_t total,available,deposited,issued,withdrawn,approved,redeemed,checktoshis,seed; int64_t values[256],srcvalues[256]; struct pax_transaction *pax; struct komodo_state *sp;
+    int32_t i,j,k,n,ht,baseid,txn_count,activation,num,opretlen,offset=1,errs=0,matched=0,kmdheights[256],otherheights[256]; uint256 hash,txids[256]; char symbol[KOMODO_ASSETCHAIN_MAXLEN],base[KOMODO_ASSETCHAIN_MAXLEN]; uint16_t vouts[256]; int8_t baseids[256]; uint8_t *script,opcode,rmd160s[256*20]; uint64_t total,subsidy,available,deposited,issued,withdrawn,approved,redeemed,checktoshis,seed; int64_t values[256],srcvalues[256]; struct pax_transaction *pax; struct komodo_state *sp;
    activation = 235300;
    if ( *(int32_t *)&array[0] == 0 )
        numbanned = komodo_bannedset(&indallvouts,array,(int32_t)(sizeof(array)/sizeof(*array)));
@@ -718,6 +719,26 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
        }
        return(0);
    }
+    if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_COMMISSION != 0 )
+    {
+        script = (uint8_t *)block.vtx[0].vout[0].scriptPubKey.data();
+        if ( script[0] != 33 || script[34] != OP_CHECKSIG || memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) != 0 )
+            return(-1);
+        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 )
+        {
+            subsidy = GetBlockSubsidy(height,Params().GetConsensus());
+            if ( block.vtx[0].vout.size() != 1 || block.vtx[0].vout[0].nValue != checktoshis+subsidy )
+                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]);
@@ -1422,7 +1443,7 @@ void komodo_stateind_set(struct komodo_state *sp,uint32_t *inds,int32_t n,uint8_
                    }
                    else if ( func == 'V' )
                    {
-                        if ( KOMODO_PAX != 0 || numv > numV-1440 )
+                        if ( KOMODO_PAX != 0 && numv > numV-1440 )
                            doissue = 1;
                        numv++;
                    }
@@ -1626,7 +1647,7 @@ void komodo_passport_iteration()
 {
    static long lastpos[34]; static char userpass[33][1024]; static uint32_t lasttime,callcounter;
    int32_t maxseconds = 10;
-    FILE *fp; uint8_t *filedata; long fpos,datalen,lastfpos; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[16],dest[16]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0;
+    FILE *fp; uint8_t *filedata; long fpos,datalen,lastfpos; int32_t baseid,limit,n,ht,isrealtime,expired,refid,blocks,longest; struct komodo_state *sp,*refsp; char *retstr,fname[512],*base,symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; uint32_t buf[3],starttime; cJSON *infoobj,*result; uint64_t RTmask = 0;
    expired = 0;
    while ( KOMODO_INITDONE == 0 )
    {
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -13,13 +13,15 @@
 *                                                                            *
 ******************************************************************************/

+#include "komodo_defs.h"
+
 void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t kheight,uint32_t ktime,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout);
 void komodo_init(int32_t height);
 int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *notarized_desttxidp);
 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();
@@ -30,6 +32,7 @@ pthread_mutex_t komodo_mutex;

 #define KOMODO_ELECTION_GAP 2000    //((ASSETCHAINS_SYMBOL[0] == 0) ? 2000 : 100)
 #define IGUANA_MAXSCRIPTSIZE 10001
+#define KOMODO_ASSETCHAIN_MAXLEN 65

 struct pax_transaction *PAX;
 int32_t NUM_PRICES; uint32_t *PVALS;
@@ -41,15 +44,15 @@ struct komodo_state KOMODO_STATES[34];
 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;
-std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES;
-uint8_t NOTARY_PUBKEY33[33];
+int32_t KOMODO_LASTMINED,prevKOMODO_LASTMINED,JUMBLR_PAUSE,ASSETCHAINS_CC;
+std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY;
+uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33];

-char ASSETCHAINS_SYMBOL[16];
+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
@@ -13,12 +13,15 @@
 *                                                                            *
 ******************************************************************************/

+#include "komodo_defs.h"
+
 #define SATOSHIDEN ((uint64_t)100000000L)
 #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)
@@ -80,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 ( (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;
@@ -150,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);
                }
@@ -160,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);
            }
@@ -185,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_jumblr.h
+++ b/src/komodo_jumblr.h
@@ -27,6 +27,7 @@
 #ifdef _WIN32
 #include <wincrypt.h>
 #endif
+#include "komodo_defs.h"

 #define JUMBLR_ADDR "RGhxXpXSSBTBm9EvNsXnTQczthMCxHX91t"
 #define JUMBLR_BTCADDR "18RmTJe9qMech8siuhYfMtHo8RtcN1obC6"
@@ -629,6 +630,8 @@ void jumblr_iteration()
 {
    static int32_t lastheight; static uint32_t lasttime;
    char *zaddr,*addr,*retstr,secretaddr[64]; cJSON *array; int32_t i,iter,height,counter,chosen_one,n; uint64_t smallest,medium,biggest,amount=0,total=0; double fee; struct jumblr_item *ptr,*tmp; uint16_t r,s;
+    if ( JUMBLR_PAUSE != 0 )
+        return;
    if ( lasttime == 0 )
    {
        if ( (retstr= jumblr_zlistaddresses()) != 0 )
--- a/src/komodo_kv.h
+++ b/src/komodo_kv.h
@@ -16,6 +16,8 @@
 #ifndef H_KOMODOKV_H
 #define H_KOMODOKV_H

+#include "komodo_defs.h"
+
 int32_t komodo_kvcmp(uint8_t *refvalue,uint16_t refvaluesize,uint8_t *value,uint16_t valuesize)
 {
    if ( refvalue == 0 && value == 0 )
@@ -99,6 +101,8 @@ void komodo_kvupdate(uint8_t *opretbuf,int32_t opretlen,uint64_t value)
 {
    static uint256 zeroes;
    uint32_t flags; uint256 pubkey,refpubkey,sig; int32_t i,refvaluesize,hassig,coresize,haspubkey,height,kvheight; uint16_t keylen,valuesize,newflag = 0; uint8_t *key,*valueptr,keyvalue[IGUANA_MAXSCRIPTSIZE]; struct komodo_kv *ptr; char *transferpubstr,*tstr; uint64_t fee;
+    if ( ASSETCHAINS_SYMBOL[0] == 0 ) // disable KV for KMD
+        return;
    iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen);
    iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize);
    iguana_rwnum(0,&opretbuf[5],sizeof(height),&height);
--- a/src/komodo_notary.h
+++ b/src/komodo_notary.h
@@ -13,6 +13,8 @@
 *                                                                            *
 ******************************************************************************/

+#include "komodo_defs.h"
+
 #include "komodo_cJSON.h"

 #define KOMODO_MAINNET_START 178999
@@ -56,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" },
@@ -124,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)
@@ -197,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;
@@ -210,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);
@@ -242,29 +315,30 @@ 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;
    komodo_init(0);
    *notaryidp = -1;
-    if ( height < 0 || height >= KOMODO_MAXBLOCKS )
+    if ( height < 0 )//|| height >= KOMODO_MAXBLOCKS )
    {
        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);
@@ -307,7 +381,7 @@ void komodo_notarized_update(struct komodo_state *sp,int32_t nHeight,int32_t not
 //struct komodo_state *komodo_stateptr(char *symbol,char *dest);
 int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp)
 {
-    char symbol[16],dest[16]; struct komodo_state *sp;
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
    {
        *hashp = sp->NOTARIZED_HASH;
@@ -324,7 +398,7 @@ int32_t komodo_notarized_height(uint256 *hashp,uint256 *txidp)

 int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *notarized_desttxidp)
 {
-    struct notarized_checkpoint *np = 0; int32_t i=0,flag = 0; char symbol[16],dest[16]; struct komodo_state *sp;
+    struct notarized_checkpoint *np = 0; int32_t i=0,flag = 0; char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
    if ( (sp= komodo_stateptr(symbol,dest)) != 0 )
    {
        if ( sp->NUM_NPOINTS > 0 )
@@ -403,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++)
@@ -414,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));
@@ -450,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_pax.h
+++ b/src/komodo_pax.h
@@ -13,6 +13,8 @@
 *                                                                            *
 ******************************************************************************/

+#include "komodo_defs.h"
+
 #define USD 0
 #define EUR 1
 #define JPY 2
--- a/src/komodo_structs.h
+++ b/src/komodo_structs.h
@@ -13,6 +13,8 @@
 *                                                                            *
 ******************************************************************************/

+#include "komodo_defs.h"
+
 #include "uthash.h"
 #include "utlist.h"

@@ -24,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'
@@ -40,6 +43,7 @@
 #define KOMODO_KVPROTECTED 1
 #define KOMODO_KVBINARY 2
 #define KOMODO_KVDURATION 1440
+#define KOMODO_ASSETCHAIN_MAXLEN 65

 union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; };
 typedef union _bits256 bits256;
@@ -60,7 +64,7 @@ struct komodo_event
    uint16_t len;
    int32_t height;
    uint8_t type,reorged;
-    char symbol[16];
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN];
    uint8_t space[];
 };

@@ -71,7 +75,7 @@ struct pax_transaction
    uint64_t komodoshis,fiatoshis,validated;
    int32_t marked,height,otherheight,approved,didstats,ready;
    uint16_t vout;
-    char symbol[16],source[16],coinaddr[64]; uint8_t rmd160[20],type,buf[35];
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN],source[KOMODO_ASSETCHAIN_MAXLEN],coinaddr[64]; uint8_t rmd160[20],type,buf[35];
 };

 struct knotary_entry { UT_hash_handle hh; uint8_t pubkey[33],notaryid; };
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -12,6 +12,8 @@
 * Removal or modification of this copyright notice is prohibited.            *
 *                                                                            *
 ******************************************************************************/
+#include "komodo_defs.h"
+
 #ifdef _WIN32
 #include <sodium.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -1362,7 +1364,7 @@ void komodo_configfile(char *symbol,uint16_t port)
        {
            if ( (fp= fopen(fname,"wb")) != 0 )
            {
-                fprintf(fp,"rpcuser=user%u\nrpcpassword=pass%s\nrpcport=%u\nserver=1\ntxindex=1\n\n",crc,password,port);
+                fprintf(fp,"rpcuser=user%u\nrpcpassword=pass%s\nrpcport=%u\nserver=1\ntxindex=1\nrpcworkqueue=64\n",crc,password,port);
                fclose(fp);
                printf("Created (%s)\n",fname);
            } else printf("Couldnt create (%s)\n",fname);
@@ -1397,12 +1399,12 @@ void komodo_configfile(char *symbol,uint16_t port)
        sprintf(KMDUSERPASS,"%s:%s",username,password);
        fclose(fp);
 //printf("KOMODO.(%s) -> userpass.(%s)\n",fname,KMDUSERPASS);
-    } else printf("couldnt open.(%s)\n",fname);
+    } //else printf("couldnt open.(%s)\n",fname);
 }

 uint16_t komodo_userpass(char *userpass,char *symbol)
 {
-    FILE *fp; uint16_t port = 0; char fname[512],username[512],password[512],confname[16];
+    FILE *fp; uint16_t port = 0; char fname[512],username[512],password[512],confname[KOMODO_ASSETCHAIN_MAXLEN];
    userpass[0] = 0;
    if ( strcmp("KMD",symbol) == 0 )
    {
@@ -1424,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)
@@ -1448,25 +1455,27 @@ uint32_t komodo_assetmagic(char *symbol,uint64_t supply)
    return(shortflag);
 }*/

-uint16_t komodo_assetport(uint32_t magic)
+uint16_t komodo_assetport(uint32_t magic,int32_t extralen)
 {
    if ( magic == 0x8de4eef9 )
        return(7770);
-    else return(8000 + (magic % 7777));
+    else if ( extralen == 0 )
+        return(8000 + (magic % 7777));
+    else return(16000 + (magic % 49500));
 }

-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);
-    return(komodo_assetport(*magicp));
+    *magicp = komodo_assetmagic(symbol,supply,extraptr,extralen);
+    return(komodo_assetport(*magicp,extralen));
 }

-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++)
@@ -1475,35 +1484,35 @@ 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);
 }

 char *argv0suffix[] =
 {
-    (char *)"mnzd", (char *)"mnz-cli", (char *)"mnzd.exe", (char *)"mnz-cli.exe"
+    (char *)"mnzd", (char *)"mnz-cli", (char *)"mnzd.exe", (char *)"mnz-cli.exe", (char *)"btchd", (char *)"btch-cli", (char *)"btchd.exe", (char *)"btch-cli.exe"
 };

 char *argv0names[] =
 {
-    (char *)"MNZ", (char *)"MNZ", (char *)"MNZ", (char *)"MNZ"
+    (char *)"MNZ", (char *)"MNZ", (char *)"MNZ", (char *)"MNZ", (char *)"BTCH", (char *)"BTCH", (char *)"BTCH", (char *)"BTCH"
 };

 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");
@@ -1511,8 +1520,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 )
    {
@@ -1528,6 +1537,7 @@ void komodo_args(char *argv0)
            }
        }
    }
+    ASSETCHAINS_CC = GetArg("-ac_cc",0); // keep it outside the assetchains hashing so KMD can do it and we dont have two identical chains other than -ac_cc
    if ( (KOMODO_REWIND= GetArg("-rewind",0)) != 0 )
    {
        printf("KOMODO_REWIND %d\n",KOMODO_REWIND);
@@ -1535,15 +1545,56 @@ 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 < 1440 )
+        {
+            ASSETCHAINS_HALVING = 1440;
+            printf("ASSETCHAINS_HALVING must be at least 1440 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 <= 100000000 )
+            decode_hex(ASSETCHAINS_OVERRIDE_PUBKEY33,33,(char *)ASSETCHAINS_OVERRIDE_PUBKEY.c_str());
+        else if ( ASSETCHAINS_COMMISSION != 0 )
+        {
+            ASSETCHAINS_COMMISSION = 0;
+            printf("ASSETCHAINS_COMMISSION needs an ASETCHAINS_OVERRIDE_PUBKEY and cant be more than 100000000 (100%%)\n");
+        }
+        if ( ASSETCHAINS_ENDSUBSIDY != 0 || ASSETCHAINS_REWARD != 0 || ASSETCHAINS_HALVING != 0 || ASSETCHAINS_DECAY != 0 || ASSETCHAINS_COMMISSION != 0 )
+        {
+            printf("end.%llu reward.%llu halving.%llu decay.%llu perc.%llu\n",(long long)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;
        strncpy(ASSETCHAINS_SYMBOL,name.c_str(),sizeof(ASSETCHAINS_SYMBOL)-1);
        if ( (baseid= komodo_baseid(ASSETCHAINS_SYMBOL)) >= 0 && baseid < 32 )
            MAX_MONEY = komodo_maxallowed(baseid);
-        else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN;
+        else if ( ASSETCHAINS_REWARD == 0 )
+            MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN;
+        else MAX_MONEY = (ASSETCHAINS_SUPPLY+1) * SATOSHIDEN + ASSETCHAINS_REWARD * (ASSETCHAINS_ENDSUBSIDY==0 ? 10000000 : ASSETCHAINS_ENDSUBSIDY);
        //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");
@@ -1562,8 +1613,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]);
@@ -1608,12 +1659,12 @@ void komodo_args(char *argv0)
                sprintf(iter == 0 ? KMDUSERPASS : BTCUSERPASS,"%s:%s",username,password);
                fclose(fp);
                //printf("KOMODO.(%s) -> userpass.(%s)\n",fname,KMDUSERPASS);
-            } else printf("couldnt open.(%s)\n",fname);
+            } //else printf("couldnt open.(%s)\n",fname);
            if ( IS_KOMODO_NOTARY == 0 )
                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
@@ -737,7 +737,7 @@ bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
        }
        else if (!txin.IsFinal())
        {
-            printf("non-final txin seq.%x locktime.%u vs nTime.%u\n",txin.nSequence,(uint32_t)tx.nLockTime,(uint32_t)nBlockTime);
+            //printf("non-final txin seq.%x locktime.%u vs nTime.%u\n",txin.nSequence,(uint32_t)tx.nLockTime,(uint32_t)nBlockTime);
            return false;
        }
    }
@@ -1491,13 +1491,14 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex)
 }

 //uint64_t komodo_moneysupply(int32_t height);
-extern char ASSETCHAINS_SYMBOL[16];
+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;

 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
 {
-    CAmount nSubsidy = 3 * COIN;
+    static uint64_t cached_subsidy; static int32_t cached_numhalvings;
+    int32_t numhalvings,i; uint64_t numerator; CAmount nSubsidy = 3 * COIN;
    if ( ASSETCHAINS_SYMBOL[0] == 0 )
    {
        if ( nHeight == 1 )
@@ -1510,7 +1511,45 @@ 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_ENDSUBSIDY != 0 && nHeight >= ASSETCHAINS_ENDSUBSIDY )
+                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_ENDSUBSIDY != 0 )
+                        {
+                            numerator = (ASSETCHAINS_ENDSUBSIDY - nHeight);
+                            nSubsidy = (nSubsidy * numerator) / ASSETCHAINS_ENDSUBSIDY;
+                        }
+                        else
+                        {
+                            if ( cached_subsidy > 0 && cached_numhalvings == numhalvings )
+                                nSubsidy = cached_subsidy;
+                            else
+                            {
+                                for (i=0; i<numhalvings&&nSubsidy!=0; i++)
+                                    nSubsidy = (nSubsidy * ASSETCHAINS_DECAY) / 100000000;
+                                cached_subsidy = nSubsidy;
+                                cached_numhalvings = numhalvings;
+                            }
+                        }
+                    }
+                }
+            }
+            return(nSubsidy);
+        } else return(0);
    }
 /*
    // Mining slow start
@@ -4177,7 +4216,7 @@ void static CheckBlockIndex()
    // Build forward-pointing map of the entire block tree.
    std::multimap<CBlockIndex*,CBlockIndex*> forward;
    for (BlockMap::iterator it = mapBlockIndex.begin(); it != mapBlockIndex.end(); it++) {
-        forward.insert(std::make_pair(it->second->pprev, it->second));
+            forward.insert(std::make_pair(it->second->pprev, it->second));
    }

    assert(forward.size() == mapBlockIndex.size());
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -106,16 +106,16 @@ void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams,
        pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, consensusParams);
 }

-#define ASSETCHAINS_MINHEIGHT 128
-#define KOMODO_ELECTION_GAP 2000
-#define ROUNDROBIN_DELAY 61
+#include "komodo_defs.h"
+
 extern int32_t ASSETCHAINS_SEED,IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAIN_INIT,KOMODO_INITDONE,KOMODO_ON_DEMAND,KOMODO_INITDONE,KOMODO_PASSPORT_INITDONE;
-extern char ASSETCHAINS_SYMBOL[16];
+extern uint32_t ASSETCHAINS_REWARD,ASSETCHAINS_COMMISSION;
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern std::string NOTARY_PUBKEY;
-extern uint8_t NOTARY_PUBKEY33[33];
+extern uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_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);
@@ -397,7 +397,7 @@ 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;
            if ( (nHeight % 60) == 0 || komodo_gateway_deposits(&txNew,(char *)"KMD",1) == 0 )
@@ -419,7 +419,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
            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;
@@ -554,7 +554,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey)
    {
        for (i=0; i<65; i++)
            fprintf(stderr,"%d ",komodo_minerid(chainActive.Tip()->nHeight-i,0));
-        fprintf(stderr," minerids.special %d from ht.%d\n",komodo_is_special(chainActive.Tip()->nHeight+1,NOTARY_PUBKEY33),chainActive.Tip()->nHeight);
+        fprintf(stderr," minerids.special %d from ht.%d\n",komodo_is_special(chainActive.Tip()->nHeight+1,NOTARY_PUBKEY33,chainActive.Tip()->GetBlockTime()),chainActive.Tip()->nHeight);
    }
    return CreateNewBlock(scriptPubKey);
 }
@@ -641,7 +641,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);
@@ -649,7 +649,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 )
@@ -742,14 +742,17 @@ 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);
+                }
            }
            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/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -61,7 +61,7 @@ unsigned int TxConfirmStats::FindBucketIndex(double val)
    if ( it != bucketMap.end() )
    {
        static uint32_t counter;
-        if ( counter++ < 10 )
+        if ( counter++ < 1 )
            fprintf(stderr,"%s FindBucketIndex violation: from val %f\n",ASSETCHAINS_SYMBOL,val);
    }
    return it->second;
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -19,6 +19,7 @@
 #ifdef ENABLE_RUST
 #include "librustzcash.h"
 #endif // ENABLE_RUST
+uint32_t komodo_chainactive_timestamp();

 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
@@ -115,13 +116,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 +134,15 @@ 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];
-
+    timestamp = komodo_chainactive_timestamp();
    bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
    if ( height == 0 )
        height = komodo_currentheight() + 1;
-    special = komodo_chosennotary(&notaryid,height,pubkey33);
+    special = komodo_chosennotary(&notaryid,height,pubkey33,timestamp);
    flag = komodo_eligiblenotary(pubkeys,mids,&nonzpkeys,height);
-    if ( height > 34000 ) // 0 -> non-special notary
+    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/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -512,15 +512,17 @@ UniValue gettxoutsetinfo(const UniValue& params, bool fHelp)
    return ret;
 }

+#include "komodo_defs.h"
+
 #define IGUANA_MAXSCRIPTSIZE 10001
 #define KOMODO_KVDURATION 1440
 #define KOMODO_KVBINARY 2
-extern char ASSETCHAINS_SYMBOL[16];
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime);
 uint32_t komodo_txtime(uint256 hash);
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume);
 int32_t komodo_paxprices(int32_t *heights,uint64_t *prices,int32_t max,char *base,char *rel);
-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);
 char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len);
 //uint32_t komodo_interest_args(int32_t *txheightp,uint32_t *tiptimep,uint64_t *valuep,uint256 hash,int32_t n);
 int32_t komodo_minerids(uint8_t *minerids,int32_t height,int32_t width);
@@ -579,17 +581,23 @@ UniValue kvsearch(const UniValue& params, bool fHelp)

 UniValue minerids(const UniValue& params, bool fHelp)
 {
-    UniValue ret(UniValue::VOBJ); UniValue a(UniValue::VARR); uint8_t minerids[2000],pubkeys[65][33]; int32_t i,j,n,numnotaries,tally[129];
+    uint32_t timestamp = 0; UniValue ret(UniValue::VOBJ); UniValue a(UniValue::VARR); uint8_t minerids[2000],pubkeys[65][33]; int32_t i,j,n,numnotaries,tally[129];
    if ( fHelp || params.size() != 1 )
        throw runtime_error("minerids needs height\n");
    LOCK(cs_main);
    int32_t height = atoi(params[0].get_str().c_str());
    if ( height <= 0 )
        height = chainActive.Tip()->nHeight;
+    else
+    {
+        CBlockIndex *pblockindex = chainActive[height];
+        if ( pblockindex != 0 )
+            timestamp = pblockindex->GetBlockTime();
+    }
    if ( (n= komodo_minerids(minerids,height,(int32_t)(sizeof(minerids)/sizeof(*minerids)))) > 0 )
    {
        memset(tally,0,sizeof(tally));
-        numnotaries = komodo_notaries(pubkeys,height);
+        numnotaries = komodo_notaries(pubkeys,height,timestamp);
        if ( numnotaries > 0 )
        {
            for (i=0; i<n; i++)
@@ -630,19 +638,28 @@ UniValue minerids(const UniValue& params, bool fHelp)

 UniValue notaries(const UniValue& params, bool fHelp)
 {
-    UniValue a(UniValue::VARR); UniValue ret(UniValue::VOBJ); int32_t i,j,n,m; char *hexstr;  uint8_t pubkeys[64][33]; char btcaddr[64],kmdaddr[64],*ptr;
+    UniValue a(UniValue::VARR); uint32_t timestamp=0; UniValue ret(UniValue::VOBJ); int32_t i,j,n,m; char *hexstr;  uint8_t pubkeys[64][33]; char btcaddr[64],kmdaddr[64],*ptr;
    if ( fHelp || params.size() != 1 )
        throw runtime_error("notaries height\n");
    LOCK(cs_main);
    int32_t height = atoi(params[0].get_str().c_str());
    if ( height < 0 )
+    {
        height = chainActive.Tip()->nHeight;
+        timestamp = chainActive.Tip()->GetBlockTime();
+    }
+    else
+    {
+        CBlockIndex *pblockindex = chainActive[height];
+        if ( pblockindex != 0 )
+            timestamp = pblockindex->GetBlockTime();
+    }
    //fprintf(stderr,"notaries as of height.%d\n",height);
    //if ( height > chainActive.Height()+20000 )
    //    throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
    //else
    {
-        if ( (n= komodo_notaries(pubkeys,height)) > 0 )
+        if ( (n= komodo_notaries(pubkeys,height,timestamp)) > 0 )
        {
            for (i=0; i<n; i++)
            {
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -46,8 +46,9 @@ 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);
-extern int32_t KOMODO_LASTMINED;
+uint32_t komodo_chainactive_timestamp();
+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);
 #define KOMODO_VERSION "0.1.1"
@@ -139,7 +140,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,komodo_chainactive_timestamp())) >= 0 )
        {
            obj.push_back(Pair("notaryid",        notaryid));
            obj.push_back(Pair("pubkey",        pubkeystr));
@@ -224,6 +225,26 @@ UniValue jumblr_secret(const UniValue& params, bool fHelp)
    return(result);
 }

+UniValue jumblr_pause(const UniValue& params, bool fHelp)
+{
+    int32_t retval; UniValue result(UniValue::VOBJ);
+    if (fHelp )
+        throw runtime_error("jumblr_pause\n");
+    JUMBLR_PAUSE = 1;
+    result.push_back(Pair("result", "paused"));
+    return(result);
+}
+
+UniValue jumblr_resume(const UniValue& params, bool fHelp)
+{
+    int32_t retval; UniValue result(UniValue::VOBJ);
+    if (fHelp )
+        throw runtime_error("jumblr_resume\n");
+    JUMBLR_PAUSE = 0;
+    result.push_back(Pair("result", "resumed"));
+    return(result);
+}
+
 UniValue validateaddress(const UniValue& params, bool fHelp)
 {
    if (fHelp || params.size() != 1)
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -22,6 +22,8 @@
 #include "wallet/wallet.h"
 #endif

+#include "komodo_defs.h"
+
 #include <stdint.h>

 #include <boost/assign/list_of.hpp>
@@ -144,7 +146,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
        out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
        if ( pindex != 0 && tx.nLockTime != 0 && (tipindex= chainActive.Tip()) != 0 )
        {
-            extern char ASSETCHAINS_SYMBOL[16];
+            extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
            interest = komodo_interest(pindex->nHeight,txout.nValue,tx.nLockTime,tipindex->nTime);
            if ( 0 && strcmp("REVS",ASSETCHAINS_SYMBOL) == 0 )
                fprintf(stderr,"TxtoJSON interest %llu %.8f (%d %llu %u %u)\n",(long long)interest,(double)interest/COIN,(int32_t)pindex->nHeight,(long long)txout.nValue,(uint32_t)tx.nLockTime,(int32_t)tipindex->nTime);
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -338,6 +338,8 @@ static const CRPCCommand vRPCCommands[] =
    { "util",               "z_validateaddress",      &z_validateaddress,      true  }, /* uses wallet if enabled */
    { "util",               "jumblr_deposit",       &jumblr_deposit,       true  },
    { "util",               "jumblr_secret",        &jumblr_secret,       true  },
+    { "util",               "jumblr_pause",        &jumblr_pause,       true  },
+    { "util",               "jumblr_resume",        &jumblr_resume,       true  },

    /* Not shown in help */
    { "hidden",             "invalidateblock",        &invalidateblock,        true  },
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -248,6 +248,8 @@ extern UniValue zc_sample_joinsplit(const UniValue& params, bool fHelp);

 extern UniValue jumblr_deposit(const UniValue& params, bool fHelp);
 extern UniValue jumblr_secret(const UniValue& params, bool fHelp);
+extern UniValue jumblr_pause(const UniValue& params, bool fHelp);
+extern UniValue jumblr_resume(const UniValue& params, bool fHelp);

 extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rcprawtransaction.cpp
 extern UniValue listunspent(const UniValue& params, bool fHelp);
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -302,6 +302,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
                pindexNew->nUndoPos       = diskindex.nUndoPos;
                pindexNew->hashAnchor     = diskindex.hashAnchor;
                pindexNew->nVersion       = diskindex.nVersion;
+                pindexNew->hashReserved   = diskindex.hashReserved;
                pindexNew->hashMerkleRoot = diskindex.hashMerkleRoot;
                pindexNew->nTime          = diskindex.nTime;
                pindexNew->nBits          = diskindex.nBits;
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -15,6 +15,7 @@
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utiltime.h"
+#include "komodo_defs.h"

 #include <stdarg.h>

@@ -441,13 +442,13 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
    strMiscWarning = message;
 }

-extern char ASSETCHAINS_SYMBOL[16];
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 //int64_t MAX_MONEY = 200000000 * 100000000LL;

 boost::filesystem::path GetDefaultDataDir()
 {
    namespace fs = boost::filesystem;
-    char symbol[16];
+    char symbol[KOMODO_ASSETCHAIN_MAXLEN];
    if ( ASSETCHAINS_SYMBOL[0] != 0 )
        strcpy(symbol,ASSETCHAINS_SYMBOL);
    else symbol[0] = 0;
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -105,8 +105,8 @@ void WalletTxToJSON(const CWalletTx& wtx, UniValue& entry)
 string AccountFromValue(const UniValue& value)
 {
    string strAccount = value.get_str();
-    if (strAccount != "")
-        throw JSONRPCError(RPC_WALLET_ACCOUNTS_UNSUPPORTED, "Accounts are unsupported");
+    //if (strAccount != "")
+    //    throw JSONRPCError(RPC_WALLET_ACCOUNTS_UNSUPPORTED, "Accounts are unsupported");
    return strAccount;
 }

@@ -471,6 +471,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)

    return wtx.GetHash().GetHex();
 }
+#include "komodo_defs.h"

 #define KOMODO_KVPROTECTED 1
 #define KOMODO_KVBINARY 2
@@ -479,7 +480,7 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
 uint64_t PAX_fiatdest(uint64_t *seedp,int32_t tokomodo,char *destaddr,uint8_t pubkey37[37],char *coinaddr,int32_t height,char *base,int64_t fiatoshis);
 int32_t komodo_opreturnscript(uint8_t *script,uint8_t type,uint8_t *opret,int32_t opretlen);
 #define CRYPTO777_KMDADDR "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA"
-extern char ASSETCHAINS_SYMBOL[16];
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 extern int32_t KOMODO_PAX;
 int32_t komodo_is_issuer();
 int32_t iguana_rwnum(int32_t rwflag,uint8_t *serialized,int32_t len,void *endianedp);
@@ -502,6 +503,8 @@ UniValue kvupdate(const UniValue& params, bool fHelp)
        throw runtime_error("kvupdate key value flags/passphrase");
    if (!EnsureWalletIsAvailable(fHelp))
        return 0;
+    if ( ASSETCHAINS_SYMBOL[0] == 0 )
+        return(0);
    haveprivkey = 0;
    memset(&sig,0,sizeof(sig));
    memset(&privkey,0,sizeof(privkey));
@@ -614,7 +617,9 @@ UniValue paxdeposit(const UniValue& params, bool fHelp)
    uint64_t available,deposited,issued,withdrawn,approved,redeemed,seed,komodoshis = 0; int32_t height; char destaddr[64]; uint8_t i,pubkey37[33];
    bool fSubtractFeeFromAmount = false;
    if ( KOMODO_PAX == 0 )
-        throw JSONRPCError(RPC_TYPE_ERROR, "paxdeposit disabled, since pax not enabled with komodod -pax");
+    {
+        throw runtime_error("paxdeposit disabled without -pax");
+    }
    if ( komodo_is_issuer() != 0 )
        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "paxdeposit only from KMD");
    if (!EnsureWalletIsAvailable(fHelp))
@@ -1236,8 +1241,8 @@ UniValue sendmany(const UniValue& params, bool fHelp)
        if (!address.IsValid())
            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, string("Invalid Komodo address: ")+name_);

-        if (setAddress.count(address))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_);
+        //if (setAddress.count(address))
+        //    throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, duplicated address: ")+name_);
        setAddress.insert(address);

        CScript scriptPubKey = GetScriptForDestination(address.Get());
@@ -1260,7 +1265,8 @@ UniValue sendmany(const UniValue& params, bool fHelp)
    EnsureWalletIsUnlocked();

    // Check funds
-    CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
+    CAmount nBalance = pwalletMain->GetBalance();
+    //CAmount nBalance = GetAccountBalance(strAccount, nMinDepth, ISMINE_SPENDABLE);
    if (totalAmount > nBalance)
        throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS, "Account has insufficient funds");

--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -37,8 +37,10 @@ unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
 bool bSpendZeroConfChange = true;
 bool fSendFreeTransactions = false;
 bool fPayAtLeastCustomFee = true;
+#include "komodo_defs.h"
+
 extern int32_t KOMODO_EXCHANGEWALLET;
-extern char ASSETCHAINS_SYMBOL[16];
+extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];

 /**
 * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
@@ -2731,10 +2733,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                    //a chance at a free transaction.
                    //But mempool inputs might still be in the mempool, so their age stays 0
                    //fprintf(stderr,"nCredit %.8f interest %.8f\n",(double)nCredit/COIN,(double)pcoin.first->vout[pcoin.second].interest/COIN);
-                    if ( KOMODO_EXCHANGEWALLET == 0 )
+                    if ( KOMODO_EXCHANGEWALLET == 0 && ASSETCHAINS_SYMBOL[0] == 0 )
                    {
                        interest2 += pcoin.first->vout[pcoin.second].interest;
-                        fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN);
+                        //fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN);
                    }
                    int age = pcoin.first->GetDepthInMainChain();
                    if (age != 0)
@@ -2747,7 +2749,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                    //interest = 0; // interest2 also
                //}
                CAmount nChange = (nValueIn - nValue + interest2);
-fprintf(stderr,"wallet change %.8f (%.8f - %.8f) interest2 %.8f total %.8f\n",(double)nChange/COIN,(double)nValueIn/COIN,(double)nValue/COIN,(double)interest2/COIN,(double)nTotalValue/COIN);
+//fprintf(stderr,"wallet change %.8f (%.8f - %.8f) interest2 %.8f total %.8f\n",(double)nChange/COIN,(double)nValueIn/COIN,(double)nValue/COIN,(double)interest2/COIN,(double)nTotalValue/COIN);
                if (nSubtractFeeFromAmount == 0)
                    nChange -= nFeeRet;

--- a/src/zcash/CreateJoinSplit.cpp
+++ b/src/zcash/CreateJoinSplit.cpp
@@ -6,7 +6,8 @@
 #include "primitives/transaction.h"
 #include "zcash/JoinSplit.hpp"
 #include "libsnark/common/profiling.hpp"
-char ASSETCHAINS_SYMBOL[16];
+#include "komodo_defs.h"
+char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 int64_t MAX_MONEY = 200000000 * 100000000LL;
 uint16_t BITCOIND_PORT = 7771;