Merge branch 'main' into nvmrc

prosopo · Dec 13, 2023 · 5140beb · 5140beb
2 parents b831354 + 2b6f214
commit 5140beb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,7 @@
     "editor.formatOnSave": true,
     "editor.formatOnSaveMode": "file",
     "files.autoSave": "onFocusChange",
-    "vs-code-prettier-eslint.prettierLast": "true",
+    "vs-code-prettier-eslint.prettierLast": "false",
     "[rust]": {
         "editor.defaultFormatter": "rust-lang.rust-analyzer",
         "editor.formatOnSave": true
@@ -23,7 +23,7 @@
     "[html]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "[yaml]": {
-        "editor.defaultFormatter": "redhat.vscode-yaml"
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
     }
 }
diff --git a/packages/provider/src/tasks/tasks.ts b/packages/provider/src/tasks/tasks.ts
@@ -25,6 +25,7 @@ import {
     Hash,
     PendingCaptchaRequest,
     ProsopoConfigOutput,
+    ProviderDetails,
     ProviderRegistered,
 } from '@prosopo/types'
 import {
@@ -532,12 +533,20 @@ export class Tasks {
     }
 
     /* Returns public details of provider */
-    async getProviderDetails(): Promise<Provider> {
-        return await wrapQuery(this.contract.query.getProvider, this.contract.query)(this.contract.pair.address)
+    async getProviderDetails(): Promise<ProviderDetails> {
+        const provider: Provider = await wrapQuery(
+            this.contract.query.getProvider,
+            this.contract.query
+        )(this.contract.pair.address)
+
+        const dbConnectionOk = await this.getCaptchaWithProof(provider.datasetId, true, 1)
+            .then(() => true)
+            .catch(() => false)
+
+        return { provider, dbConnectionOk }
     }
 
     /** Get the dataset from the databse */
-
     async getProviderDataset(datasetId: string): Promise<DatasetWithIds> {
         return await this.db.getDataset(datasetId)
     }

diff --git a/packages/types/src/provider/api.ts b/packages/types/src/provider/api.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { CaptchaSolutionSchema, CaptchaWithProof } from '../datasets/index.js'
+import { Provider } from '@prosopo/captcha-contract/types-returns'
 import { array, number, object, string, infer as zInfer } from 'zod'
 
 export enum ApiPaths {
@@ -92,3 +93,8 @@ export interface PendingCaptchaRequest {
 export interface ProviderRegistered {
     status: 'Registered' | 'Unregistered'
 }
+
+export interface ProviderDetails {
+    provider: Provider
+    dbConnectionOk: boolean
+}