refactor: username ui improvements

app/Console/Commands/CacheKnownWallets.php

@@ -21,7 +21,7 @@ final class CacheKnownWallets extends Command
      *
      * @var string
      */
-    protected $signature = 'explorer:cache-known-wallets';
+    protected $signature = 'explorer:cache-known-wallets {--force}';
 
     /**
      * The console command description.
@@ -34,7 +34,10 @@ public function handle(): void
     {
         $cache = app(WalletCache::class);
 
-        $cache->setKnown(fn () => Http::get(Network::knownWalletsUrl())->json());
+        $cache->setKnown(
+            fn () => Http::get(Network::knownWalletsUrl())->json(),
+            $this->option('force'),
+        );
 
         $knownWallets = collect(Network::knownWallets());
 

app/Services/Cache/Concerns/ManagesCache.php

@@ -47,11 +47,7 @@ private function put(string $key, $value, $ttl = null)
      */
     private function forget(string $key)
     {
-        // @codeCoverageIgnoreStart
-        // This method is currently not used in the application, keeping it for
-        // completeness and potential future use.
         return $this->getCache()->forget(md5($key));
-        // @codeCoverageIgnoreEnd
     }
 
     private function blockTimeTTL(): int

app/Services/Cache/WalletCache.php

@@ -20,8 +20,12 @@ public function getKnown(): array
         return $this->get('known', []);
     }
 
-    public function setKnown(Closure $callback): array
+    public function setKnown(Closure $callback, bool $force = false): array
     {
+        if ($force) {
+            $this->forget('known');
+        }
+
         return $this->remember('known', now()->addDay(), $callback);
     }
 

app/ViewModels/ForgingStatsViewModel.php

@@ -24,16 +24,6 @@ public function validator(): ?WalletViewModel
         return new WalletViewModel($this->forgingStats->validator);
     }
 
