test

crypto777/cJSON.c

@@ -957,6 +957,7 @@ double get_API_float(cJSON *obj)
     }
     return(val);
 }
+
 double jdouble(cJSON *json,char *field)
 {
     if ( json != 0 )

iguana/iguana777.h

@@ -908,6 +908,7 @@ bits256 iguana_str2priv(struct iguana_info *coin,char *str);
 int32_t iguana_spentflag(struct iguana_info *coin,int64_t *RTspendp,int32_t *spentheightp,struct iguana_ramchain *ramchain,int16_t spent_hdrsi,uint32_t spent_unspentind,int32_t height,uint64_t amount);
 int32_t iguana_voutscript(struct iguana_info *coin,struct iguana_bundle *bp,uint8_t *scriptspace,char *asmstr,struct iguana_unspent *u,struct iguana_pkhash *p,int32_t txi);
 cJSON *iguana_unspentjson(struct iguana_info *coin,int32_t hdrsi,uint32_t unspentind,struct iguana_txid *T,struct iguana_unspent *up,uint8_t rmd160[20],char *coinaddr,uint8_t *pubkey33);
+int32_t bitcoin_standardspend(uint8_t *script,int32_t n,uint8_t rmd160[20]);
 
 extern int32_t HDRnet,netBLOCKS;
 

iguana/iguana_bundles.c

@@ -750,7 +750,7 @@ int32_t iguana_bundleready(struct iguana_info *coin,struct iguana_bundle *bp,int
 //#endif
                 {
                     iguana_blockunmark(coin,block,bp,i,1);
-                    if ( requiredflag != 0 )
+                    if ( 0 && requiredflag != 0 )
                         printf("not ready altpath.(%d %d %d %d %d) [%d:%d]\n",block->txvalid == 0,block->fpipbits == 0 ,block->fpos < 0,(bp->bundleheight+i > 0 && bits256_nonz(block->RO.prev_block) == 0),iguana_blockvalidate(coin,&valid,block,1) < 0,bp->hdrsi,i);
                 }
             }

iguana/ramchain_api.c

@@ -388,7 +388,7 @@ THREE_STRINGS(bitcoinrpc,verifymessage,address,sig,message)
 // tx
 ARRAY_OBJ_INT(bitcoinrpc,createrawtransaction,vins,vouts,locktime)
 {
-    bits256 txid; int32_t vout,scriptlen=0,p2shlen=0,i,n; uint32_t sequenceid; uint8_t script[IGUANA_MAXSCRIPTSIZE],redeemscript[IGUANA_MAXSCRIPTSIZE]; char *str; cJSON *txobj,*item,*retjson = cJSON_CreateObject();
+    bits256 txid; int32_t vout,offset,scriptlen=0,p2shlen=0,i,n; uint32_t sequenceid; uint8_t addrtype,rmd160[20],script[IGUANA_MAXSCRIPTSIZE],redeemscript[IGUANA_MAXSCRIPTSIZE]; uint64_t satoshis; char *hexstr,*str,*field,*txstr; cJSON *txobj,*item,*obj,*retjson = cJSON_CreateObject();
     if ( coin != 0 && (txobj= bitcoin_createtx(coin,locktime)) != 0 )
     {
         if ( (n= cJSON_GetArraySize(vins)) > 0 )
@@ -408,20 +408,83 @@ ARRAY_OBJ_INT(bitcoinrpc,createrawtransaction,vins,vouts,locktime)
                     decode_hex(redeemscript,p2shlen,str);
                 }
                 vout = jint(item,"vout");
+                if ( jobj(item,"sequenceid") != 0 )
                     sequenceid = juint(item,"sequenceid");
+                else sequenceid = 0xffffffff;
                 txid = jbits256(item,"txid");
                 bitcoin_addinput(coin,txobj,txid,vout,sequenceid,script,scriptlen,redeemscript,p2shlen);
             }
         }
         if ( (n= cJSON_GetArraySize(vouts)) > 0 )
         {
-            for (i=0; i<n; i++)
+            item = vouts->child;
+            while ( item != 0 )
+            {
+                if ( (field= jfieldname(item)) != 0 )
+                {
+                    if ( strcmp(field,"data") == 0 )
+                    {
+                        if ( (hexstr= jstr(item,"data")) != 0 )
+                        {
+                            scriptlen = (int32_t)strlen(hexstr) >> 1;
+                            offset = 0;
+                            if ( is_hexstr(hexstr,scriptlen) > 0 )
+                            {
+                                decode_hex(script+4,scriptlen,hexstr);
+                                script[3] = SCRIPT_OPRETURN;
+                                scriptlen++;
+                                /* 1-75	0x01-0x4b	(special)	data	The next opcode bytes is data to be pushed onto the stack
+                                OP_PUSHDATA1	76	0x4c	(special)	data	The next byte contains the number of bytes to be pushed onto the stack.
+                                OP_PUSHDATA2	77	0x4d*/
+                                if ( scriptlen < 76 )
+                                {
+                                    script[2] = scriptlen;
+                                    offset = 2;
+                                    scriptlen++;
+                                }
+                                else if ( scriptlen <= 0xff )
+                                {
+                                    script[2] = scriptlen;
+                                    script[1] = 0x4c;
+                                    offset = 1;
+                                    scriptlen += 2;
+                                }
+                                else if ( scriptlen <= 0xffff )
+                                {
+                                    script[2] = ((scriptlen >> 8) & 0xff);
+                                    script[1] = (scriptlen & 0xff);
+                                    script[0] = 0x4d;
+                                    offset = 0;
+                                    scriptlen += 3;
+                                }
+                                else continue;
+                                if ( (obj= jobj(item,"amount")) != 0 )
+                                    satoshis = get_API_float(obj) * SATOSHIDEN;
+                                else satoshis = 0;
+                                bitcoin_addoutput(coin,txobj,script+offset,scriptlen,satoshis);
+                            }
+                        }
+                        break;
+                    }
+                    else
+                    {
+                        if ( bitcoin_addr2rmd160(&addrtype,rmd160,field) == sizeof(rmd160) )
                         {
-                item = jitem(vouts,i);
+                            scriptlen = bitcoin_standardspend(script,0,rmd160);
+                            satoshis = get_API_float(item) * SATOSHIDEN;
+                            bitcoin_addoutput(coin,txobj,script,scriptlen,satoshis);
                         }
                     }
                 }
-    printf("vins.(%s) vouts.(%s) locktime.%u\n",jprint(vins,0),jprint(vouts,0),locktime);
+                item = item->next;
+            }
+        }
+        if ( (txstr= bitcoin_json2hex(coin,&txid,txobj)) != 0 )
+        {
+            jaddstr(retjson,"result",txstr);
+            free(txstr);
+        }
+    }
     return(jprint(retjson,1));
 }
 

includes/cJSON.h

@@ -226,6 +226,7 @@ extern "C"
 #define jtrue cJSON_CreateTrue
 #define jfalse cJSON_CreateFalse
 
+#define jfieldname get_cJSON_fieldname
 
 #ifdef __cplusplus
 }