Merge pull request #54 from cardano-foundation/feat/conway_changes

Feat/conway changes

Author: fabianbormann

report/statistics.csv

@@ -270,3 +270,29 @@ total_rewards_pot,unspendable_earned_rewards,total_supply,unclaimed_refunds,epoc
 24062114812207,14199128225,36785005676862309,0,478,8214994323137691,9993163205176,9256528644590,1492348596544412,1068,22705372932636708,20964,102081461302,0,
 24020299648873,12657076823,36798870281388053,0,479,8201129718611947,10074223517217,9142016201882,1497165313551009,1070,22697968340213296,20970,94128682735,0,
 24295231154087,13931960165,36812929523020853,0,480,8187070476979147,10151440134652,9284744788618,1502038291741991,1088,22639199712419476,21243,98481346800,0,
+24422323928468,18362438550,36827102020956379,0,481,8172897979043621,10179657309600,9358201833175,1506941118966234,1103,22641739799139393,21400,88531121892,0,
+24306438558264,13809997446,36841202420119158,0,482,8158797579880842,10135837220057,9309313626555,1511816216675332,1070,22661310740997364,21339,84012172874,0,
+24331315133534,12028508459,36855324087164255,0,483,8144675912835745,10145786768549,9319265338279,1516694508210497,1091,22654534217562355,21405,75889828347,0,
+24425844815414,4557611423,36869473182105325,0,484,8130526817894675,10205781239756,9334894612576,1521584234785002,1089,22653275811843579,21526,75526246011,0,
+24406848689846,5440121562,36883631806182185,0,485,8116368193817815,10178546787087,9346932164790,1526471044644533,1083,22681562360727143,21547,75117947461,0,
+24271184514497,6034094265,36897711934961031,0,486,8102288065038969,10118318899797,9298628711801,1531331315641697,1074,22686138659428115,21461,78770930119,0,
+23880262334874,6151350413,36911562080799408,500000000,487,8088437919200592,9953100749727,9151109118173,1536114019459084,1079,22695629742500528,21147,83167097183,0,
+23902288427810,5277649900,36925434173443842,0,488,8074565826556158,9953634677511,9168196064737,1540899754794546,1086,22706311003437400,21204,81838755765,0,
+23665303667885,4584455711,36939171470777851,0,489,8060828529222149,9864084282336,9068158651972,1545637399983834,1088,22710321196091239,21041,68506507251,0,
+23799691392372,4269499441,36952989918531440,0,490,8047010081468560,9916005288267,9123747825631,1550401607761749,1091,22700671337272854,21196,69507849957,0,
+23848981445201,4654945432,36966827854495262,0,491,8033172145504738,9936692650036,9142492506125,1555176058996221,1085,22705703216591345,21268,79007776775,0,
+23666743668390,8712164934,36980576545152970,0,492,8019423454847030,9856348966292,9077045968420,1559918119894833,1092,22734331818384852,21149,70416209324,0,
+23319497254386,8678438505,36994116264583690,0,493,8005883735416310,9716376556336,8939221247173,1564590697784215,1104,22736272601621351,20872,72079705835,0,
+23639080276866,9162578488,37007766297670487,0,494,7992233702329513,9855286326841,9055977894652,1569327676418076,1065,22732567937784555,21131,142923441716,0,
+23432138868266,5438097670,37021269743925419,0,495,7978730256074581,9792692890276,8953018204337,1574019542289399,1085,22744116768308459,20982,141437820728,0,
+23670379879603,5827610371,37034995407589992,0,496,7965004592410008,9852879224578,9083424679105,1476619445875690,1085,22756607315444624,21272,97664600823,102140000000000,
+23454887920744,6590645743,37048613783370779,0,497,7951386216629221,9761078341128,9002831995468,1481317014105581,1083,22771232974796474,21128,82024444572,0,
+23393678662081,11309827748,37062184769148779,0,498,7937815230851221,9744511819652,8970431110013,1486007059665745,1109,22789583284062206,21102,89490892177,0,
+23543526304134,9256604270,37075829454137353,0,499,7924170545862647,9829635417562,9005185625746,1490725021530841,1070,22801813336374511,21284,78462502268,0,
+23350866650114,8753060893,37089410845922126,0,500,7910589154077874,9711215730046,8969477590046,1495403947921756,1083,22830844849203451,21156,67012196188,0,
+23328137814203,5036694635,37102998493684985,0,501,7897001506315015,9683310588269,8979199663094,1500074612179231,1076,22873579013689561,21176,62216157710,0,
+23405361116421,7542863545,37116609473746737,0,502,7883390526253263,9734395864483,8989893028654,1504763227266060,1081,22852658455110977,21278,67528053731,0,
+23514740291306,7144551145,37130259832211155,0,503,7869740167788845,9803303410225,9008488822820,1509473319875466,1094,22794903139974785,21414,68222967808,0,
+22929964180819,72389773647,37143587993987289,0,504,7856412006012711,9618939418552,8725031926104,1514131702485276,1080,22810377476386927,20928,55252759780,0,
+23307627113270,75804816571,37157110715033296,0,505,7842889284966704,9810245645029,8835856045587,1518869032724501,1075,22745376906060619,21314,50465238805,0,
+22936122334677,75839094508,37170426657961216,0,506,7829573342038784,9645882816192,8703015051550,1523532096285944,1086,22781672667239782,21010,50135685073,0,

report/treasury_calculation_result.json

@@ -34,7 +34,7 @@ public class DbSyncAdaPots {
     @Column(name = "utxo")
     private BigInteger utxo;
 
-    @Column(name = "deposits")
+    @Column(name = "deposits_stake")
     private BigInteger deposits;
 
     @Column(name = "fees")

validation/src/main/java/org/cardanofoundation/rewards/validation/entity/dbsync/DbSyncAdaPots.java

@@ -26,7 +26,7 @@ public interface DbSyncRewardRepository extends ReadOnlyRepository<DbSyncReward,
 
     @Query(nativeQuery = true, value = """
             SELECT SUM(amount) AS totalRewards, type AS pot
-            FROM instant_reward WHERE (type = 'reserves' OR type = 'treasury')
+            FROM reward_rest WHERE (type = 'reserves' OR type = 'treasury')
             AND earned_epoch = :epoch GROUP BY type
             """)
     List<MirTransition> getMIRCertificatesInEpoch(@Param("epoch") Integer epoch);

validation/src/main/java/org/cardanofoundation/rewards/validation/repository/DbSyncRewardRepository.java

@@ -5,6 +5,10 @@ spring:
   profiles:
     active: ${SPRING_PROFILES_ACTIVE:ci, json}
 
+cardano:
+  protocol:
+    magic: ${CARDANO_PROTOCOL_MAGIC:764824073}
+
 json:
   data-provider:
     source: ${JSON_DATA_SOURCE_FOLDER}