-    public function address(): ?string
-    {
-        return $this->validator()?->address();
-    }
-
-    public function hasUsername(): bool
-    {
-        return $this->validator()?->hasUsername() !== null;
-    }
-
     public function username(): ?string
     {
         return $this->validator()?->username();

resources/views/components/tables/desktop/validators/missed-blocks.blade.php

@@ -80,7 +80,7 @@ class="font-semibold"
                 <x-ark-tables.cell>
                     @if ($validator)
                         <x-tables.rows.desktop.encapsulated.address
-                            :model="$block"
+                            :model="$validator"
                             without-clipboard
                         />
                     @else

resources/views/components/transaction/page/addressing.blade.php

@@ -9,7 +9,7 @@
         :transaction="$transaction"
     >
         <x-transaction.page.section-detail.address
-            :address="$transaction->sender()->address()"
+            :wallet="$transaction->sender()"
             class="inline-block"
         />
     </x-transaction.page.section-detail.row>
@@ -20,7 +20,7 @@ class="inline-block"
         value-class="min-w-0"
     >
         <x-transaction.page.section-detail.address
-            :address="$transaction->recipient()->address()"
+            :wallet="$transaction->recipient()"
             :is-contract="$transaction->recipient()->isContract()"
             class="inline-block"
         />

resources/views/components/transaction/page/section-detail/address.blade.php

@@ -1,19 +1,30 @@
 @props([
-    'address',
+    'wallet' => null,
+    'address' => null,
     'isContract' => false,
 ])
 
+@if ($wallet && ! $address)
+    @php ($address = $wallet->address())
+@endif
+
 <div class="flex justify-end items-center sm:justify-start">
     <a
         href="{{ route('wallet', $address) }}"
         class="min-w-0 link"
     >
         <div class="hidden md:inline">
-            <x-truncate-dynamic>{{ $address }}</x-truncate-dynamic>
+            @if ($wallet && $wallet->hasUsername())
+                {{ $wallet->username() }}
+            @else
+                <x-truncate-dynamic>{{ $address }}</x-truncate-dynamic>
+            @endif
         </div>
 
         <div class="md:hidden">
-            @unless ($isContract)
+            @if ($wallet && $wallet->hasUsername())
+                {{ $wallet->username() }}
+            @elseif (! $isContract)
                 <x-truncate-middle>
                     {{ $address }}
                 </x-truncate-middle>

tests/Feature/Http/Livewire/Validators/RecentVotesTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-use App\Console\Commands\CacheKnownWallets;
 use App\Enums\SortDirection;
 use App\Http\Livewire\Validators\RecentVotes;
 use App\Models\Receipt;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use App\ViewModels\WalletViewModel;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 use Illuminate\View\Compilers\BladeCompiler;
@@ -679,7 +679,7 @@ function generateTransactions(): array
         'timestamp' => Carbon::parse('2023-09-18 07:41:06')->getTimestampMs(),
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     generateReceipts();
 
@@ -771,7 +771,7 @@ function generateTransactions(): array
         'timestamp' => Carbon::parse('2023-09-18 07:41:06')->getTimestampMs(),
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     generateReceipts();
 

tests/Unit/Console/Commands/CacheKnownWalletsTest.php

@@ -2,18 +2,16 @@
 
 declare(strict_types=1);
 
-use App\Console\Commands\CacheKnownWallets;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use App\Services\Cache\WalletCache;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
 
 it('should cache the known wallet name if defined', function () {
-    $knownWalletsUrl = 'https://knownwallets.com/known-wallets.json';
-
-    Config::set('arkscan.networks.development.knownWallets', $knownWalletsUrl);
+    Config::set('arkscan.networks.development.knownWallets', 'https://knownwallets.com/known-wallets.json');
 
     Http::fake(Http::response([
         [
@@ -31,16 +29,14 @@
         'attributes->username' => 'regular',
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     expect(Cache::tags('wallet')->get(md5("name_by_address/$knownWallet->address")))->toBe('Hot Wallet');
     expect(Cache::tags('wallet')->get(md5("name_by_address/$regularWallet->address")))->toBe('regular');
 });
 
 it('should cache the known wallet name if doesnt have validator name', function () {
-    $knownWalletsUrl = 'https://knownwallets.com/known-wallets.json';
-
-    Config::set('arkscan.networks.development.knownWallets', $knownWalletsUrl);
+    Config::set('arkscan.networks.development.knownWallets', 'https://knownwallets.com/known-wallets.json');
 
     Http::fake(Http::response([
         [
@@ -55,15 +51,13 @@
         'attributes->username' => null,
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     expect(Cache::tags('wallet')->get(md5("name_by_address/$wallet->address")))->toBe('Hot Wallet');
 });
 
 it('should forget wallets with resigned usernames', function () {
-    $knownWalletsUrl = 'https://knownwallets.com/known-wallets.json';
-
-    Config::set('arkscan.networks.development.knownWallets', $knownWalletsUrl);
+    Config::set('arkscan.networks.development.knownWallets', 'https://knownwallets.com/known-wallets.json');
 
     Http::fake(Http::response([
         [],
@@ -78,7 +72,7 @@
         ],
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     expect($cache->getWalletNameByAddress($wallet->address))->toBe('joeblogs');
 
@@ -88,15 +82,36 @@
         ],
     ])->save();
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     expect($cache->getWalletNameByAddress($wallet->address))->toBe('joeblogs');
 
     Transaction::factory()->usernameResignation()->create([
         'sender_address' => $wallet->address,
     ]);
 
-    (new CacheKnownWallets())->handle();
+    Artisan::call('explorer:cache-known-wallets');
 
     expect($cache->getWalletNameByAddress($wallet->address))->toBeNull();
 });
+
+it('should force update of known wallets', function () {
+    Config::set('arkscan.networks.development.knownWallets', 'https://knownwallets.com/known-wallets.json');
+
+    $cache = new WalletCache();
+    $cache->setKnown(fn () => [
+        '0xC5a19e23E99bdFb7aae4301A009763AdC01c1b5B',
+    ]);
+
+    Http::fake(Http::response([], 200));
+
+    Artisan::call('explorer:cache-known-wallets');
+
+    expect($cache->getKnown())->toBe([
+        '0xC5a19e23E99bdFb7aae4301A009763AdC01c1b5B',
+    ]);
+
+    Artisan::call('explorer:cache-known-wallets', ['--force' => true]);
+
+    expect($cache->getKnown())->toBe([]);
+});