Fix verify fn and test accounts (#1941)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: forgetso

.changeset/cool-hairs-cry.md

@@ -0,0 +1,10 @@
+---
+"@prosopo/util-crypto": minor
+"@prosopo/provider": minor
+"@prosopo/keyring": minor
+"@prosopo/types": minor
+"@prosopo/scripts": minor
+---
+
+Making sure verify works and derived accounts
+  

dev/scripts/src/setup/provider.ts

@@ -12,21 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { ProsopoEnvError } from "@prosopo/common";
 import { datasetWithSolutionHashes } from "@prosopo/datasets";
 import { Tasks } from "@prosopo/provider";
-import type { IProviderAccount } from "@prosopo/types";
 import type { ProviderEnvironment } from "@prosopo/types-env";
 
-export async function setupProvider(
-	env: ProviderEnvironment,
-	provider: IProviderAccount,
-): Promise<void> {
-	if (!provider.pair) {
-		throw new ProsopoEnvError("DEVELOPER.MISSING_PROVIDER_PAIR", {
-			context: { provider },
-		});
-	}
+export async function setupProvider(env: ProviderEnvironment): Promise<void> {
 	const logger = env.logger;
 	const tasks = new Tasks(env);
 	logger.info("   - providerSetDataset");

dev/scripts/src/setup/setup.ts

@@ -17,13 +17,12 @@ import { defaultConfig, getSecret } from "@prosopo/cli";
 import { LogLevel, ProsopoEnvError, getLogger } from "@prosopo/common";
 import { getEnvFile } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
-import { DEV_PHRASE, generateMnemonic, getPair } from "@prosopo/keyring";
 import {
-	CaptchaType,
-	ClientSettingsSchema,
-	type IProviderAccount,
-	type ISite,
-} from "@prosopo/types";
+	generateMnemonic,
+	getDefaultSiteKeys,
+	getPair,
+} from "@prosopo/keyring";
+import type { IProviderAccount } from "@prosopo/types";
 import { get } from "@prosopo/util";
 import fse from "fs-extra";
 import { updateDemoHTMLFiles, updateEnvFiles } from "../util/index.js";
@@ -59,41 +58,9 @@ function getDefaultProvider(): IProviderAccount {
 		address: process.env.PROSOPO_PROVIDER_ADDRESS || "",
 		secret: getSecret(),
 		captchaDatasetId: "",
+		pair: getPair(getSecret()),
 	};
 }
-//sr25519 dev site keys
-export function getDefaultSiteKeys(): ISite[] {
-	return [
-		{
-			secret: `${DEV_PHRASE}//${CaptchaType.image}`,
-			address: "5DWuxC3covEaAsPcMt1zcpibGLsHAqMcfAzi2fzuWtQupFgq",
-			settings: ClientSettingsSchema.parse({
-				captchaType: CaptchaType.image,
-			}),
-		},
-		{
-			secret: `${DEV_PHRASE}//${CaptchaType.pow}`,
-			address: "5GWr5T3bCvBZMG9H9CDM5ynYS1zo7vcwS24Dg4DismRmsD8P",
-			settings: ClientSettingsSchema.parse({
-				captchaType: CaptchaType.pow,
-			}),
-		},
-		{
-			secret: `${DEV_PHRASE}//${CaptchaType.frictionless}`,
-			address: "5Do7mgno9VQCDPn6abR1UgB9jUjaEmqVQb5paB5fHNabvRDE",
-			settings: ClientSettingsSchema.parse({
-				captchaType: CaptchaType.frictionless,
-			}),
-		},
-		{
-			secret: `${DEV_PHRASE}//${CaptchaType.invisible}`,
-			address: "5FNFBC97JQoJu7LBapycXbT66N9xzQH2tyFv1yNvBxqa8tQR",
-			settings: ClientSettingsSchema.parse({
-				captchaType: CaptchaType.invisible,
-			}),
-		},
-	];
-}
 
 async function copyEnvFile() {
 	try {
@@ -169,7 +136,7 @@ export async function setup(provider: boolean, sites: boolean) {
 
 		defaultProvider.pair = getPair(providerSecret);
 		if (provider) {
-			await setupProvider(env, defaultProvider);
+			await setupProvider(env);
 
 			if (!hasProviderAccount) {
 				await updateEnvFile({