diff --git a/packages/grid_client/scripts/caprover_leader.ts b/packages/grid_client/scripts/caprover_leader.ts index df001a7b12..94a3b55fa1 100644 --- a/packages/grid_client/scripts/caprover_leader.ts +++ b/packages/grid_client/scripts/caprover_leader.ts @@ -76,7 +76,7 @@ async function main() { SWM_NODE_MODE: "leader", CAPROVER_ROOT_DOMAIN: "rafy.grid.tf", // update me DEFAULT_PASSWORD: "captain42", - CAPTAIN_IMAGE_VERSION: "latest", + CAPTAIN_IMAGE_VERSION: "1.10.1", }, }, ], diff --git a/packages/grid_client/scripts/caprover_worker.ts b/packages/grid_client/scripts/caprover_worker.ts index acd609e0a4..c174495068 100644 --- a/packages/grid_client/scripts/caprover_worker.ts +++ b/packages/grid_client/scripts/caprover_worker.ts @@ -75,7 +75,7 @@ async function main() { PUBLIC_KEY: config.ssh_key, SWM_NODE_MODE: "worker", LEADER_PUBLIC_IP: "185.206.122.157", - CAPTAIN_IMAGE_VERSION: "latest", + CAPTAIN_IMAGE_VERSION: "1.10.1", }, }, ], diff --git a/packages/playground/src/stores/profile_manager.ts b/packages/playground/src/stores/profile_manager.ts index 8bb993379e..d1b53e0aad 100644 --- a/packages/playground/src/stores/profile_manager.ts +++ b/packages/playground/src/stores/profile_manager.ts @@ -1,3 +1,4 @@ +import type { KeypairType } from "@threefold/grid_client"; import { defineStore } from "pinia"; import { useGrid } from "./grid"; @@ -9,6 +10,7 @@ export interface Profile { address: string; relay: string; pk: string; + keypairType: KeypairType | undefined; } interface State { diff --git a/packages/playground/src/utils/grid.ts b/packages/playground/src/utils/grid.ts index c49e11fe55..6d92a4f016 100644 --- a/packages/playground/src/utils/grid.ts +++ b/packages/playground/src/utils/grid.ts @@ -1,15 +1,18 @@ -import { BackendStorageType, GridClient, NetworkEnv } from "@threefold/grid_client"; +import { BackendStorageType, GridClient, KeypairType, NetworkEnv } from "@threefold/grid_client"; import type { Profile } from "../stores/profile_manager"; const network = (process.env.NETWORK as NetworkEnv) || window.env.NETWORK; - -export async function getGrid(profile: Pick, projectName?: string) { +export async function getGrid( + profile: Pick & Partial>, + projectName?: string, +) { if (!profile) return null; const grid = new GridClient({ mnemonic: profile.mnemonic, network, backendStorageType: BackendStorageType.tfkvstore, + keypairType: profile.keypairType || KeypairType.sr25519, projectName, ...(import.meta.env.DEV && network !== NetworkEnv.custom @@ -95,6 +98,7 @@ export async function loadProfile(grid: GridClient): Promise { address: grid.tfclient.address, relay: grid.getDefaultUrls(network).relay.slice(6), pk: (await grid.twins.get({ id: grid!.twinId })).pk, + keypairType: grid.clientOptions!.keypairType, }; } diff --git a/packages/playground/src/weblets/profile_manager.vue b/packages/playground/src/weblets/profile_manager.vue index 876f7defc2..b8e370aa56 100644 --- a/packages/playground/src/weblets/profile_manager.vue +++ b/packages/playground/src/weblets/profile_manager.vue @@ -97,6 +97,13 @@ the password. Mnemonic or Hex Seed will never be shared outside of this device.

+ + +

+ Please note that generation of ed25519 Keys isn't supported, you can only import pre existing ones. +

+
+ -
- -
+ + +
+ +
+
+ + + +
+