From fbde518eb3d5c4d0b93b3126e2091b88100ce35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= <jtimon@jtimon.cc>
Date: Mon, 13 Mar 2017 17:01:46 +0100
Subject: [PATCH] f'DEMO ONLY: issuance skeleton'

---
 src/rpc/client.cpp       |  2 +-
 src/wallet/rpcwallet.cpp | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 0cbb0fdb75..5b9de06227 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -31,7 +31,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "combineblocksigs", 1 },
     { "getnetworkhashps", 0 },
     { "getnetworkhashps", 1 },
-    { "generateasset", 1 },
+    { "generateasset", 0 },
     { "sendtoaddress", 1 },
     { "sendtoaddress", 4 },
     { "settxfee", 0 },
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 05fcc7e2d3..fd48085325 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3217,30 +3217,23 @@ UniValue generateasset(const UniValue& params, bool fHelp)
     if (!EnsureWalletIsAvailable(fHelp))
         return NullUniValue;
 
-    if (fHelp || params.size() != 2)
+    if (fHelp || params.size() != 1)
         throw runtime_error(
-            "generateasset label amount\n"
-            "\nCreate an asset. Must have funds in wallet to do so.\n"
+            "generateasset amount\n"
+            "\nCreate an asset. Must have funds in wallet to do so. Returns asset hex id.\n"
             "\nArguments:\n"
-            "1. \"label\"            (string, required) Label for newly generated asset.\n"
-            "2. \"amount\"           (numeric, required) Number of asset to generate.\n"
+            "1. \"amount\"           (numeric, required) Number of asset to generate.\n"
             "\nExamples:\n"
-            + HelpExampleCli("generateasset", "\"my asset\" 10" )
-            + HelpExampleRpc("generateasset", "\"my asset\" 10" )
+            + HelpExampleCli("generateasset", "10" )
+            + HelpExampleRpc("generateasset", "10" )
         );
-    RPCTypeCheck(params, boost::assign::list_of(UniValue::VSTR)(UniValue::VNUM));
+    RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
 
-    std::string label = params[0].get_str();
-    // Look ma, NUMS!
-    CAsset id(GetRandHash());
-
-    pwalletMain->SetAssetPair(label, id);
-
-     // Amount
-    CAmount nAmount = AmountFromValue(params[1]);
+    CAmount nAmount = AmountFromValue(params[0]);
     if (nAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
 
+    CAsset id(GetRandHash());
     UniValue nothing(UniValue::VARR);
     std::string addr = getnewaddress(nothing, fHelp).get_str();
     CBitcoinAddress address(addr);
@@ -3253,7 +3246,7 @@ UniValue generateasset(const UniValue& params, bool fHelp)
     CWalletTx wtx;
     SendMoney(GetScriptForDestination(address.Get()), 100000, policyAsset, false, confidentiality_pubkey, wtx, &id, &nAmount);
 
-    return NullUniValue;
+    return id.GetHex();
 }
 
 UniValue dumpassetlabels(const UniValue& params, bool fHelp)