chore: merge rc into main (#695)

ArdentHQ · Mar 18, 2024 · 30e8dad · 30e8dad
2 parents f9cf9fb + 9537152
commit 30e8dad
Show file tree

Hide file tree

Showing 187 changed files with 4,280 additions and 4,297 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -128,12 +128,6 @@ module.exports = {
         "unicorn/prefer-string-slice": "error",
         "unicorn/prefer-ternary": "off", // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/prefer-ternary.md
         "unicorn/prefer-top-level-await": "error",
-        "unicorn/prevent-abbreviations": [
-            "error",
-            {
-                ignore: ["i18n"],
-            },
-        ],
     },
     overrides: [
         {

diff --git a/app/Console/Commands/CalculateCollectionTraitRarities.php b/app/Console/Commands/CalculateCollectionTraitRarities.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use App\Jobs\CalculateTraitRaritiesForCollection;
+use App\Models\Collection;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Bus;
+
+class CalculateCollectionTraitRarities extends Command
+{
+    use InteractsWithCollections;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'collections:calculate-trait-rarities {--start=} {--limit=} {--collection-id=}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Calculate the trait rarities for collections';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $start = $this->option('start');
+        $limit = $this->option('limit');
+
+        if ($start !== null) {
+            $collections = Collection::query()
+                                    ->withAcceptableSupply()
+                                    ->select('collections.*')
+                                    ->withoutSpamContracts()
+                                    ->where('id', '>=', (int) $start)
+                                    ->when($limit !== null, fn ($q) => $q->limit((int) $limit))
+                                    ->orderBy('id', 'asc')
+                                    ->get();
+
+            $first = $collections->first();
+            $last = $collections->last();
+
+            Bus::batch($collections->mapInto(CalculateTraitRaritiesForCollection::class))
+                    ->name('Calculating rarities for collection IDs '.$first->id.' to '.$last->id)
+                    ->dispatch();
+
+            $this->info('Starting from ID: '.$first->id.' to ID '.$last->id.' collections (inclusive). Total: '.$collections->count());
+
+            return Command::SUCCESS;
+        }
+
+        $queryCallback = fn ($query) => $query->withAcceptableSupply();
+
+        $this->forEachCollection(function ($collection) {
+            CalculateTraitRaritiesForCollection::dispatch($collection);
+        }, $queryCallback);
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/FetchCollectionOpenseaSlug.php b/app/Console/Commands/FetchCollectionOpenseaSlug.php
@@ -23,7 +23,7 @@ class FetchCollectionOpenseaSlug extends Command
      *
      * @var string
      */
-    protected $description = 'Fetch the opensea slug for collections';
+    protected $description = 'Fetch the OpenSea slug for collections';
 
     /**
      * Execute the console command.
@@ -33,6 +33,7 @@ public function handle(): int
         // Job runs every 5 minutes
         $limit = $this->getLimitPerMinutes(5);
 
+        // We only care about collections that don't have a slug yet, so in most cases it will not run any request...
         $this->forEachCollection(
             callback: function ($collection, $index) {
                 $this->dispatchDelayed(
@@ -43,9 +44,7 @@ public function handle(): int
             },
             queryCallback: fn ($query) => $query
                 ->orderByOpenseaSlugLastFetchedAt()
-                // Does not have an opensea slug
                 ->whereNull('extra_attributes->opensea_slug')
-                // Has not been fetched
                 ->whereNull('extra_attributes->opensea_slug_last_fetched_at'),
             limit: $limit
         );

diff --git a/app/Console/Commands/FetchCollectionTraits.php b/app/Console/Commands/FetchCollectionTraits.php
diff --git a/app/Console/Commands/InteractsWithCollections.php b/app/Console/Commands/InteractsWithCollections.php
@@ -23,7 +23,6 @@ public function forEachCollection(Closure $callback, ?Closure $queryCallback = n
                 ->select('collections.*')
                 ->where('collections.id', '=', $this->option('collection-id'))
                 ->withoutSpamContracts()
-                ->erc721()
                 ->first();
 
             $collection && $callback($collection, 0);
@@ -35,7 +34,6 @@ public function forEachCollection(Closure $callback, ?Closure $queryCallback = n
             ->when($queryCallback !== null, $queryCallback)
             ->select('collections.*')
             ->withoutSpamContracts()
-            ->erc721()
             ->when($limit !== null, fn ($query) => $query
                 ->limit($limit)
                 ->get()

diff --git a/app/Console/Commands/LiveDumpNfts.php b/app/Console/Commands/LiveDumpNfts.php
@@ -10,7 +10,6 @@
 use App\Models\Network;
 use App\Models\Token;
 use App\Support\Facades\Alchemy;
-use App\Support\Facades\Mnemonic;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
@@ -127,8 +126,6 @@ public function handle(): int
 
         $this->mergeNftChunks($chain, $contractAddress);
 
-        $this->getCollectionTraitsAndPersist($chain, $contractAddress);
-
         return Command::SUCCESS;
     }
 
@@ -287,23 +284,6 @@ private function getTokenCursorForChunk(int $chunk, Chain $chain, string $contra
         return Arr::get($nftChunk, 'pageKey');
     }
 
-    private function getCollectionTraitsAndPersist(Chain $chain, string $address): void
-    {
-        $this->info('Fetching collection traits...');
-
-        $fs = Storage::disk(self::diskName);
-
-        $traits = Mnemonic::getCollectionTraits($chain, $address);
-
-        $path = $this->prepareCollectionPath($chain, $address);
-
-        $fileName = $path.'/traits.json';
-
-        $fs->put($fileName, (string) json_encode($traits, JSON_PRETTY_PRINT));
-
-        $this->info('Fetched collection traits, file: '.$fileName);
-    }
-
     /**
      * @param  array<mixed>  $data
      * @param  array<mixed>  $attributes

diff --git a/app/Console/Commands/LiveDumpWallets.php b/app/Console/Commands/LiveDumpWallets.php
@@ -111,17 +111,6 @@ public function handle(): int
             }
         }
 
-        // Download traits for each collection
-        $allTraits = $nftCollections->mapWithKeys(function ($collectionAddresses, $chainId) {
-            $traits = $collectionAddresses->unique()
-                ->mapWithKeys(fn ($collectionAddress) => [$collectionAddress => Mnemonic::getCollectionTraits(Chain::from($chainId), $collectionAddress)]);
-
-            return [$chainId => $traits];
-        });
-
-        $fs->put('mnemonic_nft_collection_traits.json', (string) json_encode($allTraits, JSON_PRETTY_PRINT));
-        $progressBar->advance();
-
         $progressBar->finish();
 
         return Command::SUCCESS;

diff --git a/app/Console/Commands/UpdateCollectionsFiatValue.php b/app/Console/Commands/UpdateCollectionsFiatValue.php
@@ -5,7 +5,6 @@
 namespace App\Console\Commands;
 
 use App\Models\Collection;
-use App\Models\User;
 use App\Support\Queues;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection as EloquentCollection;
@@ -31,12 +30,6 @@ class UpdateCollectionsFiatValue extends Command
      */
     public function handle(): int
     {
-        User::query()->select('id')->chunkById(50, function (EloquentCollection $users) {
-            dispatch(function () use ($users) {
-                User::updateCollectionsValue($users->pluck('id')->toArray());
-            })->onQueue(Queues::SCHEDULED_DEFAULT);
-        });
-
         Collection::query()->select('id')->chunkById(50, function (EloquentCollection $collections) {
             dispatch(function () use ($collections) {
                 Collection::updateFiatValue($collections->pluck('id')->toArray());

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -115,13 +115,6 @@ protected function schedule(Schedule $schedule): void
 
     private function scheduleJobsForCollectionsOrGalleries(Schedule $schedule): void
     {
-        $schedule
-            // Command only fetches collections that don't have a slug yet
-            // so in most cases it will not run any request
-            ->command(FetchCollectionOpenseaSlug::class)
-            ->withoutOverlapping()
-            ->hourly();
-
         $schedule
             ->command(FetchCollectionTotalVolume::class)
             ->withoutOverlapping()
@@ -151,7 +144,6 @@ private function scheduleJobsForCollectionsOrGalleries(Schedule $schedule): void
             ->command(FetchCollectionOpenseaSlug::class)
             ->withoutOverlapping()
             ->everyFiveMinutes();
-
     }
 
     private function scheduleJobsForGalleries(Schedule $schedule): void

diff --git a/app/Data/Collections/CollectionData.php b/app/Data/Collections/CollectionData.php
@@ -4,12 +4,12 @@
 
 namespace App\Data\Collections;
 
+use App\Data\FloorPriceData;
 use App\Data\VolumeData;
 use App\Enums\CurrencyCode;
 use App\Enums\Period;
 use App\Models\Collection;
 use App\Transformers\IpfsGatewayUrlTransformer;
-use Illuminate\Support\Str;
 use Spatie\LaravelData\Attributes\DataCollectionOf;
 use Spatie\LaravelData\Attributes\WithTransformer;
 use Spatie\LaravelData\Data;
@@ -30,10 +30,7 @@ public function __construct(
         public string $address,
         #[LiteralTypeScriptType('App.Enums.Chain')]
         public int $chainId,
-        public ?string $floorPrice,
-        public ?float $floorPriceFiat,
-        public ?string $floorPriceCurrency,
-        public ?int $floorPriceDecimals,
+        public FloorPriceData $floorPrice,
         public ?int $supply,
         #[WithTransformer(IpfsGatewayUrlTransformer::class)]
         public ?string $image,
@@ -62,10 +59,7 @@ public static function fromModel(Collection $collection, CurrencyCode $currency,
             slug: $collection->slug,
             address: $collection->address,
             chainId: $collection->network->chain_id,
-            floorPrice: $collection->floor_price,
-            floorPriceFiat: (float) $collection->fiatValue($currency),
-            floorPriceCurrency: $collection->floorPriceToken ? Str::lower($collection->floorPriceToken->symbol) : null,
-            floorPriceDecimals: $collection->floorPriceToken?->decimals,
+            floorPrice: $collection->createFloorPriceData($currency),
             supply: $collection->supply,
             image: $collection->extra_attributes->get('image'),
             banner: $collection->extra_attributes->get('banner'),

diff --git a/app/Data/Collections/CollectionFeaturedData.php b/app/Data/Collections/CollectionFeaturedData.php
@@ -5,6 +5,7 @@
 namespace App\Data\Collections;
 
 use App\Data\Gallery\GalleryNftData;
+use App\Data\VolumeData;
 use App\Enums\CurrencyCode;
 use App\Models\Collection;
 use App\Transformers\IpfsGatewayUrlTransformer;
@@ -44,7 +45,7 @@ public function __construct(
         public DataCollection $nfts,
         public bool $isFeatured,
         public ?string $description,
-        public ?string $volume,
+        public VolumeData $volume,
     ) {
     }
 
@@ -72,7 +73,7 @@ public static function fromModel(Collection $collection, CurrencyCode $currency)
             supply: $collection->supply,
             isFeatured: $collection->is_featured,
             description: $description,
-            volume: $collection->volume,
+            volume: $collection->createVolumeData(period: null, currency: $currency),
         );
     }
 }
diff --git a/app/Data/Collections/CollectionTraitData.php b/app/Data/Collections/CollectionTraitData.php
@@ -16,7 +16,6 @@
     '/** Use the displayType to infer the actual type. */ value' => 'string | number',
     '/** Only present for numeric displayTypes. */ valueMin' => '?number',
     '/** Only present for numeric displayTypes. */ valueMax' => '?number',
-    'nftsCount' => 'number',
     'nftsPercentage' => 'number',
 ])]
 class CollectionTraitData extends Data
@@ -27,7 +26,6 @@ public function __construct(
         public string|float $value,
         public ?float $valueMin,
         public ?float $valueMax,
-        public float $nftsCount,
         public float $nftsPercentage,
     ) {
     }
@@ -40,7 +38,6 @@ public static function fromModel(CollectionTrait $trait): self
             value: self::extractValue($trait),
             valueMin: $trait['value_min'] ?? null,
             valueMax: $trait['value_max'] ?? null,
-            nftsCount: $trait['nfts_count'],
             nftsPercentage: $trait['nfts_percentage'],
         );
     }