refactor: cache fees command

app/Console/Commands/CacheFees.php

@@ -46,7 +46,6 @@ public function handle(FeeCache $cache): void
         collect(Forms::getTransactionOptions())->except(['all'])->keys()->each(function (string $type) use ($cache): void {
             $result = (new LastFeeAggregate())
                 ->setLimit(self::LIMIT_COUNT)
-                ->setType($type)
                 ->aggregate();
 
             $cache->setMinimum($type, $result['minimum']);

app/Services/Transactions/Aggregates/Fees/Historical/AllAggregate.php

@@ -8,6 +8,7 @@
 use App\Models\Transaction;
 use App\Services\Transactions\Aggregates\Concerns\HasPlaceholders;
 use App\Services\Transactions\Aggregates\Concerns\HasQueries;
+use ArkEcosystem\Crypto\Utils\UnitConverter;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
@@ -19,15 +20,16 @@ final class AllAggregate
     public function aggregate(): Collection
     {
         $select = [
-            'SUM(fee) as fee',
+            'SUM(gas_price * COALESCE(receipts.gas_used, 0)) as fee',
             sprintf("to_char(to_timestamp(%d+timestamp) AT TIME ZONE 'UTC', '%s') as formatted_date", Network::epoch()->timestamp, 'YYYY-MM'),
         ];
 
         return Transaction::query()
             ->select(DB::raw(implode(', ', $select)))
+            ->join('receipts', 'transactions.id', '=', 'receipts.id')
             ->orderBy('formatted_date')
             ->groupBy('formatted_date')
             ->pluck('fee', 'formatted_date')
-            ->mapWithKeys(fn ($fee, $month) => [$month => $fee->toFloat()]);
+            ->mapWithKeys(fn ($fee, $month) => [$month => UnitConverter::formatUnits($fee, 'gwei')]);
     }
 }

app/Services/Transactions/Aggregates/Fees/Historical/RangeAggregate.php

@@ -5,6 +5,7 @@
 namespace App\Services\Transactions\Aggregates\Fees\Historical;
 
 use App\Services\Transactions\Aggregates\Concerns\HasQueries;
+use ArkEcosystem\Crypto\Utils\UnitConverter;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -16,16 +17,17 @@ final class RangeAggregate
     public function aggregate(Carbon $start, Carbon $end, string $format): Collection
     {
         $select = [
-            'SUM(fee) as fee',
+            'SUM(gas_price * COALESCE(receipts.gas_used, 0)) as fee',
             sprintf("to_char(to_timestamp(timestamp / 1000) AT TIME ZONE 'UTC', '%s') as formatted_date", $format),
         ];
 
         return $this
             ->dateRangeQuery($start, $end)
             ->select(DB::raw(implode(', ', $select)))
+            ->join('receipts', 'transactions.id', '=', 'receipts.id')
             ->orderBy('formatted_date')
             ->groupBy('formatted_date')
             ->pluck('fee', 'formatted_date')
-            ->mapWithKeys(fn ($fee, $date) => [$date => $fee->toFloat()]);
+            ->mapWithKeys(fn ($fee, $date) => [$date => UnitConverter::formatUnits($fee, 'gwei')]);
     }
 }

app/Services/Transactions/Aggregates/Fees/LastFeeAggregate.php

@@ -6,22 +6,14 @@
 
 use App\Models\Transaction;
 use App\Services\Transactions\Aggregates\Concerns\HasQueries;
+use ArkEcosystem\Crypto\Utils\UnitConverter;
 
 final class LastFeeAggregate
 {
     use HasQueries;
 
-    private string $type;
-
     private int $limit = 20;
 
-    public function setType(string $type): self
-    {
-        $this->type = $type;
-
-        return $this;
-    }
-
     public function setLimit(int $limit): self
     {
         $this->limit = $limit;
@@ -31,20 +23,19 @@ public function setLimit(int $limit): self
 
     public function aggregate(): array
     {
-        $scope = $this->getScopeByType($this->type);
-
+        // TODO: add transaction type scope - https://app.clickup.com/t/86dur8fj6
         $fees = Transaction::query()
-            ->select('fee')
-            ->withScope($scope)
+            ->selectRaw('gas_price * COALESCE(receipts.gas_used, 0) as fee')
+            ->join('receipts', 'transactions.id', '=', 'receipts.id')
             ->orderByDesc('timestamp')
             ->limit($this->limit)
             ->pluck('fee')
-            ->map(fn ($fee) => $fee->toFloat());
+            ->map(fn ($fee) => UnitConverter::formatUnits((string) $fee));
 
         return [
             'minimum' => $fees->min() ?? 0, // @phpstan-ignore-line
-            'average' => $fees->avg() ?? 0,
-            'maximum' => $fees->max() ?? 0, // @phpstan-ignore-line
+            'average' => $fees->max() ?? 0,
+            'maximum' => $fees->avg() ?? 0, // @phpstan-ignore-line
         ];
     }
 }