From 0a37f2072d7c3d28ca83f268670d4225ea706128 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Mon, 2 Jul 2018 23:36:33 +0200
Subject: [PATCH 001/623] add travis CI

---
 .travis.yml | 82 -----------------------------------------------------
 1 file changed, 82 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac331dcf9..250756396 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 language: cpp
 
 compiler:
@@ -22,84 +21,3 @@ notifications:
       - "Alt Message : %{repository_slug} - (%{commit} - %{author}): %{message}, Build Time: %{duration}"
       - "Change view : %{compare_url}"
       - "Build details : %{build_url}"
-=======
-# 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/travis-ci/issues/4393
-# - sudo/dist/group are set so as to get Blue Box VMs, necessary for [loopback]
-#   IPv6 support
-
-sudo: required
-dist: precise
-group: legacy
-
-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="" 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="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 curl --location --fail $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
->>>>>>> zcash/master

From dfec6b538670091bec1d6fd2523a8624988a8c16 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Tue, 3 Jul 2018 19:27:05 +0200
Subject: [PATCH 002/623] update travisCI deployment

---
 .travis.yml | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 250756396..81c2092aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,33 @@
+dist: xenial
 language: cpp
-
 compiler:
-  - gcc
-  
+- 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
-
+- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
+- sudo apt-get update -qq
+- sudo apt-get install libgnutls28-dev
+- 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
+script:
+- "./zcutil/build.sh -j 5"
 notifications:
   irc:
     channels:
-      - "chat.freenode.net#komodoplatform"
+    - 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}"
+    - "%{repository}/%{branch} (%{commit} - %{author}): %{message}"
+    - 'Alt Message : %{repository_slug} - (%{commit} - %{author}): %{message}, Build
+      Time: %{duration}'
+    - 'Change view : %{compare_url}'
+    - 'Build details : %{build_url}'
+before_deploy:
+  - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)"
+deploy:
+  provider: releases
+  api_key:
+    secure: oyMB9JDSoL/val/d80Em3sd3mSJY+PPkiclUb3ktizNz7DgYZbBiStUOZIJo95GUYADEvm9RVrP0JmBiDuqneEjfFRzME9/MnpY/LmRCiYGgprMDR80ZqbLgOzSKpE10RE2XM3vZkZeXT/JcGGayUm0faElep2qx62S4ozsAxSvFJ5l/PG+wEltrlnp1z8uYdXV3PBChbjzXJ0BdMVxMrrU39kwzqwu2Ge9PnNjVv0AVxn/oZpf+bzYa7vkSuGTRe2Jcs8U9AABYnZ22wu+tdlD76pdOJzGEwR70e8CjUJmdSn+M+wwAPPHStPW/JHFwSaWsKZtUyB5EWQW2kqq6P+M1Fe7yo6srznsaAcZRWeCrbUO/k44bEfnj7HMGmxfjDJOwbxVEoHg7im+l3HLUiG8rcw5dM/TAnrmgjH/OEj/EM1lbwV2C+PdDGOjdguljEhjBABGRbRABMZjwW8w+uBFVlKlcn7y+zJbMB3mGd+FNGo/OgAcsFzRcpaN8SrC/kzUF2SeEwJjTKvAqRgA66yl7CzDPBtUv2NtoPUz/8YO9rsdGElcWfmDIVacuIEjo1CizlbDzeS7zPiFPW5MRCGryLFLt0WjA/s8lkLO+DbGYXPa4rG6+7ZNUDLfziM+lFqZH8b382/bhv+a6ctpWjaazjiW6yWemsuN8QhByuGw=
+  file: src/komodod
+  skip_cleanup: true
+  on:
+    repo: KomodoPlatform/komodo

From b310ffff5bfa1a0e84184e43f0a3cba33a48ec52 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 4 Jul 2018 09:50:49 -1100
Subject: [PATCH 003/623] Fix ac_private help

---
 src/wallet/rpcwallet.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a1773f43b..53086291a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1075,8 +1075,6 @@ UniValue getunconfirmedbalance(const UniValue &params, bool fHelp)
 
 UniValue movecmd(const UniValue& params, bool fHelp)
 {
-    if ( ASSETCHAINS_PRIVATE != 0 )
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
@@ -1100,6 +1098,8 @@ UniValue movecmd(const UniValue& params, bool fHelp)
             "\nAs a json rpc call\n"
             + HelpExampleRpc("move", "\"timotei\", \"akiko\", 0.01, 6, \"happy birthday!\"")
         );
+    if ( ASSETCHAINS_PRIVATE != 0 )
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
@@ -1150,8 +1150,6 @@ UniValue movecmd(const UniValue& params, bool fHelp)
 
 UniValue sendfrom(const UniValue& params, bool fHelp)
 {
-    if ( ASSETCHAINS_PRIVATE != 0 )
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
@@ -1181,6 +1179,8 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
             "\nAs a json rpc call\n"
             + HelpExampleRpc("sendfrom", "\"tabby\", \"RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPV\", 0.01, 6, \"donation\", \"seans outpost\"")
         );
+    if ( ASSETCHAINS_PRIVATE != 0 )
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
@@ -1217,8 +1217,6 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
 
 UniValue sendmany(const UniValue& params, bool fHelp)
 {
-    if ( ASSETCHAINS_PRIVATE != 0 )
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
@@ -1257,6 +1255,8 @@ UniValue sendmany(const UniValue& params, bool fHelp)
             "\nAs a json rpc call\n"
             + HelpExampleRpc("sendmany", "\"\", \"{\\\"RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPV\\\":0.01,\\\"RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPV\\\":0.02}\", 6, \"testing\"")
         );
+    if ( ASSETCHAINS_PRIVATE != 0 )
+        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "cant use transparent addresses in private chain");
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 

From ac09a89f9764fb1ffc8bca5d87d2c7d153a3fdd1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 03:54:47 -1100
Subject: [PATCH 004/623] Test

---
 src/main.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8d1649d3b..f533b7761 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6826,9 +6826,11 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
+        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex)
+        {
             // Only actively request headers from a single peer, unless we're close to today.
-            if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
+            if ((nSyncStarted == 0 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            {
                 state.fSyncStarted = true;
                 nSyncStarted++;
                 CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;

From 20a1f68495067de1150a6d315c2351239c3857d2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:01:37 -1100
Subject: [PATCH 005/623] +print

---
 src/main.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index f533b7761..93bcb0421 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6826,8 +6826,10 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
+        fprintf(stderr,"see if can request\n");
         if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex)
         {
+            fprintf(stderr,"check for asking initial headers: nSyncStarted.%d fFetch.%d\n",(int32_t)nSyncStarted,(int32_t)fFetch);
             // Only actively request headers from a single peer, unless we're close to today.
             if ((nSyncStarted == 0 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {

From 3a796a89aa1f0f0e13daa584d9137395eee11e4f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:07:53 -1100
Subject: [PATCH 006/623] Prints

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 93bcb0421..c4cbcc751 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6826,16 +6826,16 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        fprintf(stderr,"see if can request\n");
+        //fprintf(stderr,"see if can request\n");
         if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex)
         {
-            fprintf(stderr,"check for asking initial headers: nSyncStarted.%d fFetch.%d\n",(int32_t)nSyncStarted,(int32_t)fFetch);
             // Only actively request headers from a single peer, unless we're close to today.
-            if ((nSyncStarted == 0 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            if ((nSyncStarted < 3 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;
                 CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
+                fprintf(stderr,"ask initial headers: nSyncStarted.%d fFetch.%d peer.%d [%d to %d]\n",(int32_t)nSyncStarted,(int32_t)fFetch,pto->id, pto->nStartingHeight,pindexStart->nHeight);
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
                 pto->PushMessage("getheaders", chainActive.GetLocator(pindexStart), uint256());
             }

From 3df89af7feddbe125b7095aa69df42bb2c82c05d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:16:09 -1100
Subject: [PATCH 007/623] Test

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index c4cbcc751..e517d8a6e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6830,7 +6830,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex)
         {
             // Only actively request headers from a single peer, unless we're close to today.
-            if ((nSyncStarted < 3 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            if ((nSyncStarted < 30 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;

From 18c515eb032f5e1bfbc5405e6bf76699e8375a47 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:20:21 -1100
Subject: [PATCH 008/623] Test

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e517d8a6e..2b820f1b2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6827,15 +6827,15 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
         //fprintf(stderr,"see if can request\n");
-        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex)
+        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex && pto->nStartingHeight != 0 )
         {
             // Only actively request headers from a single peer, unless we're close to today.
-            if ((nSyncStarted < 30 && fFetch) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            if ( (nSyncStarted < 30 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;
                 CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
-                fprintf(stderr,"ask initial headers: nSyncStarted.%d fFetch.%d peer.%d [%d to %d]\n",(int32_t)nSyncStarted,(int32_t)fFetch,pto->id, pto->nStartingHeight,pindexStart->nHeight);
+                fprintf(stderr,"ask initial headers: nSyncStarted.%d fFetch.%d peer.%d [%d to %d]\n",(int32_t)nSyncStarted,(int32_t)fFetch,pto->id, pindexStart->nHeight,pto->nStartingHeight);
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
                 pto->PushMessage("getheaders", chainActive.GetLocator(pindexStart), uint256());
             }

From 8d124e7f5059d8e362892bba322996e040e5151a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:24:47 -1100
Subject: [PATCH 009/623] syntax

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 2b820f1b2..80d9e533f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6830,7 +6830,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex && pto->nStartingHeight != 0 )
         {
             // Only actively request headers from a single peer, unless we're close to today.
-            if ( (nSyncStarted < 30 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            if ( nSyncStarted < 30 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;

From 7aa8bcb497e7acb230c7537574fd0b03fabd19e6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:28:34 -1100
Subject: [PATCH 010/623] Syntax

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 80d9e533f..a083f65e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6829,12 +6829,12 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         //fprintf(stderr,"see if can request\n");
         if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex && pto->nStartingHeight != 0 )
         {
+            CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
             // Only actively request headers from a single peer, unless we're close to today.
             if ( nSyncStarted < 30 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;
-                CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
                 fprintf(stderr,"ask initial headers: nSyncStarted.%d fFetch.%d peer.%d [%d to %d]\n",(int32_t)nSyncStarted,(int32_t)fFetch,pto->id, pindexStart->nHeight,pto->nStartingHeight);
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
                 pto->PushMessage("getheaders", chainActive.GetLocator(pindexStart), uint256());

From 2a46683da275aa0cae25b366655fe9dc9a30903b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 04:32:12 -1100
Subject: [PATCH 011/623] Test

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index a083f65e3..89a0551dd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6831,7 +6831,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         {
             CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
             // Only actively request headers from a single peer, unless we're close to today.
-            if ( nSyncStarted < 30 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
+            if ( nSyncStarted < 3 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
             {
                 state.fSyncStarted = true;
                 nSyncStarted++;

From e9b849601d3967fa11eedfa3ea882e40f3c905f4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 05:27:09 -1100
Subject: [PATCH 012/623] Revert init headers tweaks

---
 src/main.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 89a0551dd..8d1649d3b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6826,16 +6826,12 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
         if (pindexBestHeader == NULL)
             pindexBestHeader = chainActive.Tip();
         bool fFetch = state.fPreferredDownload || (nPreferredDownload == 0 && !pto->fClient && !pto->fOneShot); // Download if this is a nice peer, or we have no nice peers and this one might do.
-        //fprintf(stderr,"see if can request\n");
-        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex && pto->nStartingHeight != 0 )
-        {
-            CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
+        if (!state.fSyncStarted && !pto->fClient && !fImporting && !fReindex) {
             // Only actively request headers from a single peer, unless we're close to today.
-            if ( nSyncStarted < 3 && (fFetch || pindexStart->nHeight == 0) )//|| pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60)
-            {
+            if ((nSyncStarted == 0 && fFetch) || pindexBestHeader->GetBlockTime() > GetAdjustedTime() - 24 * 60 * 60) {
                 state.fSyncStarted = true;
                 nSyncStarted++;
-                fprintf(stderr,"ask initial headers: nSyncStarted.%d fFetch.%d peer.%d [%d to %d]\n",(int32_t)nSyncStarted,(int32_t)fFetch,pto->id, pindexStart->nHeight,pto->nStartingHeight);
+                CBlockIndex *pindexStart = pindexBestHeader->pprev ? pindexBestHeader->pprev : pindexBestHeader;
                 LogPrint("net", "initial getheaders (%d) to peer=%d (startheight:%d)\n", pindexStart->nHeight, pto->id, pto->nStartingHeight);
                 pto->PushMessage("getheaders", chainActive.GetLocator(pindexStart), uint256());
             }

From 9c2f6f11bb3c45991e1b4a294aa0130b17404d76 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 05:44:54 -1100
Subject: [PATCH 013/623] Work around inadvertent CPU mining

---
 src/komodo_bitcoind.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 5cd88d7de..0f49c3758 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1248,13 +1248,16 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
     txn_count = pblock->vtx.size();
-    if ( txn_count > 1 )
+    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
+        return(1);
+    if ( txn_count > 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {
         if ( prevtime == 0 )
         {
             if ( (previndex= mapBlockIndex[pblock->hashPrevBlock]) != 0 )
                 prevtime = (uint32_t)previndex->nTime;
         }
+        // add strict check for 100% of vin -> vout
         txid = pblock->vtx[txn_count-1].vin[0].prevout.hash;
         vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
         if ( prevtime != 0 )
@@ -1265,7 +1268,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                 fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
             } else isPoS = 1;
         }
-        else if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx
+        if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx
         {
             txtime = komodo_txtime(&value,txid,vout,destaddr);
             if ( ExtractDestination(pblock->vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )

From c6d2cccf9231989c5cd4b1fdbe08a98f6a282785 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 05:49:19 -1100
Subject: [PATCH 014/623] -print

---
 src/komodo_bitcoind.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0f49c3758..cfa4c7c33 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1257,7 +1257,6 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
             if ( (previndex= mapBlockIndex[pblock->hashPrevBlock]) != 0 )
                 prevtime = (uint32_t)previndex->nTime;
         }
-        // add strict check for 100% of vin -> vout
         txid = pblock->vtx[txn_count-1].vin[0].prevout.hash;
         vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
         if ( prevtime != 0 )

From feefa2d3201c11adb6957bb8bf7b2508ae0d3a07 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 05:52:44 -1100
Subject: [PATCH 015/623] Vins == 1 check for staking utxo

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index cfa4c7c33..6aadde9b8 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1250,7 +1250,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
     txn_count = pblock->vtx.size();
     if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
         return(1);
-    if ( txn_count > 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
+    if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {
         if ( prevtime == 0 )
         {

From 6420c2d1c0ac052d40416ee8f73cf12e05785525 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 05:56:50 -1100
Subject: [PATCH 016/623] Test

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6aadde9b8..0ca0bd123 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1248,8 +1248,6 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
     txn_count = pblock->vtx.size();
-    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
-        return(1);
     if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {
         if ( prevtime == 0 )
@@ -1277,8 +1275,10 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                     isPoS = 1; // close enough for a pre-filter
                 else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
-        } else return(-1);
+        } //else return(-1);
     }
+    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
+        return(1);
     return(isPoS);
 }
 

From d4acce54ac3df12a22c21e6f5229f0b9a7b99d6b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 06:03:22 -1100
Subject: [PATCH 017/623] Test

---
 src/komodo_bitcoind.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0ca0bd123..2374c3262 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1277,6 +1277,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
         } //else return(-1);
     }
+    fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
     if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
         return(1);
     return(isPoS);

From 5c6adb31e91cac5f12be0b5beecc86d73ef136b2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 06:06:07 -1100
Subject: [PATCH 018/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2374c3262..df0cc6baa 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1275,7 +1275,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                     isPoS = 1; // close enough for a pre-filter
                 else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
-        } //else return(-1);
+        } else return(-1);
     }
     fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
     if ( ASSETCHAINS_STAKED == 100 && height < 1000 )

From 764576d5e2ffeb4a84d9416606745475da35f483 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 06:11:06 -1100
Subject: [PATCH 019/623] Prepare for new isPoS

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index df0cc6baa..2374c3262 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1275,7 +1275,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                     isPoS = 1; // close enough for a pre-filter
                 else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
-        } else return(-1);
+        } //else return(-1);
     }
     fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
     if ( ASSETCHAINS_STAKED == 100 && height < 1000 )

From ffd6dd51965634aa9a02e74a79b87106a8737105 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 06:19:48 -1100
Subject: [PATCH 020/623] Fix isPoS detection

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2374c3262..d459678f9 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1247,6 +1247,8 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
 int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_uint256 bnTarget)
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
+    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
+        return(1);
     txn_count = pblock->vtx.size();
     if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {
@@ -1277,9 +1279,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
         } //else return(-1);
     }
-    fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
-    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
-        return(1);
+    //fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
     return(isPoS);
 }
 

From 800b9aa7779cfd4a380f72026e723f63bd70979e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 06:32:30 -1100
Subject: [PATCH 021/623] No exemption for isPoS

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d459678f9..88fea5e2b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1247,8 +1247,8 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
 int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_uint256 bnTarget)
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
-    if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
-        return(1);
+    //if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
+    //    return(1);
     txn_count = pblock->vtx.size();
     if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {

From a3d08df0fc90383a350e83efacf5c3a9a862ce17 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 07:03:25 -1100
Subject: [PATCH 022/623] Prevent PoW in 100% PoS

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 88fea5e2b..acba52c7c 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1352,7 +1352,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
             return(-1);
         }
     }
-    else if ( ASSETCHAINS_STAKED != 0 && height >= 2 ) // must PoS or have at least 16x better PoW
+    if ( ASSETCHAINS_STAKED != 0 && height >= 2 ) // must PoS or have at least 16x better PoW
     {
         if ( (is_PoSblock= komodo_is_PoSblock(slowflag,height,pblock,bnTarget)) == 0 )
         {

From 640b264174a72ad13e2139d073bb36fd4c2036f1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 07:17:15 -1100
Subject: [PATCH 023/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index acba52c7c..66076ac96 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1356,7 +1356,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     {
         if ( (is_PoSblock= komodo_is_PoSblock(slowflag,height,pblock,bnTarget)) == 0 )
         {
-            if ( ASSETCHAINS_STAKED == 100 && height > 100 )  // only PoS allowed!
+            if ( ASSETCHAINS_STAKED == 100 && height > 130 )  // only PoS allowed!
                 return(-1);
             else
             {

From 6ac497242db9b056b3c18ac321dd4414224f1f12 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 07:45:13 -1100
Subject: [PATCH 024/623] Ht.200 exemption

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 66076ac96..fa2bb3ba2 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1247,8 +1247,8 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
 int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_uint256 bnTarget)
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
-    //if ( ASSETCHAINS_STAKED == 100 && height < 1000 )
-    //    return(1);
+    if ( ASSETCHAINS_STAKED == 100 && height < 200 )
+        return(1);
     txn_count = pblock->vtx.size();
     if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
     {

From d6f8eeb965d75f13c771349632c2ed5084ed6bb9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 21:48:08 -1100
Subject: [PATCH 025/623] Remove mindiff cap for 100% PoS

---
 src/coins.cpp         |  2 +-
 src/komodo_bitcoind.h | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index b2d838506..38b105e9d 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -466,7 +466,7 @@ bool CCoinsViewCache::HaveInputs(const CTransaction& tx) const
             const COutPoint &prevout = tx.vin[i].prevout;
             const CCoins* coins = AccessCoins(prevout.hash);
             if (!coins || !coins->IsAvailable(prevout.n)) {
-                fprintf(stderr,"HaveInputs missing input %s/v%d\n",prevout.hash.ToString().c_str(),prevout.n);
+                //fprintf(stderr,"HaveInputs missing input %s/v%d\n",prevout.hash.ToString().c_str(),prevout.n);
                 return false;
             }
         }
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index fa2bb3ba2..113a470c2 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1094,13 +1094,16 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         blocktime = prevtime+57;
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
-        fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
+        //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
-    bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-    bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(4));
-    if ( bnTarget < bnMaxPoSdiff )
-        bnTarget = bnMaxPoSdiff;
+    if ( ASSETCHAINS_STAKED != 100 || nHeight < 2000 )
+    {
+        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(4));
+        if ( bnTarget < bnMaxPoSdiff )
+            bnTarget = bnMaxPoSdiff;
+    }
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
     pindex = 0;

From 99fb7ab30a79c9a65abc69e4bf9dc79c3dc28291 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 21:49:51 -1100
Subject: [PATCH 026/623] -print

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8d1649d3b..d4dfae7ae 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1311,7 +1311,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
     uint256 hash = tx.GetHash();
     if (pool.exists(hash))
     {
-        fprintf(stderr,"already in mempool\n");
+        //fprintf(stderr,"already in mempool\n");
         return state.Invalid(false, REJECT_DUPLICATE, "already in mempool");
     }
     

From 99fbc8f0c0667c92a90e8fa41928efe7ac9b5404 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 22:01:16 -1100
Subject: [PATCH 027/623] -print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 53086291a..67bafd32b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4605,7 +4605,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     {
         if ( out.nDepth < nMinDepth || out.nDepth > nMaxDepth )
         {
-            fprintf(stderr,"komodo_staked invalid depth %d\n",(int32_t)out.nDepth);
+            //fprintf(stderr,"komodo_staked invalid depth %d\n",(int32_t)out.nDepth);
             continue;
         }
         if ( setAddress.size() )

From 1da1d6616340bc1722271b3a8ba770a81c2380de Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 22:01:46 -1100
Subject: [PATCH 028/623] -print

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 755b7439e..667e1a3c4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -432,7 +432,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
                 pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStaked));
                 nFees += txfees;
                 pblock->nTime = blocktime;
-                printf("staking PoS ht.%d t%u lag.%u\n",(int32_t)chainActive.Tip()->nHeight+1,blocktime,(uint32_t)(GetAdjustedTime() - (blocktime-13)));
+                //printf("staking PoS ht.%d t%u lag.%u\n",(int32_t)chainActive.Tip()->nHeight+1,blocktime,(uint32_t)(GetAdjustedTime() - (blocktime-13)));
             } else return(0); //fprintf(stderr,"no utxos eligible for staking\n");
         }
         

From 01e50e731f64dc48cf7c8aa5862aa8b9babb8f26 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 5 Jul 2018 22:02:31 -1100
Subject: [PATCH 029/623] +symbol

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 667e1a3c4..dcf22b1bd 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1009,7 +1009,7 @@ void static BitcoinMiner()
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);
-                        fprintf(stderr," mined block %d!\n",Mining_height);
+                        fprintf(stderr," mined %s block %d!\n",ASSETCHAINS_SYMBOL,Mining_height);
                     }
                     CValidationState state;
                     if ( !TestBlockValidity(state,B, chainActive.Tip(), true, false))

From d184dbb444a93b791f1323563b36708c521ab81b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 6 Jul 2018 04:07:07 -1100
Subject: [PATCH 030/623] Hash in utxo for PoS

---
 src/komodo_bitcoind.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 113a470c2..4f6b6e2fc 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1114,7 +1114,12 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         pasthash = pindex->GetBlockHash();
         memcpy(hashbuf,&pasthash,sizeof(pasthash));
         memcpy(&hashbuf[sizeof(pasthash)],&addrhash,sizeof(addrhash));
-        vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
+        if ( nHeight >= 2000 )
+        {
+            memcpy(&hashbuf[sizeof(pasthash)+sizeof(addrhash)],&txid,sizeof(txid));
+            memcpy(&hashbuf[sizeof(pasthash)+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
+            vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*3 + sizeof(vout));
+        } else vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
         //fprintf(stderr,"(%s) vs. (%s) %s %.8f txtime.%u\n",address,destaddr,hash.ToString().c_str(),dstr(value),txtime);
         for (iter=0; iter<3600; iter++)
         {

From 049e24ce9e7e0528d1bbcf754bd5ecd71ce6ce86 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 01:48:52 -1100
Subject: [PATCH 031/623] Test newstake

---
 src/komodo_bitcoind.h | 131 ++++++++++++++++++++++++++++++++++++++++--
 src/miner.cpp         |   2 +
 2 files changed, 129 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 4f6b6e2fc..6f3af9d27 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1086,9 +1086,131 @@ uint32_t komodo_segid32(char *coinaddr)
     return(addrhash.uints[0]);
 }
 
+int8_t komodo_segid(int32_t height)
+{
+    CTxDestination voutaddress; CBlock block; CBlockIndex *pindex; uint64_t value; uint32_t txtime; char voutaddr[64],destaddr[64]; int32_t txn_count,vout; bits256 txid; int8_t segid = -1;
+    if ( height > 0 && (pindex= komodo_chainactive(height)) != 0 )
+    {
+        if ( komodo_blockload(block,pindex) == 0 )
+        {
+            txn_count = pblock->vtx.size();
+            if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
+            {
+                txid = pblock->vtx[txn_count-1].vin[0].prevout.hash;
+                vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
+                txtime = komodo_txtime(&value,txid,vout,destaddr);
+                if ( ExtractDestination(pblock->vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )
+                {
+                    strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
+                    if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[txn_count-1].vout[0].nValue == value )
+                    {
+                        segid = komodo_segid32(voutaddr) & 0x3f;
+                    }
+                } else fprintf(stderr,"komodo_segid ht.%d couldnt extract voutaddress\n",height);
+            }
+        }
+    }
+    return(segid);
+}
+
+int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
+{
+    static uint8_t prevhashbuf[100]; static int32_t prevheight;
+    int32_t i;
+    if ( height == prevheight && n == 100 )
+        memcpy(hashbuf,prevhashbuf,100);
+    else
+    {
+        memset(hashbuf,0xff,n);
+        for (i=0; i<n; i++)
+        {
+            hashbuf[i] = (uint8_t)komodo_segid(height+i);
+            fprintf(stderr,"%02x ",hashbuf[i]);
+        }
+        if ( n == 100 )
+        {
+            memcpy(prevhashbuf,hashbuf,100);
+            prevheight = height;
+            fprintf(stderr,"segids.%d\n",height);
+        }
+    }
+}
+
+uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
+{
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    txtime = komodo_txtime(&value,txid,vout,address);
+    if ( blocktime < prevtime+60 )
+        blocktime = prevtime+60;
+    if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
+    {
+        //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
+        return(0);
+    }
+    bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    mfactor = 1024;
+    if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
+        minage = 6000;
+    pindex = 0;
+    vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
+    segid = ((nHeight + addrhash.uints[0]) & 0x3f);
+    komodo_segids(hashbuf,nHeight-101,100);
+    memcpy(&hashbuf[100],&addrhash,sizeof(addrhash));
+    memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
+    memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
+    vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
+    for (iter=0; iter<3600; iter++)
+    {
+        diff = (iter + blocktime - txtime - minage);
+        if ( diff > 3600*24*30 )
+            diff = 3600*24*30;
+        if ( iter > 0 )
+            diff += segid*2;
+        if ( blocktime+iter+segid*2 < txtime+minage )
+            continue;
+        coinage = (value * diff) * ((diff >> 16) + 1);
+        hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
+        if ( hashval <= bnTarget )
+        {
+            winner = 1;
+            if ( validateflag == 0 )
+            {
+                blocktime += iter;
+                blocktime += segid * 2;
+            }
+            break;
+        }
+        if ( validateflag != 0 )
+        {
+            /*for (i=31; i>=24; i--)
+             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+             fprintf(stderr," vs target ");
+             for (i=31; i>=24; i--)
+             fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+             fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
+            break;
+        }
+    }
+    //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
+    if ( 0 )
+    {
+        for (i=31; i>=24; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+        fprintf(stderr," vs ");
+        for (i=31; i>=24; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,dstr(value),(int32_t)diff);
+    }
+    if ( nHeight < 10 )
+        return(blocktime);
+    return(blocktime * winner);
+}
+
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    //if ( nHeight >= 4000 )
+        return(komodo_newstake(validateflag,bnTarget,nHeight,txid,vout,blocktime,prevtime,destaddr));
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( blocktime < prevtime+57 )
         blocktime = prevtime+57;
@@ -1120,18 +1242,19 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             memcpy(&hashbuf[sizeof(pasthash)+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
             vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*3 + sizeof(vout));
         } else vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
+        vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
         //fprintf(stderr,"(%s) vs. (%s) %s %.8f txtime.%u\n",address,destaddr,hash.ToString().c_str(),dstr(value),txtime);
         for (iter=0; iter<3600; iter++)
         {
             diff = (iter + blocktime - txtime - minage);
+            if ( diff > 3600*24*30 )
+                diff = 3600*24*30
             if ( iter > 0 )
                 diff += iter + segid*2;
-            //if ( diff > 3600*24 )
-            //    break;
             if ( blocktime+iter+segid*2 < txtime+minage )
                 continue;
             coinage = (value * diff) * ((diff >> 16) + 1);
-            hashval = arith_uint256(supply * 64) * (UintToArith256(hash) / arith_uint256(coinage+1));
+            hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
             if ( hashval <= bnTarget )
             {
                 winner = 1;
diff --git a/src/miner.cpp b/src/miner.cpp
index dcf22b1bd..7bf93a8ed 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -920,6 +920,8 @@ void static BitcoinMiner()
                     continue;
                 }*/
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
+                if ( Mining_height >= 4000 )
+                    HASHTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS);
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
                     for (z=31; z>=0; z--)

From 86f88c4f0c000fa72a46014b471e4af0e50a195f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 01:53:28 -1100
Subject: [PATCH 032/623] Syntax

---
 src/komodo_bitcoind.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6f3af9d27..b1656d09b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1088,21 +1088,21 @@ uint32_t komodo_segid32(char *coinaddr)
 
 int8_t komodo_segid(int32_t height)
 {
-    CTxDestination voutaddress; CBlock block; CBlockIndex *pindex; uint64_t value; uint32_t txtime; char voutaddr[64],destaddr[64]; int32_t txn_count,vout; bits256 txid; int8_t segid = -1;
+    CTxDestination voutaddress; CBlock block; CBlockIndex *pindex; uint64_t value; uint32_t txtime; char voutaddr[64],destaddr[64]; int32_t txn_count,vout; uint256 txid; int8_t segid = -1;
     if ( height > 0 && (pindex= komodo_chainactive(height)) != 0 )
     {
         if ( komodo_blockload(block,pindex) == 0 )
         {
-            txn_count = pblock->vtx.size();
-            if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
+            txn_count = block.vtx.size();
+            if ( txn_count > 1 && block.vtx[txn_count-1].vin.size() == 1 && block.vtx[txn_count-1].vout.size() == 1 )
             {
-                txid = pblock->vtx[txn_count-1].vin[0].prevout.hash;
-                vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
+                txid = block.vtx[txn_count-1].vin[0].prevout.hash;
+                vout = block.vtx[txn_count-1].vin[0].prevout.n;
                 txtime = komodo_txtime(&value,txid,vout,destaddr);
-                if ( ExtractDestination(pblock->vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )
+                if ( ExtractDestination(block.vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )
                 {
                     strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
-                    if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[txn_count-1].vout[0].nValue == value )
+                    if ( strcmp(destaddr,voutaddr) == 0 && block.vtx[txn_count-1].vout[0].nValue == value )
                     {
                         segid = komodo_segid32(voutaddr) & 0x3f;
                     }
@@ -1209,7 +1209,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
-    //if ( nHeight >= 4000 )
+//if ( nHeight >= 4000 )
         return(komodo_newstake(validateflag,bnTarget,nHeight,txid,vout,blocktime,prevtime,destaddr));
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( blocktime < prevtime+57 )
@@ -1248,7 +1248,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         {
             diff = (iter + blocktime - txtime - minage);
             if ( diff > 3600*24*30 )
-                diff = 3600*24*30
+                diff = 3600*24*30;
             if ( iter > 0 )
                 diff += iter + segid*2;
             if ( blocktime+iter+segid*2 < txtime+minage )

From 4aef05c93fa6de279bfd21d10c7cafc27dcc3985 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 01:56:53 -1100
Subject: [PATCH 033/623] Fix

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b1656d09b..c981b20b7 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1138,7 +1138,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( blocktime < prevtime+60 )
         blocktime = prevtime+60;

From b7865ea8f39a9aec6189720e02cd57aa1752abb8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 02:47:46 -1100
Subject: [PATCH 034/623] Newstake active at 4000

---
 src/komodo_bitcoind.h    | 2 +-
 src/wallet/rpcwallet.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index c981b20b7..787ba5f6b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1209,7 +1209,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
-//if ( nHeight >= 4000 )
+    if ( nHeight >= 4000 )
         return(komodo_newstake(validateflag,bnTarget,nHeight,txid,vout,blocktime,prevtime,destaddr));
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( blocktime < prevtime+57 )
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 67bafd32b..2230a1aa7 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4621,6 +4621,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 fprintf(stderr,"komodo_staked setAddress.count error\n");
                 continue;
             }
+            if ( IsMine(*pwalletMain, address) == 0 )
+                continue;
         }
         CAmount nValue = out.tx->vout[out.i].nValue;
         const CScript& pk = out.tx->vout[out.i].scriptPubKey;

From e8dd12a110e009eb75decca4e106e91af5116597 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 04:37:40 -1100
Subject: [PATCH 035/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 787ba5f6b..e68c1a74b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1395,7 +1395,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
             eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
-                fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
+                //fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
             } else isPoS = 1;
         }
         if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx

From 41070f82b7c103f7e97bd249e2eea7fe4a12a7f3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 06:57:59 -1100
Subject: [PATCH 036/623] Skip fractional utxo for staking

---
 src/wallet/rpcwallet.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2230a1aa7..9cbefea63 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4625,6 +4625,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 continue;
         }
         CAmount nValue = out.tx->vout[out.i].nValue;
+        if ( nValue < COIN && *utxovaluep != 0 )
+            continue;
         const CScript& pk = out.tx->vout[out.i].scriptPubKey;
         //entry.push_back(Pair("generated", out.tx->IsCoinBase()));
         CTxDestination address;

From 2f83c3e638aed65cff55367e71323d1dd25b726a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 07:00:06 -1100
Subject: [PATCH 037/623] Simplify

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9cbefea63..c866a3be8 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4625,7 +4625,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 continue;
         }
         CAmount nValue = out.tx->vout[out.i].nValue;
-        if ( nValue < COIN && *utxovaluep != 0 )
+        if ( nValue < COIN )
             continue;
         const CScript& pk = out.tx->vout[out.i].scriptPubKey;
         //entry.push_back(Pair("generated", out.tx->IsCoinBase()));

From e3124af1da164fe1b9d54d5c8667f4bf4efe4336 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 20:31:28 -1100
Subject: [PATCH 038/623] Decker's fix for watch only addresses

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c866a3be8..1e330b20c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4625,7 +4625,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 continue;
         }
         CAmount nValue = out.tx->vout[out.i].nValue;
-        if ( nValue < COIN )
+        if ( nValue < COIN  || !out.fSpendable )
             continue;
         const CScript& pk = out.tx->vout[out.i].scriptPubKey;
         //entry.push_back(Pair("generated", out.tx->IsCoinBase()));

From 42c0fc6a632c2c3fd19f844924d980abc6766161 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 7 Jul 2018 21:01:23 -1100
Subject: [PATCH 039/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e68c1a74b..d469ab953 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1406,7 +1406,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                 strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
                 if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[txn_count-1].vout[0].nValue == value )
                     isPoS = 1; // close enough for a pre-filter
-                else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
+                //else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
             } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
         } //else return(-1);
     }

From 196c69f770084c0bda8cdf41c826454e44e52789 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 00:13:09 -1100
Subject: [PATCH 040/623] Fix easy diff check for PoS

---
 COPYING     | 1 +
 src/pow.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/COPYING b/COPYING
index c84bfb7aa..eecf5ccc8 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,4 @@
+Copyright (c) 2016-2018 The Komodo developers
 Copyright (c) 2016-2017 The Zcash developers
 Copyright (c) 2009-2017 The Bitcoin Core developers
 
diff --git a/src/pow.cpp b/src/pow.cpp
index 2e525e8cb..5e9560850 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,6 +190,8 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
+    if ( height >= 4000 && ASSETCHAINS_STAKED != 0 )
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )
     {

From dec86f1b5a0e12b9fe1bfafa283f7622714de064 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 00:14:24 -1100
Subject: [PATCH 041/623] Delay activation to 4200

---
 src/pow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pow.cpp b/src/pow.cpp
index 5e9560850..cd7f47c71 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,7 +190,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
-    if ( height >= 4000 && ASSETCHAINS_STAKED != 0 )
+    if ( height >= 4200 && ASSETCHAINS_STAKED != 0 )
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )

From 0cd39760aada64f7bc6dce1b84ef8338caa76521 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 02:05:40 -1100
Subject: [PATCH 042/623] Test

---
 src/komodo_bitcoind.h | 9 ++++++---
 src/miner.cpp         | 2 +-
 src/pow.cpp           | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d469ab953..79bd25e38 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1147,7 +1147,8 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
-    bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    if ( nHeight < 6000 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
@@ -1209,7 +1210,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
-    if ( nHeight >= 4000 )
+    if ( nHeight >= 4000 ) // POSTEST64 remove when this is oldstake
         return(komodo_newstake(validateflag,bnTarget,nHeight,txid,vout,blocktime,prevtime,destaddr));
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( blocktime < prevtime+57 )
@@ -1448,7 +1449,9 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         return(-1);
     }
     hash = pblock->GetHash();
-    bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
+    if ( ASSETCHAINS_STAKED == 100 && height >= 4000 && height < 6000 )
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    else bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);
     //fprintf(stderr,"height.%d slowflag.%d possible.%d cmp.%d\n",height,slowflag,possible,bhash > bnTarget);
diff --git a/src/miner.cpp b/src/miner.cpp
index 7bf93a8ed..0b41c5cc0 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -920,7 +920,7 @@ void static BitcoinMiner()
                     continue;
                 }*/
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
-                if ( Mining_height >= 4000 )
+                if ( Mining_height >= 4000 && Mining_height < 6000 ) // POSTEST64 remove this
                     HASHTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS);
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
diff --git a/src/pow.cpp b/src/pow.cpp
index cd7f47c71..8f12f56b4 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,7 +190,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
-    if ( height >= 4200 && ASSETCHAINS_STAKED != 0 )
+    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 6000 ) // POSTEST64 remove this
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )

From 07529d5eb13f1a9f2c79b6bcac4db9c9dbc9efd7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 02:06:18 -1100
Subject: [PATCH 043/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 79bd25e38..2eb1f1164 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1449,7 +1449,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         return(-1);
     }
     hash = pblock->GetHash();
-    if ( ASSETCHAINS_STAKED == 100 && height >= 4000 && height < 6000 )
+    if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 6000 )
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     else bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
     bhash = UintToArith256(hash);

From f02af889b9ae06953deb19534e5282d8aaac5cef Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 02:53:38 -1100
Subject: [PATCH 044/623] Test

---
 src/komodo_bitcoind.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2eb1f1164..c29668146 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1449,8 +1449,11 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         return(-1);
     }
     hash = pblock->GetHash();
-    if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 6000 )
+    if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 6000 ) // POSTEST64
+    {
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        fprintf(stderr,"setmindiff ht.%d\n",height);
+    }
     else bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);
@@ -1481,7 +1484,8 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         }
         else if ( possible == 0 || ASSETCHAINS_SYMBOL[0] != 0 )
         {
-            if (KOMODO_TEST_ASSETCHAIN_SKIP_POW) return(0);
+            if ( KOMODO_TEST_ASSETCHAIN_SKIP_POW )
+                return(0);
             fprintf(stderr,"pow violation and no chance it is notary ht.%d %s\n",height,hash.ToString().c_str());
             return(-1);
         }
@@ -1490,7 +1494,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     {
         if ( (is_PoSblock= komodo_is_PoSblock(slowflag,height,pblock,bnTarget)) == 0 )
         {
-            if ( ASSETCHAINS_STAKED == 100 && height > 130 )  // only PoS allowed!
+            if ( ASSETCHAINS_STAKED == 100 && height > 130 )  // only PoS allowed! POSTEST64
                 return(-1);
             else
             {

From b45eddd85afc97ca559fa24839abe7bb62bd908a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 02:59:05 -1100
Subject: [PATCH 045/623] Test

---
 src/komodo_bitcoind.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index c29668146..6e76e5349 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1454,7 +1454,11 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
         fprintf(stderr,"setmindiff ht.%d\n",height);
     }
-    else bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
+    else
+    {
+        bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
+        fprintf(stderr,"set diff ht.%d slowflag.%d\n",height,slowflag);
+    }
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);
     //fprintf(stderr,"height.%d slowflag.%d possible.%d cmp.%d\n",height,slowflag,possible,bhash > bnTarget);

From ffd2c3834893741d599198824b38fe7cbdd80b42 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 03:03:21 -1100
Subject: [PATCH 046/623] Remove easy diff at 4400

---
 src/komodo_bitcoind.h | 6 +++---
 src/miner.cpp         | 4 ++--
 src/pow.cpp           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6e76e5349..863c39134 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1147,7 +1147,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
-    if ( nHeight < 6000 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
+    if ( nHeight < 4400 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
@@ -1449,12 +1449,12 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         return(-1);
     }
     hash = pblock->GetHash();
-    if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 6000 ) // POSTEST64
+    /*if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 4400 ) // POSTEST64
     {
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
         fprintf(stderr,"setmindiff ht.%d\n",height);
     }
-    else
+    else*/
     {
         bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
         fprintf(stderr,"set diff ht.%d slowflag.%d\n",height,slowflag);
diff --git a/src/miner.cpp b/src/miner.cpp
index 0b41c5cc0..2fb623b84 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -911,7 +911,7 @@ void static BitcoinMiner()
                     } //else fprintf(stderr,"duplicate at j.%d\n",j);
                 } else Mining_start = 0;
             } else Mining_start = 0;
-            if ( ASSETCHAINS_STAKED != 0 &&  GetArg("-genproclimit", 0) == 0 )
+            if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
             {
                 int32_t percPoS,z;
                 /*if ( Mining_height <= 100 )
@@ -920,7 +920,7 @@ void static BitcoinMiner()
                     continue;
                 }*/
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
-                if ( Mining_height >= 4000 && Mining_height < 6000 ) // POSTEST64 remove this
+                if ( Mining_height >= 4000 && Mining_height < 4400 ) // POSTEST64 remove this
                     HASHTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS);
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
diff --git a/src/pow.cpp b/src/pow.cpp
index 8f12f56b4..a6117b35c 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,7 +190,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
-    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 6000 ) // POSTEST64 remove this
+    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 4400 ) // POSTEST64 remove this
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )

From 62a9cee4d34c239c620f2d96ae6eb08b9c9e07f8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 04:01:57 -1100
Subject: [PATCH 047/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 863c39134..d742914e8 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1457,7 +1457,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     else*/
     {
         bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
-        fprintf(stderr,"set diff ht.%d slowflag.%d\n",height,slowflag);
+        //fprintf(stderr,"set diff ht.%d slowflag.%d\n",height,slowflag);
     }
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);

From f89f4ef034de31075d95849e238d0c50869cb3b0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 04:04:55 -1100
Subject: [PATCH 048/623] Update URL to white paper

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d85d013d..788635536 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ It downloads and stores the entire history of Komodo transactions; depending on
 - Support: [https://support.komodoplatform.com/support/home](https://support.komodoplatform.com/support/home)
 - Knowledgebase & How-to: [https://komodoplatform.atlassian.net/wiki/spaces/KPSD/pages](https://komodoplatform.atlassian.net/wiki/spaces/KPSD/pages)
 - API references: [http://docs.supernet.org/](http://docs.supernet.org/) #Not up to date.
-- Whitepaper: [Komodo Whitepaper](https://komodoplatform.com/wp-content/uploads/2018/03/2018-03-12-Komodo-White-Paper-Full.pdf)
+- Whitepaper: [Komodo Whitepaper](https://komodoplatform.com/wp-content/uploads/2018/06/Komodo-Whitepaper-June-3.pdf)
 - Komodo Platform public material: [Komodo Platform public material](https://docs.google.com/document/d/1AbhWrtagu4vYdkl-vsWz-HSNyNvK-W-ZasHCqe7CZy0)
 
 ## List of Komodo Platform Technologies

From 4ff37947b10c03df679003289e2e79590ff73115 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 04:32:02 -1100
Subject: [PATCH 049/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d742914e8..1f6680134 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -567,7 +567,7 @@ uint32_t komodo_txtime(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
 #endif
                         hashBlock, true))
     {
-        fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
+        //fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
         return(0);
     }
     //fprintf(stderr,"%s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);

From 5aa69f6d75c8c5839bc00e61c2e93a0830949b66 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 04:34:27 -1100
Subject: [PATCH 050/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1f6680134..2b4cf8cbc 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1490,7 +1490,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         {
             if ( KOMODO_TEST_ASSETCHAIN_SKIP_POW )
                 return(0);
-            fprintf(stderr,"pow violation and no chance it is notary ht.%d %s\n",height,hash.ToString().c_str());
+            //fprintf(stderr,"pow violation and no chance it is notary ht.%d %s\n",height,hash.ToString().c_str());
             return(-1);
         }
     }

From 45ee62cb719499b3ff2fde6168e2ef9aa0364076 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:17:39 -1100
Subject: [PATCH 051/623] Ht 6000 test

---
 src/komodo_bitcoind.h | 20 ++++++--------------
 src/miner.cpp         | 11 ++---------
 src/pow.cpp           |  2 --
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2b4cf8cbc..0f3033914 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1140,15 +1140,16 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
-    if ( blocktime < prevtime+60 )
-        blocktime = prevtime+60;
+    if ( nHeight < 6000 )
+    {
+        if ( blocktime < prevtime+60 )
+            blocktime = prevtime+60;
+    }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
-    if ( nHeight < 4400 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
-        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
@@ -1449,16 +1450,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         return(-1);
     }
     hash = pblock->GetHash();
-    /*if ( ASSETCHAINS_STAKED == 100 && height >= 4250 && height < 4400 ) // POSTEST64
-    {
-        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-        fprintf(stderr,"setmindiff ht.%d\n",height);
-    }
-    else*/
-    {
-        bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
-        //fprintf(stderr,"set diff ht.%d slowflag.%d\n",height,slowflag);
-    }
+    bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);
     //fprintf(stderr,"height.%d slowflag.%d possible.%d cmp.%d\n",height,slowflag,possible,bhash > bnTarget);
diff --git a/src/miner.cpp b/src/miner.cpp
index 2fb623b84..5e7871dd4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -425,7 +425,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-13 )
+                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-30 )
                     return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);
@@ -914,14 +914,7 @@ void static BitcoinMiner()
             if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
             {
                 int32_t percPoS,z;
-                /*if ( Mining_height <= 100 )
-                {
-                    sleep(60);
-                    continue;
-                }*/
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
-                if ( Mining_height >= 4000 && Mining_height < 4400 ) // POSTEST64 remove this
-                    HASHTarget = arith_uint256().SetCompact(KOMODO_MINDIFF_NBITS);
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
                     for (z=31; z>=0; z--)
@@ -984,7 +977,7 @@ void static BitcoinMiner()
                         return false;
                     if ( B.nTime > GetAdjustedTime() )
                     {
-                        fprintf(stderr,"need to wait %d seconds to submit block\n",(int32_t)(B.nTime - GetAdjustedTime()));
+                        //fprintf(stderr,"need to wait %d seconds to submit block\n",(int32_t)(B.nTime - GetAdjustedTime()));
                         while ( GetAdjustedTime() < B.nTime-2 )
                         {
                             sleep(1);
diff --git a/src/pow.cpp b/src/pow.cpp
index a6117b35c..2e525e8cb 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,8 +190,6 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
-    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 4400 ) // POSTEST64 remove this
-        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )
     {

From 7ed0e00b8201a1c6e5f7c63d040c59a04e71c9c1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:23:30 -1100
Subject: [PATCH 052/623] Test

---
 src/komodo_bitcoind.h | 2 ++
 src/pow.cpp           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0f3033914..b95efc8d1 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1150,6 +1150,8 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
+    if ( nHeight < 4400 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
diff --git a/src/pow.cpp b/src/pow.cpp
index 2e525e8cb..a6117b35c 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,6 +190,8 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
+    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 4400 ) // POSTEST64 remove this
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )
     {

From 4646f21b5bd0b210e56336cdeeab914eb1ffcfde Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:30:41 -1100
Subject: [PATCH 053/623] Height 6000 disable 60 sec delay

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b95efc8d1..e1249a955 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1125,13 +1125,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            fprintf(stderr,"%02x ",hashbuf[i]);
+            //fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            fprintf(stderr,"segids.%d\n",height);
+            //fprintf(stderr,"segids.%d\n",height);
         }
     }
 }
@@ -1140,7 +1140,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
-    if ( nHeight < 6000 )
+    if ( nHeight < 6000 ) // POSTEST64
     {
         if ( blocktime < prevtime+60 )
             blocktime = prevtime+60;

From 41e9c815497218c11fa91357d6db955e88047ea1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:50:11 -1100
Subject: [PATCH 054/623] Remove miner locks

---
 src/miner.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 5e7871dd4..20ff32d7c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -425,7 +425,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-30 )
+                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-57 )
                     return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);
@@ -975,7 +975,7 @@ void static BitcoinMiner()
                     fprintf(stderr," POW\n");*/
                     if ( h > hashTarget )
                         return false;
-                    if ( B.nTime > GetAdjustedTime() )
+                    if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )
                     {
                         //fprintf(stderr,"need to wait %d seconds to submit block\n",(int32_t)(B.nTime - GetAdjustedTime()));
                         while ( GetAdjustedTime() < B.nTime-2 )
@@ -999,8 +999,8 @@ void static BitcoinMiner()
                     }
                     else
                     {
-                        while ( GetAdjustedTime() < B.nTime )
-                            sleep(1);
+                        //while ( B.nTime > GetAdjustedTime() )
+                        //    sleep(1);
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From 0c35569bdcc102afab31183e81999465e7526a87 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:52:14 -1100
Subject: [PATCH 055/623] tweak

---
 src/miner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 20ff32d7c..2e552d62f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -999,8 +999,8 @@ void static BitcoinMiner()
                     }
                     else
                     {
-                        //while ( B.nTime > GetAdjustedTime() )
-                        //    sleep(1);
+                        while ( B.nTime-57 > GetAdjustedTime() )
+                            sleep(1);
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From 3aac96a8228e4f126cbf2c8b097902f631b9b58c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 8 Jul 2018 16:53:01 -1100
Subject: [PATCH 056/623] <6000 compatibility

---
 src/miner.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 2e552d62f..bbcbf6643 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1001,6 +1001,11 @@ void static BitcoinMiner()
                     {
                         while ( B.nTime-57 > GetAdjustedTime() )
                             sleep(1);
+                        if ( Mining_height < 6000 )
+                        {
+                            while ( B.nTime > GetAdjustedTime() )
+                                sleep(1);
+                        }
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From de7cb53f9933e773c3be96f435a9d3081d5098b3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:20:08 -1100
Subject: [PATCH 057/623] Test post 6000

---
 src/komodo_bitcoind.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e1249a955..3956e36f1 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1145,6 +1145,11 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         if ( blocktime < prevtime+60 )
             blocktime = prevtime+60;
     }
+    else
+    {
+        if ( blocktime < prevtime+30 )
+            blocktime = prevtime+30;
+    }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);

From 422b307c873ac94a0ddf080642ba3596e77eaae4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:24:40 -1100
Subject: [PATCH 058/623] Reduce gap

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 3956e36f1..1f3c251ec 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1147,8 +1147,8 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     }
     else
     {
-        if ( blocktime < prevtime+30 )
-            blocktime = prevtime+30;
+        if ( blocktime < prevtime+3 )
+            blocktime = prevtime+3;
     }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {

From f1d8e4b6b5a96d6c173cf4bd7dc0c2162615ecf7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:38:27 -1100
Subject: [PATCH 059/623] Fix timestamps

---
 src/komodo_bitcoind.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1f3c251ec..44ec68aa7 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1140,6 +1140,8 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
+    if ( blocktime < GetAdjustedTime() )
+        blocktime = GetAdjustedTime();
     if ( nHeight < 6000 ) // POSTEST64
     {
         if ( blocktime < prevtime+60 )

From 89931e6e6096908f98521cf334aa07f44f74f9ba Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:40:33 -1100
Subject: [PATCH 060/623] Fix

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 44ec68aa7..a3077828a 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1140,7 +1140,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
-    if ( blocktime < GetAdjustedTime() )
+    if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
     if ( nHeight < 6000 ) // POSTEST64
     {

From 7c28c718f0e6c2b583dd96c347eec3c165fdba3d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:44:15 -1100
Subject: [PATCH 061/623] +segids print

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index a3077828a..3fda9ce00 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1125,13 +1125,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            //fprintf(stderr,"%02x ",hashbuf[i]);
+            fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            //fprintf(stderr,"segids.%d\n",height);
+            fprintf(stderr,"segids.%d\n",height);
         }
     }
 }

From bf915dce107909c6a872d702d4669d7df7e36fa0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 08:57:16 -1100
Subject: [PATCH 062/623] -print

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 3fda9ce00..a3077828a 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1125,13 +1125,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            fprintf(stderr,"%02x ",hashbuf[i]);
+            //fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            fprintf(stderr,"segids.%d\n",height);
+            //fprintf(stderr,"segids.%d\n",height);
         }
     }
 }

From 2ba9de01cb1f1ebaee4b88a23b6ab8329559b577 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 22:15:27 -1100
Subject: [PATCH 063/623] 7250 diff cap.16 hardfork for PoS

---
 src/komodo_bitcoind.h | 11 +++++++++--
 src/miner.cpp         | 11 +++++++++--
 src/pow.cpp           | 15 +++++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index a3077828a..1a679c485 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1159,6 +1159,13 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     }
     if ( nHeight < 4400 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
         bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    else if ( nHeight >= 7250 )
+    {
+        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
+        if ( bnTarget < bnMaxPoSdiff )
+            bnTarget = bnMaxPoSdiff;
+    }
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
@@ -1491,8 +1498,8 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
         {
             if ( KOMODO_TEST_ASSETCHAIN_SKIP_POW )
                 return(0);
-            //fprintf(stderr,"pow violation and no chance it is notary ht.%d %s\n",height,hash.ToString().c_str());
-            return(-1);
+            if ( ASSETCHAINS_STAKED == 0 ) // komodo_is_PoSblock will check bnTarget
+                return(-1);
         }
     }
     if ( ASSETCHAINS_STAKED != 0 && height >= 2 ) // must PoS or have at least 16x better PoW
diff --git a/src/miner.cpp b/src/miner.cpp
index bbcbf6643..bc56df370 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -856,7 +856,7 @@ void static BitcoinMiner()
             //
             // Search
             //
-            uint8_t pubkeys[66][33]; uint32_t blocktimes[66]; int mids[256],nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime();
+            uint8_t pubkeys[66][33]; arith_uint256 bnMaxPoSdiff; uint32_t blocktimes[66]; int mids[256],nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime();
             savebits = pblock->nBits;
             HASHTarget = arith_uint256().SetCompact(pblock->nBits);
             roundrobin_delay = ROUNDROBIN_DELAY;
@@ -911,10 +911,17 @@ void static BitcoinMiner()
                     } //else fprintf(stderr,"duplicate at j.%d\n",j);
                 } else Mining_start = 0;
             } else Mining_start = 0;
-            if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
+            if ( ASSETCHAINS_STAKED != 0 )
             {
                 int32_t percPoS,z;
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
+                if ( Mining_height >= 7250 )
+                {
+                    bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+                    bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
+                    if ( HASHtarget < bnMaxPoSdiff )
+                        HASHtarget = bnMaxPoSdiff;
+                }
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
                     for (z=31; z>=0; z--)
diff --git a/src/pow.cpp b/src/pow.cpp
index a6117b35c..39204f7f9 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -190,8 +190,19 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     }
     if (fNegative || bnTarget == 0 || fOverflow || bnTarget > UintToArith256(params.powLimit))
         return error("CheckProofOfWork(): nBits below minimum work");
-    if (  ASSETCHAINS_STAKED != 0 && height >= 4200 && height < 4400 ) // POSTEST64 remove this
-        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    if (  ASSETCHAINS_STAKED != 0 )
+    {
+        if ( height >= 4200 && height < 4400 )
+            bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        else if ( height >= 7250 )
+        {
+            arith_uint256 bnMaxPoSdiff;
+            bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+            bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
+            if ( bnTarget < bnMaxPoSdiff )
+                bnTarget = bnMaxPoSdiff;
+        }
+    }
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )
     {

From ed3d0a051e6e325ccbd658e5d3502d740c3940a3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 9 Jul 2018 22:21:39 -1100
Subject: [PATCH 064/623] Syntax

---
 src/miner.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index bc56df370..d85e4d510 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -913,14 +913,14 @@ void static BitcoinMiner()
             } else Mining_start = 0;
             if ( ASSETCHAINS_STAKED != 0 )
             {
-                int32_t percPoS,z;
+                int32_t percPoS,z; bool fNegative,fOverflow;
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
                 if ( Mining_height >= 7250 )
                 {
                     bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
                     bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
-                    if ( HASHtarget < bnMaxPoSdiff )
-                        HASHtarget = bnMaxPoSdiff;
+                    if ( HASHTarget < bnMaxPoSdiff )
+                        HASHTarget = bnMaxPoSdiff;
                 }
                 if ( ASSETCHAINS_STAKED < 100 )
                 {

From 97a337f739d0234ea11c348deeb37b8e7b3e7ded Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 01:19:29 -1100
Subject: [PATCH 065/623] Initial revisions

---
 src/komodo_bitcoind.h | 126 +++++-------------------------------------
 src/komodo_defs.h     |   1 +
 src/miner.cpp         |  39 ++-----------
 src/pow.cpp           |  16 ++----
 4 files changed, 27 insertions(+), 155 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1a679c485..7685011e2 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1136,37 +1136,26 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
     }
 }
 
-uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
+uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0; arith_uint256 bnMaxPoSdiff,ratio; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
-    if ( nHeight < 6000 ) // POSTEST64
-    {
-        if ( blocktime < prevtime+60 )
-            blocktime = prevtime+60;
-    }
-    else
-    {
-        if ( blocktime < prevtime+3 )
-            blocktime = prevtime+3;
-    }
+    if ( blocktime < prevtime+3 )
+        blocktime = prevtime+3;
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
-    if ( nHeight < 4400 ) // POSTEST64 change newstake to stake and stake to oldstake and remove
-        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-    else if ( nHeight >= 7250 )
-    {
-        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
-        if ( bnTarget < bnMaxPoSdiff )
-            bnTarget = bnMaxPoSdiff;
-    }
-    mfactor = 1024;
+    if ( value < SATOSHIDEN )
+        return(0);
+    bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    ratio = (bnTarget / bnMaxPoSdiff);
+    bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
+    if ( bnTarget < bnMaxPoSdiff )
+        bnTarget = bnMaxPoSdiff;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
     pindex = 0;
@@ -1187,7 +1176,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff) * ((diff >> 16) + 1);
-        hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
+        hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
         if ( hashval <= bnTarget )
         {
             winner = 1;
@@ -1224,100 +1213,15 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     return(blocktime * winner);
 }
 
-uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
-{
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[128]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
-    if ( nHeight >= 4000 ) // POSTEST64 remove when this is oldstake
-        return(komodo_newstake(validateflag,bnTarget,nHeight,txid,vout,blocktime,prevtime,destaddr));
-    txtime = komodo_txtime(&value,txid,vout,address);
-    if ( blocktime < prevtime+57 )
-        blocktime = prevtime+57;
-    if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
-    {
-        //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
-        return(0);
-    }
-    if ( ASSETCHAINS_STAKED != 100 || nHeight < 2000 )
-    {
-        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(4));
-        if ( bnTarget < bnMaxPoSdiff )
-            bnTarget = bnMaxPoSdiff;
-    }
-    if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
-        minage = 6000;
-    pindex = 0;
-    if ( (pindex= komodo_chainactive(nHeight>50?nHeight-50:1)) != 0 )
-    {
-        vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
-        segid = ((nHeight + addrhash.uints[0]) & 0x3f);
-        pasthash = pindex->GetBlockHash();
-        memcpy(hashbuf,&pasthash,sizeof(pasthash));
-        memcpy(&hashbuf[sizeof(pasthash)],&addrhash,sizeof(addrhash));
-        if ( nHeight >= 2000 )
-        {
-            memcpy(&hashbuf[sizeof(pasthash)+sizeof(addrhash)],&txid,sizeof(txid));
-            memcpy(&hashbuf[sizeof(pasthash)+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
-            vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*3 + sizeof(vout));
-        } else vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
-        vcalc_sha256(0,(uint8_t *)&hash,hashbuf,(int32_t)sizeof(uint256)*2);
-        //fprintf(stderr,"(%s) vs. (%s) %s %.8f txtime.%u\n",address,destaddr,hash.ToString().c_str(),dstr(value),txtime);
-        for (iter=0; iter<3600; iter++)
-        {
-            diff = (iter + blocktime - txtime - minage);
-            if ( diff > 3600*24*30 )
-                diff = 3600*24*30;
-            if ( iter > 0 )
-                diff += iter + segid*2;
-            if ( blocktime+iter+segid*2 < txtime+minage )
-                continue;
-            coinage = (value * diff) * ((diff >> 16) + 1);
-            hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
-            if ( hashval <= bnTarget )
-            {
-                winner = 1;
-                if ( validateflag == 0 )
-                {
-                    blocktime += iter;
-                    blocktime += segid * 2;
-                }
-                break;
-            }
-            if ( validateflag != 0 )
-            {
-                /*for (i=31; i>=24; i--)
-                    fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-                fprintf(stderr," vs target ");
-                for (i=31; i>=24; i--)
-                    fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-                fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
-                break;
-            }
-        }
-        //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-        if ( 0 )
-        {
-            for (i=31; i>=24; i--)
-                fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-            fprintf(stderr," vs ");
-            for (i=31; i>=24; i--)
-                fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,dstr(value),(int32_t)diff);
-        }
-    } //else fprintf(stderr,"skip PoS scan: diff %d blocktime %u > %u txtime+minage %u pindex.%p\n",(int32_t)(blocktime - (txtime+minage)),blocktime,txtime,minage,pindex);
-    if ( nHeight < 10 )
-        return(blocktime);
-    return(blocktime * winner);
-}
-
 arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc)
 {
-    CBlockIndex *pindex; arith_uint256 bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,ht,percPoS,diff,val;
+    CBlockIndex *pindex; arith_uint256 easydiff,bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,ht,percPoS,diff,val;
     *percPoSp = percPoS = 0;
     if ( height <= 10 || (ASSETCHAINS_STAKED == 100 && height <= 100) )
         return(target);
     sum = arith_uint256(0);
     ave = sum;
+    easydiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     for (i=n=0; i<100; i++)
     {
         ht = height - 100 + i;
@@ -1375,7 +1279,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     }
     else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget
     {
-        bnTarget = ((ave * arith_uint256(goalperc)) + (target * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
+        bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
         if ( 1 )
         {
             for (i=31; i>=24; i--)
diff --git a/src/komodo_defs.h b/src/komodo_defs.h
index 1d7351638..9650620a9 100644
--- a/src/komodo_defs.h
+++ b/src/komodo_defs.h
@@ -8,5 +8,6 @@
 #define KOMODO_LIMITED_NETWORKSIZE 4
 #define KOMODO_MAXMEMPOOLTIME 3600 // affects consensus
 #define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9"
+#define KOMODO_MAXPOS_DIFF 16
 
 #endif
diff --git a/src/miner.cpp b/src/miner.cpp
index d85e4d510..2ec853756 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -117,11 +117,7 @@ uint32_t Mining_start,Mining_height;
 int32_t My_notaryid = -1;
 int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33,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);
-//int32_t komodo_is_issuer();
-//int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *symbol,int32_t tokomodo);
-//int32_t komodo_isrealtime(int32_t *kmdheightp);
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t nTime,int32_t dispflag);
 uint64_t komodo_commission(const CBlock *block);
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig);
@@ -140,29 +136,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
         return NULL;
     }
     CBlock *pblock = &pblocktemplate->block; // pointer for convenience
-    /*if ( ASSETCHAINS_SYMBOL[0] != 0 && komodo_baseid(ASSETCHAINS_SYMBOL) >= 0 && chainActive.Tip()->nHeight >= ASSETCHAINS_MINHEIGHT )
-    {
-        isrealtime = komodo_isrealtime(&kmdheight);
-        deposits = komodo_paxtotal();
-        while ( KOMODO_ON_DEMAND == 0 && deposits == 0 && (int32_t)mempool.GetTotalTxSize() == 0 )
-        {
-            deposits = komodo_paxtotal();
-            if ( KOMODO_PASSPORT_INITDONE == 0 || KOMODO_INITDONE == 0 || (komodo_baseid(ASSETCHAINS_SYMBOL) >= 0 && (isrealtime= komodo_isrealtime(&kmdheight)) == 0) )
-            {
-                //fprintf(stderr,"INITDONE.%d RT.%d deposits %.8f ht.%d\n",KOMODO_INITDONE,isrealtime,(double)deposits/COIN,kmdheight);
-            }
-            else if ( komodo_isrealtime(&kmdheight) != 0 && (deposits != 0 || (int32_t)mempool.GetTotalTxSize() > 0) )
-            {
-                fprintf(stderr,"start CreateNewBlock %s initdone.%d deposit %.8f mempool.%d RT.%u KOMODO_ON_DEMAND.%d\n",ASSETCHAINS_SYMBOL,KOMODO_INITDONE,(double)komodo_paxtotal()/COIN,(int32_t)mempool.GetTotalTxSize(),isrealtime,KOMODO_ON_DEMAND);
-                break;
-            }
-            sleep(10);
-        }
-        KOMODO_ON_DEMAND = 0;
-        if ( 0 && deposits != 0 )
-            printf("miner KOMODO_DEPOSIT %llu pblock->nHeight %d mempool.GetTotalTxSize(%d)\n",(long long)komodo_paxtotal(),(int32_t)chainActive.Tip()->nHeight,(int32_t)mempool.GetTotalTxSize());
-    }*/
-    // -regtest only: allow overriding block.nVersion with
+     // -regtest only: allow overriding block.nVersion with
     // -blockversion=N to test forking scenarios
     if (Params().MineBlocksOnDemand())
         pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
@@ -915,13 +889,10 @@ void static BitcoinMiner()
             {
                 int32_t percPoS,z; bool fNegative,fOverflow;
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
-                if ( Mining_height >= 7250 )
-                {
-                    bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-                    bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
-                    if ( HASHTarget < bnMaxPoSdiff )
-                        HASHTarget = bnMaxPoSdiff;
-                }
+                bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+                bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
+                if ( HASHTarget < bnMaxPoSdiff )
+                    HASHTarget = bnMaxPoSdiff;
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
                     for (z=31; z>=0; z--)
diff --git a/src/pow.cpp b/src/pow.cpp
index 39204f7f9..0b00c5929 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -127,6 +127,7 @@ extern int32_t KOMODO_CHOSEN_ONE;
 extern uint64_t ASSETCHAINS_STAKED;
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 #define KOMODO_ELECTION_GAP 2000
+#define KOMODO_MAXPOS_DIFF 16
 
 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,uint32_t blocktimes[66],int32_t *nonzpkeysp,int32_t height);
 int32_t KOMODO_LOADINGBLOCKS = 1;
@@ -192,16 +193,11 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
         return error("CheckProofOfWork(): nBits below minimum work");
     if (  ASSETCHAINS_STAKED != 0 )
     {
-        if ( height >= 4200 && height < 4400 )
-            bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-        else if ( height >= 7250 )
-        {
-            arith_uint256 bnMaxPoSdiff;
-            bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-            bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
-            if ( bnTarget < bnMaxPoSdiff )
-                bnTarget = bnMaxPoSdiff;
-        }
+        arith_uint256 bnMaxPoSdiff;
+        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
+        if ( bnTarget < bnMaxPoSdiff )
+            bnTarget = bnMaxPoSdiff;
     }
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )

From 443277cab34f7617975f4e6d829b0bb086614302 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:04:00 -1100
Subject: [PATCH 066/623] 7500 changes

---
 src/komodo_bitcoind.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1a679c485..afd54c784 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1026,7 +1026,7 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
         if ( txheight > 246748 )
         {
@@ -1138,7 +1138,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 ratio,hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
@@ -1162,13 +1162,18 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     else if ( nHeight >= 7250 )
     {
         bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+        ratio = (bnMaxPoSdiff / bnTarget);
         bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
         if ( bnTarget < bnMaxPoSdiff )
             bnTarget = bnMaxPoSdiff;
     }
     mfactor = 1024;
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
+    {
         minage = 6000;
+        if ( height >= 7500 )
+            txtime -= KOMODO_MAXMEMPOOLTIME;
+    }
     pindex = 0;
     vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
     segid = ((nHeight + addrhash.uints[0]) & 0x3f);
@@ -1187,7 +1192,9 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff) * ((diff >> 16) + 1);
-        hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
+        if ( height < 7500 )
+            hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
+        else hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
         if ( hashval <= bnTarget )
         {
             winner = 1;

From 41ee6d2a1f142c1e61d10d7071dec8f5bed30972 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:07:27 -1100
Subject: [PATCH 067/623] Syntax

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index afd54c784..20c2c63b4 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1138,7 +1138,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 ratio,hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 ratio,hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();

From 25c8fec1c32b46fb79d70c255c0a427656d10e26 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:08:27 -1100
Subject: [PATCH 068/623] nHeight

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 20c2c63b4..e7a74b0f9 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1171,7 +1171,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
     {
         minage = 6000;
-        if ( height >= 7500 )
+        if ( nHeight >= 7500 )
             txtime -= KOMODO_MAXMEMPOOLTIME;
     }
     pindex = 0;
@@ -1192,7 +1192,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff) * ((diff >> 16) + 1);
-        if ( height < 7500 )
+        if ( nHeight < 7500 )
             hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
         else hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
         if ( hashval <= bnTarget )

From 5a62cfb73b41d046ca0e99406586b0c10b4613d6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:23:24 -1100
Subject: [PATCH 069/623] Fix exceptions

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e7a74b0f9..f6f7005ba 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1028,9 +1028,9 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
 {
     if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
-        if ( txheight > 246748 )
+        if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
         {
-            if ( txheight < 247205 )
+            if ( txheight < 247205 && || ASSETCHAINS_STAKED == 0 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {

From c515ae54d208935617019796ffaf7db9d55a7c3c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:25:00 -1100
Subject: [PATCH 070/623] Syntax

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f6f7005ba..0ec295fbd 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1030,7 +1030,7 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
     {
         if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
         {
-            if ( txheight < 247205 && || ASSETCHAINS_STAKED == 0 )
+            if ( txheight < 247205 && ASSETCHAINS_STAKED == 0 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {

From 837aaaecb605847ba895b4ff8a2c81b3e0c9cbe4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:26:27 -1100
Subject: [PATCH 071/623] Fix exception

---
 src/komodo_bitcoind.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7685011e2..18117f665 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1026,11 +1026,11 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
-        if ( txheight > 246748 )
+        if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
         {
-            if ( txheight < 247205 )
+            if ( txheight < 247205 && ASSETCHAINS_STAKED == 0 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {
@@ -1140,6 +1140,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0; arith_uint256 bnMaxPoSdiff,ratio; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
+    txtime -= KOMODO_MAXMEMPOOLTIME;
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
     if ( blocktime < prevtime+3 )
@@ -1152,7 +1153,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     if ( value < SATOSHIDEN )
         return(0);
     bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-    ratio = (bnTarget / bnMaxPoSdiff);
+    ratio = (bnMaxPoSdiff / bnTarget);
     bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
     if ( bnTarget < bnMaxPoSdiff )
         bnTarget = bnMaxPoSdiff;

From d60e3fd1a1f414c9c6cfb76827ef0cd2cf09e7e1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:51:35 -1100
Subject: [PATCH 072/623] +print

---
 src/komodo_bitcoind.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0ec295fbd..95679eb4c 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1207,12 +1207,15 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         }
         if ( validateflag != 0 )
         {
-            /*for (i=31; i>=24; i--)
-             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-             fprintf(stderr," vs target ");
-             for (i=31; i>=24; i--)
-             fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-             fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
+            for (i=31; i>=0; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
+            fprintf(stderr," ratio -> ");
+            for (i=31; i>=24; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+            fprintf(stderr," vs target ");
+            for (i=31; i>=24; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);
             break;
         }
     }

From 1cb7611fc9254216319434abf0b22d0fa0c00a1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 03:58:38 -1100
Subject: [PATCH 073/623] Test

---
 src/komodo_bitcoind.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 95679eb4c..f02c9a2e0 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1207,7 +1207,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         }
         if ( validateflag != 0 )
         {
-            for (i=31; i>=0; i--)
+            /*for (i=31; i>=0; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
             fprintf(stderr," ratio -> ");
             for (i=31; i>=24; i--)
@@ -1215,13 +1215,16 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
             fprintf(stderr," vs target ");
             for (i=31; i>=24; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);
+            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
             break;
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 0 )
+    if ( 1 )
     {
+        for (i=31; i>=0; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
+        fprintf(stderr," ratio -> ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
         fprintf(stderr," vs ");

From c662a3bad1d1eeb154ea45cebed61167b3cde929 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:04:53 -1100
Subject: [PATCH 074/623] Test

---
 src/komodo_bitcoind.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f02c9a2e0..7fcb1671b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1138,7 +1138,8 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 ratio,hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 ratio,hashval,origtarget; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    origtarget = bnTarget;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
@@ -1229,7 +1230,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
         fprintf(stderr," vs ");
         for (i=31; i>=24; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+            fprintf(stderr,"%02x",((uint8_t *)&origtarget)[i]);
         fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,dstr(value),(int32_t)diff);
     }
     if ( nHeight < 10 )

From a86b70f4811c67195f0b9af90d67be87f59a9c5e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:09:16 -1100
Subject: [PATCH 075/623] Test

---
 src/komodo_bitcoind.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7fcb1671b..b7d4c7d51 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1138,7 +1138,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 ratio,hashval,origtarget; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; arith_uint256 bnMaxPoSdiff; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 ratio,newhashval,hashval,origtarget,bnMaxPoSdiff; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t mfactor=64,txtime,winner = 0; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     origtarget = bnTarget;
     txtime = komodo_txtime(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
@@ -1195,7 +1195,14 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         coinage = (value * diff) * ((diff >> 16) + 1);
         if ( nHeight < 7500 )
             hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
-        else hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
+        else
+        {
+            newhashval = (ratio * arith_uint256(supply)) * (UintToArith256(hash) / arith_uint256(coinage+1));
+
+            if ( hashval < 8000 )
+                hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
+            else hashval = newhashval;
+        }
         if ( hashval <= bnTarget )
         {
             winner = 1;
@@ -1224,7 +1231,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     if ( 1 )
     {
         for (i=31; i>=0; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
+            fprintf(stderr,"%02x",((uint8_t *)&newhashval)[i]);
         fprintf(stderr," ratio -> ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From 5ce19c1775e32ab951b2e6fce2f1dd6f20e971ee Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:16:41 -1100
Subject: [PATCH 076/623] Test

---
 src/komodo_bitcoind.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b7d4c7d51..b09857ace 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1197,8 +1197,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
             hashval = arith_uint256(supply * mfactor) * (UintToArith256(hash) / arith_uint256(coinage+1));
         else
         {
-            newhashval = (ratio * arith_uint256(supply)) * (UintToArith256(hash) / arith_uint256(coinage+1));
-
+            newhashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
             if ( hashval < 8000 )
                 hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
             else hashval = newhashval;
@@ -1232,7 +1231,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     {
         for (i=31; i>=0; i--)
             fprintf(stderr,"%02x",((uint8_t *)&newhashval)[i]);
-        fprintf(stderr," ratio -> ");
+        fprintf(stderr," newhash -> ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
         fprintf(stderr," vs ");

From 84f19b77ae2ca56557a422a86b2b8aef880442f0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:19:15 -1100
Subject: [PATCH 077/623] Fix

---
 src/komodo_bitcoind.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 18117f665..9e774bf50 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1138,7 +1138,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0; arith_uint256 bnMaxPoSdiff,ratio; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime(&value,txid,vout,address);
     txtime -= KOMODO_MAXMEMPOOLTIME;
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
@@ -1152,11 +1152,8 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     }
     if ( value < SATOSHIDEN )
         return(0);
-    bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-    ratio = (bnMaxPoSdiff / bnTarget);
-    bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
-    if ( bnTarget < bnMaxPoSdiff )
-        bnTarget = bnMaxPoSdiff;
+    mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    ratio = (mindiff / bnTarget);
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
     pindex = 0;
@@ -1177,7 +1174,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff) * ((diff >> 16) + 1);
-        hashval = (ratio * arith_uint256(supply) * UintToArith256(hash)) / arith_uint256(coinage+1);
+        newhashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
         if ( hashval <= bnTarget )
         {
             winner = 1;
@@ -1190,12 +1187,15 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
         if ( validateflag != 0 )
         {
-            /*for (i=31; i>=24; i--)
-             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-             fprintf(stderr," vs target ");
-             for (i=31; i>=24; i--)
-             fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-             fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
+            /*for (i=31; i>=0; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
+            fprintf(stderr," ratio -> ");
+            for (i=31; i>=24; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+            fprintf(stderr," vs target ");
+            for (i=31; i>=24; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
             break;
         }
     }

From b19bee1eb7af6520b0f4235a826e31514455d6ca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:25:18 -1100
Subject: [PATCH 078/623] 8000 changes

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b09857ace..08fcb2be7 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1165,7 +1165,7 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
         bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
         ratio = (bnMaxPoSdiff / bnTarget);
         bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(16));
-        if ( bnTarget < bnMaxPoSdiff )
+        if ( nHeight < 8000 && bnTarget < bnMaxPoSdiff )
             bnTarget = bnMaxPoSdiff;
     }
     mfactor = 1024;

From 14fd7614736d64a0831f20718fb2516fd7430d4d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:26:41 -1100
Subject: [PATCH 079/623] 8000 changes

---
 src/komodo_bitcoind.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 08fcb2be7..b6887dbf3 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1229,14 +1229,11 @@ uint32_t komodo_newstake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHe
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
     if ( 1 )
     {
-        for (i=31; i>=0; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&newhashval)[i]);
-        fprintf(stderr," newhash -> ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
         fprintf(stderr," vs ");
         for (i=31; i>=24; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&origtarget)[i]);
+            fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
         fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,dstr(value),(int32_t)diff);
     }
     if ( nHeight < 10 )

From 38cbe99ba41c90156fd526d43e3182fd2cb3394b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:28:03 -1100
Subject: [PATCH 080/623] Fix

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 9e774bf50..132ebc135 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1174,7 +1174,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff) * ((diff >> 16) + 1);
-        newhashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
+        hashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
         if ( hashval <= bnTarget )
         {
             winner = 1;

From f108acf94381c5230f90eb3e5568d6e9c6a9b695 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 04:53:28 -1100
Subject: [PATCH 081/623] Easy diff for PoS

---
 src/komodo_bitcoind.h | 2 +-
 src/komodo_defs.h     | 1 -
 src/miner.cpp         | 5 +----
 src/pow.cpp           | 6 +-----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 132ebc135..ea830ce9e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1200,7 +1200,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 0 )
+    if ( 1 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
diff --git a/src/komodo_defs.h b/src/komodo_defs.h
index 9650620a9..1d7351638 100644
--- a/src/komodo_defs.h
+++ b/src/komodo_defs.h
@@ -8,6 +8,5 @@
 #define KOMODO_LIMITED_NETWORKSIZE 4
 #define KOMODO_MAXMEMPOOLTIME 3600 // affects consensus
 #define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9"
-#define KOMODO_MAXPOS_DIFF 16
 
 #endif
diff --git a/src/miner.cpp b/src/miner.cpp
index 2ec853756..9ca979e07 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -889,10 +889,7 @@ void static BitcoinMiner()
             {
                 int32_t percPoS,z; bool fNegative,fOverflow;
                 HASHTarget_POW = komodo_PoWtarget(&percPoS,HASHTarget,Mining_height,ASSETCHAINS_STAKED);
-                bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-                bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
-                if ( HASHTarget < bnMaxPoSdiff )
-                    HASHTarget = bnMaxPoSdiff;
+                HASHTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
                 if ( ASSETCHAINS_STAKED < 100 )
                 {
                     for (z=31; z>=0; z--)
diff --git a/src/pow.cpp b/src/pow.cpp
index 0b00c5929..6d218ef13 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -127,7 +127,6 @@ extern int32_t KOMODO_CHOSEN_ONE;
 extern uint64_t ASSETCHAINS_STAKED;
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 #define KOMODO_ELECTION_GAP 2000
-#define KOMODO_MAXPOS_DIFF 16
 
 int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,uint32_t blocktimes[66],int32_t *nonzpkeysp,int32_t height);
 int32_t KOMODO_LOADINGBLOCKS = 1;
@@ -194,10 +193,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash,unsigned int
     if (  ASSETCHAINS_STAKED != 0 )
     {
         arith_uint256 bnMaxPoSdiff;
-        bnMaxPoSdiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-        bnMaxPoSdiff = (bnMaxPoSdiff / arith_uint256(KOMODO_MAXPOS_DIFF));
-        if ( bnTarget < bnMaxPoSdiff )
-            bnTarget = bnMaxPoSdiff;
+        bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     }
     // Check proof of work matches claimed amount
     if ( UintToArith256(hash) > bnTarget )

From a03465f69e964711dca1df25466cee5a76e12665 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 05:22:11 -1100
Subject: [PATCH 082/623] Rescale

---
 src/komodo_bitcoind.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index ea830ce9e..7072781ba 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1152,6 +1152,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     }
     if ( value < SATOSHIDEN )
         return(0);
+    value /= SATOSHIDEN;
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks

From 0a953df21b0ac2cd6a6aad286681811757ae378b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 05:38:28 -1100
Subject: [PATCH 083/623] Txtime2

---
 src/komodo_bitcoind.h | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7072781ba..cb7ef6c65 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -580,6 +580,32 @@ uint32_t komodo_txtime(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
     return(tx.nLockTime);
 }
 
+uint32_t komodo_txtime2(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
+{
+    CTxDestination address; CBlockIndex *pindex; CTransaction tx; uint256 hashBlock; uint32_t txtime = 0;
+    *valuep = 0;
+    if (!GetTransaction(hash, tx,
+#ifndef KOMODO_ZCASH
+                        Params().GetConsensus(),
+#endif
+                        hashBlock, true))
+    {
+        //fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
+        return(0);
+    }
+    if ( (pindex= mapBlockIndex[block->GetHash()]) != 0 )
+        txtime = pindex->nTime;
+    else txtime = tx.nLockTime;
+    //fprintf(stderr,"%s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
+    if ( n < tx.vout.size() )
+    {
+        *valuep = tx.vout[n].nValue;
+        if (ExtractDestination(tx.vout[n].scriptPubKey, address))
+            strcpy(destaddr,CBitcoinAddress(address).ToString().c_str());
+    }
+    return(txtime);
+}
+
 void komodo_disconnect(CBlockIndex *pindex,CBlock& block)
 {
     char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
@@ -1139,8 +1165,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
     CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
-    txtime = komodo_txtime(&value,txid,vout,address);
-    txtime -= KOMODO_MAXMEMPOOLTIME;
+    txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
     if ( blocktime < prevtime+3 )

From cc08cccff2682eedb5e30afa6e0385ef1d217674 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 05:40:48 -1100
Subject: [PATCH 084/623] Fix

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index cb7ef6c65..08c43c468 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -593,7 +593,7 @@ uint32_t komodo_txtime2(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
         //fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
         return(0);
     }
-    if ( (pindex= mapBlockIndex[block->GetHash()]) != 0 )
+    if ( (pindex= mapBlockIndex[pindex->GetHash()]) != 0 )
         txtime = pindex->nTime;
     else txtime = tx.nLockTime;
     //fprintf(stderr,"%s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);

From 85bf0316b012d54a2494ac264ef71462b4121828 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 05:42:03 -1100
Subject: [PATCH 085/623] Fix

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 08c43c468..7beb0db42 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -593,7 +593,7 @@ uint32_t komodo_txtime2(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
         //fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
         return(0);
     }
-    if ( (pindex= mapBlockIndex[pindex->GetHash()]) != 0 )
+    if ( (pindex= mapBlockIndex[pindex->GetBlockHash()]) != 0 )
         txtime = pindex->nTime;
     else txtime = tx.nLockTime;
     //fprintf(stderr,"%s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);

From ec894008176b9054daad5e24edb4a7182b5f58a0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:07:01 -1100
Subject: [PATCH 086/623] Fix

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7beb0db42..4f0698038 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -593,7 +593,7 @@ uint32_t komodo_txtime2(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
         //fprintf(stderr,"ERROR: %s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
         return(0);
     }
-    if ( (pindex= mapBlockIndex[pindex->GetBlockHash()]) != 0 )
+    if ( (pindex= mapBlockIndex[hashBlock]) != 0 )
         txtime = pindex->nTime;
     else txtime = tx.nLockTime;
     //fprintf(stderr,"%s/v%d locktime.%u\n",hash.ToString().c_str(),n,(uint32_t)tx.nLockTime);
@@ -1172,7 +1172,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         blocktime = prevtime+3;
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
-        //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
+        fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
     if ( value < SATOSHIDEN )

From bfa19436af5f4672c8d9505a1e7640efa0e5c2de Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:21:41 -1100
Subject: [PATCH 087/623] Test

---
 src/komodo_bitcoind.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 4f0698038..95b4f6e47 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1164,7 +1164,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    CBlockIndex *pindex; bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
@@ -1182,7 +1182,6 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     ratio = (mindiff / bnTarget);
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
-    pindex = 0;
     vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
     segid = ((nHeight + addrhash.uints[0]) & 0x3f);
     komodo_segids(hashbuf,nHeight-101,100);
@@ -1195,11 +1194,13 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         diff = (iter + blocktime - txtime - minage);
         if ( diff > 3600*24*30 )
             diff = 3600*24*30;
+        else if ( diff < 0 )
+            diff = 60;
         if ( iter > 0 )
             diff += segid*2;
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
-        coinage = (value * diff) * ((diff >> 16) + 1);
+        coinage = (value * diff);
         hashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
         if ( hashval <= bnTarget )
         {
@@ -1233,7 +1234,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         fprintf(stderr," vs ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,dstr(value),(int32_t)diff);
+        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);
     }
     if ( nHeight < 10 )
         return(blocktime);

From 5e90f44589025333edb436302287991edc0d517d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:32:27 -1100
Subject: [PATCH 088/623] Test

---
 src/komodo_bitcoind.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 95b4f6e47..c053285a7 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1193,7 +1193,10 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     {
         diff = (iter + blocktime - txtime - minage);
         if ( diff > 3600*24*30 )
+        {
+            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",diff,iter,blocktime,txtime,minage);
             diff = 3600*24*30;
+        }
         else if ( diff < 0 )
             diff = 60;
         if ( iter > 0 )

From b9ed7fa848605b8a09231138085c36c646679cc0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:34:12 -1100
Subject: [PATCH 089/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index c053285a7..f10c34b3f 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1194,7 +1194,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         diff = (iter + blocktime - txtime - minage);
         if ( diff > 3600*24*30 )
         {
-            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",diff,iter,blocktime,txtime,minage);
+            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",diff,iter,blocktime,txtime,(int32_t)minage);
             diff = 3600*24*30;
         }
         else if ( diff < 0 )

From 745a8dfc5dbb5e8c7e5fda32b1ddec422341c4f4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:36:54 -1100
Subject: [PATCH 090/623] Test

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f10c34b3f..28b8d4368 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1164,7 +1164,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage,supply = ASSETCHAINS_SUPPLY + nHeight*ASSETCHAINS_REWARD/SATOSHIDEN;
+    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
@@ -1194,7 +1194,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         diff = (iter + blocktime - txtime - minage);
         if ( diff > 3600*24*30 )
         {
-            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",diff,iter,blocktime,txtime,(int32_t)minage);
+            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",(int32_t)diff,iter,blocktime,txtime,(int32_t)minage);
             diff = 3600*24*30;
         }
         else if ( diff < 0 )

From f6567e80078d9bab45e0f61186349dc30647f966 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:44:04 -1100
Subject: [PATCH 091/623] Test

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 28b8d4368..599b6b44e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1192,13 +1192,13 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     for (iter=0; iter<3600; iter++)
     {
         diff = (iter + blocktime - txtime - minage);
-        if ( diff > 3600*24*30 )
+        if ( diff < 0 )
+            diff = 60;
+        else if ( diff > 3600*24*30 )
         {
             printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",(int32_t)diff,iter,blocktime,txtime,(int32_t)minage);
             diff = 3600*24*30;
         }
-        else if ( diff < 0 )
-            diff = 60;
         if ( iter > 0 )
             diff += segid*2;
         if ( blocktime+iter+segid*2 < txtime+minage )

From 0999e80e0edbcd0376a18e2087989c43dd9def14 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:50:26 -1100
Subject: [PATCH 092/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 599b6b44e..d942d3078 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1164,7 +1164,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int64_t diff=0; int32_t segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
+    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();

From 01994dbac72583b7ffd101a1ce33adc990ba9480 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 06:57:20 -1100
Subject: [PATCH 093/623] Test

---
 src/komodo_bitcoind.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d942d3078..856e22e7d 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1172,7 +1172,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         blocktime = prevtime+3;
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
-        fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
+        //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
         return(0);
     }
     if ( value < SATOSHIDEN )
@@ -1196,7 +1196,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             diff = 60;
         else if ( diff > 3600*24*30 )
         {
-            printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",(int32_t)diff,iter,blocktime,txtime,(int32_t)minage);
+            //printf("diff.%d (iter.%d blocktime.%u txtime.%u minage.%d)\n",(int32_t)diff,iter,blocktime,txtime,(int32_t)minage);
             diff = 3600*24*30;
         }
         if ( iter > 0 )
@@ -1217,20 +1217,17 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
         if ( validateflag != 0 )
         {
-            /*for (i=31; i>=0; i--)
-                fprintf(stderr,"%02x",((uint8_t *)&ratio)[i]);
-            fprintf(stderr," ratio -> ");
             for (i=31; i>=24; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-            fprintf(stderr," vs target ");
+            fprintf(stderr," vs ");
             for (i=31; i>=24; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d gap.%d %.8f diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,(int32_t)(blocktime - prevtime),dstr(value),(int32_t)diff);*/
+            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);
             break;
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 1 )
+    if ( 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From 26b9af8048b43fa5c9f0e6a5c25b993689645901 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 07:06:04 -1100
Subject: [PATCH 094/623] Prints

---
 src/komodo_bitcoind.h    | 6 +++---
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 856e22e7d..e667ae280 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1217,17 +1217,17 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
         if ( validateflag != 0 )
         {
-            for (i=31; i>=24; i--)
+            /*for (i=31; i>=24; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
             fprintf(stderr," vs ");
             for (i=31; i>=24; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);
+            fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);*/
             break;
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 0 )
+    if ( validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1e330b20c..5151936c4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4645,7 +4645,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             {
                 if ( eligible != komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime,(char *)CBitcoinAddress(address).ToString().c_str()) )
                 {
-                    //fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                    fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
                 }
                 else if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
                 {

From 4dc0ad386693422611dee60bf75ae8ca85b6b5f1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 07:15:24 -1100
Subject: [PATCH 095/623] -print

---
 src/komodo_bitcoind.h    | 4 ++--
 src/wallet/rpcwallet.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e667ae280..9872275e1 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1227,14 +1227,14 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( validateflag != 0 )
+    if ( validateflag > 1 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
         fprintf(stderr," vs ");
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);
+        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d ht.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff,nHeight);
     }
     if ( nHeight < 10 )
         return(blocktime);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5151936c4..a3559fc00 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4645,7 +4645,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             {
                 if ( eligible != komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime,(char *)CBitcoinAddress(address).ToString().c_str()) )
                 {
-                    fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                    //fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
                 }
                 else if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
                 {
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    //fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 9aa243103f25b465873f3ddc8e8bd2e179a2fa44 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 07:20:45 -1100
Subject: [PATCH 096/623] Test

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 9872275e1..3eac19dff 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1328,7 +1328,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
 int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_uint256 bnTarget)
 {
     CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
-    if ( ASSETCHAINS_STAKED == 100 && height < 200 )
+    if ( ASSETCHAINS_STAKED == 100 && height <= 10 )
         return(1);
     txn_count = pblock->vtx.size();
     if ( txn_count > 1 && pblock->vtx[txn_count-1].vin.size() == 1 && pblock->vtx[txn_count-1].vout.size() == 1 )
@@ -1438,7 +1438,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     {
         if ( (is_PoSblock= komodo_is_PoSblock(slowflag,height,pblock,bnTarget)) == 0 )
         {
-            if ( ASSETCHAINS_STAKED == 100 && height > 130 )  // only PoS allowed! POSTEST64
+            if ( ASSETCHAINS_STAKED == 100 && height > 100 )  // only PoS allowed! POSTEST64
                 return(-1);
             else
             {

From 8316bde87de5d4fb4b67d6c46bdf365c1969fd23 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 07:27:12 -1100
Subject: [PATCH 097/623] Test

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 3eac19dff..9076ef125 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1227,7 +1227,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( validateflag > 1 )
+    if ( validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
@@ -1345,7 +1345,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
             eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
-                //fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
+                fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
             } else isPoS = 1;
         }
         if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx

From 0c974f218db513b2660f7e6b4c691fa2b34efdd5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 07:31:01 -1100
Subject: [PATCH 098/623] +print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a3559fc00..1e330b20c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    //fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 5a7fd132cf5080d572423a48e761e90fc499f6ea Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 09:54:28 -1100
Subject: [PATCH 099/623] Fix estimate PoS perc

---
 src/komodo_bitcoind.h | 1 +
 src/miner.cpp         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 9076ef125..1c0a6414d 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1269,6 +1269,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
             }
             else
             {
+                n++;
                 percPoS++;
                 if ( ASSETCHAINS_STAKED < 100 )
                     fprintf(stderr,"0");
diff --git a/src/miner.cpp b/src/miner.cpp
index 9ca979e07..c837268f9 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -784,7 +784,7 @@ void static BitcoinMiner()
             if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_STAKED == 0 )
             {
                 //fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
-                sleep(3);
+                //sleep(3);
             }
 #ifdef ENABLE_WALLET
             CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey,pindexPrev->nHeight+1,gpucount);
@@ -976,11 +976,11 @@ void static BitcoinMiner()
                     {
                         while ( B.nTime-57 > GetAdjustedTime() )
                             sleep(1);
-                        if ( Mining_height < 6000 )
+                        /*if ( Mining_height < 6000 )
                         {
                             while ( B.nTime > GetAdjustedTime() )
                                 sleep(1);
-                        }
+                        }*/
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From d5a38d16a8866207cb96ab96f6a99befd3bb8c93 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 10 Jul 2018 11:17:30 -1100
Subject: [PATCH 100/623] +print

---
 src/miner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index c837268f9..8824959e1 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -939,7 +939,7 @@ void static BitcoinMiner()
                     solutionTargetChecks.increment();
                     B = *pblock;
                     h = UintToArith256(B.GetHash());
-                    /*for (z=31; z>=16; z--)
+                    for (z=31; z>=16; z--)
                         fprintf(stderr,"%02x",((uint8_t *)&h)[z]);
                     fprintf(stderr," mined ");
                     for (z=31; z>=16; z--)
@@ -947,7 +947,7 @@ void static BitcoinMiner()
                     fprintf(stderr," hashTarget ");
                     for (z=31; z>=16; z--)
                         fprintf(stderr,"%02x",((uint8_t *)&HASHTarget_POW)[z]);
-                    fprintf(stderr," POW\n");*/
+                    fprintf(stderr," POW\n");
                     if ( h > hashTarget )
                         return false;
                     if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )

From afdcba6b470d707f5d0f5f182690d4031b5349ed Mon Sep 17 00:00:00 2001
From: Christoph Ritzer <christoph@bitpanda.com>
Date: Wed, 11 Jul 2018 13:35:48 +0200
Subject: [PATCH 101/623] remove a bad alert

---
 src/Makefile.test.include |   1 -
 src/init.cpp              |   5 -
 src/test/alert_tests.cpp  | 447 --------------------------------------
 3 files changed, 453 deletions(-)
 delete mode 100644 src/test/alert_tests.cpp

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index ff270bd6a..a52b66335 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -45,7 +45,6 @@ BITCOIN_TESTS =\
 	test/arith_uint256_tests.cpp \
 	test/bignum.h \
 	test/addrman_tests.cpp \
-	test/alert_tests.cpp \
 	test/allocator_tests.cpp \
 	test/base32_tests.cpp \
 	test/base58_tests.cpp \
diff --git a/src/init.cpp b/src/init.cpp
index 1b8018b56..a9bdc6151 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1756,11 +1756,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     StartNode(threadGroup, scheduler);
 
-    // Monitor the chain, and alert if we get blocks much quicker or slower than expected
-    int64_t nPowTargetSpacing = Params().GetConsensus().nPowTargetSpacing;
-    CScheduler::Function f = boost::bind(&PartitionCheck, &IsInitialBlockDownload,
-                                         boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing);
-    scheduler.scheduleEvery(f, nPowTargetSpacing);
 
 #ifdef ENABLE_MINING
     // Generate coins in the background
diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp
deleted file mode 100644
index ef607dacc..000000000
--- a/src/test/alert_tests.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright (c) 2013 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-//
-// Unit tests for alert system
-//
-
-#include "alert.h"
-#include "chain.h"
-#include "chainparams.h"
-#include "clientversion.h"
-#include "data/alertTests.raw.h"
-
-#include "main.h"
-#include "rpcprotocol.h"
-#include "rpcserver.h"
-#include "serialize.h"
-#include "streams.h"
-#include "util.h"
-#include "utilstrencodings.h"
-
-#include "test/test_bitcoin.h"
-
-#include <fstream>
-
-#include <boost/filesystem/operations.hpp>
-#include <boost/foreach.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "key.h"
-#include "alertkeys.h"
-#include <iostream>
-
-/*
- * If the alert key pairs have changed, the test suite will fail as the
- * test data is now invalid.  To create valid test data, signed with a
- * new alert private key, follow these steps:
- *
- * 1. Copy your private key into alertkeys.h.  Don't commit this file!
- *    See sendalert.cpp for more info.
- *
- * 2. Set the GENERATE_ALERTS_FLAG to true.
- *
- * 3. Build and run:
- *    test_bitcoin -t Generate_Alert_Test_Data
- *
- * 4. Test data is saved in your current directory as alertTests.raw.NEW
- *    Copy this file to: src/test/data/alertTests.raw
- *
- *    For debugging purposes, terminal output can be copied into:
- *    src/test/data/alertTests.raw.h
- *
- * 5. Clean up...
- *    - Set GENERATE_ALERTS_FLAG back to false.
- *    - Remove your private key from alertkeys.h
- *
- * 6. Build and verify the new test data:
- *    test_bitcoin -t Alert_tests
- *
- */
-#define GENERATE_ALERTS_FLAG false
-
-#if GENERATE_ALERTS_FLAG
-
-// NOTE:
-// A function SignAndSave() was used by Bitcoin Core to create alert test data
-// but it has not been made publicly available.  So instead, we have adapted
-// some publicly available code which achieves the intended result:
-// https://gist.github.com/lukem512/9b272bd35e2cdefbf386
-
-
-// Code to output a C-style array of values
-template<typename T>
-std::string HexStrArray(const T itbegin, const T itend, int lineLength)
-{
-    std::string rv;
-    static const char hexmap[16] = { '0', '1', '2', '3', '4', '5', '6', '7',
-                                     '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-    rv.reserve((itend-itbegin)*3);
-    int i = 0;
-    for(T it = itbegin; it < itend; ++it)
-    {
-        unsigned char val = (unsigned char)(*it);
-        if(it != itbegin)
-        {
-            if (i % lineLength == 0)
-                rv.push_back('\n');
-            else
-                rv.push_back(' ');
-        }
-        rv.push_back('0');
-        rv.push_back('x');
-        rv.push_back(hexmap[val>>4]);
-        rv.push_back(hexmap[val&15]);
-        rv.push_back(',');
-        i++;
-    }
-
-    return rv;
-}
-
-template<typename T>
-inline std::string HexStrArray(const T& vch, int lineLength)
-{
-    return HexStrArray(vch.begin(), vch.end(), lineLength);
-}
-
-
-// Sign CAlert with alert private key
-bool SignAlert(CAlert &alert)
-{
-    // serialize alert data
-    CDataStream sMsg(SER_NETWORK, PROTOCOL_VERSION);
-    sMsg << *(CUnsignedAlert*)&alert;
-    alert.vchMsg = std::vector<unsigned char>(sMsg.begin(), sMsg.end());
-
-    // sign alert
-    std::vector<unsigned char> vchTmp(ParseHex(pszPrivKey));
-    CPrivKey vchPrivKey(vchTmp.begin(), vchTmp.end());
-    CKey key;
-    if (!key.SetPrivKey(vchPrivKey, false))
-    {
-        printf("key.SetPrivKey failed\n");
-        return false;
-    }
-    if (!key.Sign(Hash(alert.vchMsg.begin(), alert.vchMsg.end()), alert.vchSig))
-    {
-        printf("SignAlert() : key.Sign failed\n");
-        return false;
-    }
-    return true;
-}
-
-// Sign a CAlert and serialize it
-bool SignAndSerialize(CAlert &alert, CDataStream &buffer)
-{
-    // Sign
-    if(!SignAlert(alert))
-    {
-        printf("SignAndSerialize() : could not sign alert\n");
-        return false;
-    }
-    // ...and save!
-    buffer << alert;
-    return true;
-}
-
-void GenerateAlertTests()
-{
-    CDataStream sBuffer(SER_DISK, CLIENT_VERSION);
-
-    CAlert alert;
-    alert.nRelayUntil   = 60;
-    alert.nExpiration   = 24 * 60 * 60;
-    alert.nID           = 1;
-    alert.nCancel       = 0;  // cancels previous messages up to this ID number
-    alert.nMinVer       = 0;  // These versions are protocol versions
-    alert.nMaxVer       = 999001;
-    alert.nPriority     = 1;
-    alert.strComment    = "Alert comment";
-    alert.strStatusBar  = "Alert 1";
-
-    // Replace SignAndSave with SignAndSerialize
-    SignAndSerialize(alert, sBuffer);
-
-    // More tests go here ...
-    alert.setSubVer.insert(std::string("/MagicBean:0.1.0/"));
-    alert.strStatusBar  = "Alert 1 for MagicBean 0.1.0";
-    SignAndSerialize(alert, sBuffer);
-
-    alert.setSubVer.insert(std::string("/MagicBean:0.2.0/"));
-    alert.strStatusBar  = "Alert 1 for MagicBean 0.1.0, 0.2.0";
-    SignAndSerialize(alert, sBuffer);
-
-    alert.setSubVer.clear();
-    ++alert.nID;
-    alert.nCancel = 1;
-    alert.nPriority = 100;
-    alert.strStatusBar  = "Alert 2, cancels 1";
-    SignAndSerialize(alert, sBuffer);
-
-    alert.nExpiration += 60;
-    ++alert.nID;
-    SignAndSerialize(alert, sBuffer);
-
-    ++alert.nID;
-    alert.nPriority = 5000;
-    alert.strStatusBar  = "Alert 3, disables RPC";
-    alert.strRPCError = "RPC disabled";
-    SignAndSerialize(alert, sBuffer);
-
-    ++alert.nID;
-    alert.nPriority = 5000;
-    alert.strStatusBar  = "Alert 4, re-enables RPC";
-    alert.strRPCError = "";
-    SignAndSerialize(alert, sBuffer);
-
-    ++alert.nID;
-    alert.nMinVer = 11;
-    alert.nMaxVer = 22;
-    alert.nPriority = 100;
-    SignAndSerialize(alert, sBuffer);
-
-    ++alert.nID;
-    alert.strStatusBar  = "Alert 2 for MagicBean 0.1.0";
-    alert.setSubVer.insert(std::string("/MagicBean:0.1.0/"));
-    SignAndSerialize(alert, sBuffer);
-
-    ++alert.nID;
-    alert.nMinVer = 0;
-    alert.nMaxVer = 999999;
-    alert.strStatusBar  = "Evil Alert'; /bin/ls; echo '";
-    alert.setSubVer.clear();
-    bool b = SignAndSerialize(alert, sBuffer);
-
-    if (b) {
-        // Print the hex array, which will become the contents of alertTest.raw.h
-        std::vector<unsigned char> vch = std::vector<unsigned char>(sBuffer.begin(), sBuffer.end());
-        printf("%s\n", HexStrArray(vch, 8).c_str());
-
-        // Write the data to alertTests.raw.NEW, to be copied to src/test/data/alertTests.raw
-        std::ofstream outfile("alertTests.raw.NEW", std::ios::out | std::ios::binary);
-        outfile.write((const char*)&vch[0], vch.size());
-        outfile.close();
-    }
-}
-
-
-
-struct GenerateAlertTestsFixture : public TestingSetup {
-  GenerateAlertTestsFixture() {}
-  ~GenerateAlertTestsFixture() {}
-};
-
-BOOST_FIXTURE_TEST_SUITE(Generate_Alert_Test_Data, GenerateAlertTestsFixture);
-BOOST_AUTO_TEST_CASE(GenerateTheAlertTests)
-{
-    GenerateAlertTests();
-}
-BOOST_AUTO_TEST_SUITE_END()
-
-
-#else
-
-
-struct ReadAlerts : public TestingSetup
-{
-    ReadAlerts()
-    {
-        std::vector<unsigned char> vch(alert_tests::alertTests, alert_tests::alertTests + sizeof(alert_tests::alertTests));
-        CDataStream stream(vch, SER_DISK, CLIENT_VERSION);
-        try {
-            while (!stream.eof())
-            {
-                CAlert alert;
-                stream >> alert;
-                alerts.push_back(alert);
-            }
-        }
-        catch (const std::exception&) { }
-    }
-    ~ReadAlerts() { }
-
-    static std::vector<std::string> read_lines(boost::filesystem::path filepath)
-    {
-        std::vector<std::string> result;
-
-        std::ifstream f(filepath.string().c_str());
-        std::string line;
-        while (std::getline(f,line))
-            result.push_back(line);
-
-        return result;
-    }
-
-    std::vector<CAlert> alerts;
-};
-
-BOOST_FIXTURE_TEST_SUITE(Alert_tests, ReadAlerts)
-
-
-BOOST_AUTO_TEST_CASE(AlertApplies)
-{
-    SetMockTime(11);
-    const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
-
-    BOOST_FOREACH(const CAlert& alert, alerts)
-    {
-        BOOST_CHECK(alert.CheckSignature(alertKey));
-    }
-
-    BOOST_CHECK(alerts.size() >= 3);
-
-    // Matches:
-    BOOST_CHECK(alerts[0].AppliesTo(1, ""));
-    BOOST_CHECK(alerts[0].AppliesTo(999001, ""));
-    BOOST_CHECK(alerts[0].AppliesTo(1, "/MagicBean:11.11.11/"));
-
-    BOOST_CHECK(alerts[1].AppliesTo(1, "/MagicBean:0.1.0/"));
-    BOOST_CHECK(alerts[1].AppliesTo(999001, "/MagicBean:0.1.0/"));
-
-    BOOST_CHECK(alerts[2].AppliesTo(1, "/MagicBean:0.1.0/"));
-    BOOST_CHECK(alerts[2].AppliesTo(1, "/MagicBean:0.2.0/"));
-
-    // Don't match:
-    BOOST_CHECK(!alerts[0].AppliesTo(-1, ""));
-    BOOST_CHECK(!alerts[0].AppliesTo(999002, ""));
-
-    BOOST_CHECK(!alerts[1].AppliesTo(1, ""));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "MagicBean:0.1.0"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "/MagicBean:0.1.0"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "MagicBean:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(-1, "/MagicBean:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(999002, "/MagicBean:0.1.0/"));
-    BOOST_CHECK(!alerts[1].AppliesTo(1, "/MagicBean:0.2.0/"));
-
-    BOOST_CHECK(!alerts[2].AppliesTo(1, "/MagicBean:0.3.0/"));
-
-    SetMockTime(0);
-}
-
-
-BOOST_AUTO_TEST_CASE(AlertNotify)
-{
-    SetMockTime(11);
-    const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
-
-    boost::filesystem::path temp = GetTempPath() /
-        boost::filesystem::unique_path("alertnotify-%%%%.txt");
-
-    mapArgs["-alertnotify"] = std::string("echo %s >> ") + temp.string();
-
-    BOOST_FOREACH(CAlert alert, alerts)
-        alert.ProcessAlert(alertKey, false);
-
-    std::vector<std::string> r = read_lines(temp);
-    BOOST_CHECK_EQUAL(r.size(), 6u);
-
-// Windows built-in echo semantics are different than posixy shells. Quotes and
-// whitespace are printed literally.
-
-#ifndef _WIN32
-    BOOST_CHECK_EQUAL(r[0], "Alert 1");
-    BOOST_CHECK_EQUAL(r[1], "Alert 2, cancels 1");
-    BOOST_CHECK_EQUAL(r[2], "Alert 2, cancels 1");
-    BOOST_CHECK_EQUAL(r[3], "Alert 3, disables RPC");
-    BOOST_CHECK_EQUAL(r[4], "Alert 4, reenables RPC"); // dashes should be removed
-    BOOST_CHECK_EQUAL(r[5], "Evil Alert; /bin/ls; echo "); // single-quotes should be removed
-#else
-    BOOST_CHECK_EQUAL(r[0], "'Alert 1' ");
-    BOOST_CHECK_EQUAL(r[1], "'Alert 2, cancels 1' ");
-    BOOST_CHECK_EQUAL(r[2], "'Alert 2, cancels 1' ");
-    BOOST_CHECK_EQUAL(r[3], "'Alert 3, disables RPC' ");
-    BOOST_CHECK_EQUAL(r[4], "'Alert 4, reenables RPC' "); // dashes should be removed
-    BOOST_CHECK_EQUAL(r[5], "'Evil Alert; /bin/ls; echo ' ");
-#endif
-    boost::filesystem::remove(temp);
-
-    SetMockTime(0);
-    mapAlerts.clear();
-}
-
-BOOST_AUTO_TEST_CASE(AlertDisablesRPC)
-{
-    SetMockTime(11);
-    const std::vector<unsigned char>& alertKey = Params(CBaseChainParams::MAIN).AlertKey();
-
-    // Command should work before alerts
-    BOOST_CHECK_EQUAL(GetWarnings("rpc"), "");
-
-    // First alert should disable RPC
-    alerts[5].ProcessAlert(alertKey, false);
-    BOOST_CHECK_EQUAL(alerts[5].strRPCError, "RPC disabled");
-    BOOST_CHECK_EQUAL(GetWarnings("rpc"), "RPC disabled");
-
-    // Second alert should re-enable RPC
-    alerts[6].ProcessAlert(alertKey, false);
-    BOOST_CHECK_EQUAL(alerts[6].strRPCError, "");
-    BOOST_CHECK_EQUAL(GetWarnings("rpc"), "");
-
-    SetMockTime(0);
-    mapAlerts.clear();
-}
-
-static bool falseFunc() { return false; }
-
-BOOST_AUTO_TEST_CASE(PartitionAlert)
-{
-    // Test PartitionCheck
-    CCriticalSection csDummy;
-    CBlockIndex indexDummy[400];
-    CChainParams& params = Params(CBaseChainParams::MAIN);
-    int64_t nPowTargetSpacing = params.GetConsensus().nPowTargetSpacing;
-
-    // Generate fake blockchain timestamps relative to
-    // an arbitrary time:
-    int64_t now = 1427379054;
-    SetMockTime(now);
-    for (int i = 0; i < 400; i++)
-    {
-        indexDummy[i].phashBlock = NULL;
-        if (i == 0) indexDummy[i].pprev = NULL;
-        else indexDummy[i].pprev = &indexDummy[i-1];
-        indexDummy[i].nHeight = i;
-        indexDummy[i].nTime = now - (400-i)*nPowTargetSpacing;
-        // Other members don't matter, the partition check code doesn't
-        // use them
-    }
-
-    // Test 1: chain with blocks every nPowTargetSpacing seconds,
-    // as normal, no worries:
-    PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
-    BOOST_CHECK(strMiscWarning.empty());
-
-    // Test 2: go 3.5 hours without a block, expect a warning:
-    now += 3*60*60+30*60;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
-
-    // Test 3: test the "partition alerts only go off once per day"
-    // code:
-    now += 60*10;
-    SetMockTime(now);
-    PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
-    BOOST_CHECK(strMiscWarning.empty());
-
-    // Test 4: get 2.5 times as many blocks as expected:
-    now += 60*60*24; // Pretend it is a day later
-    SetMockTime(now);
-    int64_t quickSpacing = nPowTargetSpacing*2/5;
-    for (int i = 0; i < 400; i++) // Tweak chain timestamps:
-        indexDummy[i].nTime = now - (400-i)*quickSpacing;
-    PartitionCheck(falseFunc, csDummy, &indexDummy[399], nPowTargetSpacing);
-    BOOST_CHECK(!strMiscWarning.empty());
-    BOOST_TEST_MESSAGE(std::string("Got alert text: ")+strMiscWarning);
-    strMiscWarning = "";
-
-    SetMockTime(0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-#endif

From 1cdb961ba26865efb46b30eb1daa61327d7cea28 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 02:51:42 -1100
Subject: [PATCH 102/623] Fix PoW mining in mixed PoS/PoW, fix orphaned stake
 tx

---
 src/chain.h                 | 26 ++++++++++++++++++++++++++
 src/komodo_bitcoind.h       | 15 +++++++++------
 src/main.cpp                | 28 ++++++++++++++++++++++------
 src/miner.cpp               |  4 ++--
 src/validationinterface.cpp |  4 ++++
 src/validationinterface.h   |  1 +
 src/wallet/wallet.cpp       | 12 ++++++++++++
 src/wallet/wallet.h         |  1 +
 8 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index a28e4e44a..e2b03c4df 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -16,6 +16,7 @@
 
 #include <boost/foreach.hpp>
 
+uint32_t komodo_txtime(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr);
 static const int SPROUT_VALUE_VERSION = 1001400;
 
 struct CDiskBlockPos
@@ -321,6 +322,31 @@ public:
     //! Efficiently find an ancestor of this block.
     CBlockIndex* GetAncestor(int height);
     const CBlockIndex* GetAncestor(int height) const;
+
+    bool IsPOSBlock() const
+    {
+        if ( ASSETCHAINS_STAKED != 0 )
+        {
+            int32_t n,vout; uint32_t txtime; uint64_t value; char voutaddr[64],destaddr[64]; CTxDestination voutaddress; uint256 txid;
+            const CBlockIndex *pindex = this;
+            if ( (n= pindex->vtx.size()) > 1 && pblock->vtx[n-1].vin.size() == 1 && pblock->vtx[n-1].vout.size() == 1 )
+            {
+                txid = pblock->vtx[n-1].vin[0].prevout.hash;
+                vout = pblock->vtx[n-1].vin[0].prevout.n;
+                txtime = komodo_txtime(&value,txid,vout,destaddr);
+                if ( ExtractDestination(pindex->vtx[n-1].vout[0].scriptPubKey,voutaddress) )
+                {
+                    strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
+                    if ( strcmp(destaddr,voutaddr) == 0 && pindex->vtx[n-1].vout[0].nValue == value )
+                    {
+                        fprintf(stderr,"is PoS block!\n");
+                        return(true);
+                    }
+                }
+            }
+        }
+        return(false);
+    }
 };
 
 /** Used to marshal pointers into hashes for db storage. */
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1c0a6414d..2c27589cc 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1328,7 +1328,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
 
 int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_uint256 bnTarget)
 {
-    CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible,isPoS = 0; uint64_t value; CTxDestination voutaddress;
+    CBlockIndex *previndex; char voutaddr[64],destaddr[64]; uint256 txid; uint32_t txtime,prevtime=0; int32_t vout,txn_count,eligible=0,isPoS = 0; uint64_t value; CTxDestination voutaddress;
     if ( ASSETCHAINS_STAKED == 100 && height <= 10 )
         return(1);
     txn_count = pblock->vtx.size();
@@ -1343,7 +1343,8 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
         vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
         if ( prevtime != 0 )
         {
-            eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
+            if ( pblock->IsPOSBlock() != 0 )
+                eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
                 fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
@@ -1351,14 +1352,16 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
         }
         if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx
         {
-            txtime = komodo_txtime(&value,txid,vout,destaddr);
+            if ( pblock->IsPOSBlock() != 0 )
+                isPoS = 1;
+            /*txtime = komodo_txtime(&value,txid,vout,destaddr);
             if ( ExtractDestination(pblock->vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )
             {
                 strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
                 if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[txn_count-1].vout[0].nValue == value )
                     isPoS = 1; // close enough for a pre-filter
                 //else fprintf(stderr,"komodo_is_PoSblock ht.%d (%s) != (%s) or %.8f != %.8f\n",height,destaddr,voutaddr,dstr(value),dstr(pblock->vtx[txn_count-1].vout[0].nValue));
-            } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);
+            } else fprintf(stderr,"komodo_is_PoSblock ht.%d couldnt extract voutaddress\n",height);*/
         } //else return(-1);
     }
     //fprintf(stderr,"slow.%d ht.%d isPoS.%d\n",slowflag,height,isPoS);
@@ -1443,10 +1446,10 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
                 return(-1);
             else
             {
+                if ( slowflag == 0 ) // need all past 100 blocks to calculate PoW target
+                    return(0);
                 if ( slowflag != 0 )
                     bnTarget = komodo_PoWtarget(&PoSperc,bnTarget,height,ASSETCHAINS_STAKED);
-                else if ( height > 100 )
-                    bnTarget = (bnTarget / arith_uint256(KOMODO_POWMINMULT)); // lower bound
                 if ( bhash > bnTarget )
                 {
                     for (i=31; i>=16; i--)
diff --git a/src/main.cpp b/src/main.cpp
index d4dfae7ae..bd6aef8ce 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3252,13 +3252,17 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
     if (!FlushStateToDisk(state, FLUSH_STATE_IF_NEEDED))
         return false;
     
-    if (!fBare) {
+    if (!fBare)
+    {
         // Resurrect mempool transactions from the disconnected block.
-        BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+        //BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+        for (int i = 0; i < block.vtx.size(); i++)
+        {
+            CTransaction &tx = block.vtx[i];
             // ignore validation errors in resurrected transactions
             list<CTransaction> removed;
             CValidationState stateDummy;
-            if (tx.IsCoinBase() || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
+            if (tx.IsCoinBase() || (block.IsPOSBlock() && (i == (block.vtx.size() - 1))) || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
                 mempool.remove(tx, removed, true);
         }
         if (anchorBeforeDisconnect != anchorAfterDisconnect) {
@@ -3275,11 +3279,23 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
     assert(pcoinsTip->GetAnchorAt(pcoinsTip->GetBestAnchor(), newTree));
     // Let wallets know transactions went from 1-confirmed to
     // 0-confirmed or conflicted:
-    BOOST_FOREACH(const CTransaction &tx, block.vtx) {
-        SyncWithWallets(tx, NULL);
-    }
+    //BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+    //    SyncWithWallets(tx, NULL);
+    //}
     // Update cached incremental witnesses
     //fprintf(stderr,"chaintip false\n");
+    for (int i = 0; i < block.vtx.size(); i++)
+    {
+        CTransaction &tx = block.vtx[i];
+        if (block.IsPOSBlock() && (i == (block.vtx.size() - 1)))
+        {
+            EraseFromWallets(tx.GetHash());
+        }
+        else
+        {
+            SyncWithWallets(tx, NULL);
+        }
+    }
     GetMainSignals().ChainTip(pindexDelete, &block, newTree, false);
     return true;
 }
diff --git a/src/miner.cpp b/src/miner.cpp
index 8824959e1..c837268f9 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -939,7 +939,7 @@ void static BitcoinMiner()
                     solutionTargetChecks.increment();
                     B = *pblock;
                     h = UintToArith256(B.GetHash());
-                    for (z=31; z>=16; z--)
+                    /*for (z=31; z>=16; z--)
                         fprintf(stderr,"%02x",((uint8_t *)&h)[z]);
                     fprintf(stderr," mined ");
                     for (z=31; z>=16; z--)
@@ -947,7 +947,7 @@ void static BitcoinMiner()
                     fprintf(stderr," hashTarget ");
                     for (z=31; z>=16; z--)
                         fprintf(stderr,"%02x",((uint8_t *)&HASHTarget_POW)[z]);
-                    fprintf(stderr," POW\n");
+                    fprintf(stderr," POW\n");*/
                     if ( h > hashTarget )
                         return false;
                     if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
index cd3e30f3d..a8e15db99 100644
--- a/src/validationinterface.cpp
+++ b/src/validationinterface.cpp
@@ -51,3 +51,7 @@ void UnregisterAllValidationInterfaces() {
 void SyncWithWallets(const CTransaction &tx, const CBlock *pblock) {
     g_signals.SyncTransaction(tx, pblock);
 }
+
+void EraseFromWallets(const uint256 &hash) {
+    g_signals.EraseTransaction(hash);
+}
diff --git a/src/validationinterface.h b/src/validationinterface.h
index 1855dacd7..a1f111753 100644
--- a/src/validationinterface.h
+++ b/src/validationinterface.h
@@ -28,6 +28,7 @@ void UnregisterValidationInterface(CValidationInterface* pwalletIn);
 void UnregisterAllValidationInterfaces();
 /** Push an updated transaction to all registered wallets */
 void SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL);
+void EraseFromWallets(const uint256 &hash);
 
 class CValidationInterface {
 protected:
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 10bf93598..1cf52d1b4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1358,6 +1358,18 @@ bool CWallet::IsFromMe(const uint256& nullifier) const
     return false;
 }
 
+void CWallet::EraseFromWallet(const uint256 &hash)
+{
+    if (!fFileBacked)
+        return;
+    {
+        LOCK(cs_wallet);
+        if (mapWallet.erase(hash))
+            CWalletDB(strWalletFile).EraseTx(hash);
+    }
+    return;
+}
+
 void CWallet::GetNoteWitnesses(std::vector<JSOutPoint> notes,
                                std::vector<boost::optional<ZCIncrementalWitness>>& witnesses,
                                uint256 &final_anchor)
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f77a55a04..f6c8563ef 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -995,6 +995,7 @@ public:
     bool UpdateNullifierNoteMap();
     void UpdateNullifierNoteMapWithTx(const CWalletTx& wtx);
     bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);
+    void EraseFromWallet(const uint256 &hash);
     void SyncTransaction(const CTransaction& tx, const CBlock* pblock);
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);
     void EraseFromWallet(const uint256 &hash);

From d1db09204a50e47ea882160c8bf1634a8900d42a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 02:58:41 -1100
Subject: [PATCH 103/623] Syntax

---
 src/chain.h           | 25 -------------------------
 src/komodo_bitcoind.h | 32 ++++++++++++++++++++++++++++----
 src/main.cpp          |  4 ++--
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index e2b03c4df..41cf28652 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -16,7 +16,6 @@
 
 #include <boost/foreach.hpp>
 
-uint32_t komodo_txtime(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr);
 static const int SPROUT_VALUE_VERSION = 1001400;
 
 struct CDiskBlockPos
@@ -323,30 +322,6 @@ public:
     CBlockIndex* GetAncestor(int height);
     const CBlockIndex* GetAncestor(int height) const;
 
-    bool IsPOSBlock() const
-    {
-        if ( ASSETCHAINS_STAKED != 0 )
-        {
-            int32_t n,vout; uint32_t txtime; uint64_t value; char voutaddr[64],destaddr[64]; CTxDestination voutaddress; uint256 txid;
-            const CBlockIndex *pindex = this;
-            if ( (n= pindex->vtx.size()) > 1 && pblock->vtx[n-1].vin.size() == 1 && pblock->vtx[n-1].vout.size() == 1 )
-            {
-                txid = pblock->vtx[n-1].vin[0].prevout.hash;
-                vout = pblock->vtx[n-1].vin[0].prevout.n;
-                txtime = komodo_txtime(&value,txid,vout,destaddr);
-                if ( ExtractDestination(pindex->vtx[n-1].vout[0].scriptPubKey,voutaddress) )
-                {
-                    strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
-                    if ( strcmp(destaddr,voutaddr) == 0 && pindex->vtx[n-1].vout[0].nValue == value )
-                    {
-                        fprintf(stderr,"is PoS block!\n");
-                        return(true);
-                    }
-                }
-            }
-        }
-        return(false);
-    }
 };
 
 /** Used to marshal pointers into hashes for db storage. */
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2c27589cc..ab7bad30f 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -606,6 +606,30 @@ uint32_t komodo_txtime2(uint64_t *valuep,uint256 hash,int32_t n,char *destaddr)
     return(txtime);
 }
 
+int32_t komodo_isPoS(CBlock *pblock)
+{
+    int32_t n,vout; uint32_t txtime; uint64_t value; char voutaddr[64],destaddr[64]; CTxDestination voutaddress; uint256 txid;
+    if ( ASSETCHAINS_STAKED != 0 )
+    {
+        if ( (n= pblock->vtx.size()) > 1 && pblock->vtx[n-1].vin.size() == 1 && pblock->vtx[n-1].vout.size() == 1 )
+        {
+            txid = pblock->vtx[n-1].vin[0].prevout.hash;
+            vout = pblock->vtx[n-1].vin[0].prevout.n;
+            txtime = komodo_txtime(&value,txid,vout,destaddr);
+            if ( ExtractDestination(pblock->vtx[n-1].vout[0].scriptPubKey,voutaddress) )
+            {
+                strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
+                if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[n-1].vout[0].nValue == value )
+                {
+                    fprintf(stderr,"is PoS block!\n");
+                    return(1);
+                }
+            }
+        }
+    }
+    return(0);
+}
+
 void komodo_disconnect(CBlockIndex *pindex,CBlock& block)
 {
     char symbol[KOMODO_ASSETCHAIN_MAXLEN],dest[KOMODO_ASSETCHAIN_MAXLEN]; struct komodo_state *sp;
@@ -1151,13 +1175,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            //fprintf(stderr,"%02x ",hashbuf[i]);
+            fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            //fprintf(stderr,"segids.%d\n",height);
+            fprintf(stderr,"segids.%d\n",height);
         }
     }
 }
@@ -1343,7 +1367,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
         vout = pblock->vtx[txn_count-1].vin[0].prevout.n;
         if ( prevtime != 0 )
         {
-            if ( pblock->IsPOSBlock() != 0 )
+            if ( komodo_isPoS(pblock) != 0 )
                 eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
@@ -1352,7 +1376,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
         }
         if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx
         {
-            if ( pblock->IsPOSBlock() != 0 )
+            if ( komodo_isPoS(pblock) != 0 )
                 isPoS = 1;
             /*txtime = komodo_txtime(&value,txid,vout,destaddr);
             if ( ExtractDestination(pblock->vtx[txn_count-1].vout[0].scriptPubKey,voutaddress) )
diff --git a/src/main.cpp b/src/main.cpp
index bd6aef8ce..ea18662aa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3262,7 +3262,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
             // ignore validation errors in resurrected transactions
             list<CTransaction> removed;
             CValidationState stateDummy;
-            if (tx.IsCoinBase() || (block.IsPOSBlock() && (i == (block.vtx.size() - 1))) || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
+            if (tx.IsCoinBase() || (komodo_isPoS((CBlock *)&block) != 0 && (i == (block.vtx.size() - 1))) || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
                 mempool.remove(tx, removed, true);
         }
         if (anchorBeforeDisconnect != anchorAfterDisconnect) {
@@ -3287,7 +3287,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
     for (int i = 0; i < block.vtx.size(); i++)
     {
         CTransaction &tx = block.vtx[i];
-        if (block.IsPOSBlock() && (i == (block.vtx.size() - 1)))
+        if (komodo_isPoS((CBlock *)&block) != 0 && (i == (block.vtx.size() - 1)))
         {
             EraseFromWallets(tx.GetHash());
         }

From 72953c8342459633b16e6a8f33523a0ba7099f83 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 03:00:38 -1100
Subject: [PATCH 104/623] Syntax

---
 src/wallet/wallet.cpp | 12 ------------
 src/wallet/wallet.h   |  1 -
 2 files changed, 13 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 1cf52d1b4..10bf93598 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1358,18 +1358,6 @@ bool CWallet::IsFromMe(const uint256& nullifier) const
     return false;
 }
 
-void CWallet::EraseFromWallet(const uint256 &hash)
-{
-    if (!fFileBacked)
-        return;
-    {
-        LOCK(cs_wallet);
-        if (mapWallet.erase(hash))
-            CWalletDB(strWalletFile).EraseTx(hash);
-    }
-    return;
-}
-
 void CWallet::GetNoteWitnesses(std::vector<JSOutPoint> notes,
                                std::vector<boost::optional<ZCIncrementalWitness>>& witnesses,
                                uint256 &final_anchor)
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index f6c8563ef..0c6a90840 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -998,7 +998,6 @@ public:
     void EraseFromWallet(const uint256 &hash);
     void SyncTransaction(const CTransaction& tx, const CBlock* pblock);
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);
-    void EraseFromWallet(const uint256 &hash);
     void WitnessNoteCommitment(
          std::vector<uint256> commitments,
          std::vector<boost::optional<ZCIncrementalWitness>>& witnesses,

From 333cf46c477808757d82ddd319b9730faf649d6a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 03:16:21 -1100
Subject: [PATCH 105/623] Accept duplicate height 1

---
 src/main.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ea18662aa..7529a9d98 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3262,7 +3262,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
             // ignore validation errors in resurrected transactions
             list<CTransaction> removed;
             CValidationState stateDummy;
-            if (tx.IsCoinBase() || (komodo_isPoS((CBlock *)&block) != 0 && (i == (block.vtx.size() - 1))) || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
+            if (tx.IsCoinBase() || ((i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0) || !AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
                 mempool.remove(tx, removed, true);
         }
         if (anchorBeforeDisconnect != anchorAfterDisconnect) {
@@ -3287,7 +3287,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) {
     for (int i = 0; i < block.vtx.size(); i++)
     {
         CTransaction &tx = block.vtx[i];
-        if (komodo_isPoS((CBlock *)&block) != 0 && (i == (block.vtx.size() - 1)))
+        if ( (i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0 )
         {
             EraseFromWallets(tx.GetHash());
         }
@@ -4094,7 +4094,12 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
         CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(chainParams.Checkpoints());
         int32_t notarized_height;
         if ( nHeight == 1 && chainActive.Tip() != 0 && chainActive.Tip()->nHeight > 1 )
+        {
+            CBlockIndex *heightblock = chainActive[nHeight];
+            if ( heightblock != 0 && heightblock->GetBlockHash() == hash )
+                return true;
             return(false);
+        }
         if ( nHeight != 0 )
         {
             if ( pcheckpoint != 0 && nHeight < pcheckpoint->nHeight )

From 42bbeb4f4db3b9850f93ced9b6edc52d763e75ce Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 03:21:28 -1100
Subject: [PATCH 106/623] Test

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7529a9d98..5f51a47c4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4098,7 +4098,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
             CBlockIndex *heightblock = chainActive[nHeight];
             if ( heightblock != 0 && heightblock->GetBlockHash() == hash )
                 return true;
-            return(false);
+            return state.DoS(1, error("%s: trying to change height 1 forbidden", __func__));
         }
         if ( nHeight != 0 )
         {

From 8808427254f402bcba651ae3838437bdd23470a3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 03:26:47 -1100
Subject: [PATCH 107/623] -print

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index ab7bad30f..366011db6 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -621,7 +621,7 @@ int32_t komodo_isPoS(CBlock *pblock)
                 strcpy(voutaddr,CBitcoinAddress(voutaddress).ToString().c_str());
                 if ( strcmp(destaddr,voutaddr) == 0 && pblock->vtx[n-1].vout[0].nValue == value )
                 {
-                    fprintf(stderr,"is PoS block!\n");
+                    //fprintf(stderr,"is PoS block!\n");
                     return(1);
                 }
             }
@@ -1181,7 +1181,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            fprintf(stderr,"segids.%d\n",height);
+            fprintf(stderr,"prevsegids.%d\n",height+n);
         }
     }
 }

From 6789cd6db6fcdbbc7a6d483e7ebfe64d33e4b191 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 03:28:12 -1100
Subject: [PATCH 108/623] -print

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 366011db6..25bd2b831 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1175,13 +1175,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            fprintf(stderr,"%02x ",hashbuf[i]);
+            //fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            fprintf(stderr,"prevsegids.%d\n",height+n);
+            //fprintf(stderr,"prevsegids.%d\n",height+n);
         }
     }
 }
@@ -1251,7 +1251,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( validateflag != 0 )
+    if ( 0 && validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From ce2b6b330c64fecb79bef0c9608c8c8b3e3690e9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 07:41:16 -1100
Subject: [PATCH 109/623] Steepen PoW diff easement

---
 src/komodo_bitcoind.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 25bd2b831..ddfe7c6eb 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1332,7 +1332,10 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     }
     else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget
     {
-        bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
+        //bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
+        bnTarget = (ave * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
+        if ( bnTarget > easydiff )
+            bnTarget = easydiff;
         if ( 1 )
         {
             for (i=31; i>=24; i--)

From 43ff67f5fceadd67d277ce2d028d00f65fd5097d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 08:57:03 -1100
Subject: [PATCH 110/623] Handle 100% PoS for -ac_target = < 100

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index ddfe7c6eb..e9bcb0389 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1313,7 +1313,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
         ave = (sum / arith_uint256(n));
         if ( ave > target )
             ave = target;
-    } else return(target);
+    } else ave = easydiff; //else return(target);
     if ( percPoS < goalperc ) // increase PoW diff -> lower bnTarget
     {
         bnTarget = (ave * arith_uint256(percPoS * percPoS)) / arith_uint256(goalperc * goalperc * goalperc);

From 4cc33bf81ee66f3e864b53c170663c440b44e80c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 09:10:51 -1100
Subject: [PATCH 111/623] Test

---
 src/komodo_bitcoind.h | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e9bcb0389..58b037a62 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1267,19 +1267,37 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
 
 arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc)
 {
-    CBlockIndex *pindex; arith_uint256 easydiff,bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,ht,percPoS,diff,val;
+    CBlockIndex *pindex; arith_uint256 easydiff,bnTarget,hashval,sum,ave; bool fNegative,fOverflow; int32_t i,n,m,ht,percPoS,diff,val;
     *percPoSp = percPoS = 0;
     if ( height <= 10 || (ASSETCHAINS_STAKED == 100 && height <= 100) )
         return(target);
     sum = arith_uint256(0);
     ave = sum;
     easydiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
-    for (i=n=0; i<100; i++)
+    for (i=n=m=0; i<100; i++)
     {
         ht = height - 100 + i;
         if ( ht <= 1 )
             continue;
         if ( (pindex= komodo_chainactive(ht)) != 0 )
+        {
+            if ( komodo_segid(ht) >= 0 )
+            {
+                n++;
+                percPoS++;
+                if ( ASSETCHAINS_STAKED < 100 )
+                    fprintf(stderr,"0");
+            }
+            else
+            {
+                if ( ASSETCHAINS_STAKED < 100 )
+                    fprintf(stderr,"1");
+                sum += hashval;
+                m++;
+                n++;
+            }
+        }
+        /*if ( (pindex= komodo_chainactive(ht)) != 0 )
         {
             bnTarget.SetCompact(pindex->nBits,&fNegative,&fOverflow);
             bnTarget = (bnTarget / arith_uint256(KOMODO_POWMINMULT));
@@ -1298,9 +1316,9 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
                 if ( ASSETCHAINS_STAKED < 100 )
                     fprintf(stderr,"0");
             }
-            if ( ASSETCHAINS_STAKED < 100 && (i % 10) == 9 )
-                fprintf(stderr," %d, ",percPoS);
-        }
+        }*/
+        if ( ASSETCHAINS_STAKED < 100 && (i % 10) == 9 )
+            fprintf(stderr," %d, ",percPoS);
     }
     if ( n < 100 )
         percPoS = ((percPoS * n) + (goalperc * (100-n))) / 100;
@@ -1308,9 +1326,9 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
         fprintf(stderr," -> %d%% percPoS vs goalperc.%d ht.%d\n",percPoS,goalperc,height);
     *percPoSp = percPoS;
     target = (target / arith_uint256(KOMODO_POWMINMULT));
-    if ( n > 0 )
+    if ( m > 0 )
     {
-        ave = (sum / arith_uint256(n));
+        ave = (sum / arith_uint256(m));
         if ( ave > target )
             ave = target;
     } else ave = easydiff; //else return(target);

From 153a7898146c872ac4647b4f68184670bf0d662c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 09:12:39 -1100
Subject: [PATCH 112/623] Neutral diff for PoW

---
 src/komodo_bitcoind.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 58b037a62..3eff2a882 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1104,9 +1104,8 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
  
  commission must be in coinbase.vout[1] and must be >= 10000 sats
  PoS stake must be without txfee and in the last tx in the block at vout[0]
- PoW mining on PoS chain must solve a harder diff that adjusts, but never less than KOMODO_POWMINMULT
  */
-#define KOMODO_POWMINMULT 16
+//#define KOMODO_POWMINMULT 16
 
 uint64_t komodo_commission(const CBlock *pblock)
 {
@@ -1325,7 +1324,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     if ( ASSETCHAINS_STAKED < 100 )
         fprintf(stderr," -> %d%% percPoS vs goalperc.%d ht.%d\n",percPoS,goalperc,height);
     *percPoSp = percPoS;
-    target = (target / arith_uint256(KOMODO_POWMINMULT));
+    //target = (target / arith_uint256(KOMODO_POWMINMULT));
     if ( m > 0 )
     {
         ave = (sum / arith_uint256(m));

From 9e1a6d76c4e0b72d1d0ffabb1888932ca08d50f8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 09:45:35 -1100
Subject: [PATCH 113/623] Fix null hashval

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 3eff2a882..f405f2571 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1291,7 +1291,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
             {
                 if ( ASSETCHAINS_STAKED < 100 )
                     fprintf(stderr,"1");
-                sum += hashval;
+                sum += UintToArith256(pindex->GetBlockHash());
                 m++;
                 n++;
             }

From ae2d90651b0651ac548bba99a934d91032b4e790 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 10:09:58 -1100
Subject: [PATCH 114/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f405f2571..afd1fe46e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1351,7 +1351,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     {
         //bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
         bnTarget = (ave * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
-        if ( bnTarget > easydiff )
+        if ( bnTarget > easydiff || bnTarget < ave )
             bnTarget = easydiff;
         if ( 1 )
         {

From ae67e0923cf3dc1ba3850b0999fea0700f6f0c65 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 10:58:42 -1100
Subject: [PATCH 115/623] Fix PoS estimator for first 100 blocks

---
 src/komodo_bitcoind.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index afd1fe46e..6656b8e25 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1293,7 +1293,6 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
                     fprintf(stderr,"1");
                 sum += UintToArith256(pindex->GetBlockHash());
                 m++;
-                n++;
             }
         }
         /*if ( (pindex= komodo_chainactive(ht)) != 0 )

From b6c80e46e31b3833d589a9699d91ff833ab89846 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 11:06:05 -1100
Subject: [PATCH 116/623] Test

---
 src/komodo_bitcoind.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6656b8e25..c48413575 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1348,10 +1348,11 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     }
     else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget
     {
-        //bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
         bnTarget = (ave * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
-        if ( bnTarget > easydiff || bnTarget < ave )
+        if ( bnTarget > easydiff )
             bnTarget = easydiff;
+        else if ( bnTarget < ave ) // overflow
+            bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
         if ( 1 )
         {
             for (i=31; i>=24; i--)

From 0fa08b81c9ce0b4df8feadcaba2581ed78ec29b4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 11:41:39 -1100
Subject: [PATCH 117/623] Fix PoSperc count

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index c48413575..7a50f3ce2 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1318,7 +1318,7 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
         if ( ASSETCHAINS_STAKED < 100 && (i % 10) == 9 )
             fprintf(stderr," %d, ",percPoS);
     }
-    if ( n < 100 )
+    if ( m+n < 100 )
         percPoS = ((percPoS * n) + (goalperc * (100-n))) / 100;
     if ( ASSETCHAINS_STAKED < 100 )
         fprintf(stderr," -> %d%% percPoS vs goalperc.%d ht.%d\n",percPoS,goalperc,height);

From 8ba2ae9e592d6b078b4a700b409f5a9cae07d503 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 12:46:10 -1100
Subject: [PATCH 118/623] One more underflow check

---
 src/komodo_bitcoind.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7a50f3ce2..785cfe6cf 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1352,7 +1352,11 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
         if ( bnTarget > easydiff )
             bnTarget = easydiff;
         else if ( bnTarget < ave ) // overflow
+        {
             bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
+            if ( bnTarget < ave )
+                bnTarget = ave;
+        }
         if ( 1 )
         {
             for (i=31; i>=24; i--)

From 6d2fc2903ee81ecbec27b83490a0044e13064c95 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 23:19:45 -1100
Subject: [PATCH 119/623] -stopat=<height>

---
 src/komodo_globals.h | 2 +-
 src/komodo_utils.h   | 1 +
 src/main.cpp         | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index c46486430..8dfc7108c 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -52,7 +52,7 @@ uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_PUBLIC
 
 char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN],ASSETCHAINS_USERPASS[4096];
 uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
-uint32_t ASSETCHAIN_INIT,ASSETCHAINS_CC;
+uint32_t ASSETCHAIN_INIT,ASSETCHAINS_CC,KOMODO_STOPAT;
 uint32_t ASSETCHAINS_MAGIC = 2387029918;
 uint64_t KOMODO_INTERESTSUM,KOMODO_WALLETBALANCE;
 uint64_t ASSETCHAINS_ENDSUBSIDY,ASSETCHAINS_REWARD,ASSETCHAINS_HALVING,ASSETCHAINS_DECAY,ASSETCHAINS_COMMISSION,ASSETCHAINS_STAKED,ASSETCHAINS_SUPPLY = 10;
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index f61fd05ea..8188a6154 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1539,6 +1539,7 @@ void komodo_args(char *argv0)
             }
         }
     }
+    KOMODO_STOPAT = GetArg("-stopat",0);
     ASSETCHAINS_CC = GetArg("-ac_cc",0);
     ASSETCHAINS_PUBLIC = GetArg("-ac_public",0);
     ASSETCHAINS_PRIVATE = GetArg("-ac_private",0);
diff --git a/src/main.cpp b/src/main.cpp
index 5f51a47c4..cfc97db81 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2691,7 +2691,8 @@ static int64_t nTimeTotal = 0;
 bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck,bool fCheckPOW)
 {
     const CChainParams& chainparams = Params();
-    
+    if ( KOMODO_STOPAT != 0 && pindex->nHeight > KOMODO_STOPAT )
+        return(false);
     //fprintf(stderr,"connectblock ht.%d\n",(int32_t)pindex->nHeight);
     AssertLockHeld(cs_main);
     bool fExpensiveChecks = true;

From 7e282415b1b24c51f6bbc5b96b118139ce8b8e99 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 23:57:20 -1100
Subject: [PATCH 120/623] Coin supply api

---
 src/chain.h           |  2 +-
 src/komodo_bitcoind.h | 47 +++++++++++++++++++++++++++++++++++++++++++
 src/rpcmisc.cpp       | 18 +++++++++++++++++
 src/rpcserver.h       |  1 +
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/chain.h b/src/chain.h
index 41cf28652..8c86a7ede 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -121,7 +121,7 @@ public:
 
     //! height of the entry in the chain. The genesis block has height 0
     int nHeight;
-
+    int64_t newcoins;
     //! Which # file this block is stored in (blk?????.dat)
     int nFile;
 
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 785cfe6cf..7230757e5 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1532,3 +1532,50 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     else return(0);
 }
 
+int64_t komodo_newcoins(CBlockIndex *pindex)
+{
+    int32_t i,j,m,n,vout; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
+    n = pblock->vtx.size();
+    for (i=0; i<n; i++)
+    {
+        const CTransaction vintx,&tx = pblock->vtx[i];
+        if ( (m= tx.vin.size()) > 0 )
+        {
+            for (j=0; j<m; j++)
+            {
+                if ( i == 0 )
+                    continue;
+                txid = tx.vin[j].prevout.hash;
+                vout = tx.vin[j].prevout.n;
+                if ( !GetTransaction(txid,vintx,hashBlock, false) || vout >= vintx.vout.size() )
+                {
+                    fprintf(stderr,"ERROR: %s/v%d cant find\n",txid.ToString().c_str(),vout);
+                    return(0);
+                }
+                vinsum += vintx.vout[vout].nValue;
+            }
+        }
+        if ( (m= tx.vout.size()) > 0 )
+        {
+            for (j=0; j<m-1; j++)
+                voutsum += tx.vout[j].nValue;
+            script = tx.vout[j].scriptPubKey.data();
+            if ( script == 0 || script[0] != 0x6a )
+                voutsum += tx.vout[j].nValue;
+        }
+    }
+    fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f\n",pindex->nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum));
+    return(voutsum - vinsum);
+}
+
+int64_t komodo_coinsupply(int32_t height)
+{
+    CBlockIndex *pindex; int64_t supply = 0;
+    if ( (pindex= komodo_chainactive(height)) != 0 )
+    {
+        if ( pindex->newcoins == 0 )
+            pindex->newcoins = komodo_newcoins(pindex);
+        supply += pindex->newcoins;
+    }
+    return(supply);
+}
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 065739a9a..b055e591a 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -53,6 +53,7 @@ extern uint64_t KOMODO_INTERESTSUM,KOMODO_WALLETBALANCE;
 extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE,KOMODO_LONGESTCHAIN;
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint32_t komodo_segid32(char *coinaddr);
+int64_t komodo_coinsupply(int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.1.1"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
@@ -226,6 +227,23 @@ public:
 };
 #endif
 
+UniValue coinsupply(const UniValue& params, bool fHelp)
+{
+    int32_t height = 0; int64_t supply = 0; UniValue result(UniValue::VOBJ);
+    if (fHelp || params.size() > 1)
+        throw runtime_error("coinsupply <height>\n");
+    if ( params.size() == 0 )
+        height = chainActive.Height();
+    else height = atoi(params[0].get_str());
+    if ( (supply= komodo_coinsupply(height)) > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("height", (int)height));
+        result.push_back(Pair("supply", ValueFromAmount(supply)));
+    } else result.push_back(Pair("error", "couldnt calculate supply"));
+    return(result);
+}
+
 UniValue jumblr_deposit(const UniValue& params, bool fHelp)
 {
     int32_t retval; UniValue result(UniValue::VOBJ);
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 5bb949299..586d79a88 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -207,6 +207,7 @@ extern UniValue getblocktemplate(const UniValue& params, bool fHelp);
 extern UniValue submitblock(const UniValue& params, bool fHelp);
 extern UniValue estimatefee(const UniValue& params, bool fHelp);
 extern UniValue estimatepriority(const UniValue& params, bool fHelp);
+extern UniValue coinsupply(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From ab98eb8e6ab5ea2005dae06145a9998e40fa5a68 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 11 Jul 2018 23:59:32 -1100
Subject: [PATCH 121/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7230757e5..9005d8c04 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1534,7 +1534,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
 
 int64_t komodo_newcoins(CBlockIndex *pindex)
 {
-    int32_t i,j,m,n,vout; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
+    int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {

From bb7fe7a0fe95da00ed233b6c1266b18dcea33b32 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:01:02 -1100
Subject: [PATCH 122/623] Test

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 9005d8c04..b50273c79 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1538,7 +1538,7 @@ int64_t komodo_newcoins(CBlockIndex *pindex)
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {
-        const CTransaction vintx,&tx = pblock->vtx[i];
+        const CTransaction vintx,&tx = pindex->vtx[i];
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)
@@ -1559,7 +1559,7 @@ int64_t komodo_newcoins(CBlockIndex *pindex)
         {
             for (j=0; j<m-1; j++)
                 voutsum += tx.vout[j].nValue;
-            script = tx.vout[j].scriptPubKey.data();
+            script = (uint8_t *)tx.vout[j].scriptPubKey.data();
             if ( script == 0 || script[0] != 0x6a )
                 voutsum += tx.vout[j].nValue;
         }

From e2fa8fd50b8f646101bc8538c3f38ecd9cd905f0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:01:42 -1100
Subject: [PATCH 123/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b50273c79..cb2a4af53 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1538,7 +1538,7 @@ int64_t komodo_newcoins(CBlockIndex *pindex)
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {
-        const CTransaction vintx,&tx = pindex->vtx[i];
+        CTransaction vintx,&tx = pindex->vtx[i];
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)

From 9f60c7ec621339be22ed493d4a8268151f9a4996 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:04:45 -1100
Subject: [PATCH 124/623] Test

---
 src/komodo_bitcoind.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index cb2a4af53..7d9fd5c3a 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1532,13 +1532,13 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     else return(0);
 }
 
-int64_t komodo_newcoins(CBlockIndex *pindex)
+int64_t komodo_newcoins(CBlock *pblock)
 {
     int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {
-        CTransaction vintx,&tx = pindex->vtx[i];
+        CTransaction vintx,&tx = pblock->vtx[i];
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)
@@ -1570,11 +1570,15 @@ int64_t komodo_newcoins(CBlockIndex *pindex)
 
 int64_t komodo_coinsupply(int32_t height)
 {
-    CBlockIndex *pindex; int64_t supply = 0;
+    CBlockIndex *pindex; CBlock block; int64_t supply = 0;
     if ( (pindex= komodo_chainactive(height)) != 0 )
     {
         if ( pindex->newcoins == 0 )
-            pindex->newcoins = komodo_newcoins(pindex);
+        {
+            if ( komodo_blockload(block,pindex) == 0 )
+                pindex->newcoins = komodo_newcoins(&block);
+            else return(0);
+        }
         supply += pindex->newcoins;
     }
     return(supply);

From 97a4e9238a097ae986508b7ee5b88d9c4b6675d9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:06:47 -1100
Subject: [PATCH 125/623] Test

---
 src/komodo_bitcoind.h | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 7d9fd5c3a..e24883c08 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1532,7 +1532,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     else return(0);
 }
 
-int64_t komodo_newcoins(CBlock *pblock)
+int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
 {
     int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
     n = pblock->vtx.size();
@@ -1564,7 +1564,7 @@ int64_t komodo_newcoins(CBlock *pblock)
                 voutsum += tx.vout[j].nValue;
         }
     }
-    fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f\n",pindex->nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum));
+    fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum));
     return(voutsum - vinsum);
 }
 
@@ -1573,13 +1573,17 @@ int64_t komodo_coinsupply(int32_t height)
     CBlockIndex *pindex; CBlock block; int64_t supply = 0;
     if ( (pindex= komodo_chainactive(height)) != 0 )
     {
-        if ( pindex->newcoins == 0 )
+        while ( pindex != 0 && pindex->nHeight > 0 )
         {
-            if ( komodo_blockload(block,pindex) == 0 )
-                pindex->newcoins = komodo_newcoins(&block);
-            else return(0);
+            if ( pindex->newcoins == 0 )
+            {
+                if ( komodo_blockload(block,pindex) == 0 )
+                    pindex->newcoins = komodo_newcoins(pindex->nHeight,&block);
+                else return(0);
+            }
+            supply += pindex->newcoins;
+            pindex = pindex->pprev;
         }
-        supply += pindex->newcoins;
     }
     return(supply);
 }

From 26204e59df5d16a22ac2b3b35b1a6ef516432f2c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:18:58 -1100
Subject: [PATCH 126/623] Add coinsupply rpc

---
 src/rpcserver.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index ed5110114..f37124d0c 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -280,6 +280,7 @@ static const CRPCCommand vRPCCommands[] =
     { "network",            "clearbanned",            &clearbanned,            true  },
 
     /* Block chain and UTXO */
+    { "blockchain",         "coinsupply",             &coinsupply,             true  },
     { "blockchain",         "getblockchaininfo",      &getblockchaininfo,      true  },
     { "blockchain",         "getbestblockhash",       &getbestblockhash,       true  },
     { "blockchain",         "getblockcount",          &getblockcount,          true  },

From df74ee5fa0c5e28abccff98e19c9c89d980c31be Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:23:50 -1100
Subject: [PATCH 127/623] Test

---
 src/komodo_bitcoind.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e24883c08..1fd179ae9 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1571,15 +1571,21 @@ int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
 int64_t komodo_coinsupply(int32_t height)
 {
     CBlockIndex *pindex; CBlock block; int64_t supply = 0;
+    fprintf(stderr,"coinsupply %d\n",height);
     if ( (pindex= komodo_chainactive(height)) != 0 )
     {
         while ( pindex != 0 && pindex->nHeight > 0 )
         {
+            printf("start ht.%d\n",pindex->nHeight);
             if ( pindex->newcoins == 0 )
             {
                 if ( komodo_blockload(block,pindex) == 0 )
                     pindex->newcoins = komodo_newcoins(pindex->nHeight,&block);
-                else return(0);
+                else
+                {
+                    fprintf(stderr,"error loading block.%d\n",pindex->nHeight);
+                    return(0);
+                }
             }
             supply += pindex->newcoins;
             pindex = pindex->pprev;

From a46d6afb2b2670c2b7973db24787cb06a82ef53f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:28:15 -1100
Subject: [PATCH 128/623] Test

---
 src/chain.h           | 1 +
 src/komodo_bitcoind.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/chain.h b/src/chain.h
index 8c86a7ede..5400abb00 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -181,6 +181,7 @@ public:
     void SetNull()
     {
         phashBlock = NULL;
+        newcoins = 0;
         pprev = NULL;
         pskip = NULL;
         nHeight = 0;
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1fd179ae9..6c5f615f3 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1576,7 +1576,6 @@ int64_t komodo_coinsupply(int32_t height)
     {
         while ( pindex != 0 && pindex->nHeight > 0 )
         {
-            printf("start ht.%d\n",pindex->nHeight);
             if ( pindex->newcoins == 0 )
             {
                 if ( komodo_blockload(block,pindex) == 0 )
@@ -1588,6 +1587,7 @@ int64_t komodo_coinsupply(int32_t height)
                 }
             }
             supply += pindex->newcoins;
+            printf("start ht.%d new %.8f -> supply %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply));
             pindex = pindex->pprev;
         }
     }

From 67459d80b4680504c80a9dec77556c770c398714 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:39:04 -1100
Subject: [PATCH 129/623] Test

---
 src/komodo_bitcoind.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 6c5f615f3..5140c0d27 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1564,6 +1564,7 @@ int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
                 voutsum += tx.vout[j].nValue;
         }
     }
+    if ( voutsum-vinsum > 100000*SATOSHIDEN || voutsum-vinsum < 0 )
     fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum));
     return(voutsum - vinsum);
 }
@@ -1571,7 +1572,7 @@ int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
 int64_t komodo_coinsupply(int32_t height)
 {
     CBlockIndex *pindex; CBlock block; int64_t supply = 0;
-    fprintf(stderr,"coinsupply %d\n",height);
+    //fprintf(stderr,"coinsupply %d\n",height);
     if ( (pindex= komodo_chainactive(height)) != 0 )
     {
         while ( pindex != 0 && pindex->nHeight > 0 )
@@ -1587,7 +1588,7 @@ int64_t komodo_coinsupply(int32_t height)
                 }
             }
             supply += pindex->newcoins;
-            printf("start ht.%d new %.8f -> supply %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply));
+            //printf("start ht.%d new %.8f -> supply %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply));
             pindex = pindex->pprev;
         }
     }

From 261895095501daf0acd7134471628456c50e8bc6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:52:36 -1100
Subject: [PATCH 130/623] Test

---
 src/chain.h           |  4 ++--
 src/komodo_bitcoind.h | 17 +++++++++++------
 src/rpcmisc.cpp       |  8 +++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/chain.h b/src/chain.h
index 5400abb00..71d788531 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -121,7 +121,7 @@ public:
 
     //! height of the entry in the chain. The genesis block has height 0
     int nHeight;
-    int64_t newcoins;
+    int64_t newcoins,zfunds;
     //! Which # file this block is stored in (blk?????.dat)
     int nFile;
 
@@ -181,7 +181,7 @@ public:
     void SetNull()
     {
         phashBlock = NULL;
-        newcoins = 0;
+        newcoins = zfunds = 0;
         pprev = NULL;
         pskip = NULL;
         nHeight = 0;
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 5140c0d27..e9bde8595 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1532,13 +1532,14 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     else return(0);
 }
 
-int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
+int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
 {
-    int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t vinsum=0,voutsum=0;
+    int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t zfunds=0,vinsum=0,voutsum=0;
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {
         CTransaction vintx,&tx = pblock->vtx[i];
+        zfunds += (tx.GetJoinSplitValueOut() - tx.GetJoinSplitValueIn());
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)
@@ -1564,15 +1565,17 @@ int64_t komodo_newcoins(int32_t nHeight,CBlock *pblock)
                 voutsum += tx.vout[j].nValue;
         }
     }
+    *zfundsp = zfunds;
     if ( voutsum-vinsum > 100000*SATOSHIDEN || voutsum-vinsum < 0 )
-    fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum));
+        fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f zfunds %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum),dstr(zfunds));
     return(voutsum - vinsum);
 }
 
-int64_t komodo_coinsupply(int32_t height)
+int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height)
 {
-    CBlockIndex *pindex; CBlock block; int64_t supply = 0;
+    CBlockIndex *pindex; CBlock block; int64_t zfunds=0,supply = 0;
     //fprintf(stderr,"coinsupply %d\n",height);
+    *zfundsp = 0;
     if ( (pindex= komodo_chainactive(height)) != 0 )
     {
         while ( pindex != 0 && pindex->nHeight > 0 )
@@ -1580,7 +1583,7 @@ int64_t komodo_coinsupply(int32_t height)
             if ( pindex->newcoins == 0 )
             {
                 if ( komodo_blockload(block,pindex) == 0 )
-                    pindex->newcoins = komodo_newcoins(pindex->nHeight,&block);
+                    pindex->newcoins = komodo_newcoins(&pindex->zfunds,pindex->nHeight,&block);
                 else
                 {
                     fprintf(stderr,"error loading block.%d\n",pindex->nHeight);
@@ -1588,9 +1591,11 @@ int64_t komodo_coinsupply(int32_t height)
                 }
             }
             supply += pindex->newcoins;
+            zfunds += pindex->zfunds;
             //printf("start ht.%d new %.8f -> supply %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply));
             pindex = pindex->pprev;
         }
     }
+    *zfundsp = zfunds;
     return(supply);
 }
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index b055e591a..04376f4a5 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -53,7 +53,7 @@ extern uint64_t KOMODO_INTERESTSUM,KOMODO_WALLETBALANCE;
 extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE,KOMODO_LONGESTCHAIN;
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 uint32_t komodo_segid32(char *coinaddr);
-int64_t komodo_coinsupply(int32_t height);
+int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height);
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.1.1"
 extern uint16_t ASSETCHAINS_P2PPORT,ASSETCHAINS_RPCPORT;
@@ -229,17 +229,19 @@ public:
 
 UniValue coinsupply(const UniValue& params, bool fHelp)
 {
-    int32_t height = 0; int64_t supply = 0; UniValue result(UniValue::VOBJ);
+    int32_t height = 0; int64_t zfunds,supply = 0; UniValue result(UniValue::VOBJ);
     if (fHelp || params.size() > 1)
         throw runtime_error("coinsupply <height>\n");
     if ( params.size() == 0 )
         height = chainActive.Height();
     else height = atoi(params[0].get_str());
-    if ( (supply= komodo_coinsupply(height)) > 0 )
+    if ( (supply= komodo_coinsupply(&zfunds,height)) > 0 )
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("height", (int)height));
         result.push_back(Pair("supply", ValueFromAmount(supply)));
+        result.push_back(Pair("zfunds", ValueFromAmount(zfunds)));
+        result.push_back(Pair("total", ValueFromAmount(zfunds + supply)));
     } else result.push_back(Pair("error", "couldnt calculate supply"));
     return(result);
 }

From ae4dbe22bbe32f6a8d1f71db7ac2efa47badec67 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 00:58:25 -1100
Subject: [PATCH 131/623] tx.GetJoinSplitValueOut()

---
 src/komodo_bitcoind.h          |  2 +-
 src/primitives/transaction.cpp | 17 ++++++++++++++++-
 src/primitives/transaction.h   |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e9bde8595..0293c0dd5 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1539,7 +1539,7 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
     for (i=0; i<n; i++)
     {
         CTransaction vintx,&tx = pblock->vtx[i];
-        zfunds += (tx.GetJoinSplitValueOut() - tx.GetJoinSplitValueIn());
+        zfunds += (tx.GetJoinSplitValueIn() - tx.GetJoinSplitValueOut());
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
index d6ad31c3a..04222e854 100644
--- a/src/primitives/transaction.cpp
+++ b/src/primitives/transaction.cpp
@@ -232,11 +232,26 @@ CAmount CTransaction::GetJoinSplitValueIn() const
     {
         // NB: vpub_new "gives" money to the value pool just as inputs do
         nValue += it->vpub_new;
-
+        
         if (!MoneyRange(it->vpub_new) || !MoneyRange(nValue))
             throw std::runtime_error("CTransaction::GetJoinSplitValueIn(): value out of range");
     }
+    
+    return nValue;
+}
 
+CAmount CTransaction::GetJoinSplitValueOut() const
+{
+    CAmount nValue = 0;
+    for (std::vector<JSDescription>::const_iterator it(vjoinsplit.begin()); it != vjoinsplit.end(); ++it)
+    {
+        // NB: vpub_new "gives" money to the value pool just as inputs do
+        nValue += it->vpub_old;
+        
+        if (!MoneyRange(it->vpub_old) || !MoneyRange(nValue))
+            throw std::runtime_error("CTransaction::GetJoinSplitValueOut(): value out of range");
+    }
+    
     return nValue;
 }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
index 88ee9a312..e3615c120 100644
--- a/src/primitives/transaction.h
+++ b/src/primitives/transaction.h
@@ -445,6 +445,8 @@ public:
 
     // Return sum of JoinSplit vpub_new
     CAmount GetJoinSplitValueIn() const;
+    // Return sum of JoinSplit vpub_old
+    CAmount GetJoinSplitValueOut() const;
 
     // Compute priority, given priority of inputs and (optionally) tx size
     double ComputePriority(double dPriorityInputs, unsigned int nTxSize=0) const;

From 1ec2a42ff317ab4cbc81dafb49d6108a6ea6cc16 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 01:01:45 -1100
Subject: [PATCH 132/623] Test

---
 src/komodo_bitcoind.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0293c0dd5..1ceeebd38 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1566,7 +1566,12 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
         }
     }
     *zfundsp = zfunds;
-    if ( voutsum-vinsum > 100000*SATOSHIDEN || voutsum-vinsum < 0 )
+    if ( ASSETCHAINS_SYMBOL[0] == 0 && (voutsum-vinsum) == 100003*SATOSHIDEN )
+    {
+        fprintf(stderr,"ht.%d special case return 3\n",nHeight);
+        return(3 * SATOSHIDEN);
+    }
+    if ( voutsum-vinsum+zfunds > 100000*SATOSHIDEN || voutsum-vinsum+zfunds < 0 )
         fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f zfunds %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum),dstr(zfunds));
     return(voutsum - vinsum);
 }

From 3118a070000f4267ded1e5c70e3253f3a54c0551 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 01:16:41 -1100
Subject: [PATCH 133/623] Test

---
 src/komodo_bitcoind.h | 4 ++--
 src/main.cpp          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1ceeebd38..1c0264a3a 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1539,7 +1539,7 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
     for (i=0; i<n; i++)
     {
         CTransaction vintx,&tx = pblock->vtx[i];
-        zfunds += (tx.GetJoinSplitValueIn() - tx.GetJoinSplitValueOut());
+        zfunds += (tx.GetJoinSplitValueOut() - tx.GetJoinSplitValueIn());
         if ( (m= tx.vin.size()) > 0 )
         {
             for (j=0; j<m; j++)
@@ -1597,7 +1597,7 @@ int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height)
             }
             supply += pindex->newcoins;
             zfunds += pindex->zfunds;
-            //printf("start ht.%d new %.8f -> supply %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply));
+            //printf("start ht.%d new %.8f -> supply %.8f zfunds %.8f -> %.8f\n",pindex->nHeight,dstr(pindex->newcoins),dstr(supply),dstr(pindex->zfunds),dstr(zfunds));
             pindex = pindex->pprev;
         }
     }
diff --git a/src/main.cpp b/src/main.cpp
index cfc97db81..b08d2e522 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1104,7 +1104,7 @@ bool CheckTransactionWithoutProofVerification(const CTransaction& tx, CValidatio
         if ( ASSETCHAINS_PRIVATE != 0 )
         {
             fprintf(stderr,"private chain nValue %.8f iscoinbase.%d\n",(double)txout.nValue/COIN,iscoinbase);
-            if ( txout.nValue > 0 && iscoinbase == 0 )
+            if ( (txout.nValue > 0 && iscoinbase == 0) || tx.GetJoinSplitValueOut() > 0 )
                 return state.DoS(100, error("CheckTransaction(): this is a private chain, no public allowed"),REJECT_INVALID, "bad-txns-acprivacy-chain");
         }
         nValueOut += txout.nValue;

From 7130a7cdc8572f8376bb147fb8f4ffbdfc8ff4fe Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 01:21:32 -1100
Subject: [PATCH 134/623] Test

---
 src/komodo_bitcoind.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1c0264a3a..f33fc2c01 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1566,11 +1566,8 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
         }
     }
     *zfundsp = zfunds;
-    if ( ASSETCHAINS_SYMBOL[0] == 0 && (voutsum-vinsum) == 100003*SATOSHIDEN )
-    {
-        fprintf(stderr,"ht.%d special case return 3\n",nHeight);
+    if ( ASSETCHAINS_SYMBOL[0] == 0 && (voutsum-vinsum) == 100003*SATOSHIDEN ) // 15 times
         return(3 * SATOSHIDEN);
-    }
     if ( voutsum-vinsum+zfunds > 100000*SATOSHIDEN || voutsum-vinsum+zfunds < 0 )
         fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f zfunds %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum),dstr(zfunds));
     return(voutsum - vinsum);
@@ -1585,7 +1582,7 @@ int64_t komodo_coinsupply(int64_t *zfundsp,int32_t height)
     {
         while ( pindex != 0 && pindex->nHeight > 0 )
         {
-            if ( pindex->newcoins == 0 )
+            if ( pindex->newcoins == 0 && pindex->zfunds == 0 )
             {
                 if ( komodo_blockload(block,pindex) == 0 )
                     pindex->newcoins = komodo_newcoins(&pindex->zfunds,pindex->nHeight,&block);

From aa51eef61991942a6e7eed944d08b673e7c646d0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 01:37:55 -1100
Subject: [PATCH 135/623] coinsupply rpc call

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f33fc2c01..27f0a26a4 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1568,8 +1568,8 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
     *zfundsp = zfunds;
     if ( ASSETCHAINS_SYMBOL[0] == 0 && (voutsum-vinsum) == 100003*SATOSHIDEN ) // 15 times
         return(3 * SATOSHIDEN);
-    if ( voutsum-vinsum+zfunds > 100000*SATOSHIDEN || voutsum-vinsum+zfunds < 0 )
-        fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f zfunds %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum),dstr(zfunds));
+    //if ( voutsum-vinsum+zfunds > 100000*SATOSHIDEN || voutsum-vinsum+zfunds < 0 )
+    //.    fprintf(stderr,"ht.%d vins %.8f, vouts %.8f -> %.8f zfunds %.8f\n",nHeight,dstr(vinsum),dstr(voutsum),dstr(voutsum)-dstr(vinsum),dstr(zfunds));
     return(voutsum - vinsum);
 }
 

From 8aa6378bc9dde7c81c093e0cd898018bcfc27cfc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 01:46:32 -1100
Subject: [PATCH 136/623] Add symbol to coinsupply return

---
 src/rpcmisc.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 04376f4a5..bf7f345d5 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -238,6 +238,7 @@ UniValue coinsupply(const UniValue& params, bool fHelp)
     if ( (supply= komodo_coinsupply(&zfunds,height)) > 0 )
     {
         result.push_back(Pair("result", "success"));
+        result.push_back(Pair("coin", ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL));
         result.push_back(Pair("height", (int)height));
         result.push_back(Pair("supply", ValueFromAmount(supply)));
         result.push_back(Pair("zfunds", ValueFromAmount(zfunds)));

From 40df8d84b1c06d9bf6ce1069724b8cda94fba94c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 03:52:54 -1100
Subject: [PATCH 137/623] Reduce staking CPU usage

---
 src/miner.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index c837268f9..7bd6777d4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -949,7 +949,11 @@ void static BitcoinMiner()
                         fprintf(stderr,"%02x",((uint8_t *)&HASHTarget_POW)[z]);
                     fprintf(stderr," POW\n");*/
                     if ( h > hashTarget )
+                    {
+                        if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
+                            sleep(1);
                         return false;
+                    }
                     if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )
                     {
                         //fprintf(stderr,"need to wait %d seconds to submit block\n",(int32_t)(B.nTime - GetAdjustedTime()));

From 0f7abeea0ea7af9a4a4204cf19a386039424164e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 04:08:51 -1100
Subject: [PATCH 138/623] Test

---
 src/miner.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/miner.cpp b/src/miner.cpp
index 7bd6777d4..bc5bbe1f7 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -396,6 +396,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
         {
             uint64_t txfees,utxovalue; uint32_t txtime; uint256 utxotxid,revtxid; int32_t i,siglen,numsigs,utxovout; uint8_t utxosig[128],*ptr;
             CMutableTransaction txStaked = CreateNewContextualCMutableTransaction(Params().GetConsensus(), chainActive.Height() + 1);
+            sleep(1);
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;

From 2b72340d10710d0f54c04fb463b289f74a3bf210 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 06:25:02 -1100
Subject: [PATCH 139/623] -print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1e330b20c..7199db0be 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4690,7 +4690,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             //fprintf(stderr,"best %u from %u, gap %d lag.%d\n",earliest,*blocktimep,(int32_t)(earliest - *blocktimep),(int32_t)(time(NULL) - *blocktimep));
             *blocktimep = earliest;
         }
-    } else fprintf(stderr,"no earliest utxo for staking\n");
+    } //else fprintf(stderr,"no earliest utxo for staking\n");
     return(siglen);
 }
 

From 29bb0d039cd1d94d8f121f84177c4b3843cd9cb6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 08:23:58 -1100
Subject: [PATCH 140/623] Cap search to 2 minutes

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 27f0a26a4..cc60bc0e2 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1212,7 +1212,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
     memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
     vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
-    for (iter=0; iter<3600; iter++)
+    for (iter=0; iter<120; iter++)
     {
         diff = (iter + blocktime - txtime - minage);
         if ( diff < 0 )

From 8a7c025aaef77372b506d94007bd6873a807d43f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 08:39:33 -1100
Subject: [PATCH 141/623] De-clumpify at 900

---
 src/komodo_bitcoind.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index cc60bc0e2..d09503751 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1187,7 +1187,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
+    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio,coinage256; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 && blocktime < GetAdjustedTime() )
         blocktime = GetAdjustedTime();
@@ -1227,7 +1227,10 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
         coinage = (value * diff);
-        hashval = ratio * (UintToArith256(hash) / arith_uint256(coinage+1));
+        coinage256 = arith_uint256(coinage+1);
+        hashval = ratio * (UintToArith256(hash) / coinage256);
+        if ( nHeight >= 900 )
+            hashval = (hashval / coinage256);
         if ( hashval <= bnTarget )
         {
             winner = 1;

From 832ca82122ea5ce196d0bf8b6e0ac261bb8120f6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 08:53:46 -1100
Subject: [PATCH 142/623] +print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7199db0be..334b1dfe3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    //fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From c3ed86ad18cd337cfb0155d049bc001acde4a466 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:01:48 -1100
Subject: [PATCH 143/623] Test

---
 src/komodo_bitcoind.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d09503751..734c57f73 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1189,10 +1189,15 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
 {
     bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio,coinage256; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
     txtime = komodo_txtime2(&value,txid,vout,address);
-    if ( validateflag == 0 && blocktime < GetAdjustedTime() )
-        blocktime = GetAdjustedTime();
-    if ( blocktime < prevtime+3 )
-        blocktime = prevtime+3;
+    if ( validateflag == 0 )
+    {
+        fprintf(stderr,"blocktime.%u -> ",blocktime);
+        if ( blocktime < GetAdjustedTime() )
+            blocktime = GetAdjustedTime();
+        if ( blocktime < prevtime+3 )
+            blocktime = prevtime+3;
+        fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
+    }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
         //fprintf(stderr,"komodo_stake null %.8f %u %u %u\n",dstr(value),txtime,blocktime,prevtime);
@@ -1236,6 +1241,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             winner = 1;
             if ( validateflag == 0 )
             {
+                fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
             }

From e0a3ab0a32f12e972850b030e39e8d101a04f148 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:24:58 -1100
Subject: [PATCH 144/623] Test

---
 src/komodo_bitcoind.h    | 14 +++++++-------
 src/wallet/rpcwallet.cpp |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 734c57f73..fa5266d38 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1191,12 +1191,12 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 )
     {
-        fprintf(stderr,"blocktime.%u -> ",blocktime);
-        if ( blocktime < GetAdjustedTime() )
-            blocktime = GetAdjustedTime();
+        //fprintf(stderr,"blocktime.%u -> ",blocktime);
         if ( blocktime < prevtime+3 )
             blocktime = prevtime+3;
-        fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
+        if ( blocktime < GetAdjustedTime()-60 )
+            blocktime = GetAdjustedTime()-60;
+        //fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
     }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
@@ -1217,7 +1217,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
     memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
     vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
-    for (iter=0; iter<120; iter++)
+    for (iter=0; iter<180; iter++)
     {
         diff = (iter + blocktime - txtime - minage);
         if ( diff < 0 )
@@ -1241,7 +1241,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             winner = 1;
             if ( validateflag == 0 )
             {
-                fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
+                //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
             }
@@ -1401,7 +1401,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
         if ( prevtime != 0 )
         {
             if ( komodo_isPoS(pblock) != 0 )
-                eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime,(char *)"");
+                eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime+27,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
                 fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 334b1dfe3..400dc9088 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4640,10 +4640,10 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         CBlockIndex *tipindex;
         if ( (tipindex= chainActive.Tip()) != 0 )
         {
-            eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime,(char *)CBitcoinAddress(address).ToString().c_str());
+            eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
             if ( eligible > 0 )
             {
-                if ( eligible != komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime,(char *)CBitcoinAddress(address).ToString().c_str()) )
+                if ( eligible != komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
                 {
                     //fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
                 }

From 8785f8cee0a64b1e7849c454d787764632b2b4e0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:26:41 -1100
Subject: [PATCH 145/623] Fix

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index fa5266d38..e0c88065b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1195,7 +1195,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         if ( blocktime < prevtime+3 )
             blocktime = prevtime+3;
         if ( blocktime < GetAdjustedTime()-60 )
-            blocktime = GetAdjustedTime()-60;
+            blocktime = GetAdjustedTime()+30;
         //fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
     }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
@@ -1234,7 +1234,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         coinage = (value * diff);
         coinage256 = arith_uint256(coinage+1);
         hashval = ratio * (UintToArith256(hash) / coinage256);
-        if ( nHeight >= 900 )
+        if ( nHeight >= 900 && nHeight < 916 )
             hashval = (hashval / coinage256);
         if ( hashval <= bnTarget )
         {

From ed3d9247b42eb3797596457d1e6e3f51a1eb0e10 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:28:34 -1100
Subject: [PATCH 146/623] New version

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index bc5bbe1f7..c6855cd57 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -400,7 +400,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-57 )
+                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
                     return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);

From 593d06a8c749d4a3aa11f76781b5f8c385726ec3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:29:20 -1100
Subject: [PATCH 147/623] -print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 400dc9088..85141aa6a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    //fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 668ff11a727af89f84dba5ffd22c5a0f471cc6b4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:38:47 -1100
Subject: [PATCH 148/623] +print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 85141aa6a..400dc9088 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    //fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From c067f5148bc234ad863ccaa31f54994911f9c286 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:44:07 -1100
Subject: [PATCH 149/623] +print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e0c88065b..2916e4d56 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1259,7 +1259,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 0 && validateflag != 0 )
+    //if ( 0 && validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From e53395fccf810c66d567336fbe2fd1f09ae19d60 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 09:50:00 -1100
Subject: [PATCH 150/623] Test

---
 src/komodo_bitcoind.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2916e4d56..1a9377e85 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1257,9 +1257,15 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);*/
             break;
         }
+        for (i=31; i>=24; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+        fprintf(stderr," vs ");
+        for (i=31; i>=24; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
+        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d ht.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff,nHeight);
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    //if ( 0 && validateflag != 0 )
+    if ( 0 && validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From cb595b48018eaa00c18631a1afb3597bf74c0f3a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:00:10 -1100
Subject: [PATCH 151/623] -print

---
 src/komodo_bitcoind.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 1a9377e85..e0c88065b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1257,12 +1257,6 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff);*/
             break;
         }
-        for (i=31; i>=24; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-        fprintf(stderr," vs ");
-        for (i=31; i>=24; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
-        fprintf(stderr," segid.%d iter.%d winner.%d coinage.%llu %d ht.%d t.%u v%d diff.%d ht.%d\n",segid,iter,winner,(long long)coinage,(int32_t)(blocktime - txtime),nHeight,blocktime,(int32_t)value,(int32_t)diff,nHeight);
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
     if ( 0 && validateflag != 0 )

From 2da6a5a5ad4d6813a9a7fed1b5416f29a475b11c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:05:05 -1100
Subject: [PATCH 152/623] Test

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index c6855cd57..773762937 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -400,7 +400,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
+                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 )//&& GetAdjustedTime() < blocktime-157 )
                     return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);

From eedbc1907eb46c12bae422c53014fba2531b3c66 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:09:48 -1100
Subject: [PATCH 153/623] Test

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e0c88065b..4e09b3592 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1191,12 +1191,12 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 )
     {
-        //fprintf(stderr,"blocktime.%u -> ",blocktime);
+        fprintf(stderr,"blocktime.%u -> ",blocktime);
         if ( blocktime < prevtime+3 )
             blocktime = prevtime+3;
         if ( blocktime < GetAdjustedTime()-60 )
             blocktime = GetAdjustedTime()+30;
-        //fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
+        fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
     }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
@@ -1241,7 +1241,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             winner = 1;
             if ( validateflag == 0 )
             {
-                //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
+                fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
             }

From 0debf37ff7cb7a0294eecc1f324a83050521b130 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:14:15 -1100
Subject: [PATCH 154/623] Test

---
 src/komodo_bitcoind.h | 6 +++---
 src/miner.cpp         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 4e09b3592..e0c88065b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1191,12 +1191,12 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 )
     {
-        fprintf(stderr,"blocktime.%u -> ",blocktime);
+        //fprintf(stderr,"blocktime.%u -> ",blocktime);
         if ( blocktime < prevtime+3 )
             blocktime = prevtime+3;
         if ( blocktime < GetAdjustedTime()-60 )
             blocktime = GetAdjustedTime()+30;
-        fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
+        //fprintf(stderr,"blocktime.%u txtime.%u\n",blocktime,txtime);
     }
     if ( value == 0 || txtime == 0 || blocktime == 0 || prevtime == 0 )
     {
@@ -1241,7 +1241,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
             winner = 1;
             if ( validateflag == 0 )
             {
-                fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
+                //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
             }
diff --git a/src/miner.cpp b/src/miner.cpp
index 773762937..ca04343e4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -400,8 +400,8 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 )//&& GetAdjustedTime() < blocktime-157 )
-                    return(0);
+                //if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
+                //    return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);
                 pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStaked));

From cdb34664622baacc337fc8a5d413bf64939dc486 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:18:16 -1100
Subject: [PATCH 155/623] Test

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index ca04343e4..2b37590e1 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -492,7 +492,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
                 return(0);
             }
         }
-        else
+        else if ( ASSETCHAINS_STAKED == 0 )
         {
             CValidationState state;
             if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false))

From afa90f17b126d345fdae07b56479de45dc374a4d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:23:36 -1100
Subject: [PATCH 156/623] Detect new block while sleeping

---
 src/miner.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 2b37590e1..8a0c63f88 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -951,8 +951,8 @@ void static BitcoinMiner()
                     fprintf(stderr," POW\n");*/
                     if ( h > hashTarget )
                     {
-                        if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
-                            sleep(1);
+                        //if ( ASSETCHAINS_STAKED != 0 && GetArg("-genproclimit", 0) == 0 )
+                        //    sleep(1);
                         return false;
                     }
                     if ( IS_KOMODO_NOTARY != 0 && B.nTime > GetAdjustedTime() )
@@ -980,12 +980,11 @@ void static BitcoinMiner()
                     else
                     {
                         while ( B.nTime-57 > GetAdjustedTime() )
-                            sleep(1);
-                        /*if ( Mining_height < 6000 )
                         {
-                            while ( B.nTime > GetAdjustedTime() )
-                                sleep(1);
-                        }*/
+                            sleep(1);
+                            if ( chainActive.Tip()->nHeight >= Mining_height )
+                                return(false);
+                        }
                         uint256 tmp = B.GetHash();
                         int32_t z; for (z=31; z>=0; z--)
                             fprintf(stderr,"%02x",((uint8_t *)&tmp)[z]);

From b0910b9e2a17f93f908a47ac6170c46d49b3cb5b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:33:01 -1100
Subject: [PATCH 157/623] +print

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 400dc9088..4c3a66c2a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From b30fdbd2378bbee5bb5801f83e5fc45d37ef5fc3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:48:32 -1100
Subject: [PATCH 158/623] +segids print

---
 src/komodo_bitcoind.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e0c88065b..8c4e2c537 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1174,13 +1174,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            //fprintf(stderr,"%02x ",hashbuf[i]);
+            fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            //fprintf(stderr,"prevsegids.%d\n",height+n);
+            fprintf(stderr,"prevsegids.%d\n",height+n);
         }
     }
 }

From 488dab7859efb5ffc0a635c73d5cc05741789839 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:49:26 -1100
Subject: [PATCH 159/623] -prints

---
 src/komodo_bitcoind.h    | 4 ++--
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 8c4e2c537..e0c88065b 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1174,13 +1174,13 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
         for (i=0; i<n; i++)
         {
             hashbuf[i] = (uint8_t)komodo_segid(height+i);
-            fprintf(stderr,"%02x ",hashbuf[i]);
+            //fprintf(stderr,"%02x ",hashbuf[i]);
         }
         if ( n == 100 )
         {
             memcpy(prevhashbuf,hashbuf,100);
             prevheight = height;
-            fprintf(stderr,"prevsegids.%d\n",height+n);
+            //fprintf(stderr,"prevsegids.%d\n",height+n);
         }
     }
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4c3a66c2a..6831585c4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4655,7 +4655,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    //fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 308ee0761c265b2c1af855d67a85b4e9014cc2dd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 10:52:38 -1100
Subject: [PATCH 160/623] Guard error print

---
 src/komodo_bitcoind.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e0c88065b..0c714ba9c 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1404,7 +1404,8 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                 eligible = komodo_stake(1,bnTarget,height,txid,vout,pblock->nTime,prevtime+27,(char *)"");
             if ( eligible == 0 || eligible > pblock->nTime )
             {
-                fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
+                if ( ASSETCHAINS_STAKED < 100 )
+                    fprintf(stderr,"komodo_is_PoSblock PoS failure ht.%d eligible.%u vs blocktime.%u, lag.%d -> check to see if it is PoW block\n",height,eligible,(uint32_t)pblock->nTime,(int32_t)(eligible - pblock->nTime));
             } else isPoS = 1;
         }
         if ( slowflag == 0 ) // maybe previous block is not seen yet, do the best approx

From 6d2faeb0b8ddcdf843198067740e8be7a7618e62 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 11:13:32 -1100
Subject: [PATCH 161/623] +print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0c714ba9c..4b91f8230 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1259,7 +1259,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( 0 && validateflag != 0 )
+    if ( validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From d5614a7628dd72f744ed15cd878f2b32dea8ebeb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 11:43:32 -1100
Subject: [PATCH 162/623] Set nBits more often

---
 src/miner.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 8a0c63f88..dbe6dc41c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -832,8 +832,9 @@ void static BitcoinMiner()
             // Search
             //
             uint8_t pubkeys[66][33]; arith_uint256 bnMaxPoSdiff; uint32_t blocktimes[66]; int mids[256],nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime();
+            pblock->nBits         = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
             savebits = pblock->nBits;
-            HASHTarget = arith_uint256().SetCompact(pblock->nBits);
+            HASHTarget = arith_uint256().SetCompact(savebits);
             roundrobin_delay = ROUNDROBIN_DELAY;
             if ( ASSETCHAINS_SYMBOL[0] == 0 && notaryid >= 0 )
             {

From 3dcc06d3acbd1cca46554f72589c15da41b49c26 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 22:12:27 -1100
Subject: [PATCH 163/623] +print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 4b91f8230..74b9786f3 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1259,7 +1259,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    if ( validateflag != 0 )
+    //if ( validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From 5162b553a0e0f91d5a976d533b810e72855fd2ff Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 12 Jul 2018 22:14:22 -1100
Subject: [PATCH 164/623] -print

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 74b9786f3..0c714ba9c 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1259,7 +1259,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
     }
     //fprintf(stderr,"iterated until i.%d winner.%d\n",i,winner);
-    //if ( validateflag != 0 )
+    if ( 0 && validateflag != 0 )
     {
         for (i=31; i>=24; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);

From 0401884fee36534c5508b794d89c559bfd0a66ea Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 13 Jul 2018 04:45:32 -1100
Subject: [PATCH 165/623] Mitigation of very long block times, starting 2500
 for PoW

---
 src/komodo_bitcoind.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 0c714ba9c..da244e079 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1219,6 +1219,8 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
     for (iter=0; iter<180; iter++)
     {
+        if ( blocktime+iter+segid*2 < txtime+minage )
+            continue;
         diff = (iter + blocktime - txtime - minage);
         if ( diff < 0 )
             diff = 60;
@@ -1229,9 +1231,9 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         }
         if ( iter > 0 )
             diff += segid*2;
-        if ( blocktime+iter+segid*2 < txtime+minage )
-            continue;
         coinage = (value * diff);
+        if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
+            coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
         coinage256 = arith_uint256(coinage+1);
         hashval = ratio * (UintToArith256(hash) / coinage256);
         if ( nHeight >= 900 && nHeight < 916 )

From 485df724b988548f9204f0f59ef5841c51f32496 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 13 Jul 2018 23:12:59 -1100
Subject: [PATCH 166/623] Fix invalid tx in mempool for PoS

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index da244e079..42318252f 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1076,11 +1076,11 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
-        if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
+        if ( txheight > 246748 )
         {
-            if ( txheight < 247205 && ASSETCHAINS_STAKED == 0 )
+            if ( txheight < 247205 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {

From 82fd97935b50eead75971b2d32e1180710237b6c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 13 Jul 2018 23:15:43 -1100
Subject: [PATCH 167/623] Revert

---
 src/komodo_bitcoind.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 42318252f..e584b2c93 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1076,11 +1076,11 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
-        if ( txheight > 246748 )
+        if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
         {
-            if ( txheight < 247205 )
+            if ( txheight < 247205 && ASSETCHAINS_STAKED == 0 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {

From b39b4d733efea2fb3140a737ec6f57ca86217043 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 00:11:29 -1100
Subject: [PATCH 168/623] (

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index e584b2c93..da244e079 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1076,7 +1076,7 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
         if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
         {

From 3cbc956e040778621e9ebd563485ac71635d2cc6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 03:08:05 -1100
Subject: [PATCH 169/623] Test fix for crash

---
 src/wallet/wallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 10bf93598..df0cd9c2b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2112,7 +2112,7 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
         // Don't rebroadcast if newer than nTime:
         if (wtx.nTimeReceived > nTime)
             continue;
-        if ( ASSETCHAINS_SYMBOL[0] == 0 )
+        //if ( ASSETCHAINS_SYMBOL[0] == 0 )
         {
             if ( wtx.nLockTime >= LOCKTIME_THRESHOLD && wtx.nLockTime < now-KOMODO_MAXMEMPOOLTIME )
             {

From 84eabd0d59a56b98e2bed897f8b8a6787750b386 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 05:43:18 -1100
Subject: [PATCH 170/623] Skip null privacy address

---
 src/komodo_bitcoind.h    | 13 ++++++++++---
 src/wallet/rpcwallet.cpp | 18 ++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index da244e079..eb649be99 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1546,7 +1546,7 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
 
 int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
 {
-    int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t zfunds=0,vinsum=0,voutsum=0;
+    CTxDestination address; int32_t i,j,m,n,vout; uint8_t *script; uint256 txid,hashBlock; int64_t zfunds=0,vinsum=0,voutsum=0;
     n = pblock->vtx.size();
     for (i=0; i<n; i++)
     {
@@ -1571,10 +1571,17 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
         if ( (m= tx.vout.size()) > 0 )
         {
             for (j=0; j<m-1; j++)
-                voutsum += tx.vout[j].nValue;
+            {
+                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp("RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY",CBitcoinAddress(address).ToString().c_str()) != 0 )
+                    voutsum += tx.vout[j].nValue;
+                else printf("skip %.8f -> %s\n",dstr(),CBitcoinAddress(address).ToString().c_str());
+            }
             script = (uint8_t *)tx.vout[j].scriptPubKey.data();
             if ( script == 0 || script[0] != 0x6a )
-                voutsum += tx.vout[j].nValue;
+            {
+                if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp("RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY",CBitcoinAddress(address).ToString().c_str()) != 0 )
+                    voutsum += tx.vout[j].nValue;
+            }
         }
     }
     *zfundsp = zfunds;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 6831585c4..07bf91c89 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4592,7 +4592,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
 
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
-    set<CBitcoinAddress> setAddress;  int32_t i,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow;
+    set<CBitcoinAddress> setAddress;  int32_t i,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -4643,11 +4643,17 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
             if ( eligible > 0 )
             {
-                if ( eligible != komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
+                besttime = 0;
+                if ( eligible == komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
                 {
-                    //fprintf(stderr,"tip.%d validation of winning blocktime failed %u -> eligible.%u\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
-                }
-                else if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
+                    besttime = eligible;
+                    eligible--;
+                    if ( eligible < (uint32_t)tipindex->nTime-300 )
+                        break;
+                    fprintf(stderr,"tip.%d validated winning blocktime %u -> eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                } else continue;
+                eligible = besttime;
+                if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
                 {
                     earliest = eligible;
                     best_scriptPubKey = out.tx->vout[out.i].scriptPubKey;
@@ -4655,7 +4661,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    //fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 27d76b740bb4b59e35335706c6d06b7f604de1d9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 06:02:53 -1100
Subject: [PATCH 171/623] Syntax

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index eb649be99..f328853b3 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1574,7 +1574,7 @@ int64_t komodo_newcoins(int64_t *zfundsp,int32_t nHeight,CBlock *pblock)
             {
                 if ( ExtractDestination(tx.vout[j].scriptPubKey,address) != 0 && strcmp("RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY",CBitcoinAddress(address).ToString().c_str()) != 0 )
                     voutsum += tx.vout[j].nValue;
-                else printf("skip %.8f -> %s\n",dstr(),CBitcoinAddress(address).ToString().c_str());
+                else printf("skip %.8f -> %s\n",dstr(tx.vout[j].nValue),CBitcoinAddress(address).ToString().c_str());
             }
             script = (uint8_t *)tx.vout[j].scriptPubKey.data();
             if ( script == 0 || script[0] != 0x6a )

From b388a2914475cda3196eb45218f99f610283b9eb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 06:22:25 -1100
Subject: [PATCH 172/623] Add loop

---
 src/wallet/rpcwallet.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 07bf91c89..542666755 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4646,11 +4646,14 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 besttime = 0;
                 if ( eligible == komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
                 {
-                    besttime = eligible;
-                    eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime-300 )
-                        break;
-                    fprintf(stderr,"tip.%d validated winning blocktime %u -> eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                    while ( eligible == komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
+                    {
+                        besttime = eligible;
+                        eligible--;
+                        if ( eligible < (uint32_t)tipindex->nTime-300 )
+                            break;
+                        fprintf(stderr,"tip.%d validated winning blocktime %u -> eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                    }
                 } else continue;
                 eligible = besttime;
                 if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )

From beb03773e4bd9c8550b3b48183ed2950ca7e1b02 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 06:37:07 -1100
Subject: [PATCH 173/623] Test

---
 src/wallet/rpcwallet.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 542666755..d5b01a495 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4592,7 +4592,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
 
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
-    set<CBitcoinAddress> setAddress;  int32_t i,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow;
+    set<CBitcoinAddress> setAddress;  int32_t i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -4640,6 +4640,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         CBlockIndex *tipindex;
         if ( (tipindex= chainActive.Tip()) != 0 )
         {
+            m = 0;
             eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
             if ( eligible > 0 )
             {
@@ -4652,7 +4653,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                         eligible--;
                         if ( eligible < (uint32_t)tipindex->nTime-300 )
                             break;
-                        fprintf(stderr,"tip.%d validated winning blocktime %u -> eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,eligible);
+                        m++;
+                        //fprintf(stderr,"tip.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,(double)nValue/COIN,eligible);
                     }
                 } else continue;
                 eligible = besttime;
@@ -4664,7 +4666,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"ht.%d earliest.%u [%d] (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),m,CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From 424aeca00d8ff14e541be3d84a3ee478c0171aa7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 07:04:10 -1100
Subject: [PATCH 174/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d5b01a495..be1be1b28 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4651,7 +4651,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     {
                         besttime = eligible;
                         eligible--;
-                        if ( eligible < (uint32_t)tipindex->nTime-300 )
+                        if ( eligible < (uint32_t)tipindex->nTime+3 )
                             break;
                         m++;
                         //fprintf(stderr,"tip.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,(double)nValue/COIN,eligible);

From 17ec046d90b8966caea92d8c67cb62d1f5051721 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 07:15:26 -1100
Subject: [PATCH 175/623] Test

---
 src/wallet/rpcwallet.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index be1be1b28..765b718a1 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4601,6 +4601,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     memset(utxovoutp,0,sizeof(*utxovoutp));
     memset(utxosig,0,72);
     pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    fprintf(stderr,"Start scan of utxo for staking %u\n",(uint32_t)time(NULL));
     BOOST_FOREACH(const COutput& out, vecOutputs)
     {
         if ( out.nDepth < nMinDepth || out.nDepth > nMaxDepth )
@@ -4702,6 +4703,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             *blocktimep = earliest;
         }
     } //else fprintf(stderr,"no earliest utxo for staking\n");
+    fprintf(stderr,"end scan of utxo for staking %u\n",(uint32_t)time(NULL));
     return(siglen);
 }
 

From 4fc4e200964a77efdb62eec30682642f8c98c704 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 07:22:28 -1100
Subject: [PATCH 176/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 765b718a1..51b9edb8e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4652,7 +4652,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     {
                         besttime = eligible;
                         eligible--;
-                        if ( eligible < (uint32_t)tipindex->nTime+3 )
+                        //if ( eligible < (uint32_t)tipindex->nTime+3 )
                             break;
                         m++;
                         //fprintf(stderr,"tip.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,(double)nValue/COIN,eligible);

From 55dd662212f77be38ad94625d0019fa4fd3a671f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 07:41:29 -1100
Subject: [PATCH 177/623] Optimize staking loop a bit

---
 src/wallet/rpcwallet.cpp | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 51b9edb8e..88759a6f4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4592,7 +4592,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
 
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
-    set<CBitcoinAddress> setAddress;  int32_t i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow;
+    set<CBitcoinAddress> setAddress;  int32_t counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow; CBlockIndex *tipindex; CTxDestination address;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -4601,15 +4601,26 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     memset(utxovoutp,0,sizeof(*utxovoutp));
     memset(utxosig,0,72);
     pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    if ( (tipindex= chainActive.Tip()) == 0 )
+        return(0);
     fprintf(stderr,"Start scan of utxo for staking %u\n",(uint32_t)time(NULL));
     BOOST_FOREACH(const COutput& out, vecOutputs)
     {
+        counter++;
+        if ( chainActive.Tip() != tipindex )
+        {
+            fprintf(stderr,"chain tip changed during staking loop t.%u counter.%d\n",(uint32_t)time(NULL),counter);
+            return(0);
+        }
         if ( out.nDepth < nMinDepth || out.nDepth > nMaxDepth )
         {
             //fprintf(stderr,"komodo_staked invalid depth %d\n",(int32_t)out.nDepth);
             continue;
         }
-        if ( setAddress.size() )
+        CAmount nValue = out.tx->vout[out.i].nValue;
+        if ( nValue < COIN  || !out.fSpendable )
+            continue;
+       /*if ( setAddress.size() )
         {
             CTxDestination address;
             if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
@@ -4624,23 +4635,13 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
             if ( IsMine(*pwalletMain, address) == 0 )
                 continue;
-        }
-        CAmount nValue = out.tx->vout[out.i].nValue;
-        if ( nValue < COIN  || !out.fSpendable )
-            continue;
+        }*/
         const CScript& pk = out.tx->vout[out.i].scriptPubKey;
         //entry.push_back(Pair("generated", out.tx->IsCoinBase()));
-        CTxDestination address;
-        if (ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
-        {
-            //entry.push_back(Pair("address", CBitcoinAddress(address).ToString()));
-            //if (pwalletMain->mapAddressBook.count(address))
-            //    entry.push_back(Pair("account", pwalletMain->mapAddressBook[address].name));
-        }
-        //BlockMap::iterator it = mapBlockIndex.find(pcoinsTip->GetBestBlock());
-        CBlockIndex *tipindex;
-        if ( (tipindex= chainActive.Tip()) != 0 )
+        if ( ExtractDestination(out.tx->vout[out.i].scriptPubKey, address) != 0 )
         {
+            if ( IsMine(*pwalletMain,address) == 0 )
+                continue;
             m = 0;
             eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
             if ( eligible > 0 )
@@ -4703,7 +4704,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             *blocktimep = earliest;
         }
     } //else fprintf(stderr,"no earliest utxo for staking\n");
-    fprintf(stderr,"end scan of utxo for staking %u\n",(uint32_t)time(NULL));
+    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d\n",(uint32_t)time(NULL),counter);
     return(siglen);
 }
 

From aa2ef3abfcbaba8090f930a9358a92c178909c59 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 08:05:00 -1100
Subject: [PATCH 178/623] Test

---
 src/wallet/rpcwallet.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 88759a6f4..9b7e17d4e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4668,7 +4668,9 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
                     *utxovoutp = out.i;
                     *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),m,CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep);
+                    fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),m,CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep,counter);
+                    if ( counter > 1000 )
+                        break;
                 }
             } //else fprintf(stderr,"utxo not eligible\n");
         } //else fprintf(stderr,"no tipindex\n");

From d04efc6ff574bfdd826cdd137bd0aec0d4393f5b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 08:30:38 -1100
Subject: [PATCH 179/623] Test

---
 src/wallet/rpcwallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9b7e17d4e..5073ab845 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4642,6 +4642,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         {
             if ( IsMine(*pwalletMain,address) == 0 )
                 continue;
+continue;
             m = 0;
             eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
             if ( eligible > 0 )

From ac53109534eb6023a960ee2e01862ab2256dc623 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:29:29 -1100
Subject: [PATCH 180/623] Optimized staker

---
 src/komodo_bitcoind.h    |  11 ++
 src/wallet/rpcwallet.cpp | 212 +++++++++++++++++++++++++++------------
 2 files changed, 160 insertions(+), 63 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index f328853b3..58fc643b7 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1185,6 +1185,17 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
     }
 }
 
+uint32_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256 txid,int32_t vout)
+{
+    bits256 addrhash; uint8_t hashbuf[256];
+    vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
+    memcpy(&hashbuf[100],&addrhash,sizeof(addrhash));
+    memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
+    memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
+    vcalc_sha256(0,(uint8_t *)hashp,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
+    return(addrhash.uints[0]);
+}
+
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
     bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio,coinage256; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5073ab845..13ca693f5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4513,6 +4513,7 @@ UniValue z_listoperationids(const UniValue& params, bool fHelp)
 int32_t decode_hex(uint8_t *bytes,int32_t n,char *hex);
 extern std::string NOTARY_PUBKEY;
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 hash,int32_t n,uint32_t blocktime,uint32_t prevtime,char *destaddr);
+int8_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256 txid,int32_t vout);
 
 int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
 {
@@ -4590,10 +4591,86 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
     return(siglen);
 }
 
+struct komodo_staking
+{
+    char address[64];
+    uint256 txid;
+    arith_uint256 hashval;
+    uint64_t nValue;
+    uint32_t segid32;
+    int32_t vout;
+    const CScript scriptPubKey;
+};
+
+struct komodo_staking *komodo_addutxo(struct komodo_staking *array,int32_t *numkp,int32_t *maxkp,uint32_t txtime,uint64_t nValue,uint256 txid,int32_t vout,char *address,uint8_t *hashbuf,const CScript pk)
+{
+    uint256 hash; uint32_t segid32; struct komodo_staking *kp;
+    segid32 = komodo_stakehash(&hash,address,hashbuf,txid,vout);
+    kp = &array[(*numlp)++];
+    memset(*kp,0,sizeof(*kp));
+    strcpy(kp->address,address);
+    kp->txid = txid;
+    kp->vout = vout;
+    kp->hashval = UintToArith256(hash);
+    kp->txtime = txtime;
+    kp->segid32 = segid32;
+    kp->nValue = nValue;
+    kp->scriptPubKey = pk;
+    return(array);
+}
+
+arith_uint256 _komodo_eligible(struct komodo_staking *kp,arith_uint256 ratio,uint32_t blocktime,int32_t iter,int32_t minage,int32_t segid,int32_t nHeight,uint32_t prevtime)
+{
+    int32_t diff; uint64_t coinage; arith_uint256 coinage256,hashval;
+    diff = (iter + blocktime - kp->txtime - minage);
+    if ( diff < 0 )
+        diff = 60;
+    else if ( diff > 3600*24*30 )
+        diff = 3600*24*30;
+    if ( iter > 0 )
+        diff += segid*2;
+    coinage = ((uint64_t)kp->nValue/COIN * diff);
+    if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
+        coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
+    coinage256 = arith_uint256(coinage+1);
+    hashval = ratio * (kp->hashval / coinage256);
+    if ( nHeight >= 900 && nHeight < 916 )
+        hashval = (hashval / coinage256);
+    return(hashval);
+}
+
+uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komodo_staking *kp,int32_t nHeight,uint32_t blocktime,uint32_t prevtime,int32_t minage)
+{
+    int32_t maxiters = 180;
+    int32_t segid,iter,diff; uint64_t coinage; arith_uint256 hashval,coinage256;
+    segid = ((nHeight + kp->segid32) & 0x3f);
+    hashval = _komodo_eligible(kp,ratio,blocktime,maxiters,minage,segid,nHeight,prevtime);
+    if ( hashval <= bnTarget )
+    {
+        for (iter=0; iter<maxiters; iter++)
+        {
+            if ( blocktime+iter+segid*2 < kp->txtime+minage )
+                continue;
+            hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime);
+            if ( hashval <= bnTarget )
+            {
+                //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
+                blocktime += iter;
+                blocktime += segid * 2;
+                return(blocktime);
+            }
+        }
+    }
+    return(0);
+}
+
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
-    set<CBitcoinAddress> setAddress;  int32_t counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; bool fNegative,fOverflow; CBlockIndex *tipindex; CTxDestination address;
+    static struct komodo_staking *array; static int32_t numkp,maxkp; static uint32_t lasttime;
+    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 ratio,mindiff,hashBlock,ratio;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
+    mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
+    ratio = (mindiff / bnTarget);
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
     *utxovaluep = 0;
@@ -4603,79 +4680,88 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
     if ( (tipindex= chainActive.Tip()) == 0 )
         return(0);
-    fprintf(stderr,"Start scan of utxo for staking %u\n",(uint32_t)time(NULL));
-    BOOST_FOREACH(const COutput& out, vecOutputs)
+    nHeight = tipindex->nHeight + 1;
+    if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
+        minage = 6000;
+    komodo_segids(hashbuf,nHeight-101,100);
+    fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
+    if ( time(NULL) > lasttime+600 )
     {
-        counter++;
-        if ( chainActive.Tip() != tipindex )
+        if ( array != 0 )
         {
-            fprintf(stderr,"chain tip changed during staking loop t.%u counter.%d\n",(uint32_t)time(NULL),counter);
-            return(0);
+            free(array);
+            array = 0;
+            maxkp = numkp = 0;
         }
-        if ( out.nDepth < nMinDepth || out.nDepth > nMaxDepth )
+        BOOST_FOREACH(const COutput& out, vecOutputs)
         {
-            //fprintf(stderr,"komodo_staked invalid depth %d\n",(int32_t)out.nDepth);
-            continue;
-        }
-        CAmount nValue = out.tx->vout[out.i].nValue;
-        if ( nValue < COIN  || !out.fSpendable )
-            continue;
-       /*if ( setAddress.size() )
-        {
-            CTxDestination address;
-            if (!ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
+            if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
             {
-                fprintf(stderr,"komodo_staked ExtractDestination error\n");
+                fprintf(stderr,"chain tip changed during staking loop t.%u counter.%d\n",(uint32_t)time(NULL),counter);
+                return(0);
+            }
+            counter++;
+            if ( out.nDepth < nMinDepth || out.nDepth > nMaxDepth )
+            {
+                //fprintf(stderr,"komodo_staked invalid depth %d\n",(int32_t)out.nDepth);
                 continue;
             }
-            if (!setAddress.count(address))
+            CAmount nValue = out.tx->vout[out.i].nValue;
+            if ( nValue < COIN  || !out.fSpendable )
+                continue;
+            const CScript& pk = out.tx->vout[out.i].scriptPubKey;
+            if ( ExtractDestination(pk,address) != 0 )
             {
-                fprintf(stderr,"komodo_staked setAddress.count error\n");
-                continue;
-            }
-            if ( IsMine(*pwalletMain, address) == 0 )
-                continue;
-        }*/
-        const CScript& pk = out.tx->vout[out.i].scriptPubKey;
-        //entry.push_back(Pair("generated", out.tx->IsCoinBase()));
-        if ( ExtractDestination(out.tx->vout[out.i].scriptPubKey, address) != 0 )
-        {
-            if ( IsMine(*pwalletMain,address) == 0 )
-                continue;
-continue;
-            m = 0;
-            eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
-            if ( eligible > 0 )
-            {
-                besttime = 0;
-                if ( eligible == komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
+                if ( IsMine(*pwalletMain,address) == 0 )
+                    continue;
+                if ( GetTransaction(hash,tx,hashBlock,true) != 0 && (pindex= mapBlockIndex[hashBlock]) != 0 )
                 {
-                    while ( eligible == komodo_stake(1,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,eligible,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str()) )
-                    {
-                        besttime = eligible;
-                        eligible--;
-                        //if ( eligible < (uint32_t)tipindex->nTime+3 )
-                            break;
-                        m++;
-                        //fprintf(stderr,"tip.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",(uint32_t)tipindex->nHeight,*blocktimep,(double)nValue/COIN,eligible);
-                    }
-                } else continue;
-                eligible = besttime;
-                if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
-                {
-                    earliest = eligible;
-                    best_scriptPubKey = out.tx->vout[out.i].scriptPubKey;
-                    *utxovaluep = (uint64_t)nValue;
-                    decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
-                    *utxovoutp = out.i;
-                    *txtimep = (uint32_t)out.tx->nLockTime;
-                    fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d\n",(uint32_t)tipindex->nHeight+1,earliest,(int32_t)(earliest- *blocktimep),m,CBitcoinAddress(address).ToString().c_str(),(double)nValue/COIN,*txtimep,counter);
-                    if ( counter > 1000 )
-                        break;
+                    array = komodo_addutxo(array,&numkp,&maxkp,(uint32_t)pindex->nTime,(uint64_t)nValue,out.tx->GetHash(),out.i,(char *)CBitcoinAddress(address).ToString().c_str(),hashbuf,pk);
                 }
-            } //else fprintf(stderr,"utxo not eligible\n");
-        } //else fprintf(stderr,"no tipindex\n");
+            }
+        }
+        lasttime = (uint32_t)time(NULL);
+        fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
+    for (i=0; i<numkp; i++)
+    {
+        kp = &array[i];
+        eligible = komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage);
+        //eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
+        if ( eligible > 0 )
+        {
+            besttime = m = 0;
+            if ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
+            {
+                while ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
+                {
+                    besttime = eligible;
+                    eligible--;
+                    if ( eligible < (uint32_t)tipindex->nTime+3 )
+                        break;
+                    m++;
+                    fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)nValue/COIN,eligible);
+                }
+            }
+            else
+            {
+                fprintf(stderr,"ht.%d error validating winning blocktime %u -> %.8f eligible.%u test prior\n",nHeight,*blocktimep,(double)nValue/COIN,eligible);
+                continue;
+            }
+            eligible = besttime;
+            if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
+            {
+                earliest = eligible;
+                best_scriptPubKey = kp->scriptPubKey; //out.tx->vout[out.i].scriptPubKey;
+                *utxovaluep = (uint64_t)kp->nValue;
+                //decode_hex((uint8_t *)utxotxidp,32,(char *)out.tx->GetHash().GetHex().c_str());
+                decode_hex((uint8_t *)utxotxidp,32,(char *)kp->txid.GetHex().c_str());
+                *utxovoutp = kp->vout;
+                *txtimep = kp->txtime;//(uint32_t)out.tx->nLockTime;
+                fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d\n",nHeight,earliest,(int32_t)(earliest- *blocktimep),m,kp->address,(double)kp->nValue/COIN,*txtimep,counter);
+            }
+        } //else fprintf(stderr,"utxo not eligible\n");
+    } //else fprintf(stderr,"no tipindex\n");
     if ( earliest != 0 )
     {
         bool signSuccess; SignatureData sigdata; uint64_t txfee; uint8_t *ptr; uint256 revtxid,utxotxid;

From 5649e3d39d0350598fa5bbeaf08c8a570fc7cb75 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:30:50 -1100
Subject: [PATCH 181/623] Test

---
 src/komodo_bitcoind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 58fc643b7..fad483d3f 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1187,7 +1187,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256 txid,int32_t vout)
 {
-    bits256 addrhash; uint8_t hashbuf[256];
+    bits256 addrhash; 
     vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
     memcpy(&hashbuf[100],&addrhash,sizeof(addrhash));
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));

From 1273624d3e440bd9578f246b45531dd4661dd7c4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:38:45 -1100
Subject: [PATCH 182/623] Test

---
 src/komodo_bitcoind.h    |  2 +-
 src/wallet/rpcwallet.cpp | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index fad483d3f..d624dc72a 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1187,7 +1187,7 @@ int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n)
 
 uint32_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256 txid,int32_t vout)
 {
-    bits256 addrhash; 
+    bits256 addrhash;
     vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
     memcpy(&hashbuf[100],&addrhash,sizeof(addrhash));
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 13ca693f5..d9de578d5 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4514,6 +4514,7 @@ int32_t decode_hex(uint8_t *bytes,int32_t n,char *hex);
 extern std::string NOTARY_PUBKEY;
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 hash,int32_t n,uint32_t blocktime,uint32_t prevtime,char *destaddr);
 int8_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256 txid,int32_t vout);
+int32_t komodo_segids(uint8_t *hashbuf,int32_t height,int32_t n);
 
 int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33)
 {
@@ -4597,17 +4598,22 @@ struct komodo_staking
     uint256 txid;
     arith_uint256 hashval;
     uint64_t nValue;
-    uint32_t segid32;
+    uint32_t segid32,txtime;
     int32_t vout;
-    const CScript scriptPubKey;
+    CScript scriptPubKey;
 };
 
-struct komodo_staking *komodo_addutxo(struct komodo_staking *array,int32_t *numkp,int32_t *maxkp,uint32_t txtime,uint64_t nValue,uint256 txid,int32_t vout,char *address,uint8_t *hashbuf,const CScript pk)
+struct komodo_staking *komodo_addutxo(struct komodo_staking *array,int32_t *numkp,int32_t *maxkp,uint32_t txtime,uint64_t nValue,uint256 txid,int32_t vout,char *address,uint8_t *hashbuf,CScript pk)
 {
     uint256 hash; uint32_t segid32; struct komodo_staking *kp;
     segid32 = komodo_stakehash(&hash,address,hashbuf,txid,vout);
-    kp = &array[(*numlp)++];
-    memset(*kp,0,sizeof(*kp));
+    if ( *numkp >= *maxkp )
+    {
+        *maxkp += 1000;
+        array = (struct komodo_staking *)realloc(array,sizeof(*array) * (*maxkp));
+    }
+    kp = &array[(*numkp)++];
+    memset(kp,0,sizeof(*kp));
     strcpy(kp->address,address);
     kp->txid = txid;
     kp->vout = vout;
@@ -4667,7 +4673,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
     static struct komodo_staking *array; static int32_t numkp,maxkp; static uint32_t lasttime;
-    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 ratio,mindiff,hashBlock,ratio;
+    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
@@ -4716,7 +4722,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     continue;
                 if ( GetTransaction(hash,tx,hashBlock,true) != 0 && (pindex= mapBlockIndex[hashBlock]) != 0 )
                 {
-                    array = komodo_addutxo(array,&numkp,&maxkp,(uint32_t)pindex->nTime,(uint64_t)nValue,out.tx->GetHash(),out.i,(char *)CBitcoinAddress(address).ToString().c_str(),hashbuf,pk);
+                    array = komodo_addutxo(array,&numkp,&maxkp,(uint32_t)pindex->nTime,(uint64_t)nValue,out.tx->GetHash(),out.i,(char *)CBitcoinAddress(address).ToString().c_str(),hashbuf,(CScript)pk);
                 }
             }
         }

From aecf58592c68a873893e4c8f476b6014d214f6d7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:41:08 -1100
Subject: [PATCH 183/623] Fix

---
 src/wallet/rpcwallet.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d9de578d5..3633c56e4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4720,7 +4720,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             {
                 if ( IsMine(*pwalletMain,address) == 0 )
                     continue;
-                if ( GetTransaction(hash,tx,hashBlock,true) != 0 && (pindex= mapBlockIndex[hashBlock]) != 0 )
+                if ( GetTransaction(out.tx->GetHash(),tx,hashBlock,true) != 0 && (pindex= mapBlockIndex[hashBlock]) != 0 )
                 {
                     array = komodo_addutxo(array,&numkp,&maxkp,(uint32_t)pindex->nTime,(uint64_t)nValue,out.tx->GetHash(),out.i,(char *)CBitcoinAddress(address).ToString().c_str(),hashbuf,(CScript)pk);
                 }
@@ -4746,16 +4746,16 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     if ( eligible < (uint32_t)tipindex->nTime+3 )
                         break;
                     m++;
-                    fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)nValue/COIN,eligible);
+                    fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);
                 }
             }
             else
             {
-                fprintf(stderr,"ht.%d error validating winning blocktime %u -> %.8f eligible.%u test prior\n",nHeight,*blocktimep,(double)nValue/COIN,eligible);
+                fprintf(stderr,"ht.%d error validating winning blocktime %u -> %.8f eligible.%u test prior\n",nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);
                 continue;
             }
             eligible = besttime;
-            if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || nValue < *utxovaluep)) )
+            if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || kp->nValue < *utxovaluep)) )
             {
                 earliest = eligible;
                 best_scriptPubKey = kp->scriptPubKey; //out.tx->vout[out.i].scriptPubKey;

From 76df25be7a6f964272eb4383b698375c95351726 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:51:01 -1100
Subject: [PATCH 184/623] Test

---
 src/wallet/rpcwallet.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3633c56e4..c37e78889 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4732,8 +4732,9 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     for (i=0; i<numkp; i++)
     {
         kp = &array[i];
-        eligible = komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage);
-        //eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
+        if ( (eligible= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
+            continue;
+        eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
         if ( eligible > 0 )
         {
             besttime = m = 0;

From ecae680bfa8f842849ca057233ea5973d7daec20 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 10:52:42 -1100
Subject: [PATCH 185/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c37e78889..babeabe6e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4734,7 +4734,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         kp = &array[i];
         if ( (eligible= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
             continue;
-        eligible = komodo_stake(0,bnTarget,(uint32_t)tipindex->nHeight+1,out.tx->GetHash(),out.i,0,(uint32_t)tipindex->nTime+27,(char *)CBitcoinAddress(address).ToString().c_str());
+        eligible = komodo_stake(0,bnTarget,nHeight,kp->txid,kp->vout,0,(uint32_t)tipindex->nTime+27,kp->address);
         if ( eligible > 0 )
         {
             besttime = m = 0;

From 011b0a24334378c2a71ef3a069efac111f3afeed Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 11:02:23 -1100
Subject: [PATCH 186/623] Test

---
 src/wallet/rpcwallet.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index babeabe6e..59516472b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4691,7 +4691,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    if ( time(NULL) > lasttime+600 )
+    //if ( time(NULL) > lasttime+600 )
     {
         if ( array != 0 )
         {
@@ -4747,7 +4747,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                     if ( eligible < (uint32_t)tipindex->nTime+3 )
                         break;
                     m++;
-                    fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);
+                    //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);
                 }
             }
             else
@@ -4769,6 +4769,12 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");
+    if ( array != 0 )
+    {
+        free(array);
+        array = 0;
+        maxkp = numkp = 0;
+    }
     if ( earliest != 0 )
     {
         bool signSuccess; SignatureData sigdata; uint64_t txfee; uint8_t *ptr; uint256 revtxid,utxotxid;
@@ -4800,7 +4806,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             *blocktimep = earliest;
         }
     } //else fprintf(stderr,"no earliest utxo for staking\n");
-    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d\n",(uint32_t)time(NULL),counter);
+    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d numkp.%d\n",(uint32_t)time(NULL),counter,numkp);
     return(siglen);
 }
 

From 518e079e9172d69e211ed783bb7873f36b1e0333 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 11:14:53 -1100
Subject: [PATCH 187/623] Test

---
 src/wallet/rpcwallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 59516472b..384c23001 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4740,11 +4740,12 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             besttime = m = 0;
             if ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
             {
+                fprintf(stderr,"ht.%d validated winning [%d] -> %.8f eligible.%u test prior\n",nHeight,(int32_t)(eligible - *blocktimep),(double)kp->nValue/COIN,eligible);
                 while ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime+3 )
+                    if ( eligible < (uint32_t)tipindex->nTime-180 )
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);

From 1d8f1b466afec494601820a696923f53ff68f6ca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 11:18:36 -1100
Subject: [PATCH 188/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 384c23001..cc8f63040 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4740,7 +4740,6 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             besttime = m = 0;
             if ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
             {
-                fprintf(stderr,"ht.%d validated winning [%d] -> %.8f eligible.%u test prior\n",nHeight,(int32_t)(eligible - *blocktimep),(double)kp->nValue/COIN,eligible);
                 while ( eligible == komodo_stake(1,bnTarget,nHeight,kp->txid,kp->vout,eligible,(uint32_t)tipindex->nTime+27,kp->address) )
                 {
                     besttime = eligible;
@@ -4757,6 +4756,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 continue;
             }
             eligible = besttime;
+            fprintf(stderr,"ht.%d validated winning [%d] -> %.8f eligible.%u test prior\n",nHeight,(int32_t)(eligible - *blocktimep),(double)kp->nValue/COIN,eligible);
             if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || kp->nValue < *utxovaluep)) )
             {
                 earliest = eligible;

From 817aedba536f3573c715a90b49c24a2d240a68a7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 11:53:42 -1100
Subject: [PATCH 189/623] Test

---
 src/wallet/rpcwallet.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index cc8f63040..7c1b81af1 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4691,13 +4691,14 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    //if ( time(NULL) > lasttime+600 )
+    if ( time(NULL) > lasttime+60 )
     {
         if ( array != 0 )
         {
             free(array);
             array = 0;
             maxkp = numkp = 0;
+            lasttime = 0;
         }
         BOOST_FOREACH(const COutput& out, vecOutputs)
         {
@@ -4731,6 +4732,11 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     }
     for (i=0; i<numkp; i++)
     {
+        if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
+        {
+            fprintf(stderr,"chain tip changed during staking loop t.%u counter.%d\n",(uint32_t)time(NULL),counter);
+            return(0);
+        }
         kp = &array[i];
         if ( (eligible= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
             continue;
@@ -4770,11 +4776,12 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");
-    if ( array != 0 )
+    if ( 0 && array != 0 )
     {
         free(array);
         array = 0;
         maxkp = numkp = 0;
+        lasttime = 0;
     }
     if ( earliest != 0 )
     {

From a87b6f5f629a2d55c2db677155e5347f6dcad7e5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 11:55:01 -1100
Subject: [PATCH 190/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7c1b81af1..8a0d83d1f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4750,7 +4750,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime-180 )
+                    if ( eligible < (uint32_t)tipindex->nTime-60 )
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);

From cbce9f1f65a3bca9c373577178d6e6447d09dc90 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Sat, 14 Jul 2018 23:00:09 +0000
Subject: [PATCH 191/623] WIP debugging why leveldb iterator is broke

---
 src/main.cpp | 14 +++++++++++---
 src/txdb.cpp | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b08d2e522..15d74adb2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -590,10 +590,18 @@ CBlockTreeDB *pblocktree = NULL;
 
 int64_t komodo_snapshot()
 {
+    fprintf(stderr,"komodo_snapshot\n");
     int64_t total = -1;
-    if ( pblocktree != 0 )
-        total = pblocktree->Snapshot();
-    else fprintf(stderr,"null pblocktree start with -addressindex=true\n");
+    if (fAddressIndex) {
+	    if ( pblocktree != 0 ) {
+		total = pblocktree->Snapshot();
+	    } else {
+		fprintf(stderr,"null pblocktree start with -addressindex=true\n");
+	    }
+    } else {
+	    fprintf(stderr,"getsnapshot requires -addressindex=true\n");
+    }
+    fprintf(stderr,"total=%li\n", total);
     return(total);
 }
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index a0f764962..fa3766faf 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,18 +402,31 @@ int64_t CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = -1; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
-    pcursor->SeekToFirst();
+    //boost::scoped_ptr<leveldb::Iterator> pcursor(pdb->NewIterator(leveldb::ReadOptions()) );
+    //boost::scoped_ptr<leveldb::Iterator> pcursor(db->NewIterator());
+    fprintf(stderr,"Snapshot\n");
+	
+    //pcursor->SeekToFirst();
+    pcursor->SeekToLast();
+    fprintf(stderr,"SeekToLast\n");
+
     fprintf(stderr,"pcursor iterate\n");
     while (pcursor->Valid())
     {
+	fprintf(stderr,"pcursor valid\n");
         boost::this_thread::interruption_point();
+	fprintf(stderr,"about to try\n");
         try
         {
             leveldb::Slice slKey = pcursor->key();
+	    fprintf(stderr,"made slice\n");
             CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
+	    fprintf(stderr,"made ssKey\n");
             CAddressIndexKey indexKey;
             ssKey >> chType;
+	    fprintf(stderr,"made chType\n");
             ssKey >> indexKey;
+	    fprintf(stderr,"made indexKey\n");
             fprintf(stderr,"chType.%d\n",chType);
             if ( chType == DB_ADDRESSINDEX )
             {
@@ -428,12 +441,13 @@ int64_t CBlockTreeDB::Snapshot()
                         total = (int64_t)nValue;
                     else total += (int64_t)nValue;
                     //addressIndex.push_back(make_pair(indexKey, nValue));
-                    pcursor->Next();
+                    pcursor->Prev();
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
             } else { break; }
         } catch (const std::exception& e) {
+	    fprintf(stderr, "%s: LevelDB exception! - %s\n", __func__, e.what());
             break;
         }
     }

From 45c4bfef6434afc0f351566691257b49a126cebc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:02:20 -1100
Subject: [PATCH 192/623] Test

---
 src/wallet/rpcwallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8a0d83d1f..d068ac18d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4691,7 +4691,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    if ( time(NULL) > lasttime+60 )
+    //if ( time(NULL) > lasttime+60 )
     {
         if ( array != 0 )
         {
@@ -4776,7 +4776,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");
-    if ( 0 && array != 0 )
+    if ( array != 0 )
     {
         free(array);
         array = 0;

From d5c81c59bbc70ea5067c316cf34a73960cc181a8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:11:43 -1100
Subject: [PATCH 193/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d068ac18d..28166a6fa 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4678,7 +4678,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
     assert(pwalletMain != NULL);
-    LOCK2(cs_main, pwalletMain->cs_wallet);
+    //LOCK2(cs_main, pwalletMain->cs_wallet);
     *utxovaluep = 0;
     memset(utxotxidp,0,sizeof(*utxotxidp));
     memset(utxovoutp,0,sizeof(*utxovoutp));

From b8b06863603f0f0b284731d107cb4efc0de73447 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:21:33 -1100
Subject: [PATCH 194/623] Test

---
 src/wallet/rpcwallet.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 28166a6fa..d11300c96 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4660,7 +4660,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
             hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime);
             if ( hashval <= bnTarget )
             {
-                //fprintf(stderr,"winner blocktime.%u iter.%d segid.%d\n",blocktime,iter,segid);
+                fprintf(stderr,"winner %.8f blocktime.%u iter.%d segid.%d\n",(double)kp->nValue/COIN,blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
                 return(blocktime);
@@ -4673,12 +4673,12 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
     static struct komodo_staking *array; static int32_t numkp,maxkp; static uint32_t lasttime;
-    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
+    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,eligible2,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
     assert(pwalletMain != NULL);
-    //LOCK2(cs_main, pwalletMain->cs_wallet);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
     *utxovaluep = 0;
     memset(utxotxidp,0,sizeof(*utxotxidp));
     memset(utxovoutp,0,sizeof(*utxovoutp));
@@ -4691,7 +4691,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    //if ( time(NULL) > lasttime+60 )
+    if ( time(NULL) > lasttime+60 )
     {
         if ( array != 0 )
         {
@@ -4730,7 +4730,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         lasttime = (uint32_t)time(NULL);
         fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
-    for (i=0; i<numkp; i++)
+    for (i=0; i<numkp&&i<100; i++)
     {
         if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
         {
@@ -4738,9 +4738,10 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             return(0);
         }
         kp = &array[i];
-        if ( (eligible= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
+        if ( (eligible2= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
             continue;
         eligible = komodo_stake(0,bnTarget,nHeight,kp->txid,kp->vout,0,(uint32_t)tipindex->nTime+27,kp->address);
+        fprintf(stderr,"i.%d %u vs %u\n",i,eligible2,eligible);
         if ( eligible > 0 )
         {
             besttime = m = 0;

From cfe64b2b487c991b8775a875949025bfb0ed0299 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:26:38 -1100
Subject: [PATCH 195/623] Test

---
 src/wallet/rpcwallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d11300c96..987e6db62 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4651,6 +4651,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
     int32_t segid,iter,diff; uint64_t coinage; arith_uint256 hashval,coinage256;
     segid = ((nHeight + kp->segid32) & 0x3f);
     hashval = _komodo_eligible(kp,ratio,blocktime,maxiters,minage,segid,nHeight,prevtime);
+    fprintf(stderr,"b.%u minage.%d segid.%d ht.%d prev.%u\n",blocktime,minage,segid,nHeight,prevtime);
     if ( hashval <= bnTarget )
     {
         for (iter=0; iter<maxiters; iter++)
@@ -4777,7 +4778,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");
-    if ( array != 0 )
+    if ( 0 && array != 0 )
     {
         free(array);
         array = 0;

From cca0bdc6c4980c790e8fa90e02db51c9504924b1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:35:26 -1100
Subject: [PATCH 196/623] Test

---
 src/wallet/rpcwallet.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 987e6db62..1977bb4df 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4645,20 +4645,24 @@ arith_uint256 _komodo_eligible(struct komodo_staking *kp,arith_uint256 ratio,uin
     return(hashval);
 }
 
-uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komodo_staking *kp,int32_t nHeight,uint32_t blocktime,uint32_t prevtime,int32_t minage)
+uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komodo_staking *kp,int32_t nHeight,uint32_t blocktime,uint32_t prevtime,int32_t minage,uint8_t *hashbuf)
 {
-    int32_t maxiters = 180;
+    int32_t maxiters = 180; uint256 hash;
     int32_t segid,iter,diff; uint64_t coinage; arith_uint256 hashval,coinage256;
+    komodo_stakehash(&hash,kp->address,hashbuf,kp->txid,kp->vout);
+    kp->hashval = UintToArith256(hash);
     segid = ((nHeight + kp->segid32) & 0x3f);
     hashval = _komodo_eligible(kp,ratio,blocktime,maxiters,minage,segid,nHeight,prevtime);
-    fprintf(stderr,"b.%u minage.%d segid.%d ht.%d prev.%u\n",blocktime,minage,segid,nHeight,prevtime);
+    for (int i=32; i>=0; i--)
+        fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+    fprintf(stderr," b.%u minage.%d segid.%d ht.%d prev.%u\n",blocktime,minage,segid,nHeight,prevtime);
     if ( hashval <= bnTarget )
     {
         for (iter=0; iter<maxiters; iter++)
         {
             if ( blocktime+iter+segid*2 < kp->txtime+minage )
                 continue;
-            hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime);
+            hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime,hashbuf);
             if ( hashval <= bnTarget )
             {
                 fprintf(stderr,"winner %.8f blocktime.%u iter.%d segid.%d\n",(double)kp->nValue/COIN,blocktime,iter,segid);
@@ -4739,7 +4743,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             return(0);
         }
         kp = &array[i];
-        if ( (eligible2= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage)) == 0 )
+        if ( (eligible2= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage,hashbuf)) == 0 )
             continue;
         eligible = komodo_stake(0,bnTarget,nHeight,kp->txid,kp->vout,0,(uint32_t)tipindex->nTime+27,kp->address);
         fprintf(stderr,"i.%d %u vs %u\n",i,eligible2,eligible);

From 37d6294dbe692798fac29b536754a6cc8bf00425 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:36:44 -1100
Subject: [PATCH 197/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1977bb4df..5612f5f79 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4662,7 +4662,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
         {
             if ( blocktime+iter+segid*2 < kp->txtime+minage )
                 continue;
-            hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime,hashbuf);
+            hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime);
             if ( hashval <= bnTarget )
             {
                 fprintf(stderr,"winner %.8f blocktime.%u iter.%d segid.%d\n",(double)kp->nValue/COIN,blocktime,iter,segid);

From d3ce166fb8b21972151ecb7673c8f9bbbd942194 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:41:30 -1100
Subject: [PATCH 198/623] Test

---
 src/wallet/rpcwallet.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5612f5f79..824eb60b9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4653,9 +4653,9 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
     kp->hashval = UintToArith256(hash);
     segid = ((nHeight + kp->segid32) & 0x3f);
     hashval = _komodo_eligible(kp,ratio,blocktime,maxiters,minage,segid,nHeight,prevtime);
-    for (int i=32; i>=0; i--)
-        fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
-    fprintf(stderr," b.%u minage.%d segid.%d ht.%d prev.%u\n",blocktime,minage,segid,nHeight,prevtime);
+    //for (int i=32; i>=0; i--)
+    //    fprintf(stderr,"%02x",((uint8_t *)&hashval)[i]);
+    //fprintf(stderr," b.%u minage.%d segid.%d ht.%d prev.%u\n",blocktime,minage,segid,nHeight,prevtime);
     if ( hashval <= bnTarget )
     {
         for (iter=0; iter<maxiters; iter++)
@@ -4695,8 +4695,10 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
+    if ( blocktime > tipindex->nTime+60 )
+        blocktime = tipindex->nTime+60;
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    if ( time(NULL) > lasttime+60 )
+    if ( time(NULL) > lasttime+100 )
     {
         if ( array != 0 )
         {
@@ -4735,7 +4737,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         lasttime = (uint32_t)time(NULL);
         fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
-    for (i=0; i<numkp&&i<100; i++)
+    for (i=0; i<numkp; i++)
     {
         if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
         {

From 6e7dcf31067a4501dd6caf2643b58c1b5936ffe4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:42:51 -1100
Subject: [PATCH 199/623] Test

---
 src/wallet/rpcwallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 824eb60b9..a8575497f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4695,8 +4695,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
     komodo_segids(hashbuf,nHeight-101,100);
-    if ( blocktime > tipindex->nTime+60 )
-        blocktime = tipindex->nTime+60;
+    if ( *blocktimep > tipindex->nTime+60 )
+        *blocktimep = tipindex->nTime+60;
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
     if ( time(NULL) > lasttime+100 )
     {

From 1973dfa0505aa51cf471bc67aac2919a00615e82 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 12:49:18 -1100
Subject: [PATCH 200/623] Test

---
 src/wallet/rpcwallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a8575497f..330c5f253 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4665,7 +4665,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
             hashval = _komodo_eligible(kp,ratio,blocktime,iter,minage,segid,nHeight,prevtime);
             if ( hashval <= bnTarget )
             {
-                fprintf(stderr,"winner %.8f blocktime.%u iter.%d segid.%d\n",(double)kp->nValue/COIN,blocktime,iter,segid);
+                //fprintf(stderr,"winner %.8f blocktime.%u iter.%d segid.%d\n",(double)kp->nValue/COIN,blocktime,iter,segid);
                 blocktime += iter;
                 blocktime += segid * 2;
                 return(blocktime);
@@ -4698,7 +4698,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     if ( *blocktimep > tipindex->nTime+60 )
         *blocktimep = tipindex->nTime+60;
     fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
-    if ( time(NULL) > lasttime+100 )
+    if ( time(NULL) > lasttime+600 )
     {
         if ( array != 0 )
         {
@@ -4748,7 +4748,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         if ( (eligible2= komodo_eligible(bnTarget,ratio,kp,nHeight,*blocktimep,(uint32_t)tipindex->nTime+27,minage,hashbuf)) == 0 )
             continue;
         eligible = komodo_stake(0,bnTarget,nHeight,kp->txid,kp->vout,0,(uint32_t)tipindex->nTime+27,kp->address);
-        fprintf(stderr,"i.%d %u vs %u\n",i,eligible2,eligible);
+        //fprintf(stderr,"i.%d %u vs %u\n",i,eligible2,eligible);
         if ( eligible > 0 )
         {
             besttime = m = 0;

From 2d4811152640e6e4413f811af0b02cc8605022b6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 13:02:35 -1100
Subject: [PATCH 201/623] -prints

---
 src/wallet/rpcwallet.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 330c5f253..c55a306ed 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4678,7 +4678,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
     static struct komodo_staking *array; static int32_t numkp,maxkp; static uint32_t lasttime;
-    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,eligible2,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
+    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t winners,segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,eligible2,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
@@ -4697,7 +4697,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     komodo_segids(hashbuf,nHeight-101,100);
     if ( *blocktimep > tipindex->nTime+60 )
         *blocktimep = tipindex->nTime+60;
-    fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
+    //fprintf(stderr,"Start scan of utxo for staking %u ht.%d\n",(uint32_t)time(NULL),nHeight);
     if ( time(NULL) > lasttime+600 )
     {
         if ( array != 0 )
@@ -4737,7 +4737,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         lasttime = (uint32_t)time(NULL);
         fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
-    for (i=0; i<numkp; i++)
+    for (i=winners=0; i<numkp; i++)
     {
         if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
         {
@@ -4770,7 +4770,8 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 continue;
             }
             eligible = besttime;
-            fprintf(stderr,"ht.%d validated winning [%d] -> %.8f eligible.%u test prior\n",nHeight,(int32_t)(eligible - *blocktimep),(double)kp->nValue/COIN,eligible);
+            winners++;
+            //fprintf(stderr,"ht.%d validated winning [%d] -> %.8f eligible.%u test prior\n",nHeight,(int32_t)(eligible - tipindex->nTime),(double)kp->nValue/COIN,eligible);
             if ( earliest == 0 || eligible < earliest || (eligible == earliest && (*utxovaluep == 0 || kp->nValue < *utxovaluep)) )
             {
                 earliest = eligible;
@@ -4780,11 +4781,11 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 decode_hex((uint8_t *)utxotxidp,32,(char *)kp->txid.GetHex().c_str());
                 *utxovoutp = kp->vout;
                 *txtimep = kp->txtime;//(uint32_t)out.tx->nLockTime;
-                fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d\n",nHeight,earliest,(int32_t)(earliest- *blocktimep),m,kp->address,(double)kp->nValue/COIN,*txtimep,counter);
+                fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d winnders.%d\n",nHeight,earliest,(int32_t)(earliest - tipindex->nTime),m,kp->address,(double)kp->nValue/COIN,*txtimep,counter,winners);
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");
-    if ( 0 && array != 0 )
+    if ( numkp < 10000 && array != 0 )
     {
         free(array);
         array = 0;
@@ -4822,7 +4823,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             *blocktimep = earliest;
         }
     } //else fprintf(stderr,"no earliest utxo for staking\n");
-    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d numkp.%d\n",(uint32_t)time(NULL),counter,numkp);
+    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d numkp.%d winners.%d\n",(uint32_t)time(NULL),counter,numkp,winners);
     return(siglen);
 }
 

From 8cbf8d6a12fee8999c1a8b591e606b681e31b2f0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 13:12:08 -1100
Subject: [PATCH 202/623] Test

---
 src/wallet/rpcwallet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c55a306ed..debec99b6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4735,7 +4735,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             }
         }
         lasttime = (uint32_t)time(NULL);
-        fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
+        //fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
     for (i=winners=0; i<numkp; i++)
     {
@@ -4758,7 +4758,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime-60 )
+                    if ( eligible < (uint32_t)tipindex->nTime+30 )
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);
@@ -4823,7 +4823,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
             *blocktimep = earliest;
         }
     } //else fprintf(stderr,"no earliest utxo for staking\n");
-    fprintf(stderr,"end scan of utxo for staking t.%u counter.%d numkp.%d winners.%d\n",(uint32_t)time(NULL),counter,numkp,winners);
+    //fprintf(stderr,"end scan of utxo for staking t.%u counter.%d numkp.%d winners.%d\n",(uint32_t)time(NULL),counter,numkp,winners);
     return(siglen);
 }
 

From 779b7b3a5b5a472bd0893807bbbf023fa4313360 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 13:16:18 -1100
Subject: [PATCH 203/623] Typo

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index debec99b6..23ba352dd 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4781,7 +4781,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 decode_hex((uint8_t *)utxotxidp,32,(char *)kp->txid.GetHex().c_str());
                 *utxovoutp = kp->vout;
                 *txtimep = kp->txtime;//(uint32_t)out.tx->nLockTime;
-                fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d winnders.%d\n",nHeight,earliest,(int32_t)(earliest - tipindex->nTime),m,kp->address,(double)kp->nValue/COIN,*txtimep,counter,winners);
+                fprintf(stderr,"ht.%d earliest.%u [%d].%d (%s) nValue %.8f locktime.%u counter.%d winners.%d\n",nHeight,earliest,(int32_t)(earliest - tipindex->nTime),m,kp->address,(double)kp->nValue/COIN,*txtimep,counter,winners);
             }
         } //else fprintf(stderr,"utxo not eligible\n");
     } //else fprintf(stderr,"no tipindex\n");

From 8afd5b3a0444e241dbcd885ffc300f580e60dcf3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 13:25:57 -1100
Subject: [PATCH 204/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 23ba352dd..383c84ef9 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4758,7 +4758,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime+30 )
+                    if ( eligible < (uint32_t)tipindex->nTime+3 )
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);

From a3b8c12830810f7d8b81bf7bfe5296675d2aa550 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 13:26:39 -1100
Subject: [PATCH 205/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 383c84ef9..c4374737f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4758,7 +4758,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime+3 )
+                    if ( eligible < (uint32_t)tipindex->nTime-63 )
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);

From 48c3fcbed30c10ef75297659012ab036bceaca30 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 23:48:09 -1100
Subject: [PATCH 206/623] Snapshot() reverse iterator

---
 src/txdb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index a0f764962..ae15d37e1 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,7 +402,7 @@ int64_t CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = -1; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
-    pcursor->SeekToFirst();
+    pcursor->SeekToLast();
     fprintf(stderr,"pcursor iterate\n");
     while (pcursor->Valid())
     {
@@ -428,7 +428,7 @@ int64_t CBlockTreeDB::Snapshot()
                         total = (int64_t)nValue;
                     else total += (int64_t)nValue;
                     //addressIndex.push_back(make_pair(indexKey, nValue));
-                    pcursor->Next();
+                    pcursor->Prev();
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }

From 6651944ae70065fa8f4a93c4fb81d2263d04f360 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 14 Jul 2018 23:59:08 -1100
Subject: [PATCH 207/623] Test

---
 src/txdb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index ae15d37e1..31af362ac 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -400,7 +400,7 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
 
 int64_t CBlockTreeDB::Snapshot()
 {
-    char chType; int64_t total = -1; std::string address;
+    char chType; int64_t total = 0; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
     pcursor->SeekToLast();
     fprintf(stderr,"pcursor iterate\n");
@@ -428,7 +428,6 @@ int64_t CBlockTreeDB::Snapshot()
                         total = (int64_t)nValue;
                     else total += (int64_t)nValue;
                     //addressIndex.push_back(make_pair(indexKey, nValue));
-                    pcursor->Prev();
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
@@ -436,6 +435,7 @@ int64_t CBlockTreeDB::Snapshot()
         } catch (const std::exception& e) {
             break;
         }
+        pcursor->Prev();
     }
     return(total);
 }

From 7246f7f31d21875d47ea815bf822bada3a88ad0c Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Sun, 15 Jul 2018 22:01:35 -0700
Subject: [PATCH 208/623] WIP correctly calculate block progress for asset
 chains

---
 src/main.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b08d2e522..c17f4456f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3195,10 +3195,18 @@ void static UpdateTip(CBlockIndex *pindexNew) {
     nTimeBestReceived = GetTime();
     mempool.AddTransactionsUpdated(1);
     KOMODO_NEWBLOCKS++;
+    double progress;
+    if ( ASSETCHAINS_SYMBOL[0] == 0 ) {
+        progress = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip());
+    } else {
+        progress = (KOMODO_LONGESTCHAIN > 0 ) ? chainActive.Height() / KOMODO_LONGESTCHAIN : 1.0;
+    }
+
     LogPrintf("%s: new best=%s  height=%d  log2_work=%.8g  tx=%lu  date=%s progress=%f  cache=%.1fMiB(%utx)\n", __func__,
-              chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
-              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-              Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip()), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
+              chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
+              log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
+              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), progress,
+              pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
     
     cvBlockChange.notify_all();
     

From 3bd2c3bd6a060f3408a22aff6debaa76865b0884 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Mon, 16 Jul 2018 07:57:56 +0000
Subject: [PATCH 209/623] Fix progress estimate for asset chains, mostly

---
 src/main.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c17f4456f..2ef9eb519 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3199,7 +3199,8 @@ void static UpdateTip(CBlockIndex *pindexNew) {
     if ( ASSETCHAINS_SYMBOL[0] == 0 ) {
         progress = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip());
     } else {
-        progress = (KOMODO_LONGESTCHAIN > 0 ) ? chainActive.Height() / KOMODO_LONGESTCHAIN : 1.0;
+	int32_t longestchain = komodo_longestchain();
+	progress = (longestchain > 0 ) ? (double) chainActive.Height() / longestchain : 1.0;
     }
 
     LogPrintf("%s: new best=%s  height=%d  log2_work=%.8g  tx=%lu  date=%s progress=%f  cache=%.1fMiB(%utx)\n", __func__,
@@ -4858,11 +4859,21 @@ bool static LoadBlockIndexDB()
     it->second->hashAnchorEnd = pcoinsTip->GetBestAnchor();
     
     PruneBlockIndexCandidates();
+
+    double progress;
+    if ( ASSETCHAINS_SYMBOL[0] == 0 ) {
+        progress = Checkpoints::GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip());
+    } else {
+	int32_t longestchain = komodo_longestchain();
+	// TODO: komodo_longestchain does not have the data it needs at the time LoadBlockIndexDB
+	// runs, which makes it return 0, so we guess 50% for now
+	progress = (longestchain > 0 ) ? (double) chainActive.Height() / longestchain : 0.5;
+    }
     
     LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__,
               chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
               DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
-              Checkpoints::GuessVerificationProgress(chainparams.Checkpoints(), chainActive.Tip()));
+	      progress);
     
     EnforceNodeDeprecation(chainActive.Height(), true);
     

From 8d487e52a7f01b137e3704315e0eedcf8e6b001c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 15 Jul 2018 21:41:16 -1100
Subject: [PATCH 210/623] Change deprecation height for 1400000

---
 src/deprecation.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/deprecation.h b/src/deprecation.h
index 78ed8ebda..ec8b084d9 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -6,14 +6,14 @@
 #define ZCASH_DEPRECATION_H
 
 // Deprecation policy:
-// * Shut down 16 weeks' worth of blocks after the estimated release block height.
-// * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 800000;
-static const int WEEKS_UNTIL_DEPRECATION = 52;
-static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
+// * Shut down WEEKS_UNTIL_DEPRECATION weeks' worth of blocks after the estimated release block height.
+// * A warning is shown during the WEEKS_UNTIL_DEPRECATION worth of blocks prior to shut down.
+//static const int APPROX_RELEASE_HEIGHT = 800000;
+//static const int WEEKS_UNTIL_DEPRECATION = 52;
+static const int DEPRECATION_HEIGHT = 1400000; //APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);
 
 // Number of blocks before deprecation to warn users
-static const int DEPRECATION_WARN_LIMIT = 60 * 24 * 60; // 2 months
+static const int WEEKS_UNTIL_DEPRECATION = 60 * 24 * 60; // 2 months
 
 /**
  * Checks whether the node is deprecated based on the current block height, and

From 86131275722b856b80d3032d74f89d94ff6e0ea5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 15 Jul 2018 22:47:16 -1100
Subject: [PATCH 211/623] LastTip() and tweak deprecation heights

---
 src/chain.cpp             |  1 +
 src/chain.h               |  6 ++++++
 src/deprecation.h         | 10 ++++-----
 src/komodo.h              |  4 ++--
 src/komodo_bitcoind.h     | 16 +++++++-------
 src/komodo_gateway.h      |  2 +-
 src/komodo_jumblr.h       |  2 +-
 src/komodo_pax.h          |  4 ++--
 src/main.cpp              | 44 +++++++++++++++++++--------------------
 src/metrics.cpp           |  2 +-
 src/miner.cpp             | 34 +++++++++++++++---------------
 src/rest.cpp              |  6 +++---
 src/rpcblockchain.cpp     | 30 +++++++++++++-------------
 src/rpcmining.cpp         | 24 ++++++++++-----------
 src/rpcmisc.cpp           |  8 +++----
 src/rpcrawtransaction.cpp |  2 +-
 src/txmempool.cpp         |  2 +-
 src/wallet/rpcdump.cpp    |  8 +++----
 src/wallet/rpcwallet.cpp  | 12 +++++------
 src/wallet/wallet.cpp     | 12 +++++------
 20 files changed, 118 insertions(+), 111 deletions(-)

diff --git a/src/chain.cpp b/src/chain.cpp
index 7bb72d5d3..d79a66f9a 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -11,6 +11,7 @@ using namespace std;
  * CChain implementation
  */
 void CChain::SetTip(CBlockIndex *pindex) {
+    lastTip = pindex;
     if (pindex == NULL) {
         vChain.clear();
         return;
diff --git a/src/chain.h b/src/chain.h
index 71d788531..d882083e6 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -416,6 +416,7 @@ public:
 class CChain {
 private:
     std::vector<CBlockIndex*> vChain;
+    CBlockIndex *lastTip;
 
 public:
     /** Returns the index entry for the genesis block of this chain, or NULL if none. */
@@ -427,6 +428,11 @@ public:
     CBlockIndex *Tip() const {
         return vChain.size() > 0 ? vChain[vChain.size() - 1] : NULL;
     }
+    
+    /** Returns the last tip of the chain, or NULL if none. */
+    CBlockIndex *LastTip() const {
+        return vChain.size() > 0 ? lastTip : NULL;
+    }
 
     /** Returns the index entry at a particular height in this chain, or NULL if no such height exists. */
     CBlockIndex *operator[](int nHeight) const {
diff --git a/src/deprecation.h b/src/deprecation.h
index ec8b084d9..11eb69ef4 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -7,13 +7,13 @@
 
 // Deprecation policy:
 // * Shut down WEEKS_UNTIL_DEPRECATION weeks' worth of blocks after the estimated release block height.
-// * A warning is shown during the WEEKS_UNTIL_DEPRECATION worth of blocks prior to shut down.
-//static const int APPROX_RELEASE_HEIGHT = 800000;
-//static const int WEEKS_UNTIL_DEPRECATION = 52;
-static const int DEPRECATION_HEIGHT = 1400000; //APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);
+// * A warning is shown during the DEPRECATION_WARN_LIMIT worth of blocks prior to shut down.
+static const int WEEKS_UNTIL_DEPRECATION = 52;
+static const int DEPRECATION_HEIGHT = 1400000;
+static const int APPROX_RELEASE_HEIGHT = DEPRECATION_HEIGHT - (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);
 
 // Number of blocks before deprecation to warn users
-static const int WEEKS_UNTIL_DEPRECATION = 60 * 24 * 60; // 2 months
+static const int DEPRECATION_WARN_LIMIT = 60 * 24 * 60; // 2 months
 
 /**
  * Checks whether the node is deprecated based on the current block height, and
diff --git a/src/komodo.h b/src/komodo.h
index ae0898ed3..e89dea2e4 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -823,7 +823,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
         komodo_event_rewind(sp,symbol,pindex->nHeight);
         komodo_stateupdate(pindex->nHeight,0,0,0,zero,0,0,0,0,-pindex->nHeight,pindex->nTime,0,0,0,0,zero,0);
     }
-    komodo_currentheight_set(chainActive.Tip()->nHeight);
+    komodo_currentheight_set(chainActive.LastTip()->nHeight);
     if ( pindex != 0 )
     {
         height = pindex->nHeight;
@@ -907,7 +907,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,(uint32_t)chainActive.Tip()->GetBlockTime());
+                    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.LastTip()->GetBlockTime());
                     if ( 0 && i > 0 )
                     {
                         for (k=0; k<len; k++)
diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d624dc72a..5564a79a5 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -751,8 +751,8 @@ int32_t komodo_blockload(CBlock& block,CBlockIndex *pindex)
 
 uint32_t komodo_chainactive_timestamp()
 {
-    if ( chainActive.Tip() != 0 )
-        return((uint32_t)chainActive.Tip()->GetBlockTime());
+    if ( chainActive.LastTip() != 0 )
+        return((uint32_t)chainActive.LastTip()->GetBlockTime());
     else return(0);
 }
 
@@ -760,11 +760,11 @@ CBlockIndex *komodo_chainactive(int32_t height)
 {
     if ( chainActive.Tip() != 0 )
     {
-        if ( height <= chainActive.Tip()->nHeight )
+        if ( height <= chainActive.LastTip()->nHeight )
             return(chainActive[height]);
-        // else fprintf(stderr,"komodo_chainactive height %d > active.%d\n",height,chainActive.Tip()->nHeight);
+        // else fprintf(stderr,"komodo_chainactive height %d > active.%d\n",height,chainActive.LastTip()->nHeight);
     }
-    //fprintf(stderr,"komodo_chainactive null chainActive.Tip() height %d\n",height);
+    //fprintf(stderr,"komodo_chainactive null chainActive.LastTip() height %d\n",height);
     return(0);
 }
 
@@ -994,7 +994,7 @@ int32_t komodo_MoM(int32_t *notarized_heightp,uint256 *MoMp,uint256 *kmdtxidp,in
 int32_t komodo_checkpoint(int32_t *notarized_heightp,int32_t nHeight,uint256 hash)
 {
     int32_t notarized_height,MoMdepth; uint256 MoM,notarized_hash,notarized_desttxid; CBlockIndex *notary,*pindex;
-    if ( (pindex= chainActive.Tip()) == 0 )
+    if ( (pindex= chainActive.LastTip()) == 0 )
         return(-1);
     notarized_height = komodo_notarizeddata(pindex->nHeight,&notarized_hash,&notarized_desttxid);
     *notarized_heightp = notarized_height;
@@ -1036,7 +1036,7 @@ uint32_t komodo_interest_args(uint32_t *txheighttimep,int32_t *txheightp,uint32_
             *valuep = tx.vout[n].nValue;
             *txheightp = pindex->nHeight;
             *txheighttimep = pindex->nTime;
-            if ( *tiptimep == 0 && (tipindex= chainActive.Tip()) != 0 )
+            if ( *tiptimep == 0 && (tipindex= chainActive.LastTip()) != 0 )
                 *tiptimep = (uint32_t)tipindex->nTime;
             locktime = tx.nLockTime;
             //fprintf(stderr,"tx locktime.%u %.8f height.%d | tiptime.%u\n",locktime,(double)*valuep/COIN,*txheightp,*tiptimep);
@@ -1069,7 +1069,7 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
     if ( (sp= komodo_stateptrget((char *)"KMD")) != 0 )
         *kmdheightp = sp->CURRENT_HEIGHT;
     else *kmdheightp = 0;
-    if ( (pindex= chainActive.Tip()) != 0 && pindex->nHeight >= (int32_t)komodo_longestchain() )
+    if ( (pindex= chainActive.LastTip()) != 0 && pindex->nHeight >= (int32_t)komodo_longestchain() )
         return(1);
     else return(0);
 }
diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 9de6b4fc9..6a8ef310b 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -1490,7 +1490,7 @@ void komodo_passport_iteration()
             komodo_statefname(fname,baseid<32?base:(char *)"",(char *)"realtime");
             if ( (fp= fopen(fname,"wb")) != 0 )
             {
-                buf[0] = (uint32_t)chainActive.Tip()->nHeight;
+                buf[0] = (uint32_t)chainActive.LastTip()->nHeight;
                 buf[1] = (uint32_t)komodo_longestchain();
                 if ( buf[0] != 0 && buf[0] == buf[1] )
                 {
diff --git a/src/komodo_jumblr.h b/src/komodo_jumblr.h
index f36bb441a..fa44425fd 100755
--- a/src/komodo_jumblr.h
+++ b/src/komodo_jumblr.h
@@ -648,7 +648,7 @@ void jumblr_iteration()
             free(retstr);
         }
     }
-    height = (int32_t)chainActive.Tip()->nHeight;
+    height = (int32_t)chainActive.LastTip()->nHeight;
     if ( time(NULL) < lasttime+40 )
         return;
     lasttime = (uint32_t)time(NULL);
diff --git a/src/komodo_pax.h b/src/komodo_pax.h
index d0bad0e14..35d226fc3 100644
--- a/src/komodo_pax.h
+++ b/src/komodo_pax.h
@@ -637,13 +637,13 @@ uint64_t komodo_paxpriceB(uint64_t seed,int32_t height,char *base,char *rel,uint
 uint64_t komodo_paxprice(uint64_t *seedp,int32_t height,char *base,char *rel,uint64_t basevolume)
 {
     int32_t i,nonz=0; int64_t diff; uint64_t price,seed,sum = 0;
-    if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.Tip() != 0 && height > chainActive.Tip()->nHeight )
+    if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.LastTip() != 0 && height > chainActive.LastTip()->nHeight )
     {
         if ( height < 100000000 )
         {
             static uint32_t counter;
             if ( counter++ < 3 )
-                printf("komodo_paxprice height.%d vs tip.%d\n",height,chainActive.Tip()->nHeight);
+                printf("komodo_paxprice height.%d vs tip.%d\n",height,chainActive.LastTip()->nHeight);
         }
         return(0);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 2ef9eb519..330bf6ad1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1269,7 +1269,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
     }
     
     auto verifier = libzcash::ProofVerifier::Strict();
-    if ( komodo_validate_interest(tx,chainActive.Tip()->nHeight+1,chainActive.Tip()->GetMedianTimePast() + 777,0) < 0 )
+    if ( komodo_validate_interest(tx,chainActive.LastTip()->nHeight+1,chainActive.LastTip()->GetMedianTimePast() + 777,0) < 0 )
     {
         //fprintf(stderr,"AcceptToMemoryPool komodo_validate_interest failure\n");
         return error("AcceptToMemoryPool: komodo_validate_interest failed");
@@ -1399,7 +1399,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
             // Bring the best block into scope
             view.GetBestBlock();
             
-            nValueIn = view.GetValueIn(chainActive.Tip()->nHeight,&interest,tx,chainActive.Tip()->nTime);
+            nValueIn = view.GetValueIn(chainActive.LastTip()->nHeight,&interest,tx,chainActive.LastTip()->nTime);
             if ( 0 && interest != 0 )
                 fprintf(stderr,"add interest %.8f\n",(double)interest/COIN);
             // we have all inputs cached now, so switch back to dummy, so we don't need to keep lock on mempool
@@ -1891,7 +1891,7 @@ void CheckForkWarningConditions()
     if (pindexBestForkTip && chainActive.Height() - pindexBestForkTip->nHeight >= 288)
         pindexBestForkTip = NULL;
     
-    if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.Tip()->nChainWork + (GetBlockProof(*chainActive.Tip()) * 6)))
+    if (pindexBestForkTip || (pindexBestInvalid && pindexBestInvalid->nChainWork > chainActive.LastTip()->nChainWork + (GetBlockProof(*chainActive.LastTip()) * 6)))
     {
         if (!fLargeWorkForkFound && pindexBestForkBase)
         {
@@ -1926,7 +1926,7 @@ void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)
     AssertLockHeld(cs_main);
     // If we are on a fork that is sufficiently large, set a warning flag
     CBlockIndex* pfork = pindexNewForkTip;
-    CBlockIndex* plonger = chainActive.Tip();
+    CBlockIndex* plonger = chainActive.LastTip();
     while (pfork && pfork != plonger)
     {
         while (plonger && plonger->nHeight > pfork->nHeight)
@@ -1983,7 +1983,7 @@ void static InvalidChainFound(CBlockIndex* pindexNew)
               pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
               log(pindexNew->nChainWork.getdouble())/log(2.0), DateTimeStrFormat("%Y-%m-%d %H:%M:%S",
                                                                                  pindexNew->GetBlockTime()));
-    CBlockIndex *tip = chainActive.Tip();
+    CBlockIndex *tip = chainActive.LastTip();
     assert (tip);
     LogPrintf("%s:  current best=%s  height=%d  log2_work=%.8g  date=%s\n", __func__,
               tip->GetBlockHash().ToString(), chainActive.Height(), log(tip->nChainWork.getdouble())/log(2.0),
@@ -2111,14 +2111,14 @@ namespace Consensus {
             // Check for negative or overflow input values
             nValueIn += coins->vout[prevout.n].nValue;
 #ifdef KOMODO_ENABLE_INTEREST
-            if ( ASSETCHAINS_SYMBOL[0] == 0 && nSpendHeight > 60000 )//chainActive.Tip() != 0 && chainActive.Tip()->nHeight >= 60000 )
+            if ( ASSETCHAINS_SYMBOL[0] == 0 && nSpendHeight > 60000 )//chainActive.LastTip() != 0 && chainActive.LastTip()->nHeight >= 60000 )
             {
                 if ( coins->vout[prevout.n].nValue >= 10*COIN )
                 {
                     int64_t interest; int32_t txheight; uint32_t locktime;
                     if ( (interest= komodo_accrued_interest(&txheight,&locktime,prevout.hash,prevout.n,0,coins->vout[prevout.n].nValue,(int32_t)nSpendHeight-1)) != 0 )
                     {
-                        //fprintf(stderr,"checkResult %.8f += val %.8f interest %.8f ht.%d lock.%u tip.%u\n",(double)nValueIn/COIN,(double)coins->vout[prevout.n].nValue/COIN,(double)interest/COIN,txheight,locktime,chainActive.Tip()->nTime);
+                        //fprintf(stderr,"checkResult %.8f += val %.8f interest %.8f ht.%d lock.%u tip.%u\n",(double)nValueIn/COIN,(double)coins->vout[prevout.n].nValue/COIN,(double)interest/COIN,txheight,locktime,chainActive.LastTip()->nTime);
                         nValueIn += interest;
                     }
                 }
@@ -2868,7 +2868,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         
         if (!tx.IsCoinBase())
         {
-            nFees += view.GetValueIn(chainActive.Tip()->nHeight,&interest,tx,chainActive.Tip()->nTime) - tx.GetValueOut();
+            nFees += view.GetValueIn(chainActive.LastTip()->nHeight,&interest,tx,chainActive.LastTip()->nTime) - tx.GetValueOut();
             sum += interest;
             
             std::vector<CScriptCheck> vChecks;
@@ -3197,16 +3197,16 @@ void static UpdateTip(CBlockIndex *pindexNew) {
     KOMODO_NEWBLOCKS++;
     double progress;
     if ( ASSETCHAINS_SYMBOL[0] == 0 ) {
-        progress = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip());
+        progress = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.LastTip());
     } else {
 	int32_t longestchain = komodo_longestchain();
 	progress = (longestchain > 0 ) ? (double) chainActive.Height() / longestchain : 1.0;
     }
 
     LogPrintf("%s: new best=%s  height=%d  log2_work=%.8g  tx=%lu  date=%s progress=%f  cache=%.1fMiB(%utx)\n", __func__,
-              chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
-              log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
-              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()), progress,
+              chainActive.LastTip()->GetBlockHash().ToString(), chainActive.Height(),
+              log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.LastTip()->nChainTx,
+              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.LastTip()->GetBlockTime()), progress,
               pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize());
     
     cvBlockChange.notify_all();
@@ -3455,7 +3455,7 @@ static void PruneBlockIndexCandidates() {
     // Note that we can't delete the current block itself, as we may need to return to it later in case a
     // reorganization to a better block fails.
     std::set<CBlockIndex*, CBlockIndexWorkComparator>::iterator it = setBlockIndexCandidates.begin();
-    while (it != setBlockIndexCandidates.end() && setBlockIndexCandidates.value_comp()(*it, chainActive.Tip())) {
+    while (it != setBlockIndexCandidates.end() && setBlockIndexCandidates.value_comp()(*it, chainActive.LastTip())) {
         setBlockIndexCandidates.erase(it++);
     }
     // Either the current tip or a successor of it we're working towards is left in setBlockIndexCandidates.
@@ -3507,8 +3507,8 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
     if ( KOMODO_REWIND != 0 )
     {
         CBlockIndex *tipindex;
-        fprintf(stderr,">>>>>>>>>>> rewind start ht.%d -> KOMODO_REWIND.%d\n",chainActive.Tip()->nHeight,KOMODO_REWIND);
-        while ( KOMODO_REWIND > 0 && (tipindex= chainActive.Tip()) != 0 && tipindex->nHeight > KOMODO_REWIND )
+        fprintf(stderr,">>>>>>>>>>> rewind start ht.%d -> KOMODO_REWIND.%d\n",chainActive.LastTip()->nHeight,KOMODO_REWIND);
+        while ( KOMODO_REWIND > 0 && (tipindex= chainActive.LastTip()) != 0 && tipindex->nHeight > KOMODO_REWIND )
         {
             fBlocksDisconnected = true;
             fprintf(stderr,"%d ",(int32_t)tipindex->nHeight);
@@ -3922,9 +3922,9 @@ bool CheckBlockHeader(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,
         for (i=31; i>=0; i--)
             fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
         fprintf(stderr," <- CheckBlockHeader\n");
-        if ( chainActive.Tip() != 0 )
+        if ( chainActive.LastTip() != 0 )
         {
-            hash = chainActive.Tip()->GetBlockHash();
+            hash = chainActive.LastTip()->GetBlockHash();
             for (i=31; i>=0; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
             fprintf(stderr," <- chainTip\n");
@@ -4103,7 +4103,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta
         // Don't accept any forks from the main chain prior to last checkpoint
         CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(chainParams.Checkpoints());
         int32_t notarized_height;
-        if ( nHeight == 1 && chainActive.Tip() != 0 && chainActive.Tip()->nHeight > 1 )
+        if ( nHeight == 1 && chainActive.LastTip() != 0 && chainActive.LastTip()->nHeight > 1 )
         {
             CBlockIndex *heightblock = chainActive[nHeight];
             if ( heightblock != 0 && heightblock->GetBlockHash() == hash )
@@ -4440,8 +4440,8 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
 
-  if ( chainActive.Tip() != 0 )
-        komodo_currentheight_set(chainActive.Tip()->nHeight);
+  if ( chainActive.LastTip() != 0 )
+        komodo_currentheight_set(chainActive.LastTip()->nHeight);
     checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
     {
         LOCK(cs_main);
@@ -4871,8 +4871,8 @@ bool static LoadBlockIndexDB()
     }
     
     LogPrintf("%s: hashBestChain=%s height=%d date=%s progress=%f\n", __func__,
-              chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
-              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
+              chainActive.LastTip()->GetBlockHash().ToString(), chainActive.Height(),
+              DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.LastTip()->GetBlockTime()),
 	      progress);
     
     EnforceNodeDeprecation(chainActive.Height(), true);
diff --git a/src/metrics.cpp b/src/metrics.cpp
index 6c8f80fe5..cb9fe245c 100644
--- a/src/metrics.cpp
+++ b/src/metrics.cpp
@@ -211,7 +211,7 @@ int printStats(bool mining)
     {
         LOCK2(cs_main, cs_vNodes);
         height = chainActive.Height();
-        tipmediantime = chainActive.Tip()->GetMedianTimePast();
+        tipmediantime = chainActive.LastTip()->GetMedianTimePast();
         connections = vNodes.size();
         netsolps = GetNetworkHashPS(120, -1);
     }
diff --git a/src/miner.cpp b/src/miner.cpp
index dbe6dc41c..0c458a985 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -166,7 +166,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
     
     {
         LOCK2(cs_main, mempool.cs);
-        CBlockIndex* pindexPrev = chainActive.Tip();
+        CBlockIndex* pindexPrev = chainActive.LastTip();
         const int nHeight = pindexPrev->nHeight + 1;
         uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, chainparams.GetConsensus());
         pblock->nTime = GetAdjustedTime();
@@ -334,7 +334,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
                 //fprintf(stderr,"dont have inputs\n");
                 continue;
             }
-            CAmount nTxFees = view.GetValueIn(chainActive.Tip()->nHeight,&interest,tx,chainActive.Tip()->nTime)-tx.GetValueOut();
+            CAmount nTxFees = view.GetValueIn(chainActive.LastTip()->nHeight,&interest,tx,chainActive.LastTip()->nTime)-tx.GetValueOut();
             
             nTxSigOps += GetP2SHSigOpCount(tx, view);
             if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS-1)
@@ -400,14 +400,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             if ( (siglen= komodo_staked(txStaked,pblock->nBits,&blocktime,&txtime,&utxotxid,&utxovout,&utxovalue,utxosig)) > 0 )
             {
                 CAmount txfees = 0;
-                //if ( (int32_t)chainActive.Tip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
+                //if ( (int32_t)chainActive.LastTip()->nHeight+1 > 100 && GetAdjustedTime() < blocktime-157 )
                 //    return(0);
                 pblock->vtx.push_back(txStaked);
                 pblocktemplate->vTxFees.push_back(txfees);
                 pblocktemplate->vTxSigOps.push_back(GetLegacySigOpCount(txStaked));
                 nFees += txfees;
                 pblock->nTime = blocktime;
-                //printf("staking PoS ht.%d t%u lag.%u\n",(int32_t)chainActive.Tip()->nHeight+1,blocktime,(uint32_t)(GetAdjustedTime() - (blocktime-13)));
+                //printf("staking PoS ht.%d t%u lag.%u\n",(int32_t)chainActive.LastTip()->nHeight+1,blocktime,(uint32_t)(GetAdjustedTime() - (blocktime-13)));
             } else return(0); //fprintf(stderr,"no utxos eligible for staking\n");
         }
         
@@ -640,19 +640,19 @@ static bool ProcessBlockFound(CBlock* pblock)
 #endif // ENABLE_WALLET
 {
     LogPrintf("%s\n", pblock->ToString());
-    LogPrintf("generated %s height.%d\n", FormatMoney(pblock->vtx[0].vout[0].nValue),chainActive.Tip()->nHeight+1);
+    LogPrintf("generated %s height.%d\n", FormatMoney(pblock->vtx[0].vout[0].nValue),chainActive.LastTip()->nHeight+1);
     
     // Found a solution
     {
         LOCK(cs_main);
-        if (pblock->hashPrevBlock != chainActive.Tip()->GetBlockHash())
+        if (pblock->hashPrevBlock != chainActive.LastTip()->GetBlockHash())
         {
             uint256 hash; int32_t i;
             hash = pblock->hashPrevBlock;
             for (i=31; i>=0; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
             fprintf(stderr," <- prev (stale)\n");
-            hash = chainActive.Tip()->GetBlockHash();
+            hash = chainActive.LastTip()->GetBlockHash();
             for (i=31; i>=0; i--)
                 fprintf(stderr,"%02x",((uint8_t *)&hash)[i]);
             fprintf(stderr," <- chainTip (stale)\n");
@@ -680,7 +680,7 @@ static bool ProcessBlockFound(CBlock* pblock)
     
     // Process this block the same as if we had received it from another node
     CValidationState state;
-    if (!ProcessNewBlock(1,chainActive.Tip()->nHeight+1,state, NULL, pblock, true, NULL))
+    if (!ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, pblock, true, NULL))
         return error("KomodoMiner: ProcessNewBlock, block not accepted");
     
     TrackMinedBlock(pblock->GetHash());
@@ -718,13 +718,13 @@ void static BitcoinMiner()
     unsigned int n = chainparams.EquihashN();
     unsigned int k = chainparams.EquihashK();
     uint8_t *script; uint64_t total,checktoshis; int32_t i,j,gpucount=KOMODO_MAXGPUCOUNT,notaryid = -1;
-    while ( (ASSETCHAIN_INIT == 0 || KOMODO_INITDONE == 0) ) //chainActive.Tip()->nHeight != 235300 &&
+    while ( (ASSETCHAIN_INIT == 0 || KOMODO_INITDONE == 0) ) //chainActive.LastTip()->nHeight != 235300 &&
     {
         sleep(1);
         if ( komodo_baseid(ASSETCHAINS_SYMBOL) < 0 )
             break;
     }
-    komodo_chosennotary(&notaryid,chainActive.Tip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.Tip()->GetBlockTime());
+    komodo_chosennotary(&notaryid,chainActive.LastTip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.LastTip()->GetBlockTime());
     if ( notaryid != My_notaryid )
         My_notaryid = notaryid;
     std::string solver;
@@ -750,9 +750,9 @@ void static BitcoinMiner()
             fprintf(stderr,"try %s Mining with %s\n",ASSETCHAINS_SYMBOL,solver.c_str());
         while (true)
         {
-            if (chainparams.MiningRequiresPeers()) //chainActive.Tip()->nHeight != 235300 &&
+            if (chainparams.MiningRequiresPeers()) //chainActive.LastTip()->nHeight != 235300 &&
             {
-                //if ( ASSETCHAINS_SEED != 0 && chainActive.Tip()->nHeight < 100 )
+                //if ( ASSETCHAINS_SEED != 0 && chainActive.LastTip()->nHeight < 100 )
                 //    break;
                 // Busy-wait for the network to come online so we don't waste time mining
                 // on an obsolete chain. In regtest mode we expect to fly solo.
@@ -776,7 +776,7 @@ void static BitcoinMiner()
             // Create new block
             //
             unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
-            CBlockIndex* pindexPrev = chainActive.Tip();
+            CBlockIndex* pindexPrev = chainActive.LastTip();
             if ( Mining_height != pindexPrev->nHeight+1 )
             {
                 Mining_height = pindexPrev->nHeight+1;
@@ -962,7 +962,7 @@ void static BitcoinMiner()
                         while ( GetAdjustedTime() < B.nTime-2 )
                         {
                             sleep(1);
-                            if ( chainActive.Tip()->nHeight >= Mining_height )
+                            if ( chainActive.LastTip()->nHeight >= Mining_height )
                             {
                                 fprintf(stderr,"new block arrived\n");
                                 return(false);
@@ -983,7 +983,7 @@ void static BitcoinMiner()
                         while ( B.nTime-57 > GetAdjustedTime() )
                         {
                             sleep(1);
-                            if ( chainActive.Tip()->nHeight >= Mining_height )
+                            if ( chainActive.LastTip()->nHeight >= Mining_height )
                                 return(false);
                         }
                         uint256 tmp = B.GetHash();
@@ -992,7 +992,7 @@ void static BitcoinMiner()
                         fprintf(stderr," mined %s block %d!\n",ASSETCHAINS_SYMBOL,Mining_height);
                     }
                     CValidationState state;
-                    if ( !TestBlockValidity(state,B, chainActive.Tip(), true, false))
+                    if ( !TestBlockValidity(state,B, chainActive.LastTip(), true, false))
                     {
                         h = UintToArith256(B.GetHash());
                         for (z=31; z>=0; z--)
@@ -1112,7 +1112,7 @@ void static BitcoinMiner()
                             fprintf(stderr,"timeout, break\n");
                         break;
                     }
-                    if ( pindexPrev != chainActive.Tip() )
+                    if ( pindexPrev != chainActive.LastTip() )
                     {
                         if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 )
                             fprintf(stderr,"Tip advanced, break\n");
diff --git a/src/rest.cpp b/src/rest.cpp
index 8e2e4d1e6..38cc38466 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -530,7 +530,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         // serialize data
         // use exact same output as mentioned in Bip64
         CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
-        ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs;
+        ssGetUTXOResponse << chainActive.Height() << chainActive.LastTip()->GetBlockHash() << bitmap << outs;
         string ssGetUTXOResponseString = ssGetUTXOResponse.str();
 
         req->WriteHeader("Content-Type", "application/octet-stream");
@@ -540,7 +540,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
 
     case RF_HEX: {
         CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
-        ssGetUTXOResponse << chainActive.Height() << chainActive.Tip()->GetBlockHash() << bitmap << outs;
+        ssGetUTXOResponse << chainActive.Height() << chainActive.LastTip()->GetBlockHash() << bitmap << outs;
         string strHex = HexStr(ssGetUTXOResponse.begin(), ssGetUTXOResponse.end()) + "\n";
 
         req->WriteHeader("Content-Type", "text/plain");
@@ -554,7 +554,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
         // pack in some essentials
         // use more or less the same output as mentioned in Bip64
         objGetUTXOResponse.push_back(Pair("chainHeight", chainActive.Height()));
-        objGetUTXOResponse.push_back(Pair("chaintipHash", chainActive.Tip()->GetBlockHash().GetHex()));
+        objGetUTXOResponse.push_back(Pair("chaintipHash", chainActive.LastTip()->GetBlockHash().GetHex()));
         objGetUTXOResponse.push_back(Pair("bitmap", bitmapStringRepresentation));
 
         UniValue utxos(UniValue::VARR);
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 42cf7f2b0..7f8984c63 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -38,10 +38,10 @@ double GetDifficultyINTERNAL(const CBlockIndex* blockindex, bool networkDifficul
     // minimum difficulty = 1.0.
     if (blockindex == NULL)
     {
-        if (chainActive.Tip() == NULL)
+        if (chainActive.LastTip() == NULL)
             return 1.0;
         else
-            blockindex = chainActive.Tip();
+            blockindex = chainActive.LastTip();
     }
 
     uint32_t bits;
@@ -326,7 +326,7 @@ UniValue getbestblockhash(const UniValue& params, bool fHelp)
         );
 
     LOCK(cs_main);
-    return chainActive.Tip()->GetBlockHash().GetHex();
+    return chainActive.LastTip()->GetBlockHash().GetHex();
 }
 
 UniValue getdifficulty(const UniValue& params, bool fHelp)
@@ -803,13 +803,13 @@ UniValue kvsearch(const UniValue& params, bool fHelp)
     if ( (keylen= (int32_t)strlen(params[0].get_str().c_str())) > 0 )
     {
         ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL)));
-        ret.push_back(Pair("currentheight", (int64_t)chainActive.Tip()->nHeight));
+        ret.push_back(Pair("currentheight", (int64_t)chainActive.LastTip()->nHeight));
         ret.push_back(Pair("key",params[0].get_str()));
         ret.push_back(Pair("keylen",keylen));
         if ( keylen < sizeof(key) )
         {
             memcpy(key,params[0].get_str().c_str(),keylen);
-            if ( (valuesize= komodo_kvsearch(&refpubkey,chainActive.Tip()->nHeight,&flags,&height,value,key,keylen)) >= 0 )
+            if ( (valuesize= komodo_kvsearch(&refpubkey,chainActive.LastTip()->nHeight,&flags,&height,value,key,keylen)) >= 0 )
             {
                 std::string val; char *valuestr;
                 val.resize(valuesize);
@@ -837,7 +837,7 @@ UniValue minerids(const UniValue& params, bool fHelp)
     LOCK(cs_main);
     int32_t height = atoi(params[0].get_str().c_str());
     if ( height <= 0 )
-        height = chainActive.Tip()->nHeight;
+        height = chainActive.LastTip()->nHeight;
     else
     {
         CBlockIndex *pblockindex = chainActive[height];
@@ -899,8 +899,8 @@ UniValue notaries(const UniValue& params, bool fHelp)
     else timestamp = (uint32_t)time(NULL);
     if ( height < 0 )
     {
-        height = chainActive.Tip()->nHeight;
-        timestamp = chainActive.Tip()->GetBlockTime();
+        height = chainActive.LastTip()->nHeight;
+        timestamp = chainActive.LastTip()->GetBlockTime();
     }
     else if ( params.size() < 2 )
     {
@@ -988,7 +988,7 @@ UniValue paxprice(const UniValue& params, bool fHelp)
     std::string rel = params[1].get_str();
     int32_t height;
     if ( params.size() == 2 )
-        height = chainActive.Tip()->nHeight;
+        height = chainActive.LastTip()->nHeight;
     else height = atoi(params[2].get_str().c_str());
     //if ( params.size() == 3 || (basevolume= COIN * atof(params[3].get_str().c_str())) == 0 )
         basevolume = 100000;
@@ -1280,10 +1280,10 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("chain",                 Params().NetworkIDString()));
     obj.push_back(Pair("blocks",                (int)chainActive.Height()));
     obj.push_back(Pair("headers",               pindexBestHeader ? pindexBestHeader->nHeight : -1));
-    obj.push_back(Pair("bestblockhash",         chainActive.Tip()->GetBlockHash().GetHex()));
+    obj.push_back(Pair("bestblockhash",         chainActive.LastTip()->GetBlockHash().GetHex()));
     obj.push_back(Pair("difficulty",            (double)GetNetworkDifficulty()));
-    obj.push_back(Pair("verificationprogress",  Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.Tip())));
-    obj.push_back(Pair("chainwork",             chainActive.Tip()->nChainWork.GetHex()));
+    obj.push_back(Pair("verificationprogress",  Checkpoints::GuessVerificationProgress(Params().Checkpoints(), chainActive.LastTip())));
+    obj.push_back(Pair("chainwork",             chainActive.LastTip()->nChainWork.GetHex()));
     obj.push_back(Pair("pruned",                fPruneMode));
 
     ZCIncrementalMerkleTree tree;
@@ -1294,7 +1294,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("commitments",           tree.size()));
     #endif
 
-    CBlockIndex* tip = chainActive.Tip();
+    CBlockIndex* tip = chainActive.LastTip();
     UniValue valuePools(UniValue::VARR);
     valuePools.push_back(ValuePoolDesc("sprout", tip->nChainSproutValue, boost::none));
     obj.push_back(Pair("valuePools",            valuePools));
@@ -1319,7 +1319,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp)
 
     if (fPruneMode)
     {
-        CBlockIndex *block = chainActive.Tip();
+        CBlockIndex *block = chainActive.LastTip();
         while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA))
             block = block->pprev;
 
@@ -1394,7 +1394,7 @@ UniValue getchaintips(const UniValue& params, bool fHelp)
     }
 
     // Always report the currently active tip.
-    setTips.insert(chainActive.Tip());
+    setTips.insert(chainActive.LastTip());
 
     /* Construct the output array.  */
     UniValue res(UniValue::VARR); const CBlockIndex *forked;
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index afe4e5a33..47fbeec30 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -39,7 +39,7 @@ using namespace std;
  * If 'height' is nonnegative, compute the estimate at the time when a given block was found.
  */
 int64_t GetNetworkHashPS(int lookup, int height) {
-    CBlockIndex *pb = chainActive.Tip();
+    CBlockIndex *pb = chainActive.LastTip();
 
     if (height >= 0 && height < chainActive.Height())
         pb = chainActive[height];
@@ -224,7 +224,7 @@ UniValue generate(const UniValue& params, bool fHelp)
         CBlock *pblock = &pblocktemplate->block;
         {
             LOCK(cs_main);
-            IncrementExtraNonce(pblock, chainActive.Tip(), nExtraNonce);
+            IncrementExtraNonce(pblock, chainActive.LastTip(), nExtraNonce);
         }
 
         // Hash state
@@ -268,7 +268,7 @@ UniValue generate(const UniValue& params, bool fHelp)
         }
 endloop:
         CValidationState state;
-        if (!ProcessNewBlock(1,chainActive.Tip()->nHeight+1,state, NULL, pblock, true, NULL))
+        if (!ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, pblock, true, NULL))
             throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted");
         ++nHeight;
         blockHashes.push_back(pblock->GetHash().GetHex());
@@ -550,7 +550,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 return "duplicate-inconclusive";
             }
 
-            CBlockIndex* const pindexPrev = chainActive.Tip();
+            CBlockIndex* const pindexPrev = chainActive.LastTip();
             // TestBlockValidity only supports blocks built on the current Tip
             if (block.hashPrevBlock != pindexPrev->GetBlockHash())
                 return "inconclusive-not-best-prevblk";
@@ -589,7 +589,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         else
         {
             // NOTE: Spec does not specify behaviour for non-string longpollid, but this makes testing easier
-            hashWatchedChain = chainActive.Tip()->GetBlockHash();
+            hashWatchedChain = chainActive.LastTip()->GetBlockHash();
             nTransactionsUpdatedLastLP = nTransactionsUpdatedLast;
         }
 
@@ -599,7 +599,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             checktxtime = boost::get_system_time() + boost::posix_time::minutes(1);
 
             boost::unique_lock<boost::mutex> lock(csBestBlock);
-            while (chainActive.Tip()->GetBlockHash() == hashWatchedChain && IsRPCRunning())
+            while (chainActive.LastTip()->GetBlockHash() == hashWatchedChain && IsRPCRunning())
             {
                 if (!cvBlockChange.timed_wait(lock, checktxtime))
                 {
@@ -621,7 +621,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     static CBlockIndex* pindexPrev;
     static int64_t nStart;
     static CBlockTemplate* pblocktemplate;
-    if (pindexPrev != chainActive.Tip() ||
+    if (pindexPrev != chainActive.LastTip() ||
         (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLast && GetTime() - nStart > 5))
     {
         // Clear pindexPrev so future calls make a new block, despite any failures from here on
@@ -629,7 +629,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
 
         // Store the pindexBest used before CreateNewBlockWithKey, to avoid races
         nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();
-        CBlockIndex* pindexPrevNew = chainActive.Tip();
+        CBlockIndex* pindexPrevNew = chainActive.LastTip();
         nStart = GetTime();
 
         // Create new block
@@ -640,7 +640,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         }
 #ifdef ENABLE_WALLET
         CReserveKey reservekey(pwalletMain);
-        pblocktemplate = CreateNewBlockWithKey(reservekey,chainActive.Tip()->nHeight+1,KOMODO_MAXGPUCOUNT);
+        pblocktemplate = CreateNewBlockWithKey(reservekey,chainActive.LastTip()->nHeight+1,KOMODO_MAXGPUCOUNT);
 #else
         pblocktemplate = CreateNewBlockWithKey();
 #endif
@@ -693,7 +693,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
                 // Correct this if GetBlockTemplate changes the order
             //    entry.push_back(Pair("foundersreward", (int64_t)tx.vout[1].nValue));
             //}
-            CAmount nReward = GetBlockSubsidy(chainActive.Tip()->nHeight+1, Params().GetConsensus());
+            CAmount nReward = GetBlockSubsidy(chainActive.LastTip()->nHeight+1, Params().GetConsensus());
             entry.push_back(Pair("coinbasevalue", nReward));
             entry.push_back(Pair("required", true));
             txCoinbase = entry;
@@ -726,7 +726,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         result.push_back(Pair("coinbaseaux", aux));
         result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue));
     }
-    result.push_back(Pair("longpollid", chainActive.Tip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
+    result.push_back(Pair("longpollid", chainActive.LastTip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
     result.push_back(Pair("target", hashTarget.GetHex()));
     result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
     result.push_back(Pair("mutable", aMutable));
@@ -809,7 +809,7 @@ UniValue submitblock(const UniValue& params, bool fHelp)
     CValidationState state;
     submitblock_StateCatcher sc(block.GetHash());
     RegisterValidationInterface(&sc);
-    bool fAccepted = ProcessNewBlock(1,chainActive.Tip()->nHeight+1,state, NULL, &block, true, NULL);
+    bool fAccepted = ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, &block, true, NULL);
     UnregisterValidationInterface(&sc);
     if (fBlockPresent)
     {
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index bf7f345d5..4405a407d 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -133,8 +133,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     //fprintf(stderr,"after longestchain %u\n",(uint32_t)time(NULL));
     obj.push_back(Pair("longestchain",        longestchain));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    if ( chainActive.Tip() != 0 )
-        obj.push_back(Pair("tiptime", (int)chainActive.Tip()->nTime));
+    if ( chainActive.LastTip() != 0 )
+        obj.push_back(Pair("tiptime", (int)chainActive.LastTip()->nTime));
     obj.push_back(Pair("connections",   (int)vNodes.size()));
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
@@ -152,7 +152,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,komodo_chainactive_timestamp())) >= 0 )
+        if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.LastTip()->nHeight,komodo_chainactive_timestamp())) >= 0 )
         {
             obj.push_back(Pair("notaryid",        notaryid));
             obj.push_back(Pair("pubkey",        pubkeystr));
@@ -826,7 +826,7 @@ UniValue getaddressutxos(const UniValue& params, bool fHelp)
         result.push_back(Pair("utxos", utxos));
 
         LOCK(cs_main);
-        result.push_back(Pair("hash", chainActive.Tip()->GetBlockHash().GetHex()));
+        result.push_back(Pair("hash", chainActive.LastTip()->GetBlockHash().GetHex()));
         result.push_back(Pair("height", (int)chainActive.Height()));
         return result;
     } else {
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index a9aff1b7f..525c35ca4 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -179,7 +179,7 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
         const CTxOut& txout = tx.vout[i];
         UniValue out(UniValue::VOBJ);
         out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
-        if ( pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.Tip()) != 0 )
+        if ( pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.LastTip()) != 0 )
         {
             int64_t interest; int32_t txheight; uint32_t locktime;
             interest = komodo_accrued_interest(&txheight,&locktime,tx.GetHash(),i,0,txout.nValue,(int32_t)tipindex->nHeight);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index 51ed1103e..e96f0d975 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -437,7 +437,7 @@ void CTxMemPool::removeExpired(unsigned int nBlockHeight)
     for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++)
     {
         const CTransaction& tx = it->GetTx();
-        tipindex = chainActive.Tip();
+        tipindex = chainActive.LastTip();
         if (IsExpiredTx(tx, nBlockHeight) || (ASSETCHAINS_SYMBOL[0] == 0 && tipindex != 0 && komodo_validate_interest(tx,tipindex->nHeight+1,tipindex->GetMedianTimePast() + 777,0)) < 0)
         {
             transactionsToRemove.push_back(tx);
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 15caad846..c8dc7aa5b 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -278,7 +278,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys
     if (!file.is_open())
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot open wallet dump file");
 
-    int64_t nTimeBegin = chainActive.Tip()->GetBlockTime();
+    int64_t nTimeBegin = chainActive.LastTip()->GetBlockTime();
 
     bool fGood = true;
 
@@ -364,7 +364,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys
     file.close();
     pwalletMain->ShowProgress("", 100); // hide progress dialog in GUI
 
-    CBlockIndex *pindex = chainActive.Tip();
+    CBlockIndex *pindex = chainActive.LastTip();
     while (pindex && pindex->pprev && pindex->GetBlockTime() > nTimeBegin - 7200)
         pindex = pindex->pprev;
 
@@ -509,8 +509,8 @@ UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys)
     // produce output
     file << strprintf("# Wallet dump created by Komodo %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
     file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
-    file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
-    file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));
+    file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.LastTip()->GetBlockHash().ToString());
+    file << strprintf("#   mined on %s\n", EncodeDumpTime(chainActive.LastTip()->GetBlockTime()));
     file << "\n";
     for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
         const CKeyID &keyid = it->second;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c4374737f..084a4f752 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -574,7 +574,7 @@ UniValue kvupdate(const UniValue& params, bool fHelp)
             valuesize = (int32_t)strlen(params[1].get_str().c_str());
         }
         memcpy(keyvalue,key,keylen);
-        if ( (refvaluesize= komodo_kvsearch(&refpubkey,chainActive.Tip()->nHeight,&tmpflags,&height,&keyvalue[keylen],key,keylen)) >= 0 )
+        if ( (refvaluesize= komodo_kvsearch(&refpubkey,chainActive.LastTip()->nHeight,&tmpflags,&height,&keyvalue[keylen],key,keylen)) >= 0 )
         {
             if ( (tmpflags & KOMODO_KVPROTECTED) != 0 )
             {
@@ -599,7 +599,7 @@ UniValue kvupdate(const UniValue& params, bool fHelp)
         //    printf("%02x",((uint8_t *)&sig)[i]);
         //printf(" sig for keylen.%d + valuesize.%d\n",keylen,refvaluesize);
         ret.push_back(Pair("coin",(char *)(ASSETCHAINS_SYMBOL[0] == 0 ? "KMD" : ASSETCHAINS_SYMBOL)));
-        height = chainActive.Tip()->nHeight;
+        height = chainActive.LastTip()->nHeight;
         if ( memcmp(&zeroes,&refpubkey,sizeof(refpubkey)) != 0 )
             ret.push_back(Pair("owner",refpubkey.GetHex()));
         ret.push_back(Pair("height", (int64_t)height));
@@ -671,7 +671,7 @@ UniValue paxdeposit(const UniValue& params, bool fHelp)
     int64_t fiatoshis = atof(params[1].get_str().c_str()) * COIN;
     std::string base = params[2].get_str();
     std::string dest;
-    height = chainActive.Tip()->nHeight;
+    height = chainActive.LastTip()->nHeight;
     if ( pax_fiatstatus(&available,&deposited,&issued,&withdrawn,&approved,&redeemed,(char *)base.c_str()) != 0 || available < fiatoshis )
     {
         fprintf(stderr,"available %llu vs fiatoshis %llu\n",(long long)available,(long long)fiatoshis);
@@ -2713,13 +2713,13 @@ UniValue listunspent(const UniValue& params, bool fHelp)
             BlockMap::iterator it = mapBlockIndex.find(pcoinsTip->GetBestBlock());
             CBlockIndex *tipindex,*pindex = it->second;
             uint64_t interest; uint32_t locktime; int32_t txheight;
-            if ( pindex != 0 && (tipindex= chainActive.Tip()) != 0 )
+            if ( pindex != 0 && (tipindex= chainActive.LastTip()) != 0 )
             {
                 interest = komodo_accrued_interest(&txheight,&locktime,out.tx->GetHash(),out.i,0,nValue,(int32_t)tipindex->nHeight);
                 //interest = komodo_interest(txheight,nValue,out.tx->nLockTime,tipindex->nTime);
                 entry.push_back(Pair("interest",ValueFromAmount(interest)));
             }
-            //fprintf(stderr,"nValue %.8f pindex.%p tipindex.%p locktime.%u txheight.%d pindexht.%d\n",(double)nValue/COIN,pindex,chainActive.Tip(),locktime,txheight,pindex->nHeight);
+            //fprintf(stderr,"nValue %.8f pindex.%p tipindex.%p locktime.%u txheight.%d pindexht.%d\n",(double)nValue/COIN,pindex,chainActive.LastTip(),locktime,txheight,pindex->nHeight);
         }
         entry.push_back(Pair("confirmations",out.nDepth));
         entry.push_back(Pair("spendable", out.fSpendable));
@@ -2746,7 +2746,7 @@ uint64_t komodo_interestsum()
             {
                 BlockMap::iterator it = mapBlockIndex.find(pcoinsTip->GetBestBlock());
                 CBlockIndex *tipindex,*pindex = it->second;
-                if ( pindex != 0 && (tipindex= chainActive.Tip()) != 0 )
+                if ( pindex != 0 && (tipindex= chainActive.LastTip()) != 0 )
                 {
                     interest = komodo_accrued_interest(&txheight,&locktime,out.tx->GetHash(),out.i,0,nValue,(int32_t)tipindex->nHeight);
                     //interest = komodo_interest(pindex->nHeight,nValue,out.tx->nLockTime,tipindex->nTime);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index df0cd9c2b..ce5630fb6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1819,7 +1819,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
         double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
-        double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.Tip(), false);
+        double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.LastTip(), false);
         while (pindex)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
@@ -2299,20 +2299,20 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
                     if ( KOMODO_EXCHANGEWALLET == 0 )
                     {
                         uint32_t locktime; int32_t txheight; CBlockIndex *tipindex;
-                        if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.Tip() != 0 && chainActive.Tip()->nHeight >= 60000 )
+                        if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.LastTip() != 0 && chainActive.LastTip()->nHeight >= 60000 )
                         {
                             if ( pcoin->vout[i].nValue >= 10*COIN )
                             {
-                                if ( (tipindex= chainActive.Tip()) != 0 )
+                                if ( (tipindex= chainActive.LastTip()) != 0 )
                                 {
                                     komodo_accrued_interest(&txheight,&locktime,wtxid,i,0,pcoin->vout[i].nValue,(int32_t)tipindex->nHeight);
                                     interest = komodo_interestnew(txheight,pcoin->vout[i].nValue,locktime,tipindex->nTime);
                                 } else interest = 0;
-                                //interest = komodo_interestnew(chainActive.Tip()->nHeight+1,pcoin->vout[i].nValue,pcoin->nLockTime,chainActive.Tip()->nTime);
+                                //interest = komodo_interestnew(chainActive.LastTip()->nHeight+1,pcoin->vout[i].nValue,pcoin->nLockTime,chainActive.LastTip()->nTime);
                                 if ( interest != 0 )
                                 {
                                     //printf("wallet nValueRet %.8f += interest %.8f ht.%d lock.%u/%u tip.%u\n",(double)pcoin->vout[i].nValue/COIN,(double)interest/COIN,txheight,locktime,pcoin->nLockTime,tipindex->nTime);
-                                    //fprintf(stderr,"wallet nValueRet %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)pcoin->vout[i].nValue/COIN,(double)interest/COIN,chainActive.Tip()->nHeight+1,pcoin->nLockTime,chainActive.Tip()->nTime);
+                                    //fprintf(stderr,"wallet nValueRet %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)pcoin->vout[i].nValue/COIN,(double)interest/COIN,chainActive.LastTip()->nHeight+1,pcoin->nLockTime,chainActive.LastTip()->nTime);
                                     //ptr = (uint64_t *)&pcoin->vout[i].nValue;
                                     //(*ptr) += interest;
                                     ptr = (uint64_t *)&pcoin->vout[i].interest;
@@ -2687,7 +2687,7 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
     int nextBlockHeight = chainActive.Height() + 1;
     CMutableTransaction txNew = CreateNewContextualCMutableTransaction(
                                                                        Params().GetConsensus(), nextBlockHeight);
-        txNew.nLockTime = (uint32_t)chainActive.Tip()->nTime + 1; // set to a time close to now
+        txNew.nLockTime = (uint32_t)chainActive.LastTip()->nTime + 1; // set to a time close to now
 
     // Activates after Overwinter network upgrade
     // Set nExpiryHeight to expiryDelta (default 20) blocks past current block height

From 17839698a34ac122200fe4eaf82f709b3b1c94a8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 16 Jul 2018 00:55:48 -1100
Subject: [PATCH 212/623] block_from_future_rejecttime used in RAMstaker

---
 src/wallet/rpcwallet.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 084a4f752..02cea5bef 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4678,7 +4678,7 @@ uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komod
 int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blocktimep,uint32_t *txtimep,uint256 *utxotxidp,int32_t *utxovoutp,uint64_t *utxovaluep,uint8_t *utxosig)
 {
     static struct komodo_staking *array; static int32_t numkp,maxkp; static uint32_t lasttime;
-    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t winners,segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t besttime,eligible,eligible2,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
+    set<CBitcoinAddress> setAddress; struct komodo_staking *kp; int32_t winners,segid,minage,nHeight,counter=0,i,m,siglen=0,nMinDepth = 1,nMaxDepth = 99999999; vector<COutput> vecOutputs; uint32_t block_from_future_rejecttime,besttime,eligible,eligible2,earliest = 0; CScript best_scriptPubKey; arith_uint256 mindiff,ratio,bnTarget; CBlockIndex *tipindex,*pindex; CTxDestination address; bool fNegative,fOverflow; uint8_t hashbuf[256]; CTransaction tx; uint256 hashBlock;
     bnTarget.SetCompact(nBits, &fNegative, &fOverflow);
     mindiff.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow);
     ratio = (mindiff / bnTarget);
@@ -4737,6 +4737,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
         lasttime = (uint32_t)time(NULL);
         //fprintf(stderr,"finished kp data of utxo for staking %u ht.%d numkp.%d maxkp.%d\n",(uint32_t)time(NULL),nHeight,numkp,maxkp);
     }
+    block_from_future_rejecttime = (uint32_t)GetAdjustedTime() + 57;
     for (i=winners=0; i<numkp; i++)
     {
         if ( (tipindex= chainActive.Tip()) == 0 || tipindex->nHeight+1 > nHeight )
@@ -4758,7 +4759,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
                 {
                     besttime = eligible;
                     eligible--;
-                    if ( eligible < (uint32_t)tipindex->nTime-63 )
+                    if ( eligible < block_from_future_rejecttime ) // nothing gained by going earlier
                         break;
                     m++;
                     //fprintf(stderr,"m.%d ht.%d validated winning blocktime %u -> %.8f eligible.%u test prior\n",m,nHeight,*blocktimep,(double)kp->nValue/COIN,eligible);

From d62d9d7889f7c647f19534f0986e0e9372db6377 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 01:40:24 +0000
Subject: [PATCH 213/623] Almost working snapshot, we need to sum unspent
 outputs for each address and return to final snapshot data in json response

---
 src/txdb.cpp | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index fa3766faf..dfef647e6 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -400,36 +400,30 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
 
 int64_t CBlockTreeDB::Snapshot()
 {
-    char chType; int64_t total = -1; std::string address;
+    char chType; int64_t total = 0; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
-    //boost::scoped_ptr<leveldb::Iterator> pcursor(pdb->NewIterator(leveldb::ReadOptions()) );
-    //boost::scoped_ptr<leveldb::Iterator> pcursor(db->NewIterator());
-    fprintf(stderr,"Snapshot\n");
-	
+
     //pcursor->SeekToFirst();
     pcursor->SeekToLast();
-    fprintf(stderr,"SeekToLast\n");
 
-    fprintf(stderr,"pcursor iterate\n");
     while (pcursor->Valid())
     {
-	fprintf(stderr,"pcursor valid\n");
+	//fprintf(stderr,"pcursor valid\n");
         boost::this_thread::interruption_point();
-	fprintf(stderr,"about to try\n");
         try
         {
             leveldb::Slice slKey = pcursor->key();
-	    fprintf(stderr,"made slice\n");
             CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
-	    fprintf(stderr,"made ssKey\n");
-            CAddressIndexKey indexKey;
+           // CAddressIndexKey indexKey;
+	    CAddressIndexIteratorKey indexKey;
             ssKey >> chType;
-	    fprintf(stderr,"made chType\n");
             ssKey >> indexKey;
-	    fprintf(stderr,"made indexKey\n");
-            fprintf(stderr,"chType.%d\n",chType);
-            if ( chType == DB_ADDRESSINDEX )
+            //fprintf(stderr,"chType.%d\n",chType);
+            //fprintf(stderr,"dbindex prefix=%d\n",DB_ADDRESSINDEX);
+            //if ( chType == 'u'  ) // chType == DB_ADDRESSINDEX )
+            if ( chType == DB_ADDRESSUNSPENTINDEX  ) // chType == DB_ADDRESSINDEX )
             {
+
                 try {
                     leveldb::Slice slValue = pcursor->value();
                     CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
@@ -437,11 +431,9 @@ int64_t CBlockTreeDB::Snapshot()
                     ssValue >> nValue;
                     getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
                     fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
-                    if ( total < 0 )
-                        total = (int64_t)nValue;
-                    else total += (int64_t)nValue;
+
+                    total += (double) nValue / COIN;
                     //addressIndex.push_back(make_pair(indexKey, nValue));
-                    pcursor->Prev();
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
@@ -450,6 +442,7 @@ int64_t CBlockTreeDB::Snapshot()
 	    fprintf(stderr, "%s: LevelDB exception! - %s\n", __func__, e.what());
             break;
         }
+	pcursor->Prev();
     }
     return(total);
 }

From 920f9601222ad9d4d047e6242e75e539ed991f03 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 06:05:36 +0000
Subject: [PATCH 214/623] Correctly print out snapshot data to stderr for now

---
 src/txdb.cpp | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index dfef647e6..00d3d276b 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,38 +402,46 @@ int64_t CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = 0; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
+    std::map <std::string, CAmount> addressAmounts;
 
     //pcursor->SeekToFirst();
     pcursor->SeekToLast();
 
     while (pcursor->Valid())
     {
-	//fprintf(stderr,"pcursor valid\n");
         boost::this_thread::interruption_point();
         try
         {
             leveldb::Slice slKey = pcursor->key();
             CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
-           // CAddressIndexKey indexKey;
 	    CAddressIndexIteratorKey indexKey;
             ssKey >> chType;
             ssKey >> indexKey;
-            //fprintf(stderr,"chType.%d\n",chType);
-            //fprintf(stderr,"dbindex prefix=%d\n",DB_ADDRESSINDEX);
-            //if ( chType == 'u'  ) // chType == DB_ADDRESSINDEX )
-            if ( chType == DB_ADDRESSUNSPENTINDEX  ) // chType == DB_ADDRESSINDEX )
-            {
 
+            if ( chType == DB_ADDRESSUNSPENTINDEX )
+            {
                 try {
                     leveldb::Slice slValue = pcursor->value();
                     CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
                     CAmount nValue;
                     ssValue >> nValue;
+                    //if (!getAddressFromIndex(indexKey.type, indexKey.hashBytes, address)) {
                     getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
-                    fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
 
-                    total += (double) nValue / COIN;
-                    //addressIndex.push_back(make_pair(indexKey, nValue));
+			    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
+			    if (pos == addressAmounts.end()) {
+				// insert new address + utxo amount
+			        fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
+				addressAmounts[address] = nValue;
+			    } else {
+				// update unspent tally for this address
+				addressAmounts[address] += nValue;
+			    }
+
+			    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
+			    total += (double) nValue / COIN;
+			    //addressIndex.push_back(make_pair(indexKey, nValue));
+		    //}
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
@@ -442,8 +450,14 @@ int64_t CBlockTreeDB::Snapshot()
 	    fprintf(stderr, "%s: LevelDB exception! - %s\n", __func__, e.what());
             break;
         }
-	pcursor->Prev();
+        pcursor->Prev();
     }
+
+    for (map <std::string, CAmount>::iterator it = addressAmounts.begin(); it != addressAmounts.end(); it++)
+    {
+	    fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
+    }
+
     return(total);
 }
 

From 7000ef1af3ddfc99bde07c185c781ea198d5eea5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 17 Jul 2018 05:26:34 -1100
Subject: [PATCH 215/623] Possible workaround for crash

---
 src/wallet/wallet.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ce5630fb6..e62c6e60b 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1885,6 +1885,11 @@ void CWallet::ReacceptWalletTransactions()
 
 bool CWalletTx::RelayWalletTransaction()
 {
+    if ( pwallet == 0 )
+    {
+        fprintf(stderr,"unexpected null pwallet in RelayWalletTransaction\n");
+        return(false);
+    }
     assert(pwallet->GetBroadcastTransactions());
     if (!IsCoinBase())
     {
@@ -2124,9 +2129,13 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
     }
     BOOST_FOREACH(PAIRTYPE(const unsigned int, CWalletTx*)& item, mapSorted)
     {
-        CWalletTx& wtx = *item.second;
-        if (wtx.RelayWalletTransaction())
-            result.push_back(wtx.GetHash());
+        CWalletTx& wtx;
+        if ( item.second != 0 )
+        {
+            wtx = *item.second;
+            if (wtx.RelayWalletTransaction())
+                result.push_back(wtx.GetHash());
+        }
     }
     return result;
 }

From 3872e9cb59b99fbffc23ea9fa3587afbb68a524c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 17 Jul 2018 05:29:01 -1100
Subject: [PATCH 216/623] Fix

---
 src/wallet/wallet.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index e62c6e60b..5100a2470 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2129,10 +2129,9 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
     }
     BOOST_FOREACH(PAIRTYPE(const unsigned int, CWalletTx*)& item, mapSorted)
     {
-        CWalletTx& wtx;
         if ( item.second != 0 )
         {
-            wtx = *item.second;
+            CWalletTx &wtx = *item.second;
             if (wtx.RelayWalletTransaction())
                 result.push_back(wtx.GetHash());
         }

From 92dc28a3c92a1b5fea3c5ccf69dd796c6664e7b6 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 18:42:30 +0000
Subject: [PATCH 217/623] Return snapshot info as JSON

---
 src/main.cpp    |  9 ++++-----
 src/rpcmisc.cpp | 12 ++++++++----
 src/txdb.cpp    | 43 ++++++++++++++++++++++++-------------------
 src/txdb.h      |  3 ++-
 4 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 15d74adb2..dfebfec4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -588,21 +588,20 @@ CBlockTreeDB *pblocktree = NULL;
 #define KOMODO_ZCASH
 #include "komodo.h"
 
-int64_t komodo_snapshot()
+UniValue komodo_snapshot()
 {
-    fprintf(stderr,"komodo_snapshot\n");
     int64_t total = -1;
+    UniValue result(UniValue::VOBJ);
     if (fAddressIndex) {
 	    if ( pblocktree != 0 ) {
-		total = pblocktree->Snapshot();
+		result = pblocktree->Snapshot();
 	    } else {
 		fprintf(stderr,"null pblocktree start with -addressindex=true\n");
 	    }
     } else {
 	    fprintf(stderr,"getsnapshot requires -addressindex=true\n");
     }
-    fprintf(stderr,"total=%li\n", total);
-    return(total);
+    return(result);
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index bf7f345d5..198b41090 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -1015,7 +1015,7 @@ UniValue getaddressbalance(const UniValue& params, bool fHelp)
 
 }
 
-int32_t komodo_snapshot();
+UniValue komodo_snapshot();
 
 UniValue getsnapshot(const UniValue& params, bool fHelp)
 {
@@ -1026,9 +1026,13 @@ UniValue getsnapshot(const UniValue& params, bool fHelp)
                             "getsnapshot\n"
                             );
     }
-    if ( (total= komodo_snapshot()) >= 0 )
-        result.push_back(Pair("total", (double)total/COIN));
-    else result.push_back(Pair("error", "no addressindex"));
+    result = komodo_snapshot();
+    if ( result.size() > 0 ) {
+	// add timestamp, maybe block height?
+        result.push_back(Pair("time", time(NULL)));
+    } else {
+	result.push_back(Pair("error", "no addressindex"));
+    }
     return(result);
 }
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 00d3d276b..63b640123 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -10,6 +10,7 @@
 #include "main.h"
 #include "pow.h"
 #include "uint256.h"
+#include "core_io.h"
 
 #include <stdint.h>
 
@@ -398,11 +399,12 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
 
 bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &address);
 
-int64_t CBlockTreeDB::Snapshot()
+extern UniValue CBlockTreeDB::Snapshot()
 {
-    char chType; int64_t total = 0; std::string address;
+    char chType; int64_t total = 0; int64_t totalAddresses = 0; std::string address;
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
+    UniValue result(UniValue::VOBJ);
 
     //pcursor->SeekToFirst();
     pcursor->SeekToLast();
@@ -425,23 +427,22 @@ int64_t CBlockTreeDB::Snapshot()
                     CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
                     CAmount nValue;
                     ssValue >> nValue;
-                    //if (!getAddressFromIndex(indexKey.type, indexKey.hashBytes, address)) {
-                    getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
 
-			    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
-			    if (pos == addressAmounts.end()) {
-				// insert new address + utxo amount
-			        fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
-				addressAmounts[address] = nValue;
-			    } else {
-				// update unspent tally for this address
-				addressAmounts[address] += nValue;
-			    }
+		    getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
+		    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
+		    if (pos == addressAmounts.end()) {
+			// insert new address + utxo amount
+			fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
+			addressAmounts[address] = nValue;
+			totalAddresses++;
+		    } else {
+			// update unspent tally for this address
+			addressAmounts[address] += nValue;
+		    }
 
-			    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
-			    total += (double) nValue / COIN;
-			    //addressIndex.push_back(make_pair(indexKey, nValue));
-		    //}
+		    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
+		    total += nValue;
+		    //addressIndex.push_back(make_pair(indexKey, nValue));
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
@@ -453,12 +454,16 @@ int64_t CBlockTreeDB::Snapshot()
         pcursor->Prev();
     }
 
+   // TODO: create addresses key with array of {address,amount} 
+
+    fprintf(stderr, "total=%f, totalAddresses=%li\n", (double) total / COIN, totalAddresses);
     for (map <std::string, CAmount>::iterator it = addressAmounts.begin(); it != addressAmounts.end(); it++)
     {
-	    fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
+        fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
+        result.push_back(make_pair( it->first.c_str(), (double) it->second / COIN ) );
     }
 
-    return(total);
+    return(result);
 }
 
 bool CBlockTreeDB::WriteTimestampIndex(const CTimestampIndexKey &timestampIndex) {
diff --git a/src/txdb.h b/src/txdb.h
index cb4d6d19e..6c6b41917 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -13,6 +13,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <univalue.h>
 
 class CBlockFileInfo;
 class CBlockIndex;
@@ -94,7 +95,7 @@ public:
     bool ReadFlag(const std::string &name, bool &fValue);
     bool LoadBlockIndexGuts();
     bool blockOnchainActive(const uint256 &hash);
-    int64_t Snapshot();
+    UniValue Snapshot();
 };
 
 #endif // BITCOIN_TXDB_H

From 29a5aa99fd5090bf3ca1b1248a844807bcff377c Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 19:39:55 +0000
Subject: [PATCH 218/623] Move address+amount data to addresses key in JSON;
 add some useful metadata to snapshot response

---
 src/txdb.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 63b640123..9170ceea0 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -454,15 +454,23 @@ extern UniValue CBlockTreeDB::Snapshot()
         pcursor->Prev();
     }
 
-   // TODO: create addresses key with array of {address,amount} 
+    UniValue addresses(UniValue::VARR);
 
     fprintf(stderr, "total=%f, totalAddresses=%li\n", (double) total / COIN, totalAddresses);
     for (map <std::string, CAmount>::iterator it = addressAmounts.begin(); it != addressAmounts.end(); it++)
     {
-        fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
-        result.push_back(make_pair( it->first.c_str(), (double) it->second / COIN ) );
+        UniValue obj(UniValue::VOBJ);
+	fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
+	obj.push_back( make_pair("addr", it->first.c_str() ) );
+	obj.push_back( make_pair("amount", (double) it->second / COIN));
+	addresses.push_back(obj);
     }
 
+    result.push_back(make_pair("addresses", addresses));
+    result.push_back(make_pair("total", total / COIN ));
+    result.push_back(make_pair("average",(double) (total/COIN) / totalAddresses ));
+    result.push_back(make_pair("total_addresses", totalAddresses));
+    result.push_back(make_pair("height", chainActive.Height()));
     return(result);
 }
 

From 6e74fd25780d8ac14d20bd89d5ced6eb368e7440 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 21:37:52 +0000
Subject: [PATCH 219/623] In memory sorting, add a few metadata fields;
 printing small floats correctly still not working

---
 src/txdb.cpp | 46 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 9170ceea0..b4ea54f9b 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -409,6 +409,14 @@ extern UniValue CBlockTreeDB::Snapshot()
     //pcursor->SeekToFirst();
     pcursor->SeekToLast();
 
+    int64_t startingHeight = chainActive.Height();
+
+    // prevent any node updates so we can get a consistent snapshot at this height
+    //  causes coredumps
+    // LOCK(cs_main);
+    //  does not compile
+    //LOCK(cs_wallet);
+
     while (pcursor->Valid())
     {
         boost::this_thread::interruption_point();
@@ -442,7 +450,6 @@ extern UniValue CBlockTreeDB::Snapshot()
 
 		    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
 		    total += nValue;
-		    //addressIndex.push_back(make_pair(indexKey, nValue));
                 } catch (const std::exception& e) {
                     return error("failed to get address index value");
                 }
@@ -455,22 +462,39 @@ extern UniValue CBlockTreeDB::Snapshot()
     }
 
     UniValue addresses(UniValue::VARR);
-
     fprintf(stderr, "total=%f, totalAddresses=%li\n", (double) total / COIN, totalAddresses);
-    for (map <std::string, CAmount>::iterator it = addressAmounts.begin(); it != addressAmounts.end(); it++)
-    {
-        UniValue obj(UniValue::VOBJ);
-	fprintf(stderr,"{\"%s\", %.8f},\n",it->first.c_str(),(double) it->second / COIN);
-	obj.push_back( make_pair("addr", it->first.c_str() ) );
-	obj.push_back( make_pair("amount", (double) it->second / COIN));
-	addresses.push_back(obj);
+
+    typedef std::function<bool(std::pair<std::string, CAmount>, std::pair<std::string, CAmount>)> Comparator;
+    Comparator compFunctor = [](std::pair<std::string, CAmount> elem1 ,std::pair<std::string, CAmount> elem2) {
+	return elem1.second > elem2.second; /* descending */
+    };
+    // This is our intermediate data structure that allows us to calculate addressSorted
+    std::set<std::pair<std::string, CAmount>, Comparator> sortedSnapshot(addressAmounts.begin(), addressAmounts.end(), compFunctor);
+
+    UniValue obj(UniValue::VOBJ);
+    UniValue addressesSorted(UniValue::VARR);
+    for (std::pair<std::string, CAmount> element : sortedSnapshot) {
+	UniValue obj(UniValue::VOBJ);
+	obj.push_back( make_pair("addr", element.first.c_str() ) );
+	std::ostringstream strs;
+	strs << ((double) element.second/COIN);
+	std::string amount = strs.str();
+
+	//std::string amount = boost::lexical_cast<std::string>((double) element.second/COIN);
+	//sprintf(amount, "%.8f", (double) element.second / COIN);
+	obj.push_back( make_pair("amount", amount) );
+	addressesSorted.push_back(obj);
     }
 
-    result.push_back(make_pair("addresses", addresses));
+    result.push_back(make_pair("addresses", addressesSorted));
     result.push_back(make_pair("total", total / COIN ));
     result.push_back(make_pair("average",(double) (total/COIN) / totalAddresses ));
+    // Total number of addresses in this snaphot
     result.push_back(make_pair("total_addresses", totalAddresses));
-    result.push_back(make_pair("height", chainActive.Height()));
+    // The snapshot began at this block height
+    result.push_back(make_pair("start_height", startingHeight));
+    // The snapshot finished at this block height
+    result.push_back(make_pair("ending_height", chainActive.Height()));
     return(result);
 }
 

From 3eb535b8b4c61e63027611aaf02f3a4dcae9626b Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 22:31:06 +0000
Subject: [PATCH 220/623] Include start_time+end_time and correctly format
 amount

---
 src/main.cpp    |  1 +
 src/rpcmisc.cpp |  3 +--
 src/txdb.cpp    | 15 +++------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index dfebfec4f..11bc3a352 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -592,6 +592,7 @@ UniValue komodo_snapshot()
 {
     int64_t total = -1;
     UniValue result(UniValue::VOBJ);
+
     if (fAddressIndex) {
 	    if ( pblocktree != 0 ) {
 		result = pblocktree->Snapshot();
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 198b41090..01bd813e6 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -1028,8 +1028,7 @@ UniValue getsnapshot(const UniValue& params, bool fHelp)
     }
     result = komodo_snapshot();
     if ( result.size() > 0 ) {
-	// add timestamp, maybe block height?
-        result.push_back(Pair("time", time(NULL)));
+        result.push_back(Pair("end_time", time(NULL)));
     } else {
 	result.push_back(Pair("error", "no addressindex"));
     }
diff --git a/src/txdb.cpp b/src/txdb.cpp
index b4ea54f9b..2360ed340 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -405,18 +405,13 @@ extern UniValue CBlockTreeDB::Snapshot()
     boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
     UniValue result(UniValue::VOBJ);
+    result.push_back(Pair("start_time", time(NULL)));
 
     //pcursor->SeekToFirst();
     pcursor->SeekToLast();
 
     int64_t startingHeight = chainActive.Height();
 
-    // prevent any node updates so we can get a consistent snapshot at this height
-    //  causes coredumps
-    // LOCK(cs_main);
-    //  does not compile
-    //LOCK(cs_wallet);
-
     while (pcursor->Valid())
     {
         boost::this_thread::interruption_point();
@@ -476,12 +471,8 @@ extern UniValue CBlockTreeDB::Snapshot()
     for (std::pair<std::string, CAmount> element : sortedSnapshot) {
 	UniValue obj(UniValue::VOBJ);
 	obj.push_back( make_pair("addr", element.first.c_str() ) );
-	std::ostringstream strs;
-	strs << ((double) element.second/COIN);
-	std::string amount = strs.str();
-
-	//std::string amount = boost::lexical_cast<std::string>((double) element.second/COIN);
-	//sprintf(amount, "%.8f", (double) element.second / COIN);
+	char amount[32];
+	sprintf(amount, "%.8f", (double) element.second / COIN);
 	obj.push_back( make_pair("amount", amount) );
 	addressesSorted.push_back(obj);
     }

From 539080b3a4109285dc1a3b77fb5a15e782d7cc7e Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 17 Jul 2018 22:33:19 +0000
Subject: [PATCH 221/623] Less noise to stderr

---
 src/txdb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 2360ed340..cb0358403 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -435,7 +435,7 @@ extern UniValue CBlockTreeDB::Snapshot()
 		    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
 		    if (pos == addressAmounts.end()) {
 			// insert new address + utxo amount
-			fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
+			//fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
 			addressAmounts[address] = nValue;
 			totalAddresses++;
 		    } else {

From 4ac134db0c5c0e7e99222bfd3f2fb62f255094eb Mon Sep 17 00:00:00 2001
From: Alrighttt <mzlot555@gmail.com>
Date: Wed, 18 Jul 2018 02:34:10 -0400
Subject: [PATCH 222/623] change zcashd reference, update example conf

---
 contrib/debian/examples/komodo.conf | 140 ++++++++++++++++++++++++++++
 src/bitcoind.cpp                    |  12 +--
 2 files changed, 146 insertions(+), 6 deletions(-)
 create mode 100644 contrib/debian/examples/komodo.conf

diff --git a/contrib/debian/examples/komodo.conf b/contrib/debian/examples/komodo.conf
new file mode 100644
index 000000000..656a43533
--- /dev/null
+++ b/contrib/debian/examples/komodo.conf
@@ -0,0 +1,140 @@
+##
+## komodo.conf configuration file. Lines beginning with # are comments.
+##
+
+# Network-related settings:
+
+# Run a regression test network
+#regtest=0
+
+# Connect via a SOCKS5 proxy
+#proxy=127.0.0.1:9050
+
+# Bind to given address and always listen on it. Use [host]:port notation for IPv6
+#bind=<addr>
+
+# Bind to given address and whitelist peers connecting to it. Use [host]:port notation for IPv6
+#whitebind=<addr>
+
+##############################################################
+##            Quick Primer on addnode vs connect            ##
+##  Let's say for instance you use addnode=4.2.2.4          ##
+##  addnode will connect you to and tell you about the      ##
+##    nodes connected to 4.2.2.4.  In addition it will tell ##
+##    the other nodes connected to it that you exist so     ##
+##    they can connect to you.                              ##
+##  connect will not do the above when you 'connect' to it. ##
+##    It will *only* connect you to 4.2.2.4 and no one else.##
+##                                                          ##
+##  So if you're behind a firewall, or have other problems  ##
+##  finding nodes, add some using 'addnode'.                ##
+##                                                          ##
+##  If you want to stay private, use 'connect' to only      ##
+##  connect to "trusted" nodes.                             ##
+##                                                          ##
+##  If you run multiple nodes on a LAN, there's no need for ##
+##  all of them to open lots of connections.  Instead       ##
+##  'connect' them all to one node that is port forwarded   ##
+##  and has lots of connections.                            ##
+##       Thanks goes to [Noodle] on Freenode.               ##
+##############################################################
+
+# Use as many addnode= settings as you like to connect to specific peers
+#addnode=69.164.218.197
+#addnode=10.0.0.2:8233
+
+# Alternatively use as many connect= settings as you like to connect ONLY to specific peers
+#connect=69.164.218.197
+#connect=10.0.0.1:8233
+
+# Listening mode, enabled by default except when 'connect' is being used
+#listen=1
+
+# Maximum number of inbound+outbound connections.
+#maxconnections=
+
+#
+# JSON-RPC options (for controlling a running Komodo/komodod process)
+#
+
+# server=1 tells komodod to accept JSON-RPC commands (set as default if not specified)
+#server=1
+
+# Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6.
+# This option can be specified multiple times (default: bind to all interfaces)
+#rpcbind=<addr>
+
+# You must set rpcuser and rpcpassword to secure the JSON-RPC api
+#rpcuser=Ulysses
+#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
+
+# How many seconds komodo will wait for a complete RPC HTTP request.
+# after the HTTP connection is established. 
+#rpcclienttimeout=30
+
+# By default, only RPC connections from localhost are allowed.
+# Specify as many rpcallowip= settings as you like to allow connections from other hosts,
+# either as a single IPv4/IPv6 or with a subnet specification.
+
+# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
+# because the rpcpassword is transmitted over the network unencrypted and also because anyone 
+# that can authenticate on the RPC port can steal your keys + take over the account running komodod
+# For more information see https://github.com/zcash/zcash/issues/1497
+
+#rpcallowip=10.1.1.34/255.255.255.0
+#rpcallowip=1.2.3.4/24
+#rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96
+
+# Listen for RPC connections on this TCP port:
+#rpcport=8232
+
+# You can use Komodo or komodod to send commands to Komodo/komodod
+# running on another host using this option:
+#rpcconnect=127.0.0.1
+
+# Transaction Fee
+
+# Send transactions as zero-fee transactions if possible (default: 0)
+#sendfreetransactions=0
+
+# Create transactions that have enough fees (or priority) so they are likely to # begin confirmation within n blocks (default: 1).
+# This setting is overridden by the -paytxfee option.
+#txconfirmtarget=n
+
+# Miscellaneous options
+
+# Enable attempt to mine komodo.
+#gen=0
+
+# Set the number of threads to be used for mining komodo (-1 = all cores).
+#genproclimit=1
+
+# Specify a different Equihash solver (e.g. "tromp") to try to mine komodo
+# faster when gen=1.
+#equihashsolver=default
+
+# Pre-generate this many public/private key pairs, so wallet backups will be valid for
+# both prior transactions and several dozen future transactions.
+#keypool=100
+
+# Pay an optional transaction fee every time you send komodo.  Transactions with fees
+# are more likely than free transactions to be included in generated blocks, so may
+# be validated sooner. This setting does not affect private transactions created with 
+# 'z_sendmany'.
+#paytxfee=0.00
+
+#Rewind the chain to specific block height. This is useful for creating snapshots at a given block height.
+#rewind=777777
+
+#Stop the chain a specific block height. This is useful for creating snapshots at a given block height.
+#stopat=1000000
+
+#Set an address to use as change address for all transactions. This value must be set to a 33 byte pubkey. All mined coins will also be sent to this address.
+#pubkey=027dc7b5cfb5efca96674b45e9fda18df069d040b9fd9ff32c35df56005e330392
+
+#Forfeit all user rewards to miners. Set this to explicitly not claim user rewards.
+#exchange=1
+
+#Donate all user rewards to a a specific address. This value must be set to a 33 byte pubkey.
+#donation=027dc7b5cfb5efca96674b45e9fda18df069d040b9fd9ff32c35df56005e330392
+
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 5c12cfa2f..36fea57bf 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -144,21 +144,21 @@ bool AppInit(int argc, char* argv[])
             ReadConfigFile(mapArgs, mapMultiArgs);
         } catch (const missing_zcash_conf& e) {
             fprintf(stderr,
-                (_("Before starting zcashd, you need to create a configuration file:\n"
+                (_("Before starting komodod, you need to create a configuration file:\n"
                    "%s\n"
                    "It can be completely empty! That indicates you are happy with the default\n"
-                   "configuration of zcashd. But requiring a configuration file to start ensures\n"
-                   "that zcashd won't accidentally compromise your privacy if there was a default\n"
+                   "configuration of komodod. But requiring a configuration file to start ensures\n"
+                   "that komodod won't accidentally compromise your privacy if there was a default\n"
                    "option you needed to change.\n"
                    "\n"
                    "You can look at the example configuration file for suggestions of default\n"
                    "options that you may want to change. It should be in one of these locations,\n"
-                   "depending on how you installed Zcash:\n") +
+                   "depending on how you installed Komodo:\n") +
                  _("- Source code:  %s\n"
                    "- .deb package: %s\n")).c_str(),
                 GetConfigFile().string().c_str(),
-                "contrib/debian/examples/zcash.conf",
-                "/usr/share/doc/zcash/examples/zcash.conf");
+                "contrib/debian/examples/komodo.conf",
+                "/usr/share/doc/komodo/examples/komodo.conf");
             return false;
         } catch (const std::exception& e) {
             fprintf(stderr,"Error reading configuration file: %s\n", e.what());

From 9ef7fec1efd4f45ca603fbd7a25aa2beae4a5f64 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Wed, 18 Jul 2018 06:54:43 +0000
Subject: [PATCH 223/623] Protect komodo_snapshot() by cs_main lock

---
 src/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.cpp b/src/main.cpp
index 1376c3c7b..aa4435843 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -590,6 +590,7 @@ CBlockTreeDB *pblocktree = NULL;
 
 UniValue komodo_snapshot()
 {
+    LOCK(cs_main);
     int64_t total = -1;
     UniValue result(UniValue::VOBJ);
 

From f345b95386d1ac73bc136b549dbf6f41e1854b86 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 03:02:37 -1100
Subject: [PATCH 224/623] Initial assets

---
 src/cc/assets.cpp                           | 191 ++++++++++++++++++++
 src/cc/betprotocol.cpp                      |  15 ++
 src/cc/betprotocol.h                        |  15 ++
 src/cc/eval.cpp                             |  19 ++
 src/cc/eval.h                               |  19 +-
 src/cc/import.cpp                           |  15 ++
 src/cc/utils.h                              |  15 ++
 src/cryptoconditions/src/anon.c             |  14 ++
 src/cryptoconditions/src/cryptoconditions.c |  15 ++
 src/cryptoconditions/src/ed25519.c          |  15 ++
 src/cryptoconditions/src/eval.c             |  15 ++
 src/cryptoconditions/src/internal.h         |  15 ++
 src/cryptoconditions/src/json_rpc.c         |  15 ++
 src/cryptoconditions/src/prefix.c           |  14 ++
 src/cryptoconditions/src/preimage.c         |  14 ++
 src/cryptoconditions/src/threshold.c        |  14 ++
 src/cryptoconditions/src/utils.c            |  15 ++
 17 files changed, 434 insertions(+), 1 deletion(-)
 create mode 100644 src/cc/assets.cpp

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
new file mode 100644
index 000000000..1e7dc61a8
--- /dev/null
+++ b/src/cc/assets.cpp
@@ -0,0 +1,191 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include <cc/eval.h>
+#include <script/cc.h>
+#include <script/script.h>
+#include <cryptoconditions.h>
+
+/*
+ Assets can be created or transferred.
+ 
+ To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 unit, or 100 million satoshis. The interpretation of the number of decimals is left to the higher level usages.
+ 
+ Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee.
+ 
+ What this means is that vout 0 of the creation txid and vouts 1 ... n-2 for transfer vouts are assetoshi outputs.
+ 
+*/
+
+ 
+/*
+# Using Hoek to mangle asset transactions
+# Install haskell stack & hoek
+curl -sSL https://get.haskellstack.org/ | sh
+git clone https://github.com/libscott/hoek; cd hoek; stack install
+# Let...
+addr=RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp
+wif=UsNAMqFwntEpuFBTbG28e3uAJxBNRM8Vi5FxAqHfoRJJNoZ84Esj
+pk=02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c
+# Our CC is a 2 of 2 where the subconditions are an secp256k1, and an EVAL code calling 0xe3 (EVAL_ASSET).
+cc='{"type":"threshold-sha-256","threshold":2,"subfulfillments":[{"type":"eval-sha-256","code":"e3"},{"type":"secp256k1-sha-256","publicKey":"02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c"}]}'
+# 1. Create a asset: Just use regular inputs and only colored outputs
+createTx='{"inputs": [{"txid":"51b78168d94ec307e2855697209275d477e05d8647caf29cb9e38fb6a4661145","idx":0,"script":{"address":"'$addr'"}}],"outputs":[{"amount":10,"script":{"condition":'$cc'}}]}'
+# 2. Transfer a asset: use CC inputs, CC outputs, and an OP_RETURN output with the txid of the tx that created the asset (change the txid):
+transferTx='{"inputs": [{"txid":"51b78168d94ec307e2855697209275d477e05d8647caf29cb9e38fb6a4661145","idx":0,"script":{"fulfillment":'$cc'}}],"outputs":[{"amount":0,"script":{"op_return":"cafabda044ac904d56cee79bbbf3ed9b3891a69000ed08f0ddf0a3dd620a3ea6"}},{"amount":10,"script":{"condition":'$cc'}}]}'
+# 3. Sign and encode
+function signEncodeTx () {
+    signed=`hoek signTx '{"privateKeys":["'$wif'"],"tx":'"$1"'}'`;
+    hoek encodeTx "$signed"
+}
+signEncodeTx "$createTx"
+signEncodeTx "$transferTx"
+*/
+
+
+CC* GetCryptoCondition(CScript const& scriptSig)
+{
+    auto pc = scriptSig.begin();
+    opcodetype opcode;
+    std::vector<unsigned char> ffbin;
+    if (scriptSig.GetOp(pc, opcode, ffbin))
+        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
+}
+
+bool IsAssetOutput(CScript const& scriptPubKey)
+{
+    int32_t scriptlen; uint8_t *script = scriptPubKey.data();
+    scriptlen = scriptPubKey.size();
+    if ( script[scriptlen - 1] != OP_CRYPTOCONDITION )
+        return(false);
+    return(true);
+}
+
+bool IsAssetInput(CScript const& scriptSig)
+{
+    CC* cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSET;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
+// Get the coin ID from opret
+bool DecodeOpRet(CScript const& scriptPubKey, uint256 &coinId)
+{
+    std::vector<uint8_t> vopret;
+    GetOpReturnData(scriptPubKey, vopret);
+    return E_UNMARSHAL(vopret, ss >> coinId);
+}
+
+uint64_t IsAssetTx(uint256 coinId,CTransactionRef& inputTx,int32_t v)
+{
+    // Either the tx will be a CREATE (no CC inputs) or a TRANSFER (1 or more CC inputs)
+    uint256 inputCoinId; unsigned int i,n,r = 0;
+    for (i=0; i<inputTx.vin.size(); i++)
+        r += IsAssetInput(inputTx.vin[i].scriptSig) ? 1 : 0;
+    if ( r > 0 ) // It's a TRANSFER, check coin ID
+    {
+        n = inputTx.vout.size();
+        if ( DecodeOpRet(inputTx.vout[n-1].scriptPubKey,inputCoinId) == 0 )
+            return(0);
+        if ( inputCoinId == coinId && v > 0 && v < n-1 )
+            return(inputTx.vout[v].nValue);
+    }
+    else if ( r == 0 ) // It's a CREATE, compare hash directly
+    {
+        if ( coinId == inputTx.GetHash() && v == 0 ) // asset create must use vout[0] for the asset
+            return(inputTx.vout[v].nValue);
+    }
+    // should never happen
+    fprintf(stderr, "Illegal state detected, mixed inputs for asset at: %s\n",coinId.GetHex().data());
+    return(0);
+}
+
+/*
+ * assets using CC defines 2 possible types of transaction, a CREATE and a TRANSFER.
+ * A CREATE has only regular (non CC) inputs, and a TRANSFER has one or more CC inputs.
+ *
+ * If the asset EVAL routine is being called, then the tx is inevitably a TRANSFER
+ * becuase in the case of a CREATE routine, no CC is triggered.
+ *
+ * The coin ID is the ID of the CREATE transaction.
+ */
+
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
+{
+    CTransactionRef inputTx,createTx; uint256 coinId,hashBlock; int32_t i,n; uint64_t nValue,outputs=0,assetoshis = 0;
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    if ( (n= tx.vout.size()) == 0 )
+        return eval->Invalid("no-vouts");
+    for (i=1; i<n-1; i++)
+    {
+        if ( IsCCOutput(tx.vout[i].scriptPubKey) == 0 )
+            return eval->Invalid("non-CC asset vout");
+        outputs += tx.vout[i].nValue;
+    }
+    if ( !DecodeOpRet(tx.vout[n-1].scriptPubKey, coinId) ) // Expect last output to be an opreturn containing move data
+        return eval->Invalid("Invalid opreturn payload");
+    if ( eval->GetTxUnconfirmed(coinId,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset create txid");
+    if ( createTx.vout.size() == 0 || IsCCOutput(createTx.vout[0].scriptPubKey) == 0 )
+        return eval->Invalid("asset create txid is not asset CC");
+    for (i=0; i<tx.vin.size(); i++) // Check inputs
+    {
+        if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
+        {
+            // We also need to validate that our input transactions are legit - either they
+            // themselves have CC inputs of the same type, or, they have a token definition and
+            // no CC inputs.
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,inputTx,hashBlock) == 0 )
+                return eval->Invalid("This should never happen");
+            if ( (nValue= IsAssetTx(coinId,inputTx,tx.vin[i].prevout.n)) == 0 )
+                return eval->Invalid("Non colored / wrong asset input tx");
+            assetoshis += nValue;
+        }
+    }
+    if ( assetoshis == 0 )
+        return eval->Invalid("no asset inputs");
+    else if ( assetoshis != outputs )
+        return eval->Invalid("mismatched inputs and outputs");
+    
+    // We're unable to ensure that all the outputs have the correct
+    // CC Eval code because we only have the scriptPubKey which is a hash of the
+    // condition. The effect of this is that we cannot control the outputs, and therefore
+    // are able to burn or "lose" units or our colored token and they will be spent as the
+    // regular chain token, but we are able to control when units of the asset get
+    // created because we can always vet the inputs.
+    //
+    // Units of the colored token are always 1:1 with the token being input. No additional
+    // supply is created on the chain. Effectively, fees are paid in units of the colored token.
+    // This leaves something to be desired, because for example, if you wanted to create a
+    // single asset that could transfer ownership, usually you would create an asset with a 
+    // supply of 1, ie can not be divided further, however in this case there would be nothing
+    // left to pay fees with. Implementing separate supply and other details are possible, by
+    // encoding further information in the OP_RETURNS.
+
+    // It's valid
+    return true;
+}
diff --git a/src/cc/betprotocol.cpp b/src/cc/betprotocol.cpp
index 9fe9a567d..a6ccfc972 100644
--- a/src/cc/betprotocol.cpp
+++ b/src/cc/betprotocol.cpp
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include <cryptoconditions.h>
 
 #include "hash.h"
diff --git a/src/cc/betprotocol.h b/src/cc/betprotocol.h
index fad33f7ed..3724aae96 100644
--- a/src/cc/betprotocol.h
+++ b/src/cc/betprotocol.h
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #ifndef BETPROTOCOL_H
 #define BETPROTOCOL_H
 
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 25550d1e2..b8044e0dd 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include <assert.h>
 #include <cryptoconditions.h>
 
@@ -53,6 +68,10 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
     if (ecode == EVAL_IMPORTCOIN) {
         return ImportCoin(vparams, txTo, nIn);
     }
+    
+    if (ecode == EVAL_ASSETS) {
+        return ProcessAssets(this, vparams, txTo, nIn);
+    }
 
     return Invalid("invalid-code");
 }
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 0eef563a3..96af359f1 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #ifndef CC_EVAL_H
 #define CC_EVAL_H
 
@@ -23,7 +38,8 @@
  */
 #define FOREACH_EVAL(EVAL)             \
         EVAL(EVAL_IMPORTPAYOUT, 0xe1)  \
-        EVAL(EVAL_IMPORTCOIN,   0xe2)
+        EVAL(EVAL_IMPORTCOIN,   0xe2)  \
+        EVAL(EVAL_ASSETS, 0xe3)
 
 
 typedef uint8_t EvalCode;
@@ -250,6 +266,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */
diff --git a/src/cc/import.cpp b/src/cc/import.cpp
index 5f0b804e8..26f878369 100644
--- a/src/cc/import.cpp
+++ b/src/cc/import.cpp
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include "cc/eval.h"
 #include "cc/utils.h"
 #include "importcoin.h"
diff --git a/src/cc/utils.h b/src/cc/utils.h
index 5704016e4..f0b91962d 100644
--- a/src/cc/utils.h
+++ b/src/cc/utils.h
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #ifndef CC_UTILS_H
 #define CC_UTILS_H
 
diff --git a/src/cryptoconditions/src/anon.c b/src/cryptoconditions/src/anon.c
index 114517074..43e96ae44 100644
--- a/src/cryptoconditions/src/anon.c
+++ b/src/cryptoconditions/src/anon.c
@@ -1,3 +1,17 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
 
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
diff --git a/src/cryptoconditions/src/cryptoconditions.c b/src/cryptoconditions/src/cryptoconditions.c
index 6fd54f245..3c0e9ea2c 100644
--- a/src/cryptoconditions/src/cryptoconditions.c
+++ b/src/cryptoconditions/src/cryptoconditions.c
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include "strings.h"
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
diff --git a/src/cryptoconditions/src/ed25519.c b/src/cryptoconditions/src/ed25519.c
index 7ae99b226..6cdd80d1d 100644
--- a/src/cryptoconditions/src/ed25519.c
+++ b/src/cryptoconditions/src/ed25519.c
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
 #include "asn/Ed25519FingerprintContents.h"
diff --git a/src/cryptoconditions/src/eval.c b/src/cryptoconditions/src/eval.c
index 4a7d13276..a2bac4c51 100644
--- a/src/cryptoconditions/src/eval.c
+++ b/src/cryptoconditions/src/eval.c
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
 #include "asn/EvalFulfillment.h"
diff --git a/src/cryptoconditions/src/internal.h b/src/cryptoconditions/src/internal.h
index 76955f406..e027176ee 100644
--- a/src/cryptoconditions/src/internal.h
+++ b/src/cryptoconditions/src/internal.h
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include <Condition.h>
 #include <Fulfillment.h>
 #include "include/cJSON.h"
diff --git a/src/cryptoconditions/src/json_rpc.c b/src/cryptoconditions/src/json_rpc.c
index 13cffec1d..63b5909da 100644
--- a/src/cryptoconditions/src/json_rpc.c
+++ b/src/cryptoconditions/src/json_rpc.c
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include "cryptoconditions.h"
 #include "internal.h"
 #include <cJSON.h>
diff --git a/src/cryptoconditions/src/prefix.c b/src/cryptoconditions/src/prefix.c
index 66d432bd2..97a9d1074 100644
--- a/src/cryptoconditions/src/prefix.c
+++ b/src/cryptoconditions/src/prefix.c
@@ -1,3 +1,17 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
 
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
diff --git a/src/cryptoconditions/src/preimage.c b/src/cryptoconditions/src/preimage.c
index 2e3ec7c77..8902817dd 100644
--- a/src/cryptoconditions/src/preimage.c
+++ b/src/cryptoconditions/src/preimage.c
@@ -1,3 +1,17 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
 
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
diff --git a/src/cryptoconditions/src/threshold.c b/src/cryptoconditions/src/threshold.c
index 9c1800302..88d4e7f50 100644
--- a/src/cryptoconditions/src/threshold.c
+++ b/src/cryptoconditions/src/threshold.c
@@ -1,3 +1,17 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
 
 #include "asn/Condition.h"
 #include "asn/Fulfillment.h"
diff --git a/src/cryptoconditions/src/utils.c b/src/cryptoconditions/src/utils.c
index b795932b3..623331ff7 100644
--- a/src/cryptoconditions/src/utils.c
+++ b/src/cryptoconditions/src/utils.c
@@ -1,3 +1,18 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>

From 2abababa755b057db0a4f2f92e5105c29652101a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 03:06:22 -1100
Subject: [PATCH 225/623] Test

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index f9b19978b..49faa50c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -257,6 +257,7 @@ libbitcoin_server_a_SOURCES = \
   bloom.cpp \
   cc/eval.cpp \
   cc/import.cpp \
+  cc/assets.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
   checkpoints.cpp \

From ff9f2c350bcdd0fc015c7a87b8627737f38d8ad0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 03:09:17 -1100
Subject: [PATCH 226/623] Fix

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 1e7dc61a8..7f88a2048 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -66,7 +66,7 @@ CC* GetCryptoCondition(CScript const& scriptSig)
 
 bool IsAssetOutput(CScript const& scriptPubKey)
 {
-    int32_t scriptlen; uint8_t *script = scriptPubKey.data();
+    int32_t scriptlen; const uint8_t *script = scriptPubKey.data();
     scriptlen = scriptPubKey.size();
     if ( script[scriptlen - 1] != OP_CRYPTOCONDITION )
         return(false);
@@ -135,7 +135,7 @@ uint64_t IsAssetTx(uint256 coinId,CTransactionRef& inputTx,int32_t v)
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
 {
-    CTransactionRef inputTx,createTx; uint256 coinId,hashBlock; int32_t i,n; uint64_t nValue,outputs=0,assetoshis = 0;
+    CTransaction inputTx,createTx; uint256 coinId,hashBlock; int32_t i,n; uint64_t nValue,outputs=0,assetoshis = 0;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )

From 47966c7b1616ad5e19194c6751467f74212a575a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 03:12:05 -1100
Subject: [PATCH 227/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 7f88a2048..be278d799 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -39,7 +39,7 @@ git clone https://github.com/libscott/hoek; cd hoek; stack install
 addr=RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp
 wif=UsNAMqFwntEpuFBTbG28e3uAJxBNRM8Vi5FxAqHfoRJJNoZ84Esj
 pk=02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c
-# Our CC is a 2 of 2 where the subconditions are an secp256k1, and an EVAL code calling 0xe3 (EVAL_ASSET).
+# Our CC is a 2 of 2 where the subconditions are an secp256k1, and an EVAL code calling 0xe3 (EVAL_ASSETS).
 cc='{"type":"threshold-sha-256","threshold":2,"subfulfillments":[{"type":"eval-sha-256","code":"e3"},{"type":"secp256k1-sha-256","publicKey":"02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c"}]}'
 # 1. Create a asset: Just use regular inputs and only colored outputs
 createTx='{"inputs": [{"txid":"51b78168d94ec307e2855697209275d477e05d8647caf29cb9e38fb6a4661145","idx":0,"script":{"address":"'$addr'"}}],"outputs":[{"amount":10,"script":{"condition":'$cc'}}]}'
@@ -81,7 +81,7 @@ bool IsAssetInput(CScript const& scriptSig)
 
     // Recurse the CC tree to find asset condition
     auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSET;
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
         // false for a match, true for continue
         return r ? 0 : 1;
     };
@@ -99,7 +99,7 @@ bool DecodeOpRet(CScript const& scriptPubKey, uint256 &coinId)
     return E_UNMARSHAL(vopret, ss >> coinId);
 }
 
-uint64_t IsAssetTx(uint256 coinId,CTransactionRef& inputTx,int32_t v)
+uint64_t IsAssetTx(uint256 coinId,CTransaction& inputTx,int32_t v)
 {
     // Either the tx will be a CREATE (no CC inputs) or a TRANSFER (1 or more CC inputs)
     uint256 inputCoinId; unsigned int i,n,r = 0;

From 1bdde735e63c6cdccd509315e1749c878b10adce Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 03:12:58 -1100
Subject: [PATCH 228/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index be278d799..4e66dd4d4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -64,7 +64,7 @@ CC* GetCryptoCondition(CScript const& scriptSig)
         return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
 }
 
-bool IsAssetOutput(CScript const& scriptPubKey)
+bool IsCCOutput(CScript const& scriptPubKey)
 {
     int32_t scriptlen; const uint8_t *script = scriptPubKey.data();
     scriptlen = scriptPubKey.size();

From 3350160a6c497d156275b2b534c0b4577047a24a Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Wed, 18 Jul 2018 16:02:53 +0000
Subject: [PATCH 229/623] Fix bug where finding index entries of other types,
 such as timestampindex, stopped our iterator

---
 src/txdb.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index cb0358403..5608cbb07 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -411,6 +411,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     pcursor->SeekToLast();
 
     int64_t startingHeight = chainActive.Height();
+    //fprintf(stderr, "starting_height=%li\n", startingHeight);
 
     while (pcursor->Valid())
     {
@@ -423,7 +424,8 @@ extern UniValue CBlockTreeDB::Snapshot()
             ssKey >> chType;
             ssKey >> indexKey;
 
-            if ( chType == DB_ADDRESSUNSPENTINDEX )
+	    //fprintf(stderr, "chType=%d\n", chType);
+            if (chType == DB_ADDRESSUNSPENTINDEX)
             {
                 try {
                     leveldb::Slice slValue = pcursor->value();
@@ -435,7 +437,7 @@ extern UniValue CBlockTreeDB::Snapshot()
 		    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
 		    if (pos == addressAmounts.end()) {
 			// insert new address + utxo amount
-			//fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
+			fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
 			addressAmounts[address] = nValue;
 			totalAddresses++;
 		    } else {
@@ -446,9 +448,10 @@ extern UniValue CBlockTreeDB::Snapshot()
 		    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
 		    total += nValue;
                 } catch (const std::exception& e) {
-                    return error("failed to get address index value");
+		    // this should not happen normally, but maybe if an index is corrupt
+                    fprintf(stderr, "failed to get address index value\n");
                 }
-            } else { break; }
+            }
         } catch (const std::exception& e) {
 	    fprintf(stderr, "%s: LevelDB exception! - %s\n", __func__, e.what());
             break;
@@ -477,9 +480,11 @@ extern UniValue CBlockTreeDB::Snapshot()
 	addressesSorted.push_back(obj);
     }
 
-    result.push_back(make_pair("addresses", addressesSorted));
-    result.push_back(make_pair("total", total / COIN ));
-    result.push_back(make_pair("average",(double) (total/COIN) / totalAddresses ));
+    if (totalAddresses > 0) {
+        result.push_back(make_pair("addresses", addressesSorted));
+        result.push_back(make_pair("total", total / COIN ));
+        result.push_back(make_pair("average",(double) (total/COIN) / totalAddresses ));
+    }
     // Total number of addresses in this snaphot
     result.push_back(make_pair("total_addresses", totalAddresses));
     // The snapshot began at this block height

From 0ce374b7c7e781f82f4955e4c97df79ade05325c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 05:04:15 -1100
Subject: [PATCH 230/623] Remove height triggers and add PoWtarget in
 getblocktemplate

---
 src/komodo_bitcoind.h    | 25 +++++++++++++++----------
 src/rpcmining.cpp        | 11 ++++++++++-
 src/wallet/rpcwallet.cpp | 10 ++++++----
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 5564a79a5..56213206e 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1076,11 +1076,11 @@ int32_t komodo_isrealtime(int32_t *kmdheightp)
 
 int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t cmptime,int32_t dispflag)
 {
-    if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
+    if ( KOMODO_REWIND == 0 && ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
     {
-        if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
+        if ( txheight > 246748 )
         {
-            if ( txheight < 247205 && ASSETCHAINS_STAKED == 0 )
+            if ( txheight < 247205 )
                 cmptime -= 16000;
             if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
             {
@@ -1198,7 +1198,7 @@ uint32_t komodo_stakehash(uint256 *hashp,char *address,uint8_t *hashbuf,uint256
 
 uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeight,uint256 txid,int32_t vout,uint32_t blocktime,uint32_t prevtime,char *destaddr)
 {
-    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio,coinage256; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,winner = 0 ; uint64_t value,coinage;
+    bool fNegative,fOverflow; uint8_t hashbuf[256]; char address[64]; bits256 addrhash; arith_uint256 hashval,mindiff,ratio,coinage256; uint256 hash,pasthash; int32_t diff=0,segid,minage,i,iter=0; uint32_t txtime,segid32,winner = 0 ; uint64_t value,coinage;
     txtime = komodo_txtime2(&value,txid,vout,address);
     if ( validateflag == 0 )
     {
@@ -1221,13 +1221,16 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     ratio = (mindiff / bnTarget);
     if ( (minage= nHeight*3) > 6000 ) // about 100 blocks
         minage = 6000;
-    vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
+    komodo_segids(hashbuf,nHeight-101,100);
+    segid32 = komodo_stakehash(&hash,address,hashbuf,txid,vout);
+    segid = ((nHeight + segid32) & 0x3f);
+    /*vcalc_sha256(0,(uint8_t *)&addrhash,(uint8_t *)address,(int32_t)strlen(address));
     segid = ((nHeight + addrhash.uints[0]) & 0x3f);
     komodo_segids(hashbuf,nHeight-101,100);
     memcpy(&hashbuf[100],&addrhash,sizeof(addrhash));
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
     memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
-    vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));
+    vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));*/
     for (iter=0; iter<180; iter++)
     {
         if ( blocktime+iter+segid*2 < txtime+minage )
@@ -1243,12 +1246,14 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
         if ( iter > 0 )
             diff += segid*2;
         coinage = (value * diff);
-        if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
-            coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
+        if ( blocktime+iter+segid*2 > prevtime+480 )
+            coinage *= ((blocktime+iter+segid*2) - (prevtime+400));
+        //if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
+        //    coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
         coinage256 = arith_uint256(coinage+1);
         hashval = ratio * (UintToArith256(hash) / coinage256);
-        if ( nHeight >= 900 && nHeight < 916 )
-            hashval = (hashval / coinage256);
+        //if ( nHeight >= 900 && nHeight < 916 )
+        //    hashval = (hashval / coinage256);
         if ( hashval <= bnTarget )
         {
             winner = 1;
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 47fbeec30..8e0723d6d 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -438,6 +438,7 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
 
 UniValue getblocktemplate(const UniValue& params, bool fHelp)
 {
+    extern uint64_t ASSETCHAINS_STAKED;
     if (fHelp || params.size() > 1)
         throw runtime_error(
             "getblocktemplate ( \"jsonrequestobject\" )\n"
@@ -727,7 +728,15 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
         result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue));
     }
     result.push_back(Pair("longpollid", chainActive.LastTip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
-    result.push_back(Pair("target", hashTarget.GetHex()));
+    if ( ASSETCHAINS_STAKED != 0 )
+    {
+        arith_uint256 POWtarget; int32_t PosPerc;
+        POWtarget = komodo_PoWtarget(&PoSperc,hashTarget,(int32_t)(pindexPrev->nHeight+1),ASSETCHAINS_STAKED);
+        result.push_back(Pair("target", POWtarget.GetHex()));
+        result.push_back(Pair("PoSperc", (int64_t)PoSperc));
+        result.push_back(Pair("ac_staked", (int64_t)ASSETCHAINS_STAKED));
+        result.push_back(Pair("origtarget", hashTarget.GetHex()));
+    } else result.push_back(Pair("target", hashTarget.GetHex()));
     result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
     result.push_back(Pair("mutable", aMutable));
     result.push_back(Pair("noncerange", "00000000ffffffff"));
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 02cea5bef..176491b8b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4636,12 +4636,14 @@ arith_uint256 _komodo_eligible(struct komodo_staking *kp,arith_uint256 ratio,uin
     if ( iter > 0 )
         diff += segid*2;
     coinage = ((uint64_t)kp->nValue/COIN * diff);
-    if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
-        coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
+    if ( blocktime+iter+segid*2 > prevtime+480 )
+        coinage *= ((blocktime+iter+segid*2) - (prevtime+400));
+    //if ( nHeight >= 2500 && blocktime+iter+segid*2 > prevtime+180 )
+    //    coinage *= ((blocktime+iter+segid*2) - (prevtime+60));
     coinage256 = arith_uint256(coinage+1);
     hashval = ratio * (kp->hashval / coinage256);
-    if ( nHeight >= 900 && nHeight < 916 )
-        hashval = (hashval / coinage256);
+    //if ( nHeight >= 900 && nHeight < 916 )
+    //    hashval = (hashval / coinage256);
     return(hashval);
 }
 

From a9e904d9dd7d4a63d0a8983e54bdb91baf62755f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 05:08:55 -1100
Subject: [PATCH 231/623] Fix

---
 src/rpcmining.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 8e0723d6d..55955f6e6 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -730,7 +730,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
     result.push_back(Pair("longpollid", chainActive.LastTip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
     if ( ASSETCHAINS_STAKED != 0 )
     {
-        arith_uint256 POWtarget; int32_t PosPerc;
+        arith_uint256 POWtarget; int32_t PoSperc;
         POWtarget = komodo_PoWtarget(&PoSperc,hashTarget,(int32_t)(pindexPrev->nHeight+1),ASSETCHAINS_STAKED);
         result.push_back(Pair("target", POWtarget.GetHex()));
         result.push_back(Pair("PoSperc", (int64_t)PoSperc));

From 4ed779073db32e311ca1536989a092f629b9cddd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 05:10:17 -1100
Subject: [PATCH 232/623] Test

---
 src/rpcmining.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 55955f6e6..4c4d2eed5 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -32,6 +32,8 @@
 
 using namespace std;
 
+extern uint64_t ASSETCHAINS_STAKED;
+arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t height,int32_t goalperc);
 
 /**
  * Return average network hashes per second based on the last 'lookup' blocks,
@@ -438,7 +440,6 @@ static UniValue BIP22ValidationResult(const CValidationState& state)
 
 UniValue getblocktemplate(const UniValue& params, bool fHelp)
 {
-    extern uint64_t ASSETCHAINS_STAKED;
     if (fHelp || params.size() > 1)
         throw runtime_error(
             "getblocktemplate ( \"jsonrequestobject\" )\n"

From 618150c83e1ef47e87c99b41c657a17e9bd02b1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 05:31:39 -1100
Subject: [PATCH 233/623] Use scriptPubKey.IsPayToCryptoCondition()

---
 src/cc/assets.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4e66dd4d4..9a3bffd52 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -64,14 +64,14 @@ CC* GetCryptoCondition(CScript const& scriptSig)
         return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
 }
 
-bool IsCCOutput(CScript const& scriptPubKey)
+/*bool IsCCOutput(CScript const& scriptPubKey)
 {
     int32_t scriptlen; const uint8_t *script = scriptPubKey.data();
     scriptlen = scriptPubKey.size();
     if ( script[scriptlen - 1] != OP_CRYPTOCONDITION )
         return(false);
     return(true);
-}
+}*/
 
 bool IsAssetInput(CScript const& scriptSig)
 {
@@ -142,7 +142,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransacti
         return eval->Invalid("no-vouts");
     for (i=1; i<n-1; i++)
     {
-        if ( IsCCOutput(tx.vout[i].scriptPubKey) == 0 )
+        if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
             return eval->Invalid("non-CC asset vout");
         outputs += tx.vout[i].nValue;
     }
@@ -150,7 +150,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransacti
         return eval->Invalid("Invalid opreturn payload");
     if ( eval->GetTxUnconfirmed(coinId,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
-    if ( createTx.vout.size() == 0 || IsCCOutput(createTx.vout[0].scriptPubKey) == 0 )
+    if ( createTx.vout.size() == 0 || createTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("asset create txid is not asset CC");
     for (i=0; i<tx.vin.size(); i++) // Check inputs
     {

From a4d41984f67bcc7472469b564de92b8ab1505eca Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Wed, 18 Jul 2018 19:44:16 +0000
Subject: [PATCH 234/623] Modify how we iterate and deal with the end of
 iteration, since iter->Valid seems to always be true

---
 src/txdb.cpp | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 5608cbb07..af6cd0fbf 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,61 +402,59 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
 extern UniValue CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = 0; int64_t totalAddresses = 0; std::string address;
-    boost::scoped_ptr<leveldb::Iterator> pcursor(NewIterator());
+    boost::scoped_ptr<leveldb::Iterator> iter(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("start_time", time(NULL)));
 
-    //pcursor->SeekToFirst();
-    pcursor->SeekToLast();
-
     int64_t startingHeight = chainActive.Height();
-    //fprintf(stderr, "starting_height=%li\n", startingHeight);
-
-    while (pcursor->Valid())
+    fprintf(stderr, "Starting snapshot at height %li\n", startingHeight);
+    for (iter->SeekToLast(); iter->Valid(); iter->Prev())
     {
         boost::this_thread::interruption_point();
         try
         {
-            leveldb::Slice slKey = pcursor->key();
+            leveldb::Slice slKey = iter->key();
             CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION);
 	    CAddressIndexIteratorKey indexKey;
-            ssKey >> chType;
-            ssKey >> indexKey;
+
+	    ssKey >> chType;
+	    ssKey >> indexKey;
 
 	    //fprintf(stderr, "chType=%d\n", chType);
             if (chType == DB_ADDRESSUNSPENTINDEX)
             {
                 try {
-                    leveldb::Slice slValue = pcursor->value();
+                    leveldb::Slice slValue = iter->value();
                     CDataStream ssValue(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION);
                     CAmount nValue;
                     ssValue >> nValue;
 
 		    getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
+
 		    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
 		    if (pos == addressAmounts.end()) {
 			// insert new address + utxo amount
-			fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
+			//fprintf(stderr, "inserting new address %s with amount %li\n", address.c_str(), nValue);
 			addressAmounts[address] = nValue;
 			totalAddresses++;
 		    } else {
 			// update unspent tally for this address
+			//fprintf(stderr, "updating address %s with new utxo amount %li\n", address.c_str(), nValue);
 			addressAmounts[address] += nValue;
 		    }
-
 		    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
 		    total += nValue;
+
                 } catch (const std::exception& e) {
-		    // this should not happen normally, but maybe if an index is corrupt
-                    fprintf(stderr, "failed to get address index value\n");
+		    fprintf(stderr, "DONE %s: LevelDB addressindex exception! - %s\n", __func__, e.what());
+		    break;
                 }
-            }
+	    }
         } catch (const std::exception& e) {
-	    fprintf(stderr, "%s: LevelDB exception! - %s\n", __func__, e.what());
+	    fprintf(stderr, "DONE reading index entries\n");
             break;
         }
-        pcursor->Prev();
     }
 
     UniValue addresses(UniValue::VARR);

From 20ba439d0541ed7b74ff4c647a08286f1c4b30ac Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Thu, 19 Jul 2018 05:37:27 +0000
Subject: [PATCH 235/623] Add number of utxos to metadata in json response

---
 src/txdb.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index af6cd0fbf..8ae2caa7b 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,6 +402,7 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
 extern UniValue CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = 0; int64_t totalAddresses = 0; std::string address;
+    int64_t utxos = 0;
     boost::scoped_ptr<leveldb::Iterator> iter(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
     UniValue result(UniValue::VOBJ);
@@ -445,7 +446,7 @@ extern UniValue CBlockTreeDB::Snapshot()
 		    }
 		    //fprintf(stderr,"{\"%s\", %.8f},\n",address.c_str(),(double)nValue/COIN);
 		    total += nValue;
-
+		    utxos++;
                 } catch (const std::exception& e) {
 		    fprintf(stderr, "DONE %s: LevelDB addressindex exception! - %s\n", __func__, e.what());
 		    break;
@@ -458,7 +459,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     }
 
     UniValue addresses(UniValue::VARR);
-    fprintf(stderr, "total=%f, totalAddresses=%li\n", (double) total / COIN, totalAddresses);
+    fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li\n", (double) total / COIN, totalAddresses, utxos);
 
     typedef std::function<bool(std::pair<std::string, CAmount>, std::pair<std::string, CAmount>)> Comparator;
     Comparator compFunctor = [](std::pair<std::string, CAmount> elem1 ,std::pair<std::string, CAmount> elem2) {
@@ -467,6 +468,8 @@ extern UniValue CBlockTreeDB::Snapshot()
     // This is our intermediate data structure that allows us to calculate addressSorted
     std::set<std::pair<std::string, CAmount>, Comparator> sortedSnapshot(addressAmounts.begin(), addressAmounts.end(), compFunctor);
 
+    //fprintf(stderr, "sortedSnapshot.size=%li\n", sortedSnapshot.size() );
+
     UniValue obj(UniValue::VOBJ);
     UniValue addressesSorted(UniValue::VARR);
     for (std::pair<std::string, CAmount> element : sortedSnapshot) {
@@ -480,9 +483,11 @@ extern UniValue CBlockTreeDB::Snapshot()
 
     if (totalAddresses > 0) {
         result.push_back(make_pair("addresses", addressesSorted));
-        result.push_back(make_pair("total", total / COIN ));
+        result.push_back(make_pair("total", (double) total / COIN ));
         result.push_back(make_pair("average",(double) (total/COIN) / totalAddresses ));
     }
+    // Total number of utxos in this snaphot
+    result.push_back(make_pair("utxos", utxos));
     // Total number of addresses in this snaphot
     result.push_back(make_pair("total_addresses", totalAddresses));
     // The snapshot began at this block height

From ae5ea0878a1c9607b397cd0b0f24611450794b60 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:08:28 -1100
Subject: [PATCH 236/623] test

---
 src/cc/assets.cpp | 489 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 426 insertions(+), 63 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 9a3bffd52..d92bfdde8 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -21,12 +21,104 @@
 /*
  Assets can be created or transferred.
  
- To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 unit, or 100 million satoshis. The interpretation of the number of decimals is left to the higher level usages.
+ To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 asset, or 100 million satoshis for one asset with 8 decimals, and the other decimals in between. The interpretation of the number of decimals is left to the higher level usages.
  
  Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee.
  
  What this means is that vout 0 of the creation txid and vouts 1 ... n-2 for transfer vouts are assetoshi outputs.
  
+ There is a special type of transfer to an unspendable address, that locks the asset and creates an offer for all. The details specified in the opreturn. In order to be compatible with the signing restrictions, the "unspendable" address is actually an address whose privkey is known to all. Funds sent to this address can only be spent if the swap parameters are fulfilled, or if the original pubkey cancels the offer by spending it.
+ 
+ Types of transactions:
+ create name:description -> txid for assetid
+ transfer <pubkey> <assetid> -> [{address:amount}, ... ] // like withdraw api
+ selloffer <pubkey> <txid/vout> <amount> -> cancel or fillsell -> mempool txid or rejected, might not confirm
+ buyoffer <amount> <assetid> <required> -> cancelbuy or fillbuy -> mempool txid or rejected, might not confirm
+ exchange <pubkey> <txid/vout> <required> <required assetid> -> cancel or fillexchange -> mempool txid or rejected, might not confirm
+ 
+ assetsaddress <pubkey> // all assets end up in a special address for each pubkey
+ assetbalance <pubkey> <assetid>
+ assetutxos <pubkey> <assetid>
+ assetsbalances <pubkey>
+ asks <assetid>
+ bids <assetid>
+ swaps <assetid>
+ 
+ valid CC output: create or transfer or buyoffer or selloffer or exchange or cancel or fill
+ 
+ create
+ vin.0: normal input
+ vout.0: issuance assetoshis to CC
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
+ 
+ transfer
+ vin.0: normal input
+ vin.1 .. vin.n-1: valid CC outputs
+ vout.0 to n-2: assetoshis output to CC
+ vout.n-2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
+ 
+ selloffer:
+ vin.0: normal input
+ vin.1: valid CC output for sale
+ vout.0: vin.1 assetoshis output to CC to unspendable
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required]
+ 
+ buyoffer:
+ vins.*: normal inputs (bid + change)
+ vout.0: amount of bid to unspendable
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required]
+ 
+ exchange:
+ vin.0: normal input
+ vin.1: valid CC output
+ vout.0: vin.1 assetoshis output to CC to unspendable
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required]
+ 
+ cancelbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.1 from buyoffer)
+ vout.0: vin.1 value to original pubkey
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
+ 
+ cancel:
+ vin.0: normal input
+ vin.1: unspendable.(vout.1 from exchange or selloffer)
+ vout.0: vin.1 assetoshis to original pubkey CC
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+ 
+ fillsell:
+ vin.0: normal input
+ vin.1: unspendable.(vout.1 assetoshis from selloffer)
+ vin.2: normal output that satisfies selloffer
+ vout.0: vin.1 assetoshis to signer of vin.2
+ vout.1: vin.2 value to original pubkey
+ vout.2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid]
+ 
+ fillbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.1 from buyoffer)
+ vin.2: valid CC output satisfies buyoffer
+ vout.0: vin.1 value to signer of vin.2
+ vout.1: vin.2 assetoshis to original pubkey
+ vout.2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid]
+ 
+ fillexchange:
+ vin.0: normal input
+ vin.1: unspendable.(vout.1 assetoshis from exchange)
+ vin.2: valid CC output that satisfies exchange
+ vout.0: vin.1 assetoshis to signer of vin.2
+ vout.1: vin.2 assetoshis to original pubkey
+ vout.2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin1] [assetid vin2]
 */
 
  
@@ -54,6 +146,7 @@ signEncodeTx "$createTx"
 signEncodeTx "$transferTx"
 */
 
+char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 
 CC* GetCryptoCondition(CScript const& scriptSig)
 {
@@ -64,21 +157,11 @@ CC* GetCryptoCondition(CScript const& scriptSig)
         return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
 }
 
-/*bool IsCCOutput(CScript const& scriptPubKey)
-{
-    int32_t scriptlen; const uint8_t *script = scriptPubKey.data();
-    scriptlen = scriptPubKey.size();
-    if ( script[scriptlen - 1] != OP_CRYPTOCONDITION )
-        return(false);
-    return(true);
-}*/
-
 bool IsAssetInput(CScript const& scriptSig)
 {
-    CC* cond;
+    CC *cond;
     if (!(cond = GetCryptoCondition(scriptSig)))
         return false;
-
     // Recurse the CC tree to find asset condition
     auto findEval = [&] (CC *cond, struct CCVisitor _) {
         bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
@@ -91,85 +174,365 @@ bool IsAssetInput(CScript const& scriptSig)
     return out;
 }
 
-// Get the coin ID from opret
-bool DecodeOpRet(CScript const& scriptPubKey, uint256 &coinId)
+uint8_t DecodeOpRet(CScript const& scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &amount)
 {
-    std::vector<uint8_t> vopret;
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
     GetOpReturnData(scriptPubKey, vopret);
-    return E_UNMARSHAL(vopret, ss >> coinId);
+    script = (uint8_t *)vopret.data();
+    memset(&assetid,0,sizeof(assetid));
+    memset(&assetid2,0,sizeof(assetid2));
+    amount = 0;
+    if ( script[0] == EVAL_ASSETS )
+    {
+        funcid = script[1];
+        switch ( funcid )
+        {
+           case 't': case 'o': case 'x': case 'S': case 'B':
+                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
+                    return(funcid);
+                break;
+            case 's': case 'b':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> amount) != 0 )
+                    return(funcid);
+                break;
+            case 'E':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2) != 0 )
+                    return(funcid);
+                break;
+            case 'e':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> amount) != 0 )
+                    return(funcid);
+                break;
+        }
+    }
+    return(funcid);
 }
 
-uint64_t IsAssetTx(uint256 coinId,CTransaction& inputTx,int32_t v)
+uint64_t IsAssetTx(uint64_t *origamountp,uint8_t funcid,int32_t vini,uint256 assetid,CTransaction& inputTx,int32_t v)
 {
     // Either the tx will be a CREATE (no CC inputs) or a TRANSFER (1 or more CC inputs)
-    uint256 inputCoinId; unsigned int i,n,r = 0;
+    uint256 inputassetid,inputassetid2; uint64_t amount; uint8_t inputfuncid; unsigned int i,n,r = 0;
+    if ( origamountp != 0 )
+        *origamountp = 0;
     for (i=0; i<inputTx.vin.size(); i++)
         r += IsAssetInput(inputTx.vin[i].scriptSig) ? 1 : 0;
-    if ( r > 0 ) // It's a TRANSFER, check coin ID
+    if ( r > 0 )
     {
         n = inputTx.vout.size();
-        if ( DecodeOpRet(inputTx.vout[n-1].scriptPubKey,inputCoinId) == 0 )
+        if ( (inputfuncid= DecodeOpRet(inputTx.vout[n-1].scriptPubKey,inputassetid,inputassetid2,amount)) == 0 )
             return(0);
-        if ( inputCoinId == coinId && v > 0 && v < n-1 )
-            return(inputTx.vout[v].nValue);
+        if ( origamountp != 0 )
+            *origamountp = amount;
+        if ( v >= n-1 )
+            return(0);
+        if ( inputfuncid != 'E' || vini == 1 )
+        {
+            if ( inputassetid == assetid )
+                return(inputTx.vout[v].nValue);
+        }
+        else // 'E' and vini == 2
+        {
+            if ( inputassetid2 == assetid )
+                return(inputTx.vout[v].nValue);
+        }
     }
     else if ( r == 0 ) // It's a CREATE, compare hash directly
     {
-        if ( coinId == inputTx.GetHash() && v == 0 ) // asset create must use vout[0] for the asset
+        if ( assetid == inputTx.GetHash() && v == 0 ) // asset create must use vout[0] for the asset
             return(inputTx.vout[v].nValue);
     }
     // should never happen
-    fprintf(stderr, "Illegal state detected, mixed inputs for asset at: %s\n",coinId.GetHex().data());
+    fprintf(stderr, "Illegal state detected, mixed inputs for asset at: %s\n",assetid.GetHex().data());
     return(0);
 }
 
-/*
- * assets using CC defines 2 possible types of transaction, a CREATE and a TRANSFER.
- * A CREATE has only regular (non CC) inputs, and a TRANSFER has one or more CC inputs.
- *
- * If the asset EVAL routine is being called, then the tx is inevitably a TRANSFER
- * becuase in the case of a CREATE routine, no CC is triggered.
- *
- * The coin ID is the ID of the CREATE transaction.
- */
+uint64_t AssetIsvalidCCvin(uint8_t funcid,uint256 assetid,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+{
+    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock; int32_t v; uint64_t nValue = 0;
+    v = tx.vin[vini].prevout.n;
+    if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,inputTx,hashBlock) == 0 )
+        return eval->Invalid("always should find vin, but didnt");
+    if ( IsAssetInput(tx.vin[vini].scriptSig) != 0 )
+    {
+        if ( (nValue= IsAssetTx(origamountp,funcid,vini,assetid,inputTx,v)) == 0 )
+            return eval->Invalid("Non asset / wrong asset input tx");
+    }
+    if ( origaddr != 0 && origoutp != 0 )
+    {
+        origaddr[0] = 0;
+        *origoutp = 0;
+        if ( eval->GetTxUnconfirmed(InputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
+            return eval->Invalid("always should find origtx, but didnt for cancelbuy");
+        if ( ExtractDestination(origTx.vout[InputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
+            return eval->Invalid("no origtx address for cancelbuy");
+        strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        *origoutp = InputTx.vout[0].nValue;
+    }
+    return(nValue);
+}
+
+uint64_t AssetIsvalidvin(uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+{
+    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock,inputassetid,inputassetid2; int32_t v; uint64_t amount,nValue = 0;
+    v = tx.vin[vini].prevout.n;
+    *origamountp = 0;
+    if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,inputTx,hashBlock) == 0 )
+        return eval->Invalid("always should find vin, but didnt");
+    if ( (inputfuncid= DecodeOpRet(inputTx.vout[inputTx.vout.size()-1].scriptPubKey,inputassetid,inputassetid2,amount)) == 0 )
+        return(0);
+    nValue = inputTx.vout[v].nValue;
+    *origamountp = amount;
+    if ( origaddr != 0 && origoutp != 0 )
+    {
+        origaddr[0] = 0;
+        *origoutp = 0;
+        if ( eval->GetTxUnconfirmed(InputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
+            return eval->Invalid("always should find origtx, but didnt for cancelbuy");
+        if ( ExtractDestination(origTx.vout[InputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
+            return eval->Invalid("no origtx address for cancelbuy");
+        strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        *origoutp = InputTx.vout[0].nValue;
+    }
+    return(nValue);
+}
+
+uint64_t Assetvini2val(int32_t needasset,uint256 assetid,const CTransaction &tx)
+{
+    CTransaction inputTx; uint256 hashBlock;
+    if ( needasset != 0 && IsAssetInput(tx.vin[2].scriptSig) == 0 )
+        return eval->Invalid("vini2 is not CC");
+    if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,inputTx,hashBlock) == 0 )
+        return eval->Invalid("always should find vin, but didnt");
+    return(inputTx.vout[tx.vin[2].prevout.n]);
+}
+
+uint64_t AssetIsvalidvout0(const CTransaction &tx,uint64_t nValue)
+{
+    CTxDestination address;
+    if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
+        return eval->Invalid("illegal normal vout0");
+    if ( tx.vout[0].nValue != nValue )
+        return eval->Invalid("nValue mismatch vout0");
+    if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
+        return eval->Invalid("no vout0 address");
+    if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+        return eval->Invalid("invalid vout0 address");
+    return(nValue);
+}
+
+bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t amount)
+{
+    static uint256 zero;
+    CTxDestination address; uint256 hashBlock; int32_t i,r,numvins; uint64_t nValue,vini2val,origamount,outputs,assetoshis,assetoshis2; char origaddr[64];
+    numvins = tx.vin.size();
+    assetoshis = assetoshis2 = outputs = 0;
+    if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )
+        return eval->Invalid("illegal asset vin0");
+    if ( funcid != 'c' && assetid == zero )
+        return eval->Invalid("illegal assetid");
+    switch ( funcid )
+    {
+        case 'c': // create wont be called to be verified as it has no CC inputs
+            //vin.0: normal input
+            //vout.0: issuance assetoshis to CC
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
+            if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
+                return eval->Invalid("illegal normal vout0 for createasset");
+            break;
+            
+        case 't': // transfer
+            //vin.0: normal input
+            //vin.1 .. vin.n-1: valid CC outputs
+            //vout.0 to n-2: assetoshis output to CC
+            //vout.n-2: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
+            for (r=0,i=1; i<numvins; i++)
+            {
+                if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,i)) != 0 )
+                    assetoshis += nValue;
+                else return eval->Invalid("illegal normal vin for transfer");
+            }
+            for (i=0; i<numvouts-1; i++)
+            {
+                if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                    outputs += tx.vout[i].nValue;
+                else if ( i < n-2 )
+                    return eval->Invalid("non-CC asset transfer vout");
+            }
+            if ( assetoshis == 0 )
+                return eval->Invalid("no asset inputs for transfer");
+            else if ( assetoshis != outputs )
+                return eval->Invalid("mismatched inputs and outputs for transfer");
+            break;
+  
+        case 's': // selloffer
+            //vin.0: normal input
+            //vin.1: valid CC output for sale
+            //vout.0: vin.1 assetoshis output to CC to unspendable
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required]
+            if ( amount == 0 )
+                return eval->Invalid("illegal null amount for selloffer");
+            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,1)) != 0 )
+            {
+                if ( AssetIsvalidvout0(tx,nValue) != nValue )
+                    return(false);
+            } else return eval->Invalid("illegal standard vini.1 for selloffer");
+            break;
+           
+        case 'b': // buyoffer
+            //vins.*: normal inputs (bid + change)
+            //vout.0: amount of bid to unspendable
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required]
+            if ( amount == 0 )
+                return eval->Invalid("illegal null amount for buyoffer");
+            for (i=1; i<numvins; i++)
+            {
+                if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,i)) != 0 )
+                    return eval->Invalid("invalid CC vin for buyoffer");
+            }
+            for (i=0; i<numvouts-1; i++)
+            {
+                if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                    return eval->Invalid("invalid CC vout for buyoffer");
+            }
+            break;
+    
+        case 'e': // exchange
+            //vin.0: normal input
+            //vin.1: valid CC output
+            //vout.0: vin.1 assetoshis output to CC to unspendable
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required]
+            if ( assetid2 == zero )
+                return eval->Invalid("illegal assetid2 for exchange");
+            if ( amount == 0 )
+                return eval->Invalid("illegal null amount for exchange");
+            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,1)) != 0 )
+            {
+                if ( AssetIsvalidvout0(tx,nValue) != nValue )
+                    return(false);
+            } else return eval->Invalid("illegal standard vini.1 for exchange");
+            break;
+           
+        case 'o': // cancelbuy
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.1 from buyoffer)
+            //vout.0: vin.1 value to original pubkey
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
+            if ( AssetIsvalidCCvin(funcid,0,&origamount,&origout,origaddr,tx,1) != 0 )
+                return eval->Invalid("illegal CC vin.1 for cancelbuy");
+            if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+                return eval->Invalid("invalid vout0 address for cancelbuy");
+            if ( origout != tx.vout[0].nValue )
+                return eval->Invalid("mismatched value for cancelbuy");
+            if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
+                return eval->Invalid("no vout0 address for cancelbuy");
+            if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+                return eval->Invalid("mismatched origaddr for cancelbuy");
+            break;
+            
+        case 'x': // cancel
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.1 from exchange or selloffer)
+            //vout.0: vin.1 assetoshis to original pubkey CC
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
+            {
+                if ( origout != tx.vout[0].nValue )
+                    return eval->Invalid("mismatched value for cancel");
+                if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
+                    return eval->Invalid("no vout0 address for cancel");
+                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+                    return eval->Invalid("mismatched origaddr for cancel");
+            } else return eval->Invalid("illegal standard vini.1 for cancel");
+            break;
+            
+        case 'S': // fillsell
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.1 assetoshis from selloffer)
+            //vin.2: normal output that satisfies selloffer, need to extract from opreturn
+            //vout.0: vin.1 assetoshis to signer of vin.2
+            //vout.1: vin.2 value to original pubkey
+            //vout.2: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid]
+            if ( (vini2val= Assetvini2val(0,assetid,tx)) == 0 )
+                return eval->Invalid("no vini2val for fillsell");
+            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
+            {
+                if ( origout != tx.vout[0].nValue )
+                    return eval->Invalid("mismatched value for fillsell");
+                // vout address can be any
+                if ( ExtractDestination(tx.vout[1].scriptPubKey,address) == 0 )
+                    return eval->Invalid("no vout0 address for fillsell");
+                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+                    return eval->Invalid("mismatched origaddr for fillsell");
+                if ( vini2val < origamount )
+                    return eval->Invalid("not enough paid for fillsell");
+                if ( vini2val != tx.vout[1].nValue )
+                    return eval->Invalid("mismatched vout.1 val for fillsell");
+            } else return eval->Invalid("illegal standard vini.1 for fillsell");
+            break;
+           
+        case 'B': // fillbuy:
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.1 from buyoffer)
+            //vin.2: valid CC output satisfies buyoffer
+            //vout.0: vin.1 value to signer of vin.2
+            //vout.1: vin.2 assetoshis to original pubkey
+            //vout.2: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid]
+            if ( (vini2val= Assetvini2val(1,assetid,tx)) == 0 )
+                return eval->Invalid("no vini2val for fillbuy");
+            if ( (nValue= AssetIsvalidvin(&origamount,&origout,origaddr,tx,1)) != 0 )
+            {
+                if ( origout != tx.vout[0].nValue )
+                    return eval->Invalid("mismatched value for fillbuy");
+                if ( ExtractDestination(tx.vout[1].scriptPubKey,address) == 0 )
+                    return eval->Invalid("no vout0 address for fillbuy");
+                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
+                    return eval->Invalid("mismatched origaddr for fillbuy");
+                if ( vini2val < origamount )
+                    return eval->Invalid("not enough paid for fillbuy");
+                if ( vini2val != tx.vout[1].nValue )
+                    return eval->Invalid("mismatched vout.1 val for fillbuy");
+            } else return eval->Invalid("illegal CC vini.1 for fillbuy");
+            break;
+       
+        case 'E': // fillexchange:
+            //vin.0: normal input
+            /*vin.1: unspendable.(vout.1 assetoshis from exchange)
+            vin.2: valid CC output that satisfies exchange
+            vout.0: vin.1 assetoshis to signer of vin.2
+            vout.1: vin.2 assetoshis to original pubkey*/
+            //vout.2: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin1] [assetid vin2]
+            if ( assetid2 == zero )
+                return eval->Invalid("illegal assetid2 for fillexchange");
+            break;
+    }
+    return(true);
+}
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
 {
-    CTransaction inputTx,createTx; uint256 coinId,hashBlock; int32_t i,n; uint64_t nValue,outputs=0,assetoshis = 0;
+    static uint256 zero;
+    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    for (i=1; i<n-1; i++)
-    {
-        if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            return eval->Invalid("non-CC asset vout");
-        outputs += tx.vout[i].nValue;
-    }
-    if ( !DecodeOpRet(tx.vout[n-1].scriptPubKey, coinId) ) // Expect last output to be an opreturn containing move data
+    if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    if ( eval->GetTxUnconfirmed(coinId,createTx,hashBlock) == 0 )
+    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
-    if ( createTx.vout.size() == 0 || createTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
-        return eval->Invalid("asset create txid is not asset CC");
-    for (i=0; i<tx.vin.size(); i++) // Check inputs
-    {
-        if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
-        {
-            // We also need to validate that our input transactions are legit - either they
-            // themselves have CC inputs of the same type, or, they have a token definition and
-            // no CC inputs.
-            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,inputTx,hashBlock) == 0 )
-                return eval->Invalid("This should never happen");
-            if ( (nValue= IsAssetTx(coinId,inputTx,tx.vin[i].prevout.n)) == 0 )
-                return eval->Invalid("Non colored / wrong asset input tx");
-            assetoshis += nValue;
-        }
-    }
-    if ( assetoshis == 0 )
-        return eval->Invalid("no asset inputs");
-    else if ( assetoshis != outputs )
-        return eval->Invalid("mismatched inputs and outputs");
+    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset2 create txid");
+    return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount));
     
     // We're unable to ensure that all the outputs have the correct
     // CC Eval code because we only have the scriptPubKey which is a hash of the
@@ -187,5 +550,5 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransacti
     // encoding further information in the OP_RETURNS.
 
     // It's valid
-    return true;
+    //return true;
 }

From ce2b0b6ac18b3256df06b611182e6fa02180a35d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:10:43 -1100
Subject: [PATCH 237/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d92bfdde8..0fa834111 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -17,6 +17,7 @@
 #include <script/cc.h>
 #include <script/script.h>
 #include <cryptoconditions.h>
+#include "standard.h"
 
 /*
  Assets can be created or transferred.
@@ -146,7 +147,7 @@ signEncodeTx "$createTx"
 signEncodeTx "$transferTx"
 */
 
-char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
+const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 
 CC* GetCryptoCondition(CScript const& scriptSig)
 {

From cec901e6ae83be48030308ac29da0640b473d1fa Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:11:38 -1100
Subject: [PATCH 238/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0fa834111..f3bc5b676 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -17,7 +17,7 @@
 #include <script/cc.h>
 #include <script/script.h>
 #include <cryptoconditions.h>
-#include "standard.h"
+#include "<script/standard.h>"
 
 /*
  Assets can be created or transferred.

From b7006d2efcac22af94d97fd2c1d74d63e4f09462 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:12:32 -1100
Subject: [PATCH 239/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f3bc5b676..353ef478b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -17,7 +17,7 @@
 #include <script/cc.h>
 #include <script/script.h>
 #include <cryptoconditions.h>
-#include "<script/standard.h>"
+#include "../script/standard.h"
 
 /*
  Assets can be created or transferred.

From 8ce8aff26dca2fae4480e2a6af18a791b5d8c4fb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:15:49 -1100
Subject: [PATCH 240/623] Test

---
 src/cc/assets.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 353ef478b..a2a9f8399 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -247,7 +247,7 @@ uint64_t IsAssetTx(uint64_t *origamountp,uint8_t funcid,int32_t vini,uint256 ass
     return(0);
 }
 
-uint64_t AssetIsvalidCCvin(uint8_t funcid,uint256 assetid,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+uint64_t AssetIsvalidCCvin(Eval* eval,uint8_t funcid,uint256 assetid,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
 {
     CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock; int32_t v; uint64_t nValue = 0;
     v = tx.vin[vini].prevout.n;
@@ -272,7 +272,7 @@ uint64_t AssetIsvalidCCvin(uint8_t funcid,uint256 assetid,uint64_t *origamountp,
     return(nValue);
 }
 
-uint64_t AssetIsvalidvin(uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+uint64_t AssetIsvalidvin(Eval* eval,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
 {
     CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock,inputassetid,inputassetid2; int32_t v; uint64_t amount,nValue = 0;
     v = tx.vin[vini].prevout.n;
@@ -297,7 +297,7 @@ uint64_t AssetIsvalidvin(uint64_t *origamountp,uint64_t *origoutp,char *origaddr
     return(nValue);
 }
 
-uint64_t Assetvini2val(int32_t needasset,uint256 assetid,const CTransaction &tx)
+uint64_t Assetvini2val(Eval* eval,int32_t needasset,uint256 assetid,const CTransaction &tx)
 {
     CTransaction inputTx; uint256 hashBlock;
     if ( needasset != 0 && IsAssetInput(tx.vin[2].scriptSig) == 0 )
@@ -307,7 +307,7 @@ uint64_t Assetvini2val(int32_t needasset,uint256 assetid,const CTransaction &tx)
     return(inputTx.vout[tx.vin[2].prevout.n]);
 }
 
-uint64_t AssetIsvalidvout0(const CTransaction &tx,uint64_t nValue)
+uint64_t AssetIsvalidvout0(Eval* eval,const CTransaction &tx,uint64_t nValue)
 {
     CTxDestination address;
     if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
@@ -375,9 +375,9 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required]
             if ( amount == 0 )
                 return eval->Invalid("illegal null amount for selloffer");
-            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,1)) != 0 )
+            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,1)) != 0 )
             {
-                if ( AssetIsvalidvout0(tx,nValue) != nValue )
+                if ( AssetIsvalidvout0(eval,tx,nValue) != nValue )
                     return(false);
             } else return eval->Invalid("illegal standard vini.1 for selloffer");
             break;
@@ -391,7 +391,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("illegal null amount for buyoffer");
             for (i=1; i<numvins; i++)
             {
-                if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,i)) != 0 )
+                if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,i)) != 0 )
                     return eval->Invalid("invalid CC vin for buyoffer");
             }
             for (i=0; i<numvouts-1; i++)
@@ -411,9 +411,9 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("illegal assetid2 for exchange");
             if ( amount == 0 )
                 return eval->Invalid("illegal null amount for exchange");
-            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,1)) != 0 )
+            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,1)) != 0 )
             {
-                if ( AssetIsvalidvout0(tx,nValue) != nValue )
+                if ( AssetIsvalidvout0(eval,tx,nValue) != nValue )
                     return(false);
             } else return eval->Invalid("illegal standard vini.1 for exchange");
             break;
@@ -424,7 +424,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0: vin.1 value to original pubkey
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
-            if ( AssetIsvalidCCvin(funcid,0,&origamount,&origout,origaddr,tx,1) != 0 )
+            if ( AssetIsvalidCCvin(eval,funcid,0,&origamount,&origout,origaddr,tx,1) != 0 )
                 return eval->Invalid("illegal CC vin.1 for cancelbuy");
             if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
                 return eval->Invalid("invalid vout0 address for cancelbuy");
@@ -442,7 +442,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0: vin.1 assetoshis to original pubkey CC
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
+            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
             {
                 if ( origout != tx.vout[0].nValue )
                     return eval->Invalid("mismatched value for cancel");
@@ -461,9 +461,9 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.1: vin.2 value to original pubkey
             //vout.2: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid]
-            if ( (vini2val= Assetvini2val(0,assetid,tx)) == 0 )
+            if ( (vini2val= Assetvini2val(eval,0,assetid,tx)) == 0 )
                 return eval->Invalid("no vini2val for fillsell");
-            if ( (nValue= AssetIsvalidCCvin(funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
+            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
             {
                 if ( origout != tx.vout[0].nValue )
                     return eval->Invalid("mismatched value for fillsell");
@@ -487,9 +487,9 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.1: vin.2 assetoshis to original pubkey
             //vout.2: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid]
-            if ( (vini2val= Assetvini2val(1,assetid,tx)) == 0 )
+            if ( (vini2val= Assetvini2val(eval,1,assetid,tx)) == 0 )
                 return eval->Invalid("no vini2val for fillbuy");
-            if ( (nValue= AssetIsvalidvin(&origamount,&origout,origaddr,tx,1)) != 0 )
+            if ( (nValue= AssetIsvalidvin(eval,&origamount,&origout,origaddr,tx,1)) != 0 )
             {
                 if ( origout != tx.vout[0].nValue )
                     return eval->Invalid("mismatched value for fillbuy");

From 8b8103bf699a8ade1773063d03de0dd54c929c51 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:17:02 -1100
Subject: [PATCH 241/623] Test

---
 src/cc/assets.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index a2a9f8399..2effa1f27 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -262,12 +262,12 @@ uint64_t AssetIsvalidCCvin(Eval* eval,uint8_t funcid,uint256 assetid,uint64_t *o
     {
         origaddr[0] = 0;
         *origoutp = 0;
-        if ( eval->GetTxUnconfirmed(InputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
+        if ( eval->GetTxUnconfirmed(inputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
             return eval->Invalid("always should find origtx, but didnt for cancelbuy");
-        if ( ExtractDestination(origTx.vout[InputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
+        if ( ExtractDestination(origTx.vout[inputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
             return eval->Invalid("no origtx address for cancelbuy");
         strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        *origoutp = InputTx.vout[0].nValue;
+        *origoutp = inputTx.vout[0].nValue;
     }
     return(nValue);
 }
@@ -287,12 +287,12 @@ uint64_t AssetIsvalidvin(Eval* eval,uint64_t *origamountp,uint64_t *origoutp,cha
     {
         origaddr[0] = 0;
         *origoutp = 0;
-        if ( eval->GetTxUnconfirmed(InputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
+        if ( eval->GetTxUnconfirmed(inputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
             return eval->Invalid("always should find origtx, but didnt for cancelbuy");
-        if ( ExtractDestination(origTx.vout[InputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
+        if ( ExtractDestination(origTx.vout[inputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
             return eval->Invalid("no origtx address for cancelbuy");
         strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        *origoutp = InputTx.vout[0].nValue;
+        *origoutp = inputTx.vout[0].nValue;
     }
     return(nValue);
 }

From 58cb2be579a1e5d1d4b53061bc1a4e4a4c331971 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:20:42 -1100
Subject: [PATCH 242/623] Test

---
 src/cc/assets.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2effa1f27..96833fc43 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -18,6 +18,7 @@
 #include <script/script.h>
 #include <cryptoconditions.h>
 #include "../script/standard.h"
+#include "../base58.h"
 
 /*
  Assets can be created or transferred.
@@ -274,7 +275,7 @@ uint64_t AssetIsvalidCCvin(Eval* eval,uint8_t funcid,uint256 assetid,uint64_t *o
 
 uint64_t AssetIsvalidvin(Eval* eval,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
 {
-    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock,inputassetid,inputassetid2; int32_t v; uint64_t amount,nValue = 0;
+    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock,inputassetid,inputassetid2; int32_t v; uint8_t inputfuncid; uint64_t amount,nValue = 0;
     v = tx.vin[vini].prevout.n;
     *origamountp = 0;
     if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,inputTx,hashBlock) == 0 )
@@ -304,7 +305,7 @@ uint64_t Assetvini2val(Eval* eval,int32_t needasset,uint256 assetid,const CTrans
         return eval->Invalid("vini2 is not CC");
     if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,inputTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-    return(inputTx.vout[tx.vin[2].prevout.n]);
+    return(inputTx.vout[tx.vin[2].prevout.n].nValue);
 }
 
 uint64_t AssetIsvalidvout0(Eval* eval,const CTransaction &tx,uint64_t nValue)
@@ -324,9 +325,9 @@ uint64_t AssetIsvalidvout0(Eval* eval,const CTransaction &tx,uint64_t nValue)
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t amount)
 {
     static uint256 zero;
-    CTxDestination address; uint256 hashBlock; int32_t i,r,numvins; uint64_t nValue,vini2val,origamount,outputs,assetoshis,assetoshis2; char origaddr[64];
+    CTxDestination address; uint256 hashBlock; int32_t i,r,numvins; uint64_t nValue,vini2val,origamount,outputs,assetoshis,origout; char origaddr[64];
     numvins = tx.vin.size();
-    assetoshis = assetoshis2 = outputs = 0;
+    assetoshis = outputs = 0;
     if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
@@ -350,7 +351,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
             for (r=0,i=1; i<numvins; i++)
             {
-                if ( (nValue= AssetIsvalidCCvin(funcid,assetid,0,0,0,tx,i)) != 0 )
+                if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,i)) != 0 )
                     assetoshis += nValue;
                 else return eval->Invalid("illegal normal vin for transfer");
             }
@@ -358,7 +359,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             {
                 if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
                     outputs += tx.vout[i].nValue;
-                else if ( i < n-2 )
+                else if ( i < numvouts-2 )
                     return eval->Invalid("non-CC asset transfer vout");
             }
             if ( assetoshis == 0 )

From 63df1886ebd3c17c34e823078f3b8ac697c128da Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 07:23:02 -1100
Subject: [PATCH 243/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 96833fc43..8e5cc6cbd 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -425,7 +425,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0: vin.1 value to original pubkey
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
-            if ( AssetIsvalidCCvin(eval,funcid,0,&origamount,&origout,origaddr,tx,1) != 0 )
+            if ( AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1) != 0 )
                 return eval->Invalid("illegal CC vin.1 for cancelbuy");
             if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
                 return eval->Invalid("invalid vout0 address for cancelbuy");

From 8e1ca1ad1ed0911d25ec6ab36663d6ee53913916 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 16:18:49 -1100
Subject: [PATCH 244/623] Scan 10 minute window

---
 src/komodo_bitcoind.h    | 2 +-
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 56213206e..2bc4e1b88 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1231,7 +1231,7 @@ uint32_t komodo_stake(int32_t validateflag,arith_uint256 bnTarget,int32_t nHeigh
     memcpy(&hashbuf[100+sizeof(addrhash)],&txid,sizeof(txid));
     memcpy(&hashbuf[100+sizeof(addrhash)+sizeof(txid)],&vout,sizeof(vout));
     vcalc_sha256(0,(uint8_t *)&hash,hashbuf,100 + (int32_t)sizeof(uint256)*2 + sizeof(vout));*/
-    for (iter=0; iter<180; iter++)
+    for (iter=0; iter<600; iter++)
     {
         if ( blocktime+iter+segid*2 < txtime+minage )
             continue;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 176491b8b..f3f032fa6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4649,7 +4649,7 @@ arith_uint256 _komodo_eligible(struct komodo_staking *kp,arith_uint256 ratio,uin
 
 uint32_t komodo_eligible(arith_uint256 bnTarget,arith_uint256 ratio,struct komodo_staking *kp,int32_t nHeight,uint32_t blocktime,uint32_t prevtime,int32_t minage,uint8_t *hashbuf)
 {
-    int32_t maxiters = 180; uint256 hash;
+    int32_t maxiters = 600; uint256 hash;
     int32_t segid,iter,diff; uint64_t coinage; arith_uint256 hashval,coinage256;
     komodo_stakehash(&hash,kp->address,hashbuf,kp->txid,kp->vout);
     kp->hashval = UintToArith256(hash);

From c4a73444de805e55c0bd083dc17cb4441722c386 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Fri, 20 Jul 2018 03:58:05 +0000
Subject: [PATCH 245/623] Fix bug where some addresses are lost in sorting by
 using a vector instead of set and avoiding custom comparison function

---
 src/txdb.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 8ae2caa7b..ab3397049 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -405,6 +405,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     int64_t utxos = 0;
     boost::scoped_ptr<leveldb::Iterator> iter(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
+    std::vector <std::pair<CAmount, std::string>> vaddr;
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("start_time", time(NULL)));
 
@@ -461,22 +462,18 @@ extern UniValue CBlockTreeDB::Snapshot()
     UniValue addresses(UniValue::VARR);
     fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li\n", (double) total / COIN, totalAddresses, utxos);
 
-    typedef std::function<bool(std::pair<std::string, CAmount>, std::pair<std::string, CAmount>)> Comparator;
-    Comparator compFunctor = [](std::pair<std::string, CAmount> elem1 ,std::pair<std::string, CAmount> elem2) {
-	return elem1.second > elem2.second; /* descending */
-    };
-    // This is our intermediate data structure that allows us to calculate addressSorted
-    std::set<std::pair<std::string, CAmount>, Comparator> sortedSnapshot(addressAmounts.begin(), addressAmounts.end(), compFunctor);
-
-    //fprintf(stderr, "sortedSnapshot.size=%li\n", sortedSnapshot.size() );
+    for (std::pair<std::string, CAmount> element : addressAmounts) {
+	vaddr.push_back( make_pair(element.second, element.first) );
+    }
+    std::sort(vaddr.begin(), vaddr.end());
 
     UniValue obj(UniValue::VOBJ);
     UniValue addressesSorted(UniValue::VARR);
-    for (std::pair<std::string, CAmount> element : sortedSnapshot) {
+    for (std::vector<std::pair<CAmount, std::string>>::iterator it = vaddr.begin(); it!=vaddr.end(); ++it) {
 	UniValue obj(UniValue::VOBJ);
-	obj.push_back( make_pair("addr", element.first.c_str() ) );
+	obj.push_back( make_pair("addr", it->second.c_str() ) );
 	char amount[32];
-	sprintf(amount, "%.8f", (double) element.second / COIN);
+	sprintf(amount, "%.8f", (double) it->first / COIN);
 	obj.push_back( make_pair("amount", amount) );
 	addressesSorted.push_back(obj);
     }

From 70748123a94554f932fa197153e4b0d063ae648b Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Fri, 20 Jul 2018 04:40:34 +0000
Subject: [PATCH 246/623] Sort addresses by amounts in descending order

---
 src/txdb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index ab3397049..3e053c7dd 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -465,7 +465,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     for (std::pair<std::string, CAmount> element : addressAmounts) {
 	vaddr.push_back( make_pair(element.second, element.first) );
     }
-    std::sort(vaddr.begin(), vaddr.end());
+    std::sort(vaddr.rbegin(), vaddr.rend());
 
     UniValue obj(UniValue::VOBJ);
     UniValue addressesSorted(UniValue::VARR);

From 1aa7af179420e4d742c97ae38fe9b3db8a73f5e8 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Fri, 20 Jul 2018 05:01:07 +0000
Subject: [PATCH 247/623] Allow certain addresses to be ignored in snapshot

---
 src/txdb.cpp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 3e053c7dd..6d0be5b61 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -402,13 +402,32 @@ bool getAddressFromIndex(const int &type, const uint160 &hash, std::string &addr
 extern UniValue CBlockTreeDB::Snapshot()
 {
     char chType; int64_t total = 0; int64_t totalAddresses = 0; std::string address;
-    int64_t utxos = 0;
+    int64_t utxos = 0; int64_t ignoredAddresses;
     boost::scoped_ptr<leveldb::Iterator> iter(NewIterator());
     std::map <std::string, CAmount> addressAmounts;
     std::vector <std::pair<CAmount, std::string>> vaddr;
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("start_time", time(NULL)));
 
+    std::map <std::string,int> ignoredMap = {
+	{"RReUxSs5hGE39ELU23DfydX8riUuzdrHAE", 1},
+	{"RMUF3UDmzWFLSKV82iFbMaqzJpUnrWjcT4", 1},
+	{"RA5imhVyJa7yHhggmBytWuDr923j2P1bxx", 1},
+	{"RBM5LofZFodMeewUzoMWcxedm3L3hYRaWg", 1},
+	{"RAdcko2d94TQUcJhtFHZZjMyWBKEVfgn4J", 1},
+	{"RLzUaZ934k2EFCsAiVjrJqM8uU1vmMRFzk", 1},
+	{"RMSZMWZXv4FhUgWhEo4R3AQXmRDJ6rsGyt", 1},
+	{"RUDrX1v5toCsJMUgtvBmScKjwCB5NaR8py", 1},
+	{"RMSZMWZXv4FhUgWhEo4R3AQXmRDJ6rsGyt", 1},
+	{"RRvwmbkxR5YRzPGL5kMFHMe1AH33MeD8rN", 1},
+	{"RQLQvSgpPAJNPgnpc8MrYsbBhep95nCS8L", 1},
+	{"RK8JtBV78HdvEPvtV5ckeMPSTojZPzHUTe", 1},
+	{"RHVs2KaCTGUMNv3cyWiG1jkEvZjigbCnD2", 1},
+	{"RE3SVaDgdjkRPYA6TRobbthsfCmxQedVgF", 1},
+	{"RW6S5Lw5ZCCvDyq4QV9vVy7jDHfnynr5mn", 1},
+	{"RTkJwAYtdXXhVsS3JXBAJPnKaBfMDEswF8", 1}
+    };
+
     int64_t startingHeight = chainActive.Height();
     fprintf(stderr, "Starting snapshot at height %li\n", startingHeight);
     for (iter->SeekToLast(); iter->Valid(); iter->Prev())
@@ -434,6 +453,13 @@ extern UniValue CBlockTreeDB::Snapshot()
 
 		    getAddressFromIndex(indexKey.type, indexKey.hashBytes, address);
 
+		    std::map <std::string, int>::iterator ignored = ignoredMap.find(address);
+		    if (ignored != ignoredMap.end()) {
+			fprintf(stderr,"ignoring %s\n", address.c_str());
+			ignoredAddresses++;
+			continue;
+		    }
+
 		    std::map <std::string, CAmount>::iterator pos = addressAmounts.find(address);
 		    if (pos == addressAmounts.end()) {
 			// insert new address + utxo amount
@@ -460,7 +486,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     }
 
     UniValue addresses(UniValue::VARR);
-    fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li\n", (double) total / COIN, totalAddresses, utxos);
+    fprintf(stderr, "total=%f, totalAddresses=%li, utxos=%li, ignored=%li\n", (double) total / COIN, totalAddresses, utxos, ignoredAddresses);
 
     for (std::pair<std::string, CAmount> element : addressAmounts) {
 	vaddr.push_back( make_pair(element.second, element.first) );
@@ -487,6 +513,8 @@ extern UniValue CBlockTreeDB::Snapshot()
     result.push_back(make_pair("utxos", utxos));
     // Total number of addresses in this snaphot
     result.push_back(make_pair("total_addresses", totalAddresses));
+    // Total number of ignored addresses in this snaphot
+    result.push_back(make_pair("ignored_addresses", ignoredAddresses));
     // The snapshot began at this block height
     result.push_back(make_pair("start_height", startingHeight));
     // The snapshot finished at this block height

From 16f2495e1932d4038fdc7d0fd1e13361188154c4 Mon Sep 17 00:00:00 2001
From: CHMEX <33424502+CHMEX@users.noreply.github.com>
Date: Fri, 20 Jul 2018 09:48:34 +0200
Subject: [PATCH 248/623] add RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY Burnaddress

add burnaddress to excuding list
---
 src/txdb.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/txdb.cpp b/src/txdb.cpp
index 6d0be5b61..78ab2669d 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -425,7 +425,8 @@ extern UniValue CBlockTreeDB::Snapshot()
 	{"RHVs2KaCTGUMNv3cyWiG1jkEvZjigbCnD2", 1},
 	{"RE3SVaDgdjkRPYA6TRobbthsfCmxQedVgF", 1},
 	{"RW6S5Lw5ZCCvDyq4QV9vVy7jDHfnynr5mn", 1},
-	{"RTkJwAYtdXXhVsS3JXBAJPnKaBfMDEswF8", 1}
+	{"RTkJwAYtdXXhVsS3JXBAJPnKaBfMDEswF8", 1},
+	{"RD6GgnrMpPaTSMn8vai6yiGA7mN4QGPVMY", 1} //Burnaddress for null privkey
     };
 
     int64_t startingHeight = chainActive.Height();

From 325d3231851d54879f554497e864e5edeaf77980 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:41:52 -1100
Subject: [PATCH 249/623] Complete core coding for AE with partial fills

---
 src/cc/assets.cpp | 631 +++++++++++++++++++++++-----------------------
 1 file changed, 314 insertions(+), 317 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8e5cc6cbd..cf88b0757 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -20,6 +20,9 @@
 #include "../script/standard.h"
 #include "../base58.h"
 
+// debugging: need to clarify tx, inputTx, origTx
+// code rpc
+
 /*
  Assets can be created or transferred.
  
@@ -61,66 +64,69 @@
  vout.n-2: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
  
+ buyoffer:
+ vins.*: normal inputs (bid + change)
+ vout.0: amount of bid to unspendable
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
+
+ cancelbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+ vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['o']
+ 
+ fillbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+ vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+ vout.0: remaining amount of bid to unspendable
+ vout.1: vin.1 value to signer of vin.2
+ vout.2: vin.2 assetoshis to original pubkey
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+
  selloffer:
  vin.0: normal input
  vin.1: valid CC output for sale
  vout.0: vin.1 assetoshis output to CC to unspendable
  vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required]
- 
- buyoffer:
- vins.*: normal inputs (bid + change)
- vout.0: amount of bid to unspendable
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required]
+ vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
  
  exchange:
  vin.0: normal input
  vin.1: valid CC output
  vout.0: vin.1 assetoshis output to CC to unspendable
  vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required]
- 
- cancelbuy:
- vin.0: normal input
- vin.1: unspendable.(vout.1 from buyoffer)
- vout.0: vin.1 value to original pubkey
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
+ vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
  
  cancel:
  vin.0: normal input
- vin.1: unspendable.(vout.1 from exchange or selloffer)
- vout.0: vin.1 assetoshis to original pubkey CC
+ vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
+ vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
  vout.1: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
  
  fillsell:
  vin.0: normal input
- vin.1: unspendable.(vout.1 assetoshis from selloffer)
- vin.2: normal output that satisfies selloffer
- vout.0: vin.1 assetoshis to signer of vin.2
- vout.1: vin.2 value to original pubkey
- vout.2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid]
- 
- fillbuy:
- vin.0: normal input
- vin.1: unspendable.(vout.1 from buyoffer)
- vin.2: valid CC output satisfies buyoffer
- vout.0: vin.1 value to signer of vin.2
- vout.1: vin.2 assetoshis to original pubkey
- vout.2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid]
+ vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
+ vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
+ vout.0: remaining assetoshis -> unspendable
+ vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
+ vout.2: vin.2 value to original pubkey [origpubkey]
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
  
  fillexchange:
  vin.0: normal input
- vin.1: unspendable.(vout.1 assetoshis from exchange)
- vin.2: valid CC output that satisfies exchange
- vout.0: vin.1 assetoshis to signer of vin.2
- vout.1: vin.2 assetoshis to original pubkey
- vout.2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin1] [assetid vin2]
+ vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
+ vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+ vout.0: remaining assetoshis -> unspendable
+ vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
+ vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
  
@@ -150,6 +156,60 @@ signEncodeTx "$transferTx"
 
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 
+bool Getscriptaddress(char *destaddr,CScript &scriptPubKey)
+{
+    CTxDestination address;
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
+    {
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        return(true);
+    }
+    return(false)
+}
+
+uint8_t DecodeOpRet(CScript const& scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+{
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
+    GetOpReturnData(scriptPubKey, vopret);
+    script = (uint8_t *)vopret.data();
+    memset(&assetid,0,sizeof(assetid));
+    memset(&assetid2,0,sizeof(assetid2));
+    price = 0;
+    if ( script[0] == EVAL_ASSETS )
+    {
+        funcid = script[1];
+        switch ( funcid )
+        {
+            case 'o':
+                return(funcid);
+                break;
+            case 't':  case 'x':
+                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
+                    return(funcid);
+                break;
+            case 's': case 'b': case 'S': case 'B':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                    return(funcid);
+                break;
+            case 'E': case 'e':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                    return(funcid);
+                break;
+        }
+    }
+    return(funcid);
+}
+
+bool Getorigaddr(char *destaddr,CTransaction& tx)
+{
+    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
+    n = tx.vout.size();
+    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        return(false);
+    script = CScript() << origpubkey << OP_CHECKSIG;
+    return(Getscriptaddress(destaddr,script))
+}
+
 CC* GetCryptoCondition(CScript const& scriptSig)
 {
     auto pc = scriptSig.begin();
@@ -176,158 +236,102 @@ bool IsAssetInput(CScript const& scriptSig)
     return out;
 }
 
-uint8_t DecodeOpRet(CScript const& scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &amount)
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
 {
-    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
-    GetOpReturnData(scriptPubKey, vopret);
-    script = (uint8_t *)vopret.data();
-    memset(&assetid,0,sizeof(assetid));
-    memset(&assetid2,0,sizeof(assetid2));
-    amount = 0;
-    if ( script[0] == EVAL_ASSETS )
+    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
     {
-        funcid = script[1];
-        switch ( funcid )
-        {
-           case 't': case 'o': case 'x': case 'S': case 'B':
-                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
-                    return(funcid);
-                break;
-            case 's': case 'b':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> amount) != 0 )
-                    return(funcid);
-                break;
-            case 'E':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2) != 0 )
-                    return(funcid);
-                break;
-            case 'e':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> amount) != 0 )
-                    return(funcid);
-                break;
-        }
-    }
-    return(funcid);
-}
-
-uint64_t IsAssetTx(uint64_t *origamountp,uint8_t funcid,int32_t vini,uint256 assetid,CTransaction& inputTx,int32_t v)
-{
-    // Either the tx will be a CREATE (no CC inputs) or a TRANSFER (1 or more CC inputs)
-    uint256 inputassetid,inputassetid2; uint64_t amount; uint8_t inputfuncid; unsigned int i,n,r = 0;
-    if ( origamountp != 0 )
-        *origamountp = 0;
-    for (i=0; i<inputTx.vin.size(); i++)
-        r += IsAssetInput(inputTx.vin[i].scriptSig) ? 1 : 0;
-    if ( r > 0 )
-    {
-        n = inputTx.vout.size();
-        if ( (inputfuncid= DecodeOpRet(inputTx.vout[n-1].scriptPubKey,inputassetid,inputassetid2,amount)) == 0 )
-            return(0);
-        if ( origamountp != 0 )
-            *origamountp = amount;
+        n = tx.vout.size();
         if ( v >= n-1 )
             return(0);
-        if ( inputfuncid != 'E' || vini == 1 )
+        nValue = tx.vout[v].nValue;
+        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+            return(0);
+        if ( funcid == 'c' )
         {
-            if ( inputassetid == assetid )
-                return(inputTx.vout[v].nValue);
+            if ( refassetid == tTx.GetHash() && v == 0 )
+                return(nValue);
         }
-        else // 'E' and vini == 2
+        else if ( funcid != 'E' )
         {
-            if ( inputassetid2 == assetid )
-                return(inputTx.vout[v].nValue);
+            if ( assetid == refassetid )
+                return(nValue);
+        }
+        else if ( funcid == 'E' )
+        {
+            if ( v < 2 && assetid == refassetid )
+                return(nValue);
+            else if ( v == 2 && assetid2 == refassetid )
+                return(nValue);
         }
     }
-    else if ( r == 0 ) // It's a CREATE, compare hash directly
-    {
-        if ( assetid == inputTx.GetHash() && v == 0 ) // asset create must use vout[0] for the asset
-            return(inputTx.vout[v].nValue);
-    }
-    // should never happen
-    fprintf(stderr, "Illegal state detected, mixed inputs for asset at: %s\n",assetid.GetHex().data());
     return(0);
 }
 
-uint64_t AssetIsvalidCCvin(Eval* eval,uint8_t funcid,uint256 assetid,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
 {
-    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock; int32_t v; uint64_t nValue = 0;
-    v = tx.vin[vini].prevout.n;
-    if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,inputTx,hashBlock) == 0 )
+    uint256 hashBlock; char destaddr[64];
+    origaddr[0] = destaddr[0] = 0;
+    if ( tx.vin[1].prevout.n != 0 )
+        return eval->Invalid("vin1 needs to be buyvin.vout[0]");
+    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-    if ( IsAssetInput(tx.vin[vini].scriptSig) != 0 )
-    {
-        if ( (nValue= IsAssetTx(origamountp,funcid,vini,assetid,inputTx,v)) == 0 )
-            return eval->Invalid("Non asset / wrong asset input tx");
-    }
-    if ( origaddr != 0 && origoutp != 0 )
-    {
-        origaddr[0] = 0;
-        *origoutp = 0;
-        if ( eval->GetTxUnconfirmed(inputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
-            return eval->Invalid("always should find origtx, but didnt for cancelbuy");
-        if ( ExtractDestination(origTx.vout[inputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
-            return eval->Invalid("no origtx address for cancelbuy");
-        strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        *origoutp = inputTx.vout[0].nValue;
-    }
-    return(nValue);
+   else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
+        return eval->Invalid("invalid vin unspendableaddr");
+    else if ( vinTx.vout[0].nValue < 10000 )
+        return eval->Invalid("invalid dust for buyvin");
+    else if ( Getorigaddr(origaddr,vinTx) == 0 )
+        return eval->Invalid("couldnt get origaddr for buyvin");
+    else return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetIsvalidvin(Eval* eval,uint64_t *origamountp,uint64_t *origoutp,char *origaddr,const CTransaction &tx,int32_t vini)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx)
 {
-    CTransaction inputTx,origTx; CTxDestination address; uint256 hashBlock,inputassetid,inputassetid2; int32_t v; uint8_t inputfuncid; uint64_t amount,nValue = 0;
-    v = tx.vin[vini].prevout.n;
-    *origamountp = 0;
-    if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,inputTx,hashBlock) == 0 )
-        return eval->Invalid("always should find vin, but didnt");
-    if ( (inputfuncid= DecodeOpRet(inputTx.vout[inputTx.vout.size()-1].scriptPubKey,inputassetid,inputassetid2,amount)) == 0 )
+    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
-    nValue = inputTx.vout[v].nValue;
-    *origamountp = amount;
-    if ( origaddr != 0 && origoutp != 0 )
+    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
+        return eval->Invalid("invalid CC vout0 for buyvin");
+    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) == 0 )
+        return eval->Invalid("invalid opreturn for buyvin");
+    else return(nValue);
+}
+
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid)
+{
+    const CTransaction vinTx; uint64_t nValue,assetoshis;
+    if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
+        return(0);
+    if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
+        return eval->Invalid("invalid missing CC vout0 for sellvin");
+    else return(assetoshis);
+}
+
+bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
+{
+    uint64_t price,recvprice;
+    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+        return(false);
+    else if ( remaining_price < (totalprice - received) )
+        return(false);
+    else if ( remaining_nValue < (orig_nValue - paid) )
+        return(false);
+    else if ( remaining_nValue > 0 )
     {
-        origaddr[0] = 0;
-        *origoutp = 0;
-        if ( eval->GetTxUnconfirmed(inputTx.vin[vini].prevout.hash,origTx,hashBlock) == 0 )
-            return eval->Invalid("always should find origtx, but didnt for cancelbuy");
-        if ( ExtractDestination(origTx.vout[inputTx.vin[vini].prevout.n].scriptPubKey,address) == 0 )
-            return eval->Invalid("no origtx address for cancelbuy");
-        strcpy(origaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        *origoutp = inputTx.vout[0].nValue;
+        price = (totalprice * COIN) / orig_nValue;
+        recvprice = (received * COIN) / paid;
+        if ( recvprice < price )
+            return(false);
     }
-    return(nValue);
+    return(true);
 }
 
-uint64_t Assetvini2val(Eval* eval,int32_t needasset,uint256 assetid,const CTransaction &tx)
-{
-    CTransaction inputTx; uint256 hashBlock;
-    if ( needasset != 0 && IsAssetInput(tx.vin[2].scriptSig) == 0 )
-        return eval->Invalid("vini2 is not CC");
-    if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,inputTx,hashBlock) == 0 )
-        return eval->Invalid("always should find vin, but didnt");
-    return(inputTx.vout[tx.vin[2].prevout.n].nValue);
-}
-
-uint64_t AssetIsvalidvout0(Eval* eval,const CTransaction &tx,uint64_t nValue)
-{
-    CTxDestination address;
-    if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
-        return eval->Invalid("illegal normal vout0");
-    if ( tx.vout[0].nValue != nValue )
-        return eval->Invalid("nValue mismatch vout0");
-    if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
-        return eval->Invalid("no vout0 address");
-    if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-        return eval->Invalid("invalid vout0 address");
-    return(nValue);
-}
-
-bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t amount)
+bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; uint256 hashBlock; int32_t i,r,numvins; uint64_t nValue,vini2val,origamount,outputs,assetoshis,origout; char origaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
     numvins = tx.vin.size();
-    assetoshis = outputs = 0;
+    outputs = inputs = 0;
     if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
@@ -339,8 +343,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0: issuance assetoshis to CC
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
-            if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
-                return eval->Invalid("illegal normal vout0 for createasset");
+            return eval->Invalid("unexpected AssetValidate for createasset");
             break;
             
         case 't': // transfer
@@ -349,172 +352,184 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0 to n-2: assetoshis output to CC
             //vout.n-2: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
-            for (r=0,i=1; i<numvins; i++)
+            for (i=1; i<numvins; i++)
             {
-                if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,i)) != 0 )
-                    assetoshis += nValue;
-                else return eval->Invalid("illegal normal vin for transfer");
+                if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
+                {
+                    if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                        return eval->Invalid("always should find vin, but didnt");
+                    else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                        inputs += assetoshis;
+                }
             }
             for (i=0; i<numvouts-1; i++)
             {
-                if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                    outputs += tx.vout[i].nValue;
-                else if ( i < numvouts-2 )
-                    return eval->Invalid("non-CC asset transfer vout");
+                if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+                    outputs += assetoshis;
             }
-            if ( assetoshis == 0 )
+            if ( inputs == 0 )
                 return eval->Invalid("no asset inputs for transfer");
-            else if ( assetoshis != outputs )
+            else if ( inputs != outputs )
                 return eval->Invalid("mismatched inputs and outputs for transfer");
             break;
-  
-        case 's': // selloffer
-            //vin.0: normal input
-            //vin.1: valid CC output for sale
-            //vout.0: vin.1 assetoshis output to CC to unspendable
-            //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required]
-            if ( amount == 0 )
-                return eval->Invalid("illegal null amount for selloffer");
-            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,1)) != 0 )
-            {
-                if ( AssetIsvalidvout0(eval,tx,nValue) != nValue )
-                    return(false);
-            } else return eval->Invalid("illegal standard vini.1 for selloffer");
-            break;
-           
+
         case 'b': // buyoffer
             //vins.*: normal inputs (bid + change)
             //vout.0: amount of bid to unspendable
             //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required]
-            if ( amount == 0 )
+            // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
+            if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
             for (i=1; i<numvins; i++)
             {
-                if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,i)) != 0 )
+                if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
                     return eval->Invalid("invalid CC vin for buyoffer");
             }
             for (i=0; i<numvouts-1; i++)
             {
                 if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
                     return eval->Invalid("invalid CC vout for buyoffer");
+                if ( i == 0 )
+                {
+                    if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) ))
+                        return eval->Invalid("invalid vout0 destaddr for buyoffer");
+                    else if ( tx.vout[i].nValue < 10000 )
+                        return eval->Invalid("invalid vout0 dust for buyoffer");
+                }
             }
             break;
-    
-        case 'e': // exchange
-            //vin.0: normal input
-            //vin.1: valid CC output
-            //vout.0: vin.1 assetoshis output to CC to unspendable
-            //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required]
-            if ( assetid2 == zero )
-                return eval->Invalid("illegal assetid2 for exchange");
-            if ( amount == 0 )
-                return eval->Invalid("illegal null amount for exchange");
-            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,0,0,0,tx,1)) != 0 )
-            {
-                if ( AssetIsvalidvout0(eval,tx,nValue) != nValue )
-                    return(false);
-            } else return eval->Invalid("illegal standard vini.1 for exchange");
-            break;
-           
+            
         case 'o': // cancelbuy
             //vin.0: normal input
-            //vin.1: unspendable.(vout.1 from buyoffer)
-            //vout.0: vin.1 value to original pubkey
+            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+            //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
-            if ( AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1) != 0 )
-                return eval->Invalid("illegal CC vin.1 for cancelbuy");
-            if ( strcmp(Unspendableaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-                return eval->Invalid("invalid vout0 address for cancelbuy");
-            if ( origout != tx.vout[0].nValue )
-                return eval->Invalid("mismatched value for cancelbuy");
-            if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
-                return eval->Invalid("no vout0 address for cancelbuy");
-            if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-                return eval->Invalid("mismatched origaddr for cancelbuy");
+            //vout.n-1: opreturn [EVAL_ASSETS] ['o']
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx)) == 0 )
+                return(false);
+            else if ( nValue != tx.vout[0].nValue )
+                return eval->Invalid("mismatched refund for cancelbuy");
+            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+                return eval->Invalid("invalid vout0 destaddr for cancelbuy");
             break;
             
+        case 'B': // fillbuy:
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+            //vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+            //vout.0: remaining amount of bid to unspendable
+            //vout.1: vin.1 value to signer of vin.2
+            //vout.2: vin.2 assetoshis to original pubkey
+            //vout.3: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx)) == 0 )
+                return(false);
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for fillbuy");
+            else if ( IsAssetInput(tx.vin[2].scriptSig) != 0 )
+            {
+                if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+                    return eval->Invalid("always should find vin, but didnt");
+                else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
+                {
+                    if ( tx.vout[2].nValue != assetoshis )
+                        return eval->Invalid("mismatched assetoshis for fillbuy");
+                    else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+                        return eval->Invalid("mismatched vout2 destaddr for fillbuy");
+                    else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,assetoshis,tmpprice) == false )
+                        return eval->Invalid("mismatched remainder for fillbuy");
+                    else if ( remaining_price != 0 )
+                    {
+                        if ( remaining_price < 10000 )
+                            return eval->Invalid("dust vout0 to unspendableaddr for fillbuy");
+                        else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
+                            return eval->Invalid("mismatched vout0 unspendableaddr for fillbuy");
+                    }
+                } else return eval->Invalid("vin2 not enough asset2 for fillbuy");
+            } else return eval->Invalid("vin2 not asset for fillbuy");
+            break;
+            
+        case 's': // selloffer
+        case 'e': // exchange
+            //vin.0: normal input
+            //vin.1: valid CC output for sale
+            //vout.0: vin.1 assetoshis output to CC to unspendable
+            //vout.1: normal output for change (if any)
+            //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
+            //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
+            if ( remaining_price == 0 )
+                return eval->Invalid("illegal null remaining_price for selloffer");
+            if ( IsAssetInput(tx.vin[1].scriptSig) != 0 )
+            {
+                if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+                    return eval->Invalid("always should find vin, but didnt");
+                else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
+                    return eval->Invalid("illegal missing assetvin for selloffer");
+                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) ))
+                    return eval->Invalid("mismatched vout0 unspendableaddr for selloffer");
+                else if ( tx.vout[0].nValue != assetoshis )
+                    return eval->Invalid("mismatched assetoshis for selloffer");
+            } else return eval->Invalid("illegal normal vin1 for selloffer");
+            break;
+           
         case 'x': // cancel
             //vin.0: normal input
-            //vin.1: unspendable.(vout.1 from exchange or selloffer)
-            //vout.0: vin.1 assetoshis to original pubkey CC
+            //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
+            //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
-            {
-                if ( origout != tx.vout[0].nValue )
-                    return eval->Invalid("mismatched value for cancel");
-                if ( ExtractDestination(tx.vout[0].scriptPubKey,address) == 0 )
-                    return eval->Invalid("no vout0 address for cancel");
-                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-                    return eval->Invalid("mismatched origaddr for cancel");
-            } else return eval->Invalid("illegal standard vini.1 for cancel");
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( assetoshis != tx.vout[0].nValue )
+                return eval->Invalid("mismatched refund for cancelbuy");
+            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+                return eval->Invalid("invalid vout0 destaddr for cancel");
             break;
             
         case 'S': // fillsell
+        case 'E': // fillexchange
             //vin.0: normal input
-            //vin.1: unspendable.(vout.1 assetoshis from selloffer)
-            //vin.2: normal output that satisfies selloffer, need to extract from opreturn
-            //vout.0: vin.1 assetoshis to signer of vin.2
-            //vout.1: vin.2 value to original pubkey
-            //vout.2: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid]
-            if ( (vini2val= Assetvini2val(eval,0,assetid,tx)) == 0 )
-                return eval->Invalid("no vini2val for fillsell");
-            if ( (nValue= AssetIsvalidCCvin(eval,funcid,assetid,&origamount,&origout,origaddr,tx,1)) != 0 )
+            //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
+            //'S'.vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
+            //'E'.vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+            //vout.0: remaining assetoshis -> unspendable
+            //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
+            //'S'.vout.2: vin.2 value to original pubkey [origpubkey]
+            //'E'.vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
+            //vout.3: normal output for change (if any)
+            //'S'.vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
+            //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for fillsell");
+            else if ( funcid == 'S' && IsAssetInput(tx.vin[2].scriptSig) != 0 )
+                return eval->Invalid("invalid vin2 is CC for fillsell");
+            else if ( funcid == 'E' && IsAssetInput(tx.vin[2].scriptSig) == 0 )
+                return eval->Invalid("invalid vin2 is CC for fillexchange");
+            else if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nvalue == 0) )
+                return eval->Invalid("invalid asset2 vin value for fillexchange");
+            else if ( funcid == 'E' && IsAssetvout(ignore,ignorepubkey,tx,2,assetid2) == 0 )
+                return eval->Invalid("invalid asset2 voutvalue for fillexchange");
+            else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+                return eval->Invalid("mismatched vout2 destaddr for fill");
+            else if ( vinTx.vout[tx.vin[2].prevout.n].nValue = tx.vout[2].nValue )
+                return eval->Invalid("mismatched vout2 nValue for fill");
+            else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[2].nValue,tx.vout[1].nValue,tmpprice) == false )
+                return eval->Invalid("mismatched remainder for fill");
+            else if ( IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[1].prevout.n,assetid) == 0 )
+                return eval->Invalid("mismatched vout0 unspendableaddr for fill");
+            else if ( remaining_price != 0 )
             {
-                if ( origout != tx.vout[0].nValue )
-                    return eval->Invalid("mismatched value for fillsell");
-                // vout address can be any
-                if ( ExtractDestination(tx.vout[1].scriptPubKey,address) == 0 )
-                    return eval->Invalid("no vout0 address for fillsell");
-                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-                    return eval->Invalid("mismatched origaddr for fillsell");
-                if ( vini2val < origamount )
-                    return eval->Invalid("not enough paid for fillsell");
-                if ( vini2val != tx.vout[1].nValue )
-                    return eval->Invalid("mismatched vout.1 val for fillsell");
-            } else return eval->Invalid("illegal standard vini.1 for fillsell");
-            break;
-           
-        case 'B': // fillbuy:
-            //vin.0: normal input
-            //vin.1: unspendable.(vout.1 from buyoffer)
-            //vin.2: valid CC output satisfies buyoffer
-            //vout.0: vin.1 value to signer of vin.2
-            //vout.1: vin.2 assetoshis to original pubkey
-            //vout.2: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid]
-            if ( (vini2val= Assetvini2val(eval,1,assetid,tx)) == 0 )
-                return eval->Invalid("no vini2val for fillbuy");
-            if ( (nValue= AssetIsvalidvin(eval,&origamount,&origout,origaddr,tx,1)) != 0 )
-            {
-                if ( origout != tx.vout[0].nValue )
-                    return eval->Invalid("mismatched value for fillbuy");
-                if ( ExtractDestination(tx.vout[1].scriptPubKey,address) == 0 )
-                    return eval->Invalid("no vout0 address for fillbuy");
-                if ( strcmp(origaddr,(char *)CBitcoinAddress(address).ToString().c_str()) != 0 )
-                    return eval->Invalid("mismatched origaddr for fillbuy");
-                if ( vini2val < origamount )
-                    return eval->Invalid("not enough paid for fillbuy");
-                if ( vini2val != tx.vout[1].nValue )
-                    return eval->Invalid("mismatched vout.1 val for fillbuy");
-            } else return eval->Invalid("illegal CC vini.1 for fillbuy");
-            break;
-       
-        case 'E': // fillexchange:
-            //vin.0: normal input
-            /*vin.1: unspendable.(vout.1 assetoshis from exchange)
-            vin.2: valid CC output that satisfies exchange
-            vout.0: vin.1 assetoshis to signer of vin.2
-            vout.1: vin.2 assetoshis to original pubkey*/
-            //vout.2: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin1] [assetid vin2]
-            if ( assetid2 == zero )
-                return eval->Invalid("illegal assetid2 for fillexchange");
+                if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
+                    return eval->Invalid("mismatched vout0 unspendableaddr for fill");
+                else if ( IsAssetvout(ignore,ignorepubkey,tx,0,assetid) == 0 )
+                    return eval->Invalid("not asset vout0 to unspendableaddr for fill");
+                else if ( funcid == 'S' && remaining_price < 10000 )
+                    return eval->Invalid("dust vout0 to unspendableaddr for fill");
+            }
             break;
     }
     return(true);
@@ -523,34 +538,16 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
 {
     static uint256 zero;
-    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount;
+    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount)) == 0 )
+    if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount));
-    
-    // We're unable to ensure that all the outputs have the correct
-    // CC Eval code because we only have the scriptPubKey which is a hash of the
-    // condition. The effect of this is that we cannot control the outputs, and therefore
-    // are able to burn or "lose" units or our colored token and they will be spent as the
-    // regular chain token, but we are able to control when units of the asset get
-    // created because we can always vet the inputs.
-    //
-    // Units of the colored token are always 1:1 with the token being input. No additional
-    // supply is created on the chain. Effectively, fees are paid in units of the colored token.
-    // This leaves something to be desired, because for example, if you wanted to create a
-    // single asset that could transfer ownership, usually you would create an asset with a 
-    // supply of 1, ie can not be divided further, however in this case there would be nothing
-    // left to pay fees with. Implementing separate supply and other details are possible, by
-    // encoding further information in the OP_RETURNS.
-
-    // It's valid
-    //return true;
+    return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey));
 }

From ac17dd76ae93bed3c9d6b5897148d2a0f23a7980 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:43:01 -1100
Subject: [PATCH 250/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cf88b0757..df8f04d7f 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -164,7 +164,7 @@ bool Getscriptaddress(char *destaddr,CScript &scriptPubKey)
         strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
         return(true);
     }
-    return(false)
+    return(false);
 }
 
 uint8_t DecodeOpRet(CScript const& scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)

From 517ab98c4747c629ce382e45fe5bd6b0c9144781 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:45:01 -1100
Subject: [PATCH 251/623] ;

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index df8f04d7f..052f68a99 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -207,7 +207,7 @@ bool Getorigaddr(char *destaddr,CTransaction& tx)
     if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
         return(false);
     script = CScript() << origpubkey << OP_CHECKSIG;
-    return(Getscriptaddress(destaddr,script))
+    return(Getscriptaddress(destaddr,script));
 }
 
 CC* GetCryptoCondition(CScript const& scriptSig)

From 6f667a100e25a0212a93fe9cd86c4cfa083a825c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:47:37 -1100
Subject: [PATCH 252/623] Fix

---
 src/cc/assets.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 052f68a99..963dfe664 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -249,7 +249,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
             return(0);
         if ( funcid == 'c' )
         {
-            if ( refassetid == tTx.GetHash() && v == 0 )
+            if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
         else if ( funcid != 'E' )
@@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
     return(0);
 }
 
-uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
+uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
@@ -285,9 +285,9 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const
     else return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx)
 {
-    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -297,9 +297,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
 {
-    const CTransaction vinTx; uint64_t nValue,assetoshis;
+    CTransaction vinTx; uint64_t nValue,assetoshis;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
@@ -326,10 +326,10 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
     return(true);
 }
 
-bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
+    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
     numvins = tx.vin.size();
     outputs = inputs = 0;
     if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )

From 4bbb5ff7e3171a605cec168471e1d318114459ce Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:49:31 -1100
Subject: [PATCH 253/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 963dfe664..b111fa136 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -167,7 +167,7 @@ bool Getscriptaddress(char *destaddr,CScript &scriptPubKey)
     return(false);
 }
 
-uint8_t DecodeOpRet(CScript const& scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+uint8_t DecodeOpRet(CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
 {
     std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
     GetOpReturnData(scriptPubKey, vopret);
@@ -292,7 +292,7 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
         return eval->Invalid("invalid CC vout0 for buyvin");
-    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) == 0 )
+    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) == 0 )
         return eval->Invalid("invalid opreturn for buyvin");
     else return(nValue);
 }

From fd672a2b11805904760a6212383c9f51e36f4d82 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:51:51 -1100
Subject: [PATCH 254/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index b111fa136..f4e31e3a0 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -167,7 +167,7 @@ bool Getscriptaddress(char *destaddr,CScript &scriptPubKey)
     return(false);
 }
 
-uint8_t DecodeOpRet(CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
 {
     std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
     GetOpReturnData(scriptPubKey, vopret);

From d8427807592f53557b5cd926e1f1987fa965e548 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:52:50 -1100
Subject: [PATCH 255/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f4e31e3a0..f55626df3 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -156,7 +156,7 @@ signEncodeTx "$transferTx"
 
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 
-bool Getscriptaddress(char *destaddr,CScript &scriptPubKey)
+bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
     CTxDestination address;
     if ( ExtractDestination(scriptPubKey,address) != 0 )

From 9e1c41c4cecda28370710aabcba76c2a094c1095 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:55:51 -1100
Subject: [PATCH 256/623] Fix

---
 src/cc/assets.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f55626df3..e4dc9b118 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -391,7 +391,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     return eval->Invalid("invalid CC vout for buyoffer");
                 if ( i == 0 )
                 {
-                    if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) ))
+                    if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
                         return eval->Invalid("invalid vout0 destaddr for buyoffer");
                     else if ( tx.vout[i].nValue < 10000 )
                         return eval->Invalid("invalid vout0 dust for buyoffer");
@@ -409,7 +409,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( nValue != tx.vout[0].nValue )
                 return eval->Invalid("mismatched refund for cancelbuy");
-            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                 return eval->Invalid("invalid vout0 destaddr for cancelbuy");
             break;
             
@@ -434,7 +434,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 {
                     if ( tx.vout[2].nValue != assetoshis )
                         return eval->Invalid("mismatched assetoshis for fillbuy");
-                    else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+                    else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                         return eval->Invalid("mismatched vout2 destaddr for fillbuy");
                     else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,assetoshis,tmpprice) == false )
                         return eval->Invalid("mismatched remainder for fillbuy");
@@ -465,7 +465,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
                     return eval->Invalid("illegal missing assetvin for selloffer");
-                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) ))
+                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) )
                     return eval->Invalid("mismatched vout0 unspendableaddr for selloffer");
                 else if ( tx.vout[0].nValue != assetoshis )
                     return eval->Invalid("mismatched assetoshis for selloffer");
@@ -482,7 +482,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( assetoshis != tx.vout[0].nValue )
                 return eval->Invalid("mismatched refund for cancelbuy");
-            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                 return eval->Invalid("invalid vout0 destaddr for cancel");
             break;
             
@@ -513,7 +513,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("invalid asset2 vin value for fillexchange");
             else if ( funcid == 'E' && IsAssetvout(ignore,ignorepubkey,tx,2,assetid2) == 0 )
                 return eval->Invalid("invalid asset2 voutvalue for fillexchange");
-            else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0) ))
+            else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                 return eval->Invalid("mismatched vout2 destaddr for fill");
             else if ( vinTx.vout[tx.vin[2].prevout.n].nValue = tx.vout[2].nValue )
                 return eval->Invalid("mismatched vout2 nValue for fill");

From 27e76cd845c9effc9ee835982536d806a82c4761 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:58:13 -1100
Subject: [PATCH 257/623] Test

---
 src/cc/assets.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e4dc9b118..6b49ecc2d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -326,7 +326,7 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
     return(true);
 }
 
-bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
@@ -465,7 +465,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
                     return eval->Invalid("illegal missing assetvin for selloffer");
-                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0) )
+                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
                     return eval->Invalid("mismatched vout0 unspendableaddr for selloffer");
                 else if ( tx.vout[0].nValue != assetoshis )
                     return eval->Invalid("mismatched assetoshis for selloffer");
@@ -509,13 +509,13 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("invalid vin2 is CC for fillexchange");
             else if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
-            else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nvalue == 0) )
+            else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nValue == 0) )
                 return eval->Invalid("invalid asset2 vin value for fillexchange");
             else if ( funcid == 'E' && IsAssetvout(ignore,ignorepubkey,tx,2,assetid2) == 0 )
                 return eval->Invalid("invalid asset2 voutvalue for fillexchange");
             else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                 return eval->Invalid("mismatched vout2 destaddr for fill");
-            else if ( vinTx.vout[tx.vin[2].prevout.n].nValue = tx.vout[2].nValue )
+            else if ( vinTx.vout[tx.vin[2].prevout.n].nValue != tx.vout[2].nValue )
                 return eval->Invalid("mismatched vout2 nValue for fill");
             else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[2].nValue,tx.vout[1].nValue,tmpprice) == false )
                 return eval->Invalid("mismatched remainder for fill");

From a87883d543100f1cb839b6d50c15983b044f2675 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 21:59:39 -1100
Subject: [PATCH 258/623] Test

---
 src/cc/assets.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 6b49ecc2d..be73f069c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -236,7 +236,7 @@ bool IsAssetInput(CScript const& scriptSig)
     return out;
 }
 
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid)
 {
     uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
     return(0);
 }
 
-uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
@@ -285,9 +285,9 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
     else return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx)
 {
-    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -297,9 +297,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid)
 {
-    CTransaction vinTx; uint64_t nValue,assetoshis;
+    const CTransaction vinTx; uint64_t nValue,assetoshis;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
@@ -329,7 +329,7 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
     numvins = tx.vin.size();
     outputs = inputs = 0;
     if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )

From 128976d345050ac5c226c241752903981bf4d13d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:00:52 -1100
Subject: [PATCH 259/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index be73f069c..987564893 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
+uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;

From d9316bd11df33909a49631432444263ec244e426 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:02:47 -1100
Subject: [PATCH 260/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 987564893..1b556a6be 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -200,7 +200,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
     return(funcid);
 }
 
-bool Getorigaddr(char *destaddr,CTransaction& tx)
+bool Getorigaddr(char *destaddr,const CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
@@ -538,7 +538,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
 {
     static uint256 zero;
-    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    const CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )

From d90e961beea803287a9b1e373cb64b7978665e86 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:05:38 -1100
Subject: [PATCH 261/623] Test

---
 src/cc/eval.cpp | 2 +-
 src/cc/eval.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index b8044e0dd..2405c2375 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -84,7 +84,7 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
 }
 
 
-bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
+bool Eval::GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const
 {
     bool fAllowSlow = false; // Don't allow slow
     return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 96af359f1..edff3d96b 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -81,7 +81,7 @@ public:
     /*
      * IO functions
      */
-    virtual bool GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const;
+    virtual bool GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const;
     virtual bool GetTxConfirmed(const uint256 &hash, CTransaction &txOut, CBlockIndex &block) const;
     virtual unsigned int GetCurrentHeight() const;
     virtual bool GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) const;

From aedc638dff4ded92055a348e1fa3a382df4227f8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:08:24 -1100
Subject: [PATCH 262/623] -const

---
 src/cc/assets.cpp | 22 +++++++++++-----------
 src/cc/eval.cpp   |  2 +-
 src/cc/eval.h     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 1b556a6be..883d140e7 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -200,7 +200,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
     return(funcid);
 }
 
-bool Getorigaddr(char *destaddr,const CTransaction& tx)
+bool Getorigaddr(char *destaddr,CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
@@ -236,7 +236,7 @@ bool IsAssetInput(CScript const& scriptSig)
     return out;
 }
 
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid)
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
 {
     uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -268,7 +268,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
+uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
@@ -285,9 +285,9 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,const CTransaction &tx,const
     else return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx)
 {
-    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
@@ -297,9 +297,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,const CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
 {
-    const CTransaction vinTx; uint64_t nValue,assetoshis;
+    CTransaction vinTx; uint64_t nValue,assetoshis;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
@@ -326,10 +326,10 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
     return(true);
 }
 
-bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
+    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
     numvins = tx.vin.size();
     outputs = inputs = 0;
     if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )
@@ -535,10 +535,10 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
     return(true);
 }
 
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn)
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, CTransaction &tx, unsigned int nIn)
 {
     static uint256 zero;
-    const CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 2405c2375..b8044e0dd 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -84,7 +84,7 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
 }
 
 
-bool Eval::GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const
+bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
 {
     bool fAllowSlow = false; // Don't allow slow
     return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
diff --git a/src/cc/eval.h b/src/cc/eval.h
index edff3d96b..96af359f1 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -81,7 +81,7 @@ public:
     /*
      * IO functions
      */
-    virtual bool GetTxUnconfirmed(const uint256 &hash, const CTransaction &txOut, uint256 &hashBlock) const;
+    virtual bool GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const;
     virtual bool GetTxConfirmed(const uint256 &hash, CTransaction &txOut, CBlockIndex &block) const;
     virtual unsigned int GetCurrentHeight() const;
     virtual bool GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) const;

From badcb33241c7882ec2e7d15af55e8067d5875444 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:13:13 -1100
Subject: [PATCH 263/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 883d140e7..2e222a444 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -535,10 +535,11 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
     return(true);
 }
 
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, CTransaction &tx, unsigned int nIn)
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
     static uint256 zero;
     CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    CTransaction tx = *(CTransaction *)&ctx;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     if ( (n= tx.vout.size()) == 0 )

From b088fa97297f2589c4777fc4ffb9cbaa865fcd11 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:22:30 -1100
Subject: [PATCH 264/623] Fix PoW diff check in PoS/PoW mode

---
 src/komodo_bitcoind.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 2bc4e1b88..516f31187 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1481,11 +1481,13 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
     bnTarget.SetCompact(pblock->nBits,&fNegative,&fOverflow);
     bhash = UintToArith256(hash);
     possible = komodo_block2pubkey33(pubkey33,pblock);
-    //fprintf(stderr,"height.%d slowflag.%d possible.%d cmp.%d\n",height,slowflag,possible,bhash > bnTarget);
     if ( height == 0 )
     {
         if ( slowflag != 0 )
+        {
+            fprintf(stderr,"height.%d slowflag.%d possible.%d cmp.%d\n",height,slowflag,possible,bhash > bnTarget);
             return(0);
+        }
         if ( (pprev= mapBlockIndex[pblock->hashPrevBlock]) != 0 )
             height = pprev->nHeight + 1;
         if ( height == 0 )
@@ -1535,10 +1537,14 @@ int32_t komodo_checkPOW(int32_t slowflag,CBlock *pblock,int32_t height)
                         fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]);
                     fprintf(stderr," ht.%d PoW diff violation PoSperc.%d vs goalperc.%d\n",height,PoSperc,(int32_t)ASSETCHAINS_STAKED);
                     return(-1);
-                }
+                } else failed = 0;
             }
-        } else if ( is_PoSblock < 0 )
+        }
+        else if ( is_PoSblock < 0 )
+        {
+            fprintf(stderr,"unexpected negative is_PoSblock.%d\n",is_PoSblock);
             return(-1);
+        }
     }
     if ( failed == 0 && ASSETCHAINS_OVERRIDE_PUBKEY33[0] != 0 )
     {

From 55d19b212ed658187fac3fa51603cc494209be4d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 19 Jul 2018 22:35:43 -1100
Subject: [PATCH 265/623] Force ProcessNewBlock to not do slow check

---
 src/cc/assets.cpp | 1 -
 src/main.cpp      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2e222a444..56cc48975 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -20,7 +20,6 @@
 #include "../script/standard.h"
 #include "../base58.h"
 
-// debugging: need to clarify tx, inputTx, origTx
 // code rpc
 
 /*
diff --git a/src/main.cpp b/src/main.cpp
index aa4435843..ccdeee6ff 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4456,7 +4456,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
         LOCK(cs_main);
         bool fRequested = MarkBlockAsReceived(hash);
         fRequested |= fForceProcessing;
-        if ( checked != 0 && komodo_checkPOW(from_miner && ASSETCHAINS_STAKED == 0,pblock,height) < 0 )
+        if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0
         {
             checked = 0;
             //fprintf(stderr,"passed checkblock but failed checkPOW.%d\n",from_miner && ASSETCHAINS_STAKED == 0);

From dd94983fa2dce83950b23d3e8cc8b0e409c9868c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:22:01 -1100
Subject: [PATCH 266/623] Create asset tx

---
 src/cc/assets.cpp        | 95 ++++++++++++++++++++++++++++++++++++++++
 src/wallet/rpcwallet.cpp |  2 +
 2 files changed, 97 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 56cc48975..0275b54f7 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -19,6 +19,7 @@
 #include <cryptoconditions.h>
 #include "../script/standard.h"
 #include "../base58.h"
+#include "../wallet.h"
 
 // code rpc
 
@@ -166,6 +167,96 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     return(false);
 }
 
+/*
+ vout.n-1: opreturn [EVAL_ASSETS] ['o']
+ vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
+ vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
+ vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+ vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
+ vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+ vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
+ vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
+ vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
+ vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
+*/
+
+CScript EncodeCreateOpRet(uint8_t funcid,std::string name,std::string description)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << name << description);
+    return(opret);
+}
+    
+CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    switch ( funcid )
+    {
+        case 'o':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid);
+            break;
+        case 't':  case 'x':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
+            break;
+        case 's': case 'b': case 'S': case 'B':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
+            break;
+        case 'E': case 'e':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
+            break;
+        default:
+            fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
+            opret << OP_RETURN;
+            break;
+   }
+    return(opret);
+}
+
+CC *MakeAssetCond(CPubKey pk)
+{
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {assetCC, Sig});
+}
+
+CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeAssetCond(pk);
+    CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
+CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
+{
+    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
+    const CKeyStore& keystore = *pwalletMain;
+    SignatureData sigdata; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
+    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
+    {
+        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
+        {
+            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
+            if ( tx.vout[utxovout].nValue > assetsupply+txfee )
+            {
+                change = tx.vout[utxovout].nValue - (assetsupply+txfee);
+                mtx.vout.push_back(CTxOut(change, CScript() << pk << OP_CHECKSIG));
+                mtx.vout.push_back(CTxOut(0,EncodeCreateOpRet('c',name,description)));
+            }
+            if ( ProduceSignature(TransactionSignatureCreator(&keystore,&mtx,0,tx.vout[utxovout].nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+            {
+                UpdateTransaction(mtx,0,sigdata);
+                fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.ToString(),description.ToString());
+            } else fprintf(stderr,"signing error for CreateAsset\n");
+        }
+    }
+    return(mtx);
+}
+
 uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
 {
     std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
@@ -194,6 +285,10 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
                 if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
                     return(funcid);
                 break;
+            default:
+                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
+                funcid = 0;
+                break;
         }
     }
     return(funcid);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f3f032fa6..4782842b0 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4867,3 +4867,5 @@ UniValue getbalance64(const UniValue& params, bool fHelp)
     ret.push_back(Pair("notstaking", b));
     return ret;
 }
+
+

From f1734acc35f6dc1e481621e5d2f6bc8f84e3245e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:22:54 -1100
Subject: [PATCH 267/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0275b54f7..6de16e08a 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -19,7 +19,7 @@
 #include <cryptoconditions.h>
 #include "../script/standard.h"
 #include "../base58.h"
-#include "../wallet.h"
+#include "../wallet/wallet.h"
 
 // code rpc
 

From 6e732f5dda1c0285163a51806ea27968039652c6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:35:12 -1100
Subject: [PATCH 268/623] ParseHex

---
 src/cc/assets.cpp | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 6de16e08a..e1c88f5e7 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -19,6 +19,7 @@
 #include <cryptoconditions.h>
 #include "../script/standard.h"
 #include "../base58.h"
+#include "../sign.h"
 #include "../wallet/wallet.h"
 
 // code rpc
@@ -230,28 +231,37 @@ CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
     return(vout);
 }
 
+extern CWallet* pwalletMain;
+
 CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
 {
     auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    const CKeyStore& keystore = *pwalletMain;
+    const CKeyStore& keystore=0;
     SignatureData sigdata; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
+#ifdef ENABLE_WALLET
+    keystore = *pwalletMain;
+#endif
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
         {
             mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
             mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
-            if ( tx.vout[utxovout].nValue > assetsupply+txfee )
+            nValue = vintx.vout[utxovout].nValue;
+            if ( nValue > assetsupply+txfee )
             {
-                change = tx.vout[utxovout].nValue - (assetsupply+txfee);
-                mtx.vout.push_back(CTxOut(change, CScript() << pk << OP_CHECKSIG));
+                change = nValue - (assetsupply+txfee);
+                mtx.vout.push_back(CTxOut(change, CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
                 mtx.vout.push_back(CTxOut(0,EncodeCreateOpRet('c',name,description)));
             }
-            if ( ProduceSignature(TransactionSignatureCreator(&keystore,&mtx,0,tx.vout[utxovout].nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+            if ( keystore != 0 )
             {
-                UpdateTransaction(mtx,0,sigdata);
-                fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.ToString(),description.ToString());
-            } else fprintf(stderr,"signing error for CreateAsset\n");
+                if ( ProduceSignature(TransactionSignatureCreator(&keystore,&mtx,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+                {
+                    UpdateTransaction(mtx,0,sigdata);
+                    fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.c_str(),description.c_str());
+                } else fprintf(stderr,"signing error for CreateAsset\n");
+            }
         }
     }
     return(mtx);

From 65eb510eae33cf7a988ee347b09ef96b9b969cfe Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:36:04 -1100
Subject: [PATCH 269/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e1c88f5e7..27a575886 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -19,7 +19,7 @@
 #include <cryptoconditions.h>
 #include "../script/standard.h"
 #include "../base58.h"
-#include "../sign.h"
+#include "../script/sign.h"
 #include "../wallet/wallet.h"
 
 // code rpc

From 327df3a1df812989fa0116535d238c96a1d057f4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:37:46 -1100
Subject: [PATCH 270/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 27a575886..f94c05486 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -236,7 +236,7 @@ extern CWallet* pwalletMain;
 CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
 {
     auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    const CKeyStore& keystore=0;
+    const CKeyStore keystore=0;
     SignatureData sigdata; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
 #ifdef ENABLE_WALLET
     keystore = *pwalletMain;

From ccfe7dfb7fa49c6a2d9085984ecc94eccf5e7cb4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:40:56 -1100
Subject: [PATCH 271/623] Test

---
 src/cc/assets.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f94c05486..07730bb69 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -231,16 +231,13 @@ CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
     return(vout);
 }
 
+#ifdef ENABLE_WALLET
 extern CWallet* pwalletMain;
+#endif
 
 CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
 {
-    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    const CKeyStore keystore=0;
-    SignatureData sigdata; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
-#ifdef ENABLE_WALLET
-    keystore = *pwalletMain;
-#endif
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
@@ -254,14 +251,17 @@ CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid
                 mtx.vout.push_back(CTxOut(change, CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
                 mtx.vout.push_back(CTxOut(0,EncodeCreateOpRet('c',name,description)));
             }
-            if ( keystore != 0 )
+#ifdef ENABLE_WALLET
             {
+                SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
+                auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
                 if ( ProduceSignature(TransactionSignatureCreator(&keystore,&mtx,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
                 {
                     UpdateTransaction(mtx,0,sigdata);
                     fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.c_str(),description.c_str());
                 } else fprintf(stderr,"signing error for CreateAsset\n");
             }
+#endif
         }
     }
     return(mtx);

From 230ee51eec55669144fda7fc010fdf8662df8108 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:44:06 -1100
Subject: [PATCH 272/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 07730bb69..561e9b669 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -253,9 +253,9 @@ CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid
             }
 #ifdef ENABLE_WALLET
             {
-                SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
+                CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
                 auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-                if ( ProduceSignature(TransactionSignatureCreator(&keystore,&mtx,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+                if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
                 {
                     UpdateTransaction(mtx,0,sigdata);
                     fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.c_str(),description.c_str());

From bf1da1e4951137da7312401b9936ade92f25bd7f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:49:33 -1100
Subject: [PATCH 273/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 561e9b669..d2126475e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -258,7 +258,8 @@ CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid
                 if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
                 {
                     UpdateTransaction(mtx,0,sigdata);
-                    fprintf(stderr,"signed CreateAsset (%s -> %s)\n",name.c_str(),description.c_str());
+                    string strHex = EncodeHexTx(mtx);
+                    fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),strHex.ToStrin().c_str());
                 } else fprintf(stderr,"signing error for CreateAsset\n");
             }
 #endif

From 8623471c85085cc855667c24ed6896013857bf7a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:52:59 -1100
Subject: [PATCH 274/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d2126475e..a7574bef5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -258,8 +258,8 @@ CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid
                 if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
                 {
                     UpdateTransaction(mtx,0,sigdata);
-                    string strHex = EncodeHexTx(mtx);
-                    fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),strHex.ToStrin().c_str());
+                    std::string strHex = EncodeHexTx(mtx);
+                    fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),strHex.c_str());
                 } else fprintf(stderr,"signing error for CreateAsset\n");
             }
 #endif

From 89babf9f8d52fee2f2120517e25e0e4596d98d60 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 00:54:14 -1100
Subject: [PATCH 275/623] Test

---
 src/cc/assets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index a7574bef5..3c0e212f2 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -19,6 +19,7 @@
 #include <cryptoconditions.h>
 #include "../script/standard.h"
 #include "../base58.h"
+#include "../core_io.h"
 #include "../script/sign.h"
 #include "../wallet/wallet.h"
 

From ae63ba16478a4002470d2707639f87489b48813f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:40:09 -1100
Subject: [PATCH 276/623] Test

---
 src/cc/assets.cpp | 79 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 20 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3c0e212f2..9c1f09315 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -157,6 +157,7 @@ signEncodeTx "$transferTx"
 */
 
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
+static uint256 zeroid;
 
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
@@ -236,37 +237,75 @@ CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
 extern CWallet* pwalletMain;
 #endif
 
-CMutableTransaction CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
+std::string SignAssetTx(CMutableTransaction &mtx,uint64_t utxovalue,const CScript scriptPubKey)
 {
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
+#ifdef ENABLE_WALLET
+    CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
+    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
+    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,utxovalue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+    {
+        UpdateTransaction(mtx,0,sigdata);
+        std::string strHex = EncodeHexTx(mtx);
+        return(strHex);
+    } else fprintf(stderr,"signing error for CreateAsset\n");
+#else
+    return(0);
+#endif
+}
+
+std::string CompleteAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,const CScript scriptPubKey,CScript opret)
+{
+    uint64_t change;
+    if ( utxovalue > outvalue+txfee )
+    {
+        change = utxovalue - (outvalue+txfee);
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
+    }
+    mtx.vout.push_back(CTxOut(0,opret));
+    return(SignAssetTx(mtx,utxovalue,scriptPubKey));
+}
+
+std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
+{
+    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,txfee=10000;
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
+        nValue = vintx.vout[utxovout].nValue;
         if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
         {
             mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
             mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
-            nValue = vintx.vout[utxovout].nValue;
-            if ( nValue > assetsupply+txfee )
+            hex = CompleteAssetTx(mtx,pk,assetsupply,txfee,nValue,vintx.vout[utxovout].scriptPubKey,EncodeCreateOpRet('c',name,description));
+            if ( hex.size() > 0 )
             {
-                change = nValue - (assetsupply+txfee);
-                mtx.vout.push_back(CTxOut(change, CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
-                mtx.vout.push_back(CTxOut(0,EncodeCreateOpRet('c',name,description)));
+                fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),hex.c_str());
+                return(hex);
             }
-#ifdef ENABLE_WALLET
-            {
-                CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
-                auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-                if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,nValue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
-                {
-                    UpdateTransaction(mtx,0,sigdata);
-                    std::string strHex = EncodeHexTx(mtx);
-                    fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),strHex.c_str());
-                } else fprintf(stderr,"signing error for CreateAsset\n");
-            }
-#endif
         }
     }
-    return(mtx);
+    return(0);
+}
+
+std::string CreateAssetTransfer(uint256 assetid,CPubKey pk,uint256 utxotxid,int32_t utxovout)
+{
+    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
+    std::vector<uint8_t> origpubkey = pk;
+    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
+    {
+        nValue = vintx.vout[utxovout].nValue;
+        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
+        {
+            //vin.1 .. vin.n-1: valid CC outputs
+            //vout.0 to n-2: assetoshis output to CC
+            hex = CompleteAssetTx(mtx,pk,0,txfee,nValue,vintx.vout[utxovout].scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey));
+            if ( hex.size() > 0 )
+            {
+                fprintf(stderr,"signed CreateAssetTransfer %s\n",hex.c_str());
+                return(hex);
+            }
+       }
+    }
+    return(0);
 }
 
 uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)

From 0242a55f4fbb3cb7c0b87dec6ea1d1fe9ae99668 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:47:34 -1100
Subject: [PATCH 277/623] Test

---
 src/cc/assets.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 9c1f09315..cb15edc1c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -242,7 +242,7 @@ std::string SignAssetTx(CMutableTransaction &mtx,uint64_t utxovalue,const CScrip
 #ifdef ENABLE_WALLET
     CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
     auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,utxovalue,SIGHASH_ALL),vintx.vout[utxovout].scriptPubKey,sigdata,consensusBranchId) != 0 )
+    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
     {
         UpdateTransaction(mtx,0,sigdata);
         std::string strHex = EncodeHexTx(mtx);
@@ -288,12 +288,17 @@ std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t
 
 std::string CreateAssetTransfer(uint256 assetid,CPubKey pk,uint256 utxotxid,int32_t utxovout)
 {
-    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000;
-    std::vector<uint8_t> origpubkey = pk;
+    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; std::vector<uint8_t> origpubkey; int32_t i,n; uint8_t *pubkey33,*dest;
+    n = pk.size();
+    origpubkey.resize(n);
+    dest = origpubkey.data();
+    pubkey33 = pk.begin();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         nValue = vintx.vout[utxovout].nValue;
-        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
+        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= txfee )
         {
             //vin.1 .. vin.n-1: valid CC outputs
             //vout.0 to n-2: assetoshis output to CC

From e5c4a89a5ce0aae001bbb33a412bd0a05933e453 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:48:23 -1100
Subject: [PATCH 278/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cb15edc1c..695ba1096 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -292,7 +292,7 @@ std::string CreateAssetTransfer(uint256 assetid,CPubKey pk,uint256 utxotxid,int3
     n = pk.size();
     origpubkey.resize(n);
     dest = origpubkey.data();
-    pubkey33 = pk.begin();
+    pubkey33 = (uint8_t *)pk.begin();
     for (i=0; i<n; i++)
         dest[i] = pubkey33[i];
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )

From 81a6e1d4a5b94339d5e12ee861efd717c1b275f2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:52:11 -1100
Subject: [PATCH 279/623] Test

---
 src/cc/assets.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 695ba1096..50b25b2b6 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -286,15 +286,10 @@ std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t
     return(0);
 }
 
-std::string CreateAssetTransfer(uint256 assetid,CPubKey pk,uint256 utxotxid,int32_t utxovout)
+std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
-    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; std::vector<uint8_t> origpubkey; int32_t i,n; uint8_t *pubkey33,*dest;
-    n = pk.size();
-    origpubkey.resize(n);
-    dest = origpubkey.data();
-    pubkey33 = (uint8_t *)pk.begin();
-    for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
+    std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; 
+    pk.Set(origpubkey);
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         nValue = vintx.vout[utxovout].nValue;

From ffae09ff012f576e3dd5f422f99cfadd0020bb09 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:54:32 -1100
Subject: [PATCH 280/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 50b25b2b6..c315b8879 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -190,7 +190,7 @@ CScript EncodeCreateOpRet(uint8_t funcid,std::string name,std::string descriptio
     return(opret);
 }
     
-CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
+CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,const std::vector<uint8_t> origpubkey)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
     switch ( funcid )
@@ -286,7 +286,7 @@ std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t
     return(0);
 }
 
-std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
+std::string CreateAssetTransfer(uint256 assetid,const std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
     std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; 
     pk.Set(origpubkey);

From 42799586567733eebaac260246bb2865d8a5d46d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:55:53 -1100
Subject: [PATCH 281/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index c315b8879..5c4e70863 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -289,7 +289,7 @@ std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t
 std::string CreateAssetTransfer(uint256 assetid,const std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
     std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; 
-    pk.Set(origpubkey);
+    pk.CPubKey(origpubkey);
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         nValue = vintx.vout[utxovout].nValue;

From 7a34c7f56ae453bcb70e46047316b46d0e2d458c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:56:56 -1100
Subject: [PATCH 282/623] Test

---
 src/cc/assets.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 5c4e70863..0e3c0328c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -190,7 +190,7 @@ CScript EncodeCreateOpRet(uint8_t funcid,std::string name,std::string descriptio
     return(opret);
 }
     
-CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,const std::vector<uint8_t> origpubkey)
+CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
     switch ( funcid )
@@ -286,10 +286,15 @@ std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t
     return(0);
 }
 
-std::string CreateAssetTransfer(uint256 assetid,const std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
+std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
-    std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; 
-    pk.CPubKey(origpubkey);
+    std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; int32_t i,n; uint8_t *pubkey33,*dest;
+    n = origpubkey.size();
+    pk.resize(n);
+    dest = pk.begin();
+    pubkey33 = (uint8_t *)origpubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
     if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
         nValue = vintx.vout[utxovout].nValue;

From 084a779ea63836e21350b922709a2f3088d3b108 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 01:58:07 -1100
Subject: [PATCH 283/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0e3c0328c..910088f45 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -290,8 +290,8 @@ std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,
 {
     std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; int32_t i,n; uint8_t *pubkey33,*dest;
     n = origpubkey.size();
-    pk.resize(n);
-    dest = pk.begin();
+    //pk.resize(n);
+    dest = (uint8_t *)pk.begin();
     pubkey33 = (uint8_t *)origpubkey.data();
     for (i=0; i<n; i++)
         dest[i] = pubkey33[i];

From 6353ee2a020b4d2772d443a4d5b3a9544dcd1fb7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 02:26:41 -1100
Subject: [PATCH 284/623] Tx creation helpers

---
 src/cc/assets.cpp | 74 ++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 910088f45..51f255476 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -246,17 +246,36 @@ std::string SignAssetTx(CMutableTransaction &mtx,uint64_t utxovalue,const CScrip
     {
         UpdateTransaction(mtx,0,sigdata);
         std::string strHex = EncodeHexTx(mtx);
-        return(strHex);
+        if ( strHex.size() > 0 )
+            return(strHex);
     } else fprintf(stderr,"signing error for CreateAsset\n");
 #else
     return(0);
 #endif
 }
 
-std::string CompleteAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,const CScript scriptPubKey,CScript opret)
+uint64_t StartAssetTx(CPubKey &pk,const CScript &scriptPubKey,uint64_t output,uint64_t txfee,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
-    uint64_t change;
-    if ( utxovalue > outvalue+txfee )
+    CTransaction vintx; uint256 hashBlock; uint64_t nValue; int32_t i,n; uint8_t *pubkey33,*dest;
+    n = origpubkey.size();
+    dest = (uint8_t *)pk.begin();
+    pubkey33 = (uint8_t *)origpubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
+    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
+    {
+        nValue = vintx.vout[utxovout].nValue;
+        scriptPubKey = vintx.vout[utxovout].scriptPubKey;
+        if ( scriptPubKey.IsPayToCryptoCondition() == 0 && nValue >= output+txfee )
+            return(nValue);
+    }
+    return(0);
+}
+
+std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,const CScript scriptPubKey,CScript opret)
+{
+    std::string hex; uint64_t change;
+    if ( utxovalue >= outvalue+2*txfee )
     {
         change = utxovalue - (outvalue+txfee);
         mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
@@ -265,50 +284,27 @@ std::string CompleteAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalu
     return(SignAssetTx(mtx,utxovalue,scriptPubKey));
 }
 
-std::string CreateAsset(CPubKey pk,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
+std::string CreateAsset(std::vector<uint8_t> origpubkey,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
 {
-    std::string hex; CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t nValue,txfee=10000;
-    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
+    CMutableTransaction mtx; CPubKey pk; const CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,assetsupply,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
-        nValue = vintx.vout[utxovout].nValue;
-        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= assetsupply+txfee )
-        {
-            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
-            hex = CompleteAssetTx(mtx,pk,assetsupply,txfee,nValue,vintx.vout[utxovout].scriptPubKey,EncodeCreateOpRet('c',name,description));
-            if ( hex.size() > 0 )
-            {
-                fprintf(stderr,"signed CreateAsset (%s -> %s) %s\n",name.c_str(),description.c_str(),hex.c_str());
-                return(hex);
-            }
-        }
+        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
+        return(FinalizeAssetTx(mtx,pk,assetsupply,txfee,utxovalue,scriptPubKey,EncodeCreateOpRet('c',name,description)));
     }
     return(0);
 }
 
 std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
-    std::string hex; CMutableTransaction mtx; CPubKey pk; CTransaction vintx; uint256 hashBlock; uint64_t nValue,change,txfee=10000; int32_t i,n; uint8_t *pubkey33,*dest;
-    n = origpubkey.size();
-    //pk.resize(n);
-    dest = (uint8_t *)pk.begin();
-    pubkey33 = (uint8_t *)origpubkey.data();
-    for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
-    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
+    CMutableTransaction mtx; CPubKey pk; const CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
-        nValue = vintx.vout[utxovout].nValue;
-        if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 && vintx.vout[utxovout].nValue >= txfee )
-        {
-            //vin.1 .. vin.n-1: valid CC outputs
-            //vout.0 to n-2: assetoshis output to CC
-            hex = CompleteAssetTx(mtx,pk,0,txfee,nValue,vintx.vout[utxovout].scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey));
-            if ( hex.size() > 0 )
-            {
-                fprintf(stderr,"signed CreateAssetTransfer %s\n",hex.c_str());
-                return(hex);
-            }
-       }
+        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+        //vin.1 .. vin.n-1: valid CC outputs
+        //vout.0 to n-2: assetoshis output to CC
+        return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey)));
     }
     return(0);
 }

From e3af65dd8f88a967923cf66eee8bfa44396ff677 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 02:27:47 -1100
Subject: [PATCH 285/623] Test

---
 src/cc/assets.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 51f255476..bcf9e246d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -254,7 +254,7 @@ std::string SignAssetTx(CMutableTransaction &mtx,uint64_t utxovalue,const CScrip
 #endif
 }
 
-uint64_t StartAssetTx(CPubKey &pk,const CScript &scriptPubKey,uint64_t output,uint64_t txfee,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
+uint64_t StartAssetTx(CPubKey &pk,CScript &scriptPubKey,uint64_t output,uint64_t txfee,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
     CTransaction vintx; uint256 hashBlock; uint64_t nValue; int32_t i,n; uint8_t *pubkey33,*dest;
     n = origpubkey.size();
@@ -272,7 +272,7 @@ uint64_t StartAssetTx(CPubKey &pk,const CScript &scriptPubKey,uint64_t output,ui
     return(0);
 }
 
-std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,const CScript scriptPubKey,CScript opret)
+std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,CScript scriptPubKey,CScript opret)
 {
     std::string hex; uint64_t change;
     if ( utxovalue >= outvalue+2*txfee )
@@ -286,7 +286,7 @@ std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalu
 
 std::string CreateAsset(std::vector<uint8_t> origpubkey,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
 {
-    CMutableTransaction mtx; CPubKey pk; const CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
+    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,assetsupply,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
         mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
@@ -298,7 +298,7 @@ std::string CreateAsset(std::vector<uint8_t> origpubkey,uint64_t assetsupply,uin
 
 std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
 {
-    CMutableTransaction mtx; CPubKey pk; const CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
+    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
         mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));

From 54c7829ef354531524b2474779c343d0c6570779 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 02:39:12 -1100
Subject: [PATCH 286/623] Vector args

---
 src/cc/assets.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index bcf9e246d..a5c9d2da4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -296,14 +296,18 @@ std::string CreateAsset(std::vector<uint8_t> origpubkey,uint64_t assetsupply,uin
     return(0);
 }
 
-std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
+std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,std::vector<CTxIn> CCinputs,std::vector<CTxOut> CCoutputs)
 {
-    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
+    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
         mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-        //vin.1 .. vin.n-1: valid CC outputs
-        //vout.0 to n-2: assetoshis output to CC
+        n = CCinputs.size();
+        for (i=0; i<n; i++)
+            mtx.vin.push_back(CCinputs[i]);
+        n = CCoutputs.size();
+        for (i=0; i<n; i++)
+            mtx.vout.push_back(CCoutputs[i]);
         return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey)));
     }
     return(0);

From 24fe52375e183c9e54d34c400b0d56d579c09c82 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 02:49:38 -1100
Subject: [PATCH 287/623] Buy offer

---
 src/cc/assets.cpp | 76 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index a5c9d2da4..f2ff83bee 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -157,6 +157,8 @@ signEncodeTx "$transferTx"
 */
 
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
+char Unspendablehex[67] = { "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" };
+
 static uint256 zeroid;
 
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
@@ -284,7 +286,7 @@ std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalu
     return(SignAssetTx(mtx,utxovalue,scriptPubKey));
 }
 
-std::string CreateAsset(std::vector<uint8_t> origpubkey,uint64_t assetsupply,uint256 utxotxid,int32_t utxovout,std::string name,std::string description)
+std::string CreateAsset(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint64_t assetsupply,std::string name,std::string description)
 {
     CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,assetsupply,txfee,origpubkey,utxotxid,utxovout)) != 0 )
@@ -313,6 +315,78 @@ std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,
     return(0);
 }
 
+std::string CreateBuyOffer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint64_t bidamount,uint64_t required)
+{
+    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    {
+        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+        return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('b',assetid,zeroid,required,origpubkey)));
+    }
+    return(0);
+}
+
+/*
+cancelbuy:
+vin.0: normal input
+vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
+vout.1: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['o']
+
+fillbuy:
+vin.0: normal input
+vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+vout.0: remaining amount of bid to unspendable
+vout.1: vin.1 value to signer of vin.2
+vout.2: vin.2 assetoshis to original pubkey
+vout.3: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+
+selloffer:
+vin.0: normal input
+vin.1: valid CC output for sale
+vout.0: vin.1 assetoshis output to CC to unspendable
+vout.1: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
+
+exchange:
+vin.0: normal input
+vin.1: valid CC output
+vout.0: vin.1 assetoshis output to CC to unspendable
+vout.1: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
+
+cancel:
+vin.0: normal input
+vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
+vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
+vout.1: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+
+fillsell:
+vin.0: normal input
+vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
+vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
+vout.0: remaining assetoshis -> unspendable
+vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
+vout.2: vin.2 value to original pubkey [origpubkey]
+vout.3: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
+
+fillexchange:
+vin.0: normal input
+vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
+vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+vout.0: remaining assetoshis -> unspendable
+vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
+vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
+vout.3: normal output for change (if any)
+vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
+*/
+
 uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
 {
     std::vector<uint8_t> vopret; uint8_t funcid=0,*script;

From d822ecf34a761191c059cb3b50feaaa03393f822 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 03:03:34 -1100
Subject: [PATCH 288/623] Canceled

---
 src/cc/assets.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f2ff83bee..88d553059 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -318,22 +318,34 @@ std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,
 std::string CreateBuyOffer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint64_t bidamount,uint64_t required)
 {
     CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,bidamount,txfee,origpubkey,utxotxid,utxovout)) != 0 )
     {
         mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
         return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('b',assetid,zeroid,required,origpubkey)));
     }
     return(0);
 }
 
+std::string CancelBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t bidamount,utxovalue,txfee=10000;
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
+            return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('o',zeroid,zeroid,required,origpubkey)));
+        }
+    }
+    return(0);
+}
+
+
 /*
-cancelbuy:
-vin.0: normal input
-vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
-vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
-vout.1: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['o']
 
 fillbuy:
 vin.0: normal input

From 1ad82530249fc36bb45d5a25e8d9c39050742c7a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 03:04:19 -1100
Subject: [PATCH 289/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 88d553059..0cb238508 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -338,7 +338,7 @@ std::string CancelBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int3
             mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
-            return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('o',zeroid,zeroid,required,origpubkey)));
+            return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('o',zeroid,zeroid,0,origpubkey)));
         }
     }
     return(0);

From 8412cc00234170650b540acb3311b2b091f561a3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 03:09:24 -1100
Subject: [PATCH 290/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0cb238508..d78b7729a 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -298,7 +298,7 @@ std::string CreateAsset(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t
     return(0);
 }
 
-std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,std::vector<CTxIn> CCinputs,std::vector<CTxOut> CCoutputs)
+std::string CreateAssetTransfer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 assetid,std::vector<CTxIn> CCinputs,std::vector<CTxOut> CCoutputs)
 {
     CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
@@ -315,7 +315,7 @@ std::string CreateAssetTransfer(uint256 assetid,std::vector<uint8_t> origpubkey,
     return(0);
 }
 
-std::string CreateBuyOffer(uint256 assetid,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint64_t bidamount,uint64_t required)
+std::string CreateBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 assetid,uint64_t bidamount,uint64_t required)
 {
     CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,bidamount,txfee,origpubkey,utxotxid,utxovout)) != 0 )

From 85c80327dc010c0bd1b6e593b8075f746d191e6f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 03:37:54 -1100
Subject: [PATCH 291/623] Cancel buy

---
 src/cc/assets.cpp | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d78b7729a..cad5c54ad 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -306,10 +306,10 @@ std::string CreateAssetTransfer(std::vector<uint8_t> origpubkey,uint256 utxotxid
         mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
         n = CCinputs.size();
         for (i=0; i<n; i++)
-            mtx.vin.push_back(CCinputs[i]);
+            mtx.vin.push_back(CCinputs[i]); // CC
         n = CCoutputs.size();
         for (i=0; i<n; i++)
-            mtx.vout.push_back(CCoutputs[i]);
+            mtx.vout.push_back(CCoutputs[i]); // CC
         return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey)));
     }
     return(0);
@@ -344,13 +344,31 @@ std::string CancelBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int3
     return(0);
 }
 
+std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout,uint256 filltxid,int32_t fillvout)
+{
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t bidamount,paid_amount,fill_amount,remaining_required,utxovalue,txfee=10000; std::vector<uint8_t> origpubkey;
+    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,mypubkey,utxotxid,utxovout)) != 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 && GetTransaction(filltxid,filltx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            fill_amount = filltx.vout[fillvout].nValue;
+            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
+            // set paid_amount and remaining_required and origpubkey;
+            mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+            mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
+            mtx.vout.push_back(CTxOut(fill_amount,vintx.vout[bidvout].scriptPubKey));
+            return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+        }
+    }
+    return(0);
+}
 
 /*
 
 fillbuy:
-vin.0: normal input
-vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
-vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
 vout.0: remaining amount of bid to unspendable
 vout.1: vin.1 value to signer of vin.2
 vout.2: vin.2 assetoshis to original pubkey

From 5bbfcde2ebfac248ed0396b1c79a47304a0e62eb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 20 Jul 2018 03:43:18 -1100
Subject: [PATCH 292/623] Test

---
 src/cc/assets.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cad5c54ad..dcc7f2228 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -344,7 +344,7 @@ std::string CancelBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int3
     return(0);
 }
 
-std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout,uint256 filltxid,int32_t fillvout)
+std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout,uint256 assetid,uint256 filltxid,int32_t fillvout)
 {
     CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t bidamount,paid_amount,fill_amount,remaining_required,utxovalue,txfee=10000; std::vector<uint8_t> origpubkey;
     if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,mypubkey,utxotxid,utxovout)) != 0 )
@@ -356,7 +356,7 @@ std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t
             mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
             mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
-            // set paid_amount and remaining_required and origpubkey;
+            // set paid_amount and remaining_required and origpubkey, check filltxid is assetid;
             mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
             mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
             mtx.vout.push_back(CTxOut(fill_amount,vintx.vout[bidvout].scriptPubKey));
@@ -368,13 +368,6 @@ std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t
 
 /*
 
-fillbuy:
-vout.0: remaining amount of bid to unspendable
-vout.1: vin.1 value to signer of vin.2
-vout.2: vin.2 assetoshis to original pubkey
-vout.3: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-
 selloffer:
 vin.0: normal input
 vin.1: valid CC output for sale

From b40d83c9c591c68dc98e7e18505ba74426de01a3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 01:54:49 -1100
Subject: [PATCH 293/623] Rpc and tx create

---
 src/cc/assets.cpp | 703 ++++++++++++++++++++++++++++++++--------------
 src/rpcserver.cpp |   7 +
 src/rpcserver.h   |   5 +
 3 files changed, 508 insertions(+), 207 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index dcc7f2228..efb1da486 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -22,6 +22,9 @@
 #include "../core_io.h"
 #include "../script/sign.h"
 #include "../wallet/wallet.h"
+#include <univalue.h>
+
+extern uint8_t NOTARY_PUBKEY33[33];
 
 // code rpc
 
@@ -158,19 +161,22 @@ signEncodeTx "$transferTx"
 
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 char Unspendablehex[67] = { "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" };
+uint256 Unspendablepriv;
+
+CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
+{
+    static CPubKey nullpk;
+    memset(unspendablepriv,0,32);
+    if ( evalcode == EVAL_ASSETS )
+    {
+        hexstr = Unspendablehex;
+        memset(unspendablepriv,&Unspendablepriv,32);
+    } else return(nullpk);
+    return(pubkey2pk(ParseHex(Unspendablehex));
+}
 
 static uint256 zeroid;
 
-bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
-{
-    CTxDestination address;
-    if ( ExtractDestination(scriptPubKey,address) != 0 )
-    {
-        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        return(true);
-    }
-    return(false);
-}
 
 /*
  vout.n-1: opreturn [EVAL_ASSETS] ['o']
@@ -213,10 +219,59 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
             fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
             opret << OP_RETURN;
             break;
-   }
+    }
     return(opret);
 }
 
+bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
+{
+    CTxDestination address;
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
+    {
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        return(true);
+    }
+    return(false);
+}
+
+std::vector<uint8_t> Mypubkey()
+{
+    std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
+    pubkey33 = NOTARY_PUBKEY33;
+    pubkey.resize(33);
+    dest = pubkey.data;
+    for (i=0; i<33; i++)
+        dest[i] = pubkey33[i];
+    return(pubkey);
+}
+
+void Myprivkey(uint8_t myprivkey[])
+{
+    char coinaddr[64]; string strAddress; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
+    if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
+    {
+        if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
+        {
+            if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
+            {
+                memcpy(myprivkey,vchSecret.begin(),32);
+                fprintf(stderr,"found privkey!\n");
+            }
+        }
+    }
+}
+           
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
+{
+    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
+    n = pubkey.size();
+    dest = (uint8_t *)pk.begin();
+    pubkey33 = (uint8_t *)pubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
+    return(pk);
+}
+
 CC *MakeAssetCond(CPubKey pk)
 {
     std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
@@ -235,132 +290,490 @@ CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
     return(vout);
 }
 
+CC *MakeCC(uint8_t evalcode,CPubKey pk)
+{
+    if ( evalcode == EVAL_ASSETS )
+    {
+        std::vector<CC*> pks;
+        pks.push_back(CCNewSecp256k1(pk));
+        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+        CC *Sig = CCNewThreshold(1, pks);
+        return CCNewThreshold(2, {assetCC, Sig});
+    } else return(0);
+}
+
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
+{
+    CC *payoutCond;
+    if ( evalcode == EVAL_ASSETS )
+    {
+        payoutCond = MakeAssetCond(pk);
+        destaddr[0] = 0;
+        Getscriptaddress(destaddr,CCPubKey(payoutCond));
+        cc_free(payoutCond);
+        return(destaddr[0] != 0);
+    } else return false;
+}
+           
+uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+{
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
+    GetOpReturnData(scriptPubKey, vopret);
+    script = (uint8_t *)vopret.data();
+    memset(&assetid,0,sizeof(assetid));
+    memset(&assetid2,0,sizeof(assetid2));
+    price = 0;
+    if ( script[0] == EVAL_ASSETS )
+    {
+        funcid = script[1];
+        switch ( funcid )
+        {
+            case 'o':
+                return(funcid);
+                break;
+            case 't':  case 'x':
+                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
+                    return(funcid);
+                break;
+            case 's': case 'b': case 'S': case 'B':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                    return(funcid);
+                break;
+            case 'E': case 'e':
+                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                    return(funcid);
+                break;
+            default:
+                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
+                funcid = 0;
+                break;
+        }
+    }
+    return(funcid);
+}
+
+bool SetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
+{
+    uint256 assetid,assetid2;
+    if ( DecodeOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
+        return(true);
+    else return(false);
+}
+           
+bool Getorigaddr(char *destaddr,CTransaction& tx)
+{
+    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
+    n = tx.vout.size();
+    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        return(false);
+    script = CScript() << origpubkey << OP_CHECKSIG;
+    return(Getscriptaddress(destaddr,script));
+}
+       
+CC* GetCryptoCondition(CScript const& scriptSig)
+{
+    auto pc = scriptSig.begin();
+    opcodetype opcode;
+    std::vector<unsigned char> ffbin;
+    if (scriptSig.GetOp(pc, opcode, ffbin))
+        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
+}
+       
+bool IsCCInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if ( (cond= GetCryptoCondition(scriptSig)) == 0 )
+        return false;
+    cc_free(cond);
+    return true;
+}
+       
+bool IsAssetInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+       
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+{
+    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        n = tx.vout.size();
+        if ( v >= n-1 )
+            return(0);
+        nValue = tx.vout[v].nValue;
+        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+            return(0);
+        if ( funcid == 'c' )
+        {
+            if ( refassetid == tx.GetHash() && v == 0 )
+                return(nValue);
+        }
+        else if ( funcid != 'E' )
+        {
+            if ( assetid == refassetid )
+                return(nValue);
+        }
+        else if ( funcid == 'E' )
+        {
+            if ( v < 2 && assetid == refassetid )
+                return(nValue);
+            else if ( v == 2 && assetid2 == refassetid )
+                return(nValue);
+        }
+    }
+    return(0);
+}
+           
 #ifdef ENABLE_WALLET
 extern CWallet* pwalletMain;
 #endif
 
-std::string SignAssetTx(CMutableTransaction &mtx,uint64_t utxovalue,const CScript scriptPubKey)
+std::string SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
 {
 #ifdef ENABLE_WALLET
     CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
     auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,0,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
+    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
     {
-        UpdateTransaction(mtx,0,sigdata);
-        std::string strHex = EncodeHexTx(mtx);
-        if ( strHex.size() > 0 )
-            return(strHex);
+        UpdateTransaction(mtx,vini,sigdata);
+        return(1);
     } else fprintf(stderr,"signing error for CreateAsset\n");
 #else
     return(0);
 #endif
 }
 
-uint64_t StartAssetTx(CPubKey &pk,CScript &scriptPubKey,uint64_t output,uint64_t txfee,std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout)
+std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
-    CTransaction vintx; uint256 hashBlock; uint64_t nValue; int32_t i,n; uint8_t *pubkey33,*dest;
-    n = origpubkey.size();
-    dest = (uint8_t *)pk.begin();
-    pubkey33 = (uint8_t *)origpubkey.data();
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    n = mtx.vout.size();
     for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
-    if ( GetTransaction(utxotxid,vintx,hashBlock,false) != 0 )
     {
-        nValue = vintx.vout[utxovout].nValue;
-        scriptPubKey = vintx.vout[utxovout].scriptPubKey;
-        if ( scriptPubKey.IsPayToCryptoCondition() == 0 && nValue >= output+txfee )
+        if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            totaloutputs += mtx.vout[i].nValue;
+    }
+    if ( (n= mtx.vin.size()) > 64 )
+    {
+        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
+        return(0);
+    }
+    Myprivkey(myprivkey);
+    unspendablepk = GetUnspendable(evalcode,unspendablepriv)
+    GetCCaddress(evalcode,myaddr,mypk);
+    mycond = MakeCC(evalcode,mypk);
+    GetCCaddress(evalcode,unspendable,unspendablepk);
+    othercond = MakeCC(evalcode,unspendablepk);
+    fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    memset(utxovalues,0,sizeof(utxovalues));
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            if ( IsCCInput(mtx.vin[i].scriptSig) == 0 )
+            {
+                vinimask |= (1LL << i);
+                utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
+                totalinputs += utxovalues[i];
+            }
+            else
+            {
+                Getscriptaddress(destaddr,vintx.vout[mtx.vin[i].prevout.n].scriptPubKey);
+                if ( strcmp(destaddr,myaddr) == 0 )
+                {
+                    privkey = myprivkey;
+                    cond = mycond;
+                }
+                else if ( strcmp(destaddr,unspendable) == 0 )
+                {
+                    privkey = Unspendablepriv;
+                    cond = othercond;
+                }
+                else
+                {
+                    fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
+                    continue;
+                }
+                if ( cc_signTreeSecp256k1Msg32(cond,privkey,msg32) != 0 )
+                    mtx.vin[i].scriptSig = CCSig(cond);
+                else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
+            }
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString());
+    }
+    if ( mycond != 0 )
+        cc_free(mycond);
+    if ( othercond != 0 )
+        cc_free(othercond);
+    if ( totalinputs >= totalout+2*txfee )
+    {
+        change = totalinputs - (totalout+txfee);
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+    }
+    mtx.vout.push_back(CTxOut(0,opret));
+    n = mtx.vin.size();
+    for (i=0; i<n; i++)
+    {
+        if ( ((1LL << i) & vinimask) != 0 )
+        {
+            if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+            {
+                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
+                    fprintf(stderr,"signing error for vini.%d of %llx\n",vini,(long long)vinimask);
+            } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString());
+        }
+    }
+    std::string strHex = EncodeHexTx(mtx);
+    if ( strHex.size() > 0 )
+        return(strHex);
+    else return(0);
+}
+
+           
+bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
+{
+    uint64_t price,recvprice;
+    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+    {
+        fprintf(stderr,"ValidateRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
+        return(false);
+    }
+    else if ( remaining_price < (totalprice - received) )
+    {
+        fprintf(stderr,"ValidateRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
+        return(false);
+    }
+    else if ( remaining_nValue < (orig_nValue - paid) )
+    {
+        fprintf(stderr,"ValidateRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
+        return(false);
+    }
+    else if ( remaining_nValue > 0 )
+    {
+        price = (totalprice * COIN) / orig_nValue;
+        recvprice = (received * COIN) / paid;
+        if ( recvprice < price )
+        {
+            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
+            return(false);
+        }
+    }
+    return(true);
+}
+
+bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t received,uint64_t totalprice)
+{
+    uint64_t remaining_nValue,price,mult;
+    remaining_price = (totalprice - received);
+    price = (totalprice * COIN) / orig_nValue;
+    mult = (received * COIN);
+    if ( price > 0 && (paid= mult / price) > 0 )
+    {
+        if ( (mult % price) != 0 )
+            paid--;
+        remaining_nValue = (orig_nValue - paid);
+        return(ValidateRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
+    } else return(false);
+}
+           
+/*uint64_t IsNormalUtxo(uint64_t output,uint64_t txfee,uint256 feetxid,int32_t feevout)
+{
+    CTransaction vintx; uint256 hashBlock; uint64_t nValue;
+    if ( GetTransaction(feetxid,vintx,hashBlock,false) != 0 )
+    {
+        nValue = vintx.vout[feevout].nValue;
+        if ( vintx.vout[feevout].scriptPubKey.IsPayToCryptoCondition() == 0 && nValue >= output+txfee )
             return(nValue);
     }
     return(0);
-}
+}*/
 
-std::string FinalizeAssetTx(CMutableTransaction &mtx,CPubKey pk,uint64_t outvalue,uint64_t txfee,uint64_t utxovalue,CScript scriptPubKey,CScript opret)
+uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
-    std::string hex; uint64_t change;
-    if ( utxovalue >= outvalue+2*txfee )
+    uint64_t totalinputs = 0;
+    //for (i=0; i<n; i++)
+    //   mtx.vin.push_back(CCinputs[i]); // CC
+    return(totalinputs);
+}
+       
+uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
+{
+    int32_t n = 0; uint64_t totalinputs = 0;
+    const CKeyStore& keystore = *pwalletMain;
+    assert(pwalletMain != NULL);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    BOOST_FOREACH(const COutput& out, vecOutputs)
     {
-        change = utxovalue - (outvalue+txfee);
-        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
+        if ( out.fSpendable != 0 )
+        {
+            mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
+            nValue = out.tx->vout[out.i].nValue;
+            totalinputs += nValue;
+            if ( totalinputs >= total || n >= maxinputs )
+                break;
+        }
     }
-    mtx.vout.push_back(CTxOut(0,opret));
-    return(SignAssetTx(mtx,utxovalue,scriptPubKey));
+    if ( totalinputs >= total )
+        return(totalinputs);
+    else return(0);
 }
 
-std::string CreateAsset(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint64_t assetsupply,std::string name,std::string description)
+std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
 {
-    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; uint64_t utxovalue,txfee=10000;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,assetsupply,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( name.size() > 32 || description.size() > 4096 )
     {
-        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,pk));
-        return(FinalizeAssetTx(mtx,pk,assetsupply,txfee,utxovalue,scriptPubKey,EncodeCreateOpRet('c',name,description)));
+        fprintf(stderr,"name.%d or description.%d is too big\n",name.size(),description.size());
+        return(0);
+    }
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(mypubkey);
+    if ( AddNormalinputs(mtx,mypk,assetsupply+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',name,description)));
+    }
+    return(0);
+}
+    
+UniValue tokencreate(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
+    if ( fHelp || params.size() > 3 || params.size() < 2 )
+        throw runtime_error("tokencreate name supply description\n")
+    name = params[0].get_str();
+    supply = atof(params[1].get_str()) * COIN;
+    if ( params.size() == 3 )
+        description = params[2].get_str();
+    hex = CreateAsset(Mypubkey(),0,supply,name,description);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "could create transaction"));
+}
+    
+UniValue tokentransfer(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+           
+UniValue tokenbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+           
+UniValue tokencancelbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+           
+UniValue tokenfillbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+           
+std::string CreateAssetTransfer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts)
+{
+    CMutableTransaction mtx; CPubKey mypk; int32_t i,n; uint64_t CCchange=0,inputs=0,total=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(mypubkey);
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        n = outputs.size();
+        if ( n == amounts.size() )
+        {
+            for (i=0; i<n; i++)
+                total += amounts[i];
+            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total)) > 0 )
+            {
+                if ( inputs > total )
+                    CCchange = (inputs - total);
+                for (i=0; i<n; i++)
+                    mtx.vout.push_back(MakeAssetsVout(amounts[i],outputs[i]));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,mypubkey)));
+            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
+        } else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,amounts.size());
     }
     return(0);
 }
 
-std::string CreateAssetTransfer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 assetid,std::vector<CTxIn> CCinputs,std::vector<CTxOut> CCoutputs)
+std::string CreateBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
 {
-    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(mypubkey);
+    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
-        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-        n = CCinputs.size();
-        for (i=0; i<n; i++)
-            mtx.vin.push_back(CCinputs[i]); // CC
-        n = CCoutputs.size();
-        for (i=0; i<n; i++)
-            mtx.vout.push_back(CCoutputs[i]); // CC
-        return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('t',assetid,zeroid,0,origpubkey)));
-    }
-    return(0);
-}
-
-std::string CreateBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 assetid,uint64_t bidamount,uint64_t required)
-{
-    CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t utxovalue,txfee=10000;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,bidamount,txfee,origpubkey,utxotxid,utxovout)) != 0 )
-    {
-        mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
         mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
-        return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('b',assetid,zeroid,required,origpubkey)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,mypubkey)));
     }
     return(0);
 }
 
-std::string CancelBuyOffer(std::vector<uint8_t> origpubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout)
+std::string CancelBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 bidtxid)
 {
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t bidamount,utxovalue,txfee=10000;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,origpubkey,utxotxid,utxovout)) != 0 )
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(mypubkey);
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
         {
-            bidamount = vintx.vout[bidvout].nValue;
-            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
-            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
-            return(FinalizeAssetTx(mtx,pk,bidamount,txfee,utxovalue,scriptPubKey,EncodeOpRet('o',zeroid,zeroid,0,origpubkey)));
+            bidamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,mypubkey)));
         }
     }
     return(0);
 }
 
-std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint256 utxotxid,int32_t utxovout,uint256 bidtxid,int32_t bidvout,uint256 assetid,uint256 filltxid,int32_t fillvout)
+std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout)
 {
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey pk; CScript scriptPubKey; int32_t i,n; uint64_t bidamount,paid_amount,fill_amount,remaining_required,utxovalue,txfee=10000; std::vector<uint8_t> origpubkey;
-    if ( (utxovalue= StartAssetTx(pk,scriptPubKey,0,txfee,mypubkey,utxotxid,utxovout)) != 0 )
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey,tmppubkey; int32_t bidvout=0; uint64_t tmpprice,origprice,bidamount,paid_amount,fill_amount,remaining_required;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(mypubkey);
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 && GetTransaction(filltxid,filltx,hashBlock,false) != 0 )
         {
             bidamount = vintx.vout[bidvout].nValue;
+            SetOrigpubkey(origpubkey,origprice,vintx);
             fill_amount = filltx.vout[fillvout].nValue;
-            mtx.vin.push_back(CTxIn(utxotxid,utxovout,CScript()));
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
-            // set paid_amount and remaining_required and origpubkey, check filltxid is assetid;
-            mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
-            mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG));
-            mtx.vout.push_back(CTxOut(fill_amount,vintx.vout[bidvout].scriptPubKey));
-            return(FinalizeAssetTx(mtx,pk,0,txfee,utxovalue,scriptPubKey,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            if ( IsAssetvout(tmpprice,tmppubkey,filltx,fillvout,assetid) == fill_amount )
+            {
+                mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
+                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(fill_amount,pubkey2pk(origpubkey)));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx wasnt for assetid\n");
         }
     }
     return(0);
@@ -410,111 +823,6 @@ vout.3: normal output for change (if any)
 vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
-uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
-{
-    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
-    GetOpReturnData(scriptPubKey, vopret);
-    script = (uint8_t *)vopret.data();
-    memset(&assetid,0,sizeof(assetid));
-    memset(&assetid2,0,sizeof(assetid2));
-    price = 0;
-    if ( script[0] == EVAL_ASSETS )
-    {
-        funcid = script[1];
-        switch ( funcid )
-        {
-            case 'o':
-                return(funcid);
-                break;
-            case 't':  case 'x':
-                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
-                    return(funcid);
-                break;
-            case 's': case 'b': case 'S': case 'B':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
-                    return(funcid);
-                break;
-            case 'E': case 'e':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
-                    return(funcid);
-                break;
-            default:
-                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
-                funcid = 0;
-                break;
-        }
-    }
-    return(funcid);
-}
-
-bool Getorigaddr(char *destaddr,CTransaction& tx)
-{
-    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
-    n = tx.vout.size();
-    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        return(false);
-    script = CScript() << origpubkey << OP_CHECKSIG;
-    return(Getscriptaddress(destaddr,script));
-}
-
-CC* GetCryptoCondition(CScript const& scriptSig)
-{
-    auto pc = scriptSig.begin();
-    opcodetype opcode;
-    std::vector<unsigned char> ffbin;
-    if (scriptSig.GetOp(pc, opcode, ffbin))
-        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
-}
-
-bool IsAssetInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
-{
-    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
-    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
-    {
-        n = tx.vout.size();
-        if ( v >= n-1 )
-            return(0);
-        nValue = tx.vout[v].nValue;
-        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-            return(0);
-        if ( funcid == 'c' )
-        {
-            if ( refassetid == tx.GetHash() && v == 0 )
-                return(nValue);
-        }
-        else if ( funcid != 'E' )
-        {
-            if ( assetid == refassetid )
-                return(nValue);
-        }
-        else if ( funcid == 'E' )
-        {
-            if ( v < 2 && assetid == refassetid )
-                return(nValue);
-            else if ( v == 2 && assetid2 == refassetid )
-                return(nValue);
-        }
-    }
-    return(0);
-}
-
 uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
@@ -554,32 +862,13 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
-{
-    uint64_t price,recvprice;
-    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
-        return(false);
-    else if ( remaining_price < (totalprice - received) )
-        return(false);
-    else if ( remaining_nValue < (orig_nValue - paid) )
-        return(false);
-    else if ( remaining_nValue > 0 )
-    {
-        price = (totalprice * COIN) / orig_nValue;
-        recvprice = (received * COIN) / paid;
-        if ( recvprice < price )
-            return(false);
-    }
-    return(true);
-}
-
 bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
     numvins = tx.vin.size();
     outputs = inputs = 0;
-    if ( IsAssetInput(tx.vin[0].scriptSig) != 0 )
+    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
         return eval->Invalid("illegal assetid");
@@ -629,7 +918,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("illegal null amount for buyoffer");
             for (i=1; i<numvins; i++)
             {
-                if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
+                if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
                     return eval->Invalid("invalid CC vin for buyoffer");
             }
             for (i=0; i<numvouts-1; i++)
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index f37124d0c..48c6f2386 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -345,6 +345,13 @@ static const CRPCCommand vRPCCommands[] =
     { "rawtransactions",    "fundrawtransaction",     &fundrawtransaction,     false },
 #endif
 
+/* tokens */
+    { "tokens",       "tokencreate",      &tokencreate,      true  },
+    { "tokens",       "tokentransfer",    &tokentransfer,        true },
+    { "tokens",       "tokenbid",         &tokenbid,       true },
+    { "tokens",       "tokencancelbid",   &tokencancelbid,        true },
+    { "tokens",       "tokenfillbid",     &tokenfillbid,      true },
+
 /* Address index */
     { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
     { "addressindex",       "getaddressutxos",        &getaddressutxos,        false },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 586d79a88..1bf5298c4 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -208,6 +208,11 @@ extern UniValue submitblock(const UniValue& params, bool fHelp);
 extern UniValue estimatefee(const UniValue& params, bool fHelp);
 extern UniValue estimatepriority(const UniValue& params, bool fHelp);
 extern UniValue coinsupply(const UniValue& params, bool fHelp);
+extern UniValue tokencreate(const UniValue& params, bool fHelp);
+extern UniValue tokentransfer(const UniValue& params, bool fHelp);
+extern UniValue tokenbid(const UniValue& params, bool fHelp);
+extern UniValue tokencancelbid(const UniValue& params, bool fHelp);
+extern UniValue tokenfillbid(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From 6b44e4323ef0d4148efc5a508d5d713540e7d080 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 01:58:15 -1100
Subject: [PATCH 294/623] Fix

---
 src/cc/assets.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index efb1da486..dc2c781b5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -169,7 +169,6 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     memset(unspendablepriv,0,32);
     if ( evalcode == EVAL_ASSETS )
     {
-        hexstr = Unspendablehex;
         memset(unspendablepriv,&Unspendablepriv,32);
     } else return(nullpk);
     return(pubkey2pk(ParseHex(Unspendablehex));
@@ -239,7 +238,7 @@ std::vector<uint8_t> Mypubkey()
     std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
     pubkey33 = NOTARY_PUBKEY33;
     pubkey.resize(33);
-    dest = pubkey.data;
+    dest = pubkey.data();
     for (i=0; i<33; i++)
         dest[i] = pubkey33[i];
     return(pubkey);
@@ -247,9 +246,15 @@ std::vector<uint8_t> Mypubkey()
 
 void Myprivkey(uint8_t myprivkey[])
 {
-    char coinaddr[64]; string strAddress; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
+    char coinaddr[64]; string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
     if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
     {
+        n = (int32_t)strlen(coinaddr);
+        strAddress.resize(n+1);
+        dest = strAddress.data();
+        for (i=0; i<n; i++)
+            dest[i] = coinaddr[i];
+        dest[i] = 0;
         if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
         {
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )

From cdba87bad89d2dd268928b679427c790f99f30f5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 01:59:44 -1100
Subject: [PATCH 295/623] Test

---
 src/cc/assets.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index dc2c781b5..3edbe1feb 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -163,13 +163,24 @@ const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 char Unspendablehex[67] = { "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" };
 uint256 Unspendablepriv;
 
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
+{
+    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
+    n = pubkey.size();
+    dest = (uint8_t *)pk.begin();
+    pubkey33 = (uint8_t *)pubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
+    return(pk);
+}
+
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
     static CPubKey nullpk;
     memset(unspendablepriv,0,32);
     if ( evalcode == EVAL_ASSETS )
     {
-        memset(unspendablepriv,&Unspendablepriv,32);
+        memcpy(unspendablepriv,&Unspendablepriv,32);
     } else return(nullpk);
     return(pubkey2pk(ParseHex(Unspendablehex));
 }
@@ -265,17 +276,6 @@ void Myprivkey(uint8_t myprivkey[])
         }
     }
 }
-           
-CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
-{
-    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
-    n = pubkey.size();
-    dest = (uint8_t *)pk.begin();
-    pubkey33 = (uint8_t *)pubkey.data();
-    for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
-    return(pk);
-}
 
 CC *MakeAssetCond(CPubKey pk)
 {

From 42206c800d092327c2ee5bf59cea4b359d57dfdc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:03:24 -1100
Subject: [PATCH 296/623] Test

---
 src/cc/assets.cpp | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3edbe1feb..8ceaf91dc 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -159,6 +159,11 @@ signEncodeTx "$createTx"
 signEncodeTx "$transferTx"
 */
 
+#ifdef ENABLE_WALLET
+extern CWallet* pwalletMain;
+#endif
+
+static uint256 zeroid;
 const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
 char Unspendablehex[67] = { "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" };
 uint256 Unspendablepriv;
@@ -182,25 +187,9 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     {
         memcpy(unspendablepriv,&Unspendablepriv,32);
     } else return(nullpk);
-    return(pubkey2pk(ParseHex(Unspendablehex));
+    return(pubkey2pk(ParseHex(Unspendablehex)));
 }
 
-static uint256 zeroid;
-
-
-/*
- vout.n-1: opreturn [EVAL_ASSETS] ['o']
- vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
- vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
- vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
- vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
- vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
- vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
- vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
- vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
- vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
-*/
-
 CScript EncodeCreateOpRet(uint8_t funcid,std::string name,std::string description)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
@@ -257,7 +246,7 @@ std::vector<uint8_t> Mypubkey()
 
 void Myprivkey(uint8_t myprivkey[])
 {
-    char coinaddr[64]; string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
+    char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
     if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
     {
         n = (int32_t)strlen(coinaddr);
@@ -268,11 +257,13 @@ void Myprivkey(uint8_t myprivkey[])
         dest[i] = 0;
         if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
         {
+#ifdef ENABLE_WALLET
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
                 fprintf(stderr,"found privkey!\n");
             }
+#endif
         }
     }
 }
@@ -441,12 +432,8 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
     }
     return(0);
 }
-           
-#ifdef ENABLE_WALLET
-extern CWallet* pwalletMain;
-#endif
 
-std::string SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
+bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
 {
 #ifdef ENABLE_WALLET
     CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
@@ -454,10 +441,10 @@ std::string SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,cons
     if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
     {
         UpdateTransaction(mtx,vini,sigdata);
-        return(1);
+        return(true);
     } else fprintf(stderr,"signing error for CreateAsset\n");
 #else
-    return(0);
+    return(false);
 #endif
 }
 

From 1c105377e150cda0b1c86268c73e9d729827e9c5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:08:43 -1100
Subject: [PATCH 297/623] Fix

---
 src/cc/assets.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8ceaf91dc..e1bc70a24 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -251,7 +251,7 @@ void Myprivkey(uint8_t myprivkey[])
     {
         n = (int32_t)strlen(coinaddr);
         strAddress.resize(n+1);
-        dest = strAddress.data();
+        dest = (char *)strAddress.data();
         for (i=0; i<n; i++)
             dest[i] = coinaddr[i];
         dest[i] = 0;
@@ -450,7 +450,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
 
 std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
-    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
     n = mtx.vout.size();
     for (i=0; i<n; i++)
     {
@@ -463,7 +463,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
         return(0);
     }
     Myprivkey(myprivkey);
-    unspendablepk = GetUnspendable(evalcode,unspendablepriv)
+    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
     GetCCaddress(evalcode,myaddr,mypk);
     mycond = MakeCC(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
@@ -490,7 +490,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 }
                 else if ( strcmp(destaddr,unspendable) == 0 )
                 {
-                    privkey = Unspendablepriv;
+                    privkey = unspendablepriv;
                     cond = othercond;
                 }
                 else
@@ -502,13 +502,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                     mtx.vin[i].scriptSig = CCSig(cond);
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }
-        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString());
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
     if ( mycond != 0 )
         cc_free(mycond);
     if ( othercond != 0 )
         cc_free(othercond);
-    if ( totalinputs >= totalout+2*txfee )
+    if ( totalinputs >= totaloutputs+2*txfee )
     {
         change = totalinputs - (totalout+txfee);
         mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
@@ -521,9 +521,10 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
         {
             if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
             {
+                utxovout = mtx.vin[i].prevout.n;
                 if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
-                    fprintf(stderr,"signing error for vini.%d of %llx\n",vini,(long long)vinimask);
-            } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString());
+                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
+            } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
         }
     }
     std::string strHex = EncodeHexTx(mtx);
@@ -601,7 +602,8 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint6
        
 uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
 {
-    int32_t n = 0; uint64_t totalinputs = 0;
+    int32_t n = 0; uint64_t nValue,totalinputs = 0; vector<COutput> vecOutputs;
+#ifdef ENABLE_WALLET
     const CKeyStore& keystore = *pwalletMain;
     assert(pwalletMain != NULL);
     LOCK2(cs_main, pwalletMain->cs_wallet);
@@ -619,7 +621,8 @@ uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,in
     }
     if ( totalinputs >= total )
         return(totalinputs);
-    else return(0);
+#endif
+    return(0);
 }
 
 std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)

From a10d4cb6499f79d8dc2f3fd90c11192b8489814e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:13:14 -1100
Subject: [PATCH 298/623] Fix

---
 src/cc/assets.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e1bc70a24..8a6adf63f 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -23,6 +23,7 @@
 #include "../script/sign.h"
 #include "../wallet/wallet.h"
 #include <univalue.h>
+#include <exception>
 
 extern uint8_t NOTARY_PUBKEY33[33];
 
@@ -510,7 +511,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
         cc_free(othercond);
     if ( totalinputs >= totaloutputs+2*txfee )
     {
-        change = totalinputs - (totalout+txfee);
+        change = totalinputs - (totaloutputs+txfee);
         mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
     }
     mtx.vout.push_back(CTxOut(0,opret));
@@ -602,7 +603,7 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint6
        
 uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
 {
-    int32_t n = 0; uint64_t nValue,totalinputs = 0; vector<COutput> vecOutputs;
+    int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
 #ifdef ENABLE_WALLET
     const CKeyStore& keystore = *pwalletMain;
     assert(pwalletMain != NULL);
@@ -630,7 +631,7 @@ std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t as
     CMutableTransaction mtx; CPubKey mypk;
     if ( name.size() > 32 || description.size() > 4096 )
     {
-        fprintf(stderr,"name.%d or description.%d is too big\n",name.size(),description.size());
+        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
         return(0);
     }
     if ( txfee == 0 )
@@ -650,7 +651,7 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
     if ( fHelp || params.size() > 3 || params.size() < 2 )
         throw runtime_error("tokencreate name supply description\n")
     name = params[0].get_str();
-    supply = atof(params[1].get_str()) * COIN;
+    supply = atof(params[1].get_str().c_str()) * COIN;
     if ( params.size() == 3 )
         description = params[2].get_str();
     hex = CreateAsset(Mypubkey(),0,supply,name,description);
@@ -708,7 +709,7 @@ std::string CreateAssetTransfer(std::vector<uint8_t> mypubkey,uint64_t txfee,uin
                     mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,mypubkey)));
             } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        } else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,amounts.size());
+        } else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
     }
     return(0);
 }
@@ -748,7 +749,7 @@ std::string CancelBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256
 
 std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout)
 {
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey,tmppubkey; int32_t bidvout=0; uint64_t tmpprice,origprice,bidamount,paid_amount,fill_amount,remaining_required;
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey,tmppubkey; int32_t bidvout=0; uint64_t tmpprice,origprice,bidamount,paid_amount,fillamount,remaining_required;
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(mypubkey);
@@ -758,7 +759,7 @@ std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 as
         {
             bidamount = vintx.vout[bidvout].nValue;
             SetOrigpubkey(origpubkey,origprice,vintx);
-            fill_amount = filltx.vout[fillvout].nValue;
+            fillamount = filltx.vout[fillvout].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
             if ( IsAssetvout(tmpprice,tmppubkey,filltx,fillvout,assetid) == fill_amount )
             {
@@ -766,7 +767,7 @@ std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 as
                 SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
                 mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fill_amount,pubkey2pk(origpubkey)));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
         }

From 1a02fde9367c13bff7503770a31d676ce112d843 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:15:26 -1100
Subject: [PATCH 299/623] Test

---
 src/cc/assets.cpp        | 45 ++--------------------------------------
 src/wallet/rpcwallet.cpp | 43 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8a6adf63f..7a63a110d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -644,48 +644,7 @@ std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t as
     }
     return(0);
 }
-    
-UniValue tokencreate(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
-    if ( fHelp || params.size() > 3 || params.size() < 2 )
-        throw runtime_error("tokencreate name supply description\n")
-    name = params[0].get_str();
-    supply = atof(params[1].get_str().c_str()) * COIN;
-    if ( params.size() == 3 )
-        description = params[2].get_str();
-    hex = CreateAsset(Mypubkey(),0,supply,name,description);
-    if ( hex.size() > 0 )
-    {
-        result.push_back(Pair("result", "success"));
-        result.push_back(Pair("hex", hex));
-    } else result.push_back(Pair("error", "could create transaction"));
-}
-    
-UniValue tokentransfer(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ);
-    return(result);
-}
-           
-UniValue tokenbid(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ);
-    return(result);
-}
-           
-UniValue tokencancelbid(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ);
-    return(result);
-}
-           
-UniValue tokenfillbid(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ);
-    return(result);
-}
-           
+               
 std::string CreateAssetTransfer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts)
 {
     CMutableTransaction mtx; CPubKey mypk; int32_t i,n; uint64_t CCchange=0,inputs=0,total=0;
@@ -761,7 +720,7 @@ std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 as
             SetOrigpubkey(origpubkey,origprice,vintx);
             fillamount = filltx.vout[fillvout].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( IsAssetvout(tmpprice,tmppubkey,filltx,fillvout,assetid) == fill_amount )
+            if ( IsAssetvout(tmpprice,tmppubkey,filltx,fillvout,assetid) == fillamount )
             {
                 mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
                 SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4782842b0..34226e641 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,6 +4830,49 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
+std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
+
+UniValue tokencreate(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
+    if ( fHelp || params.size() > 3 || params.size() < 2 )
+        throw runtime_error("tokencreate name supply description\n")
+        name = params[0].get_str();
+    supply = atof(params[1].get_str().c_str()) * COIN;
+    if ( params.size() == 3 )
+        description = params[2].get_str();
+    hex = CreateAsset(Mypubkey(),0,supply,name,description);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "could create transaction"));
+}
+
+UniValue tokentransfer(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+
+UniValue tokenbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+
+UniValue tokencancelbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+
+UniValue tokenfillbid(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ);
+    return(result);
+}
+
 UniValue getbalance64(const UniValue& params, bool fHelp)
 {
     set<CBitcoinAddress> setAddress; vector<COutput> vecOutputs;

From 9a579b3083591f24900d86cf0f2149e1c4978cfd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:19:53 -1100
Subject: [PATCH 300/623] Test

---
 src/wallet/rpcwallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 34226e641..bb628362d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,12 +4831,13 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
+std::vector<uint8_t> Mypubkey();
 
 UniValue tokencreate(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
     if ( fHelp || params.size() > 3 || params.size() < 2 )
-        throw runtime_error("tokencreate name supply description\n")
+        throw runtime_error("tokencreate name supply description\n");
         name = params[0].get_str();
     supply = atof(params[1].get_str().c_str()) * COIN;
     if ( params.size() == 3 )

From b06e1a9383e9ef55c3eab04024adccac117f7841 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:36:04 -1100
Subject: [PATCH 301/623] Test

---
 src/cc/assets.cpp | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 7a63a110d..d902ba80c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -225,12 +225,17 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
 
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
-    CTxDestination address;
-    if ( ExtractDestination(scriptPubKey,address) != 0 )
+    CTxDestination address; txnouttype whichType;
+    if ( IsStandard(scriptPubKey,whichType) != 0 )
     {
-        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        return(true);
+        if ( ExtractDestination(scriptPubKey,address) != 0 )
+        {
+            strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+            return(true);
+        }
+        fprintf(stderr,"ExtractDestination failed\n");
     }
+    fprintf(stderr,"Getscriptaddress nonstandard\n");
     return(false);
 }
 
@@ -262,7 +267,9 @@ void Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                fprintf(stderr,"found privkey!\n");
+                for (i=0; i<32; i++)
+                    fprintf(stderr,"%02x",myprivkey[i]);
+                fprintf(stderr," found privkey!\n");
             }
 #endif
         }
@@ -302,14 +309,18 @@ CC *MakeCC(uint8_t evalcode,CPubKey pk)
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
 {
     CC *payoutCond;
+    destaddr[0] = 0;
     if ( evalcode == EVAL_ASSETS )
     {
-        payoutCond = MakeAssetCond(pk);
-        destaddr[0] = 0;
-        Getscriptaddress(destaddr,CCPubKey(payoutCond));
-        cc_free(payoutCond);
+        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
+        {
+            Getscriptaddress(destaddr,CCPubKey(payoutCond));
+            cc_free(payoutCond);
+        }
         return(destaddr[0] != 0);
-    } else return false;
+    }
+    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
+    return false;
 }
            
 uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
@@ -505,10 +516,12 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             }
         } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
+    fprintf(stderr,"do cc_frees\n");
     if ( mycond != 0 )
         cc_free(mycond);
     if ( othercond != 0 )
         cc_free(othercond);
+    fprintf(stderr,"did cc_frees\n");
     if ( totalinputs >= totaloutputs+2*txfee )
     {
         change = totalinputs - (totaloutputs+txfee);

From 246ea3c3caf012ffc44a040898f5df9f6ea86005 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:45:05 -1100
Subject: [PATCH 302/623] Test

---
 src/cc/assets.cpp        | 4 ++++
 src/wallet/rpcwallet.cpp | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d902ba80c..f7c66a7a8 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -226,6 +226,10 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
     CTxDestination address; txnouttype whichType;
+    int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
+    for (i=0; i<scriptPubKey.size(); i++)
+        fprintf(stderr,"%02x",ptr[i]);
+    fprintf(stderr," scriptPubKey\n");
     if ( IsStandard(scriptPubKey,whichType) != 0 )
     {
         if ( ExtractDestination(scriptPubKey,address) != 0 )
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index bb628362d..93ccfa19a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4838,7 +4838,7 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
     if ( fHelp || params.size() > 3 || params.size() < 2 )
         throw runtime_error("tokencreate name supply description\n");
-        name = params[0].get_str();
+    name = params[0].get_str();
     supply = atof(params[1].get_str().c_str()) * COIN;
     if ( params.size() == 3 )
         description = params[2].get_str();
@@ -4848,6 +4848,7 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));
     } else result.push_back(Pair("error", "could create transaction"));
+    return(result);
 }
 
 UniValue tokentransfer(const UniValue& params, bool fHelp)

From f6753cc656a0fdfe7cc98fa0209c4ae94d5e7047 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:53:24 -1100
Subject: [PATCH 303/623] Add CC type to extract destination

---
 src/cc/assets.cpp       | 3 +--
 src/script/standard.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f7c66a7a8..1f52d9e24 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -238,8 +238,7 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
             return(true);
         }
         fprintf(stderr,"ExtractDestination failed\n");
-    }
-    fprintf(stderr,"Getscriptaddress nonstandard\n");
+    } else fprintf(stderr,"Getscriptaddress nonstandard\n");
     return(false);
 }
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bdba59eca..e2b4e13dd 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -251,6 +251,12 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }
+    
+    else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
+    {
+        addressRet = CScriptID(uint160(vSolutions[0]));
+        return true;
+    }
     // Multisig txns have more than one address...
     return false;
 }

From 4b80614b5e29ada7e95b9b5ae73d8e54f0084571 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:56:09 -1100
Subject: [PATCH 304/623] Test

---
 src/cc/assets.cpp       | 14 ++++++--------
 src/script/standard.cpp |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 1f52d9e24..99fef6b16 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -230,15 +230,13 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     for (i=0; i<scriptPubKey.size(); i++)
         fprintf(stderr,"%02x",ptr[i]);
     fprintf(stderr," scriptPubKey\n");
-    if ( IsStandard(scriptPubKey,whichType) != 0 )
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
     {
-        if ( ExtractDestination(scriptPubKey,address) != 0 )
-        {
-            strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-            return(true);
-        }
-        fprintf(stderr,"ExtractDestination failed\n");
-    } else fprintf(stderr,"Getscriptaddress nonstandard\n");
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        fprintf("destaddr.(%s)\n",destaddr);
+        return(true);
+    }
+    fprintf(stderr,"ExtractDestination failed\n");
     return(false);
 }
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index e2b4e13dd..69477c558 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -254,6 +254,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     
     else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
+        fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }

From 52a31076dfd55206d78111926156af3ebe58be63 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:57:06 -1100
Subject: [PATCH 305/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 99fef6b16..07d2bb027 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -233,7 +233,7 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     if ( ExtractDestination(scriptPubKey,address) != 0 )
     {
         strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        fprintf("destaddr.(%s)\n",destaddr);
+        fprintf(stderr,"destaddr.(%s)\n",destaddr);
         return(true);
     }
     fprintf(stderr,"ExtractDestination failed\n");

From e0509cb521f15a33b10848d3ff2cc8de54457dec Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:04:17 -1100
Subject: [PATCH 306/623] Return valid vSolution

---
 src/script/standard.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 69477c558..a67e3c6c1 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -74,6 +74,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         if (scriptPubKey.IsPayToCryptoCondition()) {
             if (scriptPubKey.MayAcceptCryptoCondition()) {
                 typeRet = TX_CRYPTOCONDITION;
+                vector<unsigned char> hashBytes(scriptPubKey.begin(), scriptPubKey.end());
+                vSolutionsRet.push_back(hashBytes);
                 return true;
             }
             return false;

From 8506f4cc0f9df285ad250e600fbc178cd70ab0ff Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:06:49 -1100
Subject: [PATCH 307/623] Return hash160

---
 src/script/standard.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index a67e3c6c1..4b51f4f16 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -74,8 +74,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         if (scriptPubKey.IsPayToCryptoCondition()) {
             if (scriptPubKey.MayAcceptCryptoCondition()) {
                 typeRet = TX_CRYPTOCONDITION;
-                vector<unsigned char> hashBytes(scriptPubKey.begin(), scriptPubKey.end());
-                vSolutionsRet.push_back(hashBytes);
+                vSolutionsRet.push_back(Hash160(scriptPubKey));
                 return true;
             }
             return false;

From de4e4047c68dd2055a48ef319c7ab291db54f73c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:08:28 -1100
Subject: [PATCH 308/623] Test

---
 src/script/standard.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 4b51f4f16..17830539d 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -74,7 +74,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         if (scriptPubKey.IsPayToCryptoCondition()) {
             if (scriptPubKey.MayAcceptCryptoCondition()) {
                 typeRet = TX_CRYPTOCONDITION;
-                vSolutionsRet.push_back(Hash160(scriptPubKey));
+                vector<unsigned char> hashBytes = Hash160(scriptPubKey);
+                vSolutionsRet.push_back(hashBytes);
                 return true;
             }
             return false;

From 9d92fc6df88c66bb583e8719c526ce48537bd023 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:11:11 -1100
Subject: [PATCH 309/623] Horrible

---
 src/script/standard.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 17830539d..dcce3d7c2 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -74,7 +74,13 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         if (scriptPubKey.IsPayToCryptoCondition()) {
             if (scriptPubKey.MayAcceptCryptoCondition()) {
                 typeRet = TX_CRYPTOCONDITION;
-                vector<unsigned char> hashBytes = Hash160(scriptPubKey);
+                vector<unsigned char> hashBytes; uint160 x; uint8_t hash20[20],*ptr;;
+                x = Hash160(scriptPubKey);
+                memcp(hash20,&x,20);
+                ptr = hashBytes.data();
+                hashBytes.resize(20);
+                for (i=0; i<20; i++)
+                    ptr[i] = hash20[i];
                 vSolutionsRet.push_back(hashBytes);
                 return true;
             }

From 296f5ed8ff22854eb89bd07c0ac5d4e137bf445a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:12:33 -1100
Subject: [PATCH 310/623] Fix

---
 src/script/standard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index dcce3d7c2..dbbf04c93 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -74,9 +74,9 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
         if (scriptPubKey.IsPayToCryptoCondition()) {
             if (scriptPubKey.MayAcceptCryptoCondition()) {
                 typeRet = TX_CRYPTOCONDITION;
-                vector<unsigned char> hashBytes; uint160 x; uint8_t hash20[20],*ptr;;
+                vector<unsigned char> hashBytes; uint160 x; int32_t i; uint8_t hash20[20],*ptr;;
                 x = Hash160(scriptPubKey);
-                memcp(hash20,&x,20);
+                memcpp(hash20,&x,20);
                 ptr = hashBytes.data();
                 hashBytes.resize(20);
                 for (i=0; i<20; i++)

From b7168865a9ff1a6968f7721bf769877e3ebc8fd4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:13:16 -1100
Subject: [PATCH 311/623] Y

---
 src/script/standard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index dbbf04c93..9ed6e94ba 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -76,7 +76,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
                 typeRet = TX_CRYPTOCONDITION;
                 vector<unsigned char> hashBytes; uint160 x; int32_t i; uint8_t hash20[20],*ptr;;
                 x = Hash160(scriptPubKey);
-                memcpp(hash20,&x,20);
+                memcpy(hash20,&x,20);
                 ptr = hashBytes.data();
                 hashBytes.resize(20);
                 for (i=0; i<20; i++)

From ade9a60482d0a4cf6196b748e4e0f3c67d8627df Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:15:04 -1100
Subject: [PATCH 312/623] Order

---
 src/script/standard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 9ed6e94ba..97e34f911 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -77,8 +77,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
                 vector<unsigned char> hashBytes; uint160 x; int32_t i; uint8_t hash20[20],*ptr;;
                 x = Hash160(scriptPubKey);
                 memcpy(hash20,&x,20);
-                ptr = hashBytes.data();
                 hashBytes.resize(20);
+                ptr = hashBytes.data();
                 for (i=0; i<20; i++)
                     ptr[i] = hash20[i];
                 vSolutionsRet.push_back(hashBytes);

From 3c5300241e97827ca54463fc7a45e79e161ae463 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:28:33 -1100
Subject: [PATCH 313/623] Add private

---
 src/cc/assets.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 07d2bb027..b69e47e28 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -165,9 +165,9 @@ extern CWallet* pwalletMain;
 #endif
 
 static uint256 zeroid;
-const char *Unspendableaddr = "RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp";
-char Unspendablehex[67] = { "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" };
-uint256 Unspendablepriv;
+const char *Unspendableaddr = "RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+char Unspendablehex[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+uint8_t Unspendablepriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
 {
@@ -186,7 +186,7 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     memset(unspendablepriv,0,32);
     if ( evalcode == EVAL_ASSETS )
     {
-        memcpy(unspendablepriv,&Unspendablepriv,32);
+        memcpy(unspendablepriv,Unspendablepriv,32);
     } else return(nullpk);
     return(pubkey2pk(ParseHex(Unspendablehex)));
 }
@@ -226,14 +226,14 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
     CTxDestination address; txnouttype whichType;
-    int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
-    for (i=0; i<scriptPubKey.size(); i++)
-        fprintf(stderr,"%02x",ptr[i]);
-    fprintf(stderr," scriptPubKey\n");
+    //int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
+    //for (i=0; i<scriptPubKey.size(); i++)
+    //    fprintf(stderr,"%02x",ptr[i]);
+    //fprintf(stderr," scriptPubKey\n");
     if ( ExtractDestination(scriptPubKey,address) != 0 )
     {
         strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        fprintf(stderr,"destaddr.(%s)\n",destaddr);
+        //fprintf(stderr,"destaddr.(%s)\n",destaddr);
         return(true);
     }
     fprintf(stderr,"ExtractDestination failed\n");

From 58875d250624a57a26941b03de66c771dec0f222 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:32:13 -1100
Subject: [PATCH 314/623] Return out

---
 src/cc/assets.cpp       | 7 +++----
 src/script/standard.cpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index b69e47e28..f19728d62 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -288,9 +288,10 @@ CC *MakeAssetCond(CPubKey pk)
 
 CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
 {
-    CTxOut vout;
+    CTxOut vout; CScript scriptPubKey;
     CC *payoutCond = MakeAssetCond(pk);
-    CTxOut(nValue,CCPubKey(payoutCond));
+    scriptPubKey = CCPubKey(payoutCond);
+    vout = CTxOut(nValue,scriptPubkey);
     cc_free(payoutCond);
     return(vout);
 }
@@ -517,12 +518,10 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             }
         } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
-    fprintf(stderr,"do cc_frees\n");
     if ( mycond != 0 )
         cc_free(mycond);
     if ( othercond != 0 )
         cc_free(othercond);
-    fprintf(stderr,"did cc_frees\n");
     if ( totalinputs >= totaloutputs+2*txfee )
     {
         change = totalinputs - (totaloutputs+txfee);
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 97e34f911..0c463ab3d 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -262,7 +262,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     
     else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
-        fprintf(stderr,"found CC type\n");
+        //fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }

From 7d03ac603b47b76831c6029b582222f84de09c3c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:32:58 -1100
Subject: [PATCH 315/623] Fix

---
 src/cc/assets.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f19728d62..af85efafa 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -288,10 +288,9 @@ CC *MakeAssetCond(CPubKey pk)
 
 CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
 {
-    CTxOut vout; CScript scriptPubKey;
+    CTxOut vout;
     CC *payoutCond = MakeAssetCond(pk);
-    scriptPubKey = CCPubKey(payoutCond);
-    vout = CTxOut(nValue,scriptPubkey);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);
 }

From 7eecd6a6acdc7bb9ad214f0cfa3719e383d80bfd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:42:11 -1100
Subject: [PATCH 316/623] Count all vins and bouts

---
 src/cc/assets.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index af85efafa..ef4466e68 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -251,7 +251,7 @@ std::vector<uint8_t> Mypubkey()
     return(pubkey);
 }
 
-void Myprivkey(uint8_t myprivkey[])
+bool Myprivkey(uint8_t myprivkey[])
 {
     char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
     if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
@@ -268,13 +268,16 @@ void Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                for (i=0; i<32; i++)
-                    fprintf(stderr,"%02x",myprivkey[i]);
-                fprintf(stderr," found privkey!\n");
+                //for (i=0; i<32; i++)
+                //    fprintf(stderr,"%02x",myprivkey[i]);
+                //fprintf(stderr," found privkey!\n");
+                return(true);
             }
 #endif
         }
     }
+    fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
+    return(false);
 }
 
 CC *MakeAssetCond(CPubKey pk)
@@ -467,7 +470,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     n = mtx.vout.size();
     for (i=0; i<n; i++)
     {
-        if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
+        //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
             totaloutputs += mtx.vout[i].nValue;
     }
     if ( (n= mtx.vin.size()) > 64 )
@@ -487,11 +490,11 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     {
         if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
         {
+            utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
+            totalinputs += utxovalues[i];
             if ( IsCCInput(mtx.vin[i].scriptSig) == 0 )
             {
                 vinimask |= (1LL << i);
-                utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
-                totalinputs += utxovalues[i];
             }
             else
             {

From c465612c0a7779adc82a7703edefe2bd1d88f7a8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:47:55 -1100
Subject: [PATCH 317/623] Debug

---
 src/rpcrawtransaction.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 525c35ca4..449567125 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -175,11 +175,13 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
     CBlockIndex *tipindex,*pindex = it->second;
     uint64_t interest;
     UniValue vout(UniValue::VARR);
-    for (unsigned int i = 0; i < tx.vout.size(); i++) {
+    for (unsigned int i = 0; i < tx.vout.size(); i++)
+    {
         const CTxOut& txout = tx.vout[i];
         UniValue out(UniValue::VOBJ);
+        fprintf(stderr,"decode vout.%d\n",i);
         out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
-        if ( pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.LastTip()) != 0 )
+        if ( ASSETCHAINS_SYMBOL[0] == 0 && pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.LastTip()) != 0 )
         {
             int64_t interest; int32_t txheight; uint32_t locktime;
             interest = komodo_accrued_interest(&txheight,&locktime,tx.GetHash(),i,0,txout.nValue,(int32_t)tipindex->nHeight);

From 08bddeff6351e428161db8855df76fbc2d4ce3e7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:48:53 -1100
Subject: [PATCH 318/623] Fix

---
 src/rpcrawtransaction.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 449567125..bef8d182a 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -33,6 +33,8 @@
 
 using namespace std;
 
+extern char ASSETCHAINS_SYMBOL[];
+
 void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex)
 {
     txnouttype type;

From fa62690da26df2e8851780aec5073469a67696e7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:52:53 -1100
Subject: [PATCH 319/623] Test

---
 src/rpcrawtransaction.cpp | 1 -
 src/script/standard.cpp   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index bef8d182a..658bed256 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -181,7 +181,6 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
     {
         const CTxOut& txout = tx.vout[i];
         UniValue out(UniValue::VOBJ);
-        fprintf(stderr,"decode vout.%d\n",i);
         out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
         if ( ASSETCHAINS_SYMBOL[0] == 0 && pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.LastTip()) != 0 )
         {
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 0c463ab3d..46fa27038 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -260,9 +260,9 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
         return true;
     }
     
-    else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
+    else if ( whichType == TX_CRYPTOCONDITION)
     {
-        //fprintf(stderr,"found CC type\n");
+        fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }

From e512c055ac36fc8c8b1decc485e23818450d52fe Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 03:56:57 -1100
Subject: [PATCH 320/623] Fix out type

---
 src/rpcrawtransaction.cpp | 1 +
 src/script/standard.cpp   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index 658bed256..c0a6aa0ae 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -46,6 +46,7 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
         out.push_back(Pair("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
 
     if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
+        fprintf(stderr,"extractdestinations error\n");
         out.push_back(Pair("type", GetTxnOutputType(type)));
         return;
     }
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 46fa27038..db1a250dc 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -31,6 +31,8 @@ const char* GetTxnOutputType(txnouttype t)
     case TX_SCRIPTHASH: return "scripthash";
     case TX_MULTISIG: return "multisig";
     case TX_NULL_DATA: return "nulldata";
+    case TX_CRYPTOCONDITION: return "cryptocondition";
+    default: return "invalid";
     }
     return NULL;
 }
@@ -260,7 +262,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
         return true;
     }
     
-    else if ( whichType == TX_CRYPTOCONDITION)
+    else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
         fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
@@ -303,7 +305,10 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
         nRequiredRet = 1;
         CTxDestination address;
         if (!ExtractDestination(scriptPubKey, address))
+        {
+            fprintf(stderr,"error extractdestination from extractdestinations\n");
            return false;
+        }
         addressRet.push_back(address);
     }
 

From c00ab6424d5aa674a1028476ff17e383016e9b2a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:01:53 -1100
Subject: [PATCH 321/623] -print

---
 src/rpcrawtransaction.cpp | 4 ++--
 src/script/standard.cpp   | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index c0a6aa0ae..125be1d73 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -45,8 +45,8 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
     if (fIncludeHex)
         out.push_back(Pair("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end())));
 
-    if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
-        fprintf(stderr,"extractdestinations error\n");
+    if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired))
+    {
         out.push_back(Pair("type", GetTxnOutputType(type)));
         return;
     }
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index db1a250dc..359469ed8 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -264,7 +264,6 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     
     else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
-        fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }
@@ -306,7 +305,6 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
         CTxDestination address;
         if (!ExtractDestination(scriptPubKey, address))
         {
-            fprintf(stderr,"error extractdestination from extractdestinations\n");
            return false;
         }
         addressRet.push_back(address);

From 5963c84f369e633f163b4860b249ace5ef4fdd33 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:31:00 -1100
Subject: [PATCH 322/623] Bid

---
 src/cc/assets.cpp        | 27 +++++++++++++--------------
 src/wallet/rpcwallet.cpp | 23 +++++++++++++++++++----
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index ef4466e68..492363e96 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -61,7 +61,7 @@ extern uint8_t NOTARY_PUBKEY33[33];
  vin.0: normal input
  vout.0: issuance assetoshis to CC
  vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
+ vout.n-1: opreturn [EVAL_ASSETS] ['c'] [origpubkey] "<assetname>" "<description>"
  
  transfer
  vin.0: normal input
@@ -191,10 +191,10 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     return(pubkey2pk(ParseHex(Unspendablehex)));
 }
 
-CScript EncodeCreateOpRet(uint8_t funcid,std::string name,std::string description)
+CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
-    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << name << description);
+    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
     return(opret);
 }
     
@@ -611,8 +611,7 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    //for (i=0; i<n; i++)
-    //   mtx.vin.push_back(CCinputs[i]); // CC
+    mtx.vin.push_back(CTxIn(01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e,0,CScript()));
     return(totalinputs);
 }
        
@@ -655,17 +654,17 @@ std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t as
     if ( AddNormalinputs(mtx,mypk,assetsupply+txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',name,description)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',mypubkey,name,description)));
     }
     return(0);
 }
                
-std::string CreateAssetTransfer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts)
+std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts)
 {
     CMutableTransaction mtx; CPubKey mypk; int32_t i,n; uint64_t CCchange=0,inputs=0,total=0;
     if ( txfee == 0 )
         txfee = 10000;
-    mypk = pubkey2pk(mypubkey);
+    mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
         n = outputs.size();
@@ -688,12 +687,12 @@ std::string CreateAssetTransfer(std::vector<uint8_t> mypubkey,uint64_t txfee,uin
     return(0);
 }
 
-std::string CreateBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
 {
     CMutableTransaction mtx; CPubKey mypk;
     if ( txfee == 0 )
         txfee = 10000;
-    mypk = pubkey2pk(mypubkey);
+    mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
         mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
@@ -702,12 +701,12 @@ std::string CreateBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t
     return(0);
 }
 
-std::string CancelBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 bidtxid)
+std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
 {
     CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
     if ( txfee == 0 )
         txfee = 10000;
-    mypk = pubkey2pk(mypubkey);
+    mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
@@ -721,12 +720,12 @@ std::string CancelBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256
     return(0);
 }
 
-std::string FillBuyOffer(std::vector<uint8_t> mypubkey,uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout)
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout)
 {
     CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey,tmppubkey; int32_t bidvout=0; uint64_t tmpprice,origprice,bidamount,paid_amount,fillamount,remaining_required;
     if ( txfee == 0 )
         txfee = 10000;
-    mypk = pubkey2pk(mypubkey);
+    mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
         if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 && GetTransaction(filltxid,filltx,hashBlock,false) != 0 )
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 93ccfa19a..6ed2bc180 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,8 +4830,11 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
-std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
-std::vector<uint8_t> Mypubkey();
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
+std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts);
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
+std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid);
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout);
 
 UniValue tokencreate(const UniValue& params, bool fHelp)
 {
@@ -4842,7 +4845,7 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
     supply = atof(params[1].get_str().c_str()) * COIN;
     if ( params.size() == 3 )
         description = params[2].get_str();
-    hex = CreateAsset(Mypubkey(),0,supply,name,description);
+    hex = CreateAsset(0,supply,name,description);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));
@@ -4859,7 +4862,19 @@ UniValue tokentransfer(const UniValue& params, bool fHelp)
 
 UniValue tokenbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ);
+    uint64_t bidamount; double price; uint256 tokenid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokenbid numtokens tokenid price\n");
+    numtokens = atoi(params[0].get_str().c_str());
+    tokenid = ParseHex(params[1].get_str());
+    price = atof(params[2].get_str().c_str());
+    bidamount = (price * numtokens) * COIN;
+    hex = CreateBuyOffer(0,bidamount,tokenid,numtokens);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "could create bid"));
     return(result);
 }
 

From b751e4d07c4116884885ab05a8af8e137b9dad8b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:34:52 -1100
Subject: [PATCH 323/623] Test

---
 src/cc/assets.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 492363e96..0795fee5f 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -164,6 +164,11 @@ signEncodeTx "$transferTx"
 extern CWallet* pwalletMain;
 #endif
 
+//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
+//BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
+//BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
+//BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
+
 static uint256 zeroid;
 const char *Unspendableaddr = "RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char Unspendablehex[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
@@ -611,7 +616,8 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    mtx.vin.push_back(CTxIn(01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e,0,CScript()));
+    uint256 txid = ParseHex("01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e");
+    mtx.vin.push_back(CTxIn(txid,0,CScript()));
     return(totalinputs);
 }
        
@@ -680,7 +686,7 @@ std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubK
                     mtx.vout.push_back(MakeAssetsVout(amounts[i],outputs[i]));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,mypubkey)));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));
             } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
         } else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
     }
@@ -696,7 +702,7 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
     if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
         mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,mypubkey)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
     }
     return(0);
 }
@@ -714,7 +720,7 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             bidamount = vintx.vout[0].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,mypubkey)));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
         }
     }
     return(0);

From 2f231eff8c4f6a28a6fe5cb134068ecae053dca3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:38:13 -1100
Subject: [PATCH 324/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0795fee5f..3b15ec3c4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -616,7 +616,8 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    uint256 txid = ParseHex("01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e");
+    std::string assetidstr = "01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e";
+    uint256 txid = ParseHex(assetidstr);
     mtx.vin.push_back(CTxIn(txid,0,CScript()));
     return(totalinputs);
 }

From d7a8aeb6385b19efc7c61cd008d0cfb401f60185 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:41:36 -1100
Subject: [PATCH 325/623] Vectors

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3b15ec3c4..2006773f2 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -617,7 +617,8 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint6
 {
     uint64_t totalinputs = 0;
     std::string assetidstr = "01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e";
-    uint256 txid = ParseHex(assetidstr);
+    std::vector<unsigned char> txData(ParseHex(assetidstr));
+    uint256 txid = txData;
     mtx.vin.push_back(CTxIn(txid,0,CScript()));
     return(totalinputs);
 }

From edad068fb8c2c0c21c2f47d7cdc4b7a534062982 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:45:21 -1100
Subject: [PATCH 326/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2006773f2..9da854019 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -618,7 +618,8 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint6
     uint64_t totalinputs = 0;
     std::string assetidstr = "01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e";
     std::vector<unsigned char> txData(ParseHex(assetidstr));
-    uint256 txid = txData;
+    uint256 txid;
+    memcpy(&txid,txData.data(),sizeof(txid));
     mtx.vin.push_back(CTxIn(txid,0,CScript()));
     return(totalinputs);
 }

From 46668f56dbf85deeee68794815cd23db6dc62728 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:48:21 -1100
Subject: [PATCH 327/623] Test

---
 src/wallet/rpcwallet.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 6ed2bc180..9991f7405 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4862,11 +4862,12 @@ UniValue tokentransfer(const UniValue& params, bool fHelp)
 
 UniValue tokenbid(const UniValue& params, bool fHelp)
 {
-    uint64_t bidamount; double price; uint256 tokenid;
+    uint64_t bidamount,numtokens; std::string hex; double price; uint256 tokenid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenbid numtokens tokenid price\n");
     numtokens = atoi(params[0].get_str().c_str());
-    tokenid = ParseHex(params[1].get_str());
+    std::vector<unsigned char> tokid(ParseHex(params[1].get_str()));
+    memcpy(&tokenid,tokid.data(),sizeof(tokenid));
     price = atof(params[2].get_str().c_str());
     bidamount = (price * numtokens) * COIN;
     hex = CreateBuyOffer(0,bidamount,tokenid,numtokens);

From da8aa760980aed7a4daf384426c4a6013cb3f068 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:49:35 -1100
Subject: [PATCH 328/623] test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9991f7405..db8c7c00a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4862,7 +4862,7 @@ UniValue tokentransfer(const UniValue& params, bool fHelp)
 
 UniValue tokenbid(const UniValue& params, bool fHelp)
 {
-    uint64_t bidamount,numtokens; std::string hex; double price; uint256 tokenid;
+    UniValue result(UniValue::VOBJ); uint64_t bidamount,numtokens; std::string hex; double price; uint256 tokenid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenbid numtokens tokenid price\n");
     numtokens = atoi(params[0].get_str().c_str());

From 0aa4f2fccc41d0a5f1842d320d3e8c3fc8c5e6fb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:54:42 -1100
Subject: [PATCH 329/623] Adjust diff downward much faster

---
 src/komodo_bitcoind.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 516f31187..55e1ae2cf 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1375,7 +1375,9 @@ arith_uint256 komodo_PoWtarget(int32_t *percPoSp,arith_uint256 target,int32_t he
     }
     else if ( percPoS > goalperc ) // decrease PoW diff -> raise bnTarget
     {
-        bnTarget = (ave * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
+        bnTarget = ((ave * arith_uint256(goalperc)) + (easydiff * arith_uint256(percPoS))) / arith_uint256(percPoS + goalperc);
+        //bnTarget = (bnTarget * arith_uint256(percPoS * percPoS * percPoS)) / arith_uint256(goalperc * goalperc);
+        bnTarget = (bnTarget / arith_uint256(goalperc * goalperc)) * arith_uint256(percPoS * percPoS * percPoS);
         if ( bnTarget > easydiff )
             bnTarget = easydiff;
         else if ( bnTarget < ave ) // overflow

From 1fa542aff9248ebba95e4cf00ef7019d5e83034c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 04:56:00 -1100
Subject: [PATCH 330/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 9da854019..2e7cd87cc 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -649,7 +649,7 @@ uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,in
     return(0);
 }
 
-std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
 {
     CMutableTransaction mtx; CPubKey mypk;
     if ( name.size() > 32 || description.size() > 4096 )
@@ -659,11 +659,11 @@ std::string CreateAsset(std::vector<uint8_t> mypubkey,uint64_t txfee,uint64_t as
     }
     if ( txfee == 0 )
         txfee = 10000;
-    mypk = pubkey2pk(mypubkey);
+    mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,assetsupply+txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',mypubkey,name,description)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);
 }

From eb07073d675c512e2a388738f8a01ae5fc4ba0f2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 05:05:58 -1100
Subject: [PATCH 331/623] CKeyID

---
 src/script/standard.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 359469ed8..309708c7f 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -264,7 +264,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     
     else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
-        addressRet = CScriptID(uint160(vSolutions[0]));
+        addressRet = CKeyID(uint160(vSolutions[0]));
         return true;
     }
     // Multisig txns have more than one address...

From 7f190223f507fb609142c3b7478a861c6b071dbf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 05:19:57 -1100
Subject: [PATCH 332/623] Support IsPayToCryptoCondition for -addressindex

---
 src/main.cpp          | 34 ++++++++++++++++++++++++++++++++++
 src/rpcblockchain.cpp |  2 +-
 src/txmempool.cpp     | 19 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ccdeee6ff..1350240b3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2475,6 +2475,16 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
                     // undo unspent index
                     addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), hash, k), CAddressUnspentValue()));
                     
+                }
+                else if (out.scriptPubKey.IsPayToCryptoCondition()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin(), out.scriptPubKey.end());
+                    
+                    // undo receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(1, Hash160(hashBytes), pindex->nHeight, i, hash, k, false), out.nValue));
+                    
+                    // undo unspent index
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), hash, k), CAddressUnspentValue()));
+                    
                 }
                 else {
                     continue;
@@ -2560,6 +2570,16 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
                         // restore unspent index
                         addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
                         
+                    }
+                    else if (prevout.scriptPubKey.IsPayToCryptoCondition()) {
+                        vector<unsigned char> hashBytes(prevout.scriptPubKey.begin(), prevout.scriptPubKey.end());
+                        
+                        // undo spending activity
+                        addressIndex.push_back(make_pair(CAddressIndexKey(1, Hash160(hashBytes), pindex->nHeight, i, hash, j, true), prevout.nValue * -1));
+                        
+                        // restore unspent index
+                        addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), input.prevout.hash, input.prevout.n), CAddressUnspentValue(prevout.nValue, prevout.scriptPubKey, undo.nHeight)));
+                        
                     }
                     else {
                         continue;
@@ -2843,6 +2863,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                         hashBytes = Hash160(vector <unsigned char>(prevout.scriptPubKey.begin()+1, prevout.scriptPubKey.begin()+34));
                         addressType = 1;
                     }
+                    else if (prevout.scriptPubKey.IsPayToCryptoCondition()) {
+                        hashBytes = Hash160(vector <unsigned char>(prevout.scriptPubKey.begin(), prevout.scriptPubKey.end()));
+                        addressType = 1;
+                    }
                     else {
                         hashBytes.SetNull();
                         addressType = 0;
@@ -2919,6 +2943,16 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                     // record unspent output
                     addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
                     
+                }
+                else if (out.scriptPubKey.IsPayToCryptoCondition()) {
+                    vector<unsigned char> hashBytes(out.scriptPubKey.begin(), out.scriptPubKey.end());
+                    
+                    // record receiving activity
+                    addressIndex.push_back(make_pair(CAddressIndexKey(1, Hash160(hashBytes), pindex->nHeight, i, txhash, k, false), out.nValue));
+                    
+                    // record unspent output
+                    addressUnspentIndex.push_back(make_pair(CAddressUnspentKey(1, Hash160(hashBytes), txhash, k), CAddressUnspentValue(out.nValue, out.scriptPubKey, pindex->nHeight)));
+                    
                 }
                 else {
                     continue;
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 7f8984c63..2e5ed0be8 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -210,7 +210,7 @@ UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
                 vector<unsigned char> hashBytes(out.scriptPubKey.begin()+3, out.scriptPubKey.begin()+23);
                 delta.push_back(Pair("address", CBitcoinAddress(CKeyID(uint160(hashBytes))).ToString()));
             }
-            else if (out.scriptPubKey.IsPayToPublicKey()) {
+            else if (out.scriptPubKey.IsPayToPublicKey() || out.scriptPubKey.IsPayToCryptoCondition()) {
                 CTxDestination address;
                 if (ExtractDestination(out.scriptPubKey, address))
                 {
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index e96f0d975..296c0eef5 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -152,7 +152,13 @@ void CTxMemPool::addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewC
             mapAddress.insert(make_pair(key, delta));
             inserted.push_back(key);
         }
-    }
+        else if (prevout.scriptPubKey.IsPayToCryptoCondition()) {
+            vector<unsigned char> hashBytes(prevout.scriptPubKey.begin(), prevout.scriptPubKey.end());
+            CMempoolAddressDeltaKey key(1, Hash160(hashBytes), txhash, j, 1);
+            CMempoolAddressDelta delta(entry.GetTime(), prevout.nValue * -1, input.prevout.hash, input.prevout.n);
+            mapAddress.insert(make_pair(key, delta));
+            inserted.push_back(key);
+        }   }
 
     for (unsigned int k = 0; k < tx.vout.size(); k++) {
         const CTxOut &out = tx.vout[k];
@@ -176,6 +182,13 @@ void CTxMemPool::addAddressIndex(const CTxMemPoolEntry &entry, const CCoinsViewC
             mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
             inserted.push_back(key);
         }
+        else if (out.scriptPubKey.IsPayToCryptoCondition()) {
+            vector<unsigned char> hashBytes(out.scriptPubKey.begin(), out.scriptPubKey.end());
+            std::pair<addressDeltaMap::iterator,bool> ret;
+            CMempoolAddressDeltaKey key(1, Hash160(hashBytes), txhash, k, 0);
+            mapAddress.insert(make_pair(key, CMempoolAddressDelta(entry.GetTime(), out.nValue)));
+            inserted.push_back(key);
+        }
     }
 
     mapAddressInserted.insert(make_pair(txhash, inserted));
@@ -237,6 +250,10 @@ void CTxMemPool::addSpentIndex(const CTxMemPoolEntry &entry, const CCoinsViewCac
             addressHash = Hash160(vector<unsigned char> (prevout.scriptPubKey.begin()+1, prevout.scriptPubKey.begin()+34));
             addressType = 1;
         }
+        else if (prevout.scriptPubKey.IsPayToCryptoCondition()) {
+            addressHash = Hash160(vector<unsigned char> (prevout.scriptPubKey.begin(), prevout.scriptPubKey.end()));
+            addressType = 1;
+        }
         else {
             addressHash.SetNull();
             addressType = 0;

From 502037d98f77e1f4c2247790c72a9351e4ca16a4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 05:42:38 -1100
Subject: [PATCH 333/623] Test

---
 src/cc/assets.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2e7cd87cc..37b2d7b3b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -191,7 +191,8 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     memset(unspendablepriv,0,32);
     if ( evalcode == EVAL_ASSETS )
     {
-        memcpy(unspendablepriv,Unspendablepriv,32);
+        if ( unspendablepriv != 0 )
+            memcpy(unspendablepriv,Unspendablepriv,32);
     } else return(nullpk);
     return(pubkey2pk(ParseHex(Unspendablehex)));
 }
@@ -704,7 +705,7 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
-        mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
     }
     return(0);
@@ -899,18 +900,22 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
                     return eval->Invalid("invalid CC vin for buyoffer");
             }
+            destaddr[0] = 0;
             for (i=0; i<numvouts-1; i++)
             {
-                if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                    return eval->Invalid("invalid CC vout for buyoffer");
                 if ( i == 0 )
                 {
-                    if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
+                    if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
+                        return eval->Invalid("invalid normal vout for buyoffer");
+                    else if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
                         return eval->Invalid("invalid vout0 destaddr for buyoffer");
                     else if ( tx.vout[i].nValue < 10000 )
                         return eval->Invalid("invalid vout0 dust for buyoffer");
                 }
+                else if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                    return eval->Invalid("invalid CC vout for buyoffer");
             }
+            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",destaddr);
             break;
             
         case 'o': // cancelbuy

From 0444ad71812773d54d70ee9953a3b22251a61cab Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 05:46:26 -1100
Subject: [PATCH 334/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 37b2d7b3b..63b2bcc8f 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -188,7 +188,8 @@ CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
     static CPubKey nullpk;
-    memset(unspendablepriv,0,32);
+    if ( unspendablepriv != 0 )
+        memset(unspendablepriv,0,32);
     if ( evalcode == EVAL_ASSETS )
     {
         if ( unspendablepriv != 0 )

From cf6108142ee76dbe7c8c353bdce6fd0866937787 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 05:58:46 -1100
Subject: [PATCH 335/623] cancelbid

---
 src/cc/assets.cpp        |  7 ++++---
 src/wallet/rpcwallet.cpp | 12 +++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 63b2bcc8f..075b1329e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -825,9 +825,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
-    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 )
-        return eval->Invalid("invalid CC vout0 for buyvin");
-    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) == 0 )
+    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
+        return eval->Invalid("invalid normal vout0 for buyvin");
+    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
         return eval->Invalid("invalid opreturn for buyvin");
     else return(nValue);
 }
@@ -931,6 +931,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched refund for cancelbuy");
             else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                 return eval->Invalid("invalid vout0 destaddr for cancelbuy");
+            fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
             break;
             
         case 'B': // fillbuy:
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index db8c7c00a..9108657ae 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4881,7 +4881,17 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
 
 UniValue tokencancelbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ);
+    UniValue result(UniValue::VOBJ); std::string hex; uint256 bidtxid;
+    if ( fHelp || params.size() != 1 )
+        throw runtime_error("tokencancelbid bidtxid\n");
+    std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
+    memcpy(&bidtxid,bidid.data(),sizeof(bidtxid));
+    hex = CancelBuyOffer(0,bidtxid);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "could cancel bid"));
     return(result);
 }
 

From a714ed70dc56a7045ae2d3f3105a9dd672aa1f82 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:03:09 -1100
Subject: [PATCH 336/623] Test

---
 src/cc/assets.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 075b1329e..95bf9e292 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -727,7 +727,9 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
         }
+        fprintf(stderr,"couldnt find.(%s)\n",bidtxid.ToString.c_str());
     }
+    fprintf(stderr,"no normal inputs\n");
     return(0);
 }
 

From 572155d4ecb8cc699807b994e236cf02048bab1d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:04:36 -1100
Subject: [PATCH 337/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 95bf9e292..eaeebd3b6 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -727,7 +727,7 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
         }
-        fprintf(stderr,"couldnt find.(%s)\n",bidtxid.ToString.c_str());
+        fprintf(stderr,"couldnt find bidtxid\n");
     }
     fprintf(stderr,"no normal inputs\n");
     return(0);

From e7c56da88a17f38f21ac5ef803121fc172b3fbd5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:11:14 -1100
Subject: [PATCH 338/623] Test

---
 src/cc/assets.cpp        | 3 +++
 src/wallet/rpcwallet.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index eaeebd3b6..e3b0c549b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -727,6 +727,9 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
         }
+        int i;
+        for (i=31; i>=0; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&bidtxid)[i]);
         fprintf(stderr,"couldnt find bidtxid\n");
     }
     fprintf(stderr,"no normal inputs\n");
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9108657ae..5ef70958d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4885,6 +4885,9 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
     if ( fHelp || params.size() != 1 )
         throw runtime_error("tokencancelbid bidtxid\n");
     std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
+    int32_t i; for (i=31; i>=0; i--)
+        fprintf(stderr,"%02x",((uint8_t *)bidid.data())[i]);
+    fprintf(stderr,"couldnt find bidtxid\n");
     memcpy(&bidtxid,bidid.data(),sizeof(bidtxid));
     hex = CancelBuyOffer(0,bidtxid);
     if ( hex.size() > 0 )

From d6c701ed6c8a249ccf085c5a90362bccaf2396d7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:14:04 -1100
Subject: [PATCH 339/623] Reverse

---
 src/wallet/rpcwallet.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5ef70958d..274899d73 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4881,14 +4881,12 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
 
 UniValue tokencancelbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::string hex; uint256 bidtxid;
+    UniValue result(UniValue::VOBJ); std::string hex; uint256 bidtxid; int32_t i;
     if ( fHelp || params.size() != 1 )
         throw runtime_error("tokencancelbid bidtxid\n");
     std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
-    int32_t i; for (i=31; i>=0; i--)
-        fprintf(stderr,"%02x",((uint8_t *)bidid.data())[i]);
-    fprintf(stderr,"couldnt find bidtxid\n");
-    memcpy(&bidtxid,bidid.data(),sizeof(bidtxid));
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&bidtxid)[31-i] = ((uint8_t *)bidid.data())[i]);
     hex = CancelBuyOffer(0,bidtxid);
     if ( hex.size() > 0 )
     {

From f9c1423e860d928db2704dfa0b463854e51c2603 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:14:48 -1100
Subject: [PATCH 340/623] Fix

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 274899d73..2ecd11b09 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4886,7 +4886,7 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
         throw runtime_error("tokencancelbid bidtxid\n");
     std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
     for (i=31; i>=0; i--)
-        ((uint8_t *)&bidtxid)[31-i] = ((uint8_t *)bidid.data())[i]);
+        ((uint8_t *)&bidtxid)[31-i] = ((uint8_t *)bidid.data())[i];
     hex = CancelBuyOffer(0,bidtxid);
     if ( hex.size() > 0 )
     {

From 93e02ad9edcac201dd0c4a2d71ce42337d8ed76e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:24:14 -1100
Subject: [PATCH 341/623] Prints

---
 src/cc/assets.cpp        | 16 ++++++----------
 src/wallet/rpcwallet.cpp | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e3b0c549b..0c70f9af3 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -26,6 +26,7 @@
 #include <exception>
 
 extern uint8_t NOTARY_PUBKEY33[33];
+uint256 Parseuint256(char *hexstr);
 
 // code rpc
 
@@ -465,7 +466,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
     {
         UpdateTransaction(mtx,vini,sigdata);
         return(true);
-    } else fprintf(stderr,"signing error for CreateAsset\n");
+    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
 #else
     return(false);
 #endif
@@ -501,11 +502,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             totalinputs += utxovalues[i];
             if ( IsCCInput(mtx.vin[i].scriptSig) == 0 )
             {
+                fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
                 vinimask |= (1LL << i);
             }
             else
             {
                 Getscriptaddress(destaddr,vintx.vout[mtx.vin[i].prevout.n].scriptPubKey);
+                fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
                 if ( strcmp(destaddr,myaddr) == 0 )
                 {
                     privkey = myprivkey;
@@ -618,11 +621,8 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    std::string assetidstr = "01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e";
-    std::vector<unsigned char> txData(ParseHex(assetidstr));
-    uint256 txid;
-    memcpy(&txid,txData.data(),sizeof(txid));
-    mtx.vin.push_back(CTxIn(txid,0,CScript()));
+    mtx.vin.push_back(CTxIn(Parseuint256("01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e"),0,CScript()));
+    totalinputs = COIN;
     return(totalinputs);
 }
        
@@ -727,10 +727,6 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
         }
-        int i;
-        for (i=31; i>=0; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&bidtxid)[i]);
-        fprintf(stderr,"couldnt find bidtxid\n");
     }
     fprintf(stderr,"no normal inputs\n");
     return(0);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2ecd11b09..f6e4358cf 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4836,6 +4836,14 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
 std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid);
 std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout);
 
+uint256 Parseuint256(char *hexstr)
+{
+    uint256 txid; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
+    return(txid);
+}
+
 UniValue tokencreate(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
@@ -4866,10 +4874,9 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenbid numtokens tokenid price\n");
     numtokens = atoi(params[0].get_str().c_str());
-    std::vector<unsigned char> tokid(ParseHex(params[1].get_str()));
-    memcpy(&tokenid,tokid.data(),sizeof(tokenid));
+    tokenid = Parseuint256(params[1].get_str().c_str());
     price = atof(params[2].get_str().c_str());
-    bidamount = (price * numtokens) * COIN;
+    bidamount = (price * numtokens) * COIN + 0.0000000049999;
     hex = CreateBuyOffer(0,bidamount,tokenid,numtokens);
     if ( hex.size() > 0 )
     {
@@ -4881,13 +4888,10 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
 
 UniValue tokencancelbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::string hex; uint256 bidtxid; int32_t i;
+    UniValue result(UniValue::VOBJ); std::string hex; int32_t i;
     if ( fHelp || params.size() != 1 )
         throw runtime_error("tokencancelbid bidtxid\n");
-    std::vector<unsigned char> bidid(ParseHex(params[0].get_str()));
-    for (i=31; i>=0; i--)
-        ((uint8_t *)&bidtxid)[31-i] = ((uint8_t *)bidid.data())[i];
-    hex = CancelBuyOffer(0,bidtxid);
+    hex = CancelBuyOffer(0,Parseuint256(params[0].get_str().c_str());
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From 6a530006cc3c1bd3d228fed3e9a81016779025ea Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:25:37 -1100
Subject: [PATCH 342/623] Test

---
 src/cc/assets.cpp        | 2 +-
 src/wallet/rpcwallet.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0c70f9af3..445c96edf 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -621,7 +621,7 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    mtx.vin.push_back(CTxIn(Parseuint256("01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e"),0,CScript()));
+    mtx.vin.push_back(CTxIn(Parseuint256((char *)"01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e"),0,CScript()));
     totalinputs = COIN;
     return(totalinputs);
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f6e4358cf..1642387ef 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4874,7 +4874,7 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenbid numtokens tokenid price\n");
     numtokens = atoi(params[0].get_str().c_str());
-    tokenid = Parseuint256(params[1].get_str().c_str());
+    tokenid = Parseuint256((char *)params[1].get_str().c_str());
     price = atof(params[2].get_str().c_str());
     bidamount = (price * numtokens) * COIN + 0.0000000049999;
     hex = CreateBuyOffer(0,bidamount,tokenid,numtokens);
@@ -4891,7 +4891,7 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string hex; int32_t i;
     if ( fHelp || params.size() != 1 )
         throw runtime_error("tokencancelbid bidtxid\n");
-    hex = CancelBuyOffer(0,Parseuint256(params[0].get_str().c_str());
+    hex = CancelBuyOffer(0,Parseuint256((char *)params[0].get_str().c_str());
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From 7015dab7b37feb94a19ef11676e3cb6c2fb6ba53 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:26:53 -1100
Subject: [PATCH 343/623] test

---
 src/wallet/rpcwallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 1642387ef..f40cdef15 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4838,7 +4838,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
 
 uint256 Parseuint256(char *hexstr)
 {
-    uint256 txid; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
+    uint256 txid; int32_t i; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
     for (i=31; i>=0; i--)
         ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
     return(txid);
@@ -4891,7 +4891,7 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string hex; int32_t i;
     if ( fHelp || params.size() != 1 )
         throw runtime_error("tokencancelbid bidtxid\n");
-    hex = CancelBuyOffer(0,Parseuint256((char *)params[0].get_str().c_str());
+    hex = CancelBuyOffer(0,Parseuint256((char *)params[0].get_str().c_str()));
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From 2784a6bc18f3fbd69bace9cf9c4609b0472c75c9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:33:06 -1100
Subject: [PATCH 344/623] Test

---
 src/cc/assets.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 445c96edf..d13c10f62 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -498,16 +498,17 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     {
         if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
         {
-            utxovalues[i] = vintx.vout[mtx.vin[i].prevout.n].nValue;
+            utxovout = mtx.vin[i].prevout.n;
+            utxovalues[i] = vintx.vout[utxovout].nValue;
             totalinputs += utxovalues[i];
-            if ( IsCCInput(mtx.vin[i].scriptSig) == 0 )
+            if ( IsCCInput(mtx.vin[utxovout].scriptSig) == 0 )
             {
                 fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
                 vinimask |= (1LL << i);
             }
             else
             {
-                Getscriptaddress(destaddr,vintx.vout[mtx.vin[i].prevout.n].scriptPubKey);
+                Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
                 fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
                 if ( strcmp(destaddr,myaddr) == 0 )
                 {

From c6853146f70d3a00c7bc955363054e3a3ed6a4ca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:37:49 -1100
Subject: [PATCH 345/623] Test

---
 src/cc/assets.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d13c10f62..8b32a9323 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -501,7 +501,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             utxovout = mtx.vin[i].prevout.n;
             utxovalues[i] = vintx.vout[utxovout].nValue;
             totalinputs += utxovalues[i];
-            if ( IsCCInput(mtx.vin[utxovout].scriptSig) == 0 )
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
             {
                 fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
                 vinimask |= (1LL << i);
@@ -514,11 +514,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 {
                     privkey = myprivkey;
                     cond = mycond;
+                    fprintf(stderr,"my CC addr.(%s)\n",myaddr);
                 }
                 else if ( strcmp(destaddr,unspendable) == 0 )
                 {
                     privkey = unspendablepriv;
                     cond = othercond;
+                    fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
                 }
                 else
                 {

From 8badc8346ce6553456ea522763c419b9c3d84d18 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 06:46:48 -1100
Subject: [PATCH 346/623] Msghash

---
 src/cc/assets.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8b32a9323..dbf6867ea 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -474,7 +474,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
 
 std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
-    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,msgHash[32],buf[1000],myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
     n = mtx.vout.size();
     for (i=0; i<n; i++)
     {
@@ -527,7 +527,9 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                     fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
                     continue;
                 }
-                if ( cc_signTreeSecp256k1Msg32(cond,privkey,msg32) != 0 )
+                size_t len = cc_conditionBinary(cond, buf);
+                sha256(buf,len,msgHash);
+                if ( cc_signTreeSecp256k1Msg32(cond,privkey,msgHash) != 0 )
                     mtx.vin[i].scriptSig = CCSig(cond);
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }

From f02ff21a22adb06c91799abae17fdc5a1e499f94 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:02:59 -1100
Subject: [PATCH 347/623] Test

---
 src/cc/assets.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index dbf6867ea..fc2b718e4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -474,7 +474,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
 
 std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
-    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,msgHash[32],buf[1000],myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
     n = mtx.vout.size();
     for (i=0; i<n; i++)
     {
@@ -527,9 +527,9 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                     fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
                     continue;
                 }
-                size_t len = cc_conditionBinary(cond, buf);
-                sha256(buf,len,msgHash);
-                if ( cc_signTreeSecp256k1Msg32(cond,privkey,msgHash) != 0 )
+                PrecomputedTransactionData txdata(mtx);
+                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
+                if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
                     mtx.vin[i].scriptSig = CCSig(cond);
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }

From de60ca58bce955a603108b3d459b079c9b484404 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:07:16 -1100
Subject: [PATCH 348/623] Fix signing

---
 src/cc/assets.cpp | 53 +++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index fc2b718e4..3a94aef02 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -507,6 +507,33 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 vinimask |= (1LL << i);
             }
             else
+            {
+            }
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+    }
+    if ( mycond != 0 )
+        cc_free(mycond);
+    if ( othercond != 0 )
+        cc_free(othercond);
+    if ( totalinputs >= totaloutputs+2*txfee )
+    {
+        change = totalinputs - (totaloutputs+txfee);
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+    }
+    mtx.vout.push_back(CTxOut(0,opret));
+    PrecomputedTransactionData txdata(mtx);
+    n = mtx.vin.size();
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            utxovout = mtx.vin[i].prevout.n;
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
+                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
+                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
+            }
+            else
             {
                 Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
                 fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
@@ -527,36 +554,12 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                     fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
                     continue;
                 }
-                PrecomputedTransactionData txdata(mtx);
                 uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
                 if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
                     mtx.vin[i].scriptSig = CCSig(cond);
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }
-        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-    }
-    if ( mycond != 0 )
-        cc_free(mycond);
-    if ( othercond != 0 )
-        cc_free(othercond);
-    if ( totalinputs >= totaloutputs+2*txfee )
-    {
-        change = totalinputs - (totaloutputs+txfee);
-        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-    }
-    mtx.vout.push_back(CTxOut(0,opret));
-    n = mtx.vin.size();
-    for (i=0; i<n; i++)
-    {
-        if ( ((1LL << i) & vinimask) != 0 )
-        {
-            if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
-            {
-                utxovout = mtx.vin[i].prevout.n;
-                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
-                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
-            } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-        }
+        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
     std::string strHex = EncodeHexTx(mtx);
     if ( strHex.size() > 0 )

From 30396f816f44d74dda550afe284df5c276366f47 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:13:46 -1100
Subject: [PATCH 349/623] Fix

---
 src/cc/assets.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3a94aef02..2de45f93e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -511,10 +511,6 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             }
         } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
-    if ( mycond != 0 )
-        cc_free(mycond);
-    if ( othercond != 0 )
-        cc_free(othercond);
     if ( totalinputs >= totaloutputs+2*txfee )
     {
         change = totalinputs - (totaloutputs+txfee);
@@ -561,6 +557,10 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             }
         } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
+    if ( mycond != 0 )
+        cc_free(mycond);
+    if ( othercond != 0 )
+        cc_free(othercond);
     std::string strHex = EncodeHexTx(mtx);
     if ( strHex.size() > 0 )
         return(strHex);

From 0ac29f4e003db76d825578af9a7154815886e76e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:20:09 -1100
Subject: [PATCH 350/623] Test

---
 src/cc/assets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2de45f93e..6ac4bea2e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -346,6 +346,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
     if ( script[0] == EVAL_ASSETS )
     {
         funcid = script[1];
+        fprintf(stderr,"decode.[%c]\n",funcid);
         switch ( funcid )
         {
             case 'o':

From 437d6328d78619f59943a7c4fb8d0985770dab65 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:27:19 -1100
Subject: [PATCH 351/623] Add assetid to cancel I-return

---
 src/cc/assets.cpp        |  6 +++---
 src/wallet/rpcwallet.cpp | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 6ac4bea2e..b570a6b2a 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -82,7 +82,7 @@ uint256 Parseuint256(char *hexstr);
  vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
  vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
  vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['o']
+ vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
  
  fillbuy:
  vin.0: normal input
@@ -721,7 +721,7 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
     return(0);
 }
 
-std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
 {
     CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
     if ( txfee == 0 )
@@ -734,7 +734,7 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid)
             bidamount = vintx.vout[0].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',zeroid,zeroid,0,Mypubkey())));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',assetid,zeroid,0,Mypubkey())));
         }
     }
     fprintf(stderr,"no normal inputs\n");
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f40cdef15..13816496f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4833,7 +4833,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
 std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts);
 std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
-std::string CancelBuyOffer(uint64_t txfee,uint256 bidtxid);
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
 std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout);
 
 uint256 Parseuint256(char *hexstr)
@@ -4888,10 +4888,12 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
 
 UniValue tokencancelbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::string hex; int32_t i;
-    if ( fHelp || params.size() != 1 )
-        throw runtime_error("tokencancelbid bidtxid\n");
-    hex = CancelBuyOffer(0,Parseuint256((char *)params[0].get_str().c_str()));
+    UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,bidtxid;
+    if ( fHelp || params.size() != 2 )
+        throw runtime_error("tokencancelbid tokenid bidtxid\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    bidtxid = Parseuint256((char *)params[1].get_str().c_str());
+    hex = CancelBuyOffer(0,tokenid,bidtxid);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From 3f92539f81917629901b3fe9ae4e7c7700fb50a4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:31:05 -1100
Subject: [PATCH 352/623] Test

---
 src/cc/assets.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index b570a6b2a..602072d84 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -211,10 +211,7 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
     switch ( funcid )
     {
-        case 'o':
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid);
-            break;
-        case 't':  case 'x':
+        case 't':  case 'x': case 'o':
             opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
             break;
         case 's': case 'b': case 'S': case 'B':

From 5c61755daa93de8f2fd8746454e94168bd16dacc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:36:32 -1100
Subject: [PATCH 353/623] Test

---
 src/cc/assets.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 602072d84..26895aa07 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -346,10 +346,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
         fprintf(stderr,"decode.[%c]\n",funcid);
         switch ( funcid )
         {
-            case 'o':
-                return(funcid);
-                break;
-            case 't':  case 'x':
+            case 't':  case 'x': case 'o':
                 if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
                     return(funcid);
                 break;
@@ -490,7 +487,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     mycond = MakeCC(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
     othercond = MakeCC(evalcode,unspendablepk);
-    fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
     {
@@ -501,7 +498,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             totalinputs += utxovalues[i];
             if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
             {
-                fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
+                //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
                 vinimask |= (1LL << i);
             }
             else
@@ -530,18 +527,18 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
             else
             {
                 Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
-                fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
+                //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
                 if ( strcmp(destaddr,myaddr) == 0 )
                 {
                     privkey = myprivkey;
                     cond = mycond;
-                    fprintf(stderr,"my CC addr.(%s)\n",myaddr);
+                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
                 }
                 else if ( strcmp(destaddr,unspendable) == 0 )
                 {
                     privkey = unspendablepriv;
                     cond = othercond;
-                    fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
+                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
                 }
                 else
                 {

From 3393e50fe52598b6445d30a06c98f89d10055393 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:46:12 -1100
Subject: [PATCH 354/623] Test

---
 src/cc/assets.cpp | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 26895aa07..fa19858ec 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -348,7 +348,10 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
         {
             case 't':  case 'x': case 'o':
                 if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
+                {
+                    fprintf(stderr,"decoded assetid.%s\n",assetid.ToString().c_str());
                     return(funcid);
+                }
                 break;
             case 's': case 'b': case 'S': case 'B':
                 if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
@@ -824,16 +827,23 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
     else return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    fprintf(stderr,"assetvalidatebuyin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("invalid normal vout0 for buyvin");
-    else if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
-        return eval->Invalid("invalid opreturn for buyvin");
-    else return(nValue);
+    else
+    {
+        fprintf(stderr,"have %.8f checking assetid\n",(double)nValue/COIN);
+        if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
+            return eval->Invalid("invalid opreturn for buyvin");
+        else if ( refassetid != assetid )
+            return eval->Invalid("invalid assetid for buyvin");
+    }
+    return(nValue);
 }
 
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
@@ -929,7 +939,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['o']
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( nValue != tx.vout[0].nValue )
                 return eval->Invalid("mismatched refund for cancelbuy");
@@ -1067,10 +1077,13 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     CTransaction tx = *(CTransaction *)&ctx;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
-    if ( (n= tx.vout.size()) == 0 )
+    else if ( (n= tx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+    else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
+    for (i=31; i>=0; i--)
+        fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+    fprintf(stderr,"got assetid.%s\n",assetid.ToString.c_str());
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )

From 977f6c1400f155afbbc93d019d72cd893f0138b8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:48:15 -1100
Subject: [PATCH 355/623] Test

---
 src/cc/assets.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index fa19858ec..012590441 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -349,7 +349,9 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
             case 't':  case 'x': case 'o':
                 if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
                 {
-                    fprintf(stderr,"decoded assetid.%s\n",assetid.ToString().c_str());
+                    int32_t i; for (i=31; i>=0; i--)
+                        fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+                    fprintf(stderr,"got assetid\n");
                     return(funcid);
                 }
                 break;
@@ -957,7 +959,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.2: vin.2 assetoshis to original pubkey
             //vout.3: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
@@ -1083,7 +1085,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("Invalid opreturn payload");
     for (i=31; i>=0; i--)
         fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-    fprintf(stderr,"got assetid.%s\n",assetid.ToString.c_str());
+    fprintf(stderr,"got assetid\n");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )

From c7503fcf73f34d62f823783408b61538fbdce059 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:54:43 -1100
Subject: [PATCH 356/623] Test

---
 src/cc/assets.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 012590441..8aa3580bb 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -205,10 +205,19 @@ CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::st
     opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
     return(opret);
 }
-    
+
+uint256 revuint256(uint256 txid)
+{
+    uint256 revtxid; int32_t i;
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&assetid)[i];
+    return(revtxid);
+}
+
 CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    assetid = revuint256(assetid);
     switch ( funcid )
     {
         case 't':  case 'x': case 'o':
@@ -218,6 +227,7 @@ CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t pri
             opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
             break;
         case 'E': case 'e':
+            assetid2 = revuint256(assetid2);
             opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
             break;
         default:
@@ -351,13 +361,16 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
                 {
                     int32_t i; for (i=31; i>=0; i--)
                         fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-                    fprintf(stderr,"got assetid\n");
+                    fprintf(stderr," got assetid\n");
                     return(funcid);
                 }
                 break;
             case 's': case 'b': case 'S': case 'B':
                 if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    fprintf(stderr,"got price %llu\n",(long long)price);
                     return(funcid);
+                }
                 break;
             case 'E': case 'e':
                 if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
@@ -1085,7 +1098,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("Invalid opreturn payload");
     for (i=31; i>=0; i--)
         fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-    fprintf(stderr,"got assetid\n");
+    fprintf(stderr," got assetid\n");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )

From fc00ea5f5ce6e01378e6b8115dece58405e8f14c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 07:55:24 -1100
Subject: [PATCH 357/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8aa3580bb..c07e5cc53 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -210,7 +210,7 @@ uint256 revuint256(uint256 txid)
 {
     uint256 revtxid; int32_t i;
     for (i=31; i>=0; i--)
-        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&assetid)[i];
+        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&txid)[i];
     return(revtxid);
 }
 

From d558f6e581f5bd2b3ebd8028382b14b4bde97474 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:00:44 -1100
Subject: [PATCH 358/623] Test

---
 src/cc/assets.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index c07e5cc53..3616ed596 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -344,7 +344,7 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
            
 uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
 {
-    std::vector<uint8_t> vopret; uint8_t funcid=0,*script;
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
     GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();
     memset(&assetid,0,sizeof(assetid));
@@ -357,23 +357,23 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
         switch ( funcid )
         {
             case 't':  case 'x': case 'o':
-                if ( E_UNMARSHAL(vopret, ss >> assetid) != 0 )
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
                 {
-                    int32_t i; for (i=31; i>=0; i--)
+                    int32_t i; for (i=0; i<32; i++)
                         fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
                     fprintf(stderr," got assetid\n");
                     return(funcid);
                 }
                 break;
             case 's': case 'b': case 'S': case 'B':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
                 {
                     fprintf(stderr,"got price %llu\n",(long long)price);
                     return(funcid);
                 }
                 break;
             case 'E': case 'e':
-                if ( E_UNMARSHAL(vopret, ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
                     return(funcid);
                 break;
             default:

From ca2f9c6d9ed4634923eab590ee9007369c387df5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:03:39 -1100
Subject: [PATCH 359/623] Test

---
 src/cc/assets.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3616ed596..c14c2affe 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -362,19 +362,26 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
                     int32_t i; for (i=0; i<32; i++)
                         fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
                     fprintf(stderr," got assetid\n");
+                    assetid = revuint256(assetid);
                     return(funcid);
                 }
                 break;
             case 's': case 'b': case 'S': case 'B':
                 if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
                 {
+                    assetid = revuint256(assetid);
                     fprintf(stderr,"got price %llu\n",(long long)price);
                     return(funcid);
                 }
                 break;
             case 'E': case 'e':
                 if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    fprintf(stderr,"got price %llu\n",(long long)price);
+                    assetid = revuint256(assetid);
+                    assetid2 = revuint256(assetid2);
                     return(funcid);
+                }
                 break;
             default:
                 fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);

From b03de060df0018eaab84369bf69dc268ae48d324 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:09:45 -1100
Subject: [PATCH 360/623] Test

---
 src/cc/assets.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index c14c2affe..59042b911 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -834,25 +834,29 @@ vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remainin
 
 uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
 {
-    uint256 hashBlock; char destaddr[64];
+    uint256 hashBlock; char destaddr[64],unspendable[64];
     origaddr[0] = destaddr[0] = 0;
+    GetCCaddress(EVAL_ASSETS,unspendable,GetUnspendable(EVAL_ASSETS,0));
     if ( tx.vin[1].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
     else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-   else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
+    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,unspendable) != 0 )
+    {
+        fprintf(stderr,"%s vs %s\n",destaddr,unspendable);
         return eval->Invalid("invalid vin unspendableaddr");
+    }
     else if ( vinTx.vout[0].nValue < 10000 )
         return eval->Invalid("invalid dust for buyvin");
     else if ( Getorigaddr(origaddr,vinTx) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
-    else return(vinTx.vout[0].nValue);
+    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
+    return(vinTx.vout[0].nValue);
 }
 
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
-    fprintf(stderr,"assetvalidatebuyin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )

From e51e9274e1a1d479f9fcdfbce625721edfdc71cd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:26:59 -1100
Subject: [PATCH 361/623] Test

---
 src/cc/assets.cpp        | 22 ++++++++--------------
 src/wallet/rpcwallet.cpp | 21 ++++++++++++++++-----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 59042b911..813437970 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -359,9 +359,6 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
             case 't':  case 'x': case 'o':
                 if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
                 {
-                    int32_t i; for (i=0; i<32; i++)
-                        fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-                    fprintf(stderr," got assetid\n");
                     assetid = revuint256(assetid);
                     return(funcid);
                 }
@@ -370,7 +367,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
                 if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
                 {
                     assetid = revuint256(assetid);
-                    fprintf(stderr,"got price %llu\n",(long long)price);
+                    //fprintf(stderr,"got price %llu\n",(long long)price);
                     return(funcid);
                 }
                 break;
@@ -698,30 +695,30 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     return(0);
 }
                
-std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts)
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
 {
-    CMutableTransaction mtx; CPubKey mypk; int32_t i,n; uint64_t CCchange=0,inputs=0,total=0;
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        n = outputs.size();
+        /*n = outputs.size();
         if ( n == amounts.size() )
         {
             for (i=0; i<n; i++)
-                total += amounts[i];
+                total += amounts[i];*/
             if ( (inputs= AddCCinputs(mtx,mypk,assetid,total)) > 0 )
             {
                 if ( inputs > total )
                     CCchange = (inputs - total);
-                for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(amounts[i],outputs[i]));
+                //for (i=0; i<n; i++)
+                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(pubkey)));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));
             } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        } else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
+        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
     }
     return(0);
 }
@@ -1107,9 +1104,6 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    for (i=31; i>=0; i--)
-        fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-    fprintf(stderr," got assetid\n");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 13816496f..c1352dfe2 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,7 +4831,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
-std::string CreateAssetTransfer(uint64_t txfee,uint256 assetid,std::vector<CPubKey>outputs,std::vector<uint64_t>amounts);
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
 std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
 std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
 std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout);
@@ -4858,13 +4858,24 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));
-    } else result.push_back(Pair("error", "could create transaction"));
+    } else result.push_back(Pair("error", "couldnt create transaction"));
     return(result);
 }
 
 UniValue tokentransfer(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ);
+    UniValue result(UniValue::VOBJ); std::string hex; uint64_t amount; uint256 tokenid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokentransfer tokenid destpubkey amount\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    std::vector<unsigned char> pubkey(ParseHex(params[1].get_str().c_str()));
+    amount = atol(params[2].get_str().c_str());
+    hex = AssetTransfer(0,tokenid,pubkey,amount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt transfer assets"));
     return(result);
 }
 
@@ -4882,7 +4893,7 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));
-    } else result.push_back(Pair("error", "could create bid"));
+    } else result.push_back(Pair("error", "couldnt create bid"));
     return(result);
 }
 
@@ -4898,7 +4909,7 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));
-    } else result.push_back(Pair("error", "could cancel bid"));
+    } else result.push_back(Pair("error", "couldnt cancel bid"));
     return(result);
 }
 

From 0e0cbec050770abfc66014b22bb6be8f7f968bc7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:27:55 -1100
Subject: [PATCH 362/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 813437970..3362e4d31 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -713,7 +713,7 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
                 if ( inputs > total )
                     CCchange = (inputs - total);
                 //for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(pubkey)));
+                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));

From b72f0608509ec793bb5ace2a615d252709e1fd14 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:38:37 -1100
Subject: [PATCH 363/623] Dust exemption

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 1350240b3..ee014e635 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -748,7 +748,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason, const int nHeight)
         else if ((whichType == TX_MULTISIG) && (!fIsBareMultisigStd)) {
             reason = "bare-multisig";
             return false;
-        } else if (txout.IsDust(::minRelayTxFee)) {
+        } else if (txout.scriptPubKey.IsPayToCryptoCondition() == 0 && txout.IsDust(::minRelayTxFee)) {
             reason = "dust";
             return false;
         }

From f49373054880273c5332678a011fac4180a71f27 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:42:17 -1100
Subject: [PATCH 364/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3362e4d31..604a6e7d5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -451,14 +451,14 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
         if ( v >= n-1 )
             return(0);
         nValue = tx.vout[v].nValue;
-        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-            return(0);
         if ( funcid == 'c' )
         {
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
-        else if ( funcid != 'E' )
+        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+            return(0);
+        if ( funcid != 'E' )
         {
             if ( assetid == refassetid )
                 return(nValue);

From e84fd563dffa9d73765b8157ab824f00473d9827 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:47:31 -1100
Subject: [PATCH 365/623] Test

---
 src/cc/assets.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 604a6e7d5..6e4df0f9f 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -356,6 +356,8 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
         fprintf(stderr,"decode.[%c]\n",funcid);
         switch ( funcid )
         {
+            case 'c': return(funcid);
+                break;
             case 't':  case 'x': case 'o':
                 if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
                 {
@@ -453,6 +455,10 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
         nValue = tx.vout[v].nValue;
         if ( funcid == 'c' )
         {
+            int32_t i;
+            for (i=31; i>=0; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&refassetid)[i]);
+            fprintf(stderr," isassetvout %s/v%d\n",tx.GetHash().ToString().c_str(),v);
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }

From 22e6472c482929ed7348e11e6e136783120368ca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:51:20 -1100
Subject: [PATCH 366/623] Test

---
 src/cc/assets.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 6e4df0f9f..606b6561c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -450,9 +450,10 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
     {
         n = tx.vout.size();
+        nValue = tx.vout[v].nValue;
+        fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
         if ( v >= n-1 )
             return(0);
-        nValue = tx.vout[v].nValue;
         if ( funcid == 'c' )
         {
             int32_t i;
@@ -462,9 +463,12 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
-        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        {
+            fprintf(stderr,"null decodeopret\n");
             return(0);
-        if ( funcid != 'E' )
+        }
+        else if ( funcid != 'E' )
         {
             if ( assetid == refassetid )
                 return(nValue);
@@ -477,6 +481,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
                 return(nValue);
         }
     }
+    fprintf(stderr,"Isassetvout: normal output\n");
     return(0);
 }
 

From ff3d484a01e24e9bb54a9fc219ffe14d8bcd8ab0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 08:54:25 -1100
Subject: [PATCH 367/623] Test

---
 src/cc/assets.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 606b6561c..5468de0b0 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -454,7 +454,12 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
         fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
         if ( v >= n-1 )
             return(0);
-        if ( funcid == 'c' )
+        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        {
+            fprintf(stderr,"null decodeopret\n");
+            return(0);
+        }
+        else if ( funcid == 'c' )
         {
             int32_t i;
             for (i=31; i>=0; i--)
@@ -463,11 +468,6 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
-        else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        {
-            fprintf(stderr,"null decodeopret\n");
-            return(0);
-        }
         else if ( funcid != 'E' )
         {
             if ( assetid == refassetid )

From 9c068b898a941ea40e55b2d8cf24ae7e55f9b48b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:12:29 -1100
Subject: [PATCH 368/623] New token

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 5468de0b0..132d3b908 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -481,7 +481,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
                 return(nValue);
         }
     }
-    fprintf(stderr,"Isassetvout: normal output\n");
+    fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
     return(0);
 }
 
@@ -657,7 +657,7 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
 {
     uint64_t totalinputs = 0;
-    mtx.vin.push_back(CTxIn(Parseuint256((char *)"01eecd0fcaa2b0a9980c649e04a158135ebec2cbd1a3711089b90e196d5cab3e"),0,CScript()));
+    mtx.vin.push_back(CTxIn(Parseuint256((char *)"5117c5f5f7b077c3f8ef08bc0f5789d6b53a6fea61ee0a51b5c829797bd81a57"),0,CScript()));
     totalinputs = COIN;
     return(totalinputs);
 }

From 70b25592f3c71657cfdf559e6babbb80433013fa Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:28:36 -1100
Subject: [PATCH 369/623] Test

---
 src/cc/assets.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 132d3b908..7dae3e653 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -865,6 +865,7 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
+    fprintf(stderr,"AssetValidateBuyvin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
@@ -883,6 +884,7 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint64_t nValue,assetoshis;
+    fprintf(stderr,"AssetValidateSellvin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
@@ -894,6 +896,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
+    fprintf(stderr,"AssetValidate\n");
     numvins = tx.vin.size();
     outputs = inputs = 0;
     if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
@@ -935,6 +938,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("no asset inputs for transfer");
             else if ( inputs != outputs )
                 return eval->Invalid("mismatched inputs and outputs for transfer");
+            fprintf(stderr,"transfer validated %.8f -> %.8f\n",(double)inputs/COIN,(double)outputs/COIN);
             break;
 
         case 'b': // buyoffer
@@ -1016,6 +1020,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     }
                 } else return eval->Invalid("vin2 not enough asset2 for fillbuy");
             } else return eval->Invalid("vin2 not asset for fillbuy");
+            fprintf(stderr,"fillbuy validated\n");
             break;
             
         case 's': // selloffer
@@ -1101,6 +1106,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             }
             break;
     }
+    fprintf(stderr,"done Process assets\n");
     return(true);
 }
 
@@ -1109,6 +1115,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero;
     CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     CTransaction tx = *(CTransaction *)&ctx;
+    fprintf(stderr,"Process assets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( (n= tx.vout.size()) == 0 )

From 6583cbd16fc3de6fefa13c65b41f196cb5614b27 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:38:27 -1100
Subject: [PATCH 370/623] Print

---
 src/cc/assets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 7dae3e653..d3995fe01 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1122,6 +1122,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
+    fprintf(stderr,"checking assetid tx\n");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )

From e047028ff3244e709a15db37f4d494bc8032be17 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:43:57 -1100
Subject: [PATCH 371/623] Test

---
 src/cc/assets.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d3995fe01..4b9ab7ddf 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1122,10 +1122,13 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    fprintf(stderr,"checking assetid tx\n");
-    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset create txid");
-    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset2 create txid");
+    if ( 0 )
+    {
+        fprintf(stderr,"checking assetid tx\n");
+        if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+            return eval->Invalid("cant find asset create txid");
+        if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+            return eval->Invalid("cant find asset2 create txid");
+    }
     return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey));
 }

From 46d601536ae4ff58123b5274a9721b8781452a1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:45:28 -1100
Subject: [PATCH 372/623] Test

---
 src/cc/assets.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4b9ab7ddf..c7c9eeeb8 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -847,7 +847,7 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
     GetCCaddress(EVAL_ASSETS,unspendable,GetUnspendable(EVAL_ASSETS,0));
     if ( tx.vin[1].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
-    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+    else if ( eval->GetTxConfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
     else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,unspendable) != 0 )
     {
@@ -923,7 +923,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             {
                 if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
                 {
-                    if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                    if ( eval->GetTxConfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                         return eval->Invalid("always should find vin, but didnt");
                     else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
                         inputs += assetoshis;
@@ -1001,7 +1001,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
             else if ( IsAssetInput(tx.vin[2].scriptSig) != 0 )
             {
-                if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+                if ( eval->GetTxConfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
                 {
@@ -1035,7 +1035,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("illegal null remaining_price for selloffer");
             if ( IsAssetInput(tx.vin[1].scriptSig) != 0 )
             {
-                if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+                if ( eval->GetTxConfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
                     return eval->Invalid("illegal missing assetvin for selloffer");
@@ -1081,7 +1081,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("invalid vin2 is CC for fillsell");
             else if ( funcid == 'E' && IsAssetInput(tx.vin[2].scriptSig) == 0 )
                 return eval->Invalid("invalid vin2 is CC for fillexchange");
-            else if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+            else if ( eval->GetTxConfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nValue == 0) )
                 return eval->Invalid("invalid asset2 vin value for fillexchange");
@@ -1122,12 +1122,12 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    if ( 0 )
+    if ( 1 )
     {
         fprintf(stderr,"checking assetid tx\n");
-        if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+        if ( eval->GetTxConfirmed(assetid,createTx,hashBlock) == 0 )
             return eval->Invalid("cant find asset create txid");
-        if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        if ( assetid2 != zero && eval->GetTxConfirmed(assetid2,createTx,hashBlock) == 0 )
             return eval->Invalid("cant find asset2 create txid");
     }
     return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey));

From 26bb85ca789864fd8edaa4e3ba82aca9ac4c2b38 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 09:50:52 -1100
Subject: [PATCH 373/623] Test

---
 src/cc/assets.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index c7c9eeeb8..b6801e322 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -847,7 +847,7 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
     GetCCaddress(EVAL_ASSETS,unspendable,GetUnspendable(EVAL_ASSETS,0));
     if ( tx.vin[1].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
-    else if ( eval->GetTxConfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
     else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,unspendable) != 0 )
     {
@@ -896,13 +896,14 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
-    fprintf(stderr,"AssetValidate\n");
+    fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
     if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
         return eval->Invalid("illegal assetid");
+    fprintf(stderr,"switch\n");
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs
@@ -923,7 +924,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             {
                 if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
                 {
-                    if ( eval->GetTxConfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                    if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                         return eval->Invalid("always should find vin, but didnt");
                     else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
                         inputs += assetoshis;
@@ -1001,7 +1002,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
             else if ( IsAssetInput(tx.vin[2].scriptSig) != 0 )
             {
-                if ( eval->GetTxConfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+                if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
                 {
@@ -1035,7 +1036,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("illegal null remaining_price for selloffer");
             if ( IsAssetInput(tx.vin[1].scriptSig) != 0 )
             {
-                if ( eval->GetTxConfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+                if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
                     return eval->Invalid("illegal missing assetvin for selloffer");
@@ -1081,7 +1082,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("invalid vin2 is CC for fillsell");
             else if ( funcid == 'E' && IsAssetInput(tx.vin[2].scriptSig) == 0 )
                 return eval->Invalid("invalid vin2 is CC for fillexchange");
-            else if ( eval->GetTxConfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
+            else if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nValue == 0) )
                 return eval->Invalid("invalid asset2 vin value for fillexchange");
@@ -1122,13 +1123,11 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    if ( 1 )
-    {
-        fprintf(stderr,"checking assetid tx\n");
-        if ( eval->GetTxConfirmed(assetid,createTx,hashBlock) == 0 )
-            return eval->Invalid("cant find asset create txid");
-        if ( assetid2 != zero && eval->GetTxConfirmed(assetid2,createTx,hashBlock) == 0 )
-            return eval->Invalid("cant find asset2 create txid");
-    }
+    fprintf(stderr,"checking assetid tx\n");
+    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset create txid");
+    fprintf(stderr,"done checking assetid tx\n");
+    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset2 create txid");
     return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey));
 }

From f2e8496cf961024384b9e5c7ae27d49d1dd666d1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:01:25 -1100
Subject: [PATCH 374/623] Test

---
 src/miner.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 0c458a985..2a364a89f 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -671,6 +671,7 @@ static bool ProcessBlockFound(CBlock* pblock)
         }
     }
     // Track how many getdata requests this block gets
+    fprintf(stderr,"maprequestcount\n");
     //if ( 0 )
     {
         LOCK(wallet.cs_wallet);
@@ -680,11 +681,15 @@ static bool ProcessBlockFound(CBlock* pblock)
     
     // Process this block the same as if we had received it from another node
     CValidationState state;
+    fprintf(stderr,"processnewblock\n");
     if (!ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, pblock, true, NULL))
         return error("KomodoMiner: ProcessNewBlock, block not accepted");
-    
+    fprintf(stderr,"track mined block\n");
+
     TrackMinedBlock(pblock->GetHash());
+    fprintf(stderr,"komodo_broadcast\n");
     komodo_broadcast(pblock,16);
+    fprintf(stderr,"done processblockfound\n");
     return true;
 }
 

From 2ab9183cd702f2c799d583eac6d0aeb4e6c4f20c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:08:06 -1100
Subject: [PATCH 375/623] Test

---
 src/miner.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 2a364a89f..7bdaad680 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -634,6 +634,8 @@ void komodo_broadcast(CBlock *pblock,int32_t limit)
     //fprintf(stderr,"finished broadcast new block t.%u\n",(uint32_t)time(NULL));
 }
 
+extern uint32_t ASSETCHAINS_CC;
+
 static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
 #else
 static bool ProcessBlockFound(CBlock* pblock)
@@ -688,7 +690,8 @@ static bool ProcessBlockFound(CBlock* pblock)
 
     TrackMinedBlock(pblock->GetHash());
     fprintf(stderr,"komodo_broadcast\n");
-    komodo_broadcast(pblock,16);
+    if ( ASSETCHAINS_CC == 0 )
+        komodo_broadcast(pblock,16);
     fprintf(stderr,"done processblockfound\n");
     return true;
 }

From b712e32f63f0cfc433312f72bd726f24385eda4d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:12:44 -1100
Subject: [PATCH 376/623] Filter duplicate validates

---
 src/cc/assets.cpp | 13 ++++++++++---
 src/miner.cpp     | 12 ++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index b6801e322..e7a8f4773 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1113,8 +1113,11 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    static uint256 zero;
-    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    static uint256 zero,prevtxid;
+    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    txid = tx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
     CTransaction tx = *(CTransaction *)&ctx;
     fprintf(stderr,"Process assets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
@@ -1129,5 +1132,9 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     fprintf(stderr,"done checking assetid tx\n");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    return(AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey));
+    if ( AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
+    {
+        prevtxid = txid;
+        return(true);
+    } else return(false);
 }
diff --git a/src/miner.cpp b/src/miner.cpp
index 7bdaad680..0c458a985 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -634,8 +634,6 @@ void komodo_broadcast(CBlock *pblock,int32_t limit)
     //fprintf(stderr,"finished broadcast new block t.%u\n",(uint32_t)time(NULL));
 }
 
-extern uint32_t ASSETCHAINS_CC;
-
 static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
 #else
 static bool ProcessBlockFound(CBlock* pblock)
@@ -673,7 +671,6 @@ static bool ProcessBlockFound(CBlock* pblock)
         }
     }
     // Track how many getdata requests this block gets
-    fprintf(stderr,"maprequestcount\n");
     //if ( 0 )
     {
         LOCK(wallet.cs_wallet);
@@ -683,16 +680,11 @@ static bool ProcessBlockFound(CBlock* pblock)
     
     // Process this block the same as if we had received it from another node
     CValidationState state;
-    fprintf(stderr,"processnewblock\n");
     if (!ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, pblock, true, NULL))
         return error("KomodoMiner: ProcessNewBlock, block not accepted");
-    fprintf(stderr,"track mined block\n");
-
+    
     TrackMinedBlock(pblock->GetHash());
-    fprintf(stderr,"komodo_broadcast\n");
-    if ( ASSETCHAINS_CC == 0 )
-        komodo_broadcast(pblock,16);
-    fprintf(stderr,"done processblockfound\n");
+    komodo_broadcast(pblock,16);
     return true;
 }
 

From c3d76b21c76f138964a47bcf7017353c0fb94bd8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:13:29 -1100
Subject: [PATCH 377/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e7a8f4773..64cde03a4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1115,7 +1115,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
 {
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
-    txid = tx.GetHash();
+    txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
     CTransaction tx = *(CTransaction *)&ctx;

From 62f69521e01321d7051eb38d79e159f24de9c5f6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:18:46 -1100
Subject: [PATCH 378/623] Test

---
 src/cc/assets.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 64cde03a4..cfdd050e8 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -353,7 +353,7 @@ uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &asseti
     if ( script[0] == EVAL_ASSETS )
     {
         funcid = script[1];
-        fprintf(stderr,"decode.[%c]\n",funcid);
+        //fprintf(stderr,"decode.[%c]\n",funcid);
         switch ( funcid )
         {
             case 'c': return(funcid);
@@ -451,7 +451,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
     {
         n = tx.vout.size();
         nValue = tx.vout[v].nValue;
-        fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
+        //fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
         if ( v >= n-1 )
             return(0);
         if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
@@ -461,10 +461,6 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
         }
         else if ( funcid == 'c' )
         {
-            int32_t i;
-            for (i=31; i>=0; i--)
-                fprintf(stderr,"%02x",((uint8_t *)&refassetid)[i]);
-            fprintf(stderr," isassetvout %s/v%d\n",tx.GetHash().ToString().c_str(),v);
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
@@ -481,7 +477,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
                 return(nValue);
         }
     }
-    fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
+    //fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
     return(0);
 }
 
@@ -1119,17 +1115,14 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     if ( txid == prevtxid )
         return(true);
     CTransaction tx = *(CTransaction *)&ctx;
-    fprintf(stderr,"Process assets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( (n= tx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
     else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    fprintf(stderr,"checking assetid tx\n");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
-    fprintf(stderr,"done checking assetid tx\n");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
     if ( AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )

From 09c7f7cc5a3668deee78848fc6cc21339205efb6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:28:15 -1100
Subject: [PATCH 379/623] Filled

---
 src/wallet/rpcwallet.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c1352dfe2..d72a7d6cd 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4915,7 +4915,19 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
 
 UniValue tokenfillbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ);
+    UniValue result(UniValue::VOBJ); int32_t fillvout; std::string hex; uint256 tokenid,bidtxid,filltxid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokenfillbid tokenid bidtxid filltxid fillvout\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    bidtxid = Parseuint256((char *)params[1].get_str().c_str());
+    filltxid = Parseuint256((char *)params[2].get_str().c_str());
+    fillvout = atoi(params[3].get_str().c_str());
+    hex = FillBuyOffer(0,bidamount,tokenid,bidtxid,filltxid,fillvout);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt fill bid"));
     return(result);
 }
 

From 05858018b990e4023bb019506ea9771a81ff1c6b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:30:53 -1100
Subject: [PATCH 380/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d72a7d6cd..9d9bb3b20 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4922,7 +4922,7 @@ UniValue tokenfillbid(const UniValue& params, bool fHelp)
     bidtxid = Parseuint256((char *)params[1].get_str().c_str());
     filltxid = Parseuint256((char *)params[2].get_str().c_str());
     fillvout = atoi(params[3].get_str().c_str());
-    hex = FillBuyOffer(0,bidamount,tokenid,bidtxid,filltxid,fillvout);
+    hex = FillBuyOffer(0,tokenid,bidtxid,filltxid,fillvout);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From e78fa189c1216ddac49c94b9055df23eb986b3f6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:32:59 -1100
Subject: [PATCH 381/623] Fix

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9d9bb3b20..8005be247 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4916,7 +4916,7 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
 UniValue tokenfillbid(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); int32_t fillvout; std::string hex; uint256 tokenid,bidtxid,filltxid;
-    if ( fHelp || params.size() != 3 )
+    if ( fHelp || params.size() != 4 )
         throw runtime_error("tokenfillbid tokenid bidtxid filltxid fillvout\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     bidtxid = Parseuint256((char *)params[1].get_str().c_str());

From 7a2d103035217f1210c2dbac9f35d9c73fe17e6e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:40:10 -1100
Subject: [PATCH 382/623] Test

---
 src/cc/assets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cfdd050e8..19b2e1554 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -629,6 +629,7 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
     remaining_price = (totalprice - received);
     price = (totalprice * COIN) / orig_nValue;
     mult = (received * COIN);
+    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
     if ( price > 0 && (paid= mult / price) > 0 )
     {
         if ( (mult % price) != 0 )

From 325f5530742e304d0142a9fbd7948c05ff7723ec Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:53:55 -1100
Subject: [PATCH 383/623] Handle overfill

---
 src/cc/assets.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 19b2e1554..766d5e4c9 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -623,9 +623,11 @@ bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64
     return(true);
 }
 
-bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t received,uint64_t totalprice)
+bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
 {
     uint64_t remaining_nValue,price,mult;
+    if ( received >= totalprice )
+        received = totalprice;
     remaining_price = (totalprice - received);
     price = (totalprice * COIN) / orig_nValue;
     mult = (received * COIN);
@@ -783,9 +785,13 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
             {
                 mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
                 SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(CTxOut(bidamount - paid_amount,CScript() << ParseHex(Unspendablehex) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( filltx.vout[fillvout].nValue > fillamount )
+                {
+                    mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,pubkey2pk(mypk)));
+                }
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
         }

From c940ac885c9eff1bfbdd30e848b60d531f2de23a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 10:55:10 -1100
Subject: [PATCH 384/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 766d5e4c9..ba587bf53 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -790,7 +790,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
                 if ( filltx.vout[fillvout].nValue > fillamount )
                 {
-                    mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,pubkey2pk(mypk)));
+                    mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk));
                 }
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");

From bd92bb720264c3324983eb6bb5c87efee1016035 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:02:28 -1100
Subject: [PATCH 385/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index ba587bf53..975ab3e7e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -792,6 +792,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
                 {
                     mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk));
                 }
+                fprintf(stderr,"remaining %llu -> origpubkey\n");
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
         }
@@ -906,7 +907,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
         return eval->Invalid("illegal assetid");
-    fprintf(stderr,"switch\n");
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs
@@ -999,6 +999,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.2: vin.2 assetoshis to original pubkey
             //vout.3: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+            fprintf(stderr,"inside fillbuy\n");
             if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( tmporigpubkey != origpubkey )

From 7c954648ca48a7b353861d48f84dcd3a943c3fe1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:03:24 -1100
Subject: [PATCH 386/623] Test

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 975ab3e7e..cf7b7ac0d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -792,7 +792,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
                 {
                     mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk));
                 }
-                fprintf(stderr,"remaining %llu -> origpubkey\n");
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
         }
@@ -907,6 +907,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
         return eval->Invalid("illegal asset vin0");
     if ( funcid != 'c' && assetid == zero )
         return eval->Invalid("illegal assetid");
+    fprintf(stderr,"switch\n");
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs

From 51e9a1cc59297ecc2a746390c44455ff4b100b26 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:14:22 -1100
Subject: [PATCH 387/623] Test

---
 src/cc/assets.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cf7b7ac0d..53e55bd68 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -869,18 +869,25 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
-    fprintf(stderr,"AssetValidateBuyvin\n");
+    int32_t i; for (i=32; i>=0; i--)
+        fprintf(stderr,"%02x",((uint8_t *)&refassetid)[i]);
+    fprintf(stderr," AssetValidateBuyvin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("invalid normal vout0 for buyvin");
     else
     {
-        fprintf(stderr,"have %.8f checking assetid\n",(double)nValue/COIN);
+        fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
         if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
+        {
+            for (i=32; i>=0; i--)
+                fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+            fprintf(stderr," AssetValidateBuyvin\n");
             return eval->Invalid("invalid assetid for buyvin");
+        }
     }
     return(nValue);
 }

From 463637b0a4be7a0b65010744991aa62c40a43f00 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:26:04 -1100
Subject: [PATCH 388/623] Test

---
 src/cc/assets.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 53e55bd68..190a36927 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -869,7 +869,7 @@ uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransactio
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
-    int32_t i; for (i=32; i>=0; i--)
+    int32_t i; for (i=31; i>=0; i--)
         fprintf(stderr,"%02x",((uint8_t *)&refassetid)[i]);
     fprintf(stderr," AssetValidateBuyvin\n");
     if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
@@ -1019,10 +1019,13 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
                 {
                     if ( tx.vout[2].nValue != assetoshis )
+                    {
+                        fprintf(stderr,"[2] value %.8f vs %.8f\n",(double)tx.vout[2].nValue/COIN,(double)assetoshis/COIN);
                         return eval->Invalid("mismatched assetoshis for fillbuy");
+                    }
                     else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                         return eval->Invalid("mismatched vout2 destaddr for fillbuy");
-                    else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,assetoshis,tmpprice) == false )
+                    else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                         return eval->Invalid("mismatched remainder for fillbuy");
                     else if ( remaining_price != 0 )
                     {

From eb4ce88117beebb77e306ef3a84ff4b67b9dc6ec Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:27:34 -1100
Subject: [PATCH 389/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 190a36927..3cd5fc144 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1018,7 +1018,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     return eval->Invalid("always should find vin, but didnt");
                 else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
                 {
-                    if ( tx.vout[2].nValue != assetoshis )
+                    if ( tx.vout[2].nValue > assetoshis )
                     {
                         fprintf(stderr,"[2] value %.8f vs %.8f\n",(double)tx.vout[2].nValue/COIN,(double)assetoshis/COIN);
                         return eval->Invalid("mismatched assetoshis for fillbuy");

From 93dd43dbb5cc54a16d6e1779f7790210308b1f1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:29:32 -1100
Subject: [PATCH 390/623] Test

---
 src/cc/assets.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3cd5fc144..30bf62c96 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1024,7 +1024,10 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                         return eval->Invalid("mismatched assetoshis for fillbuy");
                     }
                     else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
+                    {
+                        fprintf(stddrr,"destaddr.(%s) vs origaddr.(%s)\n",destaddr,origaddr);
                         return eval->Invalid("mismatched vout2 destaddr for fillbuy");
+                    }
                     else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                         return eval->Invalid("mismatched remainder for fillbuy");
                     else if ( remaining_price != 0 )

From 4e4a5a1cde24a9cf4ede7e3dbac9d58c4e2e188f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 11:30:06 -1100
Subject: [PATCH 391/623] tst

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 30bf62c96..2a5368e5c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1025,7 +1025,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     }
                     else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
                     {
-                        fprintf(stddrr,"destaddr.(%s) vs origaddr.(%s)\n",destaddr,origaddr);
+                        fprintf(stderr,"destaddr.(%s) vs origaddr.(%s)\n",destaddr,origaddr);
                         return eval->Invalid("mismatched vout2 destaddr for fillbuy");
                     }
                     else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )

From 143488c829db6ea942f1900950a9a461f4914467 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 18:53:45 -1100
Subject: [PATCH 392/623] Code rest of rpc calls with initial implementation

---
 src/cc/assets.cpp        | 607 +++++++++++++++++++++++----------------
 src/rpcserver.cpp        |  16 +-
 src/wallet/rpcwallet.cpp | 161 ++++++++++-
 3 files changed, 520 insertions(+), 264 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2a5368e5c..56f320349 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -25,10 +25,18 @@
 #include <univalue.h>
 #include <exception>
 
+#ifdef ENABLE_WALLET
+extern CWallet* pwalletMain;
+#endif
 extern uint8_t NOTARY_PUBKEY33[33];
 uint256 Parseuint256(char *hexstr);
+bool GetAddressUnspent(uint160 addressHash, int type,
+                       std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs);
 
-// code rpc
+// code info and totals to validate asset total and balances
+// misc rpc, ie. CCaddress
+// test underfill, overfill, exactfill
+// sell and maybe even exchange
 
 /*
  Assets can be created or transferred.
@@ -87,7 +95,7 @@ uint256 Parseuint256(char *hexstr);
  fillbuy:
  vin.0: normal input
  vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
- vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+ vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
  vout.0: remaining amount of bid to unspendable
  vout.1: vin.1 value to signer of vin.2
  vout.2: vin.2 assetoshis to original pubkey
@@ -98,14 +106,16 @@ uint256 Parseuint256(char *hexstr);
  vin.0: normal input
  vin.1: valid CC output for sale
  vout.0: vin.1 assetoshis output to CC to unspendable
- vout.1: normal output for change (if any)
+ vout.1: CC output for change (if any)
+ vout.2: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
  
  exchange:
  vin.0: normal input
  vin.1: valid CC output
  vout.0: vin.1 assetoshis output to CC to unspendable
- vout.1: normal output for change (if any)
+ vout.1: CC output for change (if any)
+ vout.2: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
  
  cancel:
@@ -118,7 +128,7 @@ uint256 Parseuint256(char *hexstr);
  fillsell:
  vin.0: normal input
  vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
- vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
+ vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
  vout.0: remaining assetoshis -> unspendable
  vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
  vout.2: vin.2 value to original pubkey [origpubkey]
@@ -128,7 +138,7 @@ uint256 Parseuint256(char *hexstr);
  fillexchange:
  vin.0: normal input
  vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
- vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+ vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
  vout.0: remaining assetoshis -> unspendable
  vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
  vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
@@ -136,34 +146,6 @@ uint256 Parseuint256(char *hexstr);
  vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
- 
-/*
-# Using Hoek to mangle asset transactions
-# Install haskell stack & hoek
-curl -sSL https://get.haskellstack.org/ | sh
-git clone https://github.com/libscott/hoek; cd hoek; stack install
-# Let...
-addr=RHTcNNYXEZhLGRcXspA2H4gw2v4u6w8MNp
-wif=UsNAMqFwntEpuFBTbG28e3uAJxBNRM8Vi5FxAqHfoRJJNoZ84Esj
-pk=02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c
-# Our CC is a 2 of 2 where the subconditions are an secp256k1, and an EVAL code calling 0xe3 (EVAL_ASSETS).
-cc='{"type":"threshold-sha-256","threshold":2,"subfulfillments":[{"type":"eval-sha-256","code":"e3"},{"type":"secp256k1-sha-256","publicKey":"02184e11939da3805808cd18921a8b592b98bbaf9f506da8b272ebc3c5fa4d045c"}]}'
-# 1. Create a asset: Just use regular inputs and only colored outputs
-createTx='{"inputs": [{"txid":"51b78168d94ec307e2855697209275d477e05d8647caf29cb9e38fb6a4661145","idx":0,"script":{"address":"'$addr'"}}],"outputs":[{"amount":10,"script":{"condition":'$cc'}}]}'
-# 2. Transfer a asset: use CC inputs, CC outputs, and an OP_RETURN output with the txid of the tx that created the asset (change the txid):
-transferTx='{"inputs": [{"txid":"51b78168d94ec307e2855697209275d477e05d8647caf29cb9e38fb6a4661145","idx":0,"script":{"fulfillment":'$cc'}}],"outputs":[{"amount":0,"script":{"op_return":"cafabda044ac904d56cee79bbbf3ed9b3891a69000ed08f0ddf0a3dd620a3ea6"}},{"amount":10,"script":{"condition":'$cc'}}]}'
-# 3. Sign and encode
-function signEncodeTx () {
-    signed=`hoek signTx '{"privateKeys":["'$wif'"],"tx":'"$1"'}'`;
-    hoek encodeTx "$signed"
-}
-signEncodeTx "$createTx"
-signEncodeTx "$transferTx"
-*/
-
-#ifdef ENABLE_WALLET
-extern CWallet* pwalletMain;
-#endif
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
@@ -171,7 +153,7 @@ extern CWallet* pwalletMain;
 //BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
 
 static uint256 zeroid;
-const char *Unspendableaddr = "RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char Unspendablehex[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t Unspendablepriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
@@ -214,6 +196,14 @@ uint256 revuint256(uint256 txid)
     return(revtxid);
 }
 
+char *uint256_str(char *dest,uint256 txid)
+{
+    int32_t i,j=0;
+    for (i=31; i>=0; i--)
+        sprintf(&dest[j++ * 2] = ((uint8_t *)&txid)[i];
+   return(dest);
+}
+
 CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
@@ -331,6 +321,8 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
     destaddr[0] = 0;
     if ( evalcode == EVAL_ASSETS )
     {
+        if ( pk.size() == 0 )
+            pk = GetUnspendable(EVAL_ASSETS,0);
         if ( (payoutCond= MakeAssetCond(pk)) != 0 )
         {
             Getscriptaddress(destaddr,CCPubKey(payoutCond));
@@ -399,16 +391,17 @@ bool SetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction
     else return(false);
 }
            
-bool Getorigaddr(char *destaddr,CTransaction& tx)
+bool Getorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
     if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
         return(false);
-    script = CScript() << origpubkey << OP_CHECKSIG;
-    return(Getscriptaddress(destaddr,script));
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
+        return(true);
+    else return(false);
 }
-       
+    
 CC* GetCryptoCondition(CScript const& scriptSig)
 {
     auto pc = scriptSig.begin();
@@ -464,6 +457,8 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransacti
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
+        else if ( funcid == 'b' || funcid == 'B' )
+            return(0);
         else if ( funcid != 'E' )
         {
             if ( assetid == refassetid )
@@ -591,7 +586,6 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     else return(0);
 }
 
-           
 bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
 {
     uint64_t price,recvprice;
@@ -640,27 +634,92 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
         return(ValidateRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
     } else return(false);
 }
-           
-/*uint64_t IsNormalUtxo(uint64_t output,uint64_t txfee,uint256 feetxid,int32_t feevout)
-{
-    CTransaction vintx; uint256 hashBlock; uint64_t nValue;
-    if ( GetTransaction(feetxid,vintx,hashBlock,false) != 0 )
-    {
-        nValue = vintx.vout[feevout].nValue;
-        if ( vintx.vout[feevout].scriptPubKey.IsPayToCryptoCondition() == 0 && nValue >= output+txfee )
-            return(nValue);
-    }
-    return(0);
-}*/
 
-uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey mypk,uint256 assetid,uint64_t total)
+void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
 {
-    uint64_t totalinputs = 0;
-    mtx.vin.push_back(CTxIn(Parseuint256((char *)"5117c5f5f7b077c3f8ef08bc0f5789d6b53a6fea61ee0a51b5c829797bd81a57"),0,CScript()));
-    totalinputs = COIN;
+    int32_t i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
+    n = (int32_t)strlen(coinaddr);
+    addrstr.resize(n+1);
+    ptr = (char *)addrstr.data();
+    for (i=0; i<=n; i++)
+        ptr[i] = coinaddr[i];
+    CBitcoinAddress address(addrstr);
+    if ( address.GetIndexKey(hashBytes, type) == 0 )
+        return;
+    addresses.push_back(std::make_pair(hashBytes,type));
+    if ( getAddressesFromParams(params, addresses) == 0 )
+        return;
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
+    {
+        if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
+            return;
+    }
+}
+uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; int32_t type=0;  uint64_t price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash.GetHex();
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
     return(totalinputs);
 }
-       
+
+UniValue AssetOrders(uint256 refassetid)
+{
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VOBJ),obj(UniValue::VOBJ),a(UniValue::VARR); std::vector<uint8_t> origpubkey; std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash.GetHex();
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
+            {
+                funcidstr[0] = funcid;
+                funcidstr[1] = 0;
+                item.push_back(Pair("funcid", funcidstr));
+                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
+                item.push_back(Pair("vout", (int64_t)it->first.index));
+                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
+                if ( funcid == 'b' || funcid == 'B' )
+                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
+                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
+                if ( origpubkey.size() == 33 )
+                {
+                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    item.push_back(Pair("origaddress",origaddr));
+                }
+                if ( assetid != zeroid )
+                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
+                if ( assetid2 != zeroid )
+                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
+                if ( price > 0 )
+                    item.push_back(Pair("price", (int64_t)price));
+                a.push_back(item);
+           
+            }
+        }
+    }
+    return(result);
+}
+
 uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
 {
     int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
@@ -718,7 +777,7 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
         {
             for (i=0; i<n; i++)
                 total += amounts[i];*/
-            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total)) > 0 )
+            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total,60)) > 0 )
             {
                 if ( inputs > total )
                     CCchange = (inputs - total);
@@ -747,6 +806,30 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
     return(0);
 }
 
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( (inputs= AddCCinputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        {
+            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            if ( inputs > askamount )
+                CCchange = (askamount - total);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            if ( assetid2 == zeroid )
+                opret = EncodeOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
+            else opret = EncodeOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        }
+    }
+    return(0);
+}
+
 std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
 {
     CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
@@ -763,35 +846,51 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',assetid,zeroid,0,Mypubkey())));
         }
     }
-    fprintf(stderr,"no normal inputs\n");
     return(0);
 }
 
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout)
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
 {
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey,tmppubkey; int32_t bidvout=0; uint64_t tmpprice,origprice,bidamount,paid_amount,fillamount,remaining_required;
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 && GetTransaction(filltxid,filltx,hashBlock,false) != 0 )
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('x',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
         {
             bidamount = vintx.vout[bidvout].nValue;
             SetOrigpubkey(origpubkey,origprice,vintx);
-            fillamount = filltx.vout[fillvout].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( IsAssetvout(tmpprice,tmppubkey,filltx,fillvout,assetid) == fillamount )
+            if ( (inputs= AddCCinputs(mtx,mypk,assetid,fillamount,60)) > 0 )
             {
-                mtx.vin.push_back(CTxIn(filltxid,fillvout,CScript())); // CC
+                if ( inputs > fillamount )
+                    CCchange = (inputs - fillamount);
                 SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
                 mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( filltx.vout[fillvout].nValue > fillamount )
-                {
-                    mtx.vout.push_back(MakeAssetsVout(filltx.vout[fillvout].nValue - fillamount,mypk));
-                }
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
                 fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
@@ -800,86 +899,74 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256
     return(0);
 }
 
-/*
-
-selloffer:
-vin.0: normal input
-vin.1: valid CC output for sale
-vout.0: vin.1 assetoshis output to CC to unspendable
-vout.1: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
-
-exchange:
-vin.0: normal input
-vin.1: valid CC output
-vout.0: vin.1 assetoshis output to CC to unspendable
-vout.1: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
-
-cancel:
-vin.0: normal input
-vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
-vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
-vout.1: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-
-fillsell:
-vin.0: normal input
-vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
-vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
-vout.0: remaining assetoshis -> unspendable
-vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
-vout.2: vin.2 value to original pubkey [origpubkey]
-vout.3: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
-
-fillexchange:
-vin.0: normal input
-vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
-vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
-vout.0: remaining assetoshis -> unspendable
-vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
-vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
-vout.3: normal output for change (if any)
-vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
-*/
-
-uint64_t AssetValidatevin(Eval* eval,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
 {
-    uint256 hashBlock; char destaddr[64],unspendable[64];
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[askvout].nValue;
+            SetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
+            if ( assetid2 == zeroid )
+                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount);
+            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
+            if ( inputs > 0 )
+            {
+                if ( assetid2 == zeroid && inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx not enough utxos\n");
+        }
+    }
+    return(0);
+}
+
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+{
+    uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
-    GetCCaddress(EVAL_ASSETS,unspendable,GetUnspendable(EVAL_ASSETS,0));
-    if ( tx.vin[1].prevout.n != 0 )
+    if ( tx.vin.size() < 2 )
+        return eval->Invalid("not enough for CC vins");
+    else if ( tx.vin[1].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
     else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,unspendable) != 0 )
+    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,AssetsCCaddr) != 0 )
     {
-        fprintf(stderr,"%s vs %s\n",destaddr,unspendable);
-        return eval->Invalid("invalid vin unspendableaddr");
+        fprintf(stderr,"%s vs %s\n",destaddr,AssetsCCaddr);
+        return eval->Invalid("invalid vin AssetsCCaddr");
     }
     else if ( vinTx.vout[0].nValue < 10000 )
         return eval->Invalid("invalid dust for buyvin");
-    else if ( Getorigaddr(origaddr,vinTx) == 0 )
+    else if ( Getorigaddrs(CCaddr,origaddr,vinTx) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
     fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
     return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 refassetid)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
 {
-    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2;
-    int32_t i; for (i=31; i>=0; i--)
-        fprintf(stderr,"%02x",((uint8_t *)&refassetid)[i]);
-    fprintf(stderr," AssetValidateBuyvin\n");
-    if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("invalid normal vout0 for buyvin");
     else
     {
-        fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
-        if ( DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey) != 'b' )
+        //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
+        if ( (funcid= DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
         {
@@ -892,29 +979,73 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *origaddr,CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint64_t nValue,assetoshis;
     fprintf(stderr,"AssetValidateSellvin\n");
-    if ( (nValue= AssetValidatevin(eval,origaddr,tx,vinTx)) == 0 )
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
         return eval->Invalid("invalid missing CC vout0 for sellvin");
     else return(assetoshis);
 }
 
+bool ConstrainVout(CTxout vout,int32_t CCflag,char *cmpadr,uint64_t nValue)
+{
+    char destaddr[64];
+    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+        return(false);
+    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
+        return(false);
+    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+        return(false);
+    else return(true);
+}
+
+bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=1; i<numvins; i++)
+    {
+        if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
+        {
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                inputs += assetoshis;
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs )
+        return(false);
+    else return(true);
+}
+
 bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64];
+    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
+    preventCCvins = preventCCvouts = -1;
     if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
-    if ( funcid != 'c' && assetid == zero )
-        return eval->Invalid("illegal assetid");
-    fprintf(stderr,"switch\n");
+    else if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else if ( funcid != 'c' )
+    {
+        if ( assetid == zero )
+            return eval->Invalid("illegal assetid");
+        else if ( AssetExactAmounts(eval,tx,assetid) == false )
+            eval->Invalid("asset inputs != outputs");
+    }
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs
@@ -931,25 +1062,8 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.0 to n-2: assetoshis output to CC
             //vout.n-2: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
-            for (i=1; i<numvins; i++)
-            {
-                if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
-                {
-                    if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                        return eval->Invalid("always should find vin, but didnt");
-                    else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
-                        inputs += assetoshis;
-                }
-            }
-            for (i=0; i<numvouts-1; i++)
-            {
-                if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
-                    outputs += assetoshis;
-            }
             if ( inputs == 0 )
                 return eval->Invalid("no asset inputs for transfer");
-            else if ( inputs != outputs )
-                return eval->Invalid("mismatched inputs and outputs for transfer");
             fprintf(stderr,"transfer validated %.8f -> %.8f\n",(double)inputs/COIN,(double)outputs/COIN);
             break;
 
@@ -960,27 +1074,11 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
-            for (i=1; i<numvins; i++)
-            {
-                if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
-                    return eval->Invalid("invalid CC vin for buyoffer");
-            }
-            destaddr[0] = 0;
-            for (i=0; i<numvouts-1; i++)
-            {
-                if ( i == 0 )
-                {
-                    if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
-                        return eval->Invalid("invalid normal vout for buyoffer");
-                    else if ( Getscriptaddress(destaddr,tx.vout[i].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
-                        return eval->Invalid("invalid vout0 destaddr for buyoffer");
-                    else if ( tx.vout[i].nValue < 10000 )
-                        return eval->Invalid("invalid vout0 dust for buyoffer");
-                }
-                else if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                    return eval->Invalid("invalid CC vout for buyoffer");
-            }
-            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",destaddr);
+            else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                return eval->Invalid("invalid vout for buyoffer");
+            preventCCvins = 1;
+            preventCCvouts = 1;
+            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",AssetsCCaddr);
             break;
             
         case 'o': // cancelbuy
@@ -989,55 +1087,50 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['o']
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
-            else if ( nValue != tx.vout[0].nValue )
-                return eval->Invalid("mismatched refund for cancelbuy");
-            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
-                return eval->Invalid("invalid vout0 destaddr for cancelbuy");
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for cancelbuy");
+            else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
+                return eval->Invalid("invalid refund for cancelbuy");
+            preventCCvins = 1;
+            preventCCvouts = 0;
             fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
             break;
             
         case 'B': // fillbuy:
             //vin.0: normal input
             //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
-            //vin.2: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+            //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
             //vout.0: remaining amount of bid to unspendable
             //vout.1: vin.1 value to signer of vin.2
             //vout.2: vin.2 assetoshis to original pubkey
             //vout.3: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-            fprintf(stderr,"inside fillbuy\n");
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
+            preventCCvouts = 4;
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
+            else if ( numvouts < 3 )
+                return eval->Invalid("not enough vouts for fillbuy");
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
-            else if ( IsAssetInput(tx.vin[2].scriptSig) != 0 )
+            if ( inputs != outputs )
+                return eval->Invalid("mismatched inputs vs outputs for fillbuy");
+            else
             {
-                if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
-                    return eval->Invalid("always should find vin, but didnt");
-                else if ( (assetoshis= IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid)) != 0 )
+                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
+                    return eval->Invalid("vout1 is CC for fillbuy");
+                else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                    return eval->Invalid("vout2 is normal for fillbuy");
+                else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                    return eval->Invalid("mismatched remainder for fillbuy");
+                else if ( remaining_price != 0 )
                 {
-                    if ( tx.vout[2].nValue > assetoshis )
-                    {
-                        fprintf(stderr,"[2] value %.8f vs %.8f\n",(double)tx.vout[2].nValue/COIN,(double)assetoshis/COIN);
-                        return eval->Invalid("mismatched assetoshis for fillbuy");
-                    }
-                    else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
-                    {
-                        fprintf(stderr,"destaddr.(%s) vs origaddr.(%s)\n",destaddr,origaddr);
-                        return eval->Invalid("mismatched vout2 destaddr for fillbuy");
-                    }
-                    else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
-                        return eval->Invalid("mismatched remainder for fillbuy");
-                    else if ( remaining_price != 0 )
-                    {
-                        if ( remaining_price < 10000 )
-                            return eval->Invalid("dust vout0 to unspendableaddr for fillbuy");
-                        else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
-                            return eval->Invalid("mismatched vout0 unspendableaddr for fillbuy");
-                    }
-                } else return eval->Invalid("vin2 not enough asset2 for fillbuy");
+                    if ( remaining_price < 10000 )
+                        return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
+                    else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
+                }
             } else return eval->Invalid("vin2 not asset for fillbuy");
             fprintf(stderr,"fillbuy validated\n");
             break;
@@ -1052,17 +1145,9 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null remaining_price for selloffer");
-            if ( IsAssetInput(tx.vin[1].scriptSig) != 0 )
-            {
-                if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
-                    return eval->Invalid("always should find vin, but didnt");
-                else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[1].prevout.n,assetid)) == 0 )
-                    return eval->Invalid("illegal missing assetvin for selloffer");
-                else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
-                    return eval->Invalid("mismatched vout0 unspendableaddr for selloffer");
-                else if ( tx.vout[0].nValue != assetoshis )
-                    return eval->Invalid("mismatched assetoshis for selloffer");
-            } else return eval->Invalid("illegal normal vin1 for selloffer");
+            else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
+            preventCCvouts = 1;
             break;
            
         case 'x': // cancel
@@ -1071,20 +1156,22 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
-            else if ( assetoshis != tx.vout[0].nValue )
-                return eval->Invalid("mismatched refund for cancelbuy");
-            else if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
-                return eval->Invalid("invalid vout0 destaddr for cancel");
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for cancel");
+            else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
+                return eval->Invalid("invalid vout for cancel");
+            preventCCvins = 2;
+            preventCCvouts = 1;
             break;
             
         case 'S': // fillsell
         case 'E': // fillexchange
             //vin.0: normal input
             //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
-            //'S'.vin.2: normal output that satisfies selloffer (*tx.vin[2])->nValue
-            //'E'.vin.2: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+            //'S'.vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
+            //'E'.vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
             //vout.0: remaining assetoshis -> unspendable
             //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
             //'S'.vout.2: vin.2 value to original pubkey [origpubkey]
@@ -1092,40 +1179,54 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.3: normal output for change (if any)
             //'S'.vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
             //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,origaddr,tx,assetid)) == 0 )
-                return(false);
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for fillsell");
-            else if ( funcid == 'S' && IsAssetInput(tx.vin[2].scriptSig) != 0 )
-                return eval->Invalid("invalid vin2 is CC for fillsell");
-            else if ( funcid == 'E' && IsAssetInput(tx.vin[2].scriptSig) == 0 )
-                return eval->Invalid("invalid vin2 is CC for fillexchange");
-            else if ( eval->GetTxUnconfirmed(tx.vin[2].prevout.hash,vinTx,hashBlock) == 0 )
-                return eval->Invalid("always should find vin, but didnt");
-            else if ( funcid == 'E' && (IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[2].prevout.n,assetid2) != tx.vout[2].nValue || tx.vout[2].nValue == 0) )
-                return eval->Invalid("invalid asset2 vin value for fillexchange");
-            else if ( funcid == 'E' && IsAssetvout(ignore,ignorepubkey,tx,2,assetid2) == 0 )
-                return eval->Invalid("invalid asset2 voutvalue for fillexchange");
-            else if ( Getscriptaddress(destaddr,tx.vout[2].scriptPubKey) == 0 || strcmp(destaddr,origaddr) != 0 )
-                return eval->Invalid("mismatched vout2 destaddr for fill");
-            else if ( vinTx.vout[tx.vin[2].prevout.n].nValue != tx.vout[2].nValue )
-                return eval->Invalid("mismatched vout2 nValue for fill");
-            else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[2].nValue,tx.vout[1].nValue,tmpprice) == false )
-                return eval->Invalid("mismatched remainder for fill");
-            else if ( IsAssetvout(ignore,ignorepubkey,vinTx,tx.vin[1].prevout.n,assetid) == 0 )
-                return eval->Invalid("mismatched vout0 unspendableaddr for fill");
-            else if ( remaining_price != 0 )
+            if ( funcid == 'E' )
             {
-                if ( Getscriptaddress(destaddr,tx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,Unspendableaddr) != 0 )
-                    return eval->Invalid("mismatched vout0 unspendableaddr for fill");
-                else if ( IsAssetvout(ignore,ignorepubkey,tx,0,assetid) == 0 )
-                    return eval->Invalid("not asset vout0 to unspendableaddr for fill");
-                else if ( funcid == 'S' && remaining_price < 10000 )
-                    return eval->Invalid("dust vout0 to unspendableaddr for fill");
+                if ( AssetExactAmounts(eval,tx,assetid2) == false )
+                    eval->Invalid("asset2 inputs != outputs");
             }
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( numvouts < 3 )
+                return eval->Invalid("not enough vouts for fill");
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for fill");
+            else
+            {
+                if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                    return eval->Invalid("mismatched remainder for fill");
+                else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
+                    return eval->Invalid("normal vout1 for fillask");
+                else if ( funcid == 'E' && ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                    return eval->Invalid("normal vout2 for fillask");
+                else if ( funcid == 'S' && ConstrainVout(tx.vout[2],0,origaddr,0) == 0 )
+                    return eval->Invalid("CC vout2 for fillask");
+                else if ( remaining_price != 0 )
+                {
+                    if ( remaining_price < 10000 )
+                        return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
+                    else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
+                }
+            } else return eval->Invalid("vin2 not enough asset2 for fillbuy");
+            fprintf(stderr,"fill validated\n")
             break;
     }
-    fprintf(stderr,"done Process assets\n");
+    if ( preventCCvins >= 0 )
+    {
+        for (i=preventCCvins; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
+                return eval->Invalid("invalid CC vin");
+        }
+    }
+    if ( preventCCvouts >= 0 )
+    {
+        for (i=preventCCvouts; i<numvouts; i++)
+        {
+            else if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                return eval->Invalid("invalid CC vout");
+        }
+    }
     return(true);
 }
 
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 48c6f2386..1d128d15c 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -346,11 +346,19 @@ static const CRPCCommand vRPCCommands[] =
 #endif
 
 /* tokens */
-    { "tokens",       "tokencreate",      &tokencreate,      true  },
-    { "tokens",       "tokentransfer",    &tokentransfer,        true },
-    { "tokens",       "tokenbid",         &tokenbid,       true },
-    { "tokens",       "tokencancelbid",   &tokencancelbid,        true },
+    { "tokens",       "tokenorders",      &tokenorders,       true },
+    { "tokens",       "tokenaddress",     &tokenaddress,      true },
+    { "tokens",       "tokenbalance",     &tokenbalance,      true },
+    { "tokens",       "tokencreate",      &tokencreate,       true },
+    { "tokens",       "tokentransfer",    &tokentransfer,     true },
+    { "tokens",       "tokenbid",         &tokenbid,          true },
+    { "tokens",       "tokencancelbid",   &tokencancelbid,    true },
     { "tokens",       "tokenfillbid",     &tokenfillbid,      true },
+    { "tokens",       "tokenask",         &tokenask,          true },
+    { "tokens",       "tokenswapask",     &tokenswapask,      true },
+    { "tokens",       "tokencancelask",   &tokencancelas      true },
+    { "tokens",       "tokenfillask",     &tokenfillask,      true },
+    { "tokens",       "tokenfillswap",    &tokenfillswap      true },
 
 /* Address index */
     { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8005be247..ef6f84b7f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,11 +4830,19 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
+#define EVAL_ASSETS 0xe3
 std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
 std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
 std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
 std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint256 filltxid,int32_t fillvout);
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount);
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal);
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid);
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount);
+uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
+std::vector<uint8_t> Mypubkey();
+UniValue AssetOrders(uint256 tokenid);
 
 uint256 Parseuint256(char *hexstr)
 {
@@ -4844,6 +4852,54 @@ uint256 Parseuint256(char *hexstr)
     return(txid);
 }
 
+UniValue tokenorders(const UniValue& params, bool fHelp)
+{
+    uint256 tokenid;
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("tokenorders [tokenid]\n");
+    if ( params.size() == 1 )
+        tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    else memset(&tokenid,0,sizeof(tokenid));
+    return(AssetOrders(tokenid));
+}
+
+UniValue tokenbalance(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); char destaddr[64]; CMutableTransaction mtx; uint256 tokenid; uin64_t balance; std::vector<unsigned char> pubkey;
+    if ( fHelp || params.size() > 2 )
+        throw runtime_error("tokenbalance tokenid [pubkey]\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    if ( params.size() == 2 )
+        pubkey = ParseHex(params[1].get_str().c_str());
+    else pubkey = Mypubkey();
+    result.push_back(Pair("result", "success"));
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+        result.push_back(Pair("CCaddress",destaddr));
+    balance = AddCCinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
+    result.push_back(Pair("tokenid", params[0].get_str()));
+    result.push_back(Pair("balance", (int64_t)balance));
+    return(result);
+}
+
+UniValue tokenaddress(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("tokenaddress [pubkey]\n");
+    result.push_back(Pair("result", "success"));
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+        result.push_back(Pair("AssetsCCaddress",destaddr));
+    if ( params.size() == 1 )
+    {
+        pubkey = ParseHex(params[0].get_str().c_str());
+        if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+            result.push_back(Pair("CCaddress",destaddr));
+    }
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+        result.push_back(Pair("myCCaddress",destaddr));
+    return(result);
+}
+
 UniValue tokencreate(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
@@ -4915,14 +4971,105 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
 
 UniValue tokenfillbid(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); int32_t fillvout; std::string hex; uint256 tokenid,bidtxid,filltxid;
-    if ( fHelp || params.size() != 4 )
-        throw runtime_error("tokenfillbid tokenid bidtxid filltxid fillvout\n");
+    UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,bidtxid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokenfillbid tokenid bidtxid fillamount\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     bidtxid = Parseuint256((char *)params[1].get_str().c_str());
-    filltxid = Parseuint256((char *)params[2].get_str().c_str());
-    fillvout = atoi(params[3].get_str().c_str());
-    hex = FillBuyOffer(0,tokenid,bidtxid,filltxid,fillvout);
+    fillamount = atol(params[2].get_str().c_str());
+    hex = FillBuyOffer(0,tokenid,bidtxid,fillamount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt fill bid"));
+    return(result);
+}
+
+UniValue tokenask(const UniValue& params, bool fHelp)
+{
+    static uint256 zeroid;
+    UniValue result(UniValue::VOBJ); uint64_t askamount,numtokens; std::string hex; double price; uint256 tokenid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokenask numtokens tokenid price\n");
+    numtokens = atoi(params[0].get_str().c_str());
+    tokenid = Parseuint256((char *)params[1].get_str().c_str());
+    price = atof(params[2].get_str().c_str());
+    askamount = (price * numtokens) * COIN + 0.0000000049999;
+    hex = CreateSell(0,numtokens,tokenid,zeroid,askamount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create ask"));
+    return(result);
+}
+
+UniValue tokenswapask(const UniValue& params, bool fHelp)
+{
+    static uint256 zeroid;
+    UniValue result(UniValue::VOBJ); uint64_t askamount,numtokens; std::string hex; double price; uint256 tokenid,otherid;
+    if ( fHelp || params.size() != 4 )
+        throw runtime_error("tokenswap numtokens tokenid otherid price\n");
+    numtokens = atoi(params[0].get_str().c_str());
+    tokenid = Parseuint256((char *)params[1].get_str().c_str());
+    otherid = Parseuint256((char *)params[2].get_str().c_str());
+    price = atof(params[3].get_str().c_str());
+    askamount = (price * numtokens) * COIN + 0.0000000049999;
+    hex = CreateSell(0,numtokens,tokenid,otherid,askamount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create swap"));
+    return(result);
+}
+
+UniValue tokencancelask(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,bidtxid;
+    if ( fHelp || params.size() != 2 )
+        throw runtime_error("tokencancelask tokenid asktxid\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    bidtxid = Parseuint256((char *)params[1].get_str().c_str());
+    hex = CancelSell(0,tokenid,asktxid);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt cancel bid"));
+    return(result);
+}
+
+UniValue tokenfillask(const UniValue& params, bool fHelp)
+{
+    static uint256 zeroid;
+    UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,asktxid;
+    if ( fHelp || params.size() != 3 )
+        throw runtime_error("tokenfillask tokenid asktxid fillamount\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    asktxid = Parseuint256((char *)params[1].get_str().c_str());
+    fillamount = atol(params[2].get_str().c_str());
+    hex = FillSell(0,tokenid,zeroid,asktxid,fillamount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt fill bid"));
+    return(result);
+}
+
+UniValue tokenfillswap(const UniValue& params, bool fHelp)
+{
+    static uint256 zeroid;
+    UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,otherid,asktxid;
+    if ( fHelp || params.size() != 4 )
+        throw runtime_error("tokenfillswap tokenid otherid asktxid fillamount\n");
+    tokenid = Parseuint256((char *)params[0].get_str().c_str());
+    otherid = Parseuint256((char *)params[1].get_str().c_str());
+    asktxid = Parseuint256((char *)params[2].get_str().c_str());
+    fillamount = atol(params[3].get_str().c_str());
+    hex = FillSell(0,tokenid,otherid,asktxid,fillamount);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From cf72fbf3dd0c10bfca55762a8c20fef7a402022b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 18:57:57 -1100
Subject: [PATCH 393/623] Test

---
 src/cc/assets.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 56f320349..67b0682a9 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -200,7 +200,7 @@ char *uint256_str(char *dest,uint256 txid)
 {
     int32_t i,j=0;
     for (i=31; i>=0; i--)
-        sprintf(&dest[j++ * 2] = ((uint8_t *)&txid)[i];
+        sprintf(&dest[j++ * 2],"%02x",((uint8_t *)&txid)[i]);
    return(dest);
 }
 
@@ -637,7 +637,7 @@ bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValu
 
 void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
 {
-    int32_t i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
+    int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
     n = (int32_t)strlen(coinaddr);
     addrstr.resize(n+1);
     ptr = (char *)addrstr.data();
@@ -647,17 +647,16 @@ void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValu
     if ( address.GetIndexKey(hashBytes, type) == 0 )
         return;
     addresses.push_back(std::make_pair(hashBytes,type));
-    if ( getAddressesFromParams(params, addresses) == 0 )
-        return;
     for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
     {
         if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
             return;
     }
 }
+
 uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
 {
-    char coinaddr[64]; int32_t type=0;  uint64_t price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx;
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     GetCCaddress(EVAL_ASSETS,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
@@ -673,6 +672,7 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_
                     mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
                 nValue = it->second.satoshis;
                 totalinputs += nValue;
+                n++;
                 if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
                     break;
             }
@@ -735,6 +735,7 @@ uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,in
             mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
             nValue = out.tx->vout[out.i].nValue;
             totalinputs += nValue;
+            n++;
             if ( totalinputs >= total || n >= maxinputs )
                 break;
         }

From 4cdf7b21094a1d7fbe85af1f2c74321b4fdbb718 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:00:54 -1100
Subject: [PATCH 394/623] Test

---
 src/cc/assets.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 67b0682a9..4ff6b48be 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -663,7 +663,7 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_
     //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
-        txid = it->first.txhash.GetHex();
+        txid = it->first.txhash;
         if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
             if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
@@ -683,16 +683,16 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_
 
 UniValue AssetOrders(uint256 refassetid)
 {
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VOBJ),obj(UniValue::VOBJ),a(UniValue::VARR); std::vector<uint8_t> origpubkey; std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
     SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
-        txid = it->first.txhash.GetHex();
+        txid = it->first.txhash;
         if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
             if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
             {
-                funcidstr[0] = funcid;
+                UniValue item funcidstr[0] = funcid;
                 funcidstr[1] = 0;
                 item.push_back(Pair("funcid", funcidstr));
                 item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
@@ -712,8 +712,7 @@ UniValue AssetOrders(uint256 refassetid)
                     item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
                 if ( price > 0 )
                     item.push_back(Pair("price", (int64_t)price));
-                a.push_back(item);
-           
+                result.push_back(item);
             }
         }
     }

From 303c99882c3b50c3fd08d840db377cce5ce34ed1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:03:57 -1100
Subject: [PATCH 395/623] Test

---
 src/cc/assets.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4ff6b48be..778dce834 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -692,7 +692,8 @@ UniValue AssetOrders(uint256 refassetid)
         {
             if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
             {
-                UniValue item funcidstr[0] = funcid;
+                UniValue item;
+                funcidstr[0] = funcid;
                 funcidstr[1] = 0;
                 item.push_back(Pair("funcid", funcidstr));
                 item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
@@ -818,7 +819,7 @@ std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256
         {
             mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
             if ( inputs > askamount )
-                CCchange = (askamount - total);
+                CCchange = (inputs - askamount);
             if ( CCchange != 0 )
                 mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
             if ( assetid2 == zeroid )
@@ -913,13 +914,13 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
             SetOrigpubkey(origpubkey,origprice,vintx);
             mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
             if ( assetid2 == zeroid )
-                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount);
+                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount,60);
             else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
             if ( inputs > 0 )
             {
                 if ( assetid2 == zeroid && inputs > fillamount )
                     CCchange = (inputs - fillamount);
-                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                SetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
                 mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
@@ -970,9 +971,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
         {
-            for (i=32; i>=0; i--)
-                fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-            fprintf(stderr," AssetValidateBuyvin\n");
+            //for (i=32; i>=0; i--)
+            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+            //fprintf(stderr," AssetValidateBuyvin\n");
             return eval->Invalid("invalid assetid for buyvin");
         }
     }
@@ -990,7 +991,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool ConstrainVout(CTxout vout,int32_t CCflag,char *cmpadr,uint64_t nValue)
+bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpadr,uint64_t nValue)
 {
     char destaddr[64];
     if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )

From 9b4aec0f884f7cafad264b3afc6fe6573b7bb1d3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:06:04 -1100
Subject: [PATCH 396/623] Test

---
 src/cc/assets.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 778dce834..e53865a69 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -944,9 +944,9 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
     else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,AssetsCCaddr) != 0 )
+    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
     {
-        fprintf(stderr,"%s vs %s\n",destaddr,AssetsCCaddr);
+        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
         return eval->Invalid("invalid vin AssetsCCaddr");
     }
     else if ( vinTx.vout[0].nValue < 10000 )
@@ -991,7 +991,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpadr,uint64_t nValue)
+bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
 {
     char destaddr[64];
     if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
@@ -1075,11 +1075,11 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
-            else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("invalid vout for buyoffer");
             preventCCvins = 1;
             preventCCvouts = 1;
-            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",AssetsCCaddr);
+            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",(char *)AssetsCCaddr);
             break;
             
         case 'o': // cancelbuy
@@ -1129,7 +1129,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
-                    else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
                 }
             } else return eval->Invalid("vin2 not asset for fillbuy");
@@ -1146,7 +1146,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null remaining_price for selloffer");
-            else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
             preventCCvouts = 1;
             break;
@@ -1205,7 +1205,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
-                    else if ( ConstrainVout(tx.vout[0],1,AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
             } else return eval->Invalid("vin2 not enough asset2 for fillbuy");

From 96fc3db2df8bcd163c9a7d3263097f6f5cde1cf0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:10:59 -1100
Subject: [PATCH 397/623] Test

---
 src/cc/assets.cpp | 8 +++-----
 src/main.h        | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e53865a69..be7088301 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1115,8 +1115,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("not enough vouts for fillbuy");
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
-            if ( inputs != outputs )
-                return eval->Invalid("mismatched inputs vs outputs for fillbuy");
             else
             {
                 if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
@@ -1132,7 +1130,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
                 }
-            } else return eval->Invalid("vin2 not asset for fillbuy");
+            }
             fprintf(stderr,"fillbuy validated\n");
             break;
             
@@ -1208,7 +1206,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                     else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
-            } else return eval->Invalid("vin2 not enough asset2 for fillbuy");
+            }
             fprintf(stderr,"fill validated\n")
             break;
     }
@@ -1224,7 +1222,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
     {
         for (i=preventCCvouts; i<numvouts; i++)
         {
-            else if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
                 return eval->Invalid("invalid CC vout");
         }
     }
diff --git a/src/main.h b/src/main.h
index ef46cd83d..56b439fc0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -102,7 +102,8 @@ static const unsigned int DATABASE_FLUSH_INTERVAL = 24 * 60 * 60;
 /** Maximum length of reject messages. */
 static const unsigned int MAX_REJECT_MESSAGE_LENGTH = 111;
 
-static const bool DEFAULT_ADDRESSINDEX = false;
+//static const bool DEFAULT_ADDRESSINDEX = false;
+#define DEFAULT_ADDRESSINDEX (GetArg("-ac_cc",0) != 0)
 static const bool DEFAULT_TIMESTAMPINDEX = false;
 static const bool DEFAULT_SPENTINDEX = false;
 static const unsigned int DEFAULT_DB_MAX_OPEN_FILES = 1000;

From 918888fa0068bddfa31ab4377dfab41283aeeadb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:12:14 -1100
Subject: [PATCH 398/623] ;

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index be7088301..18bc3ddbf 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -1207,7 +1207,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
             }
-            fprintf(stderr,"fill validated\n")
+            fprintf(stderr,"fill validated\n");
             break;
     }
     if ( preventCCvins >= 0 )

From f21b8979c47458de6ddd40eca4d618bba8353d28 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:17:14 -1100
Subject: [PATCH 399/623] Test

---
 src/rpcserver.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rpcserver.h b/src/rpcserver.h
index 1bf5298c4..742dce13a 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -208,11 +208,19 @@ extern UniValue submitblock(const UniValue& params, bool fHelp);
 extern UniValue estimatefee(const UniValue& params, bool fHelp);
 extern UniValue estimatepriority(const UniValue& params, bool fHelp);
 extern UniValue coinsupply(const UniValue& params, bool fHelp);
+extern UniValue tokenorders(const UniValue& params, bool fHelp);
+extern UniValue tokenbalance(const UniValue& params, bool fHelp);
+extern UniValue tokenaddress(const UniValue& params, bool fHelp);
 extern UniValue tokencreate(const UniValue& params, bool fHelp);
 extern UniValue tokentransfer(const UniValue& params, bool fHelp);
 extern UniValue tokenbid(const UniValue& params, bool fHelp);
 extern UniValue tokencancelbid(const UniValue& params, bool fHelp);
 extern UniValue tokenfillbid(const UniValue& params, bool fHelp);
+extern UniValue tokenask(const UniValue& params, bool fHelp);
+extern UniValue tokencancelask(const UniValue& params, bool fHelp);
+extern UniValue tokenfillask(const UniValue& params, bool fHelp);
+extern UniValue tokenswapask(const UniValue& params, bool fHelp);
+extern UniValue tokenswapfill(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From 85bdc758e730a269232d3811d0d30010a877177e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:18:02 -1100
Subject: [PATCH 400/623] Test

---
 src/rpcserver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 1d128d15c..d5f6e861d 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -356,9 +356,9 @@ static const CRPCCommand vRPCCommands[] =
     { "tokens",       "tokenfillbid",     &tokenfillbid,      true },
     { "tokens",       "tokenask",         &tokenask,          true },
     { "tokens",       "tokenswapask",     &tokenswapask,      true },
-    { "tokens",       "tokencancelask",   &tokencancelas      true },
+    { "tokens",       "tokencancelask",   &tokencancelask,    true },
     { "tokens",       "tokenfillask",     &tokenfillask,      true },
-    { "tokens",       "tokenfillswap",    &tokenfillswap      true },
+    { "tokens",       "tokenfillswap",    &tokenfillswap,     true },
 
 /* Address index */
     { "addressindex",       "getaddressmempool",      &getaddressmempool,      true  },

From 60b6f4b8a8b6c436020372aa7ec1897e25498697 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:20:07 -1100
Subject: [PATCH 401/623] Test

---
 src/rpcserver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpcserver.h b/src/rpcserver.h
index 742dce13a..93db71733 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -220,7 +220,7 @@ extern UniValue tokenask(const UniValue& params, bool fHelp);
 extern UniValue tokencancelask(const UniValue& params, bool fHelp);
 extern UniValue tokenfillask(const UniValue& params, bool fHelp);
 extern UniValue tokenswapask(const UniValue& params, bool fHelp);
-extern UniValue tokenswapfill(const UniValue& params, bool fHelp);
+extern UniValue tokenfillswap(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From 110cc27c2db95e7e51976cf1f21e0f612e7bf1d6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:24:56 -1100
Subject: [PATCH 402/623] Test

---
 src/wallet/rpcwallet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ef6f84b7f..5a0a6c280 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4843,6 +4843,7 @@ uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 std::vector<uint8_t> Mypubkey();
 UniValue AssetOrders(uint256 tokenid);
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
 
 uint256 Parseuint256(char *hexstr)
 {
@@ -4865,7 +4866,7 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
 
 UniValue tokenbalance(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); char destaddr[64]; CMutableTransaction mtx; uint256 tokenid; uin64_t balance; std::vector<unsigned char> pubkey;
+    UniValue result(UniValue::VOBJ); char destaddr[64]; CMutableTransaction mtx; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey;
     if ( fHelp || params.size() > 2 )
         throw runtime_error("tokenbalance tokenid [pubkey]\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());

From ef2c8debe7cd0cf447e089306b966403e3378bcb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:26:04 -1100
Subject: [PATCH 403/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5a0a6c280..a69124c59 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -5028,7 +5028,7 @@ UniValue tokenswapask(const UniValue& params, bool fHelp)
 
 UniValue tokencancelask(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,bidtxid;
+    UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,asktxid;
     if ( fHelp || params.size() != 2 )
         throw runtime_error("tokencancelask tokenid asktxid\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());

From 147089178a5f1fc9040d3a6aca8d81e8b2198a84 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:27:04 -1100
Subject: [PATCH 404/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index a69124c59..571a82975 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -5032,7 +5032,7 @@ UniValue tokencancelask(const UniValue& params, bool fHelp)
     if ( fHelp || params.size() != 2 )
         throw runtime_error("tokencancelask tokenid asktxid\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
-    bidtxid = Parseuint256((char *)params[1].get_str().c_str());
+    asktxid = Parseuint256((char *)params[1].get_str().c_str());
     hex = CancelSell(0,tokenid,asktxid);
     if ( hex.size() > 0 )
     {

From 2f80c37219d71ff066d302047836da5ade15a0d5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:40:40 -1100
Subject: [PATCH 405/623] Print

---
 src/cc/assets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 18bc3ddbf..54fcc8495 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -714,6 +714,7 @@ UniValue AssetOrders(uint256 refassetid)
                 if ( price > 0 )
                     item.push_back(Pair("price", (int64_t)price));
                 result.push_back(item);
+                fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
             }
         }
     }

From 2a8e5837fbc036ce74dc62b39ed3fed10070cf9b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:42:13 -1100
Subject: [PATCH 406/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 54fcc8495..266784795 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -714,7 +714,7 @@ UniValue AssetOrders(uint256 refassetid)
                 if ( price > 0 )
                     item.push_back(Pair("price", (int64_t)price));
                 result.push_back(item);
-                fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+                fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
             }
         }
     }

From ea4b2aa7ae24efac6355af163fed160e77b96916 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:44:14 -1100
Subject: [PATCH 407/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 266784795..ffb183c6e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -692,7 +692,7 @@ UniValue AssetOrders(uint256 refassetid)
         {
             if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
             {
-                UniValue item;
+                UniValue item(UniValue::VOBJ);
                 funcidstr[0] = funcid;
                 funcidstr[1] = 0;
                 item.push_back(Pair("funcid", funcidstr));

From 20d8e3a9b7f4a64ab71726bacbff357e82cf0448 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:50:40 -1100
Subject: [PATCH 408/623] test

---
 src/cc/assets.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index ffb183c6e..f7986fe08 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -712,9 +712,12 @@ UniValue AssetOrders(uint256 refassetid)
                 if ( assetid2 != zeroid )
                     item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
                 if ( price > 0 )
-                    item.push_back(Pair("price", (int64_t)price));
+                {
+                    item.push_back(Pair("totalrequired", (int64_t)price));
+                    item.push_back(Pair("price", (double)(totalprice * COIN) / vintx.vout[0].nValue));
+                }
                 result.push_back(item);
-                fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
             }
         }
     }

From 93bc8fbf7c79eab66f19c28961ad2a422697dbb0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 19:58:18 -1100
Subject: [PATCH 409/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f7986fe08..a681e4cf3 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -714,7 +714,7 @@ UniValue AssetOrders(uint256 refassetid)
                 if ( price > 0 )
                 {
                     item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)(totalprice * COIN) / vintx.vout[0].nValue));
+                    item.push_back(Pair("price", (double)(price * COIN) / vintx.vout[0].nValue));
                 }
                 result.push_back(item);
                 //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);

From 28eaaf513a363901b8ba32c5a369804e75db0c1a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 20:02:32 -1100
Subject: [PATCH 410/623] Tag asset creation

---
 src/cc/assets.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index a681e4cf3..9be394991 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -154,7 +154,7 @@ bool GetAddressUnspent(uint160 addressHash, int type,
 
 static uint256 zeroid;
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
-char Unspendablehex[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t Unspendablepriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
@@ -178,7 +178,7 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
         if ( unspendablepriv != 0 )
             memcpy(unspendablepriv,Unspendablepriv,32);
     } else return(nullpk);
-    return(pubkey2pk(ParseHex(Unspendablehex)));
+    return(pubkey2pk(ParseHex(AssetsCChexstr)));
 }
 
 CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
@@ -761,9 +761,10 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,assetsupply+txfee,64) > 0 )
+    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);

From 8c9f5d2b66205ad71e818a69834e066b63ed2530 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 20:04:02 -1100
Subject: [PATCH 411/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 9be394991..d980f5f8e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -714,7 +714,7 @@ UniValue AssetOrders(uint256 refassetid)
                 if ( price > 0 )
                 {
                     item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)(price * COIN) / vintx.vout[0].nValue));
+                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
                 }
                 result.push_back(item);
                 //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);

From 44a9fd7c3b04dfce749b516153cc6befcecd70f6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 02:49:52 -1100
Subject: [PATCH 412/623] Reorganize CC assets code

---
 src/Makefile.am          |    5 +
 src/cc/CCassets.h        |   52 ++
 src/cc/CCassetsCore.cpp  |  297 +++++++++
 src/cc/CCassetstx.cpp    |  275 +++++++++
 src/cc/CCcustom.cpp      |   89 +++
 src/cc/CCinclude.h       |   59 ++
 src/cc/CCtx.cpp          |  179 ++++++
 src/cc/CCutils.cpp       |  133 ++++
 src/cc/assets copy.cpp   | 1242 ++++++++++++++++++++++++++++++++++++++
 src/cc/assets.cpp        |  945 +----------------------------
 src/cc/eval.cpp          |   24 +-
 src/cc/eval.h            |    2 +-
 src/wallet/rpcwallet.cpp |   23 +-
 13 files changed, 2363 insertions(+), 962 deletions(-)
 create mode 100644 src/cc/CCassets.h
 create mode 100644 src/cc/CCassetsCore.cpp
 create mode 100644 src/cc/CCassetstx.cpp
 create mode 100644 src/cc/CCcustom.cpp
 create mode 100644 src/cc/CCinclude.h
 create mode 100644 src/cc/CCtx.cpp
 create mode 100644 src/cc/CCutils.cpp
 create mode 100644 src/cc/assets copy.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 49faa50c5..64103a3a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -257,6 +257,11 @@ libbitcoin_server_a_SOURCES = \
   bloom.cpp \
   cc/eval.cpp \
   cc/import.cpp \
+  cc/CCassetsCore.cpp \
+  cc/CCassetstx.cpp \
+  cc/CCcustom.cpp \
+  cc/CCtx.cpp \
+  cc/CCutils.cpp \
   cc/assets.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
new file mode 100644
index 000000000..5ff35af8e
--- /dev/null
+++ b/src/cc/CCassets.h
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCinclude.h"
+
+/*
+ CCassetstx has the functions that create the EVAL_ASSETS transactions. It is expected that rpc calls would call these functions. For EVAL_ASSETS, the rpc functions are in rpcwallet.cpp
+ 
+ CCassetsCore has functions that are used in two contexts, both during rpc transaction create time and also during the blockchain validation. Using the identical functions is a good way to prevent them from being mismatched. The must match or the transaction will get rejected.
+ */
+
+#ifndef CC_ASSETS_H
+#define CC_ASSETS_H
+
+// CCassetsCore
+CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
+CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
+uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
+bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx);
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid);
+bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice);
+bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid);
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid);
+bool ConstrainAssetVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
+bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid);
+
+// CCassetstx
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
+UniValue AssetOrders(uint256 tokenid);
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount);
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal);
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid);
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount);
+
+#endif
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
new file mode 100644
index 000000000..d0a4856a5
--- /dev/null
+++ b/src/cc/CCassetsCore.cpp
@@ -0,0 +1,297 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCassets.h"
+
+CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
+    return(opret);
+}
+
+CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    assetid = revuint256(assetid);
+    switch ( funcid )
+    {
+        case 't':  case 'x': case 'o':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
+            break;
+        case 's': case 'b': case 'S': case 'B':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
+            break;
+        case 'E': case 'e':
+            assetid2 = revuint256(assetid2);
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
+            break;
+        default:
+            fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
+            opret << OP_RETURN;
+            break;
+    }
+    return(opret);
+}
+
+uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+{
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
+    GetOpReturnData(scriptPubKey, vopret);
+    script = (uint8_t *)vopret.data();
+    memset(&assetid,0,sizeof(assetid));
+    memset(&assetid2,0,sizeof(assetid2));
+    price = 0;
+    if ( script[0] == EVAL_ASSETS )
+    {
+        funcid = script[1];
+        //fprintf(stderr,"decode.[%c]\n",funcid);
+        switch ( funcid )
+        {
+            case 'c': return(funcid);
+                break;
+            case 't':  case 'x': case 'o':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
+                {
+                    assetid = revuint256(assetid);
+                    return(funcid);
+                }
+                break;
+            case 's': case 'b': case 'S': case 'B':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    assetid = revuint256(assetid);
+                    //fprintf(stderr,"got price %llu\n",(long long)price);
+                    return(funcid);
+                }
+                break;
+            case 'E': case 'e':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    fprintf(stderr,"got price %llu\n",(long long)price);
+                    assetid = revuint256(assetid);
+                    assetid2 = revuint256(assetid2);
+                    return(funcid);
+                }
+                break;
+            default:
+                fprintf(stderr,"DecodeAssetOpRet: illegal funcid.%02x\n",funcid);
+                funcid = 0;
+                break;
+        }
+    }
+    return(funcid);
+}
+
+bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
+{
+    uint256 assetid,assetid2;
+    if ( DecodeAssetOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
+        return(true);
+    else return(false);
+}
+           
+bool GetAssetorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
+{
+    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
+    n = tx.vout.size();
+    if ( n == 0 || (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        return(false);
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
+        return(true);
+    else return(false);
+}
+
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+{
+    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        n = tx.vout.size();
+        nValue = tx.vout[v].nValue;
+        //fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
+        if ( v >= n-1 )
+            return(0);
+        if ( (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        {
+            fprintf(stderr,"null decodeopret\n");
+            return(0);
+        }
+        else if ( funcid == 'c' )
+        {
+            if ( refassetid == tx.GetHash() && v == 0 )
+                return(nValue);
+        }
+        else if ( funcid == 'b' || funcid == 'B' )
+            return(0);
+        else if ( funcid != 'E' )
+        {
+            if ( assetid == refassetid )
+                return(nValue);
+        }
+        else if ( funcid == 'E' )
+        {
+            if ( v < 2 && assetid == refassetid )
+                return(nValue);
+            else if ( v == 2 && assetid2 == refassetid )
+                return(nValue);
+        }
+    }
+    //fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
+    return(0);
+}
+
+bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
+{
+    uint64_t price,recvprice;
+    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
+        return(false);
+    }
+    else if ( remaining_price < (totalprice - received) )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
+        return(false);
+    }
+    else if ( remaining_nValue < (orig_nValue - paid) )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
+        return(false);
+    }
+    else if ( remaining_nValue > 0 )
+    {
+        price = (totalprice * COIN) / orig_nValue;
+        recvprice = (received * COIN) / paid;
+        if ( recvprice < price )
+        {
+            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
+            return(false);
+        }
+    }
+    return(true);
+}
+
+bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
+{
+    uint64_t remaining_nValue,price,mult;
+    if ( received >= totalprice )
+        received = totalprice;
+    remaining_price = (totalprice - received);
+    price = (totalprice * COIN) / orig_nValue;
+    mult = (received * COIN);
+    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
+    if ( price > 0 && (paid= mult / price) > 0 )
+    {
+        if ( (mult % price) != 0 )
+            paid--;
+        remaining_nValue = (orig_nValue - paid);
+        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
+    } else return(false);
+}
+
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+{
+    uint256 hashBlock; char destaddr[64];
+    origaddr[0] = destaddr[0] = 0;
+    if ( tx.vin.size() < 2 )
+        return eval->Invalid("not enough for CC vins");
+    else if ( tx.vin[1].prevout.n != 0 )
+        return eval->Invalid("vin1 needs to be buyvin.vout[0]");
+    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+        return eval->Invalid("always should find vin, but didnt");
+    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
+    {
+        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
+        return eval->Invalid("invalid vin AssetsCCaddr");
+    }
+    else if ( vinTx.vout[0].nValue < 10000 )
+        return eval->Invalid("invalid dust for buyvin");
+    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx) == 0 )
+        return eval->Invalid("couldnt get origaddr for buyvin");
+    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
+    return(vinTx.vout[0].nValue);
+}
+
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
+{
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+        return(0);
+    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
+        return eval->Invalid("invalid normal vout0 for buyvin");
+    else
+    {
+        //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
+        if ( (funcid= DecodeAssetOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
+            return eval->Invalid("invalid opreturn for buyvin");
+        else if ( refassetid != assetid )
+        {
+            //for (i=32; i>=0; i--)
+            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+            //fprintf(stderr," AssetValidateBuyvin\n");
+            return eval->Invalid("invalid assetid for buyvin");
+        }
+    }
+    return(nValue);
+}
+
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint64_t nValue,assetoshis;
+    fprintf(stderr,"AssetValidateSellvin\n");
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+        return(0);
+    if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
+        return eval->Invalid("invalid missing CC vout0 for sellvin");
+    else return(assetoshis);
+}
+
+bool ConstrainAssetVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
+{
+    char destaddr[64];
+    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+        return(false);
+    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
+        return(false);
+    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+        return(false);
+    else return(true);
+}
+
+bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=1; i<numvins; i++)
+    {
+        if ( IsEvalInput(EVAL_ASSETS,tx.vin[i].scriptSig) != 0 )
+        {
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                inputs += assetoshis;
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs )
+        return(false);
+    else return(true);
+}
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
new file mode 100644
index 000000000..a5510917f
--- /dev/null
+++ b/src/cc/CCassetstx.cpp
@@ -0,0 +1,275 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCassets.h"
+
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+UniValue AssetOrders(uint256 refassetid)
+{
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (funcid= DecodeAssetOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
+            {
+                UniValue item(UniValue::VOBJ);
+                funcidstr[0] = funcid;
+                funcidstr[1] = 0;
+                item.push_back(Pair("funcid", funcidstr));
+                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
+                item.push_back(Pair("vout", (int64_t)it->first.index));
+                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
+                if ( funcid == 'b' || funcid == 'B' )
+                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
+                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
+                if ( origpubkey.size() == 33 )
+                {
+                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    item.push_back(Pair("origaddress",origaddr));
+                }
+                if ( assetid != zeroid )
+                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
+                if ( assetid2 != zeroid )
+                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
+                if ( price > 0 )
+                {
+                    item.push_back(Pair("totalrequired", (int64_t)price));
+                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
+                }
+                result.push_back(item);
+                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+            }
+        }
+    }
+    return(result);
+}
+
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( name.size() > 32 || description.size() > 4096 )
+    {
+        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
+        return(0);
+    }
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
+    }
+    return(0);
+}
+               
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        /*n = outputs.size();
+        if ( n == amounts.size() )
+        {
+            for (i=0; i<n; i++)
+                total += amounts[i];*/
+            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
+            {
+                if ( inputs > total )
+                    CCchange = (inputs - total);
+                //for (i=0; i<n; i++)
+                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
+            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
+        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
+    }
+    return(0);
+}
+
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
+    }
+    return(0);
+}
+
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        {
+            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            if ( inputs > askamount )
+                CCchange = (inputs - askamount);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            if ( assetid2 == zeroid )
+                opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
+            else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        }
+    }
+    return(0);
+}
+
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
+            {
+                if ( inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx wasnt for assetid\n");
+        }
+    }
+    return(0);
+}
+
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
+{
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[askvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
+            if ( assetid2 == zeroid )
+                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
+            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
+            if ( inputs > 0 )
+            {
+                if ( assetid2 == zeroid && inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx not enough utxos\n");
+        }
+    }
+    return(0);
+}
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
new file mode 100644
index 000000000..551706759
--- /dev/null
+++ b/src/cc/CCcustom.cpp
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCinclude.h"
+
+/*
+ CCcustom has most of the functions that need to be extended to create a new CC contract.
+ 
+ EVAL_CONTRACT is the naming convention and it should be added to cc/eval.h
+ 
+ A CC scriptPubKey can only be spent if it is properly signed and validated. By constraining the vins and vouts, it is possible to implement a variety of functionality. CC vouts have an otherwise non-standard form, but it is properly supported by the enhanced bitcoin protocol code as a "cryptoconditions" output and the same pubkey will create a different address.
+ 
+ This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
+ */
+
+//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
+//BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
+//BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
+//BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
+const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
+
+CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
+{
+    static CPubKey nullpk;
+    if ( unspendablepriv != 0 )
+        memset(unspendablepriv,0,32);
+    if ( evalcode == EVAL_ASSETS )
+    {
+        if ( unspendablepriv != 0 )
+            memcpy(unspendablepriv,AssetsCCpriv,32);
+    } else return(nullpk);
+    return(pubkey2pk(ParseHex(AssetsCChexstr)));
+}
+
+CC *MakeCC(uint8_t evalcode,CPubKey pk)
+{
+    if ( evalcode == EVAL_ASSETS )
+    {
+        std::vector<CC*> pks;
+        pks.push_back(CCNewSecp256k1(pk));
+        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+        CC *Sig = CCNewThreshold(1, pks);
+        return CCNewThreshold(2, {assetCC, Sig});
+    } else return(0);
+}
+
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
+{
+    CC *payoutCond;
+    destaddr[0] = 0;
+    if ( evalcode == EVAL_ASSETS )
+    {
+        if ( pk.size() == 0 )
+            pk = GetUnspendable(EVAL_ASSETS,0);
+        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
+        {
+            Getscriptaddress(destaddr,CCPubKey(payoutCond));
+            cc_free(payoutCond);
+        }
+        return(destaddr[0] != 0);
+    }
+    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
+    return false;
+}
+           
+bool ProcessCCevals(uint8_t evalcode,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+{
+    switch ( evalcode )
+    {
+        case EVAL_ASSETS:
+            return ProcessAssets(this, vparams, txTo, nIn);
+            break;
+    }
+    return(false);
+}
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
new file mode 100644
index 000000000..796d06d5a
--- /dev/null
+++ b/src/cc/CCinclude.h
@@ -0,0 +1,59 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#ifndef CC_INCLUDE_H
+#define CC_INCLUDE_H
+
+#include <cc/eval.h>
+#include <script/cc.h>
+#include <script/script.h>
+#include <cryptoconditions.h>
+#include "../script/standard.h"
+#include "../base58.h"
+#include "../core_io.h"
+#include "../script/sign.h"
+#include "../wallet/wallet.h"
+#include <univalue.h>
+#include <exception>
+
+#ifdef ENABLE_WALLET
+extern CWallet* pwalletMain;
+#endif
+bool GetAddressUnspent(uint160 addressHash, int type,std::vector<std::pair<CAddressUnspentKey,CAddressUnspentValue> > &unspentOutputs);
+
+static uint256 zeroid;
+
+// CCcustom
+CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
+CC *MakeCC(uint8_t evalcode,CPubKey pk);
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
+
+// CCutils
+CC* GetCryptoCondition(CScript const& scriptSig);
+bool IsCCInput(CScript const& scriptSig);
+bool IsEvalInput(uint8_t evalcode,CScript const& scriptSig);
+uint256 revuint256(uint256 txid);
+char *uint256_str(char *dest,uint256 txid);
+uint256 Parseuint256(char *hexstr);
+bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
+std::vector<uint8_t> Mypubkey();
+bool Myprivkey(uint8_t myprivkey[]);
+
+// CCtx
+std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret);
+void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr);
+uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs);
+
+#endif
diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
new file mode 100644
index 000000000..24be366d1
--- /dev/null
+++ b/src/cc/CCtx.cpp
@@ -0,0 +1,179 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCinclude.h"
+
+/*
+ FinalizeCCTx is a very useful function that will properly sign both CC and normal inputs, adds normal change and the opreturn.
+ 
+ This allows the contract transaction functions to create the appropriate vins and vouts and have FinalizeCCTx create a properly signed transaction.
+ 
+ By using -addressindex=1, it allows tracking of all the CC addresses
+ */
+ 
+bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
+{
+#ifdef ENABLE_WALLET
+    CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
+    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
+    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
+    {
+        UpdateTransaction(mtx,vini,sigdata);
+        return(true);
+    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
+#else
+    return(false);
+#endif
+}
+
+std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
+{
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    n = mtx.vout.size();
+    for (i=0; i<n; i++)
+    {
+        //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            totaloutputs += mtx.vout[i].nValue;
+    }
+    if ( (n= mtx.vin.size()) > 64 )
+    {
+        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
+        return(0);
+    }
+    Myprivkey(myprivkey);
+    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
+    GetCCaddress(evalcode,myaddr,mypk);
+    mycond = MakeCC(evalcode,mypk);
+    GetCCaddress(evalcode,unspendable,unspendablepk);
+    othercond = MakeCC(evalcode,unspendablepk);
+    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    memset(utxovalues,0,sizeof(utxovalues));
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            utxovout = mtx.vin[i].prevout.n;
+            utxovalues[i] = vintx.vout[utxovout].nValue;
+            totalinputs += utxovalues[i];
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
+                //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
+                vinimask |= (1LL << i);
+            }
+            else
+            {
+            }
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+    }
+    if ( totalinputs >= totaloutputs+2*txfee )
+    {
+        change = totalinputs - (totaloutputs+txfee);
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+    }
+    mtx.vout.push_back(CTxOut(0,opret));
+    PrecomputedTransactionData txdata(mtx);
+    n = mtx.vin.size();
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            utxovout = mtx.vin[i].prevout.n;
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
+                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
+                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
+            }
+            else
+            {
+                Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
+                //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
+                if ( strcmp(destaddr,myaddr) == 0 )
+                {
+                    privkey = myprivkey;
+                    cond = mycond;
+                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
+                }
+                else if ( strcmp(destaddr,unspendable) == 0 )
+                {
+                    privkey = unspendablepriv;
+                    cond = othercond;
+                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
+                }
+                else
+                {
+                    fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
+                    continue;
+                }
+                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
+                if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
+                    mtx.vin[i].scriptSig = CCSig(cond);
+                else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
+            }
+        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+    }
+    if ( mycond != 0 )
+        cc_free(mycond);
+    if ( othercond != 0 )
+        cc_free(othercond);
+    std::string strHex = EncodeHexTx(mtx);
+    if ( strHex.size() > 0 )
+        return(strHex);
+    else return(0);
+}
+
+void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
+{
+    int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
+    n = (int32_t)strlen(coinaddr);
+    addrstr.resize(n+1);
+    ptr = (char *)addrstr.data();
+    for (i=0; i<=n; i++)
+        ptr[i] = coinaddr[i];
+    CBitcoinAddress address(addrstr);
+    if ( address.GetIndexKey(hashBytes, type) == 0 )
+        return;
+    addresses.push_back(std::make_pair(hashBytes,type));
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
+    {
+        if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
+            return;
+    }
+}
+
+uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
+{
+    int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
+#ifdef ENABLE_WALLET
+    const CKeyStore& keystore = *pwalletMain;
+    assert(pwalletMain != NULL);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    BOOST_FOREACH(const COutput& out, vecOutputs)
+    {
+        if ( out.fSpendable != 0 )
+        {
+            mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
+            nValue = out.tx->vout[out.i].nValue;
+            totalinputs += nValue;
+            n++;
+            if ( totalinputs >= total || n >= maxinputs )
+                break;
+        }
+    }
+    if ( totalinputs >= total )
+        return(totalinputs);
+#endif
+    return(0);
+}
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
new file mode 100644
index 000000000..81b50ac20
--- /dev/null
+++ b/src/cc/CCutils.cpp
@@ -0,0 +1,133 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCinclude.h"
+
+/*
+ CCutils has low level functions that are universally useful for all contracts.
+ */
+
+CC* GetCryptoCondition(CScript const& scriptSig)
+{
+    auto pc = scriptSig.begin();
+    opcodetype opcode;
+    std::vector<unsigned char> ffbin;
+    if (scriptSig.GetOp(pc, opcode, ffbin))
+        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
+}
+
+bool IsCCInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if ( (cond= GetCryptoCondition(scriptSig)) == 0 )
+        return false;
+    cc_free(cond);
+    return true;
+}
+
+bool IsEvalInput(uint8_t evalcode,CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == evalcode;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
+uint256 revuint256(uint256 txid)
+{
+    uint256 revtxid; int32_t i;
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&txid)[i];
+    return(revtxid);
+}
+
+char *uint256_str(char *dest,uint256 txid)
+{
+    int32_t i,j=0;
+    for (i=31; i>=0; i--)
+        sprintf(&dest[j++ * 2],"%02x",((uint8_t *)&txid)[i]);
+   return(dest);
+}
+
+uint256 Parseuint256(char *hexstr)
+{
+    uint256 txid; int32_t i; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
+    return(txid);
+}
+
+bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
+{
+    CTxDestination address; txnouttype whichType;
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
+    {
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        return(true);
+    }
+    fprintf(stderr,"ExtractDestination failed\n");
+    return(false);
+}
+
+std::vector<uint8_t> Mypubkey()
+{
+    extern uint8_t NOTARY_PUBKEY33[33];
+    std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
+    pubkey33 = NOTARY_PUBKEY33;
+    pubkey.resize(33);
+    dest = pubkey.data();
+    for (i=0; i<33; i++)
+        dest[i] = pubkey33[i];
+    return(pubkey);
+}
+
+bool Myprivkey(uint8_t myprivkey[])
+{
+    char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
+    if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
+    {
+        n = (int32_t)strlen(coinaddr);
+        strAddress.resize(n+1);
+        dest = (char *)strAddress.data();
+        for (i=0; i<n; i++)
+            dest[i] = coinaddr[i];
+        dest[i] = 0;
+        if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
+        {
+#ifdef ENABLE_WALLET
+            if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
+            {
+                memcpy(myprivkey,vchSecret.begin(),32);
+                //for (i=0; i<32; i++)
+                //    fprintf(stderr,"%02x",myprivkey[i]);
+                //fprintf(stderr," found privkey!\n");
+                return(true);
+            }
+#endif
+        }
+    }
+    fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
+    return(false);
+}
+
diff --git a/src/cc/assets copy.cpp b/src/cc/assets copy.cpp
new file mode 100644
index 000000000..e34bee39d
--- /dev/null
+++ b/src/cc/assets copy.cpp	
@@ -0,0 +1,1242 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include <cc/eval.h>
+#include <script/cc.h>
+#include <script/script.h>
+#include <cryptoconditions.h>
+#include "../script/standard.h"
+#include "../base58.h"
+#include "../core_io.h"
+#include "../script/sign.h"
+#include "../wallet/wallet.h"
+#include <univalue.h>
+#include <exception>
+
+#ifdef ENABLE_WALLET
+extern CWallet* pwalletMain;
+#endif
+extern uint8_t NOTARY_PUBKEY33[33];
+uint256 Parseuint256(char *hexstr);
+bool GetAddressUnspent(uint160 addressHash, int type,std::vector<std::pair<CAddressUnspentKey,CAddressUnspentValue> > &unspentOutputs);
+
+
+/*
+ Assets can be created or transferred.
+ 
+ To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 asset, or 100 million satoshis for one asset with 8 decimals, and the other decimals in between. The interpretation of the number of decimals is left to the higher level usages.
+ 
+ Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee.
+ 
+ What this means is that vout 0 of the creation txid and vouts 1 ... n-2 for transfer vouts are assetoshi outputs.
+ 
+ There is a special type of transfer to an unspendable address, that locks the asset and creates an offer for all. The details specified in the opreturn. In order to be compatible with the signing restrictions, the "unspendable" address is actually an address whose privkey is known to all. Funds sent to this address can only be spent if the swap parameters are fulfilled, or if the original pubkey cancels the offer by spending it.
+ 
+ Types of transactions:
+ create name:description -> txid for assetid
+ transfer <pubkey> <assetid> -> [{address:amount}, ... ] // like withdraw api
+ selloffer <pubkey> <txid/vout> <amount> -> cancel or fillsell -> mempool txid or rejected, might not confirm
+ buyoffer <amount> <assetid> <required> -> cancelbuy or fillbuy -> mempool txid or rejected, might not confirm
+ exchange <pubkey> <txid/vout> <required> <required assetid> -> cancel or fillexchange -> mempool txid or rejected, might not confirm
+ 
+ assetsaddress <pubkey> // all assets end up in a special address for each pubkey
+ assetbalance <pubkey> <assetid>
+ assetutxos <pubkey> <assetid>
+ assetsbalances <pubkey>
+ asks <assetid>
+ bids <assetid>
+ swaps <assetid>
+ 
+ valid CC output: create or transfer or buyoffer or selloffer or exchange or cancel or fill
+ 
+ create
+ vin.0: normal input
+ vout.0: issuance assetoshis to CC
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['c'] [origpubkey] "<assetname>" "<description>"
+ 
+ transfer
+ vin.0: normal input
+ vin.1 .. vin.n-1: valid CC outputs
+ vout.0 to n-2: assetoshis output to CC
+ vout.n-2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
+ 
+ buyoffer:
+ vins.*: normal inputs (bid + change)
+ vout.0: amount of bid to unspendable
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
+
+ cancelbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+ vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
+ 
+ fillbuy:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+ vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+ vout.0: remaining amount of bid to unspendable
+ vout.1: vin.1 value to signer of vin.2
+ vout.2: vin.2 assetoshis to original pubkey
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+
+ selloffer:
+ vin.0: normal input
+ vin.1: valid CC output for sale
+ vout.0: vin.1 assetoshis output to CC to unspendable
+ vout.1: CC output for change (if any)
+ vout.2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
+ 
+ exchange:
+ vin.0: normal input
+ vin.1: valid CC output
+ vout.0: vin.1 assetoshis output to CC to unspendable
+ vout.1: CC output for change (if any)
+ vout.2: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
+ 
+ cancel:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
+ vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
+ vout.1: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+ 
+ fillsell:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
+ vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
+ vout.0: remaining assetoshis -> unspendable
+ vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
+ vout.2: vin.2 value to original pubkey [origpubkey]
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
+ 
+ fillexchange:
+ vin.0: normal input
+ vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
+ vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+ vout.0: remaining assetoshis -> unspendable
+ vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
+ vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
+ vout.3: normal output for change (if any)
+ vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
+*/
+
+
+//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
+//BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
+//BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
+//BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
+
+static uint256 zeroid;
+const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
+
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
+{
+    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
+    n = pubkey.size();
+    dest = (uint8_t *)pk.begin();
+    pubkey33 = (uint8_t *)pubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
+    return(pk);
+}
+
+CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
+    return(opret);
+}
+
+uint256 revuint256(uint256 txid)
+{
+    uint256 revtxid; int32_t i;
+    for (i=31; i>=0; i--)
+        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&txid)[i];
+    return(revtxid);
+}
+
+char *uint256_str(char *dest,uint256 txid)
+{
+    int32_t i,j=0;
+    for (i=31; i>=0; i--)
+        sprintf(&dest[j++ * 2],"%02x",((uint8_t *)&txid)[i]);
+   return(dest);
+}
+
+CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
+{
+    CScript opret; uint8_t evalcode = EVAL_ASSETS;
+    assetid = revuint256(assetid);
+    switch ( funcid )
+    {
+        case 't':  case 'x': case 'o':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
+            break;
+        case 's': case 'b': case 'S': case 'B':
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
+            break;
+        case 'E': case 'e':
+            assetid2 = revuint256(assetid2);
+            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
+            break;
+        default:
+            fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
+            opret << OP_RETURN;
+            break;
+    }
+    return(opret);
+}
+
+bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
+{
+    CTxDestination address; txnouttype whichType;
+    //int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
+    //for (i=0; i<scriptPubKey.size(); i++)
+    //    fprintf(stderr,"%02x",ptr[i]);
+    //fprintf(stderr," scriptPubKey\n");
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
+    {
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        //fprintf(stderr,"destaddr.(%s)\n",destaddr);
+        return(true);
+    }
+    fprintf(stderr,"ExtractDestination failed\n");
+    return(false);
+}
+
+std::vector<uint8_t> Mypubkey()
+{
+    std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
+    pubkey33 = NOTARY_PUBKEY33;
+    pubkey.resize(33);
+    dest = pubkey.data();
+    for (i=0; i<33; i++)
+        dest[i] = pubkey33[i];
+    return(pubkey);
+}
+
+bool Myprivkey(uint8_t myprivkey[])
+{
+    char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
+    if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
+    {
+        n = (int32_t)strlen(coinaddr);
+        strAddress.resize(n+1);
+        dest = (char *)strAddress.data();
+        for (i=0; i<n; i++)
+            dest[i] = coinaddr[i];
+        dest[i] = 0;
+        if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
+        {
+#ifdef ENABLE_WALLET
+            if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
+            {
+                memcpy(myprivkey,vchSecret.begin(),32);
+                //for (i=0; i<32; i++)
+                //    fprintf(stderr,"%02x",myprivkey[i]);
+                //fprintf(stderr," found privkey!\n");
+                return(true);
+            }
+#endif
+        }
+    }
+    fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
+    return(false);
+}
+
+CC *MakeAssetCond(CPubKey pk)
+{
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {assetCC, Sig});
+}
+
+CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeAssetCond(pk);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
+CC *MakeCC(uint8_t evalcode,CPubKey pk)
+{
+    if ( evalcode == EVAL_ASSETS )
+    {
+        std::vector<CC*> pks;
+        pks.push_back(CCNewSecp256k1(pk));
+        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+        CC *Sig = CCNewThreshold(1, pks);
+        return CCNewThreshold(2, {assetCC, Sig});
+    } else return(0);
+}
+
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
+{
+    CC *payoutCond;
+    destaddr[0] = 0;
+    if ( evalcode == EVAL_ASSETS )
+    {
+        if ( pk.size() == 0 )
+            pk = GetUnspendable(EVAL_ASSETS,0);
+        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
+        {
+            Getscriptaddress(destaddr,CCPubKey(payoutCond));
+            cc_free(payoutCond);
+        }
+        return(destaddr[0] != 0);
+    }
+    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
+    return false;
+}
+           
+uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
+{
+    std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
+    GetOpReturnData(scriptPubKey, vopret);
+    script = (uint8_t *)vopret.data();
+    memset(&assetid,0,sizeof(assetid));
+    memset(&assetid2,0,sizeof(assetid2));
+    price = 0;
+    if ( script[0] == EVAL_ASSETS )
+    {
+        funcid = script[1];
+        //fprintf(stderr,"decode.[%c]\n",funcid);
+        switch ( funcid )
+        {
+            case 'c': return(funcid);
+                break;
+            case 't':  case 'x': case 'o':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
+                {
+                    assetid = revuint256(assetid);
+                    return(funcid);
+                }
+                break;
+            case 's': case 'b': case 'S': case 'B':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    assetid = revuint256(assetid);
+                    //fprintf(stderr,"got price %llu\n",(long long)price);
+                    return(funcid);
+                }
+                break;
+            case 'E': case 'e':
+                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
+                {
+                    fprintf(stderr,"got price %llu\n",(long long)price);
+                    assetid = revuint256(assetid);
+                    assetid2 = revuint256(assetid2);
+                    return(funcid);
+                }
+                break;
+            default:
+                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
+                funcid = 0;
+                break;
+        }
+    }
+    return(funcid);
+}
+
+bool SetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
+{
+    uint256 assetid,assetid2;
+    if ( DecodeOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
+        return(true);
+    else return(false);
+}
+           
+bool Getorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
+{
+    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
+    n = tx.vout.size();
+    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        return(false);
+    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
+        return(true);
+    else return(false);
+}
+    
+CC* GetCryptoCondition(CScript const& scriptSig)
+{
+    auto pc = scriptSig.begin();
+    opcodetype opcode;
+    std::vector<unsigned char> ffbin;
+    if (scriptSig.GetOp(pc, opcode, ffbin))
+        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
+}
+       
+bool IsCCInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if ( (cond= GetCryptoCondition(scriptSig)) == 0 )
+        return false;
+    cc_free(cond);
+    return true;
+}
+       
+bool IsAssetInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+       
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+{
+    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        n = tx.vout.size();
+        nValue = tx.vout[v].nValue;
+        //fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
+        if ( v >= n-1 )
+            return(0);
+        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
+        {
+            fprintf(stderr,"null decodeopret\n");
+            return(0);
+        }
+        else if ( funcid == 'c' )
+        {
+            if ( refassetid == tx.GetHash() && v == 0 )
+                return(nValue);
+        }
+        else if ( funcid == 'b' || funcid == 'B' )
+            return(0);
+        else if ( funcid != 'E' )
+        {
+            if ( assetid == refassetid )
+                return(nValue);
+        }
+        else if ( funcid == 'E' )
+        {
+            if ( v < 2 && assetid == refassetid )
+                return(nValue);
+            else if ( v == 2 && assetid2 == refassetid )
+                return(nValue);
+        }
+    }
+    //fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
+    return(0);
+}
+
+bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
+{
+#ifdef ENABLE_WALLET
+    CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
+    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
+    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
+    {
+        UpdateTransaction(mtx,vini,sigdata);
+        return(true);
+    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
+#else
+    return(false);
+#endif
+}
+
+std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
+{
+    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
+    n = mtx.vout.size();
+    for (i=0; i<n; i++)
+    {
+        //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            totaloutputs += mtx.vout[i].nValue;
+    }
+    if ( (n= mtx.vin.size()) > 64 )
+    {
+        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
+        return(0);
+    }
+    Myprivkey(myprivkey);
+    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
+    GetCCaddress(evalcode,myaddr,mypk);
+    mycond = MakeCC(evalcode,mypk);
+    GetCCaddress(evalcode,unspendable,unspendablepk);
+    othercond = MakeCC(evalcode,unspendablepk);
+    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    memset(utxovalues,0,sizeof(utxovalues));
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            utxovout = mtx.vin[i].prevout.n;
+            utxovalues[i] = vintx.vout[utxovout].nValue;
+            totalinputs += utxovalues[i];
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
+                //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
+                vinimask |= (1LL << i);
+            }
+            else
+            {
+            }
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+    }
+    if ( totalinputs >= totaloutputs+2*txfee )
+    {
+        change = totalinputs - (totaloutputs+txfee);
+        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+    }
+    mtx.vout.push_back(CTxOut(0,opret));
+    PrecomputedTransactionData txdata(mtx);
+    n = mtx.vin.size();
+    for (i=0; i<n; i++)
+    {
+        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
+        {
+            utxovout = mtx.vin[i].prevout.n;
+            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
+            {
+                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
+                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
+            }
+            else
+            {
+                Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
+                //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
+                if ( strcmp(destaddr,myaddr) == 0 )
+                {
+                    privkey = myprivkey;
+                    cond = mycond;
+                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
+                }
+                else if ( strcmp(destaddr,unspendable) == 0 )
+                {
+                    privkey = unspendablepriv;
+                    cond = othercond;
+                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
+                }
+                else
+                {
+                    fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
+                    continue;
+                }
+                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
+                if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
+                    mtx.vin[i].scriptSig = CCSig(cond);
+                else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
+            }
+        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+    }
+    if ( mycond != 0 )
+        cc_free(mycond);
+    if ( othercond != 0 )
+        cc_free(othercond);
+    std::string strHex = EncodeHexTx(mtx);
+    if ( strHex.size() > 0 )
+        return(strHex);
+    else return(0);
+}
+
+bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
+{
+    uint64_t price,recvprice;
+    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+    {
+        fprintf(stderr,"ValidateRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
+        return(false);
+    }
+    else if ( remaining_price < (totalprice - received) )
+    {
+        fprintf(stderr,"ValidateRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
+        return(false);
+    }
+    else if ( remaining_nValue < (orig_nValue - paid) )
+    {
+        fprintf(stderr,"ValidateRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
+        return(false);
+    }
+    else if ( remaining_nValue > 0 )
+    {
+        price = (totalprice * COIN) / orig_nValue;
+        recvprice = (received * COIN) / paid;
+        if ( recvprice < price )
+        {
+            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
+            return(false);
+        }
+    }
+    return(true);
+}
+
+bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
+{
+    uint64_t remaining_nValue,price,mult;
+    if ( received >= totalprice )
+        received = totalprice;
+    remaining_price = (totalprice - received);
+    price = (totalprice * COIN) / orig_nValue;
+    mult = (received * COIN);
+    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
+    if ( price > 0 && (paid= mult / price) > 0 )
+    {
+        if ( (mult % price) != 0 )
+            paid--;
+        remaining_nValue = (orig_nValue - paid);
+        return(ValidateRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
+    } else return(false);
+}
+
+void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
+{
+    int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
+    n = (int32_t)strlen(coinaddr);
+    addrstr.resize(n+1);
+    ptr = (char *)addrstr.data();
+    for (i=0; i<=n; i++)
+        ptr[i] = coinaddr[i];
+    CBitcoinAddress address(addrstr);
+    if ( address.GetIndexKey(hashBytes, type) == 0 )
+        return;
+    addresses.push_back(std::make_pair(hashBytes,type));
+    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
+    {
+        if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
+            return;
+    }
+}
+
+uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+UniValue AssetOrders(uint256 refassetid)
+{
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
+            {
+                UniValue item(UniValue::VOBJ);
+                funcidstr[0] = funcid;
+                funcidstr[1] = 0;
+                item.push_back(Pair("funcid", funcidstr));
+                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
+                item.push_back(Pair("vout", (int64_t)it->first.index));
+                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
+                if ( funcid == 'b' || funcid == 'B' )
+                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
+                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
+                if ( origpubkey.size() == 33 )
+                {
+                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    item.push_back(Pair("origaddress",origaddr));
+                }
+                if ( assetid != zeroid )
+                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
+                if ( assetid2 != zeroid )
+                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
+                if ( price > 0 )
+                {
+                    item.push_back(Pair("totalrequired", (int64_t)price));
+                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
+                }
+                result.push_back(item);
+                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+            }
+        }
+    }
+    return(result);
+}
+
+uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
+{
+    int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
+#ifdef ENABLE_WALLET
+    const CKeyStore& keystore = *pwalletMain;
+    assert(pwalletMain != NULL);
+    LOCK2(cs_main, pwalletMain->cs_wallet);
+    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
+    BOOST_FOREACH(const COutput& out, vecOutputs)
+    {
+        if ( out.fSpendable != 0 )
+        {
+            mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
+            nValue = out.tx->vout[out.i].nValue;
+            totalinputs += nValue;
+            n++;
+            if ( totalinputs >= total || n >= maxinputs )
+                break;
+        }
+    }
+    if ( totalinputs >= total )
+        return(totalinputs);
+#endif
+    return(0);
+}
+
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( name.size() > 32 || description.size() > 4096 )
+    {
+        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
+        return(0);
+    }
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',Mypubkey(),name,description)));
+    }
+    return(0);
+}
+               
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        /*n = outputs.size();
+        if ( n == amounts.size() )
+        {
+            for (i=0; i<n; i++)
+                total += amounts[i];*/
+            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total,60)) > 0 )
+            {
+                if ( inputs > total )
+                    CCchange = (inputs - total);
+                //for (i=0; i<n; i++)
+                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));
+            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
+        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
+    }
+    return(0);
+}
+
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
+    }
+    return(0);
+}
+
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( (inputs= AddCCinputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        {
+            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            if ( inputs > askamount )
+                CCchange = (inputs - askamount);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            if ( assetid2 == zeroid )
+                opret = EncodeOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
+            else opret = EncodeOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        }
+    }
+    return(0);
+}
+
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('x',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            SetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            if ( (inputs= AddCCinputs(mtx,mypk,assetid,fillamount,60)) > 0 )
+            {
+                if ( inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx wasnt for assetid\n");
+        }
+    }
+    return(0);
+}
+
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
+{
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[askvout].nValue;
+            SetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
+            if ( assetid2 == zeroid )
+                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount,60);
+            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
+            if ( inputs > 0 )
+            {
+                if ( assetid2 == zeroid && inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx not enough utxos\n");
+        }
+    }
+    return(0);
+}
+
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+{
+    uint256 hashBlock; char destaddr[64];
+    origaddr[0] = destaddr[0] = 0;
+    if ( tx.vin.size() < 2 )
+        return eval->Invalid("not enough for CC vins");
+    else if ( tx.vin[1].prevout.n != 0 )
+        return eval->Invalid("vin1 needs to be buyvin.vout[0]");
+    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
+        return eval->Invalid("always should find vin, but didnt");
+    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
+    {
+        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
+        return eval->Invalid("invalid vin AssetsCCaddr");
+    }
+    else if ( vinTx.vout[0].nValue < 10000 )
+        return eval->Invalid("invalid dust for buyvin");
+    else if ( Getorigaddrs(CCaddr,origaddr,vinTx) == 0 )
+        return eval->Invalid("couldnt get origaddr for buyvin");
+    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
+    return(vinTx.vout[0].nValue);
+}
+
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
+{
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+        return(0);
+    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
+        return eval->Invalid("invalid normal vout0 for buyvin");
+    else
+    {
+        //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
+        if ( (funcid= DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
+            return eval->Invalid("invalid opreturn for buyvin");
+        else if ( refassetid != assetid )
+        {
+            //for (i=32; i>=0; i--)
+            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+            //fprintf(stderr," AssetValidateBuyvin\n");
+            return eval->Invalid("invalid assetid for buyvin");
+        }
+    }
+    return(nValue);
+}
+
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint64_t nValue,assetoshis;
+    fprintf(stderr,"AssetValidateSellvin\n");
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+        return(0);
+    if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
+        return eval->Invalid("invalid missing CC vout0 for sellvin");
+    else return(assetoshis);
+}
+
+bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
+{
+    char destaddr[64];
+    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+        return(false);
+    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
+        return(false);
+    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+        return(false);
+    else return(true);
+}
+
+bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=1; i<numvins; i++)
+    {
+        if ( IsEvalInput(EVAL_ASSETS,tx.vin[i].scriptSig) != 0 )
+        {
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                inputs += assetoshis;
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs )
+        return(false);
+    else return(true);
+}
+
+bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+{
+    static uint256 zero;
+    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    fprintf(stderr,"AssetValidate (%c)\n",funcid);
+    numvins = tx.vin.size();
+    outputs = inputs = 0;
+    preventCCvins = preventCCvouts = -1;
+    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
+        return eval->Invalid("illegal asset vin0");
+    else if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else if ( funcid != 'c' )
+    {
+        if ( assetid == zero )
+            return eval->Invalid("illegal assetid");
+        else if ( AssetExactAmounts(eval,tx,assetid) == false )
+            eval->Invalid("asset inputs != outputs");
+    }
+    switch ( funcid )
+    {
+        case 'c': // create wont be called to be verified as it has no CC inputs
+            //vin.0: normal input
+            //vout.0: issuance assetoshis to CC
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
+            return eval->Invalid("unexpected AssetValidate for createasset");
+            break;
+            
+        case 't': // transfer
+            //vin.0: normal input
+            //vin.1 .. vin.n-1: valid CC outputs
+            //vout.0 to n-2: assetoshis output to CC
+            //vout.n-2: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
+            if ( inputs == 0 )
+                return eval->Invalid("no asset inputs for transfer");
+            fprintf(stderr,"transfer validated %.8f -> %.8f\n",(double)inputs/COIN,(double)outputs/COIN);
+            break;
+
+        case 'b': // buyoffer
+            //vins.*: normal inputs (bid + change)
+            //vout.0: amount of bid to unspendable
+            //vout.1: normal output for change (if any)
+            // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
+            if ( remaining_price == 0 )
+                return eval->Invalid("illegal null amount for buyoffer");
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                return eval->Invalid("invalid vout for buyoffer");
+            preventCCvins = 1;
+            preventCCvouts = 1;
+            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",(char *)AssetsCCaddr);
+            break;
+            
+        case 'o': // cancelbuy
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+            //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['o']
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for cancelbuy");
+            else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
+                return eval->Invalid("invalid refund for cancelbuy");
+            preventCCvins = 1;
+            preventCCvouts = 0;
+            fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
+            break;
+            
+        case 'B': // fillbuy:
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+            //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+            //vout.0: remaining amount of bid to unspendable
+            //vout.1: vin.1 value to signer of vin.2
+            //vout.2: vin.2 assetoshis to original pubkey
+            //vout.3: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+            preventCCvouts = 4;
+            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( numvouts < 3 )
+                return eval->Invalid("not enough vouts for fillbuy");
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for fillbuy");
+            else
+            {
+                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
+                    return eval->Invalid("vout1 is CC for fillbuy");
+                else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                    return eval->Invalid("vout2 is normal for fillbuy");
+                else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                    return eval->Invalid("mismatched remainder for fillbuy");
+                else if ( remaining_price != 0 )
+                {
+                    if ( remaining_price < 10000 )
+                        return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
+                }
+            }
+            fprintf(stderr,"fillbuy validated\n");
+            break;
+            
+        case 's': // selloffer
+        case 'e': // exchange
+            //vin.0: normal input
+            //vin.1: valid CC output for sale
+            //vout.0: vin.1 assetoshis output to CC to unspendable
+            //vout.1: normal output for change (if any)
+            //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
+            //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
+            if ( remaining_price == 0 )
+                return eval->Invalid("illegal null remaining_price for selloffer");
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
+            preventCCvouts = 1;
+            break;
+           
+        case 'x': // cancel
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
+            //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
+            //vout.1: normal output for change (if any)
+            //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for cancel");
+            else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
+                return eval->Invalid("invalid vout for cancel");
+            preventCCvins = 2;
+            preventCCvouts = 1;
+            break;
+            
+        case 'S': // fillsell
+        case 'E': // fillexchange
+            //vin.0: normal input
+            //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
+            //'S'.vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
+            //'E'.vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
+            //vout.0: remaining assetoshis -> unspendable
+            //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
+            //'S'.vout.2: vin.2 value to original pubkey [origpubkey]
+            //'E'.vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
+            //vout.3: normal output for change (if any)
+            //'S'.vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
+            //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
+            if ( funcid == 'E' )
+            {
+                if ( AssetExactAmounts(eval,tx,assetid2) == false )
+                    eval->Invalid("asset2 inputs != outputs");
+            }
+            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+                return(false);
+            else if ( numvouts < 3 )
+                return eval->Invalid("not enough vouts for fill");
+            else if ( tmporigpubkey != origpubkey )
+                return eval->Invalid("mismatched origpubkeys for fill");
+            else
+            {
+                if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                    return eval->Invalid("mismatched remainder for fill");
+                else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
+                    return eval->Invalid("normal vout1 for fillask");
+                else if ( funcid == 'E' && ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                    return eval->Invalid("normal vout2 for fillask");
+                else if ( funcid == 'S' && ConstrainVout(tx.vout[2],0,origaddr,0) == 0 )
+                    return eval->Invalid("CC vout2 for fillask");
+                else if ( remaining_price != 0 )
+                {
+                    if ( remaining_price < 10000 )
+                        return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
+                }
+            }
+            fprintf(stderr,"fill validated\n");
+            break;
+    }
+    if ( preventCCvins >= 0 )
+    {
+        for (i=preventCCvins; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
+                return eval->Invalid("invalid CC vin");
+        }
+    }
+    if ( preventCCvouts >= 0 )
+    {
+        for (i=preventCCvouts; i<numvouts; i++)
+        {
+            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                return eval->Invalid("invalid CC vout");
+        }
+    }
+    return(true);
+}
+
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+{
+    static uint256 zero,prevtxid;
+    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    txid = ctx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
+    CTransaction tx = *(CTransaction *)&ctx;
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    else if ( (n= tx.vout.size()) == 0 )
+        return eval->Invalid("no-vouts");
+    else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+        return eval->Invalid("Invalid opreturn payload");
+    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset create txid");
+    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset2 create txid");
+    if ( AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
+    {
+        prevtxid = txid;
+        return(true);
+    } else return(false);
+}
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d980f5f8e..d0d5f5019 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -13,30 +13,7 @@
  *                                                                            *
  ******************************************************************************/
 
-#include <cc/eval.h>
-#include <script/cc.h>
-#include <script/script.h>
-#include <cryptoconditions.h>
-#include "../script/standard.h"
-#include "../base58.h"
-#include "../core_io.h"
-#include "../script/sign.h"
-#include "../wallet/wallet.h"
-#include <univalue.h>
-#include <exception>
-
-#ifdef ENABLE_WALLET
-extern CWallet* pwalletMain;
-#endif
-extern uint8_t NOTARY_PUBKEY33[33];
-uint256 Parseuint256(char *hexstr);
-bool GetAddressUnspent(uint160 addressHash, int type,
-                       std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs);
-
-// code info and totals to validate asset total and balances
-// misc rpc, ie. CCaddress
-// test underfill, overfill, exactfill
-// sell and maybe even exchange
+#include "CCassets.h"
 
 /*
  Assets can be created or transferred.
@@ -146,893 +123,6 @@ bool GetAddressUnspent(uint160 addressHash, int type,
  vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
-
-//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
-//BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
-//BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
-//BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
-
-static uint256 zeroid;
-const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
-char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
-uint8_t Unspendablepriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-
-CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
-{
-    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
-    n = pubkey.size();
-    dest = (uint8_t *)pk.begin();
-    pubkey33 = (uint8_t *)pubkey.data();
-    for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
-    return(pk);
-}
-
-CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
-{
-    static CPubKey nullpk;
-    if ( unspendablepriv != 0 )
-        memset(unspendablepriv,0,32);
-    if ( evalcode == EVAL_ASSETS )
-    {
-        if ( unspendablepriv != 0 )
-            memcpy(unspendablepriv,Unspendablepriv,32);
-    } else return(nullpk);
-    return(pubkey2pk(ParseHex(AssetsCChexstr)));
-}
-
-CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
-{
-    CScript opret; uint8_t evalcode = EVAL_ASSETS;
-    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
-    return(opret);
-}
-
-uint256 revuint256(uint256 txid)
-{
-    uint256 revtxid; int32_t i;
-    for (i=31; i>=0; i--)
-        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&txid)[i];
-    return(revtxid);
-}
-
-char *uint256_str(char *dest,uint256 txid)
-{
-    int32_t i,j=0;
-    for (i=31; i>=0; i--)
-        sprintf(&dest[j++ * 2],"%02x",((uint8_t *)&txid)[i]);
-   return(dest);
-}
-
-CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
-{
-    CScript opret; uint8_t evalcode = EVAL_ASSETS;
-    assetid = revuint256(assetid);
-    switch ( funcid )
-    {
-        case 't':  case 'x': case 'o':
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
-            break;
-        case 's': case 'b': case 'S': case 'B':
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
-            break;
-        case 'E': case 'e':
-            assetid2 = revuint256(assetid2);
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
-            break;
-        default:
-            fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
-            opret << OP_RETURN;
-            break;
-    }
-    return(opret);
-}
-
-bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
-{
-    CTxDestination address; txnouttype whichType;
-    //int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
-    //for (i=0; i<scriptPubKey.size(); i++)
-    //    fprintf(stderr,"%02x",ptr[i]);
-    //fprintf(stderr," scriptPubKey\n");
-    if ( ExtractDestination(scriptPubKey,address) != 0 )
-    {
-        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        //fprintf(stderr,"destaddr.(%s)\n",destaddr);
-        return(true);
-    }
-    fprintf(stderr,"ExtractDestination failed\n");
-    return(false);
-}
-
-std::vector<uint8_t> Mypubkey()
-{
-    std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
-    pubkey33 = NOTARY_PUBKEY33;
-    pubkey.resize(33);
-    dest = pubkey.data();
-    for (i=0; i<33; i++)
-        dest[i] = pubkey33[i];
-    return(pubkey);
-}
-
-bool Myprivkey(uint8_t myprivkey[])
-{
-    char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
-    if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
-    {
-        n = (int32_t)strlen(coinaddr);
-        strAddress.resize(n+1);
-        dest = (char *)strAddress.data();
-        for (i=0; i<n; i++)
-            dest[i] = coinaddr[i];
-        dest[i] = 0;
-        if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
-        {
-#ifdef ENABLE_WALLET
-            if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
-            {
-                memcpy(myprivkey,vchSecret.begin(),32);
-                //for (i=0; i<32; i++)
-                //    fprintf(stderr,"%02x",myprivkey[i]);
-                //fprintf(stderr," found privkey!\n");
-                return(true);
-            }
-#endif
-        }
-    }
-    fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
-    return(false);
-}
-
-CC *MakeAssetCond(CPubKey pk)
-{
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
-    pks.push_back(CCNewSecp256k1(pk));
-    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-    CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {assetCC, Sig});
-}
-
-CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
-{
-    CTxOut vout;
-    CC *payoutCond = MakeAssetCond(pk);
-    vout = CTxOut(nValue,CCPubKey(payoutCond));
-    cc_free(payoutCond);
-    return(vout);
-}
-
-CC *MakeCC(uint8_t evalcode,CPubKey pk)
-{
-    if ( evalcode == EVAL_ASSETS )
-    {
-        std::vector<CC*> pks;
-        pks.push_back(CCNewSecp256k1(pk));
-        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-        CC *Sig = CCNewThreshold(1, pks);
-        return CCNewThreshold(2, {assetCC, Sig});
-    } else return(0);
-}
-
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
-{
-    CC *payoutCond;
-    destaddr[0] = 0;
-    if ( evalcode == EVAL_ASSETS )
-    {
-        if ( pk.size() == 0 )
-            pk = GetUnspendable(EVAL_ASSETS,0);
-        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
-        {
-            Getscriptaddress(destaddr,CCPubKey(payoutCond));
-            cc_free(payoutCond);
-        }
-        return(destaddr[0] != 0);
-    }
-    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
-    return false;
-}
-           
-uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
-{
-    std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
-    GetOpReturnData(scriptPubKey, vopret);
-    script = (uint8_t *)vopret.data();
-    memset(&assetid,0,sizeof(assetid));
-    memset(&assetid2,0,sizeof(assetid2));
-    price = 0;
-    if ( script[0] == EVAL_ASSETS )
-    {
-        funcid = script[1];
-        //fprintf(stderr,"decode.[%c]\n",funcid);
-        switch ( funcid )
-        {
-            case 'c': return(funcid);
-                break;
-            case 't':  case 'x': case 'o':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
-                {
-                    assetid = revuint256(assetid);
-                    return(funcid);
-                }
-                break;
-            case 's': case 'b': case 'S': case 'B':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
-                {
-                    assetid = revuint256(assetid);
-                    //fprintf(stderr,"got price %llu\n",(long long)price);
-                    return(funcid);
-                }
-                break;
-            case 'E': case 'e':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
-                {
-                    fprintf(stderr,"got price %llu\n",(long long)price);
-                    assetid = revuint256(assetid);
-                    assetid2 = revuint256(assetid2);
-                    return(funcid);
-                }
-                break;
-            default:
-                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
-                funcid = 0;
-                break;
-        }
-    }
-    return(funcid);
-}
-
-bool SetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
-{
-    uint256 assetid,assetid2;
-    if ( DecodeOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
-        return(true);
-    else return(false);
-}
-           
-bool Getorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
-{
-    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
-    n = tx.vout.size();
-    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        return(false);
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
-        return(true);
-    else return(false);
-}
-    
-CC* GetCryptoCondition(CScript const& scriptSig)
-{
-    auto pc = scriptSig.begin();
-    opcodetype opcode;
-    std::vector<unsigned char> ffbin;
-    if (scriptSig.GetOp(pc, opcode, ffbin))
-        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
-}
-       
-bool IsCCInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if ( (cond= GetCryptoCondition(scriptSig)) == 0 )
-        return false;
-    cc_free(cond);
-    return true;
-}
-       
-bool IsAssetInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-       
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
-{
-    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
-    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
-    {
-        n = tx.vout.size();
-        nValue = tx.vout[v].nValue;
-        //fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
-        if ( v >= n-1 )
-            return(0);
-        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        {
-            fprintf(stderr,"null decodeopret\n");
-            return(0);
-        }
-        else if ( funcid == 'c' )
-        {
-            if ( refassetid == tx.GetHash() && v == 0 )
-                return(nValue);
-        }
-        else if ( funcid == 'b' || funcid == 'B' )
-            return(0);
-        else if ( funcid != 'E' )
-        {
-            if ( assetid == refassetid )
-                return(nValue);
-        }
-        else if ( funcid == 'E' )
-        {
-            if ( v < 2 && assetid == refassetid )
-                return(nValue);
-            else if ( v == 2 && assetid2 == refassetid )
-                return(nValue);
-        }
-    }
-    //fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
-    return(0);
-}
-
-bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
-{
-#ifdef ENABLE_WALLET
-    CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
-    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
-    {
-        UpdateTransaction(mtx,vini,sigdata);
-        return(true);
-    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
-#else
-    return(false);
-#endif
-}
-
-std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
-{
-    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
-    n = mtx.vout.size();
-    for (i=0; i<n; i++)
-    {
-        //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            totaloutputs += mtx.vout[i].nValue;
-    }
-    if ( (n= mtx.vin.size()) > 64 )
-    {
-        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
-        return(0);
-    }
-    Myprivkey(myprivkey);
-    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
-    GetCCaddress(evalcode,myaddr,mypk);
-    mycond = MakeCC(evalcode,mypk);
-    GetCCaddress(evalcode,unspendable,unspendablepk);
-    othercond = MakeCC(evalcode,unspendablepk);
-    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
-    memset(utxovalues,0,sizeof(utxovalues));
-    for (i=0; i<n; i++)
-    {
-        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
-        {
-            utxovout = mtx.vin[i].prevout.n;
-            utxovalues[i] = vintx.vout[utxovout].nValue;
-            totalinputs += utxovalues[i];
-            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            {
-                //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
-                vinimask |= (1LL << i);
-            }
-            else
-            {
-            }
-        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-    }
-    if ( totalinputs >= totaloutputs+2*txfee )
-    {
-        change = totalinputs - (totaloutputs+txfee);
-        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-    }
-    mtx.vout.push_back(CTxOut(0,opret));
-    PrecomputedTransactionData txdata(mtx);
-    n = mtx.vin.size();
-    for (i=0; i<n; i++)
-    {
-        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
-        {
-            utxovout = mtx.vin[i].prevout.n;
-            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            {
-                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
-                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
-            }
-            else
-            {
-                Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
-                //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
-                if ( strcmp(destaddr,myaddr) == 0 )
-                {
-                    privkey = myprivkey;
-                    cond = mycond;
-                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
-                }
-                else if ( strcmp(destaddr,unspendable) == 0 )
-                {
-                    privkey = unspendablepriv;
-                    cond = othercond;
-                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
-                }
-                else
-                {
-                    fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
-                    continue;
-                }
-                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
-                if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
-                    mtx.vin[i].scriptSig = CCSig(cond);
-                else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
-            }
-        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-    }
-    if ( mycond != 0 )
-        cc_free(mycond);
-    if ( othercond != 0 )
-        cc_free(othercond);
-    std::string strHex = EncodeHexTx(mtx);
-    if ( strHex.size() > 0 )
-        return(strHex);
-    else return(0);
-}
-
-bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
-{
-    uint64_t price,recvprice;
-    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
-    {
-        fprintf(stderr,"ValidateRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
-        return(false);
-    }
-    else if ( remaining_price < (totalprice - received) )
-    {
-        fprintf(stderr,"ValidateRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
-        return(false);
-    }
-    else if ( remaining_nValue < (orig_nValue - paid) )
-    {
-        fprintf(stderr,"ValidateRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
-        return(false);
-    }
-    else if ( remaining_nValue > 0 )
-    {
-        price = (totalprice * COIN) / orig_nValue;
-        recvprice = (received * COIN) / paid;
-        if ( recvprice < price )
-        {
-            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
-            return(false);
-        }
-    }
-    return(true);
-}
-
-bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
-{
-    uint64_t remaining_nValue,price,mult;
-    if ( received >= totalprice )
-        received = totalprice;
-    remaining_price = (totalprice - received);
-    price = (totalprice * COIN) / orig_nValue;
-    mult = (received * COIN);
-    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
-    if ( price > 0 && (paid= mult / price) > 0 )
-    {
-        if ( (mult % price) != 0 )
-            paid--;
-        remaining_nValue = (orig_nValue - paid);
-        return(ValidateRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
-    } else return(false);
-}
-
-void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
-{
-    int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
-    n = (int32_t)strlen(coinaddr);
-    addrstr.resize(n+1);
-    ptr = (char *)addrstr.data();
-    for (i=0; i<=n; i++)
-        ptr[i] = coinaddr[i];
-    CBitcoinAddress address(addrstr);
-    if ( address.GetIndexKey(hashBytes, type) == 0 )
-        return;
-    addresses.push_back(std::make_pair(hashBytes,type));
-    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
-    {
-        if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
-            return;
-    }
-}
-
-uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
-
-UniValue AssetOrders(uint256 refassetid)
-{
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
-    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
-            {
-                UniValue item(UniValue::VOBJ);
-                funcidstr[0] = funcid;
-                funcidstr[1] = 0;
-                item.push_back(Pair("funcid", funcidstr));
-                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
-                item.push_back(Pair("vout", (int64_t)it->first.index));
-                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
-                if ( funcid == 'b' || funcid == 'B' )
-                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
-                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
-                if ( origpubkey.size() == 33 )
-                {
-                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
-                    item.push_back(Pair("origaddress",origaddr));
-                }
-                if ( assetid != zeroid )
-                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
-                if ( assetid2 != zeroid )
-                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
-                if ( price > 0 )
-                {
-                    item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
-                }
-                result.push_back(item);
-                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
-            }
-        }
-    }
-    return(result);
-}
-
-uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
-{
-    int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
-#ifdef ENABLE_WALLET
-    const CKeyStore& keystore = *pwalletMain;
-    assert(pwalletMain != NULL);
-    LOCK2(cs_main, pwalletMain->cs_wallet);
-    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
-    BOOST_FOREACH(const COutput& out, vecOutputs)
-    {
-        if ( out.fSpendable != 0 )
-        {
-            mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
-            nValue = out.tx->vout[out.i].nValue;
-            totalinputs += nValue;
-            n++;
-            if ( totalinputs >= total || n >= maxinputs )
-                break;
-        }
-    }
-    if ( totalinputs >= total )
-        return(totalinputs);
-#endif
-    return(0);
-}
-
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( name.size() > 32 || description.size() > 4096 )
-    {
-        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
-        return(0);
-    }
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',Mypubkey(),name,description)));
-    }
-    return(0);
-}
-               
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        /*n = outputs.size();
-        if ( n == amounts.size() )
-        {
-            for (i=0; i<n; i++)
-                total += amounts[i];*/
-            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total,60)) > 0 )
-            {
-                if ( inputs > total )
-                    CCchange = (inputs - total);
-                //for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));
-            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
-    }
-    return(0);
-}
-
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
-    }
-    return(0);
-}
-
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( (inputs= AddCCinputs(mtx,mypk,assetid,askamount,60)) > 0 )
-        {
-            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
-            if ( inputs > askamount )
-                CCchange = (inputs - askamount);
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-            if ( assetid2 == zeroid )
-                opret = EncodeOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
-            else opret = EncodeOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
-        }
-    }
-    return(0);
-}
-
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
-            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('x',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
-{
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[bidvout].nValue;
-            SetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( (inputs= AddCCinputs(mtx,mypk,assetid,fillamount,60)) > 0 )
-            {
-                if ( inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx wasnt for assetid\n");
-        }
-    }
-    return(0);
-}
-
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
-{
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[askvout].nValue;
-            SetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
-            if ( assetid2 == zeroid )
-                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount,60);
-            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
-            if ( inputs > 0 )
-            {
-                if ( assetid2 == zeroid && inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx not enough utxos\n");
-        }
-    }
-    return(0);
-}
-
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
-{
-    uint256 hashBlock; char destaddr[64];
-    origaddr[0] = destaddr[0] = 0;
-    if ( tx.vin.size() < 2 )
-        return eval->Invalid("not enough for CC vins");
-    else if ( tx.vin[1].prevout.n != 0 )
-        return eval->Invalid("vin1 needs to be buyvin.vout[0]");
-    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
-        return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
-    {
-        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
-        return eval->Invalid("invalid vin AssetsCCaddr");
-    }
-    else if ( vinTx.vout[0].nValue < 10000 )
-        return eval->Invalid("invalid dust for buyvin");
-    else if ( Getorigaddrs(CCaddr,origaddr,vinTx) == 0 )
-        return eval->Invalid("couldnt get origaddr for buyvin");
-    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
-    return(vinTx.vout[0].nValue);
-}
-
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
-{
-    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
-        return(0);
-    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
-        return eval->Invalid("invalid normal vout0 for buyvin");
-    else
-    {
-        //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
-        if ( (funcid= DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
-            return eval->Invalid("invalid opreturn for buyvin");
-        else if ( refassetid != assetid )
-        {
-            //for (i=32; i>=0; i--)
-            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-            //fprintf(stderr," AssetValidateBuyvin\n");
-            return eval->Invalid("invalid assetid for buyvin");
-        }
-    }
-    return(nValue);
-}
-
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
-{
-    CTransaction vinTx; uint64_t nValue,assetoshis;
-    fprintf(stderr,"AssetValidateSellvin\n");
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
-        return(0);
-    if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
-        return eval->Invalid("invalid missing CC vout0 for sellvin");
-    else return(assetoshis);
-}
-
-bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
-{
-    char destaddr[64];
-    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
-        return(false);
-    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
-        return(false);
-    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
-        return(false);
-    else return(true);
-}
-
-bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
-{
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
-    numvins = tx.vin.size();
-    numvouts = tx.vout.size();
-    for (i=1; i<numvins; i++)
-    {
-        if ( IsAssetInput(tx.vin[i].scriptSig) != 0 )
-        {
-            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                return eval->Invalid("always should find vin, but didnt");
-            else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
-                inputs += assetoshis;
-        }
-    }
-    for (i=0; i<numvouts; i++)
-    {
-        if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
-            outputs += assetoshis;
-    }
-    if ( inputs != outputs )
-        return(false);
-    else return(true);
-}
-
 bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
@@ -1072,7 +162,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("no asset inputs for transfer");
             fprintf(stderr,"transfer validated %.8f -> %.8f\n",(double)inputs/COIN,(double)outputs/COIN);
             break;
-
+            
         case 'b': // buyoffer
             //vins.*: normal inputs (bid + change)
             //vout.0: amount of bid to unspendable
@@ -1080,7 +170,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("invalid vout for buyoffer");
             preventCCvins = 1;
             preventCCvouts = 1;
@@ -1097,7 +187,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for cancelbuy");
-            else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
+            else if ( ConstrainAssetVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
             preventCCvins = 1;
             preventCCvouts = 0;
@@ -1122,17 +212,17 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
             else
             {
-                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
+                if ( ConstrainAssetVout(tx.vout[1],0,0,0) == 0 )
                     return eval->Invalid("vout1 is CC for fillbuy");
-                else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                else if ( ConstrainAssetVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
                 else if ( remaining_price != 0 )
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
                 }
             }
@@ -1149,11 +239,11 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null remaining_price for selloffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
             preventCCvouts = 1;
             break;
-           
+            
         case 'x': // cancel
             //vin.0: normal input
             //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
@@ -1164,7 +254,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for cancel");
-            else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
+            else if ( ConstrainAssetVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
                 return eval->Invalid("invalid vout for cancel");
             preventCCvins = 2;
             preventCCvouts = 1;
@@ -1196,19 +286,19 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
-                if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                     return eval->Invalid("mismatched remainder for fill");
-                else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
+                else if ( ConstrainAssetVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");
-                else if ( funcid == 'E' && ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
+                else if ( funcid == 'E' && ConstrainAssetVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("normal vout2 for fillask");
-                else if ( funcid == 'S' && ConstrainVout(tx.vout[2],0,origaddr,0) == 0 )
+                else if ( funcid == 'S' && ConstrainAssetVout(tx.vout[2],0,origaddr,0) == 0 )
                     return eval->Invalid("CC vout2 for fillask");
                 else if ( remaining_price != 0 )
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
             }
@@ -1246,7 +336,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("Cannot have params");
     else if ( (n= tx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+    else if ( (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
@@ -1258,3 +348,4 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return(true);
     } else return(false);
 }
+
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index b8044e0dd..6f3a5827e 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -60,19 +60,19 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
 
     uint8_t ecode = cond->code[0];
     std::vector<uint8_t> vparams(cond->code+1, cond->code+cond->codeLength);
-
-    if (ecode == EVAL_IMPORTPAYOUT) {
-        return ImportPayout(vparams, txTo, nIn);
+    switch ( ecode )
+    {
+        case EVAL_IMPORTPAYOUT:
+            return ImportPayout(vparams, txTo, nIn);
+            break;
+            
+        case EVAL_IMPORTCOIN:
+            return ImportCoin(vparams, txTo, nIn);
+            break;
+        default:
+            return ProcessCCevals(ecode,this,vparams,txTo,nIn);
+            break;
     }
-
-    if (ecode == EVAL_IMPORTCOIN) {
-        return ImportCoin(vparams, txTo, nIn);
-    }
-    
-    if (ecode == EVAL_ASSETS) {
-        return ProcessAssets(this, vparams, txTo, nIn);
-    }
-
     return Invalid("invalid-code");
 }
 
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 96af359f1..79262edb6 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -266,7 +266,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
+bool ProcessCCevals(uint8_t evalcode,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 571a82975..5cb5384fd 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,28 +4830,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
-#define EVAL_ASSETS 0xe3
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount);
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal);
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid);
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount);
-uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
-std::vector<uint8_t> Mypubkey();
-UniValue AssetOrders(uint256 tokenid);
-CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
-
-uint256 Parseuint256(char *hexstr)
-{
-    uint256 txid; int32_t i; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
-    for (i=31; i>=0; i--)
-        ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
-    return(txid);
-}
+#include "../cc/CCassets.h"
 
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {

From 5cf0c1db944135ca9efa6a5792c59f0ed356927c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 02:53:55 -1100
Subject: [PATCH 413/623] Test

---
 src/cc/CCassets.h  |  6 +++++-
 src/cc/CCutils.cpp | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 5ff35af8e..519f9e9ee 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -13,7 +13,6 @@
  *                                                                            *
  ******************************************************************************/
 
-#include "CCinclude.h"
 
 /*
  CCassetstx has the functions that create the EVAL_ASSETS transactions. It is expected that rpc calls would call these functions. For EVAL_ASSETS, the rpc functions are in rpcwallet.cpp
@@ -24,6 +23,11 @@
 #ifndef CC_ASSETS_H
 #define CC_ASSETS_H
 
+#include "CCinclude.h"
+
+extern const char *AssetsCCaddr;
+extern char AssetsCChexstr[67];
+
 // CCassetsCore
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
 CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 81b50ac20..1eadfd6c3 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -78,6 +78,17 @@ uint256 Parseuint256(char *hexstr)
     return(txid);
 }
 
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
+{
+    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
+    n = pubkey.size();
+    dest = (uint8_t *)pk.begin();
+    pubkey33 = (uint8_t *)pubkey.data();
+    for (i=0; i<n; i++)
+        dest[i] = pubkey33[i];
+    return(pk);
+}
+
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
 {
     CTxDestination address; txnouttype whichType;

From 858d1df466994321aa936fab9c9eebd1638c10b4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 02:54:57 -1100
Subject: [PATCH 414/623] Test

---
 src/cc/CCinclude.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 796d06d5a..cdab5965d 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -47,6 +47,7 @@ bool IsEvalInput(uint8_t evalcode,CScript const& scriptSig);
 uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
+CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);

From 45e8b116a44b4efbc3e1eac096e8c120e614bbf5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 02:56:22 -1100
Subject: [PATCH 415/623] Test

---
 src/cc/CCassets.h       |  2 ++
 src/cc/CCassetsCore.cpp | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 519f9e9ee..6dd8265a7 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -29,6 +29,8 @@ extern const char *AssetsCCaddr;
 extern char AssetsCChexstr[67];
 
 // CCassetsCore
+CC *MakeAssetCond(CPubKey pk);
+CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
 CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index d0a4856a5..b6b2edb2c 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -15,6 +15,24 @@
 
 #include "CCassets.h"
 
+CC *MakeAssetCond(CPubKey pk)
+{
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {assetCC, Sig});
+}
+
+CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeAssetCond(pk);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;

From 751cdbc2afb756f4f4ee709a27d4d806fc47c802 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 02:59:11 -1100
Subject: [PATCH 416/623] Test

---
 src/cc/CCassets.h   | 1 -
 src/cc/CCcustom.cpp | 4 +++-
 src/cc/eval.cpp     | 5 +++--
 src/cc/eval.h       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 6dd8265a7..d7f6a13f4 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -29,7 +29,6 @@ extern const char *AssetsCCaddr;
 extern char AssetsCChexstr[67];
 
 // CCassetsCore
-CC *MakeAssetCond(CPubKey pk);
 CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
 CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 551706759..3a46d0da5 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -19,7 +19,8 @@
  CCcustom has most of the functions that need to be extended to create a new CC contract.
  
  EVAL_CONTRACT is the naming convention and it should be added to cc/eval.h
- 
+ bool Eval::Dispatch() in cc/eval.h needs to add the validation function in the switch
+
  A CC scriptPubKey can only be spent if it is properly signed and validated. By constraining the vins and vouts, it is possible to implement a variety of functionality. CC vouts have an otherwise non-standard form, but it is properly supported by the enhanced bitcoin protocol code as a "cryptoconditions" output and the same pubkey will create a different address.
  
  This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
@@ -32,6 +33,7 @@
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
+CC *MakeAssetCond(CPubKey pk);
 
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 6f3a5827e..2f77ced1a 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -69,8 +69,9 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
         case EVAL_IMPORTCOIN:
             return ImportCoin(vparams, txTo, nIn);
             break;
-        default:
-            return ProcessCCevals(ecode,this,vparams,txTo,nIn);
+            
+        case EVAL_ASSETS:
+            return ProcessAssets(this, vparams, txTo, nIn);
             break;
     }
     return Invalid("invalid-code");
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 79262edb6..96af359f1 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -266,7 +266,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
-bool ProcessCCevals(uint8_t evalcode,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn);
+bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */

From 2e482a0e6863c057919da34541b87dda72fb1554 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:00:09 -1100
Subject: [PATCH 417/623] Test

---
 src/cc/CCcustom.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 3a46d0da5..ab6daf1ab 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -79,13 +79,4 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
     return false;
 }
            
-bool ProcessCCevals(uint8_t evalcode,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
-{
-    switch ( evalcode )
-    {
-        case EVAL_ASSETS:
-            return ProcessAssets(this, vparams, txTo, nIn);
-            break;
-    }
-    return(false);
-}
+

From ea06d536b1b7b171b9c97bc464e254c4723dfbdd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:06:53 -1100
Subject: [PATCH 418/623] Test

---
 src/cc/CCassetsCore.cpp |  2 +-
 src/cc/CCcustom.cpp     | 18 ++++++++++++++++++
 src/cc/CCinclude.h      |  1 -
 src/cc/CCutils.cpp      | 17 -----------------
 src/cc/assets copy.cpp  |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index b6b2edb2c..eae6df8bf 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -296,7 +296,7 @@ bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
     numvouts = tx.vout.size();
     for (i=1; i<numvins; i++)
     {
-        if ( IsEvalInput(EVAL_ASSETS,tx.vin[i].scriptSig) != 0 )
+        if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index ab6daf1ab..8985d7719 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -35,6 +35,24 @@ char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 CC *MakeAssetCond(CPubKey pk);
 
+
+bool IsAssetsInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
     static CPubKey nullpk;
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index cdab5965d..9533dc994 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -43,7 +43,6 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 // CCutils
 CC* GetCryptoCondition(CScript const& scriptSig);
 bool IsCCInput(CScript const& scriptSig);
-bool IsEvalInput(uint8_t evalcode,CScript const& scriptSig);
 uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 1eadfd6c3..7ac92a51c 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -37,23 +37,6 @@ bool IsCCInput(CScript const& scriptSig)
     return true;
 }
 
-bool IsEvalInput(uint8_t evalcode,CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == evalcode;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-
 uint256 revuint256(uint256 txid)
 {
     uint256 revtxid; int32_t i;
diff --git a/src/cc/assets copy.cpp b/src/cc/assets copy.cpp
index e34bee39d..f823b5a1a 100644
--- a/src/cc/assets copy.cpp	
+++ b/src/cc/assets copy.cpp	
@@ -997,7 +997,7 @@ bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
     numvouts = tx.vout.size();
     for (i=1; i<numvins; i++)
     {
-        if ( IsEvalInput(EVAL_ASSETS,tx.vin[i].scriptSig) != 0 )
+        if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");

From bdcbea7b64287b3cf0992f820fd5c4ca76143e10 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:07:50 -1100
Subject: [PATCH 419/623] Test

---
 src/cc/CCassets.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index d7f6a13f4..4c531839c 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -27,6 +27,8 @@
 
 extern const char *AssetsCCaddr;
 extern char AssetsCChexstr[67];
+// CCcustom
+bool IsAssetsInput(CScript const& scriptSig);
 
 // CCassetsCore
 CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);

From 00a467aa50f29cf93f2de2aaa117b48ce0921249 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:09:39 -1100
Subject: [PATCH 420/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5cb5384fd..99e67dad6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4855,7 +4855,7 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     result.push_back(Pair("result", "success"));
     if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("CCaddress",destaddr));
-    balance = AddCCinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
+    balance = AddAssetsinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
     result.push_back(Pair("tokenid", params[0].get_str()));
     result.push_back(Pair("balance", (int64_t)balance));
     return(result);

From a2c1a1c658a3a8b5644ab7545139b9587b79796a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:10:29 -1100
Subject: [PATCH 421/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 99e67dad6..b4b5ac513 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4855,7 +4855,7 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     result.push_back(Pair("result", "success"));
     if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("CCaddress",destaddr));
-    balance = AddAssetsinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
+    balance = AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
     result.push_back(Pair("tokenid", params[0].get_str()));
     result.push_back(Pair("balance", (int64_t)balance));
     return(result);

From 86ed54e1889ee4e1066211132c73ff0807d6d7ef Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:13:43 -1100
Subject: [PATCH 422/623] Test

---
 src/wallet/rpcwallet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index b4b5ac513..138bdfc8c 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,6 +4831,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 #include "../cc/CCassets.h"
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
 
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {

From 47794c1e6ba3a35a812f114fcbf551042209eb17 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:16:16 -1100
Subject: [PATCH 423/623] Test

---
 src/cc/CCassetstx.cpp    | 26 --------------------------
 src/wallet/rpcwallet.cpp | 28 +++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index a5510917f..df74e5d85 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -15,32 +15,6 @@
 
 #include "CCassets.h"
 
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
 
 UniValue AssetOrders(uint256 refassetid)
 {
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 138bdfc8c..6933ac028 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,7 +4831,33 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 #include "../cc/CCassets.h"
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
+
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
 
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {

From e10dea243fed348601eadaacc816c66808e552ce Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:19:58 -1100
Subject: [PATCH 424/623] Test

---
 src/cc/CCassets.h        |  1 +
 src/cc/CCassetstx.cpp    | 32 ++++++++++++++++++++++++++++++++
 src/wallet/rpcwallet.cpp |  4 ++--
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 4c531839c..b2eb8fa56 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -45,6 +45,7 @@ bool ConstrainAssetVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue
 bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid);
 
 // CCassetstx
+uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
 uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
 UniValue AssetOrders(uint256 tokenid);
 std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index df74e5d85..50b159957 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -15,6 +15,38 @@
 
 #include "CCassets.h"
 
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
+{
+    CMutableTransaction mtx;
+    return(AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0));
+}
 
 UniValue AssetOrders(uint256 refassetid)
 {
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 6933ac028..2c0a76edf 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4872,7 +4872,7 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
 
 UniValue tokenbalance(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); char destaddr[64]; CMutableTransaction mtx; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey;
+    UniValue result(UniValue::VOBJ); char destaddr[64]; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey;
     if ( fHelp || params.size() > 2 )
         throw runtime_error("tokenbalance tokenid [pubkey]\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
@@ -4882,7 +4882,7 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     result.push_back(Pair("result", "success"));
     if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("CCaddress",destaddr));
-    balance = AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
+    balance = GetAssetBalance(pubkey2pk(pubkey),tokenid);//AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
     result.push_back(Pair("tokenid", params[0].get_str()));
     result.push_back(Pair("balance", (int64_t)balance));
     return(result);

From bb0c513398d1892fe2abe3938909451dbc4206f7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:21:26 -1100
Subject: [PATCH 425/623] Test

---
 src/cc/CCassetstx.cpp    |  2 +-
 src/wallet/rpcwallet.cpp | 29 +----------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 50b159957..6ad2519d2 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -45,7 +45,7 @@ uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
 {
     CMutableTransaction mtx;
-    return(AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0));
+    return(AddAssetInputs(mtx,pk,tokenid,0,0));
 }
 
 UniValue AssetOrders(uint256 refassetid)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2c0a76edf..7455b532b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4832,33 +4832,6 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 
 #include "../cc/CCassets.h"
 
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
-
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {
     uint256 tokenid;
@@ -4882,7 +4855,7 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     result.push_back(Pair("result", "success"));
     if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("CCaddress",destaddr));
-    balance = GetAssetBalance(pubkey2pk(pubkey),tokenid);//AddAssetinputs(mtx,pubkey2pk(pubkey),tokenid,0,0);
+    balance = GetAssetBalance(pubkey2pk(pubkey),tokenid);
     result.push_back(Pair("tokenid", params[0].get_str()));
     result.push_back(Pair("balance", (int64_t)balance));
     return(result);

From 83806bd7e855f9029cde2104f0ce464ea02289ba Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:26:42 -1100
Subject: [PATCH 426/623] Test

---
 src/wallet/rpcwallet.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7455b532b..9878451a4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,6 +4831,17 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 #include "../cc/CCassets.h"
+uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
+UniValue AssetOrders(uint256 tokenid);
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount);
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal);
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid);
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount);
 
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {

From e9bac7802d3280579a343e5f49f230105856532d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:28:57 -1100
Subject: [PATCH 427/623] Test

---
 src/cc/CCassetstx.cpp    | 265 -------------------------------------
 src/wallet/rpcwallet.cpp | 277 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 266 insertions(+), 276 deletions(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 6ad2519d2..5f6d4f5ce 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -14,268 +14,3 @@
  ******************************************************************************/
 
 #include "CCassets.h"
-
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
-
-uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
-{
-    CMutableTransaction mtx;
-    return(AddAssetInputs(mtx,pk,tokenid,0,0));
-}
-
-UniValue AssetOrders(uint256 refassetid)
-{
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
-    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (funcid= DecodeAssetOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
-            {
-                UniValue item(UniValue::VOBJ);
-                funcidstr[0] = funcid;
-                funcidstr[1] = 0;
-                item.push_back(Pair("funcid", funcidstr));
-                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
-                item.push_back(Pair("vout", (int64_t)it->first.index));
-                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
-                if ( funcid == 'b' || funcid == 'B' )
-                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
-                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
-                if ( origpubkey.size() == 33 )
-                {
-                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
-                    item.push_back(Pair("origaddress",origaddr));
-                }
-                if ( assetid != zeroid )
-                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
-                if ( assetid2 != zeroid )
-                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
-                if ( price > 0 )
-                {
-                    item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
-                }
-                result.push_back(item);
-                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
-            }
-        }
-    }
-    return(result);
-}
-
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( name.size() > 32 || description.size() > 4096 )
-    {
-        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
-        return(0);
-    }
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
-    }
-    return(0);
-}
-               
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        /*n = outputs.size();
-        if ( n == amounts.size() )
-        {
-            for (i=0; i<n; i++)
-                total += amounts[i];*/
-            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
-            {
-                if ( inputs > total )
-                    CCchange = (inputs - total);
-                //for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
-            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
-    }
-    return(0);
-}
-
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
-    }
-    return(0);
-}
-
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
-        {
-            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
-            if ( inputs > askamount )
-                CCchange = (inputs - askamount);
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-            if ( assetid2 == zeroid )
-                opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
-            else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
-        }
-    }
-    return(0);
-}
-
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
-            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
-{
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[bidvout].nValue;
-            SetAssetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
-            {
-                if ( inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx wasnt for assetid\n");
-        }
-    }
-    return(0);
-}
-
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
-{
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[askvout].nValue;
-            SetAssetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
-            if ( assetid2 == zeroid )
-                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
-            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
-            if ( inputs > 0 )
-            {
-                if ( assetid2 == zeroid && inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx not enough utxos\n");
-        }
-    }
-    return(0);
-}
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 9878451a4..8fe05edd3 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4831,17 +4831,272 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 }
 
 #include "../cc/CCassets.h"
-uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs);
-UniValue AssetOrders(uint256 tokenid);
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description);
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total);
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal);
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid);
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount);
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal);
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid);
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount);
+
+
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
+{
+    CMutableTransaction mtx;
+    return(AddAssetInputs(mtx,pk,tokenid,0,0));
+}
+
+UniValue AssetOrders(uint256 refassetid)
+{
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (funcid= DecodeAssetOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
+            {
+                UniValue item(UniValue::VOBJ);
+                funcidstr[0] = funcid;
+                funcidstr[1] = 0;
+                item.push_back(Pair("funcid", funcidstr));
+                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
+                item.push_back(Pair("vout", (int64_t)it->first.index));
+                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
+                if ( funcid == 'b' || funcid == 'B' )
+                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
+                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
+                if ( origpubkey.size() == 33 )
+                {
+                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    item.push_back(Pair("origaddress",origaddr));
+                }
+                if ( assetid != zeroid )
+                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
+                if ( assetid2 != zeroid )
+                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
+                if ( price > 0 )
+                {
+                    item.push_back(Pair("totalrequired", (int64_t)price));
+                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
+                }
+                result.push_back(item);
+                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+            }
+        }
+    }
+    return(result);
+}
+
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( name.size() > 32 || description.size() > 4096 )
+    {
+        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
+        return(0);
+    }
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
+    }
+    return(0);
+}
+
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        /*n = outputs.size();
+         if ( n == amounts.size() )
+         {
+         for (i=0; i<n; i++)
+         total += amounts[i];*/
+        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
+        {
+            if ( inputs > total )
+                CCchange = (inputs - total);
+            //for (i=0; i<n; i++)
+            mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
+        } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
+        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
+    }
+    return(0);
+}
+
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
+    }
+    return(0);
+}
+
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        {
+            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            if ( inputs > askamount )
+                CCchange = (inputs - askamount);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            if ( assetid2 == zeroid )
+                opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
+            else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        }
+    }
+    return(0);
+}
+
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
+            {
+                if ( inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx wasnt for assetid\n");
+        }
+    }
+    return(0);
+}
+
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
+{
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[askvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
+            if ( assetid2 == zeroid )
+                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
+            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
+            if ( inputs > 0 )
+            {
+                if ( assetid2 == zeroid && inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx not enough utxos\n");
+        }
+    }
+    return(0);
+}
 
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {

From 5a9f21107dba662ceb1252b9507fbdb25e143d6f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:31:31 -1100
Subject: [PATCH 428/623] Move assetstx to wallet

---
 src/Makefile.am          |   2 +-
 src/cc/CCassetstx.cpp    | 265 ++++++++++++++++++++++++++++++++++++++
 src/wallet/rpcwallet.cpp | 266 ---------------------------------------
 3 files changed, 266 insertions(+), 267 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 64103a3a8..2085c6621 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -258,7 +258,6 @@ libbitcoin_server_a_SOURCES = \
   cc/eval.cpp \
   cc/import.cpp \
   cc/CCassetsCore.cpp \
-  cc/CCassetstx.cpp \
   cc/CCcustom.cpp \
   cc/CCtx.cpp \
   cc/CCutils.cpp \
@@ -339,6 +338,7 @@ libbitcoin_wallet_a_SOURCES = \
   paymentdisclosuredb.cpp \
   wallet/rpcdisclosure.cpp \
   wallet/rpcdump.cpp \
+  cc/CCassetstx.cpp \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
   wallet/wallet_ismine.cpp \
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 5f6d4f5ce..6ad2519d2 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -14,3 +14,268 @@
  ******************************************************************************/
 
 #include "CCassets.h"
+
+uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
+{
+    CMutableTransaction mtx;
+    return(AddAssetInputs(mtx,pk,tokenid,0,0));
+}
+
+UniValue AssetOrders(uint256 refassetid)
+{
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (funcid= DecodeAssetOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
+            {
+                UniValue item(UniValue::VOBJ);
+                funcidstr[0] = funcid;
+                funcidstr[1] = 0;
+                item.push_back(Pair("funcid", funcidstr));
+                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
+                item.push_back(Pair("vout", (int64_t)it->first.index));
+                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
+                if ( funcid == 'b' || funcid == 'B' )
+                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
+                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
+                if ( origpubkey.size() == 33 )
+                {
+                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    item.push_back(Pair("origaddress",origaddr));
+                }
+                if ( assetid != zeroid )
+                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
+                if ( assetid2 != zeroid )
+                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
+                if ( price > 0 )
+                {
+                    item.push_back(Pair("totalrequired", (int64_t)price));
+                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
+                }
+                result.push_back(item);
+                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
+            }
+        }
+    }
+    return(result);
+}
+
+std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( name.size() > 32 || description.size() > 4096 )
+    {
+        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
+        return(0);
+    }
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
+    }
+    return(0);
+}
+               
+std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        /*n = outputs.size();
+        if ( n == amounts.size() )
+        {
+            for (i=0; i<n; i++)
+                total += amounts[i];*/
+            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
+            {
+                if ( inputs > total )
+                    CCchange = (inputs - total);
+                //for (i=0; i<n; i++)
+                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
+            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
+        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
+    }
+    return(0);
+}
+
+std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
+    }
+    return(0);
+}
+
+std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
+{
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        {
+            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            if ( inputs > askamount )
+                CCchange = (inputs - askamount);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+            if ( assetid2 == zeroid )
+                opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
+            else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        }
+    }
+    return(0);
+}
+
+std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
+            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
+{
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[0].nValue;
+            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
+            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
+        }
+    }
+    return(0);
+}
+
+std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
+{
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
+        {
+            bidamount = vintx.vout[bidvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
+            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
+            {
+                if ( inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx wasnt for assetid\n");
+        }
+    }
+    return(0);
+}
+
+std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
+{
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    {
+        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
+        {
+            askamount = vintx.vout[askvout].nValue;
+            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
+            if ( assetid2 == zeroid )
+                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
+            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
+            if ( inputs > 0 )
+            {
+                if ( assetid2 == zeroid && inputs > fillamount )
+                    CCchange = (inputs - fillamount);
+                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
+                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
+                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                if ( CCchange != 0 )
+                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
+                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+            } else fprintf(stderr,"filltx not enough utxos\n");
+        }
+    }
+    return(0);
+}
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 8fe05edd3..7455b532b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4832,272 +4832,6 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 
 #include "../cc/CCassets.h"
 
-
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
-
-uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
-{
-    CMutableTransaction mtx;
-    return(AddAssetInputs(mtx,pk,tokenid,0,0));
-}
-
-UniValue AssetOrders(uint256 refassetid)
-{
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
-    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (funcid= DecodeAssetOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
-            {
-                UniValue item(UniValue::VOBJ);
-                funcidstr[0] = funcid;
-                funcidstr[1] = 0;
-                item.push_back(Pair("funcid", funcidstr));
-                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
-                item.push_back(Pair("vout", (int64_t)it->first.index));
-                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
-                if ( funcid == 'b' || funcid == 'B' )
-                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
-                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
-                if ( origpubkey.size() == 33 )
-                {
-                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
-                    item.push_back(Pair("origaddress",origaddr));
-                }
-                if ( assetid != zeroid )
-                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
-                if ( assetid2 != zeroid )
-                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
-                if ( price > 0 )
-                {
-                    item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
-                }
-                result.push_back(item);
-                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
-            }
-        }
-    }
-    return(result);
-}
-
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( name.size() > 32 || description.size() > 4096 )
-    {
-        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
-        return(0);
-    }
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
-    }
-    return(0);
-}
-
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        /*n = outputs.size();
-         if ( n == amounts.size() )
-         {
-         for (i=0; i<n; i++)
-         total += amounts[i];*/
-        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
-        {
-            if ( inputs > total )
-                CCchange = (inputs - total);
-            //for (i=0; i<n; i++)
-            mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
-        } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
-    }
-    return(0);
-}
-
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
-    }
-    return(0);
-}
-
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
-        {
-            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
-            if ( inputs > askamount )
-                CCchange = (inputs - askamount);
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-            if ( assetid2 == zeroid )
-                opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
-            else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
-        }
-    }
-    return(0);
-}
-
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
-            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
-{
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[bidvout].nValue;
-            SetAssetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
-            {
-                if ( inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx wasnt for assetid\n");
-        }
-    }
-    return(0);
-}
-
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
-{
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[askvout].nValue;
-            SetAssetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
-            if ( assetid2 == zeroid )
-                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
-            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
-            if ( inputs > 0 )
-            {
-                if ( assetid2 == zeroid && inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx not enough utxos\n");
-        }
-    }
-    return(0);
-}
-
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {
     uint256 tokenid;

From c2f34bc31ed2d28bd879eb36c778b83be9dd5604 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 03:32:23 -1100
Subject: [PATCH 429/623] Test

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2085c6621..4ff1e63c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -339,6 +339,7 @@ libbitcoin_wallet_a_SOURCES = \
   wallet/rpcdisclosure.cpp \
   wallet/rpcdump.cpp \
   cc/CCassetstx.cpp \
+  cc/CCtx.cpp \
   wallet/rpcwallet.cpp \
   wallet/wallet.cpp \
   wallet/wallet_ismine.cpp \

From d082e563f3fb7eb16a9fc6863fd6cd07ebb06b85 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:28:47 -1100
Subject: [PATCH 430/623] Fixes

---
 src/Makefile.am         |    1 +
 src/cc/CCassets.h       |    3 +-
 src/cc/CCassetsCore.cpp |   19 +-
 src/cc/CCcustom.cpp     |   52 +-
 src/cc/CCfaucet.h       |   30 +
 src/cc/CCinclude.h      |    1 +
 src/cc/CCutils.cpp      |   12 +
 src/cc/assets copy.cpp  | 1242 ---------------------------------------
 src/cc/assets.cpp       |   26 +-
 src/cc/eval.h           |    4 +-
 src/cc/faucet.cpp       |  132 +++++
 11 files changed, 242 insertions(+), 1280 deletions(-)
 create mode 100644 src/cc/CCfaucet.h
 delete mode 100644 src/cc/assets copy.cpp
 create mode 100644 src/cc/faucet.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ff1e63c6..3baa2fde4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -262,6 +262,7 @@ libbitcoin_server_a_SOURCES = \
   cc/CCtx.cpp \
   cc/CCutils.cpp \
   cc/assets.cpp \
+  cc/faucet.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
   checkpoints.cpp \
diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index b2eb8fa56..0c62c26d2 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -41,8 +41,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
 bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid);
-bool ConstrainAssetVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
-bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid);
+bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,CTransaction &tx,uint256 assetid);
 
 // CCassetstx
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index eae6df8bf..14066f43b 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -135,7 +135,7 @@ bool GetAssetorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
 uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
 {
     uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
-    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) // maybe check address too?
     {
         n = tx.vout.size();
         nValue = tx.vout[v].nValue;
@@ -277,23 +277,12 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool ConstrainAssetVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
+bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,CTransaction &tx,uint256 assetid)
 {
-    char destaddr[64];
-    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
-        return(false);
-    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
-        return(false);
-    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
-        return(false);
-    else return(true);
-}
-
-bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
-{
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
+    inputs = outputs = 0;
     for (i=1; i<numvins; i++)
     {
         if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 8985d7719..2d8485507 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -26,6 +26,9 @@
  This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
  */
 
+CC *MakeAssetCond(CPubKey pk);
+CC *MakeFaucetCond(CPubKey pk);
+
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
 //BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
@@ -33,7 +36,9 @@
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-CC *MakeAssetCond(CPubKey pk);
+const char *FaucetCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+char FaucetCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+uint8_t FaucetCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
 
 bool IsAssetsInput(CScript const& scriptSig)
@@ -53,6 +58,23 @@ bool IsAssetsInput(CScript const& scriptSig)
     return out;
 }
 
+bool IsFaucetInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_FAUCET;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
     static CPubKey nullpk;
@@ -62,13 +84,20 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     {
         if ( unspendablepriv != 0 )
             memcpy(unspendablepriv,AssetsCCpriv,32);
-    } else return(nullpk);
-    return(pubkey2pk(ParseHex(AssetsCChexstr)));
+        return(pubkey2pk(ParseHex(AssetsCChexstr)));
+    }
+    else if ( evalcode == EVAL_FAUCET )
+    {
+        if ( unspendablepriv != 0 )
+            memcpy(unspendablepriv,FaucetCCpriv,32);
+        return(pubkey2pk(ParseHex(FaucetCChexstr)));
+    }
+    else return(nullpk);
 }
 
 CC *MakeCC(uint8_t evalcode,CPubKey pk)
 {
-    if ( evalcode == EVAL_ASSETS )
+    if ( evalcode == EVAL_ASSETS || evalcode == EVAL_FAUCET )
     {
         std::vector<CC*> pks;
         pks.push_back(CCNewSecp256k1(pk));
@@ -82,10 +111,10 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
 {
     CC *payoutCond;
     destaddr[0] = 0;
+    if ( pk.size() == 0 )
+        pk = GetUnspendable(evalcode,0);
     if ( evalcode == EVAL_ASSETS )
     {
-        if ( pk.size() == 0 )
-            pk = GetUnspendable(EVAL_ASSETS,0);
         if ( (payoutCond= MakeAssetCond(pk)) != 0 )
         {
             Getscriptaddress(destaddr,CCPubKey(payoutCond));
@@ -93,7 +122,16 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
         }
         return(destaddr[0] != 0);
     }
-    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
+    else if ( evalcode == EVAL_FAUCET )
+    {
+        if ( (payoutCond= MakeFaucetCond(pk)) != 0 )
+        {
+            Getscriptaddress(destaddr,CCPubKey(payoutCond));
+            cc_free(payoutCond);
+        }
+        return(destaddr[0] != 0);
+    }
+    fprintf(stderr,"GetCCaddress %02x is invalid evalcode\n",evalcode);
     return false;
 }
            
diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
new file mode 100644
index 000000000..4da50591d
--- /dev/null
+++ b/src/cc/CCfaucet.h
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_FAUCET_H
+#define CC_FAUCET_H
+
+#include "CCinclude.h"
+
+extern const char *FaucetCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+extern char FaucetCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+
+// CCcustom
+bool IsFaucetInput(CScript const& scriptSig);
+CC *MakeFaucetCond(CPubKey pk);
+
+
+#endif
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 9533dc994..7793622b7 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -47,6 +47,7 @@ uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
+bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 7ac92a51c..b641b8813 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -84,6 +84,18 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     return(false);
 }
 
+bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
+{
+    char destaddr[64];
+    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+        return(false);
+    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
+        return(false);
+    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+        return(false);
+    else return(true);
+}
+
 std::vector<uint8_t> Mypubkey()
 {
     extern uint8_t NOTARY_PUBKEY33[33];
diff --git a/src/cc/assets copy.cpp b/src/cc/assets copy.cpp
deleted file mode 100644
index f823b5a1a..000000000
--- a/src/cc/assets copy.cpp	
+++ /dev/null
@@ -1,1242 +0,0 @@
-/******************************************************************************
- * Copyright © 2014-2018 The SuperNET Developers.                             *
- *                                                                            *
- * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
- * the top-level directory of this distribution for the individual copyright  *
- * holder information and the developer policies on copyright and licensing.  *
- *                                                                            *
- * Unless otherwise agreed in a custom licensing agreement, no part of the    *
- * SuperNET software, including this file may be copied, modified, propagated *
- * or distributed except according to the terms contained in the LICENSE file *
- *                                                                            *
- * Removal or modification of this copyright notice is prohibited.            *
- *                                                                            *
- ******************************************************************************/
-
-#include <cc/eval.h>
-#include <script/cc.h>
-#include <script/script.h>
-#include <cryptoconditions.h>
-#include "../script/standard.h"
-#include "../base58.h"
-#include "../core_io.h"
-#include "../script/sign.h"
-#include "../wallet/wallet.h"
-#include <univalue.h>
-#include <exception>
-
-#ifdef ENABLE_WALLET
-extern CWallet* pwalletMain;
-#endif
-extern uint8_t NOTARY_PUBKEY33[33];
-uint256 Parseuint256(char *hexstr);
-bool GetAddressUnspent(uint160 addressHash, int type,std::vector<std::pair<CAddressUnspentKey,CAddressUnspentValue> > &unspentOutputs);
-
-
-/*
- Assets can be created or transferred.
- 
- To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 asset, or 100 million satoshis for one asset with 8 decimals, and the other decimals in between. The interpretation of the number of decimals is left to the higher level usages.
- 
- Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee.
- 
- What this means is that vout 0 of the creation txid and vouts 1 ... n-2 for transfer vouts are assetoshi outputs.
- 
- There is a special type of transfer to an unspendable address, that locks the asset and creates an offer for all. The details specified in the opreturn. In order to be compatible with the signing restrictions, the "unspendable" address is actually an address whose privkey is known to all. Funds sent to this address can only be spent if the swap parameters are fulfilled, or if the original pubkey cancels the offer by spending it.
- 
- Types of transactions:
- create name:description -> txid for assetid
- transfer <pubkey> <assetid> -> [{address:amount}, ... ] // like withdraw api
- selloffer <pubkey> <txid/vout> <amount> -> cancel or fillsell -> mempool txid or rejected, might not confirm
- buyoffer <amount> <assetid> <required> -> cancelbuy or fillbuy -> mempool txid or rejected, might not confirm
- exchange <pubkey> <txid/vout> <required> <required assetid> -> cancel or fillexchange -> mempool txid or rejected, might not confirm
- 
- assetsaddress <pubkey> // all assets end up in a special address for each pubkey
- assetbalance <pubkey> <assetid>
- assetutxos <pubkey> <assetid>
- assetsbalances <pubkey>
- asks <assetid>
- bids <assetid>
- swaps <assetid>
- 
- valid CC output: create or transfer or buyoffer or selloffer or exchange or cancel or fill
- 
- create
- vin.0: normal input
- vout.0: issuance assetoshis to CC
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['c'] [origpubkey] "<assetname>" "<description>"
- 
- transfer
- vin.0: normal input
- vin.1 .. vin.n-1: valid CC outputs
- vout.0 to n-2: assetoshis output to CC
- vout.n-2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
- 
- buyoffer:
- vins.*: normal inputs (bid + change)
- vout.0: amount of bid to unspendable
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
-
- cancelbuy:
- vin.0: normal input
- vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
- vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid]
- 
- fillbuy:
- vin.0: normal input
- vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
- vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
- vout.0: remaining amount of bid to unspendable
- vout.1: vin.1 value to signer of vin.2
- vout.2: vin.2 assetoshis to original pubkey
- vout.3: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-
- selloffer:
- vin.0: normal input
- vin.1: valid CC output for sale
- vout.0: vin.1 assetoshis output to CC to unspendable
- vout.1: CC output for change (if any)
- vout.2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
- 
- exchange:
- vin.0: normal input
- vin.1: valid CC output
- vout.0: vin.1 assetoshis output to CC to unspendable
- vout.1: CC output for change (if any)
- vout.2: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
- 
- cancel:
- vin.0: normal input
- vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
- vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
- vout.1: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
- 
- fillsell:
- vin.0: normal input
- vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
- vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
- vout.0: remaining assetoshis -> unspendable
- vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
- vout.2: vin.2 value to original pubkey [origpubkey]
- vout.3: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
- 
- fillexchange:
- vin.0: normal input
- vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0]
- vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
- vout.0: remaining assetoshis -> unspendable
- vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any
- vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
- vout.3: normal output for change (if any)
- vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
-*/
-
-
-//BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
-//BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
-//BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
-//BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
-
-static uint256 zeroid;
-const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
-char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
-uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-
-CPubKey pubkey2pk(std::vector<uint8_t> pubkey)
-{
-    CPubKey pk; int32_t i,n; uint8_t *dest,*pubkey33;
-    n = pubkey.size();
-    dest = (uint8_t *)pk.begin();
-    pubkey33 = (uint8_t *)pubkey.data();
-    for (i=0; i<n; i++)
-        dest[i] = pubkey33[i];
-    return(pk);
-}
-
-CScript EncodeCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
-{
-    CScript opret; uint8_t evalcode = EVAL_ASSETS;
-    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description);
-    return(opret);
-}
-
-uint256 revuint256(uint256 txid)
-{
-    uint256 revtxid; int32_t i;
-    for (i=31; i>=0; i--)
-        ((uint8_t *)&revtxid)[31-i] = ((uint8_t *)&txid)[i];
-    return(revtxid);
-}
-
-char *uint256_str(char *dest,uint256 txid)
-{
-    int32_t i,j=0;
-    for (i=31; i>=0; i--)
-        sprintf(&dest[j++ * 2],"%02x",((uint8_t *)&txid)[i]);
-   return(dest);
-}
-
-CScript EncodeOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey)
-{
-    CScript opret; uint8_t evalcode = EVAL_ASSETS;
-    assetid = revuint256(assetid);
-    switch ( funcid )
-    {
-        case 't':  case 'x': case 'o':
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid);
-            break;
-        case 's': case 'b': case 'S': case 'B':
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << price << origpubkey);
-            break;
-        case 'E': case 'e':
-            assetid2 = revuint256(assetid2);
-            opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << assetid << assetid2 << price << origpubkey);
-            break;
-        default:
-            fprintf(stderr,"EncodeOpRet: illegal funcid.%02x\n",funcid);
-            opret << OP_RETURN;
-            break;
-    }
-    return(opret);
-}
-
-bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
-{
-    CTxDestination address; txnouttype whichType;
-    //int32_t i; uint8_t *ptr = (uint8_t *)scriptPubKey.data();
-    //for (i=0; i<scriptPubKey.size(); i++)
-    //    fprintf(stderr,"%02x",ptr[i]);
-    //fprintf(stderr," scriptPubKey\n");
-    if ( ExtractDestination(scriptPubKey,address) != 0 )
-    {
-        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        //fprintf(stderr,"destaddr.(%s)\n",destaddr);
-        return(true);
-    }
-    fprintf(stderr,"ExtractDestination failed\n");
-    return(false);
-}
-
-std::vector<uint8_t> Mypubkey()
-{
-    std::vector<uint8_t> pubkey; int32_t i; uint8_t *dest,*pubkey33;
-    pubkey33 = NOTARY_PUBKEY33;
-    pubkey.resize(33);
-    dest = pubkey.data();
-    for (i=0; i<33; i++)
-        dest[i] = pubkey33[i];
-    return(pubkey);
-}
-
-bool Myprivkey(uint8_t myprivkey[])
-{
-    char coinaddr[64]; std::string strAddress; char *dest; int32_t i,n; CBitcoinAddress address; CKeyID keyID; CKey vchSecret;
-    if ( Getscriptaddress(coinaddr,CScript() << Mypubkey() << OP_CHECKSIG) != 0 )
-    {
-        n = (int32_t)strlen(coinaddr);
-        strAddress.resize(n+1);
-        dest = (char *)strAddress.data();
-        for (i=0; i<n; i++)
-            dest[i] = coinaddr[i];
-        dest[i] = 0;
-        if ( address.SetString(strAddress) != 0 && address.GetKeyID(keyID) != 0 )
-        {
-#ifdef ENABLE_WALLET
-            if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
-            {
-                memcpy(myprivkey,vchSecret.begin(),32);
-                //for (i=0; i<32; i++)
-                //    fprintf(stderr,"%02x",myprivkey[i]);
-                //fprintf(stderr," found privkey!\n");
-                return(true);
-            }
-#endif
-        }
-    }
-    fprintf(stderr,"privkey for the -pubkey= address is not in the wallet, importprivkey!\n");
-    return(false);
-}
-
-CC *MakeAssetCond(CPubKey pk)
-{
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
-    pks.push_back(CCNewSecp256k1(pk));
-    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-    CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {assetCC, Sig});
-}
-
-CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
-{
-    CTxOut vout;
-    CC *payoutCond = MakeAssetCond(pk);
-    vout = CTxOut(nValue,CCPubKey(payoutCond));
-    cc_free(payoutCond);
-    return(vout);
-}
-
-CC *MakeCC(uint8_t evalcode,CPubKey pk)
-{
-    if ( evalcode == EVAL_ASSETS )
-    {
-        std::vector<CC*> pks;
-        pks.push_back(CCNewSecp256k1(pk));
-        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-        CC *Sig = CCNewThreshold(1, pks);
-        return CCNewThreshold(2, {assetCC, Sig});
-    } else return(0);
-}
-
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
-{
-    CC *payoutCond;
-    destaddr[0] = 0;
-    if ( evalcode == EVAL_ASSETS )
-    {
-        if ( pk.size() == 0 )
-            pk = GetUnspendable(EVAL_ASSETS,0);
-        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
-        {
-            Getscriptaddress(destaddr,CCPubKey(payoutCond));
-            cc_free(payoutCond);
-        }
-        return(destaddr[0] != 0);
-    }
-    fprintf(stderr,"%02x is invalid evalcode\n",evalcode);
-    return false;
-}
-           
-uint8_t DecodeOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey)
-{
-    std::vector<uint8_t> vopret; uint8_t funcid=0,*script,e,f;
-    GetOpReturnData(scriptPubKey, vopret);
-    script = (uint8_t *)vopret.data();
-    memset(&assetid,0,sizeof(assetid));
-    memset(&assetid2,0,sizeof(assetid2));
-    price = 0;
-    if ( script[0] == EVAL_ASSETS )
-    {
-        funcid = script[1];
-        //fprintf(stderr,"decode.[%c]\n",funcid);
-        switch ( funcid )
-        {
-            case 'c': return(funcid);
-                break;
-            case 't':  case 'x': case 'o':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid) != 0 )
-                {
-                    assetid = revuint256(assetid);
-                    return(funcid);
-                }
-                break;
-            case 's': case 'b': case 'S': case 'B':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> price; ss >> origpubkey) != 0 )
-                {
-                    assetid = revuint256(assetid);
-                    //fprintf(stderr,"got price %llu\n",(long long)price);
-                    return(funcid);
-                }
-                break;
-            case 'E': case 'e':
-                if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> assetid; ss >> assetid2; ss >> price; ss >> origpubkey) != 0 )
-                {
-                    fprintf(stderr,"got price %llu\n",(long long)price);
-                    assetid = revuint256(assetid);
-                    assetid2 = revuint256(assetid2);
-                    return(funcid);
-                }
-                break;
-            default:
-                fprintf(stderr,"DecodeOpRet: illegal funcid.%02x\n",funcid);
-                funcid = 0;
-                break;
-        }
-    }
-    return(funcid);
-}
-
-bool SetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
-{
-    uint256 assetid,assetid2;
-    if ( DecodeOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
-        return(true);
-    else return(false);
-}
-           
-bool Getorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
-{
-    uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
-    n = tx.vout.size();
-    if ( n == 0 || (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        return(false);
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
-        return(true);
-    else return(false);
-}
-    
-CC* GetCryptoCondition(CScript const& scriptSig)
-{
-    auto pc = scriptSig.begin();
-    opcodetype opcode;
-    std::vector<unsigned char> ffbin;
-    if (scriptSig.GetOp(pc, opcode, ffbin))
-        return cc_readFulfillmentBinary((uint8_t*)ffbin.data(), ffbin.size()-1);
-}
-       
-bool IsCCInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if ( (cond= GetCryptoCondition(scriptSig)) == 0 )
-        return false;
-    cc_free(cond);
-    return true;
-}
-       
-bool IsAssetInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-       
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
-{
-    uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
-    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
-    {
-        n = tx.vout.size();
-        nValue = tx.vout[v].nValue;
-        //fprintf(stderr,"CC vout v.%d of n.%d %.8f\n",v,n,(double)nValue/COIN);
-        if ( v >= n-1 )
-            return(0);
-        if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
-        {
-            fprintf(stderr,"null decodeopret\n");
-            return(0);
-        }
-        else if ( funcid == 'c' )
-        {
-            if ( refassetid == tx.GetHash() && v == 0 )
-                return(nValue);
-        }
-        else if ( funcid == 'b' || funcid == 'B' )
-            return(0);
-        else if ( funcid != 'E' )
-        {
-            if ( assetid == refassetid )
-                return(nValue);
-        }
-        else if ( funcid == 'E' )
-        {
-            if ( v < 2 && assetid == refassetid )
-                return(nValue);
-            else if ( v == 2 && assetid2 == refassetid )
-                return(nValue);
-        }
-    }
-    //fprintf(stderr,"Isassetvout: normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN);
-    return(0);
-}
-
-bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScript scriptPubKey)
-{
-#ifdef ENABLE_WALLET
-    CTransaction txNewConst(mtx); SignatureData sigdata; const CKeyStore& keystore = *pwalletMain;
-    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
-    if ( ProduceSignature(TransactionSignatureCreator(&keystore,&txNewConst,vini,utxovalue,SIGHASH_ALL),scriptPubKey,sigdata,consensusBranchId) != 0 )
-    {
-        UpdateTransaction(mtx,vini,sigdata);
-        return(true);
-    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
-#else
-    return(false);
-#endif
-}
-
-std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
-{
-    CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
-    n = mtx.vout.size();
-    for (i=0; i<n; i++)
-    {
-        //if ( mtx.vout[i].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            totaloutputs += mtx.vout[i].nValue;
-    }
-    if ( (n= mtx.vin.size()) > 64 )
-    {
-        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
-        return(0);
-    }
-    Myprivkey(myprivkey);
-    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
-    GetCCaddress(evalcode,myaddr,mypk);
-    mycond = MakeCC(evalcode,mypk);
-    GetCCaddress(evalcode,unspendable,unspendablepk);
-    othercond = MakeCC(evalcode,unspendablepk);
-    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
-    memset(utxovalues,0,sizeof(utxovalues));
-    for (i=0; i<n; i++)
-    {
-        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
-        {
-            utxovout = mtx.vin[i].prevout.n;
-            utxovalues[i] = vintx.vout[utxovout].nValue;
-            totalinputs += utxovalues[i];
-            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            {
-                //fprintf(stderr,"vin.%d is normal %.8f\n",i,(double)utxovalues[i]/COIN);
-                vinimask |= (1LL << i);
-            }
-            else
-            {
-            }
-        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-    }
-    if ( totalinputs >= totaloutputs+2*txfee )
-    {
-        change = totalinputs - (totaloutputs+txfee);
-        mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-    }
-    mtx.vout.push_back(CTxOut(0,opret));
-    PrecomputedTransactionData txdata(mtx);
-    n = mtx.vin.size();
-    for (i=0; i<n; i++)
-    {
-        if ( GetTransaction(mtx.vin[i].prevout.hash,vintx,hashBlock,false) != 0 )
-        {
-            utxovout = mtx.vin[i].prevout.n;
-            if ( vintx.vout[utxovout].scriptPubKey.IsPayToCryptoCondition() == 0 )
-            {
-                if ( SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey) == 0 )
-                    fprintf(stderr,"signing error for vini.%d of %llx\n",i,(long long)vinimask);
-            }
-            else
-            {
-                Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey);
-                //fprintf(stderr,"vin.%d is CC %.8f -> (%s)\n",i,(double)utxovalues[i]/COIN,destaddr);
-                if ( strcmp(destaddr,myaddr) == 0 )
-                {
-                    privkey = myprivkey;
-                    cond = mycond;
-                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
-                }
-                else if ( strcmp(destaddr,unspendable) == 0 )
-                {
-                    privkey = unspendablepriv;
-                    cond = othercond;
-                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
-                }
-                else
-                {
-                    fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
-                    continue;
-                }
-                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
-                if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
-                    mtx.vin[i].scriptSig = CCSig(cond);
-                else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
-            }
-        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
-    }
-    if ( mycond != 0 )
-        cc_free(mycond);
-    if ( othercond != 0 )
-        cc_free(othercond);
-    std::string strHex = EncodeHexTx(mtx);
-    if ( strHex.size() > 0 )
-        return(strHex);
-    else return(0);
-}
-
-bool ValidateRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
-{
-    uint64_t price,recvprice;
-    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
-    {
-        fprintf(stderr,"ValidateRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
-        return(false);
-    }
-    else if ( remaining_price < (totalprice - received) )
-    {
-        fprintf(stderr,"ValidateRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
-        return(false);
-    }
-    else if ( remaining_nValue < (orig_nValue - paid) )
-    {
-        fprintf(stderr,"ValidateRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
-        return(false);
-    }
-    else if ( remaining_nValue > 0 )
-    {
-        price = (totalprice * COIN) / orig_nValue;
-        recvprice = (received * COIN) / paid;
-        if ( recvprice < price )
-        {
-            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
-            return(false);
-        }
-    }
-    return(true);
-}
-
-bool SetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
-{
-    uint64_t remaining_nValue,price,mult;
-    if ( received >= totalprice )
-        received = totalprice;
-    remaining_price = (totalprice - received);
-    price = (totalprice * COIN) / orig_nValue;
-    mult = (received * COIN);
-    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
-    if ( price > 0 && (paid= mult / price) > 0 )
-    {
-        if ( (mult % price) != 0 )
-            paid--;
-        remaining_nValue = (orig_nValue - paid);
-        return(ValidateRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
-    } else return(false);
-}
-
-void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr)
-{
-    int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector<std::pair<uint160, int> > addresses;
-    n = (int32_t)strlen(coinaddr);
-    addrstr.resize(n+1);
-    ptr = (char *)addrstr.data();
-    for (i=0; i<=n; i++)
-        ptr[i] = coinaddr[i];
-    CBitcoinAddress address(addrstr);
-    if ( address.GetIndexKey(hashBytes, type) == 0 )
-        return;
-    addresses.push_back(std::make_pair(hashBytes,type));
-    for (std::vector<std::pair<uint160, int> >::iterator it = addresses.begin(); it != addresses.end(); it++)
-    {
-        if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 )
-            return;
-    }
-}
-
-uint64_t AddCCinputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
-{
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
-    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
-    SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (nValue= IsAssetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
-            {
-                if ( total != 0 && maxinputs != 0 )
-                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
-                n++;
-                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
-                    break;
-            }
-        }
-    }
-    return(totalinputs);
-}
-
-UniValue AssetOrders(uint256 refassetid)
-{
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
-    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
-    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
-    {
-        txid = it->first.txhash;
-        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
-        {
-            if ( (funcid= DecodeOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey)) != 0 )
-            {
-                UniValue item(UniValue::VOBJ);
-                funcidstr[0] = funcid;
-                funcidstr[1] = 0;
-                item.push_back(Pair("funcid", funcidstr));
-                item.push_back(Pair("txid", uint256_str(assetidstr,txid)));
-                item.push_back(Pair("vout", (int64_t)it->first.index));
-                item.push_back(Pair("amount", (double)vintx.vout[it->first.index].nValue/COIN));
-                if ( funcid == 'b' || funcid == 'B' )
-                    item.push_back(Pair("bidamount",(double)vintx.vout[0].nValue/COIN));
-                else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
-                if ( origpubkey.size() == 33 )
-                {
-                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
-                    item.push_back(Pair("origaddress",origaddr));
-                }
-                if ( assetid != zeroid )
-                    item.push_back(Pair("tokenid",uint256_str(assetidstr,assetid)));
-                if ( assetid2 != zeroid )
-                    item.push_back(Pair("otherid",uint256_str(assetidstr,assetid2)));
-                if ( price > 0 )
-                {
-                    item.push_back(Pair("totalrequired", (int64_t)price));
-                    item.push_back(Pair("price", (double)vintx.vout[0].nValue / (price * COIN)));
-                }
-                result.push_back(item);
-                //fprintf(stderr,"func.(%c) %s/v%d %.8f\n",funcid,uint256_str(assetidstr,txid),(int32_t)it->first.index,(double)vintx.vout[it->first.index].nValue/COIN);
-            }
-        }
-    }
-    return(result);
-}
-
-uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs)
-{
-    int32_t n = 0; uint64_t nValue,totalinputs = 0; std::vector<COutput> vecOutputs;
-#ifdef ENABLE_WALLET
-    const CKeyStore& keystore = *pwalletMain;
-    assert(pwalletMain != NULL);
-    LOCK2(cs_main, pwalletMain->cs_wallet);
-    pwalletMain->AvailableCoins(vecOutputs, false, NULL, true);
-    BOOST_FOREACH(const COutput& out, vecOutputs)
-    {
-        if ( out.fSpendable != 0 )
-        {
-            mtx.vin.push_back(CTxIn(out.tx->GetHash(),out.i,CScript()));
-            nValue = out.tx->vout[out.i].nValue;
-            totalinputs += nValue;
-            n++;
-            if ( totalinputs >= total || n >= maxinputs )
-                break;
-        }
-    }
-    if ( totalinputs >= total )
-        return(totalinputs);
-#endif
-    return(0);
-}
-
-std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( name.size() > 32 || description.size() > 4096 )
-    {
-        fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
-        return(0);
-    }
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeCreateOpRet('c',Mypubkey(),name,description)));
-    }
-    return(0);
-}
-               
-std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        /*n = outputs.size();
-        if ( n == amounts.size() )
-        {
-            for (i=0; i<n; i++)
-                total += amounts[i];*/
-            if ( (inputs= AddCCinputs(mtx,mypk,assetid,total,60)) > 0 )
-            {
-                if ( inputs > total )
-                    CCchange = (inputs - total);
-                //for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('t',assetid,zeroid,0,Mypubkey())));
-            } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
-        //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
-    }
-    return(0);
-}
-
-std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
-    }
-    return(0);
-}
-
-std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
-{
-    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( (inputs= AddCCinputs(mtx,mypk,assetid,askamount,60)) > 0 )
-        {
-            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
-            if ( inputs > askamount )
-                CCchange = (inputs - askamount);
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-            if ( assetid2 == zeroid )
-                opret = EncodeOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
-            else opret = EncodeOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
-        }
-    }
-    return(0);
-}
-
-std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
-            mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('o',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
-{
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[0].nValue;
-            mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('x',assetid,zeroid,0,Mypubkey())));
-        }
-    }
-    return(0);
-}
-
-std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
-{
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(bidtxid,vintx,hashBlock,false) != 0 )
-        {
-            bidamount = vintx.vout[bidvout].nValue;
-            SetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( (inputs= AddCCinputs(mtx,mypk,assetid,fillamount,60)) > 0 )
-            {
-                if ( inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx wasnt for assetid\n");
-        }
-    }
-    return(0);
-}
-
-std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
-{
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
-    {
-        if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
-        {
-            askamount = vintx.vout[askvout].nValue;
-            SetOrigpubkey(origpubkey,origprice,vintx);
-            mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
-            if ( assetid2 == zeroid )
-                inputs = AddCCinputs(mtx,mypk,assetid2,fillamount,60);
-            else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
-            if ( inputs > 0 )
-            {
-                if ( assetid2 == zeroid && inputs > fillamount )
-                    CCchange = (inputs - fillamount);
-                SetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
-                if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
-                fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
-            } else fprintf(stderr,"filltx not enough utxos\n");
-        }
-    }
-    return(0);
-}
-
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
-{
-    uint256 hashBlock; char destaddr[64];
-    origaddr[0] = destaddr[0] = 0;
-    if ( tx.vin.size() < 2 )
-        return eval->Invalid("not enough for CC vins");
-    else if ( tx.vin[1].prevout.n != 0 )
-        return eval->Invalid("vin1 needs to be buyvin.vout[0]");
-    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
-        return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
-    {
-        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
-        return eval->Invalid("invalid vin AssetsCCaddr");
-    }
-    else if ( vinTx.vout[0].nValue < 10000 )
-        return eval->Invalid("invalid dust for buyvin");
-    else if ( Getorigaddrs(CCaddr,origaddr,vinTx) == 0 )
-        return eval->Invalid("couldnt get origaddr for buyvin");
-    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
-    return(vinTx.vout[0].nValue);
-}
-
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
-{
-    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
-        return(0);
-    else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
-        return eval->Invalid("invalid normal vout0 for buyvin");
-    else
-    {
-        //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr);
-        if ( (funcid= DecodeOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
-            return eval->Invalid("invalid opreturn for buyvin");
-        else if ( refassetid != assetid )
-        {
-            //for (i=32; i>=0; i--)
-            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-            //fprintf(stderr," AssetValidateBuyvin\n");
-            return eval->Invalid("invalid assetid for buyvin");
-        }
-    }
-    return(nValue);
-}
-
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
-{
-    CTransaction vinTx; uint64_t nValue,assetoshis;
-    fprintf(stderr,"AssetValidateSellvin\n");
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
-        return(0);
-    if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
-        return eval->Invalid("invalid missing CC vout0 for sellvin");
-    else return(assetoshis);
-}
-
-bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
-{
-    char destaddr[64];
-    if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
-        return(false);
-    else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
-        return(false);
-    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
-        return(false);
-    else return(true);
-}
-
-bool AssetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
-{
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
-    numvins = tx.vin.size();
-    numvouts = tx.vout.size();
-    for (i=1; i<numvins; i++)
-    {
-        if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
-        {
-            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                return eval->Invalid("always should find vin, but didnt");
-            else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
-                inputs += assetoshis;
-        }
-    }
-    for (i=0; i<numvouts; i++)
-    {
-        if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
-            outputs += assetoshis;
-    }
-    if ( inputs != outputs )
-        return(false);
-    else return(true);
-}
-
-bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
-{
-    static uint256 zero;
-    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
-    fprintf(stderr,"AssetValidate (%c)\n",funcid);
-    numvins = tx.vin.size();
-    outputs = inputs = 0;
-    preventCCvins = preventCCvouts = -1;
-    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
-        return eval->Invalid("illegal asset vin0");
-    else if ( numvouts < 1 )
-        return eval->Invalid("no vouts");
-    else if ( funcid != 'c' )
-    {
-        if ( assetid == zero )
-            return eval->Invalid("illegal assetid");
-        else if ( AssetExactAmounts(eval,tx,assetid) == false )
-            eval->Invalid("asset inputs != outputs");
-    }
-    switch ( funcid )
-    {
-        case 'c': // create wont be called to be verified as it has no CC inputs
-            //vin.0: normal input
-            //vout.0: issuance assetoshis to CC
-            //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"<assetname>":"<description>"}]
-            return eval->Invalid("unexpected AssetValidate for createasset");
-            break;
-            
-        case 't': // transfer
-            //vin.0: normal input
-            //vin.1 .. vin.n-1: valid CC outputs
-            //vout.0 to n-2: assetoshis output to CC
-            //vout.n-2: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid]
-            if ( inputs == 0 )
-                return eval->Invalid("no asset inputs for transfer");
-            fprintf(stderr,"transfer validated %.8f -> %.8f\n",(double)inputs/COIN,(double)outputs/COIN);
-            break;
-
-        case 'b': // buyoffer
-            //vins.*: normal inputs (bid + change)
-            //vout.0: amount of bid to unspendable
-            //vout.1: normal output for change (if any)
-            // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
-            if ( remaining_price == 0 )
-                return eval->Invalid("illegal null amount for buyoffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
-                return eval->Invalid("invalid vout for buyoffer");
-            preventCCvins = 1;
-            preventCCvouts = 1;
-            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",(char *)AssetsCCaddr);
-            break;
-            
-        case 'o': // cancelbuy
-            //vin.0: normal input
-            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
-            //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
-            //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['o']
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
-                return(false);
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for cancelbuy");
-            else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
-                return eval->Invalid("invalid refund for cancelbuy");
-            preventCCvins = 1;
-            preventCCvouts = 0;
-            fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
-            break;
-            
-        case 'B': // fillbuy:
-            //vin.0: normal input
-            //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
-            //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
-            //vout.0: remaining amount of bid to unspendable
-            //vout.1: vin.1 value to signer of vin.2
-            //vout.2: vin.2 assetoshis to original pubkey
-            //vout.3: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-            preventCCvouts = 4;
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
-                return(false);
-            else if ( numvouts < 3 )
-                return eval->Invalid("not enough vouts for fillbuy");
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for fillbuy");
-            else
-            {
-                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
-                    return eval->Invalid("vout1 is CC for fillbuy");
-                else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
-                    return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
-                    return eval->Invalid("mismatched remainder for fillbuy");
-                else if ( remaining_price != 0 )
-                {
-                    if ( remaining_price < 10000 )
-                        return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
-                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
-                }
-            }
-            fprintf(stderr,"fillbuy validated\n");
-            break;
-            
-        case 's': // selloffer
-        case 'e': // exchange
-            //vin.0: normal input
-            //vin.1: valid CC output for sale
-            //vout.0: vin.1 assetoshis output to CC to unspendable
-            //vout.1: normal output for change (if any)
-            //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey]
-            //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
-            if ( remaining_price == 0 )
-                return eval->Invalid("illegal null remaining_price for selloffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
-                return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
-            preventCCvouts = 1;
-            break;
-           
-        case 'x': // cancel
-            //vin.0: normal input
-            //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx
-            //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
-            //vout.1: normal output for change (if any)
-            //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
-                return(false);
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for cancel");
-            else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
-                return eval->Invalid("invalid vout for cancel");
-            preventCCvins = 2;
-            preventCCvouts = 1;
-            break;
-            
-        case 'S': // fillsell
-        case 'E': // fillexchange
-            //vin.0: normal input
-            //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0]
-            //'S'.vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue
-            //'E'.vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue
-            //vout.0: remaining assetoshis -> unspendable
-            //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
-            //'S'.vout.2: vin.2 value to original pubkey [origpubkey]
-            //'E'.vout.2: vin.2 assetoshis2 to original pubkey [origpubkey]
-            //vout.3: normal output for change (if any)
-            //'S'.vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
-            //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
-            if ( funcid == 'E' )
-            {
-                if ( AssetExactAmounts(eval,tx,assetid2) == false )
-                    eval->Invalid("asset2 inputs != outputs");
-            }
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
-                return(false);
-            else if ( numvouts < 3 )
-                return eval->Invalid("not enough vouts for fill");
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for fill");
-            else
-            {
-                if ( ValidateRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
-                    return eval->Invalid("mismatched remainder for fill");
-                else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
-                    return eval->Invalid("normal vout1 for fillask");
-                else if ( funcid == 'E' && ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
-                    return eval->Invalid("normal vout2 for fillask");
-                else if ( funcid == 'S' && ConstrainVout(tx.vout[2],0,origaddr,0) == 0 )
-                    return eval->Invalid("CC vout2 for fillask");
-                else if ( remaining_price != 0 )
-                {
-                    if ( remaining_price < 10000 )
-                        return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
-                        return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
-                }
-            }
-            fprintf(stderr,"fill validated\n");
-            break;
-    }
-    if ( preventCCvins >= 0 )
-    {
-        for (i=preventCCvins; i<numvins; i++)
-        {
-            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
-                return eval->Invalid("invalid CC vin");
-        }
-    }
-    if ( preventCCvouts >= 0 )
-    {
-        for (i=preventCCvouts; i<numvouts; i++)
-        {
-            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                return eval->Invalid("invalid CC vout");
-        }
-    }
-    return(true);
-}
-
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
-{
-    static uint256 zero,prevtxid;
-    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
-    CTransaction tx = *(CTransaction *)&ctx;
-    if ( paramsNull.size() != 0 ) // Don't expect params
-        return eval->Invalid("Cannot have params");
-    else if ( (n= tx.vout.size()) == 0 )
-        return eval->Invalid("no-vouts");
-    else if ( (funcid= DecodeOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
-        return eval->Invalid("Invalid opreturn payload");
-    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset create txid");
-    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset2 create txid");
-    if ( AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
-    {
-        prevtxid = txid;
-        return(true);
-    } else return(false);
-}
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d0d5f5019..f4c5554e5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -139,7 +139,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
     {
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( AssetExactAmounts(eval,tx,assetid) == false )
+        else if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid) == false )
             eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
@@ -170,7 +170,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
-            else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("invalid vout for buyoffer");
             preventCCvins = 1;
             preventCCvouts = 1;
@@ -187,7 +187,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for cancelbuy");
-            else if ( ConstrainAssetVout(tx.vout[0],0,origaddr,nValue) == 0 )
+            else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
             preventCCvins = 1;
             preventCCvouts = 0;
@@ -212,9 +212,9 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return eval->Invalid("mismatched origpubkeys for fillbuy");
             else
             {
-                if ( ConstrainAssetVout(tx.vout[1],0,0,0) == 0 )
+                if ( ConstrainVout(tx.vout[1],0,0,0) == 0 )
                     return eval->Invalid("vout1 is CC for fillbuy");
-                else if ( ConstrainAssetVout(tx.vout[2],1,CCaddr,0) == 0 )
+                else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("vout2 is normal for fillbuy");
                 else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
@@ -222,7 +222,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
-                    else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
                 }
             }
@@ -239,7 +239,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null remaining_price for selloffer");
-            else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                 return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
             preventCCvouts = 1;
             break;
@@ -254,7 +254,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( tmporigpubkey != origpubkey )
                 return eval->Invalid("mismatched origpubkeys for cancel");
-            else if ( ConstrainAssetVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
                 return eval->Invalid("invalid vout for cancel");
             preventCCvins = 2;
             preventCCvouts = 1;
@@ -275,7 +275,7 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
             if ( funcid == 'E' )
             {
-                if ( AssetExactAmounts(eval,tx,assetid2) == false )
+                if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
             if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
@@ -288,17 +288,17 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             {
                 if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
                     return eval->Invalid("mismatched remainder for fill");
-                else if ( ConstrainAssetVout(tx.vout[1],1,0,0) == 0 )
+                else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");
-                else if ( funcid == 'E' && ConstrainAssetVout(tx.vout[2],1,CCaddr,0) == 0 )
+                else if ( funcid == 'E' && ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("normal vout2 for fillask");
-                else if ( funcid == 'S' && ConstrainAssetVout(tx.vout[2],0,origaddr,0) == 0 )
+                else if ( funcid == 'S' && ConstrainVout(tx.vout[2],0,origaddr,0) == 0 )
                     return eval->Invalid("CC vout2 for fillask");
                 else if ( remaining_price != 0 )
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
-                    else if ( ConstrainAssetVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
             }
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 96af359f1..445aa0cda 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -39,7 +39,8 @@
 #define FOREACH_EVAL(EVAL)             \
         EVAL(EVAL_IMPORTPAYOUT, 0xe1)  \
         EVAL(EVAL_IMPORTCOIN,   0xe2)  \
-        EVAL(EVAL_ASSETS, 0xe3)
+        EVAL(EVAL_ASSETS,   0xe3)  \
+        EVAL(EVAL_FAUCET, 0xe4)
 
 
 typedef uint8_t EvalCode;
@@ -267,6 +268,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
+bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
new file mode 100644
index 000000000..f34fef9d6
--- /dev/null
+++ b/src/cc/faucet.cpp
@@ -0,0 +1,132 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCfaucet.h"
+
+/*
+ This file implements a simple CC faucet as an example of how to make a new CC contract. It wont have any fancy sybil protection but will serve the purpose of a fully automated faucet.
+ 
+ In order to implement a faucet, we need to have it funded. Once it is funded, anybody should be able to get some reasonable small amount.
+ 
+ This leads to needing to lock the funding in a CC protected output. And to put a spending limit. We can do a per transaction spending limit quite easily with vout constraints. However, that would allow anybody to issue thousands of transactions per block, so we also need to add a rate limiter.
+ 
+ To implement this, we can simply make any faucet vout fund the faucet. Then we can limit the number of confirmed utxo by combining faucet outputs and then only using utxo which are confirmed. This combined with a vout size limit will drastically limit the funds that can be withdrawn from the faucet.
+*/
+
+CC *MakeFaucetCond(CPubKey pk)
+{
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {assetCC, Sig});
+}
+
+CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeAssetCond(pk);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
+uint64_t IsFaucetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+{
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+        return(tx.vout[v].nValue);
+    return(0);
+}
+
+bool FaucetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
+{
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=1; i<numvins; i++)
+    {
+        if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
+        {
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else if ( (assetoshis= IsFaucetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+                inputs += assetoshis;
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        if ( (assetoshis= IsFaucetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs )
+        return(false);
+    else return(true);
+}
+
+bool FaucetValidate(Eval* eval,CTransaction &tx)
+{
+    static uint256 zero;
+    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    fprintf(stderr,"FaucetValidate (%c)\n",funcid);
+    numvins = tx.vin.size();
+    outputs = inputs = 0;
+    preventCCvins = preventCCvouts = -1;
+    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
+        return eval->Invalid("illegal asset vin0");
+    else if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else if ( funcid != 'c' )
+    {
+        if ( assetid == zero )
+            return eval->Invalid("illegal assetid");
+        else if ( FaucetExactAmounts(eval,tx,assetid) == false )
+            eval->Invalid("asset inputs != outputs");
+    }
+    if ( preventCCvins >= 0 )
+    {
+        for (i=preventCCvins; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
+                return eval->Invalid("invalid CC vin");
+        }
+    }
+    if ( preventCCvouts >= 0 )
+    {
+        for (i=preventCCvouts; i<numvouts; i++)
+        {
+            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                return eval->Invalid("invalid CC vout");
+        }
+    }
+    return(true);
+}
+
+bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+{
+    static uint256 zero,prevtxid;
+    txid = ctx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
+    CTransaction tx = *(CTransaction *)&ctx;
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    else if ( tx.vout.size() == 0 )
+        return eval->Invalid("no-vouts");
+    if ( FaucetValidate(eval,tx,n) != 0 )
+    {
+        prevtxid = txid;
+        return(true);
+    } else return(false);
+}

From 716ec60b2fb411adb7aaed30b5e1e93115e495ff Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:30:28 -1100
Subject: [PATCH 431/623] Skip faucet

---
 src/cc/faucet.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index f34fef9d6..55cde2d72 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -13,6 +13,7 @@
  *                                                                            *
  ******************************************************************************/
 
+#ifdef notyet
 #include "CCfaucet.h"
 
 /*
@@ -130,3 +131,4 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return(true);
     } else return(false);
 }
+#endif

From c2d1de6fe5830b97cfe78cfcd8b83f1bef643e00 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:33:50 -1100
Subject: [PATCH 432/623] Fix

---
 src/cc/CCfaucet.h | 4 ++--
 src/cc/faucet.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 4da50591d..09178be14 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -19,8 +19,8 @@
 
 #include "CCinclude.h"
 
-extern const char *FaucetCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
-extern char FaucetCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+extern const char *FaucetCCaddr;
+extern char FaucetCChexstr[67];
 
 // CCcustom
 bool IsFaucetInput(CScript const& scriptSig);
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 55cde2d72..b2915213c 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -13,7 +13,6 @@
  *                                                                            *
  ******************************************************************************/
 
-#ifdef notyet
 #include "CCfaucet.h"
 
 /*
@@ -51,6 +50,8 @@ uint64_t IsFaucetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransact
     return(0);
 }
 
+#ifdef notyet
+
 bool FaucetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;

From 6edaac431fbd7240263cfeb9d217edbe2204765f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:35:17 -1100
Subject: [PATCH 433/623] Test

---
 src/cc/faucet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index b2915213c..3f616f221 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -37,7 +37,7 @@ CC *MakeFaucetCond(CPubKey pk)
 CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
 {
     CTxOut vout;
-    CC *payoutCond = MakeAssetCond(pk);
+    CC *payoutCond = MakeFaucetCond(pk);
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);

From 78533def7eaf4b59823ea0dc072305985a543bb0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:45:40 -1100
Subject: [PATCH 434/623] Test

---
 src/cc/CCassetsCore.cpp | 8 +++-----
 src/cc/assets.cpp       | 9 +++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 14066f43b..cc5b413e8 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -256,12 +256,10 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
         if ( (funcid= DecodeAssetOpRet(vinTx.vout[vinTx.vout.size()-1].scriptPubKey,assetid,assetid2,tmpprice,tmporigpubkey)) != 'b' && funcid != 'B' )
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
-        {
-            //for (i=32; i>=0; i--)
-            //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-            //fprintf(stderr," AssetValidateBuyvin\n");
             return eval->Invalid("invalid assetid for buyvin");
-        }
+        for (i=32; i>=0; i--)
+            fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+        fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr);
     }
     return(nValue);
 }
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f4c5554e5..e4cceb5de 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -186,7 +186,16 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( tmporigpubkey != origpubkey )
+            {
+                int32_t z;
+                for (z=31; z>=0; z--)
+                    fprintf(stderr,"%02x",((uint8_t *)&tmporigpubkey)[z]);
+                fprintf(stderr," from buyvin \n");
+                for (z=31; z>=0; z--)
+                    fprintf(stderr,"%02x",((uint8_t *)&origpubkey)[z]);
+                fprintf(stderr," origpubkey\n");
                 return eval->Invalid("mismatched origpubkeys for cancelbuy");
+            }
             else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
             preventCCvins = 1;

From ec0a4595f74df36bfcd23b70db65a828637e7581 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:46:34 -1100
Subject: [PATCH 435/623] Test

---
 src/cc/CCassetsCore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index cc5b413e8..2965f64f3 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -257,7 +257,7 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
             return eval->Invalid("invalid assetid for buyvin");
-        for (i=32; i>=0; i--)
+        int32_t i; for (i=32; i>=0; i--)
             fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
         fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr);
     }

From 3ade63197c0b36ea8dfc3fb393ecca4450b3f20a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:50:50 -1100
Subject: [PATCH 436/623] Fix cancel roc

---
 src/cc/assets.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index e4cceb5de..865d87f64 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -185,17 +185,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.n-1: opreturn [EVAL_ASSETS] ['o']
             if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
-            else if ( tmporigpubkey != origpubkey )
-            {
-                int32_t z;
-                for (z=31; z>=0; z--)
-                    fprintf(stderr,"%02x",((uint8_t *)&tmporigpubkey)[z]);
-                fprintf(stderr," from buyvin \n");
-                for (z=31; z>=0; z--)
-                    fprintf(stderr,"%02x",((uint8_t *)&origpubkey)[z]);
-                fprintf(stderr," origpubkey\n");
-                return eval->Invalid("mismatched origpubkeys for cancelbuy");
-            }
             else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
             preventCCvins = 1;
@@ -261,8 +250,6 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
             //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
             if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
-            else if ( tmporigpubkey != origpubkey )
-                return eval->Invalid("mismatched origpubkeys for cancel");
             else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
                 return eval->Invalid("invalid vout for cancel");
             preventCCvins = 2;

From 6069e34de6865f862d1793e4a1b715da34e90af2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 10:54:51 -1100
Subject: [PATCH 437/623] Fix canceled

---
 src/cc/CCassetsCore.cpp | 6 +++---
 src/cc/assets.cpp       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 2965f64f3..c11509a4b 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -257,9 +257,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
             return eval->Invalid("invalid opreturn for buyvin");
         else if ( refassetid != assetid )
             return eval->Invalid("invalid assetid for buyvin");
-        int32_t i; for (i=32; i>=0; i--)
-            fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
-        fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr);
+        //int32_t i; for (i=31; i>=0; i--)
+        //    fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]);
+        //fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr);
     }
     return(nValue);
 }
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 865d87f64..ec24e2b7d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -187,9 +187,9 @@ bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,u
                 return(false);
             else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
-            preventCCvins = 1;
+            preventCCvins = 2;
             preventCCvouts = 0;
-            fprintf(stderr,"cancelbuy validated to destaddr.(%s)\n",destaddr);
+            fprintf(stderr,"cancelbuy validated to origaddr.(%s)\n",origaddr);
             break;
             
         case 'B': // fillbuy:

From bcc0d2b358d8ad814ca788f3af1c906a9190d84f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:04:23 -1100
Subject: [PATCH 438/623] test

---
 src/rpcmisc.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 8eeff7877..9fb339cad 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -94,13 +94,14 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 //#ifdef ENABLE_WALLET
 //    LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL);
 //#else
+    fprintf(stderr,"in getinfo %u\n",(uint32_t)time(NULL));
     LOCK(cs_main);
 //#endif
 
     proxyType proxy;
     GetProxy(NET_IPV4, proxy);
     notarized_height = komodo_notarized_height(&prevMoMheight,&notarized_hash,&notarized_desttxid);
-    //fprintf(stderr,"after notarized_height %u\n",(uint32_t)time(NULL));
+    fprintf(stderr,"after notarized_height %u\n",(uint32_t)time(NULL));
 
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("version", CLIENT_VERSION));
@@ -111,13 +112,14 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("notarizedhash", notarized_hash.ToString()));
     obj.push_back(Pair("notarizedtxid", notarized_desttxid.ToString()));
     txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(char *)notarized_desttxid.ToString().c_str(),&kmdnotarized_height);
+    fprintf(stderr,"after notarizedtxid_height %u\n",(uint32_t)time(NULL));
     if ( txid_height > 0 )
         obj.push_back(Pair("notarizedtxid_height", txid_height));
     else obj.push_back(Pair("notarizedtxid_height", "mempool"));
     if ( ASSETCHAINS_SYMBOL[0] != 0 )
         obj.push_back(Pair("KMDnotarized_height", kmdnotarized_height));
     obj.push_back(Pair("notarized_confirms", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height + 1) : 0));
-    //fprintf(stderr,"after notarized_confirms %u\n",(uint32_t)time(NULL));
+    fprintf(stderr,"after notarized_confirms %u\n",(uint32_t)time(NULL));
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
@@ -126,11 +128,11 @@ UniValue getinfo(const UniValue& params, bool fHelp)
             obj.push_back(Pair("interest",       ValueFromAmount(KOMODO_INTERESTSUM))); //komodo_interestsum()
     }
 #endif
-    //fprintf(stderr,"after wallet %u\n",(uint32_t)time(NULL));
+    fprintf(stderr,"after wallet %u\n",(uint32_t)time(NULL));
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     if ( (longestchain= KOMODO_LONGESTCHAIN) != 0 && chainActive.Height() > longestchain )
         longestchain = chainActive.Height();
-    //fprintf(stderr,"after longestchain %u\n",(uint32_t)time(NULL));
+    fprintf(stderr,"after longestchain %u\n",(uint32_t)time(NULL));
     obj.push_back(Pair("longestchain",        longestchain));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
     if ( chainActive.LastTip() != 0 )

From 8e235d345e2ba52fd8e3517db373766fd4362177 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:11:44 -1100
Subject: [PATCH 439/623] Const

---
 src/cc/CCassets.h       |  2 +-
 src/cc/CCassetsCore.cpp |  2 +-
 src/cc/assets.cpp       | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 0c62c26d2..4b7f00a78 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -41,7 +41,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
 bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid);
-bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,CTransaction &tx,uint256 assetid);
+bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
 
 // CCassetstx
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index c11509a4b..d103efdcd 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -275,7 +275,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,CTransaction &tx,uint256 assetid)
+bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index ec24e2b7d..5741982fb 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -123,7 +123,7 @@
  vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
-bool AssetValidate(Eval* eval,CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
     CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
@@ -327,21 +327,25 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
-    CTransaction tx = *(CTransaction *)&ctx;
+    fprintf(stderr,"ProcessAssets\n");
+    //CTransaction tx = *(CTransaction *)&ctx;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
-    else if ( (n= tx.vout.size()) == 0 )
+    else if ( (n= ctx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    else if ( (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+    else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    if ( AssetValidate(eval,tx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
+    if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;
+        fprintf(stderr,"AssetValidate passed\n");
         return(true);
-    } else return(false);
+    }
+    fprintf(stderr,"AssetValidate failed\n");
+    return(false);
 }
 

From 0120f51204d14726686a89f9c8cafc1a2855f407 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:15:28 -1100
Subject: [PATCH 440/623] Const

---
 src/cc/CCassets.h       |  8 ++++----
 src/cc/CCassetsCore.cpp | 18 +++++++++---------
 src/cc/assets.cpp       |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 4b7f00a78..4281101af 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -35,12 +35,12 @@ CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
 CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
-bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx);
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid);
+bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const CTransaction &tx);
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid);
 bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice);
 bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid);
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid);
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
 bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
 
 // CCassetstx
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index d103efdcd..8ca776d8b 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -113,7 +113,7 @@ uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &a
     return(funcid);
 }
 
-bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransaction &tx)
+bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const CTransaction &tx)
 {
     uint256 assetid,assetid2;
     if ( DecodeAssetOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,assetid,assetid2,price,origpubkey) != 0 )
@@ -121,7 +121,7 @@ bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,CTransa
     else return(false);
 }
            
-bool GetAssetorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
+bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
@@ -132,7 +132,7 @@ bool GetAssetorigaddrs(char *CCaddr,char *destaddr,CTransaction& tx)
     else return(false);
 }
 
-uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid)
 {
     uint256 assetid,assetid2; uint64_t nValue=0; int32_t n; uint8_t funcid;
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) // maybe check address too?
@@ -220,7 +220,7 @@ bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_
     } else return(false);
 }
 
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction &tx,CTransaction &vinTx)
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
@@ -243,9 +243,9 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,CTransaction
     return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 refassetid)
+uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid)
 {
-    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
     if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
@@ -264,9 +264,9 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid)
 {
-    CTransaction vinTx; uint64_t nValue,assetoshis;
+    const CTransaction vinTx; uint64_t nValue,assetoshis;
     fprintf(stderr,"AssetValidateSellvin\n");
     if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
@@ -277,7 +277,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 
 bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
 {
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     inputs = outputs = 0;
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 5741982fb..2398e58d7 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -126,7 +126,7 @@
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
@@ -323,7 +323,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
     static uint256 zero,prevtxid;
-    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    const CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);

From ce0ef87fd6379c0e6e08be8e8dd4a2c026327a9d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:17:10 -1100
Subject: [PATCH 441/623] Test

---
 src/cc/CCassetsCore.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 8ca776d8b..6b8599b97 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -220,7 +220,7 @@ bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_
     } else return(false);
 }
 
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,const CTransaction &vinTx)
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = 0;
@@ -245,7 +245,7 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
 
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid)
 {
-    const CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
     if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
@@ -266,7 +266,7 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid)
 {
-    const CTransaction vinTx; uint64_t nValue,assetoshis;
+    CTransaction vinTx; uint64_t nValue,assetoshis;
     fprintf(stderr,"AssetValidateSellvin\n");
     if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
@@ -277,7 +277,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 
 bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
 {
-    const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     inputs = outputs = 0;

From 2ab00f10fa01ee5c6a79b2d1864b22f92058d1ed Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:18:13 -1100
Subject: [PATCH 442/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2398e58d7..3895958e2 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -323,7 +323,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
     static uint256 zero,prevtxid;
-    const CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);

From 9ecbb923977a3d7cdc983ec58e431dd7ae680ed2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:21:53 -1100
Subject: [PATCH 443/623] test

---
 src/cc/assets.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3895958e2..038c8250b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -325,10 +325,9 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    if ( txid == prevtxid )
+    //if ( txid == prevtxid )
         return(true);
     fprintf(stderr,"ProcessAssets\n");
-    //CTransaction tx = *(CTransaction *)&ctx;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( (n= ctx.vout.size()) == 0 )

From 6938b51bc41b7d1d40f30b5eaab49d1f2e00c442 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:22:12 -1100
Subject: [PATCH 444/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 038c8250b..4981700fe 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -325,7 +325,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    //if ( txid == prevtxid )
+    if ( txid == prevtxid )
         return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params

From 4b1aa6cdb0c918110a375d24980b3cfb375748ec Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:24:15 -1100
Subject: [PATCH 445/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4981700fe..038c8250b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -325,7 +325,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    if ( txid == prevtxid )
+    //if ( txid == prevtxid )
         return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params

From 95769ed8636526d133ca929eb72505297f9819bc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:26:23 -1100
Subject: [PATCH 446/623] Test

---
 src/cc/assets.cpp |  3 ++-
 src/rpcmisc.cpp   | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 038c8250b..de576ef34 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -325,7 +325,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    //if ( txid == prevtxid )
+    if ( txid == prevtxid )
         return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
@@ -338,6 +338,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
+    return(true);
     if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 9fb339cad..8eeff7877 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -94,14 +94,13 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 //#ifdef ENABLE_WALLET
 //    LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL);
 //#else
-    fprintf(stderr,"in getinfo %u\n",(uint32_t)time(NULL));
     LOCK(cs_main);
 //#endif
 
     proxyType proxy;
     GetProxy(NET_IPV4, proxy);
     notarized_height = komodo_notarized_height(&prevMoMheight,&notarized_hash,&notarized_desttxid);
-    fprintf(stderr,"after notarized_height %u\n",(uint32_t)time(NULL));
+    //fprintf(stderr,"after notarized_height %u\n",(uint32_t)time(NULL));
 
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("version", CLIENT_VERSION));
@@ -112,14 +111,13 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("notarizedhash", notarized_hash.ToString()));
     obj.push_back(Pair("notarizedtxid", notarized_desttxid.ToString()));
     txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(char *)notarized_desttxid.ToString().c_str(),&kmdnotarized_height);
-    fprintf(stderr,"after notarizedtxid_height %u\n",(uint32_t)time(NULL));
     if ( txid_height > 0 )
         obj.push_back(Pair("notarizedtxid_height", txid_height));
     else obj.push_back(Pair("notarizedtxid_height", "mempool"));
     if ( ASSETCHAINS_SYMBOL[0] != 0 )
         obj.push_back(Pair("KMDnotarized_height", kmdnotarized_height));
     obj.push_back(Pair("notarized_confirms", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height + 1) : 0));
-    fprintf(stderr,"after notarized_confirms %u\n",(uint32_t)time(NULL));
+    //fprintf(stderr,"after notarized_confirms %u\n",(uint32_t)time(NULL));
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
@@ -128,11 +126,11 @@ UniValue getinfo(const UniValue& params, bool fHelp)
             obj.push_back(Pair("interest",       ValueFromAmount(KOMODO_INTERESTSUM))); //komodo_interestsum()
     }
 #endif
-    fprintf(stderr,"after wallet %u\n",(uint32_t)time(NULL));
+    //fprintf(stderr,"after wallet %u\n",(uint32_t)time(NULL));
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     if ( (longestchain= KOMODO_LONGESTCHAIN) != 0 && chainActive.Height() > longestchain )
         longestchain = chainActive.Height();
-    fprintf(stderr,"after longestchain %u\n",(uint32_t)time(NULL));
+    //fprintf(stderr,"after longestchain %u\n",(uint32_t)time(NULL));
     obj.push_back(Pair("longestchain",        longestchain));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
     if ( chainActive.LastTip() != 0 )

From 649bc0bf080f609d3bb05235b8595a0a795f63a3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:29:20 -1100
Subject: [PATCH 447/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index de576ef34..cb9a544c4 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -142,6 +142,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid) == false )
             eval->Invalid("asset inputs != outputs");
     }
+return(true);
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs
@@ -338,7 +339,6 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    return(true);
     if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;

From 6925317d369d7ebb3a6d8f1d0157895264f6fe59 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:30:47 -1100
Subject: [PATCH 448/623] Test

---
 src/cc/assets.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index cb9a544c4..4981700fe 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -142,7 +142,6 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid) == false )
             eval->Invalid("asset inputs != outputs");
     }
-return(true);
     switch ( funcid )
     {
         case 'c': // create wont be called to be verified as it has no CC inputs

From a465e89d5adb581e5a2d7feee66f2631249f0f99 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:36:05 -1100
Subject: [PATCH 449/623] Test

---
 src/cc/assets.cpp | 1 +
 src/main.cpp      | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4981700fe..de576ef34 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -338,6 +338,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
+    return(true);
     if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;
diff --git a/src/main.cpp b/src/main.cpp
index ee014e635..c17bd3aa5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4483,11 +4483,11 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
 
-  if ( chainActive.LastTip() != 0 )
-        komodo_currentheight_set(chainActive.LastTip()->nHeight);
-    checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
     {
         LOCK(cs_main);
+        if ( chainActive.LastTip() != 0 )
+            komodo_currentheight_set(chainActive.LastTip()->nHeight);
+        checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
         bool fRequested = MarkBlockAsReceived(hash);
         fRequested |= fForceProcessing;
         if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0

From 61cbf1c6fb4f0caad674ea3f5de60744596da22f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:37:06 -1100
Subject: [PATCH 450/623] test

---
 src/cc/assets.cpp | 1 -
 src/main.cpp      | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index de576ef34..4981700fe 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -338,7 +338,6 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset create txid");
     if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    return(true);
     if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;
diff --git a/src/main.cpp b/src/main.cpp
index c17bd3aa5..86bbde164 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4482,7 +4482,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-
+    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
     {
         LOCK(cs_main);
         if ( chainActive.LastTip() != 0 )
@@ -4522,7 +4522,8 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    
+    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+
     return true;
 }
 

From e38fedd89e1eef41e08f1eca0ff7f24e5f1a93ff Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:41:26 -1100
Subject: [PATCH 451/623] Test

---
 src/cc/assets.cpp | 35 +++++++++++++++++++----------------
 src/main.cpp      |  6 +++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 4981700fe..604f13c8d 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -327,24 +327,27 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
-    fprintf(stderr,"ProcessAssets\n");
-    if ( paramsNull.size() != 0 ) // Don't expect params
-        return eval->Invalid("Cannot have params");
-    else if ( (n= ctx.vout.size()) == 0 )
-        return eval->Invalid("no-vouts");
-    else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
-        return eval->Invalid("Invalid opreturn payload");
-    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset create txid");
-    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset2 create txid");
-    if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
-        prevtxid = txid;
-        fprintf(stderr,"AssetValidate passed\n");
-        return(true);
+        LOCK(cs_main);
+        fprintf(stderr,"ProcessAssets\n");
+        if ( paramsNull.size() != 0 ) // Don't expect params
+            return eval->Invalid("Cannot have params");
+        else if ( (n= ctx.vout.size()) == 0 )
+            return eval->Invalid("no-vouts");
+        else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+            return eval->Invalid("Invalid opreturn payload");
+        if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+            return eval->Invalid("cant find asset create txid");
+        if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+            return eval->Invalid("cant find asset2 create txid");
+        if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
+        {
+            prevtxid = txid;
+            fprintf(stderr,"AssetValidate passed\n");
+            return(true);
+        }
+        fprintf(stderr,"AssetValidate failed\n");
     }
-    fprintf(stderr,"AssetValidate failed\n");
     return(false);
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 86bbde164..6f3a19822 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4483,11 +4483,11 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
     fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    if ( chainActive.LastTip() != 0 )
+        komodo_currentheight_set(chainActive.LastTip()->nHeight);
+    checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
     {
         LOCK(cs_main);
-        if ( chainActive.LastTip() != 0 )
-            komodo_currentheight_set(chainActive.LastTip()->nHeight);
-        checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
         bool fRequested = MarkBlockAsReceived(hash);
         fRequested |= fForceProcessing;
         if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0

From 5a06f2ff601bed62155179e8be87dadfcf087692 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:46:29 -1100
Subject: [PATCH 452/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 604f13c8d..05bdcad8e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -327,9 +327,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
-    {
-        LOCK(cs_main);
-        fprintf(stderr,"ProcessAssets\n");
+    {        fprintf(stderr,"ProcessAssets\n");
         if ( paramsNull.size() != 0 ) // Don't expect params
             return eval->Invalid("Cannot have params");
         else if ( (n= ctx.vout.size()) == 0 )
@@ -340,6 +338,8 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
             return eval->Invalid("cant find asset create txid");
         if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
             return eval->Invalid("cant find asset2 create txid");
+        fprintf(stderr,"AssetValidate skipped\n");
+        return(true);
         if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
         {
             prevtxid = txid;

From 21f17b881624f0e1c07a2cfaa13484b64947d3d1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 11:56:10 -1100
Subject: [PATCH 453/623] Test

---
 src/cc/assets.cpp | 11 ++++++++---
 src/cc/eval.cpp   |  6 ++++--
 src/main.cpp      | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 05bdcad8e..059e0939c 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -327,15 +327,20 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
-    {        fprintf(stderr,"ProcessAssets\n");
+    {
+        fprintf(stderr,"ProcessAssets\n");
         if ( paramsNull.size() != 0 ) // Don't expect params
             return eval->Invalid("Cannot have params");
-        else if ( (n= ctx.vout.size()) == 0 )
+        fprintf(stderr,"ProcessAssets2\n");
+        if ( (n= ctx.vout.size()) == 0 )
             return eval->Invalid("no-vouts");
-        else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+        fprintf(stderr,"ProcessAssets3\n");
+        if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
             return eval->Invalid("Invalid opreturn payload");
+        fprintf(stderr,"ProcessAssets4\n");
         if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
             return eval->Invalid("cant find asset create txid");
+        fprintf(stderr,"ProcessAssets5\n");
         if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
             return eval->Invalid("cant find asset2 create txid");
         fprintf(stderr,"AssetValidate skipped\n");
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 2f77ced1a..60d87361f 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -87,8 +87,10 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
 
 bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
 {
-    bool fAllowSlow = false; // Don't allow slow
-    return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
+    bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
+    //bool fAllowSlow = false; // Don't allow slow
+    //return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
+    return myGetTransaction(hash, txOut,hashBlock);
 }
 
 
diff --git a/src/main.cpp b/src/main.cpp
index 6f3a19822..9be55a845 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1603,6 +1603,39 @@ bool GetAddressUnspent(uint160 addressHash, int type,
     return true;
 }
 
+bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
+{
+    fprintf(stderr,"check mempool\n");
+    if (mempool.lookup(hash, txOut))
+    {
+        fprintf(stderr,"found in mempool\n");
+        return true;
+    }
+    fprintf(stderr,"check disk\n");
+
+    if (fTxIndex) {
+        CDiskTxPos postx;
+        if (pblocktree->ReadTxIndex(hash, postx)) {
+            CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
+            if (file.IsNull())
+                return error("%s: OpenBlockFile failed", __func__);
+            CBlockHeader header;
+            try {
+                file >> header;
+                fseek(file.Get(), postx.nTxOffset, SEEK_CUR);
+                file >> txOut;
+            } catch (const std::exception& e) {
+                return error("%s: Deserialize or I/O error - %s", __func__, e.what());
+            }
+            hashBlock = header.GetHash();
+            if (txOut.GetHash() != hash)
+                return error("%s: txid mismatch", __func__);
+            return true;
+        }
+    }
+    return false;
+}
+
 /** Return transaction in tx, and if it was found inside a block, its hash is placed in hashBlock */
 bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock, bool fAllowSlow)
 {

From c7814899265e53b3885a0f09619ad6729bfb4776 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:00:25 -1100
Subject: [PATCH 454/623] Test

---
 src/cc/assets.cpp | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 059e0939c..ee48fe421 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -327,32 +327,29 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
+    fprintf(stderr,"ProcessAssets\n");
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    fprintf(stderr,"ProcessAssets2\n");
+    if ( (n= ctx.vout.size()) == 0 )
+        return eval->Invalid("no-vouts");
+    fprintf(stderr,"ProcessAssets3\n");
+    if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+        return eval->Invalid("Invalid opreturn payload");
+    fprintf(stderr,"ProcessAssets4\n");
+    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset create txid");
+    fprintf(stderr,"ProcessAssets5\n");
+    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset2 create txid");
+    fprintf(stderr,"AssetValidate skipped\n");
+    if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
-        fprintf(stderr,"ProcessAssets\n");
-        if ( paramsNull.size() != 0 ) // Don't expect params
-            return eval->Invalid("Cannot have params");
-        fprintf(stderr,"ProcessAssets2\n");
-        if ( (n= ctx.vout.size()) == 0 )
-            return eval->Invalid("no-vouts");
-        fprintf(stderr,"ProcessAssets3\n");
-        if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
-            return eval->Invalid("Invalid opreturn payload");
-        fprintf(stderr,"ProcessAssets4\n");
-        if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
-            return eval->Invalid("cant find asset create txid");
-        fprintf(stderr,"ProcessAssets5\n");
-        if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
-            return eval->Invalid("cant find asset2 create txid");
-        fprintf(stderr,"AssetValidate skipped\n");
+        prevtxid = txid;
+        fprintf(stderr,"AssetValidate passed\n");
         return(true);
-        if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
-        {
-            prevtxid = txid;
-            fprintf(stderr,"AssetValidate passed\n");
-            return(true);
-        }
-        fprintf(stderr,"AssetValidate failed\n");
     }
+    fprintf(stderr,"AssetValidate failed\n");
     return(false);
 }
 

From 67c3262fcddeca72730e5ac690acbce019b8674b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:03:43 -1100
Subject: [PATCH 455/623] Fixed deadlock?

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9be55a845..ba887ff23 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4515,7 +4515,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
     if ( chainActive.LastTip() != 0 )
         komodo_currentheight_set(chainActive.LastTip()->nHeight);
     checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
@@ -4555,7 +4555,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
 
     return true;
 }

From e2beb0504ebb2d56b428e46ad01d49d3360c7b31 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:08:25 -1100
Subject: [PATCH 456/623] Reduce prints

---
 src/cc/assets.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index ee48fe421..2d5f8a735 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -330,20 +330,15 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
-    fprintf(stderr,"ProcessAssets2\n");
-    if ( (n= ctx.vout.size()) == 0 )
+    else if ( (n= ctx.vout.size()) == 0 )
         return eval->Invalid("no-vouts");
-    fprintf(stderr,"ProcessAssets3\n");
-    if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+    else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
-    fprintf(stderr,"ProcessAssets4\n");
-    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+    else if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset create txid");
-    fprintf(stderr,"ProcessAssets5\n");
-    if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+    else if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
         return eval->Invalid("cant find asset2 create txid");
-    fprintf(stderr,"AssetValidate skipped\n");
-    if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
+    else if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         prevtxid = txid;
         fprintf(stderr,"AssetValidate passed\n");

From f75227208fba63a6007fc788adba69bdbb7186bc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:09:24 -1100
Subject: [PATCH 457/623] Test

---
 src/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index ba887ff23..913807ba9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1605,13 +1605,14 @@ bool GetAddressUnspent(uint160 addressHash, int type,
 
 bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
 {
-    fprintf(stderr,"check mempool\n");
+    // need a GetTransaction without lock so the validation code for assets can run without deadlock
+    //fprintf(stderr,"check mempool\n");
     if (mempool.lookup(hash, txOut))
     {
-        fprintf(stderr,"found in mempool\n");
+        //fprintf(stderr,"found in mempool\n");
         return true;
     }
-    fprintf(stderr,"check disk\n");
+    //fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;

From 02c68a7b8c631c58b7507f1f8a0fcbf840dd6536 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:34:05 -1100
Subject: [PATCH 458/623] Faucet

---
 src/cc/CCinclude.h |  1 +
 src/cc/CCutils.cpp | 30 ++++++++++++++++++++++--
 src/cc/assets.cpp  | 18 +-------------
 src/cc/eval.cpp    |  3 +--
 src/cc/faucet.cpp  | 58 +++++++++++++++-------------------------------
 5 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 7793622b7..b36002e71 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -48,6 +48,7 @@ char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
 bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
+bool PreventCC(const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index b641b8813..50e2fd26b 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -56,8 +56,12 @@ char *uint256_str(char *dest,uint256 txid)
 uint256 Parseuint256(char *hexstr)
 {
     uint256 txid; int32_t i; std::vector<unsigned char> txidbytes(ParseHex(hexstr));
-    for (i=31; i>=0; i--)
-        ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
+    memset(&txid,0,sizeof(txid));
+    if ( strlen(hexstr) == 64 )
+    {
+        for (i=31; i>=0; i--)
+            ((uint8_t *)&txid)[31-i] = ((uint8_t *)txidbytes.data())[i];
+    }
     return(txid);
 }
 
@@ -96,6 +100,28 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
     else return(true);
 }
 
+bool PreventCC(const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts)
+{
+    int32_t i;
+    if ( preventCCvins >= 0 )
+    {
+        for (i=preventCCvins; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
+                return eval->Invalid("invalid CC vin");
+        }
+    }
+    if ( preventCCvouts >= 0 )
+    {
+        for (i=preventCCvouts; i<numvouts; i++)
+        {
+            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
+                return eval->Invalid("invalid CC vout");
+        }
+    }
+    return(true);
+}
+
 std::vector<uint8_t> Mypubkey()
 {
     extern uint8_t NOTARY_PUBKEY33[33];
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 2d5f8a735..d1cc23edf 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -301,23 +301,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             fprintf(stderr,"fill validated\n");
             break;
     }
-    if ( preventCCvins >= 0 )
-    {
-        for (i=preventCCvins; i<numvins; i++)
-        {
-            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
-                return eval->Invalid("invalid CC vin");
-        }
-    }
-    if ( preventCCvouts >= 0 )
-    {
-        for (i=preventCCvouts; i<numvouts; i++)
-        {
-            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                return eval->Invalid("invalid CC vout");
-        }
-    }
-    return(true);
+    return(PreventCC(tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 60d87361f..91a507030 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -88,6 +88,7 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector<CTransaction> &spends) c
 bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const
 {
     bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
+    // there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks
     //bool fAllowSlow = false; // Don't allow slow
     //return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
     return myGetTransaction(hash, txOut,hashBlock);
@@ -110,7 +111,6 @@ unsigned int Eval::GetCurrentHeight() const
     return chainActive.Height();
 }
 
-
 bool Eval::GetBlock(uint256 hash, CBlockIndex& blockIdx) const
 {
     auto r = mapBlockIndex.find(hash);
@@ -122,7 +122,6 @@ bool Eval::GetBlock(uint256 hash, CBlockIndex& blockIdx) const
     return false;
 }
 
-
 extern int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestamp);
 
 
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 3f616f221..72102f558 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -43,18 +43,20 @@ CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
     return(vout);
 }
 
-uint64_t IsFaucetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,CTransaction& tx,int32_t v,uint256 refassetid)
+uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
 {
+    char destaddr[64];
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
-        return(tx.vout[v].nValue);
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,FaucetCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
     return(0);
 }
 
-#ifdef notyet
-
-bool FaucetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
+bool FaucetExactAmounts(Eval* eval,const CTransaction &tx)
 {
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     for (i=1; i<numvins; i++)
@@ -63,13 +65,13 @@ bool FaucetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
-            else if ( (assetoshis= IsFaucetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+            else if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                 inputs += assetoshis;
         }
     }
     for (i=0; i<numvouts; i++)
     {
-        if ( (assetoshis= IsFaucetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+        if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
             outputs += assetoshis;
     }
     if ( inputs != outputs )
@@ -77,42 +79,21 @@ bool FaucetExactAmounts(Eval* eval,CTransaction &tx,uint256 assetid)
     else return(true);
 }
 
-bool FaucetValidate(Eval* eval,CTransaction &tx)
+bool FaucetValidate(Eval* eval,const CTransaction &tx)
 {
-    static uint256 zero;
-    CTxDestination address; CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
-    fprintf(stderr,"FaucetValidate (%c)\n",funcid);
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts;
+    fprintf(stderr,"FaucetValidate\n");
     numvins = tx.vin.size();
+    numvouts = tx.vout.size();
     outputs = inputs = 0;
     preventCCvins = preventCCvouts = -1;
     if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     else if ( numvouts < 1 )
         return eval->Invalid("no vouts");
-    else if ( funcid != 'c' )
-    {
-        if ( assetid == zero )
-            return eval->Invalid("illegal assetid");
-        else if ( FaucetExactAmounts(eval,tx,assetid) == false )
-            eval->Invalid("asset inputs != outputs");
-    }
-    if ( preventCCvins >= 0 )
-    {
-        for (i=preventCCvins; i<numvins; i++)
-        {
-            if ( IsCCInput(tx.vin[i].scriptSig) != 0 )
-                return eval->Invalid("invalid CC vin");
-        }
-    }
-    if ( preventCCvouts >= 0 )
-    {
-        for (i=preventCCvouts; i<numvouts; i++)
-        {
-            if ( tx.vout[i].scriptPubKey.IsPayToCryptoCondition() != 0 )
-                return eval->Invalid("invalid CC vout");
-        }
-    }
-    return(true);
+    else if ( FaucetExactAmounts(eval,tx) == false )
+        eval->Invalid("asset inputs != outputs");
+    else return(PreventCC(tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
@@ -121,12 +102,11 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
-    CTransaction tx = *(CTransaction *)&ctx;
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
-    else if ( tx.vout.size() == 0 )
+    else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
-    if ( FaucetValidate(eval,tx,n) != 0 )
+    if ( FaucetValidate(eval,ctx,n) != 0 )
     {
         prevtxid = txid;
         return(true);

From e49eb6ed6b2aaa296a64c37873231d1fd4972fcc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:35:46 -1100
Subject: [PATCH 459/623] Eval* eval,

---
 src/cc/CCinclude.h | 2 +-
 src/cc/CCutils.cpp | 2 +-
 src/cc/faucet.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index b36002e71..d9367ec5a 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -48,7 +48,7 @@ char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
 bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
-bool PreventCC(const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts);
+bool PreventCC(Eval* eval,const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 50e2fd26b..6e19151e6 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -100,7 +100,7 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
     else return(true);
 }
 
-bool PreventCC(const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts)
+bool PreventCC(Eval* eval,const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts)
 {
     int32_t i;
     if ( preventCCvins >= 0 )
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 72102f558..89657336a 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -93,7 +93,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
         return eval->Invalid("no vouts");
     else if ( FaucetExactAmounts(eval,tx) == false )
         eval->Invalid("asset inputs != outputs");
-    else return(PreventCC(tx,preventCCvins,numvins,preventCCvouts,numvouts));
+    else return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)

From 463e5af096d2908da07189bf98ad8e9bc089d77b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:37:18 -1100
Subject: [PATCH 460/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d1cc23edf..81ff2a96a 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -301,7 +301,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             fprintf(stderr,"fill validated\n");
             break;
     }
-    return(PreventCC(tx,preventCCvins,numvins,preventCCvouts,numvouts));
+    return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)

From fd77b9d59e7d7f4c26361cd86927355084e18edf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:39:14 -1100
Subject: [PATCH 461/623] Test

---
 src/cc/faucet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 89657336a..c922046ca 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -98,7 +98,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    static uint256 zero,prevtxid;
+    static uint256 zero,prevtxid; uint256 txid;
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
@@ -106,7 +106,7 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
-    if ( FaucetValidate(eval,ctx,n) != 0 )
+    if ( FaucetValidate(eval,ctx) != 0 )
     {
         prevtxid = txid;
         return(true);

From 1659202766c523bcda81c43fdc7e457373bae508 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 12:39:49 -1100
Subject: [PATCH 462/623] Fix

---
 src/cc/faucet.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index c922046ca..92abe0003 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -85,7 +85,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
     fprintf(stderr,"FaucetValidate\n");
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
-    outputs = inputs = 0;
     preventCCvins = preventCCvouts = -1;
     if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
@@ -112,4 +111,3 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return(true);
     } else return(false);
 }
-#endif

From 65a961ff06b5b7357be05ac861c22c88222858ba Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:06:46 -1100
Subject: [PATCH 463/623] Faucet

---
 src/cc/CCcustom.cpp      |  4 ++--
 src/cc/CCfaucet.h        |  2 ++
 src/cc/CCtx.cpp          |  3 ++-
 src/cc/CCutils.cpp       |  6 +++---
 src/cc/faucet.cpp        | 35 +++++++++++++++++++++++++++++++++++
 src/rpcserver.cpp        |  3 +++
 src/rpcserver.h          |  2 ++
 src/wallet/rpcwallet.cpp | 32 ++++++++++++++++++++++++++++++++
 8 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 2d8485507..f10c35fb6 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -36,8 +36,8 @@ CC *MakeFaucetCond(CPubKey pk);
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-const char *FaucetCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
-char FaucetCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
+const char *FaucetCCaddr = "RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
+char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
 
diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 09178be14..71875c394 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -26,5 +26,7 @@ extern char FaucetCChexstr[67];
 bool IsFaucetInput(CScript const& scriptSig);
 CC *MakeFaucetCond(CPubKey pk);
 
+std::string FaucetFund(uint64_t txfee,uint64_t funds);
+std::string FaucetGet(uint64_t txfee);
 
 #endif
diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 24be366d1..201adb074 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -82,7 +82,8 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
         change = totalinputs - (totaloutputs+txfee);
         mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
     }
-    mtx.vout.push_back(CTxOut(0,opret));
+    if ( opret.size() > 0 )
+        mtx.vout.push_back(CTxOut(0,opret));
     PrecomputedTransactionData txdata(mtx);
     n = mtx.vin.size();
     for (i=0; i<n; i++)
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 6e19151e6..b761090e1 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -151,9 +151,9 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                //for (i=0; i<32; i++)
-                //    fprintf(stderr,"%02x",myprivkey[i]);
-                //fprintf(stderr," found privkey!\n");
+                for (i=0; i<32; i++)
+                    fprintf(stderr,"0x%02x, ",myprivkey[i]);
+                fprintf(stderr," found privkey!\n");
                 return(true);
             }
 #endif
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 92abe0003..b1b69b90f 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -111,3 +111,38 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return(true);
     } else return(false);
 }
+
+std::string FaucetFund(uint64_t txfee,uint64_t funds)
+{
+    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    faucetpk = GetUnspendable(EVAL_FAUCET,0);
+    if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeFaucetVout(funds,faucetpk));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+std::string FaucetGet(uint64_t txfee)
+{
+    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN;
+    if ( txfee == 0 )
+        txfee = 10000;
+    faucetpk = GetUnspendable(EVAL_FAUCET,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index d5f6e861d..ab676ddae 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -344,6 +344,9 @@ static const CRPCCommand vRPCCommands[] =
 #ifdef ENABLE_WALLET
     { "rawtransactions",    "fundrawtransaction",     &fundrawtransaction,     false },
 #endif
+    /* faucet */
+    { "faucet",       "faucetfund",      &faucetfund,     true },
+    { "faucet",       "faucetget",       &faucetget,      true },
 
 /* tokens */
     { "tokens",       "tokenorders",      &tokenorders,       true },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 93db71733..021e2d274 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -221,6 +221,8 @@ extern UniValue tokencancelask(const UniValue& params, bool fHelp);
 extern UniValue tokenfillask(const UniValue& params, bool fHelp);
 extern UniValue tokenswapask(const UniValue& params, bool fHelp);
 extern UniValue tokenfillswap(const UniValue& params, bool fHelp);
+extern UniValue faucetfund(const UniValue& params, bool fHelp);
+extern UniValue faucetget(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7455b532b..355eb1800 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,8 +4830,40 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
+#include "../cc/CCfaucet.h"
+
+UniValue faucetfund(const UniValue& params, bool fHelp)
+{
+    uint64_t funds; std::string hex;
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("faucetfund amount\n");
+    funds = atof(params[1].get_str().c_str()) * COIN;
+    hex = FaucetFund(0,funds);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create faucet funding transaction"));
+    return(result);
+}
+
+UniValue faucetget(const UniValue& params, bool fHelp)
+{
+    uint64_t funds; std::string hex;
+    if ( fHelp || params.size() > 0 )
+        throw runtime_error("faucetget\n");
+    hex = FaucetGet(0);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create faucet get transaction"));
+    return(result);
+}
+
 #include "../cc/CCassets.h"
 
+
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {
     uint256 tokenid;

From 36e071fcb3eaf848bdb68f77cb83235a01d20c93 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:14:45 -1100
Subject: [PATCH 464/623] Test

---
 src/cc/CCtx.cpp    |  2 +-
 src/cc/CCutils.cpp |  3 +++
 src/cc/faucet.cpp  | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 201adb074..b5208ced5 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -58,7 +58,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     mycond = MakeCC(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
     othercond = MakeCC(evalcode,unspendablepk);
-    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
     {
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index b761090e1..f5576b239 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -92,7 +92,10 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
 {
     char destaddr[64];
     if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+    {
+        fprintf(stderr,"constrain vout error isCC %d vs %d CCflag\n",vout.scriptPubKey.IsPayToCryptoCondition(),CCflag);
         return(false);
+    }
     else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
         return(false);
     else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index b1b69b90f..f83b9e7e2 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -112,6 +112,33 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     } else return(false);
 }
 
+uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_FAUCET,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsFaucetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
 std::string FaucetFund(uint64_t txfee,uint64_t funds)
 {
     CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret;

From f6ab9f307967638440df95da97f310d08da70ff4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:16:13 -1100
Subject: [PATCH 465/623] Test

---
 src/cc/faucet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index f83b9e7e2..fcf64f42d 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -112,7 +112,7 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     } else return(false);
 }
 
-uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
@@ -124,7 +124,7 @@ uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uin
         txid = it->first.txhash;
         if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
-            if ( (nValue= IsFaucetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            if ( (nValue= IsFaucetvout(vintx,(int32_t)it->first.index)) > 0 )
             {
                 if ( total != 0 && maxinputs != 0 )
                     mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));

From a5c286bf78157e93f78178631f2f150b974b332f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:21:23 -1100
Subject: [PATCH 466/623] UniValue result(UniValue::VOBJ);

---
 src/wallet/rpcwallet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 355eb1800..7be4ff85d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4834,7 +4834,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 
 UniValue faucetfund(const UniValue& params, bool fHelp)
 {
-    uint64_t funds; std::string hex;
+    UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
     if ( fHelp || params.size() > 1 )
         throw runtime_error("faucetfund amount\n");
     funds = atof(params[1].get_str().c_str()) * COIN;
@@ -4849,7 +4849,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
 
 UniValue faucetget(const UniValue& params, bool fHelp)
 {
-    uint64_t funds; std::string hex;
+    UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
     if ( fHelp || params.size() > 0 )
         throw runtime_error("faucetget\n");
     hex = FaucetGet(0);

From 37e67a2ad6aab95fd56c52bb443f0b5860916cb8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:25:40 -1100
Subject: [PATCH 467/623] Test

---
 src/cc/CCutils.cpp       | 6 ++++++
 src/wallet/rpcwallet.cpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index f5576b239..033d18b6f 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -97,9 +97,15 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
         return(false);
     }
     else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
+    {
+        fprintf(stderr,"constrain vout error addr\n");
         return(false);
+    }
     else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+    {
+        fprintf(stderr,"constrain vout error nValue %.8f vs %.8f\n",(double)nValue/COIN,(double)vout.nValue/COIN);
         return(false);
+    }
     else return(true);
 }
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7be4ff85d..e2bd693df 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4837,7 +4837,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
     if ( fHelp || params.size() > 1 )
         throw runtime_error("faucetfund amount\n");
-    funds = atof(params[1].get_str().c_str()) * COIN;
+    funds = atof(params[0].get_str().c_str()) * COIN;
     hex = FaucetFund(0,funds);
     if ( hex.size() > 0 )
     {

From 939225fa740f0c3f3d36aa9ee6afc090d6467eba Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:28:14 -1100
Subject: [PATCH 468/623] Test

---
 src/cc/CCcustom.cpp | 2 +-
 src/cc/CCutils.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index f10c35fb6..5fc7652a8 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -38,7 +38,7 @@ char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 const char *FaucetCCaddr = "RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
-uint8_t FaucetCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
+uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
 
 bool IsAssetsInput(CScript const& scriptSig)
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 033d18b6f..c5483e40e 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -101,7 +101,7 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
         fprintf(stderr,"constrain vout error addr\n");
         return(false);
     }
-    else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
+    else if ( (nValue == 0 && vout.nValue < 10000) || (nValue != 0 && nValue != vout.nValue) )
     {
         fprintf(stderr,"constrain vout error nValue %.8f vs %.8f\n",(double)nValue/COIN,(double)vout.nValue/COIN);
         return(false);

From f469612164d6f844201fbc071018ada62c9053f0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:30:56 -1100
Subject: [PATCH 469/623] Test

---
 src/cc/CCcustom.cpp | 2 +-
 src/cc/CCutils.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 5fc7652a8..2427c98c0 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -36,7 +36,7 @@ CC *MakeFaucetCond(CPubKey pk);
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-const char *FaucetCCaddr = "RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
+const char *FaucetCCaddr = "RHyZVzEvyKK4GtpFyGP3LzXBPJwQJfCfwG" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index c5483e40e..c128568a8 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -160,9 +160,9 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                for (i=0; i<32; i++)
-                    fprintf(stderr,"0x%02x, ",myprivkey[i]);
-                fprintf(stderr," found privkey!\n");
+                //for (i=0; i<32; i++)
+                //    fprintf(stderr,"0x%02x, ",myprivkey[i]);
+                //fprintf(stderr," found privkey!\n");
                 return(true);
             }
 #endif

From c670ca6c36e24e72654500bc0f0fd9503766251c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:34:08 -1100
Subject: [PATCH 470/623] Test

---
 src/cc/CCutils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index c128568a8..cddf39e46 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -98,7 +98,7 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
     }
     else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
     {
-        fprintf(stderr,"constrain vout error addr\n");
+        fprintf(stderr,"constrain vout error addr %s vs %s\n",cmpaddr!=0?cmpaddr:"",destaddr!=0?destaddr:"");
         return(false);
     }
     else if ( (nValue == 0 && vout.nValue < 10000) || (nValue != 0 && nValue != vout.nValue) )

From d3227df299096ea65927660ef8d6ec792fc8cdd4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:43:56 -1100
Subject: [PATCH 471/623] Test

---
 src/cc/CCassetsCore.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 6b8599b97..fbd1c71a3 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -121,13 +121,13 @@ bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const C
     else return(false);
 }
            
-bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx)
+bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx,int32_t i)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
     if ( n == 0 || (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
         return(false);
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
+    if ( GetCCaddress(EVAL_ASSETS,CCaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
         return(true);
     else return(false);
 }
@@ -223,29 +223,30 @@ bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_
 uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
-    origaddr[0] = destaddr[0] = 0;
+    origaddr[0] = destaddr[0] = CCaddr[0] = 0;
     if ( tx.vin.size() < 2 )
         return eval->Invalid("not enough for CC vins");
     else if ( tx.vin[1].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
     else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
         return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[0].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
+    else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[1].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
     {
         fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
         return eval->Invalid("invalid vin AssetsCCaddr");
     }
     else if ( vinTx.vout[0].nValue < 10000 )
         return eval->Invalid("invalid dust for buyvin");
-    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx) == 0 )
+    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx,tx.vin[1].prevout.h) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
-    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[0].nValue/COIN,origaddr);
+    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[tx.vin[1].prevout.n].nValue/COIN,origaddr);
     return(vinTx.vout[0].nValue);
 }
 
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
+    CCaddr[0] = origaddr[0] = 0;
     if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )

From 43ac8b986ea8a5a1f9ecc1dac7aab39b8e5b9a37 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:45:01 -1100
Subject: [PATCH 472/623] Test

---
 src/cc/CCassetsCore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index fbd1c71a3..ecb37e02d 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -121,7 +121,7 @@ bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const C
     else return(false);
 }
            
-bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx,int32_t i)
+bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
@@ -237,7 +237,7 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
     }
     else if ( vinTx.vout[0].nValue < 10000 )
         return eval->Invalid("invalid dust for buyvin");
-    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx,tx.vin[1].prevout.h) == 0 )
+    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
     fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[tx.vin[1].prevout.n].nValue/COIN,origaddr);
     return(vinTx.vout[0].nValue);

From 698d25f7589ef81a42f1999fafd63d4f1fd1449c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:47:37 -1100
Subject: [PATCH 473/623] Test

---
 src/cc/CCutils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index cddf39e46..01511210f 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -101,7 +101,7 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
         fprintf(stderr,"constrain vout error addr %s vs %s\n",cmpaddr!=0?cmpaddr:"",destaddr!=0?destaddr:"");
         return(false);
     }
-    else if ( (nValue == 0 && vout.nValue < 10000) || (nValue != 0 && nValue != vout.nValue) )
+    else if ( nValue != 0 && nValue != vout.nValue ) //(nValue == 0 && vout.nValue < 10000) || (
     {
         fprintf(stderr,"constrain vout error nValue %.8f vs %.8f\n",(double)nValue/COIN,(double)vout.nValue/COIN);
         return(false);

From bba1ef17b8721a121bb80d5e496b346fffd3570b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:52:46 -1100
Subject: [PATCH 474/623] Test

---
 src/cc/CCassetsCore.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index ecb37e02d..5c155e520 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -171,9 +171,11 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice)
+bool ValidateAssetRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received,int64_t paid,int64_t totalprice)
 {
     uint64_t price,recvprice;
+    if ( received >= totalprice )
+        received = totalprice;
     if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
     {
         fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);

From 115a38af5b5d31a58cddb27b2442d9b9e643d016 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 13:53:45 -1100
Subject: [PATCH 475/623] Test

---
 src/cc/CCassets.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 4281101af..290abd10e 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -37,7 +37,7 @@ CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
 bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const CTransaction &tx);
 uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid);
-bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received,uint64_t paid,uint64_t totalprice);
+bool ValidateAssetRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received,int64_t paid,int64_t totalprice);
 bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);

From 303d26770f008e8fffb2172126d4e26d6089dac2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:40:16 -1100
Subject: [PATCH 476/623] Fix remainder and validation of prices

---
 src/cc/CCassetsCore.cpp | 137 +++++++++++++++++++++++++---------------
 src/cc/assets.cpp       |  20 +++---
 2 files changed, 98 insertions(+), 59 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 5c155e520..5def01f66 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -15,6 +15,92 @@
 
 #include "CCassets.h"
 
+/*
+ The SetAssetFillamounts() and ValidateAssetRemainder() work in tandem to calculate the vouts for a fill and to validate the vouts, respectively.
+ 
+ This pair of functions are critical to make sure the trading is correct and is the trickiest part of the assets contract.
+ 
+ //vin.0: normal input
+ //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0]
+ //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue
+ //vout.0: remaining amount of bid to unspendable
+ //vout.1: vin.1 value to signer of vin.2
+ //vout.2: vin.2 assetoshis to original pubkey
+ //vout.3: CC output for assetoshis change (if any)
+ //vout.4: normal output for change (if any)
+ //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
+    ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice);
+ 
+ Yes, this is quite confusing...
+ 
+ In ValudateAssetRemainder the naming convention is nValue is the coin/asset with the offer on the books and "price" is what it is being paid in. The high level check is to make sure we didnt lose any coins or assets, the harder to validate is the actual price paid as the "orderbook" is in terms of the combined nValue for the combined pricetotal.
+ 
+ We assume that the effective unit cost in the orderbook is valid and that that amount was paid and also that any remainder will be close enough in effective unit cost to not matter. At the edge cases, this will probably be not true and maybe some orders wont be practically fillable when reduced to fractional state. However, the original pubkey that created the offer can always reclaim it.
+*/
+
+bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice)
+{
+    uint64_t unitprice,recvunitprice,newunitprice=0;
+    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
+        return(false);
+    }
+    else if ( totalprice != (remaining_price + paidprice) )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: totalprice %llu != %llu (remaining_price %llu + %llu paidprice)\n",(long long)totalprice,(long long)(remaining_price + paidprice),(long long)remaining_price,(long long)paidprice);
+        return(false);
+    }
+    else if ( orig_nValue != (remaining_nValue + received_nValue) )
+    {
+        fprintf(stderr,"ValidateAssetRemainder: orig_nValue %llu != %llu (remaining_nValue %llu + %llu received_nValue)\n",(long long)orig_nValue,(long long)(remaining_nValue - received_nValue),(long long)remaining_nValue,(long long)received_nValue);
+        return(false);
+    }
+    else
+    {
+        unitprice = (orig_nValue * COIN) / totalprice;
+        recvunitprice = (received_nValue * COIN) / paidprice;
+        if ( recvunitprice < unitprice )
+        {
+            fprintf(stderr,"recvunitprice %llu < %llu unitprice\n",(long long)recvunitprice,(long long)unitprice);
+            return(false);
+        }
+        if ( remaining_price != 0 )
+            newunitprice = (remaining_nValue * COIN) / remaining_price;
+        fprintf(stderr,"recvunitprice %llu >= %llu unitprice, new unitprice %llu\n",(long long)recvunitprice,(long long)unitprice,(long long)newunitprice);
+    }
+    return(true);
+}
+
+/*
+ SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+ */
+
+bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &paidprice,uint64_t totalprice)
+{
+    uint64_t remaining_nValue,unitprice;
+    if ( totalprice == 0 )
+    {
+        received_nValue = remaining_price = paidprice = 0;
+        return(false);
+    }
+    if ( paidprice >= totalprice )
+    {
+        paidprice = totalprice;
+        received_nValue = orig_nValue;
+        remaining_price = 0;
+        fprint(stderr,"totally filled!\n");
+        return(true);
+    }
+    remaining_price = (totalprice - paidprice);
+    unitprice = (orig_nValue * COIN) / totalprice;
+    if ( unitprice > 0 && (received_nValue= paidprice * unitprice) > 0 && received_nValue < orig_nValue )
+    {
+        remaining_nValue = (orig_nValue - received_nValue);
+        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received_nValue,paidprice,totalprice));
+    } else return(false);
+}
+
 CC *MakeAssetCond(CPubKey pk)
 {
     std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
@@ -171,57 +257,6 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-bool ValidateAssetRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received,int64_t paid,int64_t totalprice)
-{
-    uint64_t price,recvprice;
-    if ( received >= totalprice )
-        received = totalprice;
-    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
-    {
-        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
-        return(false);
-    }
-    else if ( remaining_price < (totalprice - received) )
-    {
-        fprintf(stderr,"ValidateAssetRemainder: remaining_price %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_price,(long long)(totalprice - received),(long long)totalprice,(long long)received);
-        return(false);
-    }
-    else if ( remaining_nValue < (orig_nValue - paid) )
-    {
-        fprintf(stderr,"ValidateAssetRemainder: remaining_nValue %llu < %llu (totalprice %llu - %llu received)\n",(long long)remaining_nValue,(long long)(orig_nValue - paid),(long long)orig_nValue,(long long)paid);
-        return(false);
-    }
-    else if ( remaining_nValue > 0 )
-    {
-        price = (totalprice * COIN) / orig_nValue;
-        recvprice = (received * COIN) / paid;
-        if ( recvprice < price )
-        {
-            fprintf(stderr,"recvprice %llu < %llu price\n",(long long)recvprice,(long long)price);
-            return(false);
-        }
-    }
-    return(true);
-}
-
-bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice)
-{
-    uint64_t remaining_nValue,price,mult;
-    if ( received >= totalprice )
-        received = totalprice;
-    remaining_price = (totalprice - received);
-    price = (totalprice * COIN) / orig_nValue;
-    mult = (received * COIN);
-    fprintf(stderr,"remaining %llu price %llu, mult %llu, totalprice %llu, received %llu, paid %llu\n",(long long)remaining_price,(long long)price,(long long)mult,(long long)totalprice,(long long)received,(long long)mult / price);
-    if ( price > 0 && (paid= mult / price) > 0 )
-    {
-        if ( (mult % price) != 0 )
-            paid--;
-        remaining_nValue = (orig_nValue - paid);
-        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received,paid,totalprice));
-    } else return(false);
-}
-
 uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 81ff2a96a..f5c1a8ebf 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -76,7 +76,8 @@
  vout.0: remaining amount of bid to unspendable
  vout.1: vin.1 value to signer of vin.2
  vout.2: vin.2 assetoshis to original pubkey
- vout.3: normal output for change (if any)
+ vout.3: CC output for assetoshis change (if any)
+ vout.4: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
 
  selloffer:
@@ -109,7 +110,9 @@
  vout.0: remaining assetoshis -> unspendable
  vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any
  vout.2: vin.2 value to original pubkey [origpubkey]
- vout.3: normal output for change (if any)
+ vout.3: CC asset for change (if any)
+ vout.4: CC asset2 for change (if any) 'E' only
+ vout.5: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey]
  
  fillexchange:
@@ -126,7 +129,7 @@
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
@@ -199,10 +202,11 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.0: remaining amount of bid to unspendable
             //vout.1: vin.1 value to signer of vin.2
             //vout.2: vin.2 assetoshis to original pubkey
-            //vout.3: normal output for change (if any)
+            //vout.3: CC output for assetoshis change (if any)
+            //vout.4: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
             preventCCvouts = 4;
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(eval,totalprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fillbuy");
@@ -214,7 +218,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                     return eval->Invalid("vout1 is CC for fillbuy");
                 else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
                 else if ( remaining_price != 0 )
                 {
@@ -274,7 +278,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (assetoshis= AssetValidateSellvin(eval,totalprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fill");
@@ -282,7 +286,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
-                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,tmpprice) == false )
+                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");

From 889f89c43ad9078107c511eed6bbe365422122ae Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:42:18 -1100
Subject: [PATCH 477/623] Fix

---
 src/cc/CCassetsCore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 5def01f66..5b27b06bf 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -41,7 +41,7 @@
 bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice)
 {
     uint64_t unitprice,recvunitprice,newunitprice=0;
-    if ( orig_nValue == 0 || received == 0 || paid == 0 || totalprice == 0 )
+    if ( orig_nValue == 0 || received_nValue == 0 || paidprice == 0 || totalprice == 0 )
     {
         fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
         return(false);
@@ -89,7 +89,7 @@ bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uin
         paidprice = totalprice;
         received_nValue = orig_nValue;
         remaining_price = 0;
-        fprint(stderr,"totally filled!\n");
+        fprintf(stderr,"totally filled!\n");
         return(true);
     }
     remaining_price = (totalprice - paidprice);

From 7da626c2ec9c5d0f54bf0dd9ece19cd56be0d939 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:43:15 -1100
Subject: [PATCH 478/623] Test

---
 src/cc/CCassetsCore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 5b27b06bf..2321eee09 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -43,7 +43,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
     uint64_t unitprice,recvunitprice,newunitprice=0;
     if ( orig_nValue == 0 || received_nValue == 0 || paidprice == 0 || totalprice == 0 )
     {
-        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received == %llu || paid == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received,(long long)paid,(long long)totalprice);
+        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received_nValue == %llu || paidprice == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received_nValue,(long long)paidprice,(long long)totalprice);
         return(false);
     }
     else if ( totalprice != (remaining_price + paidprice) )

From 2c6c822f1a055424f79de60a710e393c451ee5d8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:44:51 -1100
Subject: [PATCH 479/623] Test

---
 src/cc/CCassets.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 290abd10e..9a3ed33dc 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -37,7 +37,7 @@ CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
 bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const CTransaction &tx);
 uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid);
-bool ValidateAssetRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received,int64_t paid,int64_t totalprice);
+bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice);
 bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);

From ba94abe8b5596a80a3e7250a53d64099e7fdddc2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:54:01 -1100
Subject: [PATCH 480/623] Test

---
 src/cc/CCassetsCore.cpp |  4 ++--
 src/cc/assets.cpp       | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 2321eee09..e129adaf9 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -67,7 +67,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
         }
         if ( remaining_price != 0 )
             newunitprice = (remaining_nValue * COIN) / remaining_price;
-        fprintf(stderr,"recvunitprice %llu >= %llu unitprice, new unitprice %llu\n",(long long)recvunitprice,(long long)unitprice,(long long)newunitprice);
+        fprintf(stderr,"recvunitprice %.8f >= %.8f unitprice, new unitprice %llu\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN);
     }
     return(true);
 }
@@ -94,7 +94,7 @@ bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uin
     }
     remaining_price = (totalprice - paidprice);
     unitprice = (orig_nValue * COIN) / totalprice;
-    if ( unitprice > 0 && (received_nValue= paidprice * unitprice) > 0 && received_nValue < orig_nValue )
+    if ( unitprice > 0 && (received_nValue= (paidprice * unitprice)/COIN) > 0 && received_nValue < orig_nValue )
     {
         remaining_nValue = (orig_nValue - received_nValue);
         return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received_nValue,paidprice,totalprice));
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f5c1a8ebf..7ddeaeea1 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -310,11 +310,11 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    static uint256 zero,prevtxid;
-    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
+    //static uint256 zero,prevtxid;
+    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    //txid = ctx.GetHash();
+    //if ( txid == prevtxid )
+    //    return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
@@ -328,11 +328,11 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset2 create txid");
     else if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
-        prevtxid = txid;
-        fprintf(stderr,"AssetValidate passed\n");
+        //prevtxid = txid;
+        fprintf(stderr,"AssetValidate.(%c) passed\n",funcid);
         return(true);
     }
-    fprintf(stderr,"AssetValidate failed\n");
+    fprintf(stderr,"AssetValidate.(%c) failed\n",funcid);
     return(false);
 }
 

From 410849f034e1a0cd1ed3907517f1acdc22f46d3a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 22 Jul 2018 23:57:41 -1100
Subject: [PATCH 481/623] Test

---
 src/cc/CCassetsCore.cpp | 38 +++++++++++++++++++-------------------
 src/cc/assets.cpp       | 10 +++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index e129adaf9..26b4fc663 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -29,26 +29,26 @@
  //vout.3: CC output for assetoshis change (if any)
  //vout.4: normal output for change (if any)
  //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
-    ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice);
+    ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits);
  
  Yes, this is quite confusing...
  
- In ValudateAssetRemainder the naming convention is nValue is the coin/asset with the offer on the books and "price" is what it is being paid in. The high level check is to make sure we didnt lose any coins or assets, the harder to validate is the actual price paid as the "orderbook" is in terms of the combined nValue for the combined pricetotal.
+ In ValudateAssetRemainder the naming convention is nValue is the coin/asset with the offer on the books and "units" is what it is being paid in. The high level check is to make sure we didnt lose any coins or assets, the harder to validate is the actual price paid as the "orderbook" is in terms of the combined nValue for the combined totalunits.
  
  We assume that the effective unit cost in the orderbook is valid and that that amount was paid and also that any remainder will be close enough in effective unit cost to not matter. At the edge cases, this will probably be not true and maybe some orders wont be practically fillable when reduced to fractional state. However, the original pubkey that created the offer can always reclaim it.
 */
 
-bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice)
+bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
 {
     uint64_t unitprice,recvunitprice,newunitprice=0;
-    if ( orig_nValue == 0 || received_nValue == 0 || paidprice == 0 || totalprice == 0 )
+    if ( orig_nValue == 0 || received_nValue == 0 || paidunits == 0 || totalunits == 0 )
     {
-        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received_nValue == %llu || paidprice == %llu || totalprice == %llu\n",(long long)orig_nValue,(long long)received_nValue,(long long)paidprice,(long long)totalprice);
+        fprintf(stderr,"ValidateAssetRemainder: orig_nValue == %llu || received_nValue == %llu || paidunits == %llu || totalunits == %llu\n",(long long)orig_nValue,(long long)received_nValue,(long long)paidunits,(long long)totalunits);
         return(false);
     }
-    else if ( totalprice != (remaining_price + paidprice) )
+    else if ( totalunits != (remaining_price + paidunits) )
     {
-        fprintf(stderr,"ValidateAssetRemainder: totalprice %llu != %llu (remaining_price %llu + %llu paidprice)\n",(long long)totalprice,(long long)(remaining_price + paidprice),(long long)remaining_price,(long long)paidprice);
+        fprintf(stderr,"ValidateAssetRemainder: totalunits %llu != %llu (remaining_price %llu + %llu paidunits)\n",(long long)totalunits,(long long)(remaining_price + paidunits),(long long)remaining_price,(long long)paidunits);
         return(false);
     }
     else if ( orig_nValue != (remaining_nValue + received_nValue) )
@@ -58,8 +58,8 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
     }
     else
     {
-        unitprice = (orig_nValue * COIN) / totalprice;
-        recvunitprice = (received_nValue * COIN) / paidprice;
+        unitprice = (orig_nValue * COIN) / totalunits;
+        recvunitprice = (received_nValue * COIN) / paidunits;
         if ( recvunitprice < unitprice )
         {
             fprintf(stderr,"recvunitprice %llu < %llu unitprice\n",(long long)recvunitprice,(long long)unitprice);
@@ -67,7 +67,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
         }
         if ( remaining_price != 0 )
             newunitprice = (remaining_nValue * COIN) / remaining_price;
-        fprintf(stderr,"recvunitprice %.8f >= %.8f unitprice, new unitprice %llu\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN);
+        fprintf(stderr,"recvunitprice %.8f >= %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN);
     }
     return(true);
 }
@@ -76,28 +76,28 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
  SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
  */
 
-bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &paidprice,uint64_t totalprice)
+bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &paidunits,uint64_t totalunits)
 {
     uint64_t remaining_nValue,unitprice;
-    if ( totalprice == 0 )
+    if ( totalunits == 0 )
     {
-        received_nValue = remaining_price = paidprice = 0;
+        received_nValue = remaining_price = paidunits = 0;
         return(false);
     }
-    if ( paidprice >= totalprice )
+    if ( paidunits >= totalunits )
     {
-        paidprice = totalprice;
+        paidunits = totalunits;
         received_nValue = orig_nValue;
         remaining_price = 0;
         fprintf(stderr,"totally filled!\n");
         return(true);
     }
-    remaining_price = (totalprice - paidprice);
-    unitprice = (orig_nValue * COIN) / totalprice;
-    if ( unitprice > 0 && (received_nValue= (paidprice * unitprice)/COIN) > 0 && received_nValue < orig_nValue )
+    remaining_price = (totalunits - paidunits);
+    unitprice = (orig_nValue * COIN) / totalunits;
+    if ( unitprice > 0 && (received_nValue= (paidunits * unitprice)/COIN) > 0 && received_nValue < orig_nValue )
     {
         remaining_nValue = (orig_nValue - received_nValue);
-        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received_nValue,paidprice,totalprice));
+        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received_nValue,paidunits,totalunits));
     } else return(false);
 }
 
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 7ddeaeea1..507ebd46b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -129,7 +129,7 @@
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalprice,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
@@ -206,7 +206,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //vout.4: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
             preventCCvouts = 4;
-            if ( (nValue= AssetValidateBuyvin(eval,totalprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fillbuy");
@@ -218,7 +218,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                     return eval->Invalid("vout1 is CC for fillbuy");
                 else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice) == false )
+                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
                 else if ( remaining_price != 0 )
                 {
@@ -278,7 +278,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
-            if ( (assetoshis= AssetValidateSellvin(eval,totalprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (assetoshis= AssetValidateSellvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fill");
@@ -286,7 +286,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
-                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalprice) == false )
+                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");

From fdda6fcd710564573777173bcf7419db5d79db29 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:08:25 -1100
Subject: [PATCH 482/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 507ebd46b..d5bdc834e 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -310,7 +310,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    //static uint256 zero,prevtxid;
+    static uint256 zero;
     CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     //txid = ctx.GetHash();
     //if ( txid == prevtxid )

From db2a2a0e143483fcf37a4e21b77b3a18ebc4766e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:15:05 -1100
Subject: [PATCH 483/623] Test

---
 src/cc/CCassetsCore.cpp | 4 ++--
 src/cc/assets.cpp       | 2 ++
 src/cc/eval.cpp         | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 26b4fc663..ba0769d46 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -67,7 +67,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
         }
         if ( remaining_price != 0 )
             newunitprice = (remaining_nValue * COIN) / remaining_price;
-        fprintf(stderr,"recvunitprice %.8f >= %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN);
+        fprintf(stderr,"recvunitprice %.16f >= %.16f unitprice, new unitprice %.16f\n",(double)recvunitprice/(COIN*COIN),(double)unitprice/(COIN*COIN),(double)newunitprice/(COIN*COIN));
     }
     return(true);
 }
@@ -93,7 +93,7 @@ bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uin
         return(true);
     }
     remaining_price = (totalunits - paidunits);
-    unitprice = (orig_nValue * COIN) / totalunits;
+    unitprice = (orig_nValue * COIN) / totalunits; // unit price has 10 decimals precision, eg. unitprice of 100 million is 1 COIN per unit
     if ( unitprice > 0 && (received_nValue= (paidunits * unitprice)/COIN) > 0 && received_nValue < orig_nValue )
     {
         remaining_nValue = (orig_nValue - received_nValue);
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d5bdc834e..8c845ba68 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -329,6 +329,8 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     else if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
         //prevtxid = txid;
+        if ( funcid == 'B' )
+            return(false);
         fprintf(stderr,"AssetValidate.(%c) passed\n",funcid);
         return(true);
     }
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 91a507030..3f70b6466 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -35,6 +35,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
+    fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;

From 1d504829f16a1c69191eee0b66cdad69f79313b1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:24:32 -1100
Subject: [PATCH 484/623] Fix 'b'/'B' vout0 exemption

---
 src/cc/CCassetsCore.cpp | 13 +++++++++++--
 src/cc/assets.cpp       | 16 +++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index ba0769d46..d19fa6aad 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -238,7 +238,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
             if ( refassetid == tx.GetHash() && v == 0 )
                 return(nValue);
         }
-        else if ( funcid == 'b' || funcid == 'B' )
+        else if ( (funcid == 'b' || funcid == 'B') && v == 0 ) // critical! 'b'/'B' vout0 is NOT asset
             return(0);
         else if ( funcid != 'E' )
         {
@@ -319,22 +319,31 @@ bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTran
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     inputs = outputs = 0;
-    for (i=1; i<numvins; i++)
+    for (i=0; i<numvins; i++)
     {
         if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
+            {
+                fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis)
                 inputs += assetoshis;
+            }
         }
     }
     for (i=0; i<numvouts; i++)
     {
         if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
+        {
+            fprintf(stderr,"vout%d %llu, ",i,(long long)assetoshis)
             outputs += assetoshis;
+        }
     }
     if ( inputs != outputs )
+    {
+        fprintf(stderr,"inputs %.8f vs %.8f outputs\n",(double)inputs/COIN,(double)outputs/COIN);
         return(false);
+    }
     else return(true);
 }
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 8c845ba68..0df636fb5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -143,7 +143,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
         else if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid) == false )
-            eval->Invalid("asset inputs != outputs");
+            return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
     {
@@ -310,11 +310,11 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
 
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    static uint256 zero;
-    CTransaction createTx; uint256 assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
-    //txid = ctx.GetHash();
-    //if ( txid == prevtxid )
-    //    return(true);
+    static uint256 zero,prevtxid;
+    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    txid = ctx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
@@ -328,9 +328,7 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("cant find asset2 create txid");
     else if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
     {
-        //prevtxid = txid;
-        if ( funcid == 'B' )
-            return(false);
+        prevtxid = txid;
         fprintf(stderr,"AssetValidate.(%c) passed\n",funcid);
         return(true);
     }

From 3bdf31e94618217f9bbee1c4451477abb5dbec29 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:26:54 -1100
Subject: [PATCH 485/623] Doc

---
 src/cc/assets.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0df636fb5..db85562be 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -18,6 +18,8 @@
 /*
  Assets can be created or transferred.
  
+ native coins are also locked in the EVAL_ASSETS address, so we need a strict rule on when utxo in the special address are native coins and when they are assets. The specific rule that must not be violated is that vout0 for 'b'/'B' funcid are native coins. All other utxo locked in the special address are assets.
+ 
  To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 asset, or 100 million satoshis for one asset with 8 decimals, and the other decimals in between. The interpretation of the number of decimals is left to the higher level usages.
  
  Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee.

From 2bead5c15f43867ac3b29b5e43bf3ddae6fb94ee Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:27:33 -1100
Subject: [PATCH 486/623] Test

---
 src/cc/CCassetsCore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index d19fa6aad..68493d33e 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -327,7 +327,7 @@ bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTran
                 return eval->Invalid("always should find vin, but didnt");
             else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
             {
-                fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis)
+                fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis);
                 inputs += assetoshis;
             }
         }
@@ -336,7 +336,7 @@ bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTran
     {
         if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,tx,i,assetid)) != 0 )
         {
-            fprintf(stderr,"vout%d %llu, ",i,(long long)assetoshis)
+            fprintf(stderr,"vout%d %llu, ",i,(long long)assetoshis);
             outputs += assetoshis;
         }
     }

From e10def86a7c46fd568c219f8de4f5c07ab98ecfe Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:37:54 -1100
Subject: [PATCH 487/623] Enforce -pubkey and -addressindex for all CC rpc
 calls

---
 src/cc/eval.cpp          |  2 +-
 src/wallet/rpcwallet.cpp | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 3f70b6466..97bb89402 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -35,7 +35,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
-    fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
+    //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e2bd693df..65cc1e577 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4830,6 +4830,15 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
     return(siglen);
 }
 
+int32_t ensure_CCrequirements()
+{
+    if ( NOTARY_PUBKEY33[0] == 0 )
+        return(-1);
+    else if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) == 0 )
+        return(-1);
+    else return(0);
+}
+
 #include "../cc/CCfaucet.h"
 
 UniValue faucetfund(const UniValue& params, bool fHelp)
@@ -4837,6 +4846,8 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
     if ( fHelp || params.size() > 1 )
         throw runtime_error("faucetfund amount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     funds = atof(params[0].get_str().c_str()) * COIN;
     hex = FaucetFund(0,funds);
     if ( hex.size() > 0 )
@@ -4852,6 +4863,8 @@ UniValue faucetget(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
     if ( fHelp || params.size() > 0 )
         throw runtime_error("faucetget\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     hex = FaucetGet(0);
     if ( hex.size() > 0 )
     {
@@ -4869,6 +4882,8 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
     uint256 tokenid;
     if ( fHelp || params.size() > 1 )
         throw runtime_error("tokenorders [tokenid]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     if ( params.size() == 1 )
         tokenid = Parseuint256((char *)params[0].get_str().c_str());
     else memset(&tokenid,0,sizeof(tokenid));
@@ -4880,6 +4895,8 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); char destaddr[64]; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey;
     if ( fHelp || params.size() > 2 )
         throw runtime_error("tokenbalance tokenid [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     if ( params.size() == 2 )
         pubkey = ParseHex(params[1].get_str().c_str());
@@ -4898,6 +4915,8 @@ UniValue tokenaddress(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
     if ( fHelp || params.size() > 1 )
         throw runtime_error("tokenaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     result.push_back(Pair("result", "success"));
     if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("AssetsCCaddress",destaddr));
@@ -4917,6 +4936,8 @@ UniValue tokencreate(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;
     if ( fHelp || params.size() > 3 || params.size() < 2 )
         throw runtime_error("tokencreate name supply description\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     name = params[0].get_str();
     supply = atof(params[1].get_str().c_str()) * COIN;
     if ( params.size() == 3 )
@@ -4935,6 +4956,8 @@ UniValue tokentransfer(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string hex; uint64_t amount; uint256 tokenid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokentransfer tokenid destpubkey amount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     std::vector<unsigned char> pubkey(ParseHex(params[1].get_str().c_str()));
     amount = atol(params[2].get_str().c_str());
@@ -4952,6 +4975,8 @@ UniValue tokenbid(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t bidamount,numtokens; std::string hex; double price; uint256 tokenid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenbid numtokens tokenid price\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     numtokens = atoi(params[0].get_str().c_str());
     tokenid = Parseuint256((char *)params[1].get_str().c_str());
     price = atof(params[2].get_str().c_str());
@@ -4970,6 +4995,8 @@ UniValue tokencancelbid(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,bidtxid;
     if ( fHelp || params.size() != 2 )
         throw runtime_error("tokencancelbid tokenid bidtxid\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     bidtxid = Parseuint256((char *)params[1].get_str().c_str());
     hex = CancelBuyOffer(0,tokenid,bidtxid);
@@ -4986,6 +5013,8 @@ UniValue tokenfillbid(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,bidtxid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenfillbid tokenid bidtxid fillamount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     bidtxid = Parseuint256((char *)params[1].get_str().c_str());
     fillamount = atol(params[2].get_str().c_str());
@@ -5004,6 +5033,8 @@ UniValue tokenask(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t askamount,numtokens; std::string hex; double price; uint256 tokenid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenask numtokens tokenid price\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     numtokens = atoi(params[0].get_str().c_str());
     tokenid = Parseuint256((char *)params[1].get_str().c_str());
     price = atof(params[2].get_str().c_str());
@@ -5023,6 +5054,8 @@ UniValue tokenswapask(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t askamount,numtokens; std::string hex; double price; uint256 tokenid,otherid;
     if ( fHelp || params.size() != 4 )
         throw runtime_error("tokenswap numtokens tokenid otherid price\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     numtokens = atoi(params[0].get_str().c_str());
     tokenid = Parseuint256((char *)params[1].get_str().c_str());
     otherid = Parseuint256((char *)params[2].get_str().c_str());
@@ -5042,6 +5075,8 @@ UniValue tokencancelask(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,asktxid;
     if ( fHelp || params.size() != 2 )
         throw runtime_error("tokencancelask tokenid asktxid\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     asktxid = Parseuint256((char *)params[1].get_str().c_str());
     hex = CancelSell(0,tokenid,asktxid);
@@ -5059,6 +5094,8 @@ UniValue tokenfillask(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,asktxid;
     if ( fHelp || params.size() != 3 )
         throw runtime_error("tokenfillask tokenid asktxid fillamount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     asktxid = Parseuint256((char *)params[1].get_str().c_str());
     fillamount = atol(params[2].get_str().c_str());
@@ -5077,6 +5114,8 @@ UniValue tokenfillswap(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ); uint64_t fillamount; std::string hex; uint256 tokenid,otherid,asktxid;
     if ( fHelp || params.size() != 4 )
         throw runtime_error("tokenfillswap tokenid otherid asktxid fillamount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     tokenid = Parseuint256((char *)params[0].get_str().c_str());
     otherid = Parseuint256((char *)params[1].get_str().c_str());
     asktxid = Parseuint256((char *)params[2].get_str().c_str());

From efa4ed1fd12d7d027ef6c97f41fe5d5e4235024e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:40:13 -1100
Subject: [PATCH 488/623] Fix

---
 src/cc/assets.cpp        | 4 ++++
 src/wallet/rpcwallet.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index db85562be..afec00a32 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -288,6 +288,10 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
+                // if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
+                //bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
+
+                    
                 if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 65cc1e577..91916d6a7 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4832,6 +4832,7 @@ int32_t komodo_staked(CMutableTransaction &txNew,uint32_t nBits,uint32_t *blockt
 
 int32_t ensure_CCrequirements()
 {
+    extern uint8_t NOTARY_PUBKEY33[];
     if ( NOTARY_PUBKEY33[0] == 0 )
         return(-1);
     else if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) == 0 )

From fc6ac4322fb50b670a097ed98037ad5748ecab1e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 00:46:22 -1100
Subject: [PATCH 489/623] Fix fillsell

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index afec00a32..522519289 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -292,7 +292,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 //bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
 
                     
-                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
+                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");

From 75b63facf38b68fbf3bbc5f561a9ef8c802022b3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 01:43:03 -1100
Subject: [PATCH 490/623] Sell flag

---
 src/cc/CCassets.h       |  4 ++--
 src/cc/CCassetsCore.cpp | 12 ++++--------
 src/cc/CCassetstx.cpp   |  8 ++++----
 src/cc/assets.cpp       |  8 ++------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 9a3ed33dc..976a2c2da 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -37,8 +37,8 @@ CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
 bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const CTransaction &tx);
 uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid);
-bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice);
-bool SetAssetFillamounts(uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
+bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice);
+bool SetAssetFillamounts(int32_t sellflag,uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
 bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 68493d33e..59d64f0b3 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -38,7 +38,7 @@
  We assume that the effective unit cost in the orderbook is valid and that that amount was paid and also that any remainder will be close enough in effective unit cost to not matter. At the edge cases, this will probably be not true and maybe some orders wont be practically fillable when reduced to fractional state. However, the original pubkey that created the offer can always reclaim it.
 */
 
-bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
+bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
 {
     uint64_t unitprice,recvunitprice,newunitprice=0;
     if ( orig_nValue == 0 || received_nValue == 0 || paidunits == 0 || totalunits == 0 )
@@ -60,7 +60,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
     {
         unitprice = (orig_nValue * COIN) / totalunits;
         recvunitprice = (received_nValue * COIN) / paidunits;
-        if ( recvunitprice < unitprice )
+        if ( (sellflag == 0 && recvunitprice < unitprice) || (sellflag != 0 && recvunitprice > unitprice) )
         {
             fprintf(stderr,"recvunitprice %llu < %llu unitprice\n",(long long)recvunitprice,(long long)unitprice);
             return(false);
@@ -72,11 +72,7 @@ bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,u
     return(true);
 }
 
-/*
- SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
- */
-
-bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &paidunits,uint64_t totalunits)
+bool SetAssetFillamounts(int32_t sellflag,uint64_t &received_nValue,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &paidunits,uint64_t totalunits)
 {
     uint64_t remaining_nValue,unitprice;
     if ( totalunits == 0 )
@@ -97,7 +93,7 @@ bool SetAssetFillamounts(uint64_t &received_nValue,uint64_t &remaining_price,uin
     if ( unitprice > 0 && (received_nValue= (paidunits * unitprice)/COIN) > 0 && received_nValue < orig_nValue )
     {
         remaining_nValue = (orig_nValue - received_nValue);
-        return(ValidateAssetRemainder(remaining_price,remaining_nValue,orig_nValue,received_nValue,paidunits,totalunits));
+        return(ValidateAssetRemainder(sellflag,remaining_price,remaining_nValue,orig_nValue,received_nValue,paidunits,totalunits));
     } else return(false);
 }
 
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 6ad2519d2..7c290ff56 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -232,7 +232,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t
             {
                 if ( inputs > fillamount )
                     CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,bidamount,fillamount,origprice);
+                SetAssetFillamounts(0,paid_amount,remaining_required,bidamount,fillamount,origprice);
                 mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
@@ -248,7 +248,7 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t
 
 std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
 {
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t origprice,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t totalunits,askamount,paid_amount,remaining_required,inputs,CCchange=0;
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -257,7 +257,7 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
         if ( GetTransaction(asktxid,vintx,hashBlock,false) != 0 )
         {
             askamount = vintx.vout[askvout].nValue;
-            SetAssetOrigpubkey(origpubkey,origprice,vintx);
+            SetAssetOrigpubkey(origpubkey,totalunits,vintx);
             mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
             if ( assetid2 == zeroid )
                 inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
@@ -266,7 +266,7 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
             {
                 if ( assetid2 == zeroid && inputs > fillamount )
                     CCchange = (inputs - fillamount);
-                SetAssetFillamounts(paid_amount,remaining_required,askamount,fillamount,origprice);
+                SetAssetFillamounts(1,paid_amount,remaining_required,askamount,fillamount,totalunits);
                 mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
                 mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 522519289..22f737a62 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -220,7 +220,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                     return eval->Invalid("vout1 is CC for fillbuy");
                 else if ( ConstrainVout(tx.vout[2],1,CCaddr,0) == 0 )
                     return eval->Invalid("vout2 is normal for fillbuy");
-                else if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
+                else if ( ValidateAssetRemainder(0,remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fillbuy");
                 else if ( remaining_price != 0 )
                 {
@@ -288,11 +288,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
                 return eval->Invalid("mismatched origpubkeys for fill");
             else
             {
-                // if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
-                //bool ValidateAssetRemainder(uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidunits,uint64_t totalunits)
-
-                    
-                if ( ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
+                if ( ValidateAssetRemainder(1,remaining_price,tx.vout[0].nValue,assetoshis,tx.vout[1].nValue,tx.vout[2].nValue,totalunits) == false )
                     return eval->Invalid("mismatched remainder for fill");
                 else if ( ConstrainVout(tx.vout[1],1,0,0) == 0 )
                     return eval->Invalid("normal vout1 for fillask");

From 736beceb03933db7ddca6e1ff4e2ab2f605cbabf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:45:01 -1100
Subject: [PATCH 491/623] Faucet enforcement

---
 src/cc/CCassetsCore.cpp | 10 +++++-----
 src/cc/faucet.cpp       | 27 +++++++++++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 59d64f0b3..0a203b3f7 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -60,13 +60,13 @@ bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t r
     {
         unitprice = (orig_nValue * COIN) / totalunits;
         recvunitprice = (received_nValue * COIN) / paidunits;
-        if ( (sellflag == 0 && recvunitprice < unitprice) || (sellflag != 0 && recvunitprice > unitprice) )
-        {
-            fprintf(stderr,"recvunitprice %llu < %llu unitprice\n",(long long)recvunitprice,(long long)unitprice);
-            return(false);
-        }
         if ( remaining_price != 0 )
             newunitprice = (remaining_nValue * COIN) / remaining_price;
+        if ( recvunitprice < unitprice )
+        {
+            fprintf(stderr,"error recvunitprice %.16f < %.16f unitprice, new unitprice %.16f\n",(double)recvunitprice/(COIN*COIN),(double)unitprice/(COIN*COIN),(double)newunitprice/(COIN*COIN));
+            return(false);
+        }
         fprintf(stderr,"recvunitprice %.16f >= %.16f unitprice, new unitprice %.16f\n",(double)recvunitprice/(COIN*COIN),(double)unitprice/(COIN*COIN),(double)newunitprice/(COIN*COIN));
     }
     return(true);
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index fcf64f42d..13efe1e47 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -54,17 +54,21 @@ uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
     return(0);
 }
 
-bool FaucetExactAmounts(Eval* eval,const CTransaction &tx)
+bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
 {
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; CBlockIndex *pindex;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
-    for (i=1; i<numvins; i++)
+    for (i=0; i<numvins; i++)
     {
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
+            else if ( (pindex= mapBlockIndex[hashBlock]) != 0 )
+                return eval->Invalid("couldnt find pindex for hashBlock");
+            else if ( pindex->nHeight <= 0 || pindex->nHeight > chainActive.LastTip()->nHeight )
+                return eval->Invalid("vin is not eligible");
             else if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                 inputs += assetoshis;
         }
@@ -81,7 +85,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx)
 
 bool FaucetValidate(Eval* eval,const CTransaction &tx)
 {
-    int32_t numvins,numvouts,preventCCvins,preventCCvouts;
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
     fprintf(stderr,"FaucetValidate\n");
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
@@ -90,9 +94,20 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
         return eval->Invalid("illegal asset vin0");
     else if ( numvouts < 1 )
         return eval->Invalid("no vouts");
-    else if ( FaucetExactAmounts(eval,tx) == false )
+    else if ( FaucetExactAmounts(eval,tx,1) == false )
         eval->Invalid("asset inputs != outputs");
-    else return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+    else
+    {
+        preventCCvouts = 1;
+        if ( (assetoshis= IsFaucetvout(tx,0)) != 0 )
+        {
+            preventCCvouts++;
+            i = 1;
+        } else i = 0;
+        if ( tx.vin[i].nValue != COIN )
+            return(false);
+        return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+    }
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)

From 2c2ab06909465fd8449b48e122120b93e4287bbd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:46:30 -1100
Subject: [PATCH 492/623] Hex

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 91916d6a7..2ae5e79da 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4851,7 +4851,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     funds = atof(params[0].get_str().c_str()) * COIN;
     hex = FaucetFund(0,funds);
-    if ( hex.size() > 0 )
+    if ( hex != 0 && hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));

From f3b0a3885aa155745ccd8b3565d18aeef31998f9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:49:17 -1100
Subject: [PATCH 493/623] Test

---
 src/cc/faucet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 13efe1e47..68daa5aa3 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -99,12 +99,12 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
     else
     {
         preventCCvouts = 1;
-        if ( (assetoshis= IsFaucetvout(tx,0)) != 0 )
+        if ( IsFaucetvout(tx,0) != 0 )
         {
             preventCCvouts++;
             i = 1;
         } else i = 0;
-        if ( tx.vin[i].nValue != COIN )
+        if ( tx.vout[i].nValue != COIN )
             return(false);
         return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
     }

From 9e6c9706475ab56cad0feb6dd13fe0327b622b4c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:50:11 -1100
Subject: [PATCH 494/623] Test

---
 src/wallet/rpcwallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2ae5e79da..91916d6a7 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4851,7 +4851,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     funds = atof(params[0].get_str().c_str()) * COIN;
     hex = FaucetFund(0,funds);
-    if ( hex != 0 && hex.size() > 0 )
+    if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));
         result.push_back(Pair("hex", hex));

From 7053977c32afa5934e4292c6ddf27137ebec82ba Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:52:42 -1100
Subject: [PATCH 495/623] Test

---
 src/cc/faucet.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 68daa5aa3..2a4142224 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -164,7 +164,7 @@ std::string FaucetFund(uint64_t txfee,uint64_t funds)
     if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeFaucetVout(funds,faucetpk));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     }
     return(0);
 }
@@ -183,7 +183,7 @@ std::string FaucetGet(uint64_t txfee)
         if ( CCchange != 0 )
             mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
         mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     }
     return(0);
 }

From de9e3c8b5d72882607c75258e9270732a434f144 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 02:56:55 -1100
Subject: [PATCH 496/623] Test

---
 src/cc/CCtx.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index b5208ced5..0b082c306 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -104,13 +104,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 {
                     privkey = myprivkey;
                     cond = mycond;
-                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
+                    fprintf(stderr,"my CC addr.(%s)\n",myaddr);
                 }
                 else if ( strcmp(destaddr,unspendable) == 0 )
                 {
                     privkey = unspendablepriv;
                     cond = othercond;
-                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
+                    fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
                 }
                 else
                 {

From 60bcef450a5b770ef7caddc098ad9aae2cbbf114 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:04:13 -1100
Subject: [PATCH 497/623] Fix validate 'o'

---
 src/cc/CCassets.h       | 2 +-
 src/cc/CCassetsCore.cpp | 4 ++--
 src/cc/assets.cpp       | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 976a2c2da..f78d47031 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -41,7 +41,7 @@ bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t r
 bool SetAssetFillamounts(int32_t sellflag,uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
-bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
+bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
 
 // CCassetstx
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 0a203b3f7..2f8cdaa05 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -309,13 +309,13 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool AssetExactAmounts(uint64_t &inputs,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
+bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     inputs = outputs = 0;
-    for (i=0; i<numvins; i++)
+    for (i=starti; i<numvins; i++)
     {
         if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
         {
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 22f737a62..959d478d3 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -131,7 +131,7 @@
 bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,starti,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     numvins = tx.vin.size();
     outputs = inputs = 0;
@@ -142,9 +142,12 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         return eval->Invalid("no vouts");
     else if ( funcid != 'c' )
     {
+        if ( funcid == 't' )
+            starti = 0;
+        else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid) == false )
+        else if ( AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
             return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )

From 44327a21e1d35c838fae03bc3a8c5d8fab715ad6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:05:10 -1100
Subject: [PATCH 498/623] Fix

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 959d478d3..61da45dfc 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -280,7 +280,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
             //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
             if ( funcid == 'E' )
             {
-                if ( AssetExactAmounts(inputs,outputs,eval,tx,assetid2) == false )
+                if ( AssetExactAmounts(inputs,1,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
             if ( (assetoshis= AssetValidateSellvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )

From 31511e418513f1f8ed17f1c11c0edc4c8c7f475a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:10:08 -1100
Subject: [PATCH 499/623] Test

---
 src/cc/CCtx.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 0b082c306..0b3906d8f 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -32,7 +32,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
     {
         UpdateTransaction(mtx,vini,sigdata);
         return(true);
-    } else fprintf(stderr,"signing error for CreateAsset vini.%d %.8f\n",vini,(double)utxovalue/COIN);
+    } else fprintf(stderr,"signing error for SignTx vini.%d %.8f\n",vini,(double)utxovalue/COIN);
 #else
     return(false);
 #endif
@@ -49,7 +49,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     }
     if ( (n= mtx.vin.size()) > 64 )
     {
-        fprintf(stderr,"FinalizeAssetTx: %d is too many vins\n",n);
+        fprintf(stderr,"FinalizeCCTx: %d is too many vins\n",n);
         return(0);
     }
     Myprivkey(myprivkey);
@@ -119,10 +119,15 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 }
                 uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
                 if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
+                {
+                    int32_t z; for (z=0; z<32; z++)
+                        fprintf(stderr,"%02x",privkey[z]);
+                    fprintf(stderr," signed with privkey\n");
                     mtx.vin[i].scriptSig = CCSig(cond);
+                }
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }
-        } else fprintf(stderr,"FinalizeAssetTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
+        } else fprintf(stderr,"FinalizeCCTx couldnt find %s\n",mtx.vin[i].prevout.hash.ToString().c_str());
     }
     if ( mycond != 0 )
         cc_free(mycond);

From 470d9cb01290f6f77c95f4e81aa7579518e14648 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:18:15 -1100
Subject: [PATCH 500/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 61da45dfc..68efbd9db 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -147,7 +147,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+        else if ( funcid == 'o' || funcid == 'x' || AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
             return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
@@ -318,8 +318,8 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
+    //if ( txid == prevtxid )
+    //    return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");

From 26878f9d33c42483c084cc4eeda14d70982760a0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:20:00 -1100
Subject: [PATCH 501/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 68efbd9db..f0a70a083 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -147,7 +147,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( funcid == 'o' || funcid == 'x' || AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+        else if ( funcid != 'o' && funcid != 'x' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
             return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )

From c4ab86b5758a3843418c8724f0c149e71ecebe2c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:31:15 -1100
Subject: [PATCH 502/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index f0a70a083..045232ffc 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -318,8 +318,8 @@ bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     static uint256 zero,prevtxid;
     CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
     txid = ctx.GetHash();
-    //if ( txid == prevtxid )
-    //    return(true);
+    if ( txid == prevtxid )
+        return(true);
     fprintf(stderr,"ProcessAssets\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");

From 8ff48ecaeb4497508634533d2e2dbe23855aac03 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:36:52 -1100
Subject: [PATCH 503/623] Test

---
 src/cc/CCassetsCore.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 2f8cdaa05..594b1b07e 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -253,17 +253,17 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,CTransaction &vinTx)
+uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,int32_t vini,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = CCaddr[0] = 0;
     if ( tx.vin.size() < 2 )
         return eval->Invalid("not enough for CC vins");
-    else if ( tx.vin[1].prevout.n != 0 )
+    else if ( tx.vin[vini].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
-    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
-        return eval->Invalid("always should find vin, but didnt");
-    else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[1].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
+    else if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,vinTx,hashBlock) == 0 )
+        return eval->Invalid("always should find CCvin, but didnt");
+    else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
     {
         fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
         return eval->Invalid("invalid vin AssetsCCaddr");
@@ -272,7 +272,7 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
         return eval->Invalid("invalid dust for buyvin");
     else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
-    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[tx.vin[1].prevout.n].nValue/COIN,origaddr);
+    fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[tx.vin[vini].prevout.n].nValue/COIN,origaddr);
     return(vinTx.vout[0].nValue);
 }
 
@@ -280,7 +280,7 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
     CCaddr[0] = origaddr[0] = 0;
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("invalid normal vout0 for buyvin");
@@ -302,7 +302,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
 {
     CTransaction vinTx; uint64_t nValue,assetoshis;
     fprintf(stderr,"AssetValidateSellvin\n");
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,vinTx)) == 0 )
+    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
         return eval->Invalid("invalid missing CC vout0 for sellvin");
@@ -320,7 +320,10 @@ bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* e
         if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+            {
+                fprintf(stderr,"i.%d starti.%d numvins.%d\n",i,starti,numvins);
                 return eval->Invalid("always should find vin, but didnt");
+            }
             else if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,tx.vin[i].prevout.n,assetid)) != 0 )
             {
                 fprintf(stderr,"vin%d %llu, ",i,(long long)assetoshis);

From 1e7035abfc639bc3dbfe670b200388f360ea4500 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:44:51 -1100
Subject: [PATCH 504/623] test

---
 src/cc/CCassetsCore.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 594b1b07e..65f537089 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -262,7 +262,13 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
     else if ( tx.vin[vini].prevout.n != 0 )
         return eval->Invalid("vin1 needs to be buyvin.vout[0]");
     else if ( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash,vinTx,hashBlock) == 0 )
+    {
+        int32_t z;
+        for (z=31; z>=0; z--)
+            fprintf(stderr,"%02x",((uint8_t *)&tx.vin[vini].prevout.hash)[z]);
+        fprintf(stderr," vini.%d\n",vini);
         return eval->Invalid("always should find CCvin, but didnt");
+    }
     else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
     {
         fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);

From 33045d71322e659ca27b5790f5daf746fc595983 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:49:15 -1100
Subject: [PATCH 505/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 045232ffc..94be78f76 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -147,8 +147,8 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( funcid != 'o' && funcid != 'x' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
-            return eval->Invalid("asset inputs != outputs");
+        //else if ( funcid != 'o' && funcid != 'x' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+        //    return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
     {

From 2659387e3d90ae1f85015be318cc2fda3d8c90d4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:49:44 -1100
Subject: [PATCH 506/623] Test

---
 src/cc/assets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 94be78f76..748f96069 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -147,8 +147,8 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        //else if ( funcid != 'o' && funcid != 'x' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
-        //    return eval->Invalid("asset inputs != outputs");
+        else if ( funcid == 't' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+            return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
     {

From 27db9f401c4c490f2c85cf4ddd4754baa133f545 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:55:00 -1100
Subject: [PATCH 507/623] Test

---
 src/cc/eval.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 97bb89402..401d12e3e 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -90,8 +90,8 @@ bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &h
 {
     bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
     // there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks
-    //bool fAllowSlow = false; // Don't allow slow
-    //return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
+    bool fAllowSlow = false; // Don't allow slow
+    return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
     return myGetTransaction(hash, txOut,hashBlock);
 }
 

From fc40b06c944f0d057282787da6e914f2161344c0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 03:56:57 -1100
Subject: [PATCH 508/623] Test

---
 src/cc/eval.cpp | 4 ++--
 src/main.cpp    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 401d12e3e..97bb89402 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -90,8 +90,8 @@ bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &h
 {
     bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock);
     // there is a LOCK(cs_main) in the normal GetTransaction(), which leads to deadlocks
-    bool fAllowSlow = false; // Don't allow slow
-    return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
+    //bool fAllowSlow = false; // Don't allow slow
+    //return GetTransaction(hash, txOut, hashBlock, fAllowSlow);
     return myGetTransaction(hash, txOut,hashBlock);
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 913807ba9..dfc47c605 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1606,13 +1606,13 @@ bool GetAddressUnspent(uint160 addressHash, int type,
 bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
-    //fprintf(stderr,"check mempool\n");
+    fprintf(stderr,"check mempool\n");
     if (mempool.lookup(hash, txOut))
     {
-        //fprintf(stderr,"found in mempool\n");
+        fprintf(stderr,"found in mempool\n");
         return true;
     }
-    //fprintf(stderr,"check disk\n");
+    fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;

From e641e1ef52902d966a671a2c691b1e06b6b1f5f2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:00:06 -1100
Subject: [PATCH 509/623] Test

---
 src/main.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index dfc47c605..41d854b48 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4516,12 +4516,12 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
-    if ( chainActive.LastTip() != 0 )
-        komodo_currentheight_set(chainActive.LastTip()->nHeight);
-    checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
+    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
     {
         LOCK(cs_main);
+        if ( chainActive.LastTip() != 0 )
+            komodo_currentheight_set(chainActive.LastTip()->nHeight);
+        checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
         bool fRequested = MarkBlockAsReceived(hash);
         fRequested |= fForceProcessing;
         if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0
@@ -4556,7 +4556,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
 
     return true;
 }

From a5fc91571628f79c76cebd9ffd3ee277b4949500 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:22:30 -1100
Subject: [PATCH 510/623] Mempool current block

---
 src/main.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 41d854b48..3fc2c8f37 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4113,6 +4113,19 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
                              REJECT_INVALID, "bad-cb-multiple");
     
     // Check transactions
+    if ( ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
+    {
+        CValidationState stateDummy;
+        for (int i = 0; i < block.vtx.size(); i++)
+        {
+            CTransaction &tx = block.vtx[i];
+            if (tx.IsCoinBase() != 0 )
+                continue;
+            else if ( ASSETCHAINS_STAKED != 0 && (i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0 )
+                continue;
+            AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL);
+         }
+    }
     BOOST_FOREACH(const CTransaction& tx, block.vtx)
     {
         if ( komodo_validate_interest(tx,height == 0 ? komodo_block2height((CBlock *)&block) : height,block.nTime,0) < 0 )
@@ -4516,12 +4529,12 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    if ( chainActive.LastTip() != 0 )
+        komodo_currentheight_set(chainActive.LastTip()->nHeight);
+    checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
     {
         LOCK(cs_main);
-        if ( chainActive.LastTip() != 0 )
-            komodo_currentheight_set(chainActive.LastTip()->nHeight);
-        checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
         bool fRequested = MarkBlockAsReceived(hash);
         fRequested |= fForceProcessing;
         if ( checked != 0 && komodo_checkPOW(0,pblock,height) < 0 ) //from_miner && ASSETCHAINS_STAKED == 0
@@ -4556,7 +4569,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
 
     return true;
 }

From 0b34402ad870d65acfc458195c07fe0b50325a29 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:23:44 -1100
Subject: [PATCH 511/623] Test

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3fc2c8f37..29ea76cc0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4118,7 +4118,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
         CValidationState stateDummy;
         for (int i = 0; i < block.vtx.size(); i++)
         {
-            CTransaction &tx = block.vtx[i];
+            const CTransaction &tx = block.vtx[i];
             if (tx.IsCoinBase() != 0 )
                 continue;
             else if ( ASSETCHAINS_STAKED != 0 && (i == (block.vtx.size() - 1)) && komodo_isPoS((CBlock *)&block) != 0 )

From e1bbbdd96eb7f19bc151fa82a326c805cf3bb423 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:25:41 -1100
Subject: [PATCH 512/623] Test

---
 src/cc/assets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 748f96069..61da45dfc 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -147,7 +147,7 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( funcid == 't' && AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+        else if ( AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
             return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )

From bd66b37fd1b5035ab047659edff2d850d671de56 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:27:10 -1100
Subject: [PATCH 513/623] Test

---
 src/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 29ea76cc0..632b59e64 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1606,13 +1606,13 @@ bool GetAddressUnspent(uint160 addressHash, int type,
 bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
-    fprintf(stderr,"check mempool\n");
+    //fprintf(stderr,"check mempool\n");
     if (mempool.lookup(hash, txOut))
     {
-        fprintf(stderr,"found in mempool\n");
+        //fprintf(stderr,"found in mempool\n");
         return true;
     }
-    fprintf(stderr,"check disk\n");
+    //fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;

From 0f4afd4d460eb05557b2b8356971b8cbb9c3777c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:33:46 -1100
Subject: [PATCH 514/623] Sign with branched

---
 src/cc/CCtx.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 0b3906d8f..022db7c81 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -40,6 +40,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
 
 std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
+    auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
     CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
     n = mtx.vout.size();
     for (i=0; i<n; i++)
@@ -117,7 +118,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                     fprintf(stderr,"vini.%d has unknown CC address.(%s)\n",i,destaddr);
                     continue;
                 }
-                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, 0, 0, &txdata);
+                uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, utxovalues[i],consensusBranchId, &txdata);
                 if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
                 {
                     int32_t z; for (z=0; z<32; z++)

From 46d1074a67fa0b087085cef3981fb5bf7188be2b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:43:21 -1100
Subject: [PATCH 515/623] Test

---
 src/cc/CCtx.cpp            | 6 +++++-
 src/cc/eval.cpp            | 2 +-
 src/main.cpp               | 2 +-
 src/script/interpreter.cpp | 5 +++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 022db7c81..1942e3b7c 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -121,7 +121,11 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, utxovalues[i],consensusBranchId, &txdata);
                 if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
                 {
-                    int32_t z; for (z=0; z<32; z++)
+                    int32_t z;
+                    for (z=0; z<32; z++)
+                        fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
+                    fprintf(stderr," sighash, ");
+                    for (z=0; z<32; z++)
                         fprintf(stderr,"%02x",privkey[z]);
                     fprintf(stderr," signed with privkey\n");
                     mtx.vin[i].scriptSig = CCSig(cond);
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 97bb89402..3f70b6466 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -35,7 +35,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
-    //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
+    fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;
diff --git a/src/main.cpp b/src/main.cpp
index 632b59e64..cef87892e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1365,7 +1365,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
             // do we already have it?
             if (view.HaveCoins(hash))
             {
-                fprintf(stderr,"view.HaveCoins(hash) error\n");
+                //fprintf(stderr,"view.HaveCoins(hash) error\n");
                 return state.Invalid(false, REJECT_DUPLICATE, "already have coins");
             }
             
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 4a2eac2bc..9ac4981bc 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1313,6 +1313,10 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     } catch (logic_error ex) {
         return 0;
     }
+    int32_t z;
+    for (z=0; z<32; z++)
+        fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
+    fprintf(stderr," sighash\n");
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);
@@ -1320,6 +1324,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
 
     int out = cc_verify(cond, (const unsigned char*)&sighash, 32, 0,
                         condBin.data(), condBin.size(), eval, (void*)this);
+    fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);
     cc_free(cond);
     return out;
 }

From 226eb116a7261cffb0ab35aacfcafe61d77e46da Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 04:54:26 -1100
Subject: [PATCH 516/623] Test

---
 src/cc/CCtx.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 1942e3b7c..edabf1502 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -129,6 +129,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                         fprintf(stderr,"%02x",privkey[z]);
                     fprintf(stderr," signed with privkey\n");
                     mtx.vin[i].scriptSig = CCSig(cond);
+                    printf("RunCCEval.%d\n",RunCCEval(cond,mtx,i));
                 }
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }

From 911aef2b43c3137035e97fa049658dbeeeaa0c35 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:01:27 -1100
Subject: [PATCH 517/623] Test

---
 src/cc/CCtx.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index edabf1502..13e4546c3 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -105,13 +105,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 {
                     privkey = myprivkey;
                     cond = mycond;
-                    fprintf(stderr,"my CC addr.(%s)\n",myaddr);
+                    //fprintf(stderr,"my CC addr.(%s)\n",myaddr);
                 }
                 else if ( strcmp(destaddr,unspendable) == 0 )
                 {
                     privkey = unspendablepriv;
                     cond = othercond;
-                    fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
+                    //fprintf(stderr,"unspendable CC addr.(%s)\n",unspendable);
                 }
                 else
                 {
@@ -129,7 +129,6 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                         fprintf(stderr,"%02x",privkey[z]);
                     fprintf(stderr," signed with privkey\n");
                     mtx.vin[i].scriptSig = CCSig(cond);
-                    printf("RunCCEval.%d\n",RunCCEval(cond,mtx,i));
                 }
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);
             }

From bfcf5bad784efd924ca433572fc75624a6aba4d4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:22:36 -1100
Subject: [PATCH 518/623] Test

---
 src/script/interpreter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 9ac4981bc..0588b6a77 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1316,7 +1316,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     int32_t z;
     for (z=0; z<32; z++)
         fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
-    fprintf(stderr," sighash\n");
+    fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);

From 89c506ddb42337fb83bbbe0de57ccb7cbccf4a7b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:27:13 -1100
Subject: [PATCH 519/623] Test

---
 src/script/interpreter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 0588b6a77..1e1127a2c 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1313,7 +1313,11 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     } catch (logic_error ex) {
         return 0;
     }
-    int32_t z;
+    int32_t z; uint8_t *ptr;
+    ptr = scriptCode.data();
+    for (z=0; z<scriptCode.size(); z++)
+        fprintf(stderr,"%02x",ptr[z]);
+    fprintf(stderr," <- CScript\n");
     for (z=0; z<32; z++)
         fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
     fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);

From d05a61ec13f27ed9506966ff8bc1e51abee6860b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:28:04 -1100
Subject: [PATCH 520/623] Test

---
 src/script/interpreter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 1e1127a2c..e6ed58fd5 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1314,7 +1314,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
         return 0;
     }
     int32_t z; uint8_t *ptr;
-    ptr = scriptCode.data();
+    ptr = (uint8_t *)scriptCode.data();
     for (z=0; z<scriptCode.size(); z++)
         fprintf(stderr,"%02x",ptr[z]);
     fprintf(stderr," <- CScript\n");

From a81698329dc51335f1cbba80a24e29d2e66c2e29 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:34:57 -1100
Subject: [PATCH 521/623] Test

---
 src/cc/faucet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 2a4142224..56a6a6cfd 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -178,11 +178,11 @@ std::string FaucetGet(uint64_t txfee)
     mypk = pubkey2pk(Mypubkey());
     if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
     {
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
         if ( inputs > nValue )
             CCchange = (inputs - nValue - txfee);
         if ( CCchange != 0 )
             mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
-        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
         return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     }
     return(0);

From 1f5f9d297b51c0dd2e5d4a2525e135db4240a535 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:41:43 -1100
Subject: [PATCH 522/623] Test

---
 src/cc/eval.cpp            |  2 +-
 src/cc/faucet.cpp          | 17 ++++++++++-------
 src/script/interpreter.cpp | 18 +++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 3f70b6466..97bb89402 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -35,7 +35,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
-    fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
+    //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 56a6a6cfd..9ce6e48bf 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -176,14 +176,17 @@ std::string FaucetGet(uint64_t txfee)
         txfee = 10000;
     faucetpk = GetUnspendable(EVAL_FAUCET,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-        if ( inputs > nValue )
-            CCchange = (inputs - nValue - txfee);
-        if ( CCchange != 0 )
-            mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
-        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue,60)) > 0 )
+        {
+            if ( inputs > nValue )
+                CCchange = (inputs - nValue);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
+            mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        }
     }
     return(0);
 }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index e6ed58fd5..4295d4ddc 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1313,14 +1313,14 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     } catch (logic_error ex) {
         return 0;
     }
-    int32_t z; uint8_t *ptr;
-    ptr = (uint8_t *)scriptCode.data();
-    for (z=0; z<scriptCode.size(); z++)
-        fprintf(stderr,"%02x",ptr[z]);
-    fprintf(stderr," <- CScript\n");
-    for (z=0; z<32; z++)
-        fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
-    fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
+    //int32_t z; uint8_t *ptr;
+    //ptr = (uint8_t *)scriptCode.data();
+    //for (z=0; z<scriptCode.size(); z++)
+    //    fprintf(stderr,"%02x",ptr[z]);
+    //fprintf(stderr," <- CScript\n");
+    //for (z=0; z<32; z++)
+    //    fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
+    //fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);
@@ -1328,7 +1328,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
 
     int out = cc_verify(cond, (const unsigned char*)&sighash, 32, 0,
                         condBin.data(), condBin.size(), eval, (void*)this);
-    fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);
+    //fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);
     cc_free(cond);
     return out;
 }

From 30a0ecf7e101a31893fd4a7c8010f4462bd1b6aa Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:44:44 -1100
Subject: [PATCH 523/623] Test

---
 src/cc/faucet.cpp | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 9ce6e48bf..ef761306e 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -112,19 +112,13 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    static uint256 zero,prevtxid; uint256 txid;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
     if ( FaucetValidate(eval,ctx) != 0 )
-    {
-        prevtxid = txid;
         return(true);
-    } else return(false);
+    else return(false);
 }
 
 uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
@@ -176,17 +170,14 @@ std::string FaucetGet(uint64_t txfee)
         txfee = 10000;
     faucetpk = GetUnspendable(EVAL_FAUCET,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
+    if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
     {
-        if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue,60)) > 0 )
-        {
-            if ( inputs > nValue )
-                CCchange = (inputs - nValue);
-            if ( CCchange != 0 )
-                mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
-            mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
-        }
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+       return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     }
     return(0);
 }

From d04ff3aff2554cb93a7729a73a9ee6e76813323c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:46:51 -1100
Subject: [PATCH 524/623] Test

---
 src/cc/faucet.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index ef761306e..c9c3e5cf7 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -112,6 +112,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
+    return(true);
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )

From b2617a2dee841a8198c330cbc5156010a6b037a5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:49:23 -1100
Subject: [PATCH 525/623] Test

---
 src/script/interpreter.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 4295d4ddc..2d117e8f0 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1313,14 +1313,14 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     } catch (logic_error ex) {
         return 0;
     }
-    //int32_t z; uint8_t *ptr;
+    int32_t z; //uint8_t *ptr;
     //ptr = (uint8_t *)scriptCode.data();
     //for (z=0; z<scriptCode.size(); z++)
     //    fprintf(stderr,"%02x",ptr[z]);
     //fprintf(stderr," <- CScript\n");
-    //for (z=0; z<32; z++)
-    //    fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
-    //fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
+    for (z=0; z<32; z++)
+        fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
+    fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);

From 1960a3d2c6c9ea924e27ebf60be3860cad3e692c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:52:40 -1100
Subject: [PATCH 526/623] Test

---
 src/cc/faucet.cpp          | 7 +++----
 src/script/interpreter.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index c9c3e5cf7..53a8d56eb 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -27,11 +27,11 @@
 
 CC *MakeFaucetCond(CPubKey pk)
 {
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_FAUCET;
     pks.push_back(CCNewSecp256k1(pk));
-    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode));
     CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {assetCC, Sig});
+    return CCNewThreshold(2, {faucetCC, Sig});
 }
 
 CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
@@ -112,7 +112,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
-    return(true);
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 2d117e8f0..4295d4ddc 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -1313,14 +1313,14 @@ int TransactionSignatureChecker::CheckCryptoCondition(
     } catch (logic_error ex) {
         return 0;
     }
-    int32_t z; //uint8_t *ptr;
+    //int32_t z; uint8_t *ptr;
     //ptr = (uint8_t *)scriptCode.data();
     //for (z=0; z<scriptCode.size(); z++)
     //    fprintf(stderr,"%02x",ptr[z]);
     //fprintf(stderr," <- CScript\n");
-    for (z=0; z<32; z++)
-        fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
-    fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
+    //for (z=0; z<32; z++)
+    //    fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
+    //fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);

From 3f030864cdf6b45a948cd7a960f093b6ddf3175b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:59:11 -1100
Subject: [PATCH 527/623] Test

---
 src/cc/CCtx.cpp   | 2 +-
 src/cc/faucet.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 13e4546c3..845178e59 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -59,7 +59,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     mycond = MakeCC(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
     othercond = MakeCC(evalcode,unspendablepk);
-    fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
     {
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 53a8d56eb..5f8cbb107 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -86,7 +86,6 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
 bool FaucetValidate(Eval* eval,const CTransaction &tx)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
-    fprintf(stderr,"FaucetValidate\n");
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     preventCCvins = preventCCvouts = -1;
@@ -127,7 +126,6 @@ uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int3
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     GetCCaddress(EVAL_FAUCET,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
-    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;
@@ -178,7 +176,7 @@ std::string FaucetGet(uint64_t txfee)
             mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
         mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
-    }
+    } else fprintf(stderr,"cant find faucet inputs\n");
     return(0);
 }
 

From 6ff08712db3c6d1b4d9a4d72f6b1eaab3cfb7f4c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:02:25 -1100
Subject: [PATCH 528/623] Test

---
 src/rpcserver.cpp        |  1 +
 src/rpcserver.h          |  1 +
 src/wallet/rpcwallet.cpp | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index ab676ddae..c8a8c4291 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -347,6 +347,7 @@ static const CRPCCommand vRPCCommands[] =
     /* faucet */
     { "faucet",       "faucetfund",      &faucetfund,     true },
     { "faucet",       "faucetget",       &faucetget,      true },
+    { "faucet",       "faucetaddress",   &faucetaddress,      true },
 
 /* tokens */
     { "tokens",       "tokenorders",      &tokenorders,       true },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 021e2d274..5c330497a 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -223,6 +223,7 @@ extern UniValue tokenswapask(const UniValue& params, bool fHelp);
 extern UniValue tokenfillswap(const UniValue& params, bool fHelp);
 extern UniValue faucetfund(const UniValue& params, bool fHelp);
 extern UniValue faucetget(const UniValue& params, bool fHelp);
+UniValue faucetaddress(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 91916d6a7..490992d7a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4842,6 +4842,27 @@ int32_t ensure_CCrequirements()
 
 #include "../cc/CCfaucet.h"
 
+UniValue faucetaddress(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("faucetaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    result.push_back(Pair("result", "success"));
+    if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+        result.push_back(Pair("AssetsCCaddress",destaddr));
+    if ( params.size() == 1 )
+    {
+        pubkey = ParseHex(params[0].get_str().c_str());
+        if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+            result.push_back(Pair("CCaddress",destaddr));
+    }
+    if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+        result.push_back(Pair("myCCaddress",destaddr));
+    return(result);
+}
+
 UniValue faucetfund(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;

From b8674c91de361dab5e6c5397d826dd817fd3e3fc Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:09:05 -1100
Subject: [PATCH 529/623] Test

---
 src/cc/CCfaucet.h        | 2 ++
 src/wallet/rpcwallet.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 71875c394..7dfd7263e 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -19,6 +19,8 @@
 
 #include "CCinclude.h"
 
+#define EVAL_FAUCET 0xe4
+
 extern const char *FaucetCCaddr;
 extern char FaucetCChexstr[67];
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 490992d7a..ed00ef373 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4850,15 +4850,15 @@ UniValue faucetaddress(const UniValue& params, bool fHelp)
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
-        result.push_back(Pair("AssetsCCaddress",destaddr));
+    if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(pubkey)) != 0 )
+        result.push_back(Pair("FaucetCCaddress",destaddr));
     if ( params.size() == 1 )
     {
         pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+        if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(pubkey)) != 0 )
             result.push_back(Pair("CCaddress",destaddr));
     }
-    if ( GetCCaddress(FAUCET_ASSETS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+    if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(Mypubkey())) != 0 )
         result.push_back(Pair("myCCaddress",destaddr));
     return(result);
 }

From f63a47382546a868ccf9f7d1df9ea98b08f3baff Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:10:26 -1100
Subject: [PATCH 530/623] Test

---
 src/cc/CCcustom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 2427c98c0..d114ee850 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -36,7 +36,7 @@ CC *MakeFaucetCond(CPubKey pk);
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
-const char *FaucetCCaddr = "RHyZVzEvyKK4GtpFyGP3LzXBPJwQJfCfwG" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
+const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 

From 216f23be608759c88dfe735af16e5b4ed4f3fc88 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:13:40 -1100
Subject: [PATCH 531/623] Test

---
 src/cc/eval.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 97bb89402..b28d820b2 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -74,8 +74,12 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
         case EVAL_ASSETS:
             return ProcessAssets(this, vparams, txTo, nIn);
             break;
+            
+        case EVAL_FAUCET:
+            return ProcessFaucet(this, vparams, txTo, nIn);
+            break;
     }
-    return Invalid("invalid-code");
+    return Invalid("invalid-code, dont forget to add EVAL_NEWCC to Eval::Dispatch");
 }
 
 

From d96d11af7978a53630d9eb2994f6e65d83456c12 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:18:01 -1100
Subject: [PATCH 532/623] Test

---
 src/cc/faucet.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 5f8cbb107..400f7907a 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -78,7 +78,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
         if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
             outputs += assetoshis;
     }
-    if ( inputs != outputs )
+    if ( inputs != outputs+COIN )
         return(false);
     else return(true);
 }
@@ -89,23 +89,29 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     preventCCvins = preventCCvouts = -1;
-    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
-        return eval->Invalid("illegal asset vin0");
-    else if ( numvouts < 1 )
+    if ( numvouts < 1 )
         return eval->Invalid("no vouts");
-    else if ( FaucetExactAmounts(eval,tx,1) == false )
-        eval->Invalid("asset inputs != outputs");
     else
     {
-        preventCCvouts = 1;
-        if ( IsFaucetvout(tx,0) != 0 )
+        for (i=0; i<numvins; i++)
         {
-            preventCCvouts++;
-            i = 1;
-        } else i = 0;
-        if ( tx.vout[i].nValue != COIN )
-            return(false);
-        return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+                return eval->Invalid("illegal normal vini");
+        }
+        if ( FaucetExactAmounts(eval,tx,1) == false )
+            eval->Invalid("asset inputs != outputs");
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsFaucetvout(tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return(false);
+            return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+        }
     }
 }
 

From 78c489e9b2b803df84b96171449277cb4e102ca6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:22:10 -1100
Subject: [PATCH 533/623] Test

---
 src/cc/faucet.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 400f7907a..0f7973b41 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -79,7 +79,10 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
             outputs += assetoshis;
     }
     if ( inputs != outputs+COIN )
-        return(false);
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN");
+    }
     else return(true);
 }
 
@@ -99,7 +102,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
                 return eval->Invalid("illegal normal vini");
         }
         if ( FaucetExactAmounts(eval,tx,1) == false )
-            eval->Invalid("asset inputs != outputs");
+            return false;
         else
         {
             preventCCvouts = 1;
@@ -109,10 +112,11 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
                 i = 1;
             } else i = 0;
             if ( tx.vout[i].nValue != COIN )
-                return(false);
+                return eval->Invalid("invalid faucet output");
             return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
         }
     }
+    return(true);
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)

From ce57bee8ad978276278f02061c803a1decbcd931 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:25:23 -1100
Subject: [PATCH 534/623] Test

---
 src/cc/faucet.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 0f7973b41..ace45e0c3 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -66,7 +66,12 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else if ( (pindex= mapBlockIndex[hashBlock]) != 0 )
+            {
+                for (i=31; i>=0; i--)
+                    fprintf(stderr,"%02x",((uint8_t *)&hashBlock)[i]);
+                fprintf(stderr,"couldnt find block\n");
                 return eval->Invalid("couldnt find pindex for hashBlock");
+            }
             else if ( pindex->nHeight <= 0 || pindex->nHeight > chainActive.LastTip()->nHeight )
                 return eval->Invalid("vin is not eligible");
             else if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )

From d0dcdd6bb7681966f62ea757a7e9c5edd163f0b5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:33:23 -1100
Subject: [PATCH 535/623] Test

---
 src/cc/faucet.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index ace45e0c3..26571fb57 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -56,7 +56,8 @@ uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
 
 bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
 {
-    CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis; CBlockIndex *pindex;
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     for (i=0; i<numvins; i++)
@@ -65,17 +66,16 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
-            else if ( (pindex= mapBlockIndex[hashBlock]) != 0 )
+            else
             {
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant faucet from mempool");
                 for (i=31; i>=0; i--)
                     fprintf(stderr,"%02x",((uint8_t *)&hashBlock)[i]);
-                fprintf(stderr,"couldnt find block\n");
-                return eval->Invalid("couldnt find pindex for hashBlock");
+                fprintf(stderr," hashBlock\n");
+                if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
             }
-            else if ( pindex->nHeight <= 0 || pindex->nHeight > chainActive.LastTip()->nHeight )
-                return eval->Invalid("vin is not eligible");
-            else if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
-                inputs += assetoshis;
         }
     }
     for (i=0; i<numvouts; i++)

From 806a3a8dd56dc45510a1a8b97f82544e0a05ea81 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:39:02 -1100
Subject: [PATCH 536/623] Test

---
 src/cc/faucet.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 26571fb57..34cab2248 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -70,9 +70,6 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
             {
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant faucet from mempool");
-                for (i=31; i>=0; i--)
-                    fprintf(stderr,"%02x",((uint8_t *)&hashBlock)[i]);
-                fprintf(stderr," hashBlock\n");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
@@ -80,6 +77,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
     }
     for (i=0; i<numvouts; i++)
     {
+        fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
         if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
             outputs += assetoshis;
     }

From fee68138ebaef18bdbbf9ea40e840cd09607ffcf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:41:28 -1100
Subject: [PATCH 537/623] Test

---
 src/cc/faucet.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 34cab2248..d2c7bdca7 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -54,7 +54,7 @@ uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
     return(0);
 }
 
-bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
+bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
 {
     static uint256 zerohash;
     CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
@@ -81,10 +81,10 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage)
         if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
             outputs += assetoshis;
     }
-    if ( inputs != outputs+COIN )
+    if ( inputs != outputs+COIN+txfee )
     {
         fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
-        return eval->Invalid("mismatched inputs != outputs + COIN");
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
     }
     else return(true);
 }
@@ -104,7 +104,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
             if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
                 return eval->Invalid("illegal normal vini");
         }
-        if ( FaucetExactAmounts(eval,tx,1) == false )
+        if ( FaucetExactAmounts(eval,tx,1,10000) == false )
             return false;
         else
         {

From d0638addaf658f19583daaf6981f9a20876095e7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:43:39 -1100
Subject: [PATCH 538/623] working Faucet

---
 src/cc/faucet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index d2c7bdca7..67a69e583 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -77,7 +77,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
     }
     for (i=0; i<numvouts; i++)
     {
-        fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
         if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
             outputs += assetoshis;
     }

From 8c96cb0efc272a24dc84361aacd62e44e2da1110 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:47:25 -1100
Subject: [PATCH 539/623] -print

---
 src/cc/CCtx.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 845178e59..4d1dd0d00 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -121,13 +121,13 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
                 uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL, utxovalues[i],consensusBranchId, &txdata);
                 if ( cc_signTreeSecp256k1Msg32(cond,privkey,sighash.begin()) != 0 )
                 {
-                    int32_t z;
-                    for (z=0; z<32; z++)
-                        fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
-                    fprintf(stderr," sighash, ");
-                    for (z=0; z<32; z++)
-                        fprintf(stderr,"%02x",privkey[z]);
-                    fprintf(stderr," signed with privkey\n");
+                    //int32_t z;
+                    //for (z=0; z<32; z++)
+                    //    fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]);
+                    //fprintf(stderr," sighash, ");
+                    //for (z=0; z<32; z++)
+                    //   fprintf(stderr,"%02x",privkey[z]);
+                    //fprintf(stderr," signed with privkey\n");
                     mtx.vin[i].scriptSig = CCSig(cond);
                 }
                 else fprintf(stderr,"vini.%d has CC signing error address.(%s)\n",i,destaddr);

From d6fe579a234b3a9aef2996ce5268654a67d58605 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:54:00 -1100
Subject: [PATCH 540/623] Remove excess vout in create asset

---
 src/cc/CCassetstx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 7c290ff56..4f31f9160 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -105,7 +105,7 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        //mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);

From a1fdb736b7500d0efaa438ddf080fb8781eb3e43 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:54:34 -1100
Subject: [PATCH 541/623] Restore tag

---
 src/cc/CCassetstx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 4f31f9160..7c290ff56 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -105,7 +105,7 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
-        //mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);

From 728965dfee0822da8a60b28c1b1f9809db7c3a51 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 06:55:53 -1100
Subject: [PATCH 542/623] Revert

---
 src/cc/assets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 61da45dfc..11d375698 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -48,7 +48,8 @@
  create
  vin.0: normal input
  vout.0: issuance assetoshis to CC
- vout.1: normal output for change (if any)
+ vout.1: tag sent to AssetsCCaddress
+ vout.2: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['c'] [origpubkey] "<assetname>" "<description>"
  
  transfer

From 194ad5b8598ca991de39b82ef0a431bd1e0a13e1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 18:37:46 -1100
Subject: [PATCH 543/623] Initial rewards CC

---
 src/cc/CCcustom.cpp |  39 +++++++-
 src/cc/eval.cpp     |   4 +
 src/cc/eval.h       |   4 +-
 src/cc/faucet.cpp   |   7 +-
 src/cc/rewards.cpp  | 224 ++++++++++++++++++++++++++++++++++++++++++++
 src/main.cpp        |   4 +-
 src/miner.cpp       |   6 +-
 7 files changed, 280 insertions(+), 8 deletions(-)
 create mode 100644 src/cc/rewards.cpp

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index d114ee850..e220435fd 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -28,6 +28,7 @@
 
 CC *MakeAssetCond(CPubKey pk);
 CC *MakeFaucetCond(CPubKey pk);
+CC *MakeRewardsCond(CPubKey pk);
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
@@ -36,10 +37,14 @@ CC *MakeFaucetCond(CPubKey pk);
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
+
 const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
+const char *RewardsCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
+char RewardsCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
+uint8_t RewardsCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
 bool IsAssetsInput(CScript const& scriptSig)
 {
@@ -75,6 +80,23 @@ bool IsFaucetInput(CScript const& scriptSig)
     return out;
 }
 
+bool IsRewardsInput(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_REWARDS;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
     static CPubKey nullpk;
@@ -92,12 +114,18 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
             memcpy(unspendablepriv,FaucetCCpriv,32);
         return(pubkey2pk(ParseHex(FaucetCChexstr)));
     }
+    else if ( evalcode == EVAL_REWARDS )
+    {
+        if ( unspendablepriv != 0 )
+            memcpy(unspendablepriv,RewardsCCpriv,32);
+        return(pubkey2pk(ParseHex(RewardsCChexstr)));
+    }
     else return(nullpk);
 }
 
 CC *MakeCC(uint8_t evalcode,CPubKey pk)
 {
-    if ( evalcode == EVAL_ASSETS || evalcode == EVAL_FAUCET )
+    if ( evalcode == EVAL_ASSETS || evalcode == EVAL_FAUCET || evalcode == EVAL_REWARDS )
     {
         std::vector<CC*> pks;
         pks.push_back(CCNewSecp256k1(pk));
@@ -131,6 +159,15 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
         }
         return(destaddr[0] != 0);
     }
+    else if ( evalcode == EVAL_REWARDS )
+    {
+        if ( (payoutCond= MakeRewardsCond(pk)) != 0 )
+        {
+            Getscriptaddress(destaddr,CCPubKey(payoutCond));
+            cc_free(payoutCond);
+        }
+        return(destaddr[0] != 0);
+    }
     fprintf(stderr,"GetCCaddress %02x is invalid evalcode\n",evalcode);
     return false;
 }
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index b28d820b2..43b215748 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -78,6 +78,10 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
         case EVAL_FAUCET:
             return ProcessFaucet(this, vparams, txTo, nIn);
             break;
+            
+        case EVAL_REWARDS:
+            return ProcessRewards(this, vparams, txTo, nIn);
+            break;
     }
     return Invalid("invalid-code, dont forget to add EVAL_NEWCC to Eval::Dispatch");
 }
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 445aa0cda..d8ca4312d 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -40,7 +40,8 @@
         EVAL(EVAL_IMPORTPAYOUT, 0xe1)  \
         EVAL(EVAL_IMPORTCOIN,   0xe2)  \
         EVAL(EVAL_ASSETS,   0xe3)  \
-        EVAL(EVAL_FAUCET, 0xe4)
+        EVAL(EVAL_FAUCET, 0xe4) \
+        EVAL(EVAL_REWARDS, 0xe5)
 
 
 typedef uint8_t EvalCode;
@@ -269,6 +270,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
 bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
+bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 67a69e583..990b79c23 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -119,18 +119,21 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
             return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
         }
     }
+    fprintf(stderr,"faucet validated\n");
     return(true);
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
+    fprintf(stderr,"start faucet validate\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
     if ( FaucetValidate(eval,ctx) != 0 )
         return(true);
-    else return(false);
+    fprintf(stderr,"faucet validate failed\n");
+    return(false);
 }
 
 uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
@@ -166,7 +169,7 @@ std::string FaucetFund(uint64_t txfee,uint64_t funds)
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     faucetpk = GetUnspendable(EVAL_FAUCET,0);
-    if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
+    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeFaucetVout(funds,faucetpk));
         return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
new file mode 100644
index 000000000..42e2ee035
--- /dev/null
+++ b/src/cc/rewards.cpp
@@ -0,0 +1,224 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCinclude.h"
+
+/*
+ */
+
+#define EVAL_REWARDS 0xe5
+
+extern const char *RewardsCCaddr;
+extern char RewardsCChexstr[67];
+
+uint64_t RewardsCalc(uint64_t claim,uint256 txid)
+{
+    uint64_t reward = 0;
+    return(reward);
+}
+
+CC *MakeRewardsCond(CPubKey pk)
+{
+    std::vector<CC*> pks; uint8_t evalcode = EVAL_REWARDS;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *rewardsCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {rewardsCC, Sig});
+}
+
+CTxOut MakeRewardsVout(CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeRewardsCond(pk);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
+uint64_t IsRewardsvout(const CTransaction& tx,int32_t v)
+{
+    char destaddr[64];
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,RewardsCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
+    return(0);
+}
+
+bool RewardsExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+{
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=0; i<numvins; i++)
+    {
+        if ( IsRewardsInput(tx.vin[i].scriptSig) != 0 )
+        {
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("always should find vin, but didnt");
+            else
+            {
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant rewards from mempool");
+                if ( (assetoshis= IsRewardsvout(vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
+            }
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        if ( (assetoshis= IsRewardsvout(tx,i)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs+COIN+txfee )
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
+    }
+    else return(true);
+}
+
+bool RewardsValidate(Eval* eval,const CTransaction &tx)
+{
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    preventCCvins = preventCCvouts = -1;
+    if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else
+    {
+        for (i=0; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+                return eval->Invalid("illegal normal vini");
+        }
+        if ( RewardsExactAmounts(eval,tx,1,10000) == false )
+            return false;
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsRewardsvout(tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return eval->Invalid("invalid rewards output");
+            return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+        }
+    }
+    return(true);
+}
+
+bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+{
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    else if ( ctx.vout.size() == 0 )
+        return eval->Invalid("no-vouts");
+    if ( RewardsValidate(eval,ctx) != 0 )
+        return(true);
+    else return(false);
+}
+
+uint64_t AddRewardsInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_REWARDS,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsRewardsvout(vintx,(int32_t)it->first.index)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+// 0.834% every 60 days, min 100, capped at 0.834%
+
+std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
+{
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    rewardspk = GetUnspendable(EVAL_REWARDS,0);
+    if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeRewardsVout(funds,rewardspk));
+        mtx.vout.push_back(CTxOut(APR,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(minseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(maxseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(mindeposit,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+std::string RewardsLock(uint64_t txfee,uint64_t amount)
+{
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret;
+    if ( txfee == 0 )
+        txfee = 10000;
+    rewardspk = GetUnspendable(EVAL_REWARDS,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,amount+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeRewardsVout(amount,rewardspk));
+        // specify destination pubkey, funding txid
+        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret create script));
+    } else fprintf(stderr,"cant find rewards inputs\n");
+    return(0);
+}
+
+std::string RewardsUnlock(uint64_t txfee)
+{
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,claim,inputs,CCchange=0;
+    if ( txfee == 0 )
+        txfee = 10000;
+    rewardspk = GetUnspendable(EVAL_REWARDS,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (claim= AddRewardsInputs(mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
+    {
+        if ( (inputs= AddRewardsInputs(mtx,mypk,reward+txfee,30)) > 0 )
+        {
+            if ( inputs > (reward+txfee) )
+                CCchange = (inputs - reward - txfee);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeRewardsVout(CCchange,rewardspk));
+            mtx.vout.push_back(CTxOut(claim+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
+        }
+    } else fprintf(stderr,"cant find rewards inputs\n");
+    return(0);
+}
+
diff --git a/src/main.cpp b/src/main.cpp
index cef87892e..54e77366f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4529,7 +4529,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
     if ( chainActive.LastTip() != 0 )
         komodo_currentheight_set(chainActive.LastTip()->nHeight);
     checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
@@ -4569,7 +4569,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
 
     return true;
 }
diff --git a/src/miner.cpp b/src/miner.cpp
index 0c458a985..fee14a959 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -644,7 +644,7 @@ static bool ProcessBlockFound(CBlock* pblock)
     
     // Found a solution
     {
-        LOCK(cs_main);
+        //LOCK(cs_main);
         if (pblock->hashPrevBlock != chainActive.LastTip()->GetBlockHash())
         {
             uint256 hash; int32_t i;
@@ -673,11 +673,13 @@ static bool ProcessBlockFound(CBlock* pblock)
     // Track how many getdata requests this block gets
     //if ( 0 )
     {
+        fprintf(stderr,"lock cs_wallet\n");
         LOCK(wallet.cs_wallet);
         wallet.mapRequestCount[pblock->GetHash()] = 0;
     }
 #endif
-    
+    fprintf(stderr,"process new block\n");
+
     // Process this block the same as if we had received it from another node
     CValidationState state;
     if (!ProcessNewBlock(1,chainActive.LastTip()->nHeight+1,state, NULL, pblock, true, NULL))

From e3ec4c50aa73fb8dd21f78074057c51f97b6d83c Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 18:38:40 -1100
Subject: [PATCH 544/623] Fix

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3baa2fde4..a0c474146 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -263,6 +263,7 @@ libbitcoin_server_a_SOURCES = \
   cc/CCutils.cpp \
   cc/assets.cpp \
   cc/faucet.cpp \
+  cc/rewards.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
   checkpoints.cpp \

From e37d99ce95458ae78f1747616da735f1af8369b0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 18:52:27 -1100
Subject: [PATCH 545/623] Add rewards rpc

---
 src/rpcserver.cpp        |  6 +++
 src/rpcserver.h          |  6 ++-
 src/wallet/rpcwallet.cpp | 96 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index c8a8c4291..2e454c7aa 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -344,6 +344,12 @@ static const CRPCCommand vRPCCommands[] =
 #ifdef ENABLE_WALLET
     { "rawtransactions",    "fundrawtransaction",     &fundrawtransaction,     false },
 #endif
+    /* rewards */
+    { "rewards",       "rewardsfund",       &rewardsfund,     true },
+    { "rewards",       "rewardslock",       &rewardslock,     true },
+    { "rewards",       "rewardsunlock",     &rewardsunlock,   true },
+    { "rewards",       "rewardsaddress",    &rewardsaddress   true },
+    
     /* faucet */
     { "faucet",       "faucetfund",      &faucetfund,     true },
     { "faucet",       "faucetget",       &faucetget,      true },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 5c330497a..70407673a 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -223,7 +223,11 @@ extern UniValue tokenswapask(const UniValue& params, bool fHelp);
 extern UniValue tokenfillswap(const UniValue& params, bool fHelp);
 extern UniValue faucetfund(const UniValue& params, bool fHelp);
 extern UniValue faucetget(const UniValue& params, bool fHelp);
-UniValue faucetaddress(const UniValue& params, bool fHelp);
+extern UniValue faucetaddress(const UniValue& params, bool fHelp);
+extern UniValue rewardsaddress(const UniValue& params, bool fHelp)
+extern UniValue rewardsfund(const UniValue& params, bool fHelp)
+extern UniValue rewardslock(const UniValue& params, bool fHelp)
+extern UniValue rewardsunlock(const UniValue& params, bool fHelp)
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ed00ef373..7fcd50cd6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4840,6 +4840,100 @@ int32_t ensure_CCrequirements()
     else return(0);
 }
 
+#define EVAL_REWARDS 0xe5
+std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
+std::string RewardsLock(uint64_t txfee,uint64_t amount);
+std::string RewardsUnlock(uint64_t txfee);
+
+UniValue rewardsaddress(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("rewardsaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    result.push_back(Pair("result", "success"));
+    if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(pubkey)) != 0 )
+        result.push_back(Pair("RewardsCCaddress",destaddr));
+    if ( params.size() == 1 )
+    {
+        pubkey = ParseHex(params[0].get_str().c_str());
+        if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(pubkey)) != 0 )
+            result.push_back(Pair("CCaddress",destaddr));
+    }
+    if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+        result.push_back(Pair("myCCaddress",destaddr));
+    return(result);
+}
+
+UniValue rewardsfund(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); uint64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex;
+    if ( fHelp || params.size() > 5 || params.size() < 1 )
+        throw runtime_error("rewardsfund amount APR mindays maxdays mindeposit\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    // default to OOT params
+    APR = 5 * COIN;
+    minseconds = maxseconds = 60 * 3600 * 24;
+    mindeposit = 100 * COIN;
+    funds = atof(params[0].get_str().c_str()) * COIN;
+    if ( params.size() > 1 )
+    {
+        APR = atof(params[1].get_str().c_str()) * COIN;
+        if ( params.size() > 2 )
+        {
+            minseconds = atol(params[2].get_str().c_str()) * 3600 * 24;
+            if ( params.size() > 3 )
+            {
+                maxseconds = atol(params[3].get_str().c_str()) * 3600 * 24;
+                if ( params.size() > 4 )
+                    mindeposit = atof(params[4].get_str().c_str()) * COIN;
+            }
+        }
+    }
+    hex = RewardsFund(0,funds,APR,minseconds,maxseconds,mindeposit);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create rewards funding transaction"));
+    return(result);
+}
+
+UniValue rewardslock(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); uint64_t amount; std::string hex;
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("rewardslock amount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    amount = atof(params[0].get_str().c_str()) * COIN;
+    hex = RewardsLock(0,amount);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create rewards lock transaction"));
+    return(result);
+}
+
+UniValue rewardsunlock(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::string hex;
+    if ( fHelp || params.size() > 0 )
+        throw runtime_error("rewardsunlock [txid]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    hex = RewardsUnlock(0);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create rewards unlock transaction"));
+    return(result);
+}
+
 #include "../cc/CCfaucet.h"
 
 UniValue faucetaddress(const UniValue& params, bool fHelp)
@@ -4882,7 +4976,7 @@ UniValue faucetfund(const UniValue& params, bool fHelp)
 
 UniValue faucetget(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
+    UniValue result(UniValue::VOBJ); std::string hex;
     if ( fHelp || params.size() > 0 )
         throw runtime_error("faucetget\n");
     if ( ensure_CCrequirements() < 0 )

From 14cfb1b72c6df7f5e14ad757d81d98939163760a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 18:54:03 -1100
Subject: [PATCH 546/623] Test

---
 src/rpcserver.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/rpcserver.h b/src/rpcserver.h
index 70407673a..eb9f69247 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -224,10 +224,10 @@ extern UniValue tokenfillswap(const UniValue& params, bool fHelp);
 extern UniValue faucetfund(const UniValue& params, bool fHelp);
 extern UniValue faucetget(const UniValue& params, bool fHelp);
 extern UniValue faucetaddress(const UniValue& params, bool fHelp);
-extern UniValue rewardsaddress(const UniValue& params, bool fHelp)
-extern UniValue rewardsfund(const UniValue& params, bool fHelp)
-extern UniValue rewardslock(const UniValue& params, bool fHelp)
-extern UniValue rewardsunlock(const UniValue& params, bool fHelp)
+extern UniValue rewardsaddress(const UniValue& params, bool fHelp);
+extern UniValue rewardsfund(const UniValue& params, bool fHelp);
+extern UniValue rewardslock(const UniValue& params, bool fHelp);
+extern UniValue rewardsunlock(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From 5b79a0e163c55595393861fd1cc0f547d59c0727 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 18:57:30 -1100
Subject: [PATCH 547/623] Rewards skeleton code

---
 src/cc/rewards.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 42e2ee035..be47a8962 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -22,6 +22,7 @@
 
 extern const char *RewardsCCaddr;
 extern char RewardsCChexstr[67];
+bool IsRewardsInput(CScript const& scriptSig);
 
 uint64_t RewardsCalc(uint64_t claim,uint256 txid)
 {
@@ -195,7 +196,8 @@ std::string RewardsLock(uint64_t txfee,uint64_t amount)
     {
         mtx.vout.push_back(MakeRewardsVout(amount,rewardspk));
         // specify destination pubkey, funding txid
-        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret create script));
+        //opret = ;//
+        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
     } else fprintf(stderr,"cant find rewards inputs\n");
     return(0);
 }

From 8a8ff823e5f682d9bd3d2205703c163e5eb9280d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:01:06 -1100
Subject: [PATCH 548/623] Fix

---
 src/rpcserver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 2e454c7aa..4d766d5ae 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -348,11 +348,11 @@ static const CRPCCommand vRPCCommands[] =
     { "rewards",       "rewardsfund",       &rewardsfund,     true },
     { "rewards",       "rewardslock",       &rewardslock,     true },
     { "rewards",       "rewardsunlock",     &rewardsunlock,   true },
-    { "rewards",       "rewardsaddress",    &rewardsaddress   true },
+    { "rewards",       "rewardsaddress",    &rewardsaddress,  true },
     
     /* faucet */
-    { "faucet",       "faucetfund",      &faucetfund,     true },
-    { "faucet",       "faucetget",       &faucetget,      true },
+    { "faucet",       "faucetfund",      &faucetfund,         true },
+    { "faucet",       "faucetget",       &faucetget,          true },
     { "faucet",       "faucetaddress",   &faucetaddress,      true },
 
 /* tokens */

From 7c766994354945a8171a9f47c372410efba127ca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:04:11 -1100
Subject: [PATCH 549/623] Fix

---
 src/cc/rewards.cpp       | 2 --
 src/wallet/rpcwallet.cpp | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index be47a8962..a6855cc8f 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -18,8 +18,6 @@
 /*
  */
 
-#define EVAL_REWARDS 0xe5
-
 extern const char *RewardsCCaddr;
 extern char RewardsCChexstr[67];
 bool IsRewardsInput(CScript const& scriptSig);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7fcd50cd6..c79226954 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4840,6 +4840,8 @@ int32_t ensure_CCrequirements()
     else return(0);
 }
 
+#include "../cc/CCfaucet.h"
+#include "../cc/CCassets.h"
 #define EVAL_REWARDS 0xe5
 std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
 std::string RewardsLock(uint64_t txfee,uint64_t amount);
@@ -4934,8 +4936,6 @@ UniValue rewardsunlock(const UniValue& params, bool fHelp)
     return(result);
 }
 
-#include "../cc/CCfaucet.h"
-
 UniValue faucetaddress(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
@@ -4990,9 +4990,6 @@ UniValue faucetget(const UniValue& params, bool fHelp)
     return(result);
 }
 
-#include "../cc/CCassets.h"
-
-
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {
     uint256 tokenid;

From 32b0978b57d03ce73a7f2818deff7df73ea27863 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:16:28 -1100
Subject: [PATCH 550/623] Test

---
 src/cc/faucet.cpp | 5 +++--
 src/miner.cpp     | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 990b79c23..1a04dfed9 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -119,8 +119,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
             return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
         }
     }
-    fprintf(stderr,"faucet validated\n");
-    return(true);
 }
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
@@ -131,7 +129,10 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
     if ( FaucetValidate(eval,ctx) != 0 )
+    {
+        fprintf(stderr,"faucet validated\n");
         return(true);
+    }
     fprintf(stderr,"faucet validate failed\n");
     return(false);
 }
diff --git a/src/miner.cpp b/src/miner.cpp
index fee14a959..468cddaf3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -726,7 +726,8 @@ void static BitcoinMiner()
         if ( komodo_baseid(ASSETCHAINS_SYMBOL) < 0 )
             break;
     }
-    komodo_chosennotary(&notaryid,chainActive.LastTip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.LastTip()->GetBlockTime());
+    if ( ASSETCHAINS_SYMBOL[0] == 0 )
+        komodo_chosennotary(&notaryid,chainActive.LastTip()->nHeight,NOTARY_PUBKEY33,(uint32_t)chainActive.LastTip()->GetBlockTime());
     if ( notaryid != My_notaryid )
         My_notaryid = notaryid;
     std::string solver;
@@ -786,7 +787,7 @@ void static BitcoinMiner()
             }
             if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_STAKED == 0 )
             {
-                //fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
+                fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
                 //sleep(3);
             }
 #ifdef ENABLE_WALLET
@@ -802,6 +803,7 @@ void static BitcoinMiner()
                 sleep(1);
                 continue;
             }
+            fprintf(stderr,"get template\n");
             unique_ptr<CBlockTemplate> pblocktemplate(ptr);
             if (!pblocktemplate.get())
             {
@@ -829,6 +831,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
+            frintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search
@@ -909,6 +912,7 @@ void static BitcoinMiner()
                  sleep(10);
                  break;
                  }*/
+                fprintf(stderr,"top of while\n");
                 // Hash state
                 KOMODO_CHOSEN_ONE = 0;
                 crypto_generichash_blake2b_state state;

From 34c88aa0a55864aa41e07b46e9115b8f5619b8f1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:34:23 -1100
Subject: [PATCH 551/623] P

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 468cddaf3..67fcf4015 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -831,7 +831,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
-            frintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
+            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search

From f7c507356e4313d67c3cdf739d606d90d1124d36 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:40:15 -1100
Subject: [PATCH 552/623] Fix

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 67fcf4015..98a07ddfa 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -831,7 +831,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
-            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
+            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size());
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search

From e40ea822e9300bec125f37001f90c3773a0e0c05 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:41:41 -1100
Subject: [PATCH 553/623] .

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 98a07ddfa..087ff2f45 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -831,7 +831,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
-            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size());
+            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block\n",solver.c_str(),pblock->vtx.size());
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search

From 0548be2094641b6322d510da980e6d97d3ef54db Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:43:40 -1100
Subject: [PATCH 554/623] Fix

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 087ff2f45..6dce2f9fa 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -831,7 +831,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
-            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block\n",solver.c_str(),pblock->vtx.size());
+            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block\n",solver.c_str(),(int32_t)pblock->vtx.size());
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search

From 723ae0eab9634c31549f2c541f2083767815b7e1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:47:53 -1100
Subject: [PATCH 555/623] Test

---
 src/cc/faucet.cpp  | 9 +++++++++
 src/cc/rewards.cpp | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 1a04dfed9..8dc70dab5 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -99,15 +99,18 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
         return eval->Invalid("no vouts");
     else
     {
+        fprintf(stderr,"check vins\n");
         for (i=0; i<numvins; i++)
         {
             if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
                 return eval->Invalid("illegal normal vini");
         }
+        fprintf(stderr,"check amounts\n");
         if ( FaucetExactAmounts(eval,tx,1,10000) == false )
             return false;
         else
         {
+            fprintf(stderr,"check rest\n");
             preventCCvouts = 1;
             if ( IsFaucetvout(tx,0) != 0 )
             {
@@ -116,6 +119,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
             } else i = 0;
             if ( tx.vout[i].nValue != COIN )
                 return eval->Invalid("invalid faucet output");
+            fprintf(stderr,"check CC\n");
             return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
         }
     }
@@ -123,6 +127,10 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
+    static uint256 prevtxid; uint256 txid;
+    txid = ctx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
     fprintf(stderr,"start faucet validate\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
@@ -130,6 +138,7 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
         return eval->Invalid("no-vouts");
     if ( FaucetValidate(eval,ctx) != 0 )
     {
+        prevtxid = txid;
         fprintf(stderr,"faucet validated\n");
         return(true);
     }
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index a6855cc8f..0af15f2ce 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -127,12 +127,19 @@ bool RewardsValidate(Eval* eval,const CTransaction &tx)
 
 bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
+    static uint256 prevtxid; uint256 txid;
+    txid = ctx.GetHash();
+    if ( txid == prevtxid )
+        return(true);
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
     if ( RewardsValidate(eval,ctx) != 0 )
+    {
+        prevtxid = txid;
         return(true);
+    }
     else return(false);
 }
 

From 63a24829c4ea3e149eb28d99492533d785ec7abb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:55:54 -1100
Subject: [PATCH 556/623] Tweak locks

---
 src/cc/faucet.cpp |  3 +++
 src/main.cpp      | 13 ++++++++-----
 src/miner.cpp     |  4 +++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 8dc70dab5..14f361ef7 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -62,12 +62,15 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
     numvouts = tx.vout.size();
     for (i=0; i<numvins; i++)
     {
+        fprintf(stderr,"vini.%d\n");
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
+            fprintf(stderr,"vini.%d get Tx\n");
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else
             {
+                fprintf(stderr,"vini.%d check hash and vout\n");
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
diff --git a/src/main.cpp b/src/main.cpp
index 54e77366f..e4d060fe0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1606,13 +1606,16 @@ bool GetAddressUnspent(uint160 addressHash, int type,
 bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock)
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
-    //fprintf(stderr,"check mempool\n");
-    if (mempool.lookup(hash, txOut))
     {
-        //fprintf(stderr,"found in mempool\n");
-        return true;
+        READLOCK(mempool.cs)
+        fprintf(stderr,"check mempool\n");
+        if (mempool.lookup(hash, txOut))
+        {
+            fprintf(stderr,"found in mempool\n");
+            return true;
+        }
     }
-    //fprintf(stderr,"check disk\n");
+    fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;
diff --git a/src/miner.cpp b/src/miner.cpp
index 6dce2f9fa..f73e93d6c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -165,7 +165,8 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
     CAmount nFees = 0;
     
     {
-        LOCK2(cs_main, mempool.cs);
+        //LOCK2(cs_main, mempool.cs);
+        LOCK(cs_main);
         CBlockIndex* pindexPrev = chainActive.LastTip();
         const int nHeight = pindexPrev->nHeight + 1;
         uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, chainparams.GetConsensus());
@@ -185,6 +186,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
         for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
              mi != mempool.mapTx.end(); ++mi)
         {
+            READLOCK(mempool.cs);
             const CTransaction& tx = mi->GetTx();
             
             int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)

From e0b973cb5cc3fe1745145ad2159479a2de5a73dd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 19:58:17 -1100
Subject: [PATCH 557/623] Test

---
 src/cc/faucet.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 14f361ef7..0dba256ae 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -62,15 +62,15 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
     numvouts = tx.vout.size();
     for (i=0; i<numvins; i++)
     {
-        fprintf(stderr,"vini.%d\n");
+        fprintf(stderr,"vini.%d\n",i);
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
-            fprintf(stderr,"vini.%d get Tx\n");
+            fprintf(stderr,"vini.%d get Tx\n",i);
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
             else
             {
-                fprintf(stderr,"vini.%d check hash and vout\n");
+                fprintf(stderr,"vini.%d check hash and vout\n",i);
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )

From facc3e62c170cdf41386d0198f2ef8b5dd70f4c6 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:00:10 -1100
Subject: [PATCH 558/623] Test

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index e4d060fe0..c5a548072 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1607,7 +1607,7 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
     {
-        READLOCK(mempool.cs)
+        READLOCK(mempool.cs);
         fprintf(stderr,"check mempool\n");
         if (mempool.lookup(hash, txOut))
         {
@@ -4116,7 +4116,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
                              REJECT_INVALID, "bad-cb-multiple");
     
     // Check transactions
-    if ( ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
+    if ( 0 && ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
     {
         CValidationState stateDummy;
         for (int i = 0; i < block.vtx.size(); i++)

From 46f639d98e7112c4439cad25537e716e59410dcd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:03:02 -1100
Subject: [PATCH 559/623] Test

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index c5a548072..76f20cbb0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1607,7 +1607,7 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
     {
-        READLOCK(mempool.cs);
+        LOCK(mempool.cs);
         fprintf(stderr,"check mempool\n");
         if (mempool.lookup(hash, txOut))
         {

From c6c7527ff99ad5a988102745eae372e23b0793b7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:04:35 -1100
Subject: [PATCH 560/623] Fix

---
 src/miner.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index f73e93d6c..6dce2f9fa 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -165,8 +165,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
     CAmount nFees = 0;
     
     {
-        //LOCK2(cs_main, mempool.cs);
-        LOCK(cs_main);
+        LOCK2(cs_main, mempool.cs);
         CBlockIndex* pindexPrev = chainActive.LastTip();
         const int nHeight = pindexPrev->nHeight + 1;
         uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, chainparams.GetConsensus());
@@ -186,7 +185,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
         for (CTxMemPool::indexed_transaction_set::iterator mi = mempool.mapTx.begin();
              mi != mempool.mapTx.end(); ++mi)
         {
-            READLOCK(mempool.cs);
             const CTransaction& tx = mi->GetTx();
             
             int64_t nLockTimeCutoff = (STANDARD_LOCKTIME_VERIFY_FLAGS & LOCKTIME_MEDIAN_TIME_PAST)

From 6613483bc7599c8af4e12f66a40aaa0a0297248d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:10:41 -1100
Subject: [PATCH 561/623] Test

---
 src/cc/faucet.cpp | 12 +++++++-----
 src/main.cpp      |  7 +++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 0dba256ae..a2549b7e2 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -14,6 +14,7 @@
  ******************************************************************************/
 
 #include "CCfaucet.h"
+#include "../txmempool.h"
 
 /*
  This file implements a simple CC faucet as an example of how to make a new CC contract. It wont have any fancy sybil protection but will serve the purpose of a fully automated faucet.
@@ -65,14 +66,15 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
         fprintf(stderr,"vini.%d\n",i);
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
-            fprintf(stderr,"vini.%d get Tx\n",i);
-            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                return eval->Invalid("always should find vin, but didnt");
+            fprintf(stderr,"vini.%d check mempool\n",i);
+            if ( mempool.lookup(hash, vinTx) != 0 )
+            //if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("cant faucet mempool tx");
             else
             {
                 fprintf(stderr,"vini.%d check hash and vout\n",i);
-                if ( hashBlock == zerohash )
-                    return eval->Invalid("cant faucet from mempool");
+                //if ( hashBlock == zerohash )
+                //    return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
diff --git a/src/main.cpp b/src/main.cpp
index 76f20cbb0..96f384b27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1607,7 +1607,6 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
     {
-        LOCK(mempool.cs);
         fprintf(stderr,"check mempool\n");
         if (mempool.lookup(hash, txOut))
         {
@@ -1634,9 +1633,11 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
             hashBlock = header.GetHash();
             if (txOut.GetHash() != hash)
                 return error("%s: txid mismatch", __func__);
+            fprintf(stderr,"found on disk\n");
             return true;
         }
     }
+    fprintf(stderr,"not found\n");
     return false;
 }
 
@@ -4116,9 +4117,10 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
                              REJECT_INVALID, "bad-cb-multiple");
     
     // Check transactions
-    if ( 0 && ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
+    if ( ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
     {
         CValidationState stateDummy;
+        fprintf(stderr,"put block's tx into mempool\n");
         for (int i = 0; i < block.vtx.size(); i++)
         {
             const CTransaction &tx = block.vtx[i];
@@ -4128,6 +4130,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
                 continue;
             AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL);
          }
+        fprintf(stderr,"done putting block's tx into mempool\n");
     }
     BOOST_FOREACH(const CTransaction& tx, block.vtx)
     {

From 2e41bc42805481c778b5f5a6a6a7c8792dc638f7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:11:49 -1100
Subject: [PATCH 562/623] Fix

---
 src/cc/faucet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index a2549b7e2..9d20de4d9 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -67,7 +67,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
             fprintf(stderr,"vini.%d check mempool\n",i);
-            if ( mempool.lookup(hash, vinTx) != 0 )
+            if ( mempool.lookup(tx.vin[i].prevout.hash,vinTx) != 0 )
             //if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("cant faucet mempool tx");
             else

From cff4030820551afee0ff46fc378651351c351f50 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:15:17 -1100
Subject: [PATCH 563/623] Test

---
 src/cc/faucet.cpp | 7 +++----
 src/main.cpp      | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 9d20de4d9..f8cc140e9 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -67,14 +67,13 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
             fprintf(stderr,"vini.%d check mempool\n",i);
-            if ( mempool.lookup(tx.vin[i].prevout.hash,vinTx) != 0 )
-            //if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("cant faucet mempool tx");
             else
             {
                 fprintf(stderr,"vini.%d check hash and vout\n",i);
-                //if ( hashBlock == zerohash )
-                //    return eval->Invalid("cant faucet from mempool");
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
diff --git a/src/main.cpp b/src/main.cpp
index 96f384b27..871da14d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1614,6 +1614,7 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
             return true;
         }
     }
+    return(false);
     fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {

From 500f38a978eb1a7da9e07ab86ab886bf65768694 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:19:41 -1100
Subject: [PATCH 564/623] Test

---
 src/main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 871da14d7..76175cc73 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1614,16 +1614,18 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
             return true;
         }
     }
-    return(false);
     fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;
+        fprintf(stderr,"ReadTxIndex\n");
         if (pblocktree->ReadTxIndex(hash, postx)) {
+            fprintf(stderr,"OpenBlockFile\n");
             CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
             if (file.IsNull())
                 return error("%s: OpenBlockFile failed", __func__);
             CBlockHeader header;
+            fprintf(stderr,"seek and read\n");
             try {
                 file >> header;
                 fseek(file.Get(), postx.nTxOffset, SEEK_CUR);

From 179295530319f063352003274543ebf10dc87f44 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:22:05 -1100
Subject: [PATCH 565/623] Test

---
 src/miner.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 6dce2f9fa..a5265ba49 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -126,7 +126,8 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33);
 CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
 {
     uint64_t deposits; int32_t isrealtime,kmdheight; uint32_t blocktime; const CChainParams& chainparams = Params();
-    // Create new block
+    fprintf(stderr,"create new block\n");
+  // Create new block
     if ( gpucount < 0 )
         gpucount = KOMODO_MAXGPUCOUNT;
     std::unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
@@ -495,16 +496,20 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
         else if ( ASSETCHAINS_STAKED == 0 )
         {
             CValidationState state;
+            fprintf(stderr,"check validity\n");
             if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false))
             {
                 //static uint32_t counter;
                 //if ( counter++ < 100 && ASSETCHAINS_STAKED == 0 )
                 //    fprintf(stderr,"warning: miner testblockvalidity failed\n");
+                fprintf(stderr,"invalid\n");
                 return(0);
             }
+            fprintf(stderr,"valid\n");
         }
     }
-    
+    fprintf(stderr,"done new block\n");
+
     return pblocktemplate.release();
 }
  

From 581409cbd16a337df6a8326c0b1d3caaaaa2b8b0 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:24:33 -1100
Subject: [PATCH 566/623] Test

---
 src/miner.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index a5265ba49..79155259a 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -493,20 +493,20 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
                 return(0);
             }
         }
-        else if ( ASSETCHAINS_STAKED == 0 )
+    }
+    if ( ASSETCHAINS_STAKED == 0 )
+    {
+        CValidationState state;
+        fprintf(stderr,"check validity\n");
+        if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false))
         {
-            CValidationState state;
-            fprintf(stderr,"check validity\n");
-            if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false))
-            {
-                //static uint32_t counter;
-                //if ( counter++ < 100 && ASSETCHAINS_STAKED == 0 )
-                //    fprintf(stderr,"warning: miner testblockvalidity failed\n");
-                fprintf(stderr,"invalid\n");
-                return(0);
-            }
-            fprintf(stderr,"valid\n");
+            //static uint32_t counter;
+            //if ( counter++ < 100 && ASSETCHAINS_STAKED == 0 )
+            //    fprintf(stderr,"warning: miner testblockvalidity failed\n");
+            fprintf(stderr,"invalid\n");
+            return(0);
         }
+        fprintf(stderr,"valid\n");
     }
     fprintf(stderr,"done new block\n");
 

From 562852ab08daf7431bd477a6d54bcf92a5904b8f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:26:23 -1100
Subject: [PATCH 567/623] Test

---
 src/miner.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 79155259a..7e5c47f56 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -164,10 +164,10 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
     
     // Collect memory pool transactions into the block
     CAmount nFees = 0;
-    
+    CBlockIndex* pindexPrev = 0;
     {
         LOCK2(cs_main, mempool.cs);
-        CBlockIndex* pindexPrev = chainActive.LastTip();
+        pindexPrev = chainActive.LastTip();
         const int nHeight = pindexPrev->nHeight + 1;
         uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, chainparams.GetConsensus());
         pblock->nTime = GetAdjustedTime();
@@ -494,7 +494,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             }
         }
     }
-    if ( ASSETCHAINS_STAKED == 0 )
+    if ( pindexPrev != 0 && ASSETCHAINS_STAKED == 0 )
     {
         CValidationState state;
         fprintf(stderr,"check validity\n");

From 2a6a442a4e2d16ffea0df6575506ba203aa24d85 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:29:33 -1100
Subject: [PATCH 568/623] Test

---
 src/main.cpp  | 16 ++++++++--------
 src/miner.cpp | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 76175cc73..03a7af32a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1607,25 +1607,25 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
 {
     // need a GetTransaction without lock so the validation code for assets can run without deadlock
     {
-        fprintf(stderr,"check mempool\n");
+        //fprintf(stderr,"check mempool\n");
         if (mempool.lookup(hash, txOut))
         {
-            fprintf(stderr,"found in mempool\n");
+            //fprintf(stderr,"found in mempool\n");
             return true;
         }
     }
-    fprintf(stderr,"check disk\n");
+    //fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {
         CDiskTxPos postx;
-        fprintf(stderr,"ReadTxIndex\n");
+        //fprintf(stderr,"ReadTxIndex\n");
         if (pblocktree->ReadTxIndex(hash, postx)) {
-            fprintf(stderr,"OpenBlockFile\n");
+            //fprintf(stderr,"OpenBlockFile\n");
             CAutoFile file(OpenBlockFile(postx, true), SER_DISK, CLIENT_VERSION);
             if (file.IsNull())
                 return error("%s: OpenBlockFile failed", __func__);
             CBlockHeader header;
-            fprintf(stderr,"seek and read\n");
+            //fprintf(stderr,"seek and read\n");
             try {
                 file >> header;
                 fseek(file.Get(), postx.nTxOffset, SEEK_CUR);
@@ -1636,11 +1636,11 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
             hashBlock = header.GetHash();
             if (txOut.GetHash() != hash)
                 return error("%s: txid mismatch", __func__);
-            fprintf(stderr,"found on disk\n");
+            //fprintf(stderr,"found on disk\n");
             return true;
         }
     }
-    fprintf(stderr,"not found\n");
+    //fprintf(stderr,"not found\n");
     return false;
 }
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 7e5c47f56..8ba0ef983 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -126,7 +126,7 @@ int32_t komodo_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33);
 CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
 {
     uint64_t deposits; int32_t isrealtime,kmdheight; uint32_t blocktime; const CChainParams& chainparams = Params();
-    fprintf(stderr,"create new block\n");
+    //fprintf(stderr,"create new block\n");
   // Create new block
     if ( gpucount < 0 )
         gpucount = KOMODO_MAXGPUCOUNT;
@@ -497,8 +497,8 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
     if ( pindexPrev != 0 && ASSETCHAINS_STAKED == 0 )
     {
         CValidationState state;
-        fprintf(stderr,"check validity\n");
-        if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false))
+        //fprintf(stderr,"check validity\n");
+        if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false)) // invokes CC checks
         {
             //static uint32_t counter;
             //if ( counter++ < 100 && ASSETCHAINS_STAKED == 0 )
@@ -506,9 +506,9 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             fprintf(stderr,"invalid\n");
             return(0);
         }
-        fprintf(stderr,"valid\n");
+        //fprintf(stderr,"valid\n");
     }
-    fprintf(stderr,"done new block\n");
+    //fprintf(stderr,"done new block\n");
 
     return pblocktemplate.release();
 }
@@ -792,7 +792,7 @@ void static BitcoinMiner()
             }
             if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_STAKED == 0 )
             {
-                fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
+                //fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height);
                 //sleep(3);
             }
 #ifdef ENABLE_WALLET
@@ -808,7 +808,7 @@ void static BitcoinMiner()
                 sleep(1);
                 continue;
             }
-            fprintf(stderr,"get template\n");
+            //fprintf(stderr,"get template\n");
             unique_ptr<CBlockTemplate> pblocktemplate(ptr);
             if (!pblocktemplate.get())
             {
@@ -836,7 +836,7 @@ void static BitcoinMiner()
                 }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
-            fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block\n",solver.c_str(),(int32_t)pblock->vtx.size());
+            //fprintf(stderr,"Running KomodoMiner.%s with %u transactions in block\n",solver.c_str(),(int32_t)pblock->vtx.size());
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));
             //
             // Search
@@ -917,7 +917,7 @@ void static BitcoinMiner()
                  sleep(10);
                  break;
                  }*/
-                fprintf(stderr,"top of while\n");
+                //fprintf(stderr,"top of while\n");
                 // Hash state
                 KOMODO_CHOSEN_ONE = 0;
                 crypto_generichash_blake2b_state state;

From 6629184408976f076398120e53a9e7ae51030542 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:30:29 -1100
Subject: [PATCH 569/623] -print

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 03a7af32a..592e8bd9b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4123,7 +4123,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
     if ( ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
     {
         CValidationState stateDummy;
-        fprintf(stderr,"put block's tx into mempool\n");
+        //fprintf(stderr,"put block's tx into mempool\n");
         for (int i = 0; i < block.vtx.size(); i++)
         {
             const CTransaction &tx = block.vtx[i];
@@ -4133,7 +4133,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
                 continue;
             AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL);
          }
-        fprintf(stderr,"done putting block's tx into mempool\n");
+        //fprintf(stderr,"done putting block's tx into mempool\n");
     }
     BOOST_FOREACH(const CTransaction& tx, block.vtx)
     {

From d1bc3a75e9209aa68ba2b946ee445027964bab52 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:35:32 -1100
Subject: [PATCH 570/623] -print

---
 src/cc/faucet.cpp | 8 ++++----
 src/main.cpp      | 4 ++--
 src/miner.cpp     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index f8cc140e9..afb152121 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -63,15 +63,15 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
     numvouts = tx.vout.size();
     for (i=0; i<numvins; i++)
     {
-        fprintf(stderr,"vini.%d\n",i);
+        //fprintf(stderr,"vini.%d\n",i);
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
-            fprintf(stderr,"vini.%d check mempool\n",i);
+            //fprintf(stderr,"vini.%d check mempool\n",i);
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
-                return eval->Invalid("cant faucet mempool tx");
+                return eval->Invalid("cant find vinTx");
             else
             {
-                fprintf(stderr,"vini.%d check hash and vout\n",i);
+                //fprintf(stderr,"vini.%d check hash and vout\n",i);
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
diff --git a/src/main.cpp b/src/main.cpp
index 592e8bd9b..80d90ba96 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4538,7 +4538,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     bool checked; uint256 hash; int32_t futureblock=0;
     auto verifier = libzcash::ProofVerifier::Disabled();
     hash = pblock->GetHash();
-    fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
     if ( chainActive.LastTip() != 0 )
         komodo_currentheight_set(chainActive.LastTip()->nHeight);
     checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
@@ -4578,7 +4578,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
     
     if (futureblock == 0 && !ActivateBestChain(state, pblock))
         return error("%s: ActivateBestChain failed", __func__);
-    fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
+    //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
 
     return true;
 }
diff --git a/src/miner.cpp b/src/miner.cpp
index 8ba0ef983..4a2dda285 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -678,12 +678,12 @@ static bool ProcessBlockFound(CBlock* pblock)
     // Track how many getdata requests this block gets
     //if ( 0 )
     {
-        fprintf(stderr,"lock cs_wallet\n");
+        //fprintf(stderr,"lock cs_wallet\n");
         LOCK(wallet.cs_wallet);
         wallet.mapRequestCount[pblock->GetHash()] = 0;
     }
 #endif
-    fprintf(stderr,"process new block\n");
+    //fprintf(stderr,"process new block\n");
 
     // Process this block the same as if we had received it from another node
     CValidationState state;

From 54ef331a5fb13a0c411a9ceb24dac6a0383f70c8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:38:46 -1100
Subject: [PATCH 571/623] New rewards address

---
 src/cc/CCcustom.cpp | 4 ++--
 src/cc/CCutils.cpp  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index e220435fd..2ede6af13 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -42,8 +42,8 @@ const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvx
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
-const char *RewardsCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
-char RewardsCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
+const char *RewardsCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
+char RewardsCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
 uint8_t RewardsCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
 bool IsAssetsInput(CScript const& scriptSig)
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 01511210f..4811981df 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -160,9 +160,9 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                //for (i=0; i<32; i++)
-                //    fprintf(stderr,"0x%02x, ",myprivkey[i]);
-                //fprintf(stderr," found privkey!\n");
+                for (i=0; i<32; i++)
+                    fprintf(stderr,"0x%02x, ",myprivkey[i]);
+                fprintf(stderr," found privkey!\n");
                 return(true);
             }
 #endif

From 3a4954d14e2992c01d90e604eb257c71c1f565c7 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@safe-mail.net>
Date: Tue, 24 Jul 2018 09:40:38 +0200
Subject: [PATCH 572/623] add SEC

---
 src/assetchains.old  | 2 +-
 src/assetchains_stop | 1 +
 src/dpowassets       | 3 ++-
 src/fiat-cli         | 1 +
 src/fiat/sec         | 2 ++
 5 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 src/fiat/sec

diff --git a/src/assetchains.old b/src/assetchains.old
index dd5c5d813..cbf976dd9 100755
--- a/src/assetchains.old
+++ b/src/assetchains.old
@@ -37,4 +37,4 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=ZILLA -ac_supply=11000000 -addnode=54.39.23.248 &
 ./komodod -pubkey=$pubkey -ac_name=RFOX -ac_supply=1000000000 -ac_reward=100000000 -addnode=78.47.196.146 &
 ~/VerusCoin/src/komodod -pubkey=$pubkey -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_veruspos=50 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -addnode=185.25.48.236 -addnode=185.64.105.111 &
-
+./komodod -pubkey=$pubkey -ac_name=SEC -ac_cc=333 -ac_supply=1000000000 -addnode=185.148.145.43 &
diff --git a/src/assetchains_stop b/src/assetchains_stop
index e55231b1a..66dd35fc0 100755
--- a/src/assetchains_stop
+++ b/src/assetchains_stop
@@ -38,3 +38,4 @@ komodo_stop BNTN
 komodo_stop CHAIN
 komodo_stop PRLPAY
 komodo_stop DSEC
+komodo_stop SEC
diff --git a/src/dpowassets b/src/dpowassets
index f9d86dd57..6506c54d0 100755
--- a/src/dpowassets
+++ b/src/dpowassets
@@ -33,8 +33,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\":\"DSEC\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"GLXT\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"EQL\",\"pubkey\":\"$pubkey\"}"
-curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ZILLA\",\"pubkey\":\"$pubkey\"}" 
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"ZILLA\",\"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\":\"GAME\",\"freq\":5,\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"RFOX\",\"freq\":10,\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"VRSC\",\"freq\":10,\"pubkey\":\"$pubkey\"}"
+curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"SEC\",\"pubkey\":\"$pubkey\"}"
diff --git a/src/fiat-cli b/src/fiat-cli
index 2838575f9..b842903d3 100755
--- a/src/fiat-cli
+++ b/src/fiat-cli
@@ -33,3 +33,4 @@ echo eql; fiat/eql $1 $2 $3 $4
 echo zilla; fiat/zilla $1 $2 $3 $4
 echo vrsc; fiat/vrsc $1 $2 $3 $4
 echo rfox; fiat/rfox $1 $2 $3 $4
+echo sec; fiat/sec $1 $2 $3 $4
diff --git a/src/fiat/sec b/src/fiat/sec
new file mode 100755
index 000000000..185a76cf1
--- /dev/null
+++ b/src/fiat/sec
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=SEC $1 $2 $3 $4 $5 $6

From ff780022306e594c87d93abc926d9592d0eed82e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 20:42:01 -1100
Subject: [PATCH 573/623] Update rewards privacy

---
 src/cc/CCcustom.cpp | 4 ++--
 src/cc/CCutils.cpp  | 9 ++++++---
 src/cc/rewards.cpp  | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 2ede6af13..6761497b0 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -42,9 +42,9 @@ const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvx
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
-const char *RewardsCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
+const char *RewardsCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
 char RewardsCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
-uint8_t RewardsCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
+uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
 
 bool IsAssetsInput(CScript const& scriptSig)
 {
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 4811981df..ba896e9f6 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -160,9 +160,12 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                for (i=0; i<32; i++)
-                    fprintf(stderr,"0x%02x, ",myprivkey[i]);
-                fprintf(stderr," found privkey!\n");
+                if ( 0 )
+                {
+                    for (i=0; i<32; i++)
+                        fprintf(stderr,"0x%02x, ",myprivkey[i]);
+                    fprintf(stderr," found privkey!\n");
+                }
                 return(true);
             }
 #endif
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 0af15f2ce..b4e931821 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -131,16 +131,19 @@ bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransacti
     txid = ctx.GetHash();
     if ( txid == prevtxid )
         return(true);
+    fprintf(stderr,"ProcessRewards\n");
     if ( paramsNull.size() != 0 ) // Don't expect params
         return eval->Invalid("Cannot have params");
     else if ( ctx.vout.size() == 0 )
         return eval->Invalid("no-vouts");
     if ( RewardsValidate(eval,ctx) != 0 )
     {
+        fprintf(stderr,"ProcessRewards valid\n");
         prevtxid = txid;
         return(true);
     }
-    else return(false);
+    fprintf(stderr,"ProcessRewards failed\n");
+    return(false);
 }
 
 uint64_t AddRewardsInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)

From 26e796c068feb640e16ec3f7c7014abe65451d55 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 21:05:00 -1100
Subject: [PATCH 574/623] Create generic evalcode CC funds

---
 src/cc/CCcustom.cpp | 9 +++++----
 src/cc/CCfaucet.h   | 2 +-
 src/cc/CCinclude.h  | 3 ++-
 src/cc/CCtx.cpp     | 4 ++--
 src/cc/CCutils.cpp  | 9 +++++++++
 src/cc/faucet.cpp   | 7 ++++---
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 6761497b0..a3fdef385 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -27,7 +27,7 @@
  */
 
 CC *MakeAssetCond(CPubKey pk);
-CC *MakeFaucetCond(CPubKey pk);
+//CC *MakeFaucetCond(CPubKey pk);
 CC *MakeRewardsCond(CPubKey pk);
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
@@ -123,7 +123,7 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     else return(nullpk);
 }
 
-CC *MakeCC(uint8_t evalcode,CPubKey pk)
+/*CC *MakeCC(uint8_t evalcode,CPubKey pk)
 {
     if ( evalcode == EVAL_ASSETS || evalcode == EVAL_FAUCET || evalcode == EVAL_REWARDS )
     {
@@ -133,7 +133,7 @@ CC *MakeCC(uint8_t evalcode,CPubKey pk)
         CC *Sig = CCNewThreshold(1, pks);
         return CCNewThreshold(2, {assetCC, Sig});
     } else return(0);
-}
+}*/
 
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
 {
@@ -152,7 +152,8 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
     }
     else if ( evalcode == EVAL_FAUCET )
     {
-        if ( (payoutCond= MakeFaucetCond(pk)) != 0 )
+        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
+        //if ( (payoutCond= MakeFaucetCond(pk)) != 0 )
         {
             Getscriptaddress(destaddr,CCPubKey(payoutCond));
             cc_free(payoutCond);
diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 7dfd7263e..12a0c1897 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -26,7 +26,7 @@ extern char FaucetCChexstr[67];
 
 // CCcustom
 bool IsFaucetInput(CScript const& scriptSig);
-CC *MakeFaucetCond(CPubKey pk);
+//CC *MakeFaucetCond(CPubKey pk);
 
 std::string FaucetFund(uint64_t txfee,uint64_t funds);
 std::string FaucetGet(uint64_t txfee);
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index d9367ec5a..1573deca2 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -37,10 +37,11 @@ static uint256 zeroid;
 
 // CCcustom
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
-CC *MakeCC(uint8_t evalcode,CPubKey pk);
+//CC *MakeCC(uint8_t evalcode,CPubKey pk);
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 
 // CCutils
+CC *MakeCCcond1(uint8_t evalcode,CPubKey pk);
 CC* GetCryptoCondition(CScript const& scriptSig);
 bool IsCCInput(CScript const& scriptSig);
 uint256 revuint256(uint256 txid);
diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 4d1dd0d00..5a8b3607a 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -56,9 +56,9 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     Myprivkey(myprivkey);
     unspendablepk = GetUnspendable(evalcode,unspendablepriv);
     GetCCaddress(evalcode,myaddr,mypk);
-    mycond = MakeCC(evalcode,mypk);
+    mycond = MakeCCcond1(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
-    othercond = MakeCC(evalcode,unspendablepk);
+    othercond = MakeCCcond1(evalcode,unspendablepk);
     //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index ba896e9f6..4a0d4c72a 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -19,6 +19,15 @@
  CCutils has low level functions that are universally useful for all contracts.
  */
 
+CC *MakeCCcond1(uint8_t evalcode,CPubKey pk)
+{
+    std::vector<CC*> pks;
+    pks.push_back(CCNewSecp256k1(pk));
+    CC *condCC = CCNewEval(E_MARSHAL(ss << evalcode));
+    CC *Sig = CCNewThreshold(1, pks);
+    return CCNewThreshold(2, {condCC, Sig});
+}
+
 CC* GetCryptoCondition(CScript const& scriptSig)
 {
     auto pc = scriptSig.begin();
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index afb152121..778e2293b 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -26,19 +26,20 @@
  To implement this, we can simply make any faucet vout fund the faucet. Then we can limit the number of confirmed utxo by combining faucet outputs and then only using utxo which are confirmed. This combined with a vout size limit will drastically limit the funds that can be withdrawn from the faucet.
 */
 
-CC *MakeFaucetCond(CPubKey pk)
+/*CC *MakeFaucetCond(CPubKey pk)
 {
     std::vector<CC*> pks; uint8_t evalcode = EVAL_FAUCET;
     pks.push_back(CCNewSecp256k1(pk));
     CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode));
     CC *Sig = CCNewThreshold(1, pks);
     return CCNewThreshold(2, {faucetCC, Sig});
-}
+}*/
 
 CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
 {
     CTxOut vout;
-    CC *payoutCond = MakeFaucetCond(pk);
+    //CC *payoutCond = MakeFaucetCond(pk);
+    CC *payoutCond = MakeCCcond1(EVAL_FAUCET,pk);
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);

From db3b8abe6def5abcc9c0bbdd864ff372d92dc09e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 21:13:22 -1100
Subject: [PATCH 575/623] MakeCC1vout

---
 src/cc/CCassets.h       |  2 +-
 src/cc/CCassetsCore.cpp |  6 +++---
 src/cc/CCassetstx.cpp   | 28 ++++++++++++++--------------
 src/cc/CCcustom.cpp     |  8 ++++----
 src/cc/CCinclude.h      |  1 +
 src/cc/CCutils.cpp      |  9 +++++++++
 src/cc/faucet.cpp       |  8 ++++----
 src/cc/rewards.cpp      | 12 ++++++------
 8 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index f78d47031..0b4dd5578 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -31,7 +31,7 @@ extern char AssetsCChexstr[67];
 bool IsAssetsInput(CScript const& scriptSig);
 
 // CCassetsCore
-CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
+//CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description);
 CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector<uint8_t> origpubkey);
 uint8_t DecodeAssetOpRet(const CScript &scriptPubKey,uint256 &assetid,uint256 &assetid2,uint64_t &price,std::vector<uint8_t> &origpubkey);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 65f537089..16422bc3b 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -97,7 +97,7 @@ bool SetAssetFillamounts(int32_t sellflag,uint64_t &received_nValue,uint64_t &re
     } else return(false);
 }
 
-CC *MakeAssetCond(CPubKey pk)
+/*CC *MakeAssetCond(CPubKey pk)
 {
     std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
     pks.push_back(CCNewSecp256k1(pk));
@@ -109,11 +109,11 @@ CC *MakeAssetCond(CPubKey pk)
 CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
 {
     CTxOut vout;
-    CC *payoutCond = MakeAssetCond(pk);
+    CC *payoutCond = MakeCCcond1(EVAL_ASSETS,pk);
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);
-}
+}*/
 
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
 {
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 7c290ff56..29fb299c0 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -104,7 +104,7 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeAssetsVout(assetsupply,mypk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,assetsupply,mypk));
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
     }
@@ -129,9 +129,9 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
                 if ( inputs > total )
                     CCchange = (inputs - total);
                 //for (i=0; i<n; i++)
-                    mtx.vout.push_back(MakeAssetsVout(total,pubkey2pk(destpubkey)));
+                    mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,total,pubkey2pk(destpubkey)));
                 if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                    mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
             } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
         //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
@@ -147,7 +147,7 @@ std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uin
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeAssetsVout(bidamount,GetUnspendable(EVAL_ASSETS,0)));
+        mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount,GetUnspendable(EVAL_ASSETS,0)));
         return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
     }
     return(0);
@@ -163,11 +163,11 @@ std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256
     {
         if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
         {
-            mtx.vout.push_back(MakeAssetsVout(askamount,GetUnspendable(EVAL_ASSETS,0)));
+            mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount,GetUnspendable(EVAL_ASSETS,0)));
             if ( inputs > askamount )
                 CCchange = (inputs - askamount);
             if ( CCchange != 0 )
-                mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
             if ( assetid2 == zeroid )
                 opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
             else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
@@ -208,7 +208,7 @@ std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
         {
             askamount = vintx.vout[0].nValue;
             mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
-            mtx.vout.push_back(MakeAssetsVout(askamount,mypk));
+            mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount,mypk));
             return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
         }
     }
@@ -233,11 +233,11 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t
                 if ( inputs > fillamount )
                     CCchange = (inputs - fillamount);
                 SetAssetFillamounts(0,paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeAssetsVout(bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,fillamount,pubkey2pk(origpubkey)));
                 if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                    mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
                 fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
@@ -267,11 +267,11 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
                 if ( assetid2 == zeroid && inputs > fillamount )
                     CCchange = (inputs - fillamount);
                 SetAssetFillamounts(1,paid_amount,remaining_required,askamount,fillamount,totalunits);
-                mtx.vout.push_back(MakeAssetsVout(askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
-                mtx.vout.push_back(MakeAssetsVout(paid_amount,mypk));
-                mtx.vout.push_back(MakeAssetsVout(fillamount,pubkey2pk(origpubkey)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,paid_amount,mypk));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,fillamount,pubkey2pk(origpubkey)));
                 if ( CCchange != 0 )
-                    mtx.vout.push_back(MakeAssetsVout(CCchange,mypk));
+                    mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
                 fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
                 return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx not enough utxos\n");
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index a3fdef385..f627a5537 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -26,9 +26,9 @@
  This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
  */
 
-CC *MakeAssetCond(CPubKey pk);
+//CC *MakeAssetCond(CPubKey pk);
 //CC *MakeFaucetCond(CPubKey pk);
-CC *MakeRewardsCond(CPubKey pk);
+//CC *MakeRewardsCond(CPubKey pk);
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
@@ -143,7 +143,7 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
         pk = GetUnspendable(evalcode,0);
     if ( evalcode == EVAL_ASSETS )
     {
-        if ( (payoutCond= MakeAssetCond(pk)) != 0 )
+        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
         {
             Getscriptaddress(destaddr,CCPubKey(payoutCond));
             cc_free(payoutCond);
@@ -162,7 +162,7 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
     }
     else if ( evalcode == EVAL_REWARDS )
     {
-        if ( (payoutCond= MakeRewardsCond(pk)) != 0 )
+        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
         {
             Getscriptaddress(destaddr,CCPubKey(payoutCond));
             cc_free(payoutCond);
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 1573deca2..f5f7e9a01 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -41,6 +41,7 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 
 // CCutils
+CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk);
 CC *MakeCCcond1(uint8_t evalcode,CPubKey pk);
 CC* GetCryptoCondition(CScript const& scriptSig);
 bool IsCCInput(CScript const& scriptSig);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 4a0d4c72a..e65b8dc29 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -19,6 +19,15 @@
  CCutils has low level functions that are universally useful for all contracts.
  */
 
+CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk)
+{
+    CTxOut vout;
+    CC *payoutCond = MakeCCcond1(evalcode,pk);
+    vout = CTxOut(nValue,CCPubKey(payoutCond));
+    cc_free(payoutCond);
+    return(vout);
+}
+
 CC *MakeCCcond1(uint8_t evalcode,CPubKey pk)
 {
     std::vector<CC*> pks;
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 778e2293b..c50d6252f 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -33,7 +33,7 @@
     CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode));
     CC *Sig = CCNewThreshold(1, pks);
     return CCNewThreshold(2, {faucetCC, Sig});
-}*/
+}
 
 CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
 {
@@ -43,7 +43,7 @@ CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);
-}
+}*/
 
 uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
 {
@@ -186,7 +186,7 @@ std::string FaucetFund(uint64_t txfee,uint64_t funds)
     faucetpk = GetUnspendable(EVAL_FAUCET,0);
     if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeFaucetVout(funds,faucetpk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,funds,faucetpk));
         return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     }
     return(0);
@@ -204,7 +204,7 @@ std::string FaucetGet(uint64_t txfee)
         if ( inputs > nValue )
             CCchange = (inputs - nValue - txfee);
         if ( CCchange != 0 )
-            mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
+            mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk));
         mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
     } else fprintf(stderr,"cant find faucet inputs\n");
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index b4e931821..5253035ac 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -28,7 +28,7 @@ uint64_t RewardsCalc(uint64_t claim,uint256 txid)
     return(reward);
 }
 
-CC *MakeRewardsCond(CPubKey pk)
+/*CC *MakeRewardsCond(CPubKey pk)
 {
     std::vector<CC*> pks; uint8_t evalcode = EVAL_REWARDS;
     pks.push_back(CCNewSecp256k1(pk));
@@ -40,11 +40,11 @@ CC *MakeRewardsCond(CPubKey pk)
 CTxOut MakeRewardsVout(CAmount nValue,CPubKey pk)
 {
     CTxOut vout;
-    CC *payoutCond = MakeRewardsCond(pk);
+    CC *payoutCond = MakeCCcond1(EVAL_REWARDS,pk);
     vout = CTxOut(nValue,CCPubKey(payoutCond));
     cc_free(payoutCond);
     return(vout);
-}
+}*/
 
 uint64_t IsRewardsvout(const CTransaction& tx,int32_t v)
 {
@@ -183,7 +183,7 @@ std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t mins
     rewardspk = GetUnspendable(EVAL_REWARDS,0);
     if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeRewardsVout(funds,rewardspk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,funds,rewardspk));
         mtx.vout.push_back(CTxOut(APR,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(minseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(maxseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
@@ -202,7 +202,7 @@ std::string RewardsLock(uint64_t txfee,uint64_t amount)
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,amount+2*txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeRewardsVout(amount,rewardspk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,amount,rewardspk));
         // specify destination pubkey, funding txid
         //opret = ;//
         return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
@@ -224,7 +224,7 @@ std::string RewardsUnlock(uint64_t txfee)
             if ( inputs > (reward+txfee) )
                 CCchange = (inputs - reward - txfee);
             if ( CCchange != 0 )
-                mtx.vout.push_back(MakeRewardsVout(CCchange,rewardspk));
+                mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,CCchange,rewardspk));
             mtx.vout.push_back(CTxOut(claim+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
             return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
         }

From ec6fec4011551ebf1add2b163d1b23bc079d8acd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 21:17:50 -1100
Subject: [PATCH 576/623] Test

---
 src/cc/CCcustom.cpp | 26 ++++++++++++++++++++++----
 src/cc/CCinclude.h  |  3 ++-
 src/cc/CCutils.cpp  | 14 ++++++++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index f627a5537..414324f5e 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -80,12 +80,30 @@ bool IsFaucetInput(CScript const& scriptSig)
     return out;
 }
 
-bool IsRewardsInput(CScript const& scriptSig)
+bool IsCCinput(uint8_t evalcode,CScript const& scriptSig)
 {
     CC *cond;
     if (!(cond = GetCryptoCondition(scriptSig)))
         return false;
     // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == evalcode;
+        // false for a match, true for continue
+        return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
+bool IsRewardsInput(CScript const& scriptSig)
+{
+    return(IsCCinput(EVAL_REWARDS,scriptSig));
+    /*CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
     auto findEval = [&] (CC *cond, struct CCVisitor _) {
         bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_REWARDS;
         // false for a match, true for continue
@@ -94,7 +112,7 @@ bool IsRewardsInput(CScript const& scriptSig)
     CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
     bool out =! cc_visit(cond, visitor);
     cc_free(cond);
-    return out;
+    return out;*/
 }
 
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
@@ -133,7 +151,7 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
         CC *Sig = CCNewThreshold(1, pks);
         return CCNewThreshold(2, {assetCC, Sig});
     } else return(0);
-}*/
+}
 
 bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
 {
@@ -171,6 +189,6 @@ bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
     }
     fprintf(stderr,"GetCCaddress %02x is invalid evalcode\n",evalcode);
     return false;
-}
+}*/
            
 
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index f5f7e9a01..20f6eaf0d 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -38,7 +38,7 @@ static uint256 zeroid;
 // CCcustom
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
 //CC *MakeCC(uint8_t evalcode,CPubKey pk);
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
+//bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 
 // CCutils
 CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk);
@@ -49,6 +49,7 @@ uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
 bool PreventCC(Eval* eval,const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index e65b8dc29..010727132 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -106,6 +106,20 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     return(false);
 }
 
+bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
+{
+    CC *payoutCond;
+    destaddr[0] = 0;
+    if ( pk.size() == 0 )
+        pk = GetUnspendable(evalcode,0);
+    if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
+    {
+        Getscriptaddress(destaddr,CCPubKey(payoutCond));
+        cc_free(payoutCond);
+    }
+    return(destaddr[0] != 0);
+}
+
 bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
 {
     char destaddr[64];

From 4a4ab6c76b188a8d3b3af71d6ba4567fd8e9e6d2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 22:58:16 -1100
Subject: [PATCH 577/623] Cleanup

---
 src/cc/CCassetsCore.cpp |  18 --------
 src/cc/CCcustom.cpp     | 100 +++++++++++-----------------------------
 src/cc/CCcustom.inc     |  18 ++++++++
 src/cc/CCfaucet.h       |   2 -
 src/cc/CCinclude.h      |   2 -
 src/cc/faucet.cpp       |  19 --------
 6 files changed, 45 insertions(+), 114 deletions(-)
 create mode 100644 src/cc/CCcustom.inc

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 16422bc3b..7dc1e8a13 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -97,24 +97,6 @@ bool SetAssetFillamounts(int32_t sellflag,uint64_t &received_nValue,uint64_t &re
     } else return(false);
 }
 
-/*CC *MakeAssetCond(CPubKey pk)
-{
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_ASSETS;
-    pks.push_back(CCNewSecp256k1(pk));
-    CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-    CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {assetCC, Sig});
-}
-
-CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk)
-{
-    CTxOut vout;
-    CC *payoutCond = MakeCCcond1(EVAL_ASSETS,pk);
-    vout = CTxOut(nValue,CCPubKey(payoutCond));
-    cc_free(payoutCond);
-    return(vout);
-}*/
-
 CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector<uint8_t> origpubkey,std::string name,std::string description)
 {
     CScript opret; uint8_t evalcode = EVAL_ASSETS;
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 414324f5e..a689c117f 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -34,19 +34,40 @@
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
 //BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
 //BTCD Privkey: Ux6XQekTxokko6gZHz24B7PUsmUQtWFzG2W9nUA8jba7UoVbPBF4
+
+// Assets, aka Tokens
+#define FUNCNAME IsAssetsInput
+#define EVALCODE EVAL_ASSETS
 const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
+// Faucet
+#define FUNCNAME IsFaucetInput
+#define EVALCODE EVAL_FAUCET
 const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
+// Rewards
+#define FUNCNAME IsRewardsInput
+#define EVALCODE EVAL_REWARDS
 const char *RewardsCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
 char RewardsCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
 uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
 
-bool IsAssetsInput(CScript const& scriptSig)
+/*bool IsAssetsInput(CScript const& scriptSig)
 {
     CC *cond;
     if (!(cond = GetCryptoCondition(scriptSig)))
@@ -80,27 +101,9 @@ bool IsFaucetInput(CScript const& scriptSig)
     return out;
 }
 
-bool IsCCinput(uint8_t evalcode,CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == evalcode;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-
 bool IsRewardsInput(CScript const& scriptSig)
 {
-    return(IsCCinput(EVAL_REWARDS,scriptSig));
-    /*CC *cond;
+    CC *cond;
     if (!(cond = GetCryptoCondition(scriptSig)))
         return false;
     // Recurse the CC tree to find asset condition
@@ -112,8 +115,10 @@ bool IsRewardsInput(CScript const& scriptSig)
     CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
     bool out =! cc_visit(cond, visitor);
     cc_free(cond);
-    return out;*/
-}
+    return out;
+}*/
+
+uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs);
 
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
 {
@@ -141,54 +146,3 @@ CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
     else return(nullpk);
 }
 
-/*CC *MakeCC(uint8_t evalcode,CPubKey pk)
-{
-    if ( evalcode == EVAL_ASSETS || evalcode == EVAL_FAUCET || evalcode == EVAL_REWARDS )
-    {
-        std::vector<CC*> pks;
-        pks.push_back(CCNewSecp256k1(pk));
-        CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-        CC *Sig = CCNewThreshold(1, pks);
-        return CCNewThreshold(2, {assetCC, Sig});
-    } else return(0);
-}
-
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
-{
-    CC *payoutCond;
-    destaddr[0] = 0;
-    if ( pk.size() == 0 )
-        pk = GetUnspendable(evalcode,0);
-    if ( evalcode == EVAL_ASSETS )
-    {
-        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
-        {
-            Getscriptaddress(destaddr,CCPubKey(payoutCond));
-            cc_free(payoutCond);
-        }
-        return(destaddr[0] != 0);
-    }
-    else if ( evalcode == EVAL_FAUCET )
-    {
-        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
-        //if ( (payoutCond= MakeFaucetCond(pk)) != 0 )
-        {
-            Getscriptaddress(destaddr,CCPubKey(payoutCond));
-            cc_free(payoutCond);
-        }
-        return(destaddr[0] != 0);
-    }
-    else if ( evalcode == EVAL_REWARDS )
-    {
-        if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
-        {
-            Getscriptaddress(destaddr,CCPubKey(payoutCond));
-            cc_free(payoutCond);
-        }
-        return(destaddr[0] != 0);
-    }
-    fprintf(stderr,"GetCCaddress %02x is invalid evalcode\n",evalcode);
-    return false;
-}*/
-           
-
diff --git a/src/cc/CCcustom.inc b/src/cc/CCcustom.inc
new file mode 100644
index 000000000..e88a813ac
--- /dev/null
+++ b/src/cc/CCcustom.inc
@@ -0,0 +1,18 @@
+
+bool FUNCNAME(CScript const& scriptSig)
+{
+    CC *cond;
+    if (!(cond = GetCryptoCondition(scriptSig)))
+        return false;
+    // Recurse the CC tree to find asset condition
+    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+    bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVALCODE;
+    // false for a match, true for continue
+    return r ? 0 : 1;
+    };
+    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
+    bool out =! cc_visit(cond, visitor);
+    cc_free(cond);
+    return out;
+}
+
diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 12a0c1897..42a097369 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -26,8 +26,6 @@ extern char FaucetCChexstr[67];
 
 // CCcustom
 bool IsFaucetInput(CScript const& scriptSig);
-//CC *MakeFaucetCond(CPubKey pk);
-
 std::string FaucetFund(uint64_t txfee,uint64_t funds);
 std::string FaucetGet(uint64_t txfee);
 
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 20f6eaf0d..4d1d1cf2c 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -37,8 +37,6 @@ static uint256 zeroid;
 
 // CCcustom
 CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
-//CC *MakeCC(uint8_t evalcode,CPubKey pk);
-//bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
 
 // CCutils
 CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk);
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index c50d6252f..15686dc01 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -26,25 +26,6 @@
  To implement this, we can simply make any faucet vout fund the faucet. Then we can limit the number of confirmed utxo by combining faucet outputs and then only using utxo which are confirmed. This combined with a vout size limit will drastically limit the funds that can be withdrawn from the faucet.
 */
 
-/*CC *MakeFaucetCond(CPubKey pk)
-{
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_FAUCET;
-    pks.push_back(CCNewSecp256k1(pk));
-    CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode));
-    CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {faucetCC, Sig});
-}
-
-CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk)
-{
-    CTxOut vout;
-    //CC *payoutCond = MakeFaucetCond(pk);
-    CC *payoutCond = MakeCCcond1(EVAL_FAUCET,pk);
-    vout = CTxOut(nValue,CCPubKey(payoutCond));
-    cc_free(payoutCond);
-    return(vout);
-}*/
-
 uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
 {
     char destaddr[64];

From 287efad431a3a62765f65000bdb847673a8db793 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:05:30 -1100
Subject: [PATCH 578/623] CCcontract_info

---
 src/cc/CCassets.h        |   4 +-
 src/cc/CCcustom.cpp      | 111 +++++++++++----------------------------
 src/cc/CCcustom.inc      |   1 -
 src/cc/CCfaucet.h        |   4 +-
 src/cc/CCinclude.h       |  10 ++++
 src/cc/CCrewards.h       |  30 +++++++++++
 src/cc/CCutils.cpp       |  28 ++++++++++
 src/cc/assets.cpp        |  42 ++++-----------
 src/cc/eval.cpp          |  23 ++++----
 src/cc/eval.h            |   5 +-
 src/cc/faucet.cpp        |   8 +--
 src/cc/rewards.cpp       |  34 +++---------
 src/wallet/rpcwallet.cpp |   5 +-
 13 files changed, 135 insertions(+), 170 deletions(-)
 create mode 100644 src/cc/CCrewards.h

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 0b4dd5578..343108aa8 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -25,10 +25,8 @@
 
 #include "CCinclude.h"
 
-extern const char *AssetsCCaddr;
-extern char AssetsCChexstr[67];
 // CCcustom
-bool IsAssetsInput(CScript const& scriptSig);
+bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
 
 // CCassetsCore
 //CTxOut MakeAssetsVout(CAmount nValue,CPubKey pk);
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index a689c117f..1f9d634e0 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -14,22 +14,20 @@
  ******************************************************************************/
 
 #include "CCinclude.h"
+#include "CCassets.h"
+#include "CCfaucet.h"
+#include "CCrewards.h"
 
 /*
  CCcustom has most of the functions that need to be extended to create a new CC contract.
  
  EVAL_CONTRACT is the naming convention and it should be added to cc/eval.h
- bool Eval::Dispatch() in cc/eval.h needs to add the validation function in the switch
 
  A CC scriptPubKey can only be spent if it is properly signed and validated. By constraining the vins and vouts, it is possible to implement a variety of functionality. CC vouts have an otherwise non-standard form, but it is properly supported by the enhanced bitcoin protocol code as a "cryptoconditions" output and the same pubkey will create a different address.
  
  This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
  */
 
-//CC *MakeAssetCond(CPubKey pk);
-//CC *MakeFaucetCond(CPubKey pk);
-//CC *MakeRewardsCond(CPubKey pk);
-
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
 //BTCD Privkey: UvtvQVgVScXEYm4J3r4nE4nbFuGXSVM5pKec8VWXwgG9dmpWBuDh
 //BTCD Address: RSavingsEYcivt2DFsxsKeCjqArV6oVtVZ
@@ -67,82 +65,33 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 #undef FUNCNAME
 #undef EVALCODE
 
-/*bool IsAssetsInput(CScript const& scriptSig)
+struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
 {
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_ASSETS;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-
-bool IsFaucetInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_FAUCET;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}
-
-bool IsRewardsInput(CScript const& scriptSig)
-{
-    CC *cond;
-    if (!(cond = GetCryptoCondition(scriptSig)))
-        return false;
-    // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
-        bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVAL_REWARDS;
-        // false for a match, true for continue
-        return r ? 0 : 1;
-    };
-    CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL};
-    bool out =! cc_visit(cond, visitor);
-    cc_free(cond);
-    return out;
-}*/
-
-uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs);
-
-CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv)
-{
-    static CPubKey nullpk;
-    if ( unspendablepriv != 0 )
-        memset(unspendablepriv,0,32);
-    if ( evalcode == EVAL_ASSETS )
-    {
-        if ( unspendablepriv != 0 )
-            memcpy(unspendablepriv,AssetsCCpriv,32);
-        return(pubkey2pk(ParseHex(AssetsCChexstr)));
-    }
-    else if ( evalcode == EVAL_FAUCET )
-    {
-        if ( unspendablepriv != 0 )
-            memcpy(unspendablepriv,FaucetCCpriv,32);
-        return(pubkey2pk(ParseHex(FaucetCChexstr)));
-    }
-    else if ( evalcode == EVAL_REWARDS )
-    {
-        if ( unspendablepriv != 0 )
-            memcpy(unspendablepriv,RewardsCCpriv,32);
-        return(pubkey2pk(ParseHex(RewardsCChexstr)));
-    }
-    else return(nullpk);
+    cp->evalcode = evalcode;
+    switch ( evalcode )
+    {
+        case EVAL_ASSETS:
+            strcpy(cp->CCaddress,AssetsCCaddr);
+            strcpy(cp->CChexstr,AssetsCChexstr);
+            memcpy(cp->CCpriv,AssetsCCpriv,32);
+            cp->validate = AssetsValidate;
+            cp->ismyvin = IsAssetsInput;
+            break;
+        case EVAL_FAUCET:
+            strcpy(cp->CCaddress,FaucetCCaddr);
+            strcpy(cp->CChexstr,FaucetCChexstr);
+            memcpy(cp->CCpriv,FaucetCCpriv,32);
+            cp->validate = FaucetValidate;
+            cp->ismyvin = IsFaucetInput;
+            break;
+        case EVAL_REWARDS:
+            strcpy(cp->CCaddress,RewardsCCaddr);
+            strcpy(cp->CChexstr,RewardsCChexstr);
+            memcpy(cp->CCpriv,RewardsCCpriv,32);
+            cp->validate = RewardsValidate;
+            cp->ismyvin = IsRewardsInput;
+            break;
+    }
+    return(cp);
 }
 
diff --git a/src/cc/CCcustom.inc b/src/cc/CCcustom.inc
index e88a813ac..a5a88f1eb 100644
--- a/src/cc/CCcustom.inc
+++ b/src/cc/CCcustom.inc
@@ -15,4 +15,3 @@ bool FUNCNAME(CScript const& scriptSig)
     cc_free(cond);
     return out;
 }
-
diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h
index 42a097369..b478165b5 100644
--- a/src/cc/CCfaucet.h
+++ b/src/cc/CCfaucet.h
@@ -21,11 +21,9 @@
 
 #define EVAL_FAUCET 0xe4
 
-extern const char *FaucetCCaddr;
-extern char FaucetCChexstr[67];
+bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
 
 // CCcustom
-bool IsFaucetInput(CScript const& scriptSig);
 std::string FaucetFund(uint64_t txfee,uint64_t funds);
 std::string FaucetGet(uint64_t txfee);
 
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 4d1d1cf2c..e4b4c1b52 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -28,6 +28,16 @@
 #include <univalue.h>
 #include <exception>
 
+struct CCcontract_info
+{
+    char CCaddress[64],CChexstr[72];
+    uint8_t CCpriv[32];
+    bool (*validate)(Eval* eval,struct CCcontract_info *cp,const CTransaction &tx);
+    bool (*ismyvin)(CScript const& scriptSig);
+    uint8_t evalcode;
+};
+struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode);
+
 #ifdef ENABLE_WALLET
 extern CWallet* pwalletMain;
 #endif
diff --git a/src/cc/CCrewards.h b/src/cc/CCrewards.h
new file mode 100644
index 000000000..fe900c02b
--- /dev/null
+++ b/src/cc/CCrewards.h
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_REWARDS_H
+#define CC_REWARDS_H
+
+#include "CCinclude.h"
+
+#define EVAL_REWARDS 0xe5
+
+bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+
+std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
+std::string RewardsLock(uint64_t txfee,uint64_t amount);
+std::string RewardsUnlock(uint64_t txfee);
+
+#endif
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 010727132..ceccee93e 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -207,3 +207,31 @@ bool Myprivkey(uint8_t myprivkey[])
     return(false);
 }
 
+CPubKey GetUnspendable(struct CCcontract_info *cp,uint8_t *unspendablepriv)
+{
+    if ( unspendablepriv != 0 )
+        memcpy(unspendablepriv,cp->CCpriv,32);
+    return(pubkey2pk(ParseHex(cp->CChexstr)));
+}
+
+bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+{
+    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
+    txid = ctx.GetHash();
+    if ( txid == cp->prevtxid )
+        return(true);
+    if ( paramsNull.size() != 0 ) // Don't expect params
+        return eval->Invalid("Cannot have params");
+    else if ( ctx.vout.size() == 0 )
+        return eval->Invalid("no-vouts");
+    else if ( (*cp->validate)(cp,eval,ctx) != 0 )
+    {
+        cp->prevtxid = txid;
+        return(true);
+    }
+    return(false);
+}
+
+
+uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs);
+
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 11d375698..60268b20b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -129,15 +129,22 @@
  vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
 */
 
-bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t remaining_price,std::vector<uint8_t> origpubkey)
+bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock; int32_t i,starti,numvins,preventCCvins,preventCCvouts; uint64_t nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> tmporigpubkey,ignorepubkey; char destaddr[64],origaddr[64],CCaddr[64];
-    fprintf(stderr,"AssetValidate (%c)\n",funcid);
+    CTxDestination address; const CTransaction vinTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; uint64_t remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];
     numvins = tx.vin.size();
+    numvouts = tx.vout.size();
     outputs = inputs = 0;
     preventCCvins = preventCCvouts = -1;
-    if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
+    if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+        return eval->Invalid("Invalid opreturn payload");
+    fprintf(stderr,"AssetValidate (%c)\n",funcid);
+    if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset create txid");
+    else if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
+        return eval->Invalid("cant find asset2 create txid");
+    else if ( IsCCInput(tx.vin[0].scriptSig) != 0 )
         return eval->Invalid("illegal asset vin0");
     else if ( numvouts < 1 )
         return eval->Invalid("no vouts");
@@ -314,31 +321,4 @@ bool AssetValidate(Eval* eval,const CTransaction &tx,int32_t numvouts,uint8_t fu
     return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
 }
 
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
-{
-    static uint256 zero,prevtxid;
-    CTransaction createTx; uint256 txid,assetid,assetid2,hashBlock; uint8_t funcid; int32_t i,n; uint64_t amount; std::vector<uint8_t> origpubkey;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
-    fprintf(stderr,"ProcessAssets\n");
-    if ( paramsNull.size() != 0 ) // Don't expect params
-        return eval->Invalid("Cannot have params");
-    else if ( (n= ctx.vout.size()) == 0 )
-        return eval->Invalid("no-vouts");
-    else if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
-        return eval->Invalid("Invalid opreturn payload");
-    else if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset create txid");
-    else if ( assetid2 != zero && eval->GetTxUnconfirmed(assetid2,createTx,hashBlock) == 0 )
-        return eval->Invalid("cant find asset2 create txid");
-    else if ( AssetValidate(eval,ctx,n,funcid,assetid,assetid2,amount,origpubkey) != 0 )
-    {
-        prevtxid = txid;
-        fprintf(stderr,"AssetValidate.(%c) passed\n",funcid);
-        return(true);
-    }
-    fprintf(stderr,"AssetValidate.(%c) failed\n",funcid);
-    return(false);
-}
 
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 43b215748..2c886668d 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -21,6 +21,7 @@
 #include "script/cc.h"
 #include "cc/eval.h"
 #include "cc/utils.h"
+#include "cc/CCutils.h"
 #include "main.h"
 #include "chain.h"
 #include "core_io.h"
@@ -28,12 +29,11 @@
 
 
 Eval* EVAL_TEST = 0;
-
+struct CCcontract_info CCinfos[0x100];
 
 bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
 {
     EvalRef eval;
-
     bool out = eval->Dispatch(cond, tx, nIn);
     //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
@@ -56,10 +56,17 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
  */
 bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
 {
+    struct CCcontract_info *cp;
     if (cond->codeLength == 0)
         return Invalid("empty-eval");
 
     uint8_t ecode = cond->code[0];
+    cp = &CCinfos[(int32_t)ecode];
+    if ( cp->didinit == 0 )
+    {
+        CCinit(cp,ecode);
+        cp->didinit = 1;
+    }
     std::vector<uint8_t> vparams(cond->code+1, cond->code+cond->codeLength);
     switch ( ecode )
     {
@@ -71,16 +78,8 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
             return ImportCoin(vparams, txTo, nIn);
             break;
             
-        case EVAL_ASSETS:
-            return ProcessAssets(this, vparams, txTo, nIn);
-            break;
-            
-        case EVAL_FAUCET:
-            return ProcessFaucet(this, vparams, txTo, nIn);
-            break;
-            
-        case EVAL_REWARDS:
-            return ProcessRewards(this, vparams, txTo, nIn);
+        default:
+            return(ProcessCC(cp,this, vparams, txTo, nIn));
             break;
     }
     return Invalid("invalid-code, dont forget to add EVAL_NEWCC to Eval::Dispatch");
diff --git a/src/cc/eval.h b/src/cc/eval.h
index d8ca4312d..59404dba8 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -268,9 +268,8 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
-bool ProcessAssets(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
-bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
-bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
+void CCinit(struct CCcontract_info *cp,uint8_t evalcode);
+bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 
 #endif /* CC_EVAL_H */
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 15686dc01..bbce16366 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -37,7 +37,7 @@ uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
     return(0);
 }
 
-bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
 {
     static uint256 zerohash;
     CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
@@ -46,7 +46,7 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
     for (i=0; i<numvins; i++)
     {
         //fprintf(stderr,"vini.%d\n",i);
-        if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
         {
             //fprintf(stderr,"vini.%d check mempool\n",i);
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
@@ -111,7 +111,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
     }
 }
 
-bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+/*bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
     static uint256 prevtxid; uint256 txid;
     txid = ctx.GetHash();
@@ -130,7 +130,7 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     }
     fprintf(stderr,"faucet validate failed\n");
     return(false);
-}
+}*/
 
 uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 5253035ac..b08cd6bd7 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -18,34 +18,12 @@
 /*
  */
 
-extern const char *RewardsCCaddr;
-extern char RewardsCChexstr[67];
-bool IsRewardsInput(CScript const& scriptSig);
-
 uint64_t RewardsCalc(uint64_t claim,uint256 txid)
 {
     uint64_t reward = 0;
     return(reward);
 }
 
-/*CC *MakeRewardsCond(CPubKey pk)
-{
-    std::vector<CC*> pks; uint8_t evalcode = EVAL_REWARDS;
-    pks.push_back(CCNewSecp256k1(pk));
-    CC *rewardsCC = CCNewEval(E_MARSHAL(ss << evalcode));
-    CC *Sig = CCNewThreshold(1, pks);
-    return CCNewThreshold(2, {rewardsCC, Sig});
-}
-
-CTxOut MakeRewardsVout(CAmount nValue,CPubKey pk)
-{
-    CTxOut vout;
-    CC *payoutCond = MakeCCcond1(EVAL_REWARDS,pk);
-    vout = CTxOut(nValue,CCPubKey(payoutCond));
-    cc_free(payoutCond);
-    return(vout);
-}*/
-
 uint64_t IsRewardsvout(const CTransaction& tx,int32_t v)
 {
     char destaddr[64];
@@ -57,7 +35,7 @@ uint64_t IsRewardsvout(const CTransaction& tx,int32_t v)
     return(0);
 }
 
-bool RewardsExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+bool RewardsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
 {
     static uint256 zerohash;
     CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
@@ -65,7 +43,7 @@ bool RewardsExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64
     numvouts = tx.vout.size();
     for (i=0; i<numvins; i++)
     {
-        if ( IsRewardsInput(tx.vin[i].scriptSig) != 0 )
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("always should find vin, but didnt");
@@ -92,7 +70,7 @@ bool RewardsExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64
     else return(true);
 }
 
-bool RewardsValidate(Eval* eval,const CTransaction &tx)
+bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
     numvins = tx.vin.size();
@@ -107,7 +85,7 @@ bool RewardsValidate(Eval* eval,const CTransaction &tx)
             if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
                 return eval->Invalid("illegal normal vini");
         }
-        if ( RewardsExactAmounts(eval,tx,1,10000) == false )
+        if ( RewardsExactAmounts(cp,eval,tx,1,10000) == false )
             return false;
         else
         {
@@ -125,7 +103,7 @@ bool RewardsValidate(Eval* eval,const CTransaction &tx)
     return(true);
 }
 
-bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
+/*bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
 {
     static uint256 prevtxid; uint256 txid;
     txid = ctx.GetHash();
@@ -144,7 +122,7 @@ bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransacti
     }
     fprintf(stderr,"ProcessRewards failed\n");
     return(false);
-}
+}*/
 
 uint64_t AddRewardsInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index c79226954..ac202298d 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4842,10 +4842,7 @@ int32_t ensure_CCrequirements()
 
 #include "../cc/CCfaucet.h"
 #include "../cc/CCassets.h"
-#define EVAL_REWARDS 0xe5
-std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
-std::string RewardsLock(uint64_t txfee,uint64_t amount);
-std::string RewardsUnlock(uint64_t txfee);
+#include "../cc/CCrewards.h"
 
 UniValue rewardsaddress(const UniValue& params, bool fHelp)
 {

From 6d450023961ff8042567f9ea8ddf38580a256ff1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:06:48 -1100
Subject: [PATCH 579/623] CCinclude.h

---
 src/cc/eval.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 2c886668d..f157b6197 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -21,7 +21,7 @@
 #include "script/cc.h"
 #include "cc/eval.h"
 #include "cc/utils.h"
-#include "cc/CCutils.h"
+#include "cc/CCinclude.h"
 #include "main.h"
 #include "chain.h"
 #include "core_io.h"

From b646136072eefbe13fc7459877b43d655649c270 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:07:49 -1100
Subject: [PATCH 580/623] struct CCcontract_info *

---
 src/cc/eval.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/eval.h b/src/cc/eval.h
index 59404dba8..e35bd053a 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -268,7 +268,7 @@ typedef std::pair<uint256,MerkleBranch> TxProof;
 
 
 uint256 GetMerkleRoot(const std::vector<uint256>& vLeaves);
-void CCinit(struct CCcontract_info *cp,uint8_t evalcode);
+struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode);
 bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector<uint8_t> paramsNull, const CTransaction &tx, unsigned int nIn);
 
 

From 633335654f03b1e0794f86e1d844ccb74a38a789 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:08:19 -1100
Subject: [PATCH 581/623] Prevtxid

---
 src/cc/CCinclude.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index e4b4c1b52..7f4feb426 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -30,11 +30,12 @@
 
 struct CCcontract_info
 {
+    uint256 prevtxid;
     char CCaddress[64],CChexstr[72];
     uint8_t CCpriv[32];
     bool (*validate)(Eval* eval,struct CCcontract_info *cp,const CTransaction &tx);
     bool (*ismyvin)(CScript const& scriptSig);
-    uint8_t evalcode;
+    uint8_t evalcode,didinit;
 };
 struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode);
 

From d4d7e23790f7c843886a77b2ad651520f1299447 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:10:40 -1100
Subject: [PATCH 582/623] Cp arg

---
 src/cc/CCassets.h       | 2 +-
 src/cc/CCassetsCore.cpp | 4 ++--
 src/cc/assets.cpp       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 343108aa8..2dd35577e 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -39,7 +39,7 @@ bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t r
 bool SetAssetFillamounts(int32_t sellflag,uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
 uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
 uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
-bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
+bool AssetExactAmounts(struct CCcontract_info *cp,uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
 
 // CCassetstx
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid);
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 7dc1e8a13..1891bbbdf 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -297,7 +297,7 @@ uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     else return(assetoshis);
 }
 
-bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
+bool AssetExactAmounts(struct CCcontract_info *cp,uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; std::vector<uint8_t> tmporigpubkey; uint64_t tmpprice;
     numvins = tx.vin.size();
@@ -305,7 +305,7 @@ bool AssetExactAmounts(uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* e
     inputs = outputs = 0;
     for (i=starti; i<numvins; i++)
     {
-        if ( IsAssetsInput(tx.vin[i].scriptSig) != 0 )
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
         {
             if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
             {
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 60268b20b..13cfd285b 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -155,7 +155,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
         else starti = 1;
         if ( assetid == zero )
             return eval->Invalid("illegal assetid");
-        else if ( AssetExactAmounts(inputs,starti,outputs,eval,tx,assetid) == false )
+        else if ( AssetExactAmounts(cp,inputs,starti,outputs,eval,tx,assetid) == false )
             return eval->Invalid("asset inputs != outputs");
     }
     switch ( funcid )
@@ -288,7 +288,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             //'E'.vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey]
             if ( funcid == 'E' )
             {
-                if ( AssetExactAmounts(inputs,1,outputs,eval,tx,assetid2) == false )
+                if ( AssetExactAmounts(cp,inputs,1,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
             if ( (assetoshis= AssetValidateSellvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )

From eb304fa0e9fa50ee6c4d41dba21db85b11e2da24 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:12:31 -1100
Subject: [PATCH 583/623] unspendableCCaddr

---
 src/cc/CCcustom.cpp | 6 +++---
 src/cc/CCinclude.h  | 2 +-
 src/cc/assets.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 1f9d634e0..69353213f 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -71,21 +71,21 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
     switch ( evalcode )
     {
         case EVAL_ASSETS:
-            strcpy(cp->CCaddress,AssetsCCaddr);
+            strcpy(cp->unspendableCCaddr,AssetsCCaddr);
             strcpy(cp->CChexstr,AssetsCChexstr);
             memcpy(cp->CCpriv,AssetsCCpriv,32);
             cp->validate = AssetsValidate;
             cp->ismyvin = IsAssetsInput;
             break;
         case EVAL_FAUCET:
-            strcpy(cp->CCaddress,FaucetCCaddr);
+            strcpy(cp->unspendableCCaddr,FaucetCCaddr);
             strcpy(cp->CChexstr,FaucetCChexstr);
             memcpy(cp->CCpriv,FaucetCCpriv,32);
             cp->validate = FaucetValidate;
             cp->ismyvin = IsFaucetInput;
             break;
         case EVAL_REWARDS:
-            strcpy(cp->CCaddress,RewardsCCaddr);
+            strcpy(cp->unspendableCCaddr,RewardsCCaddr);
             strcpy(cp->CChexstr,RewardsCChexstr);
             memcpy(cp->CCpriv,RewardsCCpriv,32);
             cp->validate = RewardsValidate;
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 7f4feb426..2eb6785fd 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -31,7 +31,7 @@
 struct CCcontract_info
 {
     uint256 prevtxid;
-    char CCaddress[64],CChexstr[72];
+    char unspendableCCaddr[64],CChexstr[72];
     uint8_t CCpriv[32];
     bool (*validate)(Eval* eval,struct CCcontract_info *cp,const CTransaction &tx);
     bool (*ismyvin)(CScript const& scriptSig);
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 13cfd285b..0c3d18dea 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -254,7 +254,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null remaining_price for selloffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,0) == 0 )
                 return eval->Invalid("mismatched vout0 AssetsCCaddr for selloffer");
             preventCCvouts = 1;
             break;
@@ -311,7 +311,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fill");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,(char *)cp->unspendableCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fill");
                 }
             }

From 14294273b6734c7b5c97972d813347bd8635ebed Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:14:14 -1100
Subject: [PATCH 584/623] struct CCcontract_info *cp,

---
 src/cc/CCassets.h       |  4 ++--
 src/cc/CCassetsCore.cpp | 12 ++++++------
 src/cc/assets.cpp       |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h
index 2dd35577e..0fbe4891c 100644
--- a/src/cc/CCassets.h
+++ b/src/cc/CCassets.h
@@ -37,8 +37,8 @@ bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const C
 uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTransaction& tx,int32_t v,uint256 refassetid);
 bool ValidateAssetRemainder(int32_t sellflag,uint64_t remaining_price,uint64_t remaining_nValue,uint64_t orig_nValue,uint64_t received_nValue,uint64_t paidprice,uint64_t totalprice);
 bool SetAssetFillamounts(int32_t sellflag,uint64_t &paid,uint64_t &remaining_price,uint64_t orig_nValue,uint64_t &received,uint64_t totalprice);
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
+uint64_t AssetValidateBuyvin(struct CCcontract_info *cp,Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid);
+uint64_t AssetValidateSellvin(struct CCcontract_info *cp,Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid);
 bool AssetExactAmounts(struct CCcontract_info *cp,uint64_t &inputs,int32_t starti,uint64_t &outputs,Eval* eval,const CTransaction &tx,uint256 assetid);
 
 // CCassetstx
diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 1891bbbdf..d429c4ef3 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -235,7 +235,7 @@ uint64_t IsAssetvout(uint64_t &price,std::vector<uint8_t> &origpubkey,const CTra
     return(0);
 }
 
-uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,int32_t vini,CTransaction &vinTx)
+uint64_t AssetValidateCCvin(struct CCcontract_info *cp,Eval* eval,char *CCaddr,char *origaddr,const CTransaction &tx,int32_t vini,CTransaction &vinTx)
 {
     uint256 hashBlock; char destaddr[64];
     origaddr[0] = destaddr[0] = CCaddr[0] = 0;
@@ -251,7 +251,7 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
         fprintf(stderr," vini.%d\n",vini);
         return eval->Invalid("always should find CCvin, but didnt");
     }
-    else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)AssetsCCaddr) != 0 )
+    else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)cp->unspendableCCaddr) != 0 )
     {
         fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
         return eval->Invalid("invalid vin AssetsCCaddr");
@@ -264,11 +264,11 @@ uint64_t AssetValidateCCvin(Eval* eval,char *CCaddr,char *origaddr,const CTransa
     return(vinTx.vout[0].nValue);
 }
 
-uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid)
+uint64_t AssetValidateBuyvin(struct CCcontract_info *cp,Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid)
 {
     CTransaction vinTx; uint64_t nValue; uint256 assetid,assetid2; uint8_t funcid;
     CCaddr[0] = origaddr[0] = 0;
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
+    if ( (nValue= AssetValidateCCvin(cp,eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
         return(0);
     else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 )
         return eval->Invalid("invalid normal vout0 for buyvin");
@@ -286,11 +286,11 @@ uint64_t AssetValidateBuyvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t>
     return(nValue);
 }
 
-uint64_t AssetValidateSellvin(Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid)
+uint64_t AssetValidateSellvin(struct CCcontract_info *cp,Eval* eval,uint64_t &tmpprice,std::vector<uint8_t> &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid)
 {
     CTransaction vinTx; uint64_t nValue,assetoshis;
     fprintf(stderr,"AssetValidateSellvin\n");
-    if ( (nValue= AssetValidateCCvin(eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
+    if ( (nValue= AssetValidateCCvin(cp,eval,CCaddr,origaddr,tx,1,vinTx)) == 0 )
         return(0);
     if ( (assetoshis= IsAssetvout(tmpprice,tmporigpubkey,vinTx,0,assetid)) != 0 )
         return eval->Invalid("invalid missing CC vout0 for sellvin");
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 0c3d18dea..3b3b6f428 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -265,7 +265,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid]
-            if ( (assetoshis= AssetValidateSellvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (assetoshis= AssetValidateSellvin(cp,eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( ConstrainVout(tx.vout[0],1,CCaddr,assetoshis) == 0 )
                 return eval->Invalid("invalid vout for cancel");
@@ -291,7 +291,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                 if ( AssetExactAmounts(cp,inputs,1,outputs,eval,tx,assetid2) == false )
                     eval->Invalid("asset2 inputs != outputs");
             }
-            if ( (assetoshis= AssetValidateSellvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (assetoshis= AssetValidateSellvin(cp,eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fill");

From ae02bd6ba228251d8f14fa6c21f75e584ec6bba8 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:15:17 -1100
Subject: [PATCH 585/623] Fix

---
 src/cc/CCassetsCore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index d429c4ef3..e837b0fb2 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -253,7 +253,7 @@ uint64_t AssetValidateCCvin(struct CCcontract_info *cp,Eval* eval,char *CCaddr,c
     }
     else if ( Getscriptaddress(destaddr,vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || strcmp(destaddr,(char *)cp->unspendableCCaddr) != 0 )
     {
-        fprintf(stderr,"%s vs %s\n",destaddr,(char *)AssetsCCaddr);
+        fprintf(stderr,"%s vs %s\n",destaddr,(char *)cp->unspendableCCaddr);
         return eval->Invalid("invalid vin AssetsCCaddr");
     }
     else if ( vinTx.vout[0].nValue < 10000 )

From ced7a51333b90744c6ccdd35c9543b207368cacb Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:17:21 -1100
Subject: [PATCH 586/623] Eval* eval,

---
 src/cc/CCinclude.h | 2 +-
 src/cc/faucet.cpp  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 2eb6785fd..539a9b123 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -33,7 +33,7 @@ struct CCcontract_info
     uint256 prevtxid;
     char unspendableCCaddr[64],CChexstr[72];
     uint8_t CCpriv[32];
-    bool (*validate)(Eval* eval,struct CCcontract_info *cp,const CTransaction &tx);
+    bool (*validate)(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
     bool (*ismyvin)(CScript const& scriptSig);
     uint8_t evalcode,didinit;
 };
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index bbce16366..cc76fa8e6 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -75,7 +75,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
     else return(true);
 }
 
-bool FaucetValidate(Eval* eval,const CTransaction &tx)
+bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
     int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
     numvins = tx.vin.size();
@@ -92,7 +92,7 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx)
                 return eval->Invalid("illegal normal vini");
         }
         fprintf(stderr,"check amounts\n");
-        if ( FaucetExactAmounts(eval,tx,1,10000) == false )
+        if ( FaucetExactAmounts(cp,eval,tx,1,10000) == false )
             return false;
         else
         {

From 98252f712b0090d247052a8729d6e7bfeb5b5bae Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:20:45 -1100
Subject: [PATCH 587/623] Fix

---
 src/cc/assets.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 3b3b6f428..d720894f5 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -132,12 +132,12 @@
 bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; uint64_t remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; const CTransaction vinTx,createTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; uint64_t amount,remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     outputs = inputs = 0;
     preventCCvins = preventCCvouts = -1;
-    if ( (funcid= DecodeAssetOpRet(ctx.vout[n-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
+    if ( (funcid= DecodeAssetOpRet(tx.vout[numvouts-1].scriptPubKey,assetid,assetid2,amount,origpubkey)) == 0 )
         return eval->Invalid("Invalid opreturn payload");
     fprintf(stderr,"AssetValidate (%c)\n",funcid);
     if ( eval->GetTxUnconfirmed(assetid,createTx,hashBlock) == 0 )
@@ -186,11 +186,11 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey]
             if ( remaining_price == 0 )
                 return eval->Invalid("illegal null amount for buyoffer");
-            else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+            else if ( ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,0) == 0 )
                 return eval->Invalid("invalid vout for buyoffer");
             preventCCvins = 1;
             preventCCvouts = 1;
-            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",(char *)AssetsCCaddr);
+            fprintf(stderr,"buy offer validated to destaddr.(%s)\n",cp->unspendableCCaddr);
             break;
             
         case 'o': // cancelbuy
@@ -219,7 +219,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             //vout.4: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey]
             preventCCvouts = 4;
-            if ( (nValue= AssetValidateBuyvin(eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(cp,eval,totalunits,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( numvouts < 3 )
                 return eval->Invalid("not enough vouts for fillbuy");

From 11ac375bfa8b3f853c48dab3c663b69f6881d715 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:22:01 -1100
Subject: [PATCH 588/623] Test

---
 src/cc/assets.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index d720894f5..b1a34d524 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -132,7 +132,7 @@
 bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
     static uint256 zero;
-    CTxDestination address; const CTransaction vinTx,createTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; uint64_t amount,remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];
+    CTxDestination address; CTransaction vinTx,createTx; uint256 hashBlock,assetid,assetid2; int32_t i,starti,numvins,numvouts,preventCCvins,preventCCvouts; uint64_t amount,remaining_price,nValue,assetoshis,outputs,inputs,tmpprice,totalunits,ignore; std::vector<uint8_t> origpubkey,tmporigpubkey,ignorepubkey; uint8_t funcid; char destaddr[64],origaddr[64],CCaddr[64];
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     outputs = inputs = 0;
@@ -199,7 +199,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey]
             //vout.1: normal output for change (if any)
             //vout.n-1: opreturn [EVAL_ASSETS] ['o']
-            if ( (nValue= AssetValidateBuyvin(eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
+            if ( (nValue= AssetValidateBuyvin(cp,eval,tmpprice,tmporigpubkey,CCaddr,origaddr,tx,assetid)) == 0 )
                 return(false);
             else if ( ConstrainVout(tx.vout[0],0,origaddr,nValue) == 0 )
                 return eval->Invalid("invalid refund for cancelbuy");
@@ -237,7 +237,7 @@ bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
                 {
                     if ( remaining_price < 10000 )
                         return eval->Invalid("dust vout0 to AssetsCCaddr for fillbuy");
-                    else if ( ConstrainVout(tx.vout[0],1,(char *)AssetsCCaddr,0) == 0 )
+                    else if ( ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,0) == 0 )
                         return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy");
                 }
             }

From 32406f1be77e99574767df11b521bfc73ce249b7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:23:47 -1100
Subject: [PATCH 589/623] Fix

---
 src/cc/faucet.cpp | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index cc76fa8e6..98295c300 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -26,6 +26,8 @@
  To implement this, we can simply make any faucet vout fund the faucet. Then we can limit the number of confirmed utxo by combining faucet outputs and then only using utxo which are confirmed. This combined with a vout size limit will drastically limit the funds that can be withdrawn from the faucet.
 */
 
+// start of consensus code
+
 uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
 {
     char destaddr[64];
@@ -110,27 +112,9 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
         }
     }
 }
+// end of consensus code
 
-/*bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
-{
-    static uint256 prevtxid; uint256 txid;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
-    fprintf(stderr,"start faucet validate\n");
-    if ( paramsNull.size() != 0 ) // Don't expect params
-        return eval->Invalid("Cannot have params");
-    else if ( ctx.vout.size() == 0 )
-        return eval->Invalid("no-vouts");
-    if ( FaucetValidate(eval,ctx) != 0 )
-    {
-        prevtxid = txid;
-        fprintf(stderr,"faucet validated\n");
-        return(true);
-    }
-    fprintf(stderr,"faucet validate failed\n");
-    return(false);
-}*/
+// helper functions for rpc calls in rpcwallet.cpp
 
 uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {

From b9f95c74f6b2e07861ff29777f92ff7a38c3ab2e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:24:49 -1100
Subject: [PATCH 590/623] Add cp

---
 src/cc/faucet.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 98295c300..8d0075f34 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -28,12 +28,12 @@
 
 // start of consensus code
 
-uint64_t IsFaucetvout(const CTransaction& tx,int32_t v)
+uint64_t IsFaucetvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
 {
     char destaddr[64];
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
     {
-        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,FaucetCCaddr) == 0 )
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
             return(tx.vout[v].nValue);
     }
     return(0);
@@ -58,7 +58,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
                 //fprintf(stderr,"vini.%d check hash and vout\n",i);
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant faucet from mempool");
-                if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
+                if ( (assetoshis= IsFaucetvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
         }
@@ -66,7 +66,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
     for (i=0; i<numvouts; i++)
     {
         //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
-        if ( (assetoshis= IsFaucetvout(tx,i)) != 0 )
+        if ( (assetoshis= IsFaucetvout(cp,tx,i)) != 0 )
             outputs += assetoshis;
     }
     if ( inputs != outputs+COIN+txfee )
@@ -100,7 +100,7 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
         {
             fprintf(stderr,"check rest\n");
             preventCCvouts = 1;
-            if ( IsFaucetvout(tx,0) != 0 )
+            if ( IsFaucetvout(cp,tx,0) != 0 )
             {
                 preventCCvouts++;
                 i = 1;

From 0d769d9141273a9d26830279ffa6c2eef6456690 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:26:51 -1100
Subject: [PATCH 591/623] C

---
 src/cc/faucet.cpp | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 8d0075f34..24cd6f612 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -116,7 +116,7 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
 
 // helper functions for rpc calls in rpcwallet.cpp
 
-uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+uint64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
@@ -127,7 +127,7 @@ uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int3
         txid = it->first.txhash;
         if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
-            if ( (nValue= IsFaucetvout(vintx,(int32_t)it->first.index)) > 0 )
+            if ( (nValue= IsFaucetvout(cp,vintx,(int32_t)it->first.index)) > 0 )
             {
                 if ( total != 0 && maxinputs != 0 )
                     mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
@@ -142,6 +142,26 @@ uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int3
     return(totalinputs);
 }
 
+std::string FaucetGet(uint64_t txfee)
+{
+    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_FAUCET);
+    if ( txfee == 0 )
+        txfee = 10000;
+    faucetpk = GetUnspendable(EVAL_FAUCET,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddFaucetInputs(cp,mtx,faucetpk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find faucet inputs\n");
+    return(0);
+}
+
 std::string FaucetFund(uint64_t txfee,uint64_t funds)
 {
     CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret;
@@ -157,22 +177,4 @@ std::string FaucetFund(uint64_t txfee,uint64_t funds)
     return(0);
 }
 
-std::string FaucetGet(uint64_t txfee)
-{
-    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN;
-    if ( txfee == 0 )
-        txfee = 10000;
-    faucetpk = GetUnspendable(EVAL_FAUCET,0);
-    mypk = pubkey2pk(Mypubkey());
-    if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
-    {
-        if ( inputs > nValue )
-            CCchange = (inputs - nValue - txfee);
-        if ( CCchange != 0 )
-            mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk));
-        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-       return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
-    } else fprintf(stderr,"cant find faucet inputs\n");
-    return(0);
-}
 

From e04b5c084b1566bffee8f58ff37eb689f4790ac4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:39:58 -1100
Subject: [PATCH 592/623] Fixes

---
 src/cc/CCassetsCore.cpp  |   4 +-
 src/cc/CCassetstx.cpp    |  70 +++++++++++++++------------
 src/cc/CCinclude.h       |   4 +-
 src/cc/CCtx.cpp          |  12 ++---
 src/cc/CCutils.cpp       |   6 +--
 src/cc/faucet.cpp        |  13 ++---
 src/cc/rewards.cpp       | 102 ++++++++++++++++++++-------------------
 src/wallet/rpcwallet.cpp |  32 ++++++------
 8 files changed, 131 insertions(+), 112 deletions(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index e837b0fb2..88ebf0feb 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -185,13 +185,13 @@ bool SetAssetOrigpubkey(std::vector<uint8_t> &origpubkey,uint64_t &price,const C
     else return(false);
 }
            
-bool GetAssetorigaddrs(char *CCaddr,char *destaddr,const CTransaction& tx)
+bool GetAssetorigaddrs(struct CCcontract_info *cp,char *CCaddr,char *destaddr,const CTransaction& tx)
 {
     uint256 assetid,assetid2; uint64_t price,nValue=0; int32_t n; uint8_t funcid; std::vector<uint8_t> origpubkey; CScript script;
     n = tx.vout.size();
     if ( n == 0 || (funcid= DecodeAssetOpRet(tx.vout[n-1].scriptPubKey,assetid,assetid2,price,origpubkey)) == 0 )
         return(false);
-    if ( GetCCaddress(EVAL_ASSETS,CCaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
+    if ( GetCCaddress(cp,CCaddr,pubkey2pk(origpubkey)) != 0 && Getscriptaddress(destaddr,CScript() << origpubkey << OP_CHECKSIG) != 0 )
         return(true);
     else return(false);
 }
diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index 29fb299c0..d961d1713 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -15,11 +15,11 @@
 
 #include "CCassets.h"
 
-uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+uint64_t AddAssetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_ASSETS,coinaddr,pk);
+    GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
     //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
@@ -44,13 +44,15 @@ uint64_t AddAssetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint
 
 uint64_t GetAssetBalance(CPubKey pk,uint256 tokenid)
 {
-    CMutableTransaction mtx;
-    return(AddAssetInputs(mtx,pk,tokenid,0,0));
+    CMutableTransaction mtx; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
+    return(AddAssetInputs(cp,mtx,pk,tokenid,0,0));
 }
 
 UniValue AssetOrders(uint256 refassetid)
 {
-    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65];
+    uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65]; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
@@ -71,7 +73,7 @@ UniValue AssetOrders(uint256 refassetid)
                 else item.push_back(Pair("askamount",(double)vintx.vout[0].nValue));
                 if ( origpubkey.size() == 33 )
                 {
-                    GetCCaddress(EVAL_ASSETS,origaddr,pubkey2pk(origpubkey));
+                    GetCCaddress(cp,origaddr,pubkey2pk(origpubkey));
                     item.push_back(Pair("origaddress",origaddr));
                 }
                 if ( assetid != zeroid )
@@ -93,7 +95,8 @@ UniValue AssetOrders(uint256 refassetid)
 
 std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std::string description)
 {
-    CMutableTransaction mtx; CPubKey mypk;
+    CMutableTransaction mtx; CPubKey mypk; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( name.size() > 32 || description.size() > 4096 )
     {
         fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size());
@@ -106,14 +109,15 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     {
         mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,assetsupply,mypk));
         mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);
 }
                
 std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> destpubkey,uint64_t total)
 {
-    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0; //int32_t i,n;
+    CMutableTransaction mtx; CPubKey mypk; uint64_t CCchange=0,inputs=0;  struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -124,7 +128,7 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
         {
             for (i=0; i<n; i++)
                 total += amounts[i];*/
-            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,total,60)) > 0 )
+            if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,total,60)) > 0 )
             {
                 if ( inputs > total )
                     CCchange = (inputs - total);
@@ -132,7 +136,7 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
                     mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,total,pubkey2pk(destpubkey)));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
+                return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey())));
             } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN);
         //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size());
     }
@@ -141,29 +145,31 @@ std::string AssetTransfer(uint64_t txfee,uint256 assetid,std::vector<uint8_t> de
 
 std::string CreateBuyOffer(uint64_t txfee,uint64_t bidamount,uint256 assetid,uint64_t pricetotal)
 {
-    CMutableTransaction mtx; CPubKey mypk;
+    CMutableTransaction mtx; CPubKey mypk; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,bidamount+txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount,GetUnspendable(EVAL_ASSETS,0)));
-        return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
+        mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount,GetUnspendable(cp,0)));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet('b',assetid,zeroid,pricetotal,Mypubkey())));
     }
     return(0);
 }
 
 std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256 assetid2,uint64_t pricetotal)
 {
-    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret;
+    CMutableTransaction mtx; CPubKey mypk; uint64_t inputs,CCchange; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        if ( (inputs= AddAssetInputs(mtx,mypk,assetid,askamount,60)) > 0 )
+        if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,askamount,60)) > 0 )
         {
-            mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount,GetUnspendable(EVAL_ASSETS,0)));
+            mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount,GetUnspendable(cp,0)));
             if ( inputs > askamount )
                 CCchange = (inputs - askamount);
             if ( CCchange != 0 )
@@ -171,7 +177,7 @@ std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256
             if ( assetid2 == zeroid )
                 opret = EncodeAssetOpRet('s',assetid,zeroid,pricetotal,Mypubkey());
             else opret = EncodeAssetOpRet('e',assetid,assetid2,pricetotal,Mypubkey());
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,opret));
+            return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
         }
     }
     return(0);
@@ -179,7 +185,8 @@ std::string CreateSell(uint64_t txfee,uint64_t askamount,uint256 assetid,uint256
 
 std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
 {
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk;
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t bidamount; CPubKey mypk; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -190,7 +197,7 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
             bidamount = vintx.vout[0].nValue;
             mtx.vin.push_back(CTxIn(bidtxid,0,CScript()));
             mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
+            return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet('o',assetid,zeroid,0,Mypubkey())));
         }
     }
     return(0);
@@ -198,7 +205,8 @@ std::string CancelBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid)
 
 std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
 {
-    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk;
+    CMutableTransaction mtx; CTransaction vintx; uint256 hashBlock; uint64_t askamount; CPubKey mypk; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -209,7 +217,7 @@ std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
             askamount = vintx.vout[0].nValue;
             mtx.vin.push_back(CTxIn(asktxid,0,CScript()));
             mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount,mypk));
-            return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
+            return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet('x',assetid,zeroid,0,Mypubkey())));
         }
     }
     return(0);
@@ -217,7 +225,8 @@ std::string CancelSell(uint64_t txfee,uint256 assetid,uint256 asktxid)
 
 std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t fillamount)
 {
-    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0;
+    CTransaction vintx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t bidvout=0; uint64_t origprice,bidamount,paid_amount,remaining_required,inputs,CCchange=0; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -228,18 +237,18 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t
             bidamount = vintx.vout[bidvout].nValue;
             SetAssetOrigpubkey(origpubkey,origprice,vintx);
             mtx.vin.push_back(CTxIn(bidtxid,bidvout,CScript()));
-            if ( (inputs= AddAssetInputs(mtx,mypk,assetid,fillamount,60)) > 0 )
+            if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,fillamount,60)) > 0 )
             {
                 if ( inputs > fillamount )
                     CCchange = (inputs - fillamount);
                 SetAssetFillamounts(0,paid_amount,remaining_required,bidamount,fillamount,origprice);
-                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,bidamount - paid_amount,GetUnspendable(cp,0)));
                 mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
                 mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,fillamount,pubkey2pk(origpubkey)));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
                 fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
+                return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet('B',assetid,zeroid,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx wasnt for assetid\n");
         }
     }
@@ -248,7 +257,8 @@ std::string FillBuyOffer(uint64_t txfee,uint256 assetid,uint256 bidtxid,uint64_t
 
 std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,uint64_t fillamount)
 {
-    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t totalunits,askamount,paid_amount,remaining_required,inputs,CCchange=0;
+    CTransaction vintx,filltx; uint256 hashBlock; CMutableTransaction mtx; CPubKey mypk; std::vector<uint8_t> origpubkey; int32_t askvout=0; uint64_t totalunits,askamount,paid_amount,remaining_required,inputs,CCchange=0; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
@@ -260,20 +270,20 @@ std::string FillSell(uint64_t txfee,uint256 assetid,uint256 assetid2,uint256 ask
             SetAssetOrigpubkey(origpubkey,totalunits,vintx);
             mtx.vin.push_back(CTxIn(asktxid,askvout,CScript()));
             if ( assetid2 == zeroid )
-                inputs = AddAssetInputs(mtx,mypk,assetid2,fillamount,60);
+                inputs = AddAssetInputs(cp,mtx,mypk,assetid2,fillamount,60);
             else inputs = AddNormalinputs(mtx,mypk,fillamount,60);
             if ( inputs > 0 )
             {
                 if ( assetid2 == zeroid && inputs > fillamount )
                     CCchange = (inputs - fillamount);
                 SetAssetFillamounts(1,paid_amount,remaining_required,askamount,fillamount,totalunits);
-                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount - paid_amount,GetUnspendable(EVAL_ASSETS,0)));
+                mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,askamount - paid_amount,GetUnspendable(cp,0)));
                 mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,paid_amount,mypk));
                 mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,fillamount,pubkey2pk(origpubkey)));
                 if ( CCchange != 0 )
                     mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk));
                 fprintf(stderr,"remaining %llu -> origpubkey\n",(long long)remaining_required);
-                return(FinalizeCCTx(EVAL_ASSETS,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
+                return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetOpRet(assetid2==zeroid?'E':'S',assetid,assetid2,remaining_required,origpubkey)));
             } else fprintf(stderr,"filltx not enough utxos\n");
         }
     }
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 539a9b123..1b262f301 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -47,7 +47,7 @@ bool GetAddressUnspent(uint160 addressHash, int type,std::vector<std::pair<CAddr
 static uint256 zeroid;
 
 // CCcustom
-CPubKey GetUnspendable(uint8_t evalcode,uint8_t *unspendablepriv);
+CPubKey GetUnspendable(struct CCcontract_info *cp,uint8_t *unspendablepriv);
 
 // CCutils
 CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk);
@@ -58,7 +58,7 @@ uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
 CPubKey pubkey2pk(std::vector<uint8_t> pubkey);
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk);
+bool GetCCaddress(struct CCcontract_info *cp,char *destaddr,CPubKey pk);
 bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue);
 bool PreventCC(Eval* eval,const CTransaction &tx,int32_t preventCCvins,int32_t numvins,int32_t preventCCvouts,int32_t numvouts);
 bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 5a8b3607a..b37e6f061 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -38,7 +38,7 @@ bool SignTx(CMutableTransaction &mtx,int32_t vini,uint64_t utxovalue,const CScri
 #endif
 }
 
-std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
+std::string FinalizeCCTx(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret)
 {
     auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus());
     CTransaction vintx; std::string hex; uint256 hashBlock; uint64_t vinimask=0,utxovalues[64],change,totaloutputs=0,totalinputs=0; int32_t i,utxovout,n,err = 0; char myaddr[64],destaddr[64],unspendable[64]; uint8_t *privkey,myprivkey[32],unspendablepriv[32],*msg32 = 0; CC *mycond=0,*othercond=0,*cond; CPubKey unspendablepk;
@@ -54,11 +54,11 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
         return(0);
     }
     Myprivkey(myprivkey);
-    unspendablepk = GetUnspendable(evalcode,unspendablepriv);
-    GetCCaddress(evalcode,myaddr,mypk);
-    mycond = MakeCCcond1(evalcode,mypk);
-    GetCCaddress(evalcode,unspendable,unspendablepk);
-    othercond = MakeCCcond1(evalcode,unspendablepk);
+    unspendablepk = GetUnspendable(cp,unspendablepriv);
+    GetCCaddress(cp,myaddr,mypk);
+    mycond = MakeCCcond1(cp->evalcode,mypk);
+    GetCCaddress(cp,unspendable,unspendablepk);
+    othercond = MakeCCcond1(cp->evalcode,unspendablepk);
     //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index ceccee93e..80a2e5af6 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -106,13 +106,13 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     return(false);
 }
 
-bool GetCCaddress(uint8_t evalcode,char *destaddr,CPubKey pk)
+bool GetCCaddress(struct CCcontract_info *cp,char *destaddr,CPubKey pk)
 {
     CC *payoutCond;
     destaddr[0] = 0;
     if ( pk.size() == 0 )
-        pk = GetUnspendable(evalcode,0);
-    if ( (payoutCond= MakeCCcond1(evalcode,pk)) != 0 )
+        pk = GetUnspendable(cp,0);
+    if ( (payoutCond= MakeCCcond1(cp->evalcode,pk)) != 0 )
     {
         Getscriptaddress(destaddr,CCPubKey(payoutCond));
         cc_free(payoutCond);
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 24cd6f612..0882e0a6b 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -120,7 +120,7 @@ uint64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPu
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_FAUCET,coinaddr,pk);
+    GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
@@ -148,7 +148,7 @@ std::string FaucetGet(uint64_t txfee)
     cp = CCinit(&C,EVAL_FAUCET);
     if ( txfee == 0 )
         txfee = 10000;
-    faucetpk = GetUnspendable(EVAL_FAUCET,0);
+    faucetpk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
     if ( (inputs= AddFaucetInputs(cp,mtx,faucetpk,nValue+txfee,60)) > 0 )
     {
@@ -157,22 +157,23 @@ std::string FaucetGet(uint64_t txfee)
         if ( CCchange != 0 )
             mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk));
         mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
     } else fprintf(stderr,"cant find faucet inputs\n");
     return(0);
 }
 
 std::string FaucetFund(uint64_t txfee,uint64_t funds)
 {
-    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret;
+    CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_FAUCET);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
-    faucetpk = GetUnspendable(EVAL_FAUCET,0);
+    faucetpk = GetUnspendable(cp,0);
     if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,funds,faucetpk));
-        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
     }
     return(0);
 }
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index b08cd6bd7..6dfae6839 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -24,12 +24,12 @@ uint64_t RewardsCalc(uint64_t claim,uint256 txid)
     return(reward);
 }
 
-uint64_t IsRewardsvout(const CTransaction& tx,int32_t v)
+uint64_t IsRewardsvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
 {
     char destaddr[64];
     if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
     {
-        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,RewardsCCaddr) == 0 )
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
             return(tx.vout[v].nValue);
     }
     return(0);
@@ -51,7 +51,7 @@ bool RewardsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransactio
             {
                 if ( hashBlock == zerohash )
                     return eval->Invalid("cant rewards from mempool");
-                if ( (assetoshis= IsRewardsvout(vinTx,tx.vin[i].prevout.n)) != 0 )
+                if ( (assetoshis= IsRewardsvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
         }
@@ -59,7 +59,7 @@ bool RewardsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransactio
     for (i=0; i<numvouts; i++)
     {
         //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
-        if ( (assetoshis= IsRewardsvout(tx,i)) != 0 )
+        if ( (assetoshis= IsRewardsvout(cp,tx,i)) != 0 )
             outputs += assetoshis;
     }
     if ( inputs != outputs+COIN+txfee )
@@ -90,7 +90,7 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
         else
         {
             preventCCvouts = 1;
-            if ( IsRewardsvout(tx,0) != 0 )
+            if ( IsRewardsvout(cp,tx,0) != 0 )
             {
                 preventCCvouts++;
                 i = 1;
@@ -124,18 +124,18 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
     return(false);
 }*/
 
-uint64_t AddRewardsInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
-    GetCCaddress(EVAL_REWARDS,coinaddr,pk);
+    GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;
         if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
         {
-            if ( (nValue= IsRewardsvout(vintx,(int32_t)it->first.index)) > 0 )
+            if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 )
             {
                 if ( total != 0 && maxinputs != 0 )
                     mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
@@ -150,50 +150,13 @@ uint64_t AddRewardsInputs(CMutableTransaction &mtx,CPubKey pk,uint64_t total,int
     return(totalinputs);
 }
 
-// 0.834% every 60 days, min 100, capped at 0.834%
-
-std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
-{
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    mypk = pubkey2pk(Mypubkey());
-    rewardspk = GetUnspendable(EVAL_REWARDS,0);
-    if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,funds,rewardspk));
-        mtx.vout.push_back(CTxOut(APR,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
-        mtx.vout.push_back(CTxOut(minseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
-        mtx.vout.push_back(CTxOut(maxseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
-        mtx.vout.push_back(CTxOut(mindeposit,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
-        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
-    }
-    return(0);
-}
-
-std::string RewardsLock(uint64_t txfee,uint64_t amount)
-{
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret;
-    if ( txfee == 0 )
-        txfee = 10000;
-    rewardspk = GetUnspendable(EVAL_REWARDS,0);
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,amount+2*txfee,64) > 0 )
-    {
-        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,amount,rewardspk));
-        // specify destination pubkey, funding txid
-        //opret = ;//
-        return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
-    } else fprintf(stderr,"cant find rewards inputs\n");
-    return(0);
-}
-
 std::string RewardsUnlock(uint64_t txfee)
 {
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,claim,inputs,CCchange=0;
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,claim,inputs,CCchange=0; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_REWARDS);
     if ( txfee == 0 )
         txfee = 10000;
-    rewardspk = GetUnspendable(EVAL_REWARDS,0);
+    rewardspk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
     if ( (claim= AddRewardsInputs(mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
     {
@@ -204,9 +167,50 @@ std::string RewardsUnlock(uint64_t txfee)
             if ( CCchange != 0 )
                 mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,CCchange,rewardspk));
             mtx.vout.push_back(CTxOut(claim+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            return(FinalizeCCTx(EVAL_REWARDS,mtx,mypk,txfee,opret));
+            return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
         }
     } else fprintf(stderr,"cant find rewards inputs\n");
     return(0);
 }
 
+// 0.834% every 60 days, min 100, capped at 0.834%
+
+std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
+{
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    rewardspk = GetUnspendable(cp,0);
+    if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,funds,rewardspk));
+        mtx.vout.push_back(CTxOut(APR,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(minseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(maxseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(mindeposit,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+std::string RewardsLock(uint64_t txfee,uint64_t amount)
+{
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( txfee == 0 )
+        txfee = 10000;
+    rewardspk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( AddNormalinputs(mtx,mypk,amount+2*txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,amount,rewardspk));
+        // specify destination pubkey, funding txid
+        //opret = ;//
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find rewards inputs\n");
+    return(0);
+}
+
+
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ac202298d..5d92a585f 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4846,21 +4846,22 @@ int32_t ensure_CCrequirements()
 
 UniValue rewardsaddress(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_REWARDS);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("rewardsaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(pubkey)) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("RewardsCCaddress",destaddr));
     if ( params.size() == 1 )
     {
         pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(pubkey)) != 0 )
+        if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
             result.push_back(Pair("CCaddress",destaddr));
     }
-    if ( GetCCaddress(EVAL_REWARDS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 )
         result.push_back(Pair("myCCaddress",destaddr));
     return(result);
 }
@@ -4935,21 +4936,22 @@ UniValue rewardsunlock(const UniValue& params, bool fHelp)
 
 UniValue faucetaddress(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_FAUCET);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("faucetaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(pubkey)) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("FaucetCCaddress",destaddr));
     if ( params.size() == 1 )
     {
         pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(pubkey)) != 0 )
+        if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
             result.push_back(Pair("CCaddress",destaddr));
     }
-    if ( GetCCaddress(EVAL_FAUCET,destaddr,pubkey2pk(Mypubkey())) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 )
         result.push_back(Pair("myCCaddress",destaddr));
     return(result);
 }
@@ -5002,7 +5004,8 @@ UniValue tokenorders(const UniValue& params, bool fHelp)
 
 UniValue tokenbalance(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); char destaddr[64]; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey;
+    UniValue result(UniValue::VOBJ); char destaddr[64]; uint256 tokenid; uint64_t balance; std::vector<unsigned char> pubkey; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( fHelp || params.size() > 2 )
         throw runtime_error("tokenbalance tokenid [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
@@ -5012,7 +5015,7 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
         pubkey = ParseHex(params[1].get_str().c_str());
     else pubkey = Mypubkey();
     result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("CCaddress",destaddr));
     balance = GetAssetBalance(pubkey2pk(pubkey),tokenid);
     result.push_back(Pair("tokenid", params[0].get_str()));
@@ -5022,21 +5025,22 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
 
 UniValue tokenaddress(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64];
+    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("tokenaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
         result.push_back(Pair("AssetsCCaddress",destaddr));
     if ( params.size() == 1 )
     {
         pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(pubkey)) != 0 )
+        if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
             result.push_back(Pair("CCaddress",destaddr));
     }
-    if ( GetCCaddress(EVAL_ASSETS,destaddr,pubkey2pk(Mypubkey())) != 0 )
+    if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 )
         result.push_back(Pair("myCCaddress",destaddr));
     return(result);
 }

From 3749ec7019829cab486553e0c9518d8e11dc82f1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:41:23 -1100
Subject: [PATCH 593/623] Fx

---
 src/cc/CCassetsCore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp
index 88ebf0feb..466db2d1b 100644
--- a/src/cc/CCassetsCore.cpp
+++ b/src/cc/CCassetsCore.cpp
@@ -258,7 +258,7 @@ uint64_t AssetValidateCCvin(struct CCcontract_info *cp,Eval* eval,char *CCaddr,c
     }
     else if ( vinTx.vout[0].nValue < 10000 )
         return eval->Invalid("invalid dust for buyvin");
-    else if ( GetAssetorigaddrs(CCaddr,origaddr,vinTx) == 0 )
+    else if ( GetAssetorigaddrs(cp,CCaddr,origaddr,vinTx) == 0 )
         return eval->Invalid("couldnt get origaddr for buyvin");
     fprintf(stderr,"Got %.8f to origaddr.(%s)\n",(double)vinTx.vout[tx.vin[vini].prevout.n].nValue/COIN,origaddr);
     return(vinTx.vout[0].nValue);

From d0c3462029c20b434404688ca1f7a77dc515cee9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:43:48 -1100
Subject: [PATCH 594/623] Test

---
 src/cc/CCinclude.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index 1b262f301..b10b64478 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -66,7 +66,7 @@ std::vector<uint8_t> Mypubkey();
 bool Myprivkey(uint8_t myprivkey[]);
 
 // CCtx
-std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret);
+std::string FinalizeCCTx(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey mypk,uint64_t txfee,CScript opret);
 void SetCCunspents(std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > &unspentOutputs,char *coinaddr);
 uint64_t AddNormalinputs(CMutableTransaction &mtx,CPubKey mypk,uint64_t total,int32_t maxinputs);
 

From f9ebfa97bb39aad8f3560f48580c606647b11f9f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:45:05 -1100
Subject: [PATCH 595/623] Fix

---
 src/cc/rewards.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 6dfae6839..961883c5f 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -158,9 +158,9 @@ std::string RewardsUnlock(uint64_t txfee)
         txfee = 10000;
     rewardspk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( (claim= AddRewardsInputs(mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
+    if ( (claim= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
     {
-        if ( (inputs= AddRewardsInputs(mtx,mypk,reward+txfee,30)) > 0 )
+        if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+txfee,30)) > 0 )
         {
             if ( inputs > (reward+txfee) )
                 CCchange = (inputs - reward - txfee);

From a35184925bba241f193b700339897edfa6c2b9b4 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:50:32 -1100
Subject: [PATCH 596/623] Test

---
 src/cc/CCassetstx.cpp |  4 ++--
 src/cc/CCcustom.cpp   |  8 ++++++--
 src/cc/rewards.cpp    | 21 ---------------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp
index d961d1713..c52864218 100644
--- a/src/cc/CCassetstx.cpp
+++ b/src/cc/CCassetstx.cpp
@@ -53,7 +53,7 @@ UniValue AssetOrders(uint256 refassetid)
 {
     uint64_t price; uint256 txid,hashBlock,assetid,assetid2; std::vector<uint8_t> origpubkey; CTransaction vintx; UniValue result(UniValue::VARR);  std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs; uint8_t funcid; char funcidstr[16],origaddr[64],assetidstr[65]; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_ASSETS);
-    SetCCunspents(unspentOutputs,(char *)AssetsCCaddr);
+    SetCCunspents(unspentOutputs,(char *)cp->unspendableCCaddr);
     for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
     {
         txid = it->first.txhash;
@@ -108,7 +108,7 @@ std::string CreateAsset(uint64_t txfee,uint64_t assetsupply,std::string name,std
     if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,assetsupply,mypk));
-        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(AssetsCChexstr) << OP_CHECKSIG));
+        mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(cp->CChexstr) << OP_CHECKSIG));
         return(FinalizeCCTx(cp,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description)));
     }
     return(0);
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 69353213f..8ebbe821d 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -21,11 +21,15 @@
 /*
  CCcustom has most of the functions that need to be extended to create a new CC contract.
  
- EVAL_CONTRACT is the naming convention and it should be added to cc/eval.h
-
  A CC scriptPubKey can only be spent if it is properly signed and validated. By constraining the vins and vouts, it is possible to implement a variety of functionality. CC vouts have an otherwise non-standard form, but it is properly supported by the enhanced bitcoin protocol code as a "cryptoconditions" output and the same pubkey will create a different address.
  
  This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented.
+ 
+ what needs to be done to add a new contract:
+ 1. add EVAL_CODE to eval.h
+ 2. initialize the variables in the CCinit function below
+ 3. write a Validate function to reject any unsanctioned usage of vin/vout
+ 4. make helper functions to create rawtx for RPC functions
  */
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 961883c5f..fe1583303 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -103,27 +103,6 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
     return(true);
 }
 
-/*bool ProcessRewards(Eval* eval, std::vector<uint8_t> paramsNull,const CTransaction &ctx, unsigned int nIn)
-{
-    static uint256 prevtxid; uint256 txid;
-    txid = ctx.GetHash();
-    if ( txid == prevtxid )
-        return(true);
-    fprintf(stderr,"ProcessRewards\n");
-    if ( paramsNull.size() != 0 ) // Don't expect params
-        return eval->Invalid("Cannot have params");
-    else if ( ctx.vout.size() == 0 )
-        return eval->Invalid("no-vouts");
-    if ( RewardsValidate(eval,ctx) != 0 )
-    {
-        fprintf(stderr,"ProcessRewards valid\n");
-        prevtxid = txid;
-        return(true);
-    }
-    fprintf(stderr,"ProcessRewards failed\n");
-    return(false);
-}*/
-
 uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
     char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;

From da8b0b333653ce2539fd61c3d1fc6f27a9944fe2 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 00:56:29 -1100
Subject: [PATCH 597/623] Test

---
 src/cc/CCcustom.cpp |  2 ++
 src/cc/faucet.cpp   | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 8ebbe821d..d15e43a02 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -30,6 +30,8 @@
  2. initialize the variables in the CCinit function below
  3. write a Validate function to reject any unsanctioned usage of vin/vout
  4. make helper functions to create rawtx for RPC functions
+ 5. add rpc calls to rpcserver.cpp and rpcserver.h and in one of the rpc.cpp files
+ 6. add the new .cpp files to src/Makefile.am
  */
 
 //BTCD Address: RAssetsAtGnvwgK9gVHBbAU4sVTah1hAm5
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 0882e0a6b..00b01d76f 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -79,7 +79,7 @@ bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction
 
 bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
 {
-    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i;
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
     numvins = tx.vin.size();
     numvouts = tx.vout.size();
     preventCCvins = preventCCvouts = -1;
@@ -87,18 +87,23 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
         return eval->Invalid("no vouts");
     else
     {
-        fprintf(stderr,"check vins\n");
+        //fprintf(stderr,"check vins\n");
         for (i=0; i<numvins; i++)
         {
             if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            {
+                fprintf(stderr,"faucetget invalid vini\n");
                 return eval->Invalid("illegal normal vini");
+            }
         }
-        fprintf(stderr,"check amounts\n");
+        //fprintf(stderr,"check amounts\n");
         if ( FaucetExactAmounts(cp,eval,tx,1,10000) == false )
+        {
+            fprintf(stderr,"faucetget invalid amount\n");
             return false;
+        }
         else
         {
-            fprintf(stderr,"check rest\n");
             preventCCvouts = 1;
             if ( IsFaucetvout(cp,tx,0) != 0 )
             {
@@ -107,8 +112,11 @@ bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx
             } else i = 0;
             if ( tx.vout[i].nValue != COIN )
                 return eval->Invalid("invalid faucet output");
-            fprintf(stderr,"check CC\n");
-            return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts));
+            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
+            if ( retval != 0 )
+                fprintf(stderr,"faucetget validated\n");
+            else fprintf(stderr,"faucetget invalid\n");
+            return(retval);
         }
     }
 }

From 72546a6ef243daafeed2e0907511db8ea127ed2f Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Tue, 24 Jul 2018 17:44:13 +0200
Subject: [PATCH 598/623] remove travis deployment

---
 .travis.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81c2092aa..de6f6a538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,13 +21,3 @@ notifications:
       Time: %{duration}'
     - 'Change view : %{compare_url}'
     - 'Build details : %{build_url}'
-before_deploy:
-  - git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)"
-deploy:
-  provider: releases
-  api_key:
-    secure: oyMB9JDSoL/val/d80Em3sd3mSJY+PPkiclUb3ktizNz7DgYZbBiStUOZIJo95GUYADEvm9RVrP0JmBiDuqneEjfFRzME9/MnpY/LmRCiYGgprMDR80ZqbLgOzSKpE10RE2XM3vZkZeXT/JcGGayUm0faElep2qx62S4ozsAxSvFJ5l/PG+wEltrlnp1z8uYdXV3PBChbjzXJ0BdMVxMrrU39kwzqwu2Ge9PnNjVv0AVxn/oZpf+bzYa7vkSuGTRe2Jcs8U9AABYnZ22wu+tdlD76pdOJzGEwR70e8CjUJmdSn+M+wwAPPHStPW/JHFwSaWsKZtUyB5EWQW2kqq6P+M1Fe7yo6srznsaAcZRWeCrbUO/k44bEfnj7HMGmxfjDJOwbxVEoHg7im+l3HLUiG8rcw5dM/TAnrmgjH/OEj/EM1lbwV2C+PdDGOjdguljEhjBABGRbRABMZjwW8w+uBFVlKlcn7y+zJbMB3mGd+FNGo/OgAcsFzRcpaN8SrC/kzUF2SeEwJjTKvAqRgA66yl7CzDPBtUv2NtoPUz/8YO9rsdGElcWfmDIVacuIEjo1CizlbDzeS7zPiFPW5MRCGryLFLt0WjA/s8lkLO+DbGYXPa4rG6+7ZNUDLfziM+lFqZH8b382/bhv+a6ctpWjaazjiW6yWemsuN8QhByuGw=
-  file: src/komodod
-  skip_cleanup: true
-  on:
-    repo: KomodoPlatform/komodo

From cfea7a4690190628a29d0bed00e363b86bbe5232 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:13:05 -1100
Subject: [PATCH 599/623] Dice skeleton

---
 src/cc/CCcustom.cpp      |  17 ++++
 src/cc/CCdice.h          |  29 +++++++
 src/cc/CCinclude.h       |   2 +
 src/cc/CCrewards.h       |   4 +-
 src/cc/CCutils.cpp       |  24 ++++++
 src/cc/assets.cpp        |   2 +-
 src/cc/dice.cpp          | 182 +++++++++++++++++++++++++++++++++++++++
 src/cc/rewards.cpp       | 101 ++++++++++++++++------
 src/rpcserver.cpp        |   7 +-
 src/rpcserver.h          |   3 +
 src/wallet/rpcwallet.cpp | 149 ++++++++++++++++++++------------
 11 files changed, 435 insertions(+), 85 deletions(-)
 create mode 100644 src/cc/CCdice.h
 create mode 100644 src/cc/dice.cpp

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index d15e43a02..f4642c82e 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -71,6 +71,16 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 #undef FUNCNAME
 #undef EVALCODE
 
+// Dice
+#define FUNCNAME IsDiceInput
+#define EVALCODE EVAL_DICE
+const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
+char DiceCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
+uint8_t DiceCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
 struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
 {
     cp->evalcode = evalcode;
@@ -97,6 +107,13 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
             cp->validate = RewardsValidate;
             cp->ismyvin = IsRewardsInput;
             break;
+        case EVAL_DICE:
+            strcpy(cp->unspendableCCaddr,DiceCCaddr);
+            strcpy(cp->CChexstr,DiceCChexstr);
+            memcpy(cp->CCpriv,DiceCCpriv,32);
+            cp->validate = DiceValidate;
+            cp->ismyvin = IsDiceInput;
+            break;
     }
     return(cp);
 }
diff --git a/src/cc/CCdice.h b/src/cc/CCdice.h
new file mode 100644
index 000000000..582a9fe64
--- /dev/null
+++ b/src/cc/CCdice.h
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_REWARDS_H
+#define CC_REWARDS_H
+
+#include "CCinclude.h"
+
+#define EVAL_DICE 0xe6
+
+bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+
+std::string DiceFund(uint64_t txfee,uint64_t funds);
+std::string DiceBet(uint64_t txfee,uint64_t amount,uint64_t odds)
+
+#endif
diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h
index b10b64478..f72fce237 100644
--- a/src/cc/CCinclude.h
+++ b/src/cc/CCinclude.h
@@ -54,6 +54,8 @@ CTxOut MakeCC1vout(uint8_t evalcode,CAmount nValue,CPubKey pk);
 CC *MakeCCcond1(uint8_t evalcode,CPubKey pk);
 CC* GetCryptoCondition(CScript const& scriptSig);
 bool IsCCInput(CScript const& scriptSig);
+int32_t unstringbits(char *buf,uint64_t bits);
+uint64_t stringbits(char *str);
 uint256 revuint256(uint256 txid);
 char *uint256_str(char *dest,uint256 txid);
 uint256 Parseuint256(char *hexstr);
diff --git a/src/cc/CCrewards.h b/src/cc/CCrewards.h
index fe900c02b..35fe87960 100644
--- a/src/cc/CCrewards.h
+++ b/src/cc/CCrewards.h
@@ -23,8 +23,8 @@
 
 bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
 
-std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
-std::string RewardsLock(uint64_t txfee,uint64_t amount);
+std::string RewardsFund(uint64_t txfee,char *planstr,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
+std::string RewardsLock(uint64_t txfee,char *planstr,uint64_t amount)
 std::string RewardsUnlock(uint64_t txfee);
 
 #endif
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index 80a2e5af6..f8617e536 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -55,6 +55,30 @@ bool IsCCInput(CScript const& scriptSig)
     return true;
 }
 
+int32_t unstringbits(char *buf,uint64_t bits)
+{
+    int32_t i;
+    for (i=0; i<8; i++,bits>>=8)
+        if ( (buf[i]= (char)(bits & 0xff)) == 0 )
+            break;
+    buf[i] = 0;
+    return(i);
+}
+
+uint64_t stringbits(char *str)
+{
+    uint64_t bits = 0;
+    if ( str == 0 )
+        return(0);
+    int32_t i,n = (int32_t)strlen(str);
+    if ( n > 8 )
+        n = 8;
+    for (i=n-1; i>=0; i--)
+        bits = (bits << 8) | (str[i] & 0xff);
+    //printf("(%s) -> %llx %llu\n",str,(long long)bits,(long long)bits);
+    return(bits);
+}
+
 uint256 revuint256(uint256 txid)
 {
     uint256 revtxid; int32_t i;
diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index b1a34d524..8462c0b16 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -48,7 +48,7 @@
  create
  vin.0: normal input
  vout.0: issuance assetoshis to CC
- vout.1: tag sent to AssetsCCaddress
+ vout.1: tag sent to normal address of AssetsCCaddress
  vout.2: normal output for change (if any)
  vout.n-1: opreturn [EVAL_ASSETS] ['c'] [origpubkey] "<assetname>" "<description>"
  
diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp
new file mode 100644
index 000000000..f76fc02ab
--- /dev/null
+++ b/src/cc/dice.cpp
@@ -0,0 +1,182 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCdice.h"
+#include "../txmempool.h"
+
+/*
+*/
+
+// start of consensus code
+
+uint64_t IsDicevout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
+{
+    char destaddr[64];
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
+    return(0);
+}
+
+bool DiceExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+{
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=0; i<numvins; i++)
+    {
+        //fprintf(stderr,"vini.%d\n",i);
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
+        {
+            //fprintf(stderr,"vini.%d check mempool\n",i);
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("cant find vinTx");
+            else
+            {
+                //fprintf(stderr,"vini.%d check hash and vout\n",i);
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant dice from mempool");
+                if ( (assetoshis= IsDicevout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
+            }
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        if ( (assetoshis= IsDicevout(cp,tx,i)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs+COIN+txfee )
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
+    }
+    else return(true);
+}
+
+bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+{
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    preventCCvins = preventCCvouts = -1;
+    if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else
+    {
+        //fprintf(stderr,"check vins\n");
+        for (i=0; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            {
+                fprintf(stderr,"diceget invalid vini\n");
+                return eval->Invalid("illegal normal vini");
+            }
+        }
+        //fprintf(stderr,"check amounts\n");
+        if ( DiceExactAmounts(cp,eval,tx,1,10000) == false )
+        {
+            fprintf(stderr,"diceget invalid amount\n");
+            return false;
+        }
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsDicevout(cp,tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return eval->Invalid("invalid dice output");
+            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
+            if ( retval != 0 )
+                fprintf(stderr,"diceget validated\n");
+            else fprintf(stderr,"diceget invalid\n");
+            return(retval);
+        }
+    }
+}
+// end of consensus code
+
+// helper functions for rpc calls in rpcwallet.cpp
+
+uint64_t AddDiceInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(cp,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsDicevout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+std::string DiceBet(uint64_t txfee,uint64_t amount,uint64_t odds)
+{
+    CMutableTransaction mtx; CPubKey mypk,dicepk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_DICE);
+    if ( txfee == 0 )
+        txfee = 10000;
+    dicepk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddDiceInputs(cp,mtx,dicepk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_DICE,CCchange,dicepk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find dice inputs\n");
+    return(0);
+}
+
+std::string DiceFund(uint64_t txfee,uint64_t funds)
+{
+    CMutableTransaction mtx; CPubKey mypk,dicepk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_DICE);
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    dicepk = GetUnspendable(cp,0);
+    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeCC1vout(EVAL_DICE,funds,dicepk));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index fe1583303..7ec3b83e6 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -16,11 +16,34 @@
 #include "CCinclude.h"
 
 /*
+ The rewards CC contract is initially for OOT, which needs this functionality. However, many of the attributes can be parameterized to allow different rewards programs to run. Multiple rewards plans could even run on the same blockchain, though the user would need to choose which one to lock funds into.
+ 
+ At the high level, the user would lock funds for some amount of time and at the end of it, would get all the locked funds back with an additional reward. So there needs to be a lock funds and unlock funds ability. Additionally, the rewards need to come from somewhere, so similar to the faucet, there would be a way to fund the reward.
+ 
+ Additional requirements are for the user to be able to lock funds via SPV. This requirement in turns forces the creation of a way for anybody to be able to unlock the funds as that operation requires a native daemon running and cant be done over SPV. The idea is to allow anybody to run a script that would unlock all funds that are matured. As far as the user is concerned, he locks his funds via SPV and after some time it comes back with an extra reward.
+ 
+ In reality, the funds are locked into a CC address that is unspendable, except for some special conditions and it needs to come back to the address that funded the lock. In order to implement this, several things are clear.
+ 
+ 1) each locked CC utxo needs to be linked to a specific rewards plan
+ 2) each locked CC utxo needs to know the only address that it can be unlocked into
+ 3) SPV requirement means the lock transaction needs to be able to be created without any CC signing
+ 
+ The opreturn will be used to store the name of the rewards plan and all funding and locked funds with the same plan will use the same pool of rewards. plan names will be limited to 8 chars and encoded into a uint64_t.
+ 
+ The initial funding transaction will have all the parameters for the rewards plan encoded in the vouts. Additional fundings will just increase the available CC utxo for the rewards.
+ 
+ Locks wont have any CC vins, but will send to the RewardsCCaddress, with the plan stringbits in the opreturn. vout1 will have the unlock address and no other destination is valid.
+ 
+ Unlock does a CC spend to the vout1 address
  */
 
-uint64_t RewardsCalc(uint64_t claim,uint256 txid)
+uint64_t RewardsCalc(uint64_t claim,uint256 txid) // min/max time, mindeposit and rate
 {
     uint64_t reward = 0;
+    // get start time, get current time
+    // if elapsed < mintime -> return 0
+    // if elapsed > maxtime, elapsed = maxtime
+    // calc reward
     return(reward);
 }
 
@@ -80,6 +103,7 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
         return eval->Invalid("no vouts");
     else
     {
+        // follow rules
         for (i=0; i<numvins; i++)
         {
             if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
@@ -105,7 +129,7 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
 
 uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
 {
-    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    char coinaddr[64]; uint64_t nValue,totalinputs = 0; uint256 txid,hashBlock; CTransaction vintx; int32_t n = 0;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     GetCCaddress(cp,coinaddr,pk);
     SetCCunspents(unspentOutputs,coinaddr);
@@ -118,8 +142,7 @@ uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP
             {
                 if ( total != 0 && maxinputs != 0 )
                     mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
-                nValue = it->second.satoshis;
-                totalinputs += nValue;
+                totalinputs += it->second.satoshis;
                 n++;
                 if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
                     break;
@@ -129,34 +152,55 @@ uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP
     return(totalinputs);
 }
 
+uint64_t RewardsPlanFunds(uint64_t &refsbits,struct CCcontract_info *cp,CPubKey &pk,char *planstr)
+{
+    char coinaddr[64]; uint64_t sbits,totalinputs = 0; uint256 hashBlock; CTransaction vintx;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    if ( planstr == 0 || planstr[0] == 0 || strlen(planstr) > 8 )
+        return(0);
+    refsbits = stringbits(planstr);
+    GetCCaddress(cp,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        if ( GetTransaction(it->first.txhash,vintx,hashBlock,false) != 0 )
+        {
+            xxx if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            {
+                totalinputs += nValue;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
 std::string RewardsUnlock(uint64_t txfee)
 {
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,claim,inputs,CCchange=0; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,amount,inputs,CCchange=0; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_REWARDS);
     if ( txfee == 0 )
         txfee = 10000;
     rewardspk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( (claim= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
+    if ( (amount= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
     {
-        if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+txfee,30)) > 0 )
+        if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+amount+txfee,30)) > 0 )
         {
-            if ( inputs > (reward+txfee) )
-                CCchange = (inputs - reward - txfee);
+            if ( inputs > (amount + reward + 2*txfee) )
+                CCchange = (inputs - amount - reward - txfee);
             if ( CCchange != 0 )
-                mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,CCchange,rewardspk));
-            mtx.vout.push_back(CTxOut(claim+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+                mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk));
+            mtx.vout.push_back(CTxOut(amount+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'U' << sbits);
             return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
         }
     } else fprintf(stderr,"cant find rewards inputs\n");
     return(0);
 }
 
-// 0.834% every 60 days, min 100, capped at 0.834%
-
-std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
+std::string RewardsFund(uint64_t txfee,char *planstr,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit)
 {
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t sbits; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_REWARDS);
     if ( txfee == 0 )
         txfee = 10000;
@@ -164,31 +208,34 @@ std::string RewardsFund(uint64_t txfee,uint64_t funds,uint64_t APR,uint64_t mins
     rewardspk = GetUnspendable(cp,0);
     if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,funds,rewardspk));
+        mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,rewardspk));
         mtx.vout.push_back(CTxOut(APR,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(minseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(maxseconds,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
         mtx.vout.push_back(CTxOut(mindeposit,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG));
+        opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'F' << sbits);
         return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
     }
     return(0);
 }
 
-std::string RewardsLock(uint64_t txfee,uint64_t amount)
+std::string RewardsLock(uint64_t txfee,char *planstr,uint64_t amount)
 {
-    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t sbits,funding; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_REWARDS);
-    if ( txfee == 0 )
-        txfee = 10000;
-    rewardspk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs(mtx,mypk,amount+2*txfee,64) > 0 )
+    rewardspk = GetUnspendable(cp,0);
+    if ( (funding= RewardsPlanFunds(sbits,cp,rewardspk,planstr)) >= amount )
     {
-        mtx.vout.push_back(MakeCC1vout(EVAL_REWARDS,amount,rewardspk));
-        // specify destination pubkey, funding txid
-        //opret = ;//
-        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
-    } else fprintf(stderr,"cant find rewards inputs\n");
+        if ( txfee == 0 )
+            txfee = 10000;
+        if ( AddNormalinputs(mtx,mypk,amount+txfee,64) > 0 )
+        {
+            mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,rewardspk));
+            opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'L' << sbits);
+            return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+        } else fprintf(stderr,"cant find rewards inputs\n");
+    }
     return(0);
 }
 
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 4d766d5ae..40ebd162c 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -354,8 +354,13 @@ static const CRPCCommand vRPCCommands[] =
     { "faucet",       "faucetfund",      &faucetfund,         true },
     { "faucet",       "faucetget",       &faucetget,          true },
     { "faucet",       "faucetaddress",   &faucetaddress,      true },
+    
+    /* dice */
+    { "dice",       "dicefund",      &dicefund,         true },
+    { "dice",       "dicebet",       &dicebet,          true },
+    { "dice",       "diceaddress",   &diceaddress,      true },
 
-/* tokens */
+    /* tokens */
     { "tokens",       "tokenorders",      &tokenorders,       true },
     { "tokens",       "tokenaddress",     &tokenaddress,      true },
     { "tokens",       "tokenbalance",     &tokenbalance,      true },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index eb9f69247..ff06966ba 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -228,6 +228,9 @@ extern UniValue rewardsaddress(const UniValue& params, bool fHelp);
 extern UniValue rewardsfund(const UniValue& params, bool fHelp);
 extern UniValue rewardslock(const UniValue& params, bool fHelp);
 extern UniValue rewardsunlock(const UniValue& params, bool fHelp);
+extern UniValue diceaddress(const UniValue& params, bool fHelp);
+extern UniValue dicefund(const UniValue& params, bool fHelp);
+extern UniValue dicebet(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 5d92a585f..e10a7b09b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4843,21 +4843,17 @@ int32_t ensure_CCrequirements()
 #include "../cc/CCfaucet.h"
 #include "../cc/CCassets.h"
 #include "../cc/CCrewards.h"
+#include "../cc/CCdice.h"
 
-UniValue rewardsaddress(const UniValue& params, bool fHelp)
+UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned char> &pubkey)
 {
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
-    cp = CCinit(&C,EVAL_REWARDS);
-    if ( fHelp || params.size() > 1 )
-        throw runtime_error("rewardsaddress [pubkey]\n");
-    if ( ensure_CCrequirements() < 0 )
-        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    UniValue result(UniValue::VOBJ); ; char destaddr[64],str[64];
     result.push_back(Pair("result", "success"));
+    sprintf(str,"%sCCaddress",name);
     if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-        result.push_back(Pair("RewardsCCaddress",destaddr));
-    if ( params.size() == 1 )
+        result.push_back(Pair(str,destaddr));
+    if ( pubkey.size() == 33 )
     {
-        pubkey = ParseHex(params[0].get_str().c_str());
         if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
             result.push_back(Pair("CCaddress",destaddr));
     }
@@ -4866,6 +4862,58 @@ UniValue rewardsaddress(const UniValue& params, bool fHelp)
     return(result);
 }
 
+UniValue diceaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("diceaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,"Dice",pubkey));
+}
+
+UniValue faucetaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("faucetaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,"Faucet",pubkey));
+}
+
+UniValue rewardsaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("rewardsaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,"Rewards",pubkey));
+}
+
+UniValue tokenaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_REWARDS);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("tokenaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,"Assets",pubkey));
+}
+
 UniValue rewardsfund(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); uint64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex;
@@ -4934,28 +4982,6 @@ UniValue rewardsunlock(const UniValue& params, bool fHelp)
     return(result);
 }
 
-UniValue faucetaddress(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
-    cp = CCinit(&C,EVAL_FAUCET);
-    if ( fHelp || params.size() > 1 )
-        throw runtime_error("faucetaddress [pubkey]\n");
-    if ( ensure_CCrequirements() < 0 )
-        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
-    result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-        result.push_back(Pair("FaucetCCaddress",destaddr));
-    if ( params.size() == 1 )
-    {
-        pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-            result.push_back(Pair("CCaddress",destaddr));
-    }
-    if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 )
-        result.push_back(Pair("myCCaddress",destaddr));
-    return(result);
-}
-
 UniValue faucetfund(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
@@ -4989,6 +5015,43 @@ UniValue faucetget(const UniValue& params, bool fHelp)
     return(result);
 }
 
+UniValue dicefund(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); uint64_t funds; std::string hex;
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("faucetfund amount\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    funds = atof(params[0].get_str().c_str()) * COIN;
+    hex = DiceFund(0,funds);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create faucet funding transaction"));
+    return(result);
+}
+
+UniValue dicebet(const UniValue& params, bool fHelp)
+{
+    UniValue result(UniValue::VOBJ); std::string hex; uint64_t amount,odds;
+    if ( fHelp || params.size() > 2 )
+        throw runtime_error("dicebet amount odds\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    amount = atof(params[0].get_str().c_str()) * COIN;
+    if ( params.size() == 2 )
+        odds = atof(params[1].get_str().c_str()) * COIN;
+    else odds = 1;
+    hex = DiceBet(0,amount,odds);
+    if ( hex.size() > 0 )
+    {
+        result.push_back(Pair("result", "success"));
+        result.push_back(Pair("hex", hex));
+    } else result.push_back(Pair("error", "couldnt create faucet get transaction"));
+    return(result);
+}
+
 UniValue tokenorders(const UniValue& params, bool fHelp)
 {
     uint256 tokenid;
@@ -5023,28 +5086,6 @@ UniValue tokenbalance(const UniValue& params, bool fHelp)
     return(result);
 }
 
-UniValue tokenaddress(const UniValue& params, bool fHelp)
-{
-    UniValue result(UniValue::VOBJ); std::vector<unsigned char> pubkey; char destaddr[64]; struct CCcontract_info *cp,C;
-    cp = CCinit(&C,EVAL_ASSETS);
-    if ( fHelp || params.size() > 1 )
-        throw runtime_error("tokenaddress [pubkey]\n");
-    if ( ensure_CCrequirements() < 0 )
-        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
-    result.push_back(Pair("result", "success"));
-    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-        result.push_back(Pair("AssetsCCaddress",destaddr));
-    if ( params.size() == 1 )
-    {
-        pubkey = ParseHex(params[0].get_str().c_str());
-        if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-            result.push_back(Pair("CCaddress",destaddr));
-    }
-    if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 )
-        result.push_back(Pair("myCCaddress",destaddr));
-    return(result);
-}
-
 UniValue tokencreate(const UniValue& params, bool fHelp)
 {
     UniValue result(UniValue::VOBJ); std::string name,description,hex; uint64_t supply;

From 2fcf7a420c172ff0f538b03b8c73c083562919bd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:15:29 -1100
Subject: [PATCH 600/623] Fix

---
 src/cc/CCcustom.cpp | 1 +
 src/cc/CCdice.h     | 4 ++--
 src/cc/eval.h       | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index f4642c82e..c0254d0b1 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -17,6 +17,7 @@
 #include "CCassets.h"
 #include "CCfaucet.h"
 #include "CCrewards.h"
+#include "CCdice.h"
 
 /*
  CCcustom has most of the functions that need to be extended to create a new CC contract.
diff --git a/src/cc/CCdice.h b/src/cc/CCdice.h
index 582a9fe64..77f7d5dd9 100644
--- a/src/cc/CCdice.h
+++ b/src/cc/CCdice.h
@@ -14,8 +14,8 @@
  ******************************************************************************/
 
 
-#ifndef CC_REWARDS_H
-#define CC_REWARDS_H
+#ifndef CC_DICE_H
+#define CC_DICE_H
 
 #include "CCinclude.h"
 
diff --git a/src/cc/eval.h b/src/cc/eval.h
index e35bd053a..0ce5b6bf7 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -41,7 +41,8 @@
         EVAL(EVAL_IMPORTCOIN,   0xe2)  \
         EVAL(EVAL_ASSETS,   0xe3)  \
         EVAL(EVAL_FAUCET, 0xe4) \
-        EVAL(EVAL_REWARDS, 0xe5)
+        EVAL(EVAL_REWARDS, 0xe5) \
+        EVAL(EVAL_DICE, 0xe6)
 
 
 typedef uint8_t EvalCode;

From c9bab2a8d2e8c4956faa58df052c8518ed23eee3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:18:26 -1100
Subject: [PATCH 601/623] Fix

---
 src/cc/CCrewards.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCrewards.h b/src/cc/CCrewards.h
index 35fe87960..8deff3d81 100644
--- a/src/cc/CCrewards.h
+++ b/src/cc/CCrewards.h
@@ -24,7 +24,7 @@
 bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
 
 std::string RewardsFund(uint64_t txfee,char *planstr,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
-std::string RewardsLock(uint64_t txfee,char *planstr,uint64_t amount)
+std::string RewardsLock(uint64_t txfee,char *planstr,uint64_t amount);
 std::string RewardsUnlock(uint64_t txfee);
 
 #endif

From 06b1503b44d4dd3d2d46ba0211d13c048dc9faca Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:21:33 -1100
Subject: [PATCH 602/623] Test

---
 src/cc/CCcustom.cpp | 8 ++++----
 src/cc/CCdice.h     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index c0254d0b1..fb6753e28 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -43,7 +43,7 @@
 // Assets, aka Tokens
 #define FUNCNAME IsAssetsInput
 #define EVALCODE EVAL_ASSETS
-const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6" ;//"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
+const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6";  //"RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u";
 char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" };
 uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 };
 
@@ -54,7 +54,7 @@ uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xb
 // Faucet
 #define FUNCNAME IsFaucetInput
 #define EVALCODE EVAL_FAUCET
-const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC" ;//"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
+const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC";  //"RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk";
 char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" };
 uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 };
 
@@ -65,7 +65,7 @@ uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4
 // Rewards
 #define FUNCNAME IsRewardsInput
 #define EVALCODE EVAL_REWARDS
-const char *RewardsCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
+const char *RewardsCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm";  //"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
 char RewardsCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
 uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
 #include "CCcustom.inc"
@@ -75,7 +75,7 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 // Dice
 #define FUNCNAME IsDiceInput
 #define EVALCODE EVAL_DICE
-const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm" ;//"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
+const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm";  //"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
 char DiceCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
 uint8_t DiceCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
 #include "CCcustom.inc"
diff --git a/src/cc/CCdice.h b/src/cc/CCdice.h
index 77f7d5dd9..7c89d18d5 100644
--- a/src/cc/CCdice.h
+++ b/src/cc/CCdice.h
@@ -24,6 +24,6 @@
 bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
 
 std::string DiceFund(uint64_t txfee,uint64_t funds);
-std::string DiceBet(uint64_t txfee,uint64_t amount,uint64_t odds)
+std::string DiceBet(uint64_t txfee,uint64_t amount,uint64_t odds);
 
 #endif

From 05c8a626893638151b7727a3f2af4ce01fdb0add Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:30:20 -1100
Subject: [PATCH 603/623] tst

---
 src/cc/rewards.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 7ec3b83e6..33ab9a900 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -165,7 +165,7 @@ uint64_t RewardsPlanFunds(uint64_t &refsbits,struct CCcontract_info *cp,CPubKey
     {
         if ( GetTransaction(it->first.txhash,vintx,hashBlock,false) != 0 )
         {
-            xxx if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            if ( (nValue= IsRewardsvout(cp,vintx,(int32_t)it->first.index)) > 0 )
             {
                 totalinputs += nValue;
             }
@@ -182,7 +182,7 @@ std::string RewardsUnlock(uint64_t txfee)
         txfee = 10000;
     rewardspk = GetUnspendable(cp,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( (amount= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(claim,mtx.vin[0].prevout.hash)) > txfee )
+    if ( (amount= AddRewardsInputs(cp,mtx,mypk,(1LL << 30),1)) > 0 && (reward= RewardsCalc(amount,mtx.vin[0].prevout.hash)) > txfee )
     {
         if ( (inputs= AddRewardsInputs(cp,mtx,mypk,reward+amount+txfee,30)) > 0 )
         {
@@ -191,7 +191,7 @@ std::string RewardsUnlock(uint64_t txfee)
             if ( CCchange != 0 )
                 mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk));
             mtx.vout.push_back(CTxOut(amount+reward,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-            opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'U' << sbits);
+            opret << OP_RETURN << E_MARSHAL(ss << cp->evalcode << 'U');
             return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
         }
     } else fprintf(stderr,"cant find rewards inputs\n");

From 1f658f5912f966e59c174b8598b1d3c4684f8ccf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:32:48 -1100
Subject: [PATCH 604/623] Test

---
 src/cc/rewards.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 33ab9a900..9f567ae79 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -154,7 +154,7 @@ uint64_t AddRewardsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CP
 
 uint64_t RewardsPlanFunds(uint64_t &refsbits,struct CCcontract_info *cp,CPubKey &pk,char *planstr)
 {
-    char coinaddr[64]; uint64_t sbits,totalinputs = 0; uint256 hashBlock; CTransaction vintx;
+    char coinaddr[64]; uint64_t sbits,nValue,totalinputs = 0; uint256 hashBlock; CTransaction vintx;
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
     if ( planstr == 0 || planstr[0] == 0 || strlen(planstr) > 8 )
         return(0);

From f0f5f6c09b6d7a60aa457c42e03b6531bae5343e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:44:11 -1100
Subject: [PATCH 605/623] Fix

---
 src/cc/CCrewards.h       |  2 +-
 src/cc/rewards.cpp       |  2 +-
 src/wallet/rpcwallet.cpp | 58 ++++++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/cc/CCrewards.h b/src/cc/CCrewards.h
index 8deff3d81..b9addfb95 100644
--- a/src/cc/CCrewards.h
+++ b/src/cc/CCrewards.h
@@ -25,6 +25,6 @@ bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t
 
 std::string RewardsFund(uint64_t txfee,char *planstr,uint64_t funds,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit);
 std::string RewardsLock(uint64_t txfee,char *planstr,uint64_t amount);
-std::string RewardsUnlock(uint64_t txfee);
+std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 txid);
 
 #endif
diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp
index 9f567ae79..53ade6494 100644
--- a/src/cc/rewards.cpp
+++ b/src/cc/rewards.cpp
@@ -174,7 +174,7 @@ uint64_t RewardsPlanFunds(uint64_t &refsbits,struct CCcontract_info *cp,CPubKey
     return(totalinputs);
 }
 
-std::string RewardsUnlock(uint64_t txfee)
+std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 txid)
 {
     CMutableTransaction mtx; CPubKey mypk,rewardspk; CScript opret; uint64_t reward,amount,inputs,CCchange=0; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_REWARDS);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e10a7b09b..2c392e3c4 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4872,7 +4872,7 @@ UniValue diceaddress(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     if ( params.size() == 1 )
         pubkey = ParseHex(params[0].get_str().c_str());
-    return(CCaddress(cp,"Dice",pubkey));
+    return(CCaddress(cp,(char *)"Dice",pubkey));
 }
 
 UniValue faucetaddress(const UniValue& params, bool fHelp)
@@ -4885,7 +4885,7 @@ UniValue faucetaddress(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     if ( params.size() == 1 )
         pubkey = ParseHex(params[0].get_str().c_str());
-    return(CCaddress(cp,"Faucet",pubkey));
+    return(CCaddress(cp,(char *)"Faucet",pubkey));
 }
 
 UniValue rewardsaddress(const UniValue& params, bool fHelp)
@@ -4898,7 +4898,7 @@ UniValue rewardsaddress(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     if ( params.size() == 1 )
         pubkey = ParseHex(params[0].get_str().c_str());
-    return(CCaddress(cp,"Rewards",pubkey));
+    return(CCaddress(cp,(char *)"Rewards",pubkey));
 }
 
 UniValue tokenaddress(const UniValue& params, bool fHelp)
@@ -4911,36 +4911,37 @@ UniValue tokenaddress(const UniValue& params, bool fHelp)
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     if ( params.size() == 1 )
         pubkey = ParseHex(params[0].get_str().c_str());
-    return(CCaddress(cp,"Assets",pubkey));
+    return(CCaddress(cp,(char *)"Assets",pubkey));
 }
 
 UniValue rewardsfund(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); uint64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex;
-    if ( fHelp || params.size() > 5 || params.size() < 1 )
-        throw runtime_error("rewardsfund amount APR mindays maxdays mindeposit\n");
+    UniValue result(UniValue::VOBJ); char *name; uint64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex;
+    if ( fHelp || params.size() > 6 || params.size() < 2 )
+        throw runtime_error("rewardsfund name amount APR mindays maxdays mindeposit\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
     // default to OOT params
     APR = 5 * COIN;
     minseconds = maxseconds = 60 * 3600 * 24;
     mindeposit = 100 * COIN;
-    funds = atof(params[0].get_str().c_str()) * COIN;
-    if ( params.size() > 1 )
+    name = (char *)params[1].get_str().c_str();
+    funds = atof(params[1].get_str().c_str()) * COIN;
+    if ( params.size() > 2 )
     {
-        APR = atof(params[1].get_str().c_str()) * COIN;
-        if ( params.size() > 2 )
+        APR = atof(params[2].get_str().c_str()) * COIN;
+        if ( params.size() > 3 )
         {
-            minseconds = atol(params[2].get_str().c_str()) * 3600 * 24;
-            if ( params.size() > 3 )
+            minseconds = atol(params[3].get_str().c_str()) * 3600 * 24;
+            if ( params.size() > 4 )
             {
-                maxseconds = atol(params[3].get_str().c_str()) * 3600 * 24;
-                if ( params.size() > 4 )
-                    mindeposit = atof(params[4].get_str().c_str()) * COIN;
+                maxseconds = atol(params[4].get_str().c_str()) * 3600 * 24;
+                if ( params.size() > 5 )
+                    mindeposit = atof(params[5].get_str().c_str()) * COIN;
             }
         }
     }
-    hex = RewardsFund(0,funds,APR,minseconds,maxseconds,mindeposit);
+    hex = RewardsFund(0,name,funds,APR,minseconds,maxseconds,mindeposit);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));
@@ -4951,13 +4952,14 @@ UniValue rewardsfund(const UniValue& params, bool fHelp)
 
 UniValue rewardslock(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); uint64_t amount; std::string hex;
-    if ( fHelp || params.size() > 1 )
-        throw runtime_error("rewardslock amount\n");
+    UniValue result(UniValue::VOBJ); char *name; uint64_t amount; std::string hex;
+    if ( fHelp || params.size() > 2 )
+        throw runtime_error("rewardslock name amount\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
-    amount = atof(params[0].get_str().c_str()) * COIN;
-    hex = RewardsLock(0,amount);
+    name = (char *)params[0].get_str().c_str();
+    amount = atof(params[1].get_str().c_str()) * COIN;
+    hex = RewardsLock(0,name,amount);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));
@@ -4968,12 +4970,16 @@ UniValue rewardslock(const UniValue& params, bool fHelp)
 
 UniValue rewardsunlock(const UniValue& params, bool fHelp)
 {
-    UniValue result(UniValue::VOBJ); std::string hex;
-    if ( fHelp || params.size() > 0 )
-        throw runtime_error("rewardsunlock [txid]\n");
+    UniValue result(UniValue::VOBJ); std::string hex; char *name; uint256 txid;
+    if ( fHelp || params.size() > 2 )
+        throw runtime_error("rewardsunlock name [txid]\n");
     if ( ensure_CCrequirements() < 0 )
         throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
-    hex = RewardsUnlock(0);
+    name = (char *)params[0].get_str().c_str();
+    if ( params.size() > 1 )
+        txid = Parseuint256((char *)params[1].get_str().c_str());
+    else memset(&txid,0,sizeof(txid));
+    hex = RewardsUnlock(0,name,txid);
     if ( hex.size() > 0 )
     {
         result.push_back(Pair("result", "success"));

From 0542b1cd5506078a1558eb895f36df606e17622b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:45:35 -1100
Subject: [PATCH 606/623] Add dice.cpp

---
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index a0c474146..3b7d17e85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -264,6 +264,7 @@ libbitcoin_server_a_SOURCES = \
   cc/assets.cpp \
   cc/faucet.cpp \
   cc/rewards.cpp \
+  cc/dice.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
   checkpoints.cpp \

From fac62537c48bd11e5d4398e7f3a38ffec8f10cb1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:48:55 -1100
Subject: [PATCH 607/623] test

---
 src/cc/CCcustom.cpp | 4 ++--
 src/cc/CCutils.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index fb6753e28..982bde154 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -75,8 +75,8 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 // Dice
 #define FUNCNAME IsDiceInput
 #define EVALCODE EVAL_DICE
-const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm";  //"RYRJGMAYEfLCZ6ZddbpxPiUZ1sens8vPYK";
-char DiceCChexstr[67] = { "026f00fdc2f1ed0006d66e2ca1787633590581c2fc90e7cb7b01a6c1131b40e94d" };
+const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm";  //"RLEe8f7Eg3TDuXii9BmNiiiaVGraHUt25c";
+char DiceCChexstr[67] = { "039d966927cfdadab3ee6c56da63c21f17ea753dde4b3dfd41487103e24b27e94e" };
 uint8_t DiceCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
 #include "CCcustom.inc"
 #undef FUNCNAME
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index f8617e536..e61f91f53 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -216,7 +216,7 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                if ( 0 )
+                if ( 1 )
                 {
                     for (i=0; i<32; i++)
                         fprintf(stderr,"0x%02x, ",myprivkey[i]);

From b2b7d05b5e18aeea6c7f4593a47722956e081233 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:52:41 -1100
Subject: [PATCH 608/623] test

---
 src/cc/CCutils.cpp       | 2 +-
 src/wallet/rpcwallet.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index e61f91f53..f8617e536 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -216,7 +216,7 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                if ( 1 )
+                if ( 0 )
                 {
                     for (i=0; i<32; i++)
                         fprintf(stderr,"0x%02x, ",myprivkey[i]);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 2c392e3c4..7f6816cee 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4865,7 +4865,7 @@ UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned ch
 UniValue diceaddress(const UniValue& params, bool fHelp)
 {
     struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
-    cp = CCinit(&C,EVAL_REWARDS);
+    cp = CCinit(&C,EVAL_DICE);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("diceaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
@@ -4878,7 +4878,7 @@ UniValue diceaddress(const UniValue& params, bool fHelp)
 UniValue faucetaddress(const UniValue& params, bool fHelp)
 {
     struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
-    cp = CCinit(&C,EVAL_REWARDS);
+    cp = CCinit(&C,EVAL_FAUCET);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("faucetaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )
@@ -4904,7 +4904,7 @@ UniValue rewardsaddress(const UniValue& params, bool fHelp)
 UniValue tokenaddress(const UniValue& params, bool fHelp)
 {
     struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
-    cp = CCinit(&C,EVAL_REWARDS);
+    cp = CCinit(&C,EVAL_ASSETS);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("tokenaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )

From cd56547d355821e24aff7c782a358f3b80769fa7 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 07:54:27 -1100
Subject: [PATCH 609/623] Test

---
 src/cc/CCcustom.cpp | 2 +-
 src/cc/CCutils.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 982bde154..243177593 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -75,7 +75,7 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 // Dice
 #define FUNCNAME IsDiceInput
 #define EVALCODE EVAL_DICE
-const char *DiceCCaddr = "RJCqA4jQTFEZ841dZgxko8aYgUU3FRNGNm";  //"RLEe8f7Eg3TDuXii9BmNiiiaVGraHUt25c";
+const char *DiceCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RLEe8f7Eg3TDuXii9BmNiiiaVGraHUt25c";
 char DiceCChexstr[67] = { "039d966927cfdadab3ee6c56da63c21f17ea753dde4b3dfd41487103e24b27e94e" };
 uint8_t DiceCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
 #include "CCcustom.inc"
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index f8617e536..e61f91f53 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -216,7 +216,7 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                if ( 0 )
+                if ( 1 )
                 {
                     for (i=0; i<32; i++)
                         fprintf(stderr,"0x%02x, ",myprivkey[i]);

From 6f1e714b5a6a29a162cbbddcb9ca4007967376d9 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 08:01:39 -1100
Subject: [PATCH 610/623] Test

---
 src/cc/CCcustom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 243177593..cb8a1de87 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -77,7 +77,7 @@ uint8_t RewardsCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0x
 #define EVALCODE EVAL_DICE
 const char *DiceCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RLEe8f7Eg3TDuXii9BmNiiiaVGraHUt25c";
 char DiceCChexstr[67] = { "039d966927cfdadab3ee6c56da63c21f17ea753dde4b3dfd41487103e24b27e94e" };
-uint8_t DiceCCpriv[32] = { 0x9f, 0x0c, 0x57, 0xdc, 0x6f, 0x78, 0xae, 0xb0, 0xc7, 0x62, 0x9e, 0x7d, 0x2b, 0x90, 0x6b, 0xbd, 0x40, 0x78, 0x19, 0x5b, 0x3c, 0xb8, 0x82, 0x2d, 0x29, 0x84, 0x72, 0x7a, 0x59, 0x5a, 0x4b, 0x69 };
+uint8_t DiceCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
 #include "CCcustom.inc"
 #undef FUNCNAME
 #undef EVALCODE

From 6982938529e9620bc27a3ced4bf0c5b34f94165f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 08:43:50 -1100
Subject: [PATCH 611/623] Skeletons for lotto, Ponzi and auction

---
 src/cc/CCauction.h  |  30 +++++++
 src/cc/CCcustom.cpp |  33 ++++++++
 src/cc/CClotto.h    |  29 +++++++
 src/cc/CCponzi.h    |  29 +++++++
 src/cc/auction.cpp  | 202 ++++++++++++++++++++++++++++++++++++++++++++
 src/cc/eval.h       |   5 +-
 src/cc/lotto.cpp    | 182 +++++++++++++++++++++++++++++++++++++++
 src/cc/ponzi.cpp    | 182 +++++++++++++++++++++++++++++++++++++++
 8 files changed, 691 insertions(+), 1 deletion(-)
 create mode 100644 src/cc/CCauction.h
 create mode 100644 src/cc/CClotto.h
 create mode 100644 src/cc/CCponzi.h
 create mode 100644 src/cc/auction.cpp
 create mode 100644 src/cc/lotto.cpp
 create mode 100644 src/cc/ponzi.cpp

diff --git a/src/cc/CCauction.h b/src/cc/CCauction.h
new file mode 100644
index 000000000..52cd03d14
--- /dev/null
+++ b/src/cc/CCauction.h
@@ -0,0 +1,30 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_AUCTION_H
+#define CC_AUCTION_H
+
+#include "CCinclude.h"
+
+#define EVAL_AUCTION 0xe8
+
+bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+
+std::string AuctionPost(uint64_t txfee,uint256 itemhash,uint64_t minbid,char *title,char *description);
+std::string AuctionBid(uint64_t txfee,uint256 itemhash,uint64_t amount);
+std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid);
+
+#endif
diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index cb8a1de87..7080e3ed5 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -18,6 +18,9 @@
 #include "CCfaucet.h"
 #include "CCrewards.h"
 #include "CCdice.h"
+#include "CCauction.h"
+#include "CClotto.h"
+#include "CCponzi.h"
 
 /*
  CCcustom has most of the functions that need to be extended to create a new CC contract.
@@ -82,6 +85,36 @@ uint8_t DiceCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1,
 #undef FUNCNAME
 #undef EVALCODE
 
+// Lotto
+#define FUNCNAME IsLottoInput
+#define EVALCODE EVAL_LOTTO
+const char *LottoCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RLW6hhRqBZZMBndnyPv29Yg3krh6iBYCyg";
+char LottoCChexstr[67] = { "03f72d2c4db440df1e706502b09ca5fec73ffe954ea1883e4049e98da68690d98f" };
+uint8_t LottoCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
+// Ponzi
+#define FUNCNAME IsPonziInput
+#define EVALCODE EVAL_PONZI
+const char *PonziCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RWSHRbxnJYLvDjpcQ2i8MekgP6h2ctTKaj";
+char PonziCChexstr[67] = { "039b52d294b413b07f3643c1a28c5467901a76562d8b39a785910ae0a0f3043810" };
+uint8_t PonziCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
+// Auction
+#define FUNCNAME IsAuctionInput
+#define EVALCODE EVAL_AUCTION
+const char *AuctionCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RFtVDNmdTZBTNZdmFRbfBgJ6LitgTghikL";
+char AuctionCChexstr[67] = { "037eefe050c14cb60ae65d5b2f69eaa1c9006826d729bc0957bdc3024e3ca1dbe6" };
+uint8_t AuctionCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+#include "CCcustom.inc"
+#undef FUNCNAME
+#undef EVALCODE
+
 struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
 {
     cp->evalcode = evalcode;
diff --git a/src/cc/CClotto.h b/src/cc/CClotto.h
new file mode 100644
index 000000000..a0354252e
--- /dev/null
+++ b/src/cc/CClotto.h
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_LOTTO_H
+#define CC_LOTTO_H
+
+#include "CCinclude.h"
+
+#define EVAL_LOTTO 0xe9
+
+bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+
+std::string LottoTicket(uint64_t txfee,uint64_t numtickets);
+std::string LottoWinner(uint64_t txfee);
+
+#endif
diff --git a/src/cc/CCponzi.h b/src/cc/CCponzi.h
new file mode 100644
index 000000000..eb28737f7
--- /dev/null
+++ b/src/cc/CCponzi.h
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+
+#ifndef CC_PONZI_H
+#define CC_PONZI_H
+
+#include "CCinclude.h"
+
+#define EVAL_PONZI 0xe7
+
+bool PonziValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx);
+
+std::string PonziBuy(uint64_t txfee,uint64_t amount);
+std::string PonziClaim(uint64_t txfee);
+
+#endif
diff --git a/src/cc/auction.cpp b/src/cc/auction.cpp
new file mode 100644
index 000000000..9676af7cc
--- /dev/null
+++ b/src/cc/auction.cpp
@@ -0,0 +1,202 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCauction.h"
+#include "../txmempool.h"
+
+/*
+*/
+
+// start of consensus code
+
+uint64_t IsAuctionvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
+{
+    char destaddr[64];
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
+    return(0);
+}
+
+bool AuctionExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+{
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=0; i<numvins; i++)
+    {
+        //fprintf(stderr,"vini.%d\n",i);
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
+        {
+            //fprintf(stderr,"vini.%d check mempool\n",i);
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("cant find vinTx");
+            else
+            {
+                //fprintf(stderr,"vini.%d check hash and vout\n",i);
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant Auction from mempool");
+                if ( (assetoshis= IsAuctionvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
+            }
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        if ( (assetoshis= IsAuctionvout(cp,tx,i)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs+COIN+txfee )
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
+    }
+    else return(true);
+}
+
+bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+{
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    preventCCvins = preventCCvouts = -1;
+    if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else
+    {
+        //fprintf(stderr,"check vins\n");
+        for (i=0; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            {
+                fprintf(stderr,"Auctionget invalid vini\n");
+                return eval->Invalid("illegal normal vini");
+            }
+        }
+        //fprintf(stderr,"check amounts\n");
+        if ( AuctionExactAmounts(cp,eval,tx,1,10000) == false )
+        {
+            fprintf(stderr,"Auctionget invalid amount\n");
+            return false;
+        }
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsAuctionvout(cp,tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return eval->Invalid("invalid Auction output");
+            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
+            if ( retval != 0 )
+                fprintf(stderr,"Auctionget validated\n");
+            else fprintf(stderr,"Auctionget invalid\n");
+            return(retval);
+        }
+    }
+}
+// end of consensus code
+
+// helper functions for rpc calls in rpcwallet.cpp
+
+uint64_t AddAuctionInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(cp,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsAuctionvout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+std::string AuctionBid(uint64_t txfee,uint256 itemhash,uint64_t amount)
+{
+    CMutableTransaction mtx; CPubKey mypk,Auctionpk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_AUCTION);
+    if ( txfee == 0 )
+        txfee = 10000;
+    Auctionpk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddAuctionInputs(cp,mtx,Auctionpk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find Auction inputs\n");
+    return(0);
+}
+
+std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid)
+{
+    CMutableTransaction mtx; CPubKey mypk,Auctionpk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_AUCTION);
+    if ( txfee == 0 )
+        txfee = 10000;
+    Auctionpk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddAuctionInputs(cp,mtx,Auctionpk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find Auction inputs\n");
+    return(0);
+}
+
+std::string AuctionPost(uint64_t txfee,uint256 itemhash,uint64_t minbid,char *title,char *description)
+{
+    CMutableTransaction mtx; CPubKey mypk,Auctionpk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_AUCTION);
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    Auctionpk = GetUnspendable(cp,0);
+    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    {
+        //mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+
diff --git a/src/cc/eval.h b/src/cc/eval.h
index 0ce5b6bf7..5454cf449 100644
--- a/src/cc/eval.h
+++ b/src/cc/eval.h
@@ -42,7 +42,10 @@
         EVAL(EVAL_ASSETS,   0xe3)  \
         EVAL(EVAL_FAUCET, 0xe4) \
         EVAL(EVAL_REWARDS, 0xe5) \
-        EVAL(EVAL_DICE, 0xe6)
+        EVAL(EVAL_DICE, 0xe6) \
+        EVAL(EVAL_PONZI, 0xe7) \
+        EVAL(EVAL_AUCTION, 0xe8) \
+        EVAL(EVAL_LOTTO, 0xe9)
 
 
 typedef uint8_t EvalCode;
diff --git a/src/cc/lotto.cpp b/src/cc/lotto.cpp
new file mode 100644
index 000000000..a699ffa5c
--- /dev/null
+++ b/src/cc/lotto.cpp
@@ -0,0 +1,182 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CClotto.h"
+#include "../txmempool.h"
+
+/*
+*/
+
+// start of consensus code
+
+uint64_t IsLottovout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
+{
+    char destaddr[64];
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
+    return(0);
+}
+
+bool LottoExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+{
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=0; i<numvins; i++)
+    {
+        //fprintf(stderr,"vini.%d\n",i);
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
+        {
+            //fprintf(stderr,"vini.%d check mempool\n",i);
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("cant find vinTx");
+            else
+            {
+                //fprintf(stderr,"vini.%d check hash and vout\n",i);
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant Lotto from mempool");
+                if ( (assetoshis= IsLottovout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
+            }
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        if ( (assetoshis= IsLottovout(cp,tx,i)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs+COIN+txfee )
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
+    }
+    else return(true);
+}
+
+bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+{
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    preventCCvins = preventCCvouts = -1;
+    if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else
+    {
+        //fprintf(stderr,"check vins\n");
+        for (i=0; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            {
+                fprintf(stderr,"Lottoget invalid vini\n");
+                return eval->Invalid("illegal normal vini");
+            }
+        }
+        //fprintf(stderr,"check amounts\n");
+        if ( LottoExactAmounts(cp,eval,tx,1,10000) == false )
+        {
+            fprintf(stderr,"Lottoget invalid amount\n");
+            return false;
+        }
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsLottovout(cp,tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return eval->Invalid("invalid Lotto output");
+            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
+            if ( retval != 0 )
+                fprintf(stderr,"Lottoget validated\n");
+            else fprintf(stderr,"Lottoget invalid\n");
+            return(retval);
+        }
+    }
+}
+// end of consensus code
+
+// helper functions for rpc calls in rpcwallet.cpp
+
+uint64_t AddLottoInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(cp,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsLottovout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+std::string LottoTicket(uint64_t txfee,uint64_t numtickets)
+{
+    CMutableTransaction mtx; CPubKey mypk,Lottopk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_LOTTO);
+    if ( txfee == 0 )
+        txfee = 10000;
+    Lottopk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddLottoInputs(cp,mtx,Lottopk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,CCchange,Lottopk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find Lotto inputs\n");
+    return(0);
+}
+
+std::string LottoWinner(uint64_t txfee)
+{
+    CMutableTransaction mtx; CPubKey mypk,Lottopk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_LOTTO);
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    Lottopk = GetUnspendable(cp,0);
+    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,funds,Lottopk));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+
diff --git a/src/cc/ponzi.cpp b/src/cc/ponzi.cpp
new file mode 100644
index 000000000..26cf98515
--- /dev/null
+++ b/src/cc/ponzi.cpp
@@ -0,0 +1,182 @@
+/******************************************************************************
+ * Copyright © 2014-2018 The SuperNET Developers.                             *
+ *                                                                            *
+ * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at                  *
+ * the top-level directory of this distribution for the individual copyright  *
+ * holder information and the developer policies on copyright and licensing.  *
+ *                                                                            *
+ * Unless otherwise agreed in a custom licensing agreement, no part of the    *
+ * SuperNET software, including this file may be copied, modified, propagated *
+ * or distributed except according to the terms contained in the LICENSE file *
+ *                                                                            *
+ * Removal or modification of this copyright notice is prohibited.            *
+ *                                                                            *
+ ******************************************************************************/
+
+#include "CCponzi.h"
+#include "../txmempool.h"
+
+/*
+*/
+
+// start of consensus code
+
+uint64_t IsPonzivout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v)
+{
+    char destaddr[64];
+    if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 )
+    {
+        if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 )
+            return(tx.vout[v].nValue);
+    }
+    return(0);
+}
+
+bool PonziExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee)
+{
+    static uint256 zerohash;
+    CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; uint64_t inputs=0,outputs=0,assetoshis;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    for (i=0; i<numvins; i++)
+    {
+        //fprintf(stderr,"vini.%d\n",i);
+        if ( (*cp->ismyvin)(tx.vin[i].scriptSig) != 0 )
+        {
+            //fprintf(stderr,"vini.%d check mempool\n",i);
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+                return eval->Invalid("cant find vinTx");
+            else
+            {
+                //fprintf(stderr,"vini.%d check hash and vout\n",i);
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant ponzi from mempool");
+                if ( (assetoshis= IsPonzivout(cp,vinTx,tx.vin[i].prevout.n)) != 0 )
+                    inputs += assetoshis;
+            }
+        }
+    }
+    for (i=0; i<numvouts; i++)
+    {
+        //fprintf(stderr,"i.%d of numvouts.%d\n",i,numvouts);
+        if ( (assetoshis= IsPonzivout(cp,tx,i)) != 0 )
+            outputs += assetoshis;
+    }
+    if ( inputs != outputs+COIN+txfee )
+    {
+        fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs);
+        return eval->Invalid("mismatched inputs != outputs + COIN + txfee");
+    }
+    else return(true);
+}
+
+bool PonziValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx)
+{
+    int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval;
+    numvins = tx.vin.size();
+    numvouts = tx.vout.size();
+    preventCCvins = preventCCvouts = -1;
+    if ( numvouts < 1 )
+        return eval->Invalid("no vouts");
+    else
+    {
+        //fprintf(stderr,"check vins\n");
+        for (i=0; i<numvins; i++)
+        {
+            if ( IsCCInput(tx.vin[0].scriptSig) == 0 )
+            {
+                fprintf(stderr,"ponziget invalid vini\n");
+                return eval->Invalid("illegal normal vini");
+            }
+        }
+        //fprintf(stderr,"check amounts\n");
+        if ( PonziExactAmounts(cp,eval,tx,1,10000) == false )
+        {
+            fprintf(stderr,"ponziget invalid amount\n");
+            return false;
+        }
+        else
+        {
+            preventCCvouts = 1;
+            if ( IsPonzivout(cp,tx,0) != 0 )
+            {
+                preventCCvouts++;
+                i = 1;
+            } else i = 0;
+            if ( tx.vout[i].nValue != COIN )
+                return eval->Invalid("invalid ponzi output");
+            retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts);
+            if ( retval != 0 )
+                fprintf(stderr,"ponziget validated\n");
+            else fprintf(stderr,"ponziget invalid\n");
+            return(retval);
+        }
+    }
+}
+// end of consensus code
+
+// helper functions for rpc calls in rpcwallet.cpp
+
+uint64_t AddPonziInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(cp,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsPonzivout(cp,vintx,(int32_t)it->first.index)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
+std::string PonziBuy(uint64_t txfee,uint64_t amount)
+{
+    CMutableTransaction mtx; CPubKey mypk,ponzipk; CScript opret; uint64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_PONZI);
+    if ( txfee == 0 )
+        txfee = 10000;
+    ponzipk = GetUnspendable(cp,0);
+    mypk = pubkey2pk(Mypubkey());
+    if ( (inputs= AddPonziInputs(cp,mtx,ponzipk,nValue+txfee,60)) > 0 )
+    {
+        if ( inputs > nValue )
+            CCchange = (inputs - nValue - txfee);
+        if ( CCchange != 0 )
+            mtx.vout.push_back(MakeCC1vout(EVAL_PONZI,CCchange,ponzipk));
+        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    } else fprintf(stderr,"cant find ponzi inputs\n");
+    return(0);
+}
+
+std::string PonziClaim(uint64_t txfee)
+{
+    CMutableTransaction mtx; CPubKey mypk,ponzipk; CScript opret; struct CCcontract_info *cp,C;
+    cp = CCinit(&C,EVAL_PONZI);
+    if ( txfee == 0 )
+        txfee = 10000;
+    mypk = pubkey2pk(Mypubkey());
+    ponzipk = GetUnspendable(cp,0);
+    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    {
+        mtx.vout.push_back(MakeCC1vout(EVAL_PONZI,funds,ponzipk));
+        return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
+    }
+    return(0);
+}
+
+

From eca34fd97846f3e8a03c8fd7375dd8922c47dd5e Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 08:50:42 -1100
Subject: [PATCH 612/623] Test

---
 src/wallet/rpcwallet.cpp | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 7f6816cee..3c2e45b55 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4844,10 +4844,14 @@ int32_t ensure_CCrequirements()
 #include "../cc/CCassets.h"
 #include "../cc/CCrewards.h"
 #include "../cc/CCdice.h"
+#include "../cc/CCponzi.h"
+#include "../cc/CCauction.h"
+#include "../cc/CClotto.h"
 
 UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned char> &pubkey)
 {
     UniValue result(UniValue::VOBJ); ; char destaddr[64],str[64];
+    { uint8_t p[32]; Myprivkey(p); }
     result.push_back(Pair("result", "success"));
     sprintf(str,"%sCCaddress",name);
     if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
@@ -4862,6 +4866,45 @@ UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned ch
     return(result);
 }
 
+UniValue lottoaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_LOTTO);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("lottoaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,(char *)"Lotto",pubkey));
+}
+
+UniValue ponziaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_PONZI);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("ponziaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,(char *)"Ponzi",pubkey));
+}
+
+UniValue auctionaddress(const UniValue& params, bool fHelp)
+{
+    struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
+    cp = CCinit(&C,EVAL_DICE);
+    if ( fHelp || params.size() > 1 )
+        throw runtime_error("auctionaddress [pubkey]\n");
+    if ( ensure_CCrequirements() < 0 )
+        throw runtime_error("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet\n");
+    if ( params.size() == 1 )
+        pubkey = ParseHex(params[0].get_str().c_str());
+    return(CCaddress(cp,(char *)"Auction",pubkey));
+}
+
 UniValue diceaddress(const UniValue& params, bool fHelp)
 {
     struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;

From 8ee5c997703c23aa8dcc1e137e9c5dd93500ad02 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 08:54:29 -1100
Subject: [PATCH 613/623] Address functions

---
 src/cc/CCcustom.cpp | 2 +-
 src/rpcserver.cpp   | 9 +++++++++
 src/rpcserver.h     | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index 7080e3ed5..c03907c4a 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -110,7 +110,7 @@ uint8_t PonziCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1
 #define EVALCODE EVAL_AUCTION
 const char *AuctionCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RFtVDNmdTZBTNZdmFRbfBgJ6LitgTghikL";
 char AuctionCChexstr[67] = { "037eefe050c14cb60ae65d5b2f69eaa1c9006826d729bc0957bdc3024e3ca1dbe6" };
-uint8_t AuctionCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+uint8_t AuctionCCpriv[32] = { 0x8c, 0x1b, 0xb7, 0x8c, 0x02, 0xa3, 0x9d, 0x21, 0x28, 0x59, 0xf5, 0xea, 0xda, 0xec, 0x0d, 0x11, 0xcd, 0x38, 0x47, 0xac, 0x0b, 0x6f, 0x19, 0xc0, 0x24, 0x36, 0xbf, 0x1c, 0x0a, 0x06, 0x31, 0xfb };
 #include "CCcustom.inc"
 #undef FUNCNAME
 #undef EVALCODE
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 40ebd162c..afcb5cc59 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -344,6 +344,15 @@ static const CRPCCommand vRPCCommands[] =
 #ifdef ENABLE_WALLET
     { "rawtransactions",    "fundrawtransaction",     &fundrawtransaction,     false },
 #endif
+    /* auction */
+    { "auction",       "auctionaddress",    &auctionaddress,  true },
+    
+    /* lotto */
+    { "lotto",       "lottoaddress",    &lottoaddress,  true },
+    
+    /* ponzi */
+    { "ponzi",       "ponziaddress",    &ponziaddress,  true },
+    
     /* rewards */
     { "rewards",       "rewardsfund",       &rewardsfund,     true },
     { "rewards",       "rewardslock",       &rewardslock,     true },
diff --git a/src/rpcserver.h b/src/rpcserver.h
index ff06966ba..fe48bdd74 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -231,6 +231,9 @@ extern UniValue rewardsunlock(const UniValue& params, bool fHelp);
 extern UniValue diceaddress(const UniValue& params, bool fHelp);
 extern UniValue dicefund(const UniValue& params, bool fHelp);
 extern UniValue dicebet(const UniValue& params, bool fHelp);
+extern UniValue lottoaddress(const UniValue& params, bool fHelp);
+extern UniValue ponziaddress(const UniValue& params, bool fHelp);
+extern UniValue auctionaddress(const UniValue& params, bool fHelp);
 
 extern UniValue getnewaddress(const UniValue& params, bool fHelp); // in rpcwallet.cpp
 //extern UniValue getnewaddress64(const UniValue& params, bool fHelp); // in rpcwallet.cpp

From b935ab65f4b2f0155cee371483b3b90bbe7ab903 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:02:15 -1100
Subject: [PATCH 614/623] Fix

---
 src/cc/CCcustom.cpp      | 27 ++++++++++++++++++++++++---
 src/wallet/rpcwallet.cpp |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index c03907c4a..aab1aa9af 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -88,7 +88,7 @@ uint8_t DiceCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1,
 // Lotto
 #define FUNCNAME IsLottoInput
 #define EVALCODE EVAL_LOTTO
-const char *LottoCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RLW6hhRqBZZMBndnyPv29Yg3krh6iBYCyg";
+const char *LottoCCaddr = "RNXZxgyWSAE6XS3qGnTaf5dVNCxnYzhPrg";  //"RLW6hhRqBZZMBndnyPv29Yg3krh6iBYCyg";
 char LottoCChexstr[67] = { "03f72d2c4db440df1e706502b09ca5fec73ffe954ea1883e4049e98da68690d98f" };
 uint8_t LottoCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
 #include "CCcustom.inc"
@@ -98,9 +98,9 @@ uint8_t LottoCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1
 // Ponzi
 #define FUNCNAME IsPonziInput
 #define EVALCODE EVAL_PONZI
-const char *PonziCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RWSHRbxnJYLvDjpcQ2i8MekgP6h2ctTKaj";
+const char *PonziCCaddr = "RUKTbLBeKgHkm3Ss4hKZP3ikuLW1xx7B2x";  //"RWSHRbxnJYLvDjpcQ2i8MekgP6h2ctTKaj";
 char PonziCChexstr[67] = { "039b52d294b413b07f3643c1a28c5467901a76562d8b39a785910ae0a0f3043810" };
-uint8_t PonziCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+uint8_t PonziCCpriv[32] = { 0x11, 0xe1, 0xea, 0x3e, 0xdb, 0x36, 0xf0, 0xa8, 0xc6, 0x34, 0xe1, 0x21, 0xb8, 0x02, 0xb9, 0x4b, 0x12, 0x37, 0x8f, 0xa0, 0x86, 0x23, 0x50, 0xb2, 0x5f, 0xe4, 0xe7, 0x36, 0x0f, 0xda, 0xae, 0xfc };
 #include "CCcustom.inc"
 #undef FUNCNAME
 #undef EVALCODE
@@ -148,6 +148,27 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode)
             cp->validate = DiceValidate;
             cp->ismyvin = IsDiceInput;
             break;
+        case EVAL_LOTTO:
+            strcpy(cp->unspendableCCaddr,LottoCCaddr);
+            strcpy(cp->CChexstr,LottoCChexstr);
+            memcpy(cp->CCpriv,LottoCCpriv,32);
+            cp->validate = LottoValidate;
+            cp->ismyvin = IsLottoInput;
+            break;
+        case EVAL_PONZI:
+            strcpy(cp->unspendableCCaddr,PonziCCaddr);
+            strcpy(cp->CChexstr,PonziCChexstr);
+            memcpy(cp->CCpriv,PonziCCpriv,32);
+            cp->validate = PonziValidate;
+            cp->ismyvin = IsPonziInput;
+            break;
+        case EVAL_AUCTION:
+            strcpy(cp->unspendableCCaddr,AuctionCCaddr);
+            strcpy(cp->CChexstr,AuctionCChexstr);
+            memcpy(cp->CCpriv,AuctionCCpriv,32);
+            cp->validate = AuctionValidate;
+            cp->ismyvin = IsAuctionInput;
+            break;
     }
     return(cp);
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 3c2e45b55..f5db1ed35 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4895,7 +4895,7 @@ UniValue ponziaddress(const UniValue& params, bool fHelp)
 UniValue auctionaddress(const UniValue& params, bool fHelp)
 {
     struct CCcontract_info *cp,C; std::vector<unsigned char> pubkey;
-    cp = CCinit(&C,EVAL_DICE);
+    cp = CCinit(&C,EVAL_AUCTION);
     if ( fHelp || params.size() > 1 )
         throw runtime_error("auctionaddress [pubkey]\n");
     if ( ensure_CCrequirements() < 0 )

From 4391153705fe8d2dd9c4cf411ef130e144e6b75a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:05:31 -1100
Subject: [PATCH 615/623] Makefile

---
 src/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b7d17e85..a44839781 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -265,6 +265,9 @@ libbitcoin_server_a_SOURCES = \
   cc/faucet.cpp \
   cc/rewards.cpp \
   cc/dice.cpp \
+  cc/lotto.cpp \
+  cc/ponzi.cpp \
+  cc/auction.cpp \
   cc/betprotocol.cpp \
   chain.cpp \
   checkpoints.cpp \

From 90a233e9ace692837e907810ad0f983522666e9a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:07:49 -1100
Subject: [PATCH 616/623] Test

---
 src/cc/lotto.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/lotto.cpp b/src/cc/lotto.cpp
index a699ffa5c..079cf5793 100644
--- a/src/cc/lotto.cpp
+++ b/src/cc/lotto.cpp
@@ -171,7 +171,7 @@ std::string LottoWinner(uint64_t txfee)
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     Lottopk = GetUnspendable(cp,0);
-    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,funds,Lottopk));
         return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));

From 372625beb6077f0fec354495522d071331bede31 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:09:32 -1100
Subject: [PATCH 617/623] Test

---
 src/cc/lotto.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cc/lotto.cpp b/src/cc/lotto.cpp
index 079cf5793..af6222b5d 100644
--- a/src/cc/lotto.cpp
+++ b/src/cc/lotto.cpp
@@ -165,7 +165,7 @@ std::string LottoTicket(uint64_t txfee,uint64_t numtickets)
 
 std::string LottoWinner(uint64_t txfee)
 {
-    CMutableTransaction mtx; CPubKey mypk,Lottopk; CScript opret; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,Lottopk; uint64_t winnings = 0; CScript opret; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_LOTTO);
     if ( txfee == 0 )
         txfee = 10000;
@@ -173,7 +173,7 @@ std::string LottoWinner(uint64_t txfee)
     Lottopk = GetUnspendable(cp,0);
     if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 )
     {
-        mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,funds,Lottopk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,winnings,Lottopk));
         return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
     }
     return(0);

From b08b67f2115ef3a1aaca0063b4633786ed559f75 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:11:32 -1100
Subject: [PATCH 618/623] Test

---
 src/cc/auction.cpp | 6 +++---
 src/cc/ponzi.cpp   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cc/auction.cpp b/src/cc/auction.cpp
index 9676af7cc..a11f66e85 100644
--- a/src/cc/auction.cpp
+++ b/src/cc/auction.cpp
@@ -185,15 +185,15 @@ std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid)
 
 std::string AuctionPost(uint64_t txfee,uint256 itemhash,uint64_t minbid,char *title,char *description)
 {
-    CMutableTransaction mtx; CPubKey mypk,Auctionpk; CScript opret; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,Auctionpk; uint64_t funds = 0; CScript opret; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_AUCTION);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     Auctionpk = GetUnspendable(cp,0);
-    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 )
     {
-        //mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk));
+        mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk));
         return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));
     }
     return(0);
diff --git a/src/cc/ponzi.cpp b/src/cc/ponzi.cpp
index 26cf98515..81021209e 100644
--- a/src/cc/ponzi.cpp
+++ b/src/cc/ponzi.cpp
@@ -165,13 +165,13 @@ std::string PonziBuy(uint64_t txfee,uint64_t amount)
 
 std::string PonziClaim(uint64_t txfee)
 {
-    CMutableTransaction mtx; CPubKey mypk,ponzipk; CScript opret; struct CCcontract_info *cp,C;
+    CMutableTransaction mtx; CPubKey mypk,ponzipk; uint64_t funds = 0; CScript opret; struct CCcontract_info *cp,C;
     cp = CCinit(&C,EVAL_PONZI);
     if ( txfee == 0 )
         txfee = 10000;
     mypk = pubkey2pk(Mypubkey());
     ponzipk = GetUnspendable(cp,0);
-    if ( AddNormalinputs(mtx,mypk,funds+txfee,64) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 )
     {
         mtx.vout.push_back(MakeCC1vout(EVAL_PONZI,funds,ponzipk));
         return(FinalizeCCTx(cp,mtx,mypk,txfee,opret));

From d3e128d961ef4e6ec5985f8f0ffcf2978887db7d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 09:15:43 -1100
Subject: [PATCH 619/623] Test

---
 src/cc/CCcustom.cpp      | 4 ++--
 src/cc/CCutils.cpp       | 2 +-
 src/wallet/rpcwallet.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp
index aab1aa9af..db891c583 100644
--- a/src/cc/CCcustom.cpp
+++ b/src/cc/CCcustom.cpp
@@ -90,7 +90,7 @@ uint8_t DiceCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1,
 #define EVALCODE EVAL_LOTTO
 const char *LottoCCaddr = "RNXZxgyWSAE6XS3qGnTaf5dVNCxnYzhPrg";  //"RLW6hhRqBZZMBndnyPv29Yg3krh6iBYCyg";
 char LottoCChexstr[67] = { "03f72d2c4db440df1e706502b09ca5fec73ffe954ea1883e4049e98da68690d98f" };
-uint8_t LottoCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 };
+uint8_t LottoCCpriv[32] = { 0xb4, 0xac, 0xc2, 0xd9, 0x67, 0x34, 0xd7, 0x58, 0x80, 0x4e, 0x25, 0x55, 0xc0, 0x50, 0x66, 0x84, 0xbb, 0xa2, 0xe7, 0xc0, 0x39, 0x17, 0xb4, 0xc5, 0x07, 0xb7, 0x3f, 0xca, 0x07, 0xb0, 0x9a, 0xeb };
 #include "CCcustom.inc"
 #undef FUNCNAME
 #undef EVALCODE
@@ -108,7 +108,7 @@ uint8_t PonziCCpriv[32] = { 0x11, 0xe1, 0xea, 0x3e, 0xdb, 0x36, 0xf0, 0xa8, 0xc6
 // Auction
 #define FUNCNAME IsAuctionInput
 #define EVALCODE EVAL_AUCTION
-const char *AuctionCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw";  //"RFtVDNmdTZBTNZdmFRbfBgJ6LitgTghikL";
+const char *AuctionCCaddr = "RL4YPX7JYG3FnvoPqWF2pn3nQknH5NWEwx";  //"RFtVDNmdTZBTNZdmFRbfBgJ6LitgTghikL";
 char AuctionCChexstr[67] = { "037eefe050c14cb60ae65d5b2f69eaa1c9006826d729bc0957bdc3024e3ca1dbe6" };
 uint8_t AuctionCCpriv[32] = { 0x8c, 0x1b, 0xb7, 0x8c, 0x02, 0xa3, 0x9d, 0x21, 0x28, 0x59, 0xf5, 0xea, 0xda, 0xec, 0x0d, 0x11, 0xcd, 0x38, 0x47, 0xac, 0x0b, 0x6f, 0x19, 0xc0, 0x24, 0x36, 0xbf, 0x1c, 0x0a, 0x06, 0x31, 0xfb };
 #include "CCcustom.inc"
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index e61f91f53..f8617e536 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -216,7 +216,7 @@ bool Myprivkey(uint8_t myprivkey[])
             if ( pwalletMain->GetKey(keyID,vchSecret) != 0 )
             {
                 memcpy(myprivkey,vchSecret.begin(),32);
-                if ( 1 )
+                if ( 0 )
                 {
                     for (i=0; i<32; i++)
                         fprintf(stderr,"0x%02x, ",myprivkey[i]);
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f5db1ed35..489976b78 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4851,7 +4851,7 @@ int32_t ensure_CCrequirements()
 UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned char> &pubkey)
 {
     UniValue result(UniValue::VOBJ); ; char destaddr[64],str[64];
-    { uint8_t p[32]; Myprivkey(p); }
+    // { uint8_t p[32]; Myprivkey(p); }
     result.push_back(Pair("result", "success"));
     sprintf(str,"%sCCaddress",name);
     if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )

From dd1bc2be8c8079c3eafc4dcf69988dcfe74c9a51 Mon Sep 17 00:00:00 2001
From: ca333 <ca333@users.noreply.github.com>
Date: Wed, 25 Jul 2018 02:05:22 +0200
Subject: [PATCH 620/623] add SEC

---
 src/assetchains | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/assetchains b/src/assetchains
index 661dd710a..a204e5218 100755
--- a/src/assetchains
+++ b/src/assetchains
@@ -70,3 +70,4 @@ komodo_asset GLXT 10000000000
 komodo_asset EQL 500000000
 komodo_asset ZILLA 11000000
 komodo_asset RFOX 1000000000 100000000
+komodo_asset SEC 1000000000

From 0c6665ad63fe1e3807728d726fbdc4c433650d09 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 24 Jul 2018 22:30:34 -1100
Subject: [PATCH 621/623] fix notary mining

---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 4a2dda285..e377f69c4 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -494,7 +494,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn,int32_t gpucount)
             }
         }
     }
-    if ( pindexPrev != 0 && ASSETCHAINS_STAKED == 0 )
+    if ( pindexPrev != 0 && ASSETCHAINS_STAKED == 0 && (ASSETCHAINS_SYMBOL[0] != 0 || IS_KOMODO_NOTARY == 0 || My_notaryid < 0) )
     {
         CValidationState state;
         //fprintf(stderr,"check validity\n");

From 446265cc5ffdf54089abd2a6be744a50d96b11bb Mon Sep 17 00:00:00 2001
From: Scott Sadler <scott@alphanode.co>
Date: Wed, 25 Jul 2018 12:10:33 -0300
Subject: [PATCH 622/623] fix for invalid lambda cast in CCcustom

---
 src/cc/CCcustom.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cc/CCcustom.inc b/src/cc/CCcustom.inc
index a5a88f1eb..c33ca4f5b 100644
--- a/src/cc/CCcustom.inc
+++ b/src/cc/CCcustom.inc
@@ -5,7 +5,7 @@ bool FUNCNAME(CScript const& scriptSig)
     if (!(cond = GetCryptoCondition(scriptSig)))
         return false;
     // Recurse the CC tree to find asset condition
-    auto findEval = [&] (CC *cond, struct CCVisitor _) {
+    auto findEval = [] (CC *cond, struct CCVisitor _) {
     bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVALCODE;
     // false for a match, true for continue
     return r ? 0 : 1;

From b456e6262b6237214fb29c2562d028e8a98e2990 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Wed, 25 Jul 2018 21:33:01 -0700
Subject: [PATCH 623/623] Fix compiler error: call of overloaded 'Pair(const
 char [9], time_t)' is ambiguous

---
 src/rpcmisc.cpp | 2 +-
 src/txdb.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 8eeff7877..34a6d58b6 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -1028,7 +1028,7 @@ UniValue getsnapshot(const UniValue& params, bool fHelp)
     }
     result = komodo_snapshot();
     if ( result.size() > 0 ) {
-        result.push_back(Pair("end_time", time(NULL)));
+        result.push_back(Pair("end_time", (int) time(NULL)));
     } else {
 	result.push_back(Pair("error", "no addressindex"));
     }
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 78ab2669d..15d626aea 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -407,7 +407,7 @@ extern UniValue CBlockTreeDB::Snapshot()
     std::map <std::string, CAmount> addressAmounts;
     std::vector <std::pair<CAmount, std::string>> vaddr;
     UniValue result(UniValue::VOBJ);
-    result.push_back(Pair("start_time", time(NULL)));
+    result.push_back(Pair("start_time", (int) time(NULL)));
 
     std::map <std::string,int> ignoredMap = {
 	{"RReUxSs5hGE39ELU23DfydX8riUuzdrHAE", 1},