Fractional currency launch fixes, more needed

diff --git a/src/pbaas/pbaas.cpp b/src/pbaas/pbaas.cpp
index 1278f49861c29b5eb126939cc2338afb858c38f9..9ee6b4dddd660dcc5a3b5f6ae180b8af662ae3d7 100644 (file)
--- a/src/pbaas/pbaas.cpp
+++ b/src/pbaas/pbaas.cpp
@@ -1581,7 +1581,7 @@ void CConnectedChains::AggregateChainTransfers(const CTxDestination &feeOutput,
                                     cp = CCinit(&CC, EVAL_FINALIZE_EXPORT);
                                     CTransactionFinalization finalization(0);
 
-                                    printf("%s: Finalizing export with index dest %s\n", __func__, EncodeDestination(CKeyID(CCrossChainRPCData::GetConditionID(lastChainDef.systemID, EVAL_FINALIZE_EXPORT))).c_str());
+                                    //printf("%s: Finalizing export with index dest %s\n", __func__, EncodeDestination(CKeyID(CCrossChainRPCData::GetConditionID(lastChainDef.systemID, EVAL_FINALIZE_EXPORT))).c_str());
 
                                     indexDests = std::vector<CTxDestination>({CKeyID(CCrossChainRPCData::GetConditionID(lastChainDef.systemID, EVAL_FINALIZE_EXPORT))});
                                     dests = std::vector<CTxDestination>({CPubKey(ParseHex(CC.CChexstr)).GetID()});

diff --git a/src/pbaas/reserves.cpp b/src/pbaas/reserves.cpp
index d2813038f8abc4e3ab59cf62f9fe23fd1dc092ef..6e163cda79e0c4b1400c2336e71b4566976c2cbb 100644 (file)
--- a/src/pbaas/reserves.cpp
+++ b/src/pbaas/reserves.cpp
@@ -1401,7 +1401,7 @@ bool CReserveTransactionDescriptor::AddReserveTransferImportOutputs(const uint16
 
     uint160 systemDestID = importCurrencyDef.systemID;     // native on destination system
     uint160 importCurrencyID = importCurrencyDef.GetID();
-    printf("%s\n", importCurrencyDef.ToUniValue().write(1,2).c_str());
+    //printf("%s\n", importCurrencyDef.ToUniValue().write(1,2).c_str());
 
     std::map<uint160, CAmount> preAllocMap;             // if this contains pre-allocations, only make the necessary map once
 
@@ -1428,7 +1428,7 @@ bool CReserveTransactionDescriptor::AddReserveTransferImportOutputs(const uint16
             }
             CReserveTransfer &curTransfer = *pCurTransfer;
 
-            printf("currency transfer #%d:\n%s\n", i, curTransfer.ToUniValue().write(1,2).c_str());
+            //printf("currency transfer #%d:\n%s\n", i, curTransfer.ToUniValue().write(1,2).c_str());
 
             CCurrencyDefinition currencyDest = ConnectedChains.GetCachedCurrency(curTransfer.destCurrencyID);
 

diff --git a/src/rpc/pbaasrpc.cpp b/src/rpc/pbaasrpc.cpp
index 733cc650d37d80645bd8a40daaac25c2c3f34933..e5ca69714d9c3ed57ba17623f2f2386d53ffb648 100644 (file)
--- a/src/rpc/pbaasrpc.cpp
+++ b/src/rpc/pbaasrpc.cpp
@@ -1593,7 +1593,7 @@ bool GetChainTransfers(multimap<uint160, pair<CInputDescriptor, CReserveTransfer
                         (nofilter || (m.vKeys.size() > 1 && GetDestinationID(m.vKeys[1]) == chainFilter)) &&
                         (rt.flags & flags) == flags)
                     {
-                        inputDescriptors.insert(make_pair(GetDestinationID(p.vKeys[1]),
+                        inputDescriptors.insert(make_pair(GetDestinationID(m.vKeys[1]),
                                                     make_pair(CInputDescriptor(ntx.vout[i].scriptPubKey, ntx.vout[i].nValue, CTxIn(COutPoint(it->first.txhash, i))), rt)));
                     }
                     else if (p.IsValid() &&