chore: merge staging into master (#401)

ArdentHQ · Jul 11, 2023 · ea8897f · ea8897f
2 parents e469b72 + f904cef
commit ea8897f
Show file tree

Hide file tree

Showing 32 changed files with 563 additions and 187 deletions.
diff --git a/app/Http/Livewire/Modals/ExportBlocks.php b/app/Http/Livewire/Modals/ExportBlocks.php
@@ -17,12 +17,15 @@ final class ExportBlocks extends Component
 
     public ?string $username = null;
 
+    public bool $hasForgedBlocks = false;
+
     public function mount(WalletViewModel $wallet): void
     {
         $this->publicKey = $wallet->publicKey();
 
         if ($wallet->isDelegate()) {
-            $this->username = $wallet->username();
+            $this->username        = $wallet->username();
+            $this->hasForgedBlocks = $wallet->blocksCount() > 0;
         }
     }
 

diff --git a/app/Services/Search/BlockSearch.php b/app/Services/Search/BlockSearch.php
@@ -40,12 +40,8 @@ public static function buildSearchQueryForIndex(string $query, int $limit): ?Sea
             return null;
         }
 
-        if ((new self())->couldBeBlockID($query)) {
-            $query = sprintf('"%s"', $query);
-        }
-
         return (new SearchQuery())
-            ->setFilter(['id = '.$query])
+            ->setFilter(['id = '.sprintf('"%s"', addslashes($query))])
             ->setIndexUid('blocks')
             ->setLimit($limit);
     }

diff --git a/app/Services/Search/TransactionSearch.php b/app/Services/Search/TransactionSearch.php
@@ -40,12 +40,8 @@ public static function buildSearchQueryForIndex(string $query, int $limit): ?Sea
             return null;
         }
 
-        if ((new self())->couldBeTransactionID($query)) {
-            $query = sprintf('"%s"', $query);
-        }
-
         return (new SearchQuery())
-            ->setFilter(['id = '.$query])
+            ->setFilter(['id = '.sprintf('"%s"', addslashes($query))])
             ->setIndexUid('transactions')
             ->setLimit($limit);
     }

diff --git a/app/ViewModels/Concerns/Wallet/CanBeDelegate.php b/app/ViewModels/Concerns/Wallet/CanBeDelegate.php
@@ -97,4 +97,9 @@ public function delegateStatusStyling(): string
 
         return 'text-theme-success-600 border-theme-success-600';
     }
+
+    public function blocksCount(): int
+    {
+        return $this->wallet->blocks()->count();
+    }
 }
diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
         "ext-gmp": "*",
         "ardenthq/arkvault-url": "^1.1",
         "arkecosystem/crypto": "^1.8",
-        "arkecosystem/foundation": "^13.10",
+        "arkecosystem/foundation": "^13.12",
         "blade-ui-kit/blade-icons": "^1.5",
         "brick/math": "^0.11",
         "doctrine/dbal": "^3.0",
         "fruitcake/laravel-cors": "^2.0",
         "http-interop/http-factory-guzzle": "^1.2",
         "huddledigital/zendesk-laravel": "^3.8",
-        "laravel/framework": "^9.13",
+        "laravel/framework": "^9.14",
         "laravel/horizon": "^5.17",
         "laravel/scout": "^10.2",
         "laravel/tinker": "^2.8",
@@ -28,12 +28,12 @@
         "meilisearch/meilisearch-php": "^1.2",
         "nyholm/psr7": "^1.8",
         "savvot/random": "^0.3",
-        "sentry/sentry-laravel": "^2.5",
+        "sentry/sentry-laravel": "^2.6",
         "symfony/psr-http-message-bridge": "^2.2"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.8",
-        "spatie/laravel-ignition": "^1.1",
+        "spatie/laravel-ignition": "^1.2",
         "furqansiddiqui/bip39-mnemonic-php": "^0.1",
         "laravel/dusk": "^6.7",
         "wnx/laravel-stats": "^2.11"