From 350c8a72aab49bbe0b3bc64427c5eee5b7975c43 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 21 Mar 2019 20:01:40 -1100
Subject: [PATCH] Shift payments vouts to put change in vout0

---
 src/cc/payments.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cc/payments.cpp b/src/cc/payments.cpp
index 8fa87bd3d..a9e55fd50 100644
--- a/src/cc/payments.cpp
+++ b/src/cc/payments.cpp
@@ -321,6 +321,8 @@ UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr)
                     result.push_back(Pair("minrelease",ValueFromAmount(minrelease)));
                     return(result);
                 }
+                txidpk = CCtxidaddr(txidaddr,createtxid);
+                mtx.vout.push_back(MakeCC1of2vout(EVAL_PAYMENTS,0,Paymentspk,txidpk));
                 for (i=0; i<txidoprets.size(); i++)
                 {
                     std::vector<uint8_t> scriptPubKey,opret;
@@ -370,14 +372,13 @@ UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr)
                 }
                 for (i=0; i<txidoprets.size(); i++)
                 {
-                    mtx.vout[i].nValue *= amount;
-                    mtx.vout[i].nValue /= totalallocations;
+                    mtx.vout[i+1].nValue *= amount;
+                    mtx.vout[i+1].nValue /= totalallocations;
                 }
-                txidpk = CCtxidaddr(txidaddr,createtxid);
                 if ( (inputsum= AddPaymentsInputs(cp,mtx,txidpk,amount+PAYMENTS_TXFEE,60,createtxid,latestheight)) >= amount )
                 {
                     if ( (CCchange= (inputsum - amount)) >= PAYMENTS_TXFEE )
-                        mtx.vout.push_back(MakeCC1of2vout(EVAL_PAYMENTS,CCchange,Paymentspk,txidpk));
+                        mtx.vout[0].nValue = CCchange;
                     GetCCaddress1of2(cp,destaddr,Paymentspk,txidpk);
                     CCaddr1of2set(cp,Paymentspk,txidpk,cp->CCpriv,destaddr);
                     rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,onlyopret);