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] 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 )