Fix anchor lookup in project view

Signed-off-by: Alexis Sellier <self@cloudhead.io>
This commit is contained in:
Alexis Sellier
2022-02-09 10:36:46 +01:00
parent b26192f933
commit 2fc2639b49
3 changed files with 15 additions and 7 deletions
+3 -5
View File
@@ -16,13 +16,11 @@ interface AnchorObject {
multihash: string;
}
export async function getAllAnchors(config: Config, urn: string, anchors?: string | null): Promise<string[]> {
if (! anchors) {
return [];
}
export async function getProjectAnchors(urn: string, anchorsStorage: string, config: Config): Promise<string[]> {
const unpadded = decodeRadicleId(urn);
const id = ethers.utils.hexZeroPad(unpadded, 32);
const allAnchors = await querySubgraph(config.orgs.subgraph, GetAllAnchors, { project: id, org: anchors });
const allAnchors = await querySubgraph(config.orgs.subgraph, GetAllAnchors, { project: id, org: anchorsStorage });
return allAnchors.anchors
.map((anchor: AnchorObject) => formatProjectHash(ethers.utils.arrayify(anchor.multihash)));
}
+2 -2
View File
@@ -9,7 +9,6 @@
import { formatOrg, formatSeedId, isRadicleId } from '@app/utils';
import { getOid } from '@app/project';
import { Seed } from '@app/base/seeds/Seed';
import { getAllAnchors } from '@app/anchors';
import Header from '@app/base/projects/Header.svelte';
import ProjectContentRoutes from '@app/base/projects/ProjectContentRoutes.svelte';
@@ -41,7 +40,8 @@
const cfg = seedInstance && seedInstance.valid ? config.withSeed(seedInstance) : config;
const info = await proj.getInfo(id, cfg);
const urn = isRadicleId(id) ? id : info.urn;
const anchors = await getAllAnchors(config, urn, profile?.anchorsAccount ?? addressOrName);
const anchors = profile ? await profile.confirmedProjectAnchors(urn, config) : [];
let branches = Array([info.defaultBranch, info.head]) as [string, string][];
let peers: proj.Peer[] = [];
+10
View File
@@ -8,6 +8,7 @@ import type { Config } from "@app/config";
import type { Seed, InvalidSeed } from "@app/base/seeds/Seed";
import { Org } from "@app/base/orgs/Org";
import { NotFoundError } from "@app/error";
import { getProjectAnchors } from "@app/anchors";
import type { Anchor, PendingAnchor } from "@app/project";
export interface IProfile {
@@ -164,6 +165,15 @@ export class Profile {
}
}
async confirmedProjectAnchors(urn: string, config: Config): Promise<string[]> {
const storage = this.anchorsAccount || this.org?.address;
if (storage) {
return await getProjectAnchors(urn, storage, config);
}
return [];
}
// Get the anchors account as an org, or the org, if available.
private async getAnchorsOrg(config: Config): Promise<Org | null> {
if (this.anchorsAccount) {