Fixed decoderawtransaction output on unsent stream creation

codeing-io · Oct 28, 2018 · 5923fad · 5923fad
1 parent 2b6084f
commit 5923fad
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/rpc/rpcrawtransaction.cpp b/src/rpc/rpcrawtransaction.cpp
@@ -503,7 +503,27 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
     if(new_entity_type == MC_ENT_TYPE_STREAM)
     {
         uint256 txid=tx.GetHash();
-        entry.push_back(Pair("create", StreamEntry((unsigned char*)&txid,0x05)));
+
+        mc_EntityDetails entity;
+        mc_EntityDetails *lpEntity=NULL;
+        entity.Zero();
+        if(mc_gState->m_Assets->FindEntityByTxID(&entity,(unsigned char*)&txid) == 0)
+        {
+            mc_EntityLedgerRow entity_row;
+            entity_row.Zero();
+            memcpy(entity_row.m_Key,&txid,MC_ENT_KEY_SIZE);
+            entity_row.m_EntityType=MC_ENT_TYPE_STREAM;
+            entity_row.m_Block=mc_gState->m_Assets->m_Block;
+            entity_row.m_Offset=-1;
+            entity_row.m_ScriptSize=details_script_size;
+            if(details_script_size)
+            {
+                memcpy(entity_row.m_Script,details_script,details_script_size);
+            }
+            entity.Set(&entity_row);
+            lpEntity=&entity;
+        }
+        entry.push_back(Pair("create", StreamEntry((unsigned char*)&txid,0x05,lpEntity)));
     }
 
     if(mc_gState->m_Compatibility & MC_VCM_1_0)

diff --git a/src/rpc/rpcutils.cpp b/src/rpc/rpcutils.cpp
@@ -782,7 +782,7 @@ Object FilterEntry(const unsigned char *txid,uint32_t output_level,uint32_t filt
     return entry;    
 }
 
-Object StreamEntry(const unsigned char *txid,uint32_t output_level)
+Object StreamEntry(const unsigned char *txid,uint32_t output_level,mc_EntityDetails *raw_entity)
 {
 // output_level constants
 // 0x0001 type
@@ -806,9 +806,14 @@ Object StreamEntry(const unsigned char *txid,uint32_t output_level)
         return entry;
     }
 
+
     uint256 hash=*(uint256*)txid;
-    if(mc_gState->m_Assets->FindEntityByTxID(&entity,txid))
+    if( (raw_entity != NULL ) || (mc_gState->m_Assets->FindEntityByTxID(&entity,txid) != 0) )
     {        
+        if(raw_entity)
+        {
+            memcpy(&entity,raw_entity,sizeof(mc_EntityDetails));
+        }
         ptr=(unsigned char *)entity.GetName();
 
         if(output_level & 0x001)
@@ -1020,6 +1025,11 @@ Object StreamEntry(const unsigned char *txid,uint32_t output_level)
     return entry;
 }
 
+Object StreamEntry(const unsigned char *txid,uint32_t output_level)
+{
+    return StreamEntry(txid,output_level,NULL);
+}
+
 map<string, Value> ParamsToUpgrade(mc_EntityDetails *entity,int version)   
 {
     map<string, Value> result;

diff --git a/src/rpc/rpcutils.h b/src/rpc/rpcutils.h
@@ -109,6 +109,7 @@ Value PermissionForFieldEntry(mc_EntityDetails *lpEntity);
 Array PerOutputDataEntries(const CTxOut& txout,mc_Script *lpScript,uint256 txid,int vout);
 Array PermissionEntries(const CTxOut& txout,mc_Script *lpScript,bool fLong);
 Object StreamEntry(const unsigned char *txid,uint32_t output_level);
+Object StreamEntry(const unsigned char *txid,uint32_t output_level,mc_EntityDetails *raw_entity);
 Object UpgradeEntry(const unsigned char *txid);
 const unsigned char *GetChunkDataInRange(int64_t *out_size,unsigned char* hashes,int chunk_count,int64_t start,int64_t count);
 uint32_t GetFormattedData(mc_Script *lpScript,const unsigned char **elem,int64_t *out_size,unsigned char* hashes,int chunk_count,int64_t total_size);