Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Pin preset bug #647

Merged
merged 4 commits into from
Nov 30, 2023
Merged

fix: Pin preset bug #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f180eb7
fixing preset append bug in pin command
FuzzB0t Nov 30, 2023
8f89481
fixing lint issues
FuzzB0t Nov 30, 2023
14ad02a
fixing preset bug in getUrl
FuzzB0t Nov 30, 2023
0df32ae
fixing lint issues
FuzzB0t Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/builder/src/package.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,10 @@ export async function publishPackage({
includeProvisioned = false,
}: CopyPackageOpts) {
debug(`copy package ${packageRef} (${fromStorage.registry.getLabel()} -> ${toStorage.registry.getLabel()})`);
const { fullPackageRef } = new PackageReference(packageRef);

// TODO: packageRef in this case can be a package name or an IPFS hash (@ipfs://Qm...) for the pin command, however, this functionality should have
// it's own function to handle the pinning of IPFS urls.
const fullPackageRef = !packageRef.startsWith('@') ? new PackageReference(packageRef).fullPackageRef : packageRef;

const alreadyCopiedIpfs = new Map<string, any>();

Expand Down
27 changes: 15 additions & 12 deletions packages/builder/src/registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ export abstract class CannonRegistry {
// ex @ipfs:Qm... is ipfs://Qm...
// eslint-disable-next-line @typescript-eslint/no-unused-vars
async getUrl(packageRef: string, chainId: number): Promise<string | null> {
// Check if its an ipfs hash / url, if so we make sure to remove any incorrectly appended presets (like @main);
if (packageRef.startsWith('@')) {
return packageRef.replace(':', '://').replace('@', '');
const result = packageRef.replace(':', '://').replace('@', '');

return result.indexOf('@', 1) !== -1 ? result.slice(0, result.indexOf('@', 1)) : result;
}

return null;
Expand Down Expand Up @@ -87,14 +90,14 @@ export class InMemoryRegistry extends CannonRegistry {
}

async getUrl(packageRef: string, chainId: number): Promise<string | null> {
const { preset, fullPackageRef } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

const baseResolved = await super.getUrl(packageRef, chainId);
if (baseResolved) {
return baseResolved;
}

const { preset, fullPackageRef } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

return this.pkgs[fullPackageRef] ? this.pkgs[fullPackageRef][variant] : null;
}

Expand Down Expand Up @@ -132,7 +135,7 @@ export class FallbackRegistry extends EventEmitter implements CannonRegistry {
for (const registry of [this.memoryCacheRegistry, ...this.registries]) {
debug('trying registry', registry.getLabel());
try {
const result = await registry.getUrl(fullPackageRef, chainId);
const result = await registry.getUrl(packageRef, chainId);

if (result) {
debug('fallback registry: loaded from registry', registry.getLabel());
Expand Down Expand Up @@ -367,13 +370,13 @@ export class OnChainRegistry extends CannonRegistry {
}

async getUrl(packageRef: string, chainId: number): Promise<string | null> {
const { name, version, preset } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

const baseResolved = await super.getUrl(packageRef, chainId);

if (baseResolved) return baseResolved;

const { name, version, preset } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

const url = await this.contract.getPackageUrl(
ethers.utils.formatBytes32String(name),
ethers.utils.formatBytes32String(version),
Expand All @@ -384,13 +387,13 @@ export class OnChainRegistry extends CannonRegistry {
}

async getMetaUrl(packageRef: string, chainId: number): Promise<string | null> {
const { name, version, preset, fullPackageRef } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

const baseResolved = await super.getUrl(fullPackageRef, chainId);
const baseResolved = await super.getUrl(packageRef, chainId);

if (baseResolved) return baseResolved;

const { name, version, preset } = new PackageReference(packageRef);
const variant = `${chainId}-${preset}`;

const url = await this.contract.getPackageMeta(
ethers.utils.formatBytes32String(name),
ethers.utils.formatBytes32String(version),
Expand Down
4 changes: 2 additions & 2 deletions packages/builder/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ export class CannonStorage extends EventEmitter {

async readDeploy(packageRef: string, chainId: number): Promise<DeploymentInfo | null> {
const registryName = this.registry.getLabel();
const { preset, fullPackageRef } = new PackageReference(packageRef);
const { preset } = new PackageReference(packageRef);

this.emit(Events.ResolveDeploy, packageRef, preset, chainId, registryName, 0);

const uri = await this.registry.getUrl(fullPackageRef, chainId);
const uri = await this.registry.getUrl(packageRef, chainId);

if (!uri) return null;

Expand Down
Loading