From 224c48b097db79bfd391782b0f42e44ad88cddb5 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 16 May 2016 16:24:02 -0500
Subject: [PATCH] test

---
 iguana/iguana_tx.c | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/iguana/iguana_tx.c b/iguana/iguana_tx.c
index 96318fbdd..099321d5d 100755
--- a/iguana/iguana_tx.c
+++ b/iguana/iguana_tx.c
@@ -117,22 +117,26 @@ int32_t iguana_voutscript(struct iguana_info *coin,struct iguana_bundle *bp,uint
 int32_t iguana_voutset(struct iguana_info *coin,uint8_t *scriptspace,char *asmstr,int32_t height,struct iguana_msgvout *vout,struct iguana_txid *tx,int32_t i)
 {
     struct iguana_ramchaindata *rdata=0; uint32_t unspentind,scriptlen = 0; struct iguana_bundle *bp;
-    struct iguana_unspent *u,*U; struct iguana_pkhash *P; int32_t err = 0;
+    struct iguana_unspent *u,*U; struct iguana_pkhash *P; struct iguana_ramchain *ramchain; int32_t err = 0;
     memset(vout,0,sizeof(*vout));
-    if ( height >= 0 && height < coin->chain->bundlesize*coin->bundlescount && (bp= coin->bundles[height / coin->chain->bundlesize]) != 0  && (rdata= bp->ramchain.H.data) != 0 && i < tx->numvouts )
+    if ( height >= 0 && height < coin->chain->bundlesize*coin->bundlescount && (bp= coin->bundles[height / coin->chain->bundlesize]) != 0  )
     {
-        U = RAMCHAIN_PTR(rdata,Uoffset);
-        P = RAMCHAIN_PTR(rdata,Poffset);
-        //U = (void *)(long)((long)rdata + rdata->Uoffset);
-        //P = (void *)(long)((long)rdata + rdata->Poffset);
-        unspentind = (tx->firstvout + i);
-        u = &U[unspentind];
-        if ( u->txidind != tx->txidind || u->vout != i || u->hdrsi != height / coin->chain->bundlesize )
-            printf("iguana_voutset: txidind mismatch %d vs %d || %d vs %d || (%d vs %d)\n",u->txidind,u->txidind,u->vout,i,u->hdrsi,height / coin->chain->bundlesize);
-        vout->value = u->value;
-        vout->pk_script = scriptspace;
-        scriptlen = iguana_voutscript(coin,bp,scriptspace,asmstr,u,&P[u->pkind],i);
-    } else printf("iguana_voutset unexpected path rdata.%p i.%d %d\n",rdata,i,tx->numvouts);
+        ramchain = (bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
+        if ( (rdata= ramchain->H.data) != 0 && i < tx->numvouts )
+        {
+            U = RAMCHAIN_PTR(rdata,Uoffset);
+            P = RAMCHAIN_PTR(rdata,Poffset);
+            //U = (void *)(long)((long)rdata + rdata->Uoffset);
+            //P = (void *)(long)((long)rdata + rdata->Poffset);
+            unspentind = (tx->firstvout + i);
+            u = &U[unspentind];
+            if ( u->txidind != tx->txidind || u->vout != i || u->hdrsi != height / coin->chain->bundlesize )
+                printf("iguana_voutset: txidind mismatch %d vs %d || %d vs %d || (%d vs %d)\n",u->txidind,u->txidind,u->vout,i,u->hdrsi,height / coin->chain->bundlesize);
+            vout->value = u->value;
+            vout->pk_script = scriptspace;
+            scriptlen = iguana_voutscript(coin,bp,scriptspace,asmstr,u,&P[u->pkind],i);
+        } else printf("iguana_voutset unexpected path rdata.%p i.%d %d\n",rdata,i,tx->numvouts);
+    }
     vout->pk_scriptlen = scriptlen;
     if ( err != 0 )
         return(-err);