fix: Pin preset bug (#647)

usecannon · Nov 30, 2023 · 3873ae0 · 3873ae0
1 parent 36fba32
commit 3873ae0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/packages/builder/src/registry.ts b/packages/builder/src/registry.ts
@@ -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;
@@ -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;
   }
 
@@ -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());
@@ -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),
@@ -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),

diff --git a/packages/builder/src/runtime.ts b/packages/builder/src/runtime.ts
@@ -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;