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 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 618150c83e1ef47e87c99b41c657a17e9bd02b1f Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Wed, 18 Jul 2018 05:31:39 -1100
Subject: [PATCH 6/6] 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
     {