From 5cf0c1db944135ca9efa6a5792c59f0ed356927c Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 Jul 2018 02:53:55 -1100 Subject: [PATCH] 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 origpubkey,std::string name,std::string description); CScript EncodeAssetOpRet(uint8_t funcid,uint256 assetid,uint256 assetid2,uint64_t price,std::vector 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 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