Monthly period fix

XRPLWin · Mar 14, 2024 · 971da76 · 971da76
1 parent d0ba136
commit 971da76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/app/Console/Commands/XwaAccountSync.php b/app/Console/Commands/XwaAccountSync.php
@@ -162,7 +162,8 @@ public function handle()
       if($ledger_index_min != 0 && config('xwa.database_engine') == 'sql') {
         //find last tx in sharded db, back from today to genesis (first one found is it)
         $period_startdate = ripple_epoch_to_carbon(config('xrpl.'.config('xrpl.net').'.genesis_ledger_close_time'));
-        $period = \Carbon\CarbonPeriod::create($period_startdate, '30 days', now());
+        //$period = \Carbon\CarbonPeriod::create($period_startdate, '30 days', now());
+        $period = toMonthPeriod($period_startdate,now());
         $period_array = [];
         foreach($period as $m) {
           $period_array[] = $m->format('Ym');

diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
@@ -359,4 +359,16 @@ function bcdechex(string $dec): string
 $test2 = \bcdechex($test);
 var_dump($test2);
 exit;
-*/
+*/
+
+if (!function_exists('toMonthPeriod')) {
+  /**
+   * dechex but suppported uint64 numbers
+   */
+  function toMonthPeriod(\Carbon\Carbon $from, \Carbon\Carbon $to): \Carbon\CarbonPeriod
+  {
+    $from2 = clone $from;
+    $from2->firstOfMonth();
+    return $from2->toPeriod($to, 1, 'month')->settings(['monthOverflow' => false]);
+  }
+}
diff --git a/database/migrations/2022_11_24_083404_create_transactions_table.php b/database/migrations/2022_11_24_083404_create_transactions_table.php
@@ -212,7 +212,7 @@ private function period(): CarbonPeriod
   {
     $startdate = ripple_epoch_to_carbon(config('xrpl.'.config('xrpl.net').'.genesis_ledger_close_time'));
     $enddate = now()->addYears(2);
-    return CarbonPeriod::create($startdate, '30 days', $enddate);
+    return toMonthPeriod($startdate,$enddate);
   }
 
   /**