Skip to content

Commit 7d0e922

Browse files
krypdkatkrypdkat
committed
add oracle handling
1 parent 855b6b8 commit 7d0e922

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

‎LogEvent.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,12 @@ Json::Value LogEvent::parseToJsonValueWithExtraData(const TickData& td, const in
225225
{
226226
txHash = td.transactionDigests[txIndex].toQubicHash();
227227
}
228-
else if (txIndex <= SC_END_EPOCH_TX)
228+
else if (txIndex <= LOG_TX_PER_TICK)
229229
{
230230
if (txIndex == SC_INITIALIZE_TX) txHash = ("SC_INITIALIZE_TX_" + std::to_string(td.tick));
231231
if (txIndex == SC_BEGIN_EPOCH_TX) txHash = ("SC_BEGIN_EPOCH_TX_" + std::to_string(td.tick));
232232
if (txIndex == SC_BEGIN_TICK_TX) txHash = ("SC_BEGIN_TICK_TX_" + std::to_string(td.tick));
233+
if (txIndex == SC_NOTIFICATION_TX) txHash = ("SC_NOTIFICATION_TX" + std::to_string(td.tick));
233234
if (txIndex == SC_END_TICK_TX) txHash = ("SC_END_TICK_TX_" + std::to_string(td.tick));
234235
if (txIndex == SC_END_EPOCH_TX) txHash = ("SC_END_EPOCH_TX_" + std::to_string(td.tick));
235236
}

‎RESTAPI/bobAPI.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ std::string getQuTransfersForIdentity(uint32_t fromTick, uint32_t toTick, const
594594
if (i == SC_INITIALIZE_TX) outArray.append("SC_INITIALIZE_TX_" + std::to_string(tick));
595595
if (i == SC_BEGIN_EPOCH_TX) outArray.append("SC_BEGIN_EPOCH_TX_" + std::to_string(tick));
596596
if (i == SC_BEGIN_TICK_TX) outArray.append("SC_BEGIN_TICK_TX_" + std::to_string(tick));
597+
if (i == SC_NOTIFICATION_TX) outArray.append("SC_NOTIFICATION_TX_" + std::to_string(tick));
597598
if (i == SC_END_TICK_TX) outArray.append("SC_END_TICK_TX_" + std::to_string(tick));
598599
if (i == SC_END_EPOCH_TX) outArray.append("SC_END_EPOCH_TX_" + std::to_string(tick));
599600
}
@@ -632,6 +633,7 @@ std::string getQuTransfersForIdentity(uint32_t fromTick, uint32_t toTick, const
632633
if (i == SC_INITIALIZE_TX) inArray.append("SC_INITIALIZE_TX_" + std::to_string(tick));
633634
if (i == SC_BEGIN_EPOCH_TX) inArray.append("SC_BEGIN_EPOCH_TX_" + std::to_string(tick));
634635
if (i == SC_BEGIN_TICK_TX) inArray.append("SC_BEGIN_TICK_TX_" + std::to_string(tick));
636+
if (i == SC_NOTIFICATION_TX) inArray.append("SC_NOTIFICATION_TX_" + std::to_string(tick));
635637
if (i == SC_END_TICK_TX) inArray.append("SC_END_TICK_TX_" + std::to_string(tick));
636638
if (i == SC_END_EPOCH_TX) inArray.append("SC_END_EPOCH_TX_" + std::to_string(tick));
637639
}
@@ -723,6 +725,7 @@ std::string getAssetTransfersForIdentity(uint32_t fromTick, uint32_t toTick, con
723725
if (i == SC_INITIALIZE_TX) outArray.append("SC_INITIALIZE_TX_" + std::to_string(tick));
724726
if (i == SC_BEGIN_EPOCH_TX) outArray.append("SC_BEGIN_EPOCH_TX_" + std::to_string(tick));
725727
if (i == SC_BEGIN_TICK_TX) outArray.append("SC_BEGIN_TICK_TX_" + std::to_string(tick));
728+
if (i == SC_NOTIFICATION_TX) outArray.append("SC_NOTIFICATION_TX_" + std::to_string(tick));
726729
if (i == SC_END_TICK_TX) outArray.append("SC_END_TICK_TX_" + std::to_string(tick));
727730
if (i == SC_END_EPOCH_TX) outArray.append("SC_END_EPOCH_TX_" + std::to_string(tick));
728731
}
@@ -763,6 +766,7 @@ std::string getAssetTransfersForIdentity(uint32_t fromTick, uint32_t toTick, con
763766
if (i == SC_INITIALIZE_TX) inArray.append("SC_INITIALIZE_TX_" + std::to_string(tick));
764767
if (i == SC_BEGIN_EPOCH_TX) inArray.append("SC_BEGIN_EPOCH_TX_" + std::to_string(tick));
765768
if (i == SC_BEGIN_TICK_TX) inArray.append("SC_BEGIN_TICK_TX_" + std::to_string(tick));
769+
if (i == SC_NOTIFICATION_TX) inArray.append("SC_NOTIFICATION_TX_" + std::to_string(tick));
766770
if (i == SC_END_TICK_TX) inArray.append("SC_END_TICK_TX_" + std::to_string(tick));
767771
if (i == SC_END_EPOCH_TX) inArray.append("SC_END_EPOCH_TX_" + std::to_string(tick));
768772
}
@@ -845,6 +849,7 @@ std::string getAllAssetTransfers(uint32_t fromTick, uint32_t toTick, const std::
845849
if (i == SC_INITIALIZE_TX) outArray.append("SC_INITIALIZE_TX_" + std::to_string(tick));
846850
if (i == SC_BEGIN_EPOCH_TX) outArray.append("SC_BEGIN_EPOCH_TX_" + std::to_string(tick));
847851
if (i == SC_BEGIN_TICK_TX) outArray.append("SC_BEGIN_TICK_TX_" + std::to_string(tick));
852+
if (i == SC_NOTIFICATION_TX) outArray.append("SC_NOTIFICATION_TX_" + std::to_string(tick));
848853
if (i == SC_END_TICK_TX) outArray.append("SC_END_TICK_TX_" + std::to_string(tick));
849854
if (i == SC_END_EPOCH_TX) outArray.append("SC_END_EPOCH_TX_" + std::to_string(tick));
850855
}

‎defines.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "commonFunctions.h"
22
#define NUMBER_OF_TRANSACTIONS_PER_TICK 1024
3-
#define NUMBER_OF_SPECIAL_EVENT_PER_TICK 5
3+
#define NUMBER_OF_SPECIAL_EVENT_PER_TICK 6
44
#define SIGNATURE_SIZE 64
55
#define SPECTRUM_DEPTH 24 // Is derived from SPECTRUM_CAPACITY (=N)
66
#define ASSETS_DEPTH 24 // Is derived from ASSETS_CAPACITY (=N)
@@ -18,4 +18,5 @@
1818
#define SC_BEGIN_EPOCH_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 1)
1919
#define SC_BEGIN_TICK_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 2)
2020
#define SC_END_TICK_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 3)
21-
#define SC_END_EPOCH_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 4)
21+
#define SC_END_EPOCH_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 4)
22+
#define SC_NOTIFICATION_TX (NUMBER_OF_TRANSACTIONS_PER_TICK + 5)

‎structs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ struct RequestAllLogIdRangesFromTick
271271
}
272272
};
273273

274-
#define LOG_TX_NUMBER_OF_SPECIAL_EVENT 5
275-
#define LOG_TX_PER_TICK (NUMBER_OF_TRANSACTIONS_PER_TICK + LOG_TX_NUMBER_OF_SPECIAL_EVENT)// +5 special events
274+
#define LOG_TX_PER_TICK (NUMBER_OF_TRANSACTIONS_PER_TICK + NUMBER_OF_SPECIAL_EVENT_PER_TICK)// +6 special events
276275
// Response logid ranges of all txs from a tick
277276
struct LogRangesPerTxInTick
278277
{
@@ -294,6 +293,7 @@ struct LogRangesPerTxInTick
294293
{
295294
if (fromLogId[i] != -1) logTxOrder.push_back(i);
296295
}
296+
if (fromLogId[SC_NOTIFICATION_TX] != -1) logTxOrder.push_back(SC_NOTIFICATION_TX);
297297
if (fromLogId[SC_END_TICK_TX] != -1) logTxOrder.push_back(SC_END_TICK_TX);
298298
if (fromLogId[SC_END_EPOCH_TX] != -1) logTxOrder.push_back(SC_END_EPOCH_TX);
299299
return logTxOrder;

0 commit comments

Comments
 (0)