fix(cli): stop the publishing process before sending an empty transaction

packages/cli/src/commands/publish.test.ts

@@ -3,9 +3,10 @@ import {
   DeploymentInfo,
   InMemoryRegistry,
   IPFSLoader,
-  OnChainRegistry,
   preparePublishPackage,
+  OnChainRegistry,
 } from '@usecannon/builder';
+import * as builder from '@usecannon/builder';
 import fs from 'fs-extra';
 import _ from 'lodash';
 import path from 'path';
@@ -136,37 +137,75 @@ describe('publish command', () => {
     jest.spyOn(OnChainRegistry.prototype, 'publish').mockResolvedValue([]);
   });
 
-  it('should publish the package to the registry', async () => {
-    // jest spy on fs readdir which return string[] of package.json
-    await publish({
-      packageRef: fullPackageRef,
-      cliSettings: resolveCliSettings(),
-      onChainRegistry,
-      tags,
-      chainId,
-      quiet: true,
-      includeProvisioned: false,
-      skipConfirm: true,
+  describe('publish', () => {
+    it('should not publish if there are no new packages', async () => {
+      jest.spyOn(builder, 'preparePublishPackage').mockResolvedValue([]);
+
+      await expect(
+        publish({
+          packageRef: fullPackageRef,
+          cliSettings: resolveCliSettings(),
+          onChainRegistry,
+          tags,
+          chainId,
+          quiet: true,
+          skipConfirm: true,
+          includeProvisioned: false,
+        })
+      ).rejects.toThrow("There isn't anything new to publish.");
     });
 
-    expect(await onChainRegistry.getUrl(fullPackageRef, chainId)).toEqual(testPkgDataNewIpfsUrl);
-    expect(await onChainRegistry.getUrl(`package:tag0@${preset}`, chainId)).toEqual(testPkgDataNewIpfsUrl);
-  });
+    it('should publish the package to the registry', async () => {
+      // jest spy on fs readdir which return string[] of package.json
+      jest.spyOn(builder, 'preparePublishPackage').mockResolvedValue([
+        {
+          packagesNames: [fullPackageRef, `${fullPackageRef}:tag0@${preset}`],
+          chainId,
+          url: 'ipfs://test-ipfs-new-url',
+          metaUrl: '',
+        },
+      ]);
 
-  it('should publish the package to the registry with no tags', async () => {
-    tags = [];
-    await publish({
-      packageRef: fullPackageRef,
-      cliSettings: resolveCliSettings(),
-      onChainRegistry,
-      tags,
-      chainId,
-      quiet: true,
-      skipConfirm: true,
-      includeProvisioned: true,
+      await publish({
+        packageRef: fullPackageRef,
+        cliSettings: resolveCliSettings(),
+        onChainRegistry,
+        tags,
+        chainId,
+        quiet: true,
+        skipConfirm: true,
+        includeProvisioned: false,
+      });
+
+      expect(await onChainRegistry.getUrl(fullPackageRef, chainId)).toEqual(testPkgDataNewIpfsUrl);
+      expect(await onChainRegistry.getUrl(`${fullPackageRef}:tag0@${preset}`, chainId)).toEqual(testPkgDataNewIpfsUrl);
     });
 
-    expect(await onChainRegistry.getUrl(fullPackageRef, chainId)).toEqual(testPkgDataNewIpfsUrl);
+    it('should publish the package to the registry with no tags', async () => {
+      tags = [];
+
+      jest.spyOn(builder, 'preparePublishPackage').mockResolvedValue([
+        {
+          packagesNames: [fullPackageRef],
+          chainId,
+          url: 'ipfs://test-ipfs-new-url',
+          metaUrl: '',
+        },
+      ]);
+
+      await publish({
+        packageRef: fullPackageRef,
+        cliSettings: resolveCliSettings(),
+        onChainRegistry,
+        tags,
+        chainId,
+        quiet: true,
+        skipConfirm: true,
+        includeProvisioned: true,
+      });
+
+      expect(await onChainRegistry.getUrl(fullPackageRef, chainId)).toEqual(testPkgDataNewIpfsUrl);
+    });
   });
 
   describe('scanDeploys', () => {
@@ -179,10 +218,14 @@ describe('publish command', () => {
       // @ts-ignore
       jest.spyOn(fs, 'readdir').mockResolvedValue(_deployDataLocalFileNames);
 
-      const builder = await import('@usecannon/builder');
-      jest.spyOn(builder, 'preparePublishPackage').mockImplementation(async () => {
-        return [];
-      });
+      jest.spyOn(builder, 'preparePublishPackage').mockResolvedValue([
+        {
+          packagesNames: [fullPackageRef],
+          chainId,
+          url: 'ipfs://test-ipfs-new-url',
+          metaUrl: '',
+        },
+      ]);
     });
 
     it('should only find single deploy file on chainId and preset set', async () => {

packages/cli/src/commands/publish.ts

@@ -157,6 +157,10 @@ export async function publish({
     publishCalls.push(...calls);
   }
 
+  if (!publishCalls.length) {
+    throw new Error("There isn't anything new to publish.");
+  }
+
   if (!skipConfirm) {
     for (const publishCall of publishCalls) {
       const packageName = new PackageReference(publishCall.packagesNames[0]).name;
@@ -179,7 +183,7 @@ export async function publish({
         totalFees > 0n &&
         totalFees >= (await onChainRegistry.provider!.getBalance({ address: onChainRegistry.signer!.address }))
       ) {
-        throw new Error('you do not appear to have enough ETH in your wallet to publish');
+        throw new Error('You do not appear to have enough ETH in your wallet to publish');
       }
     }
 

packages/cli/src/util/provider.ts

@@ -58,7 +58,6 @@ export const hideApiKey = (providerUrl: string) => {
     parsedUrl.pathname = pathParts.join('/');
     return parsedUrl.toString();
   } catch (error) {
-    debug('error processing url:', error);
     return providerUrl; // return original URL if parsing fails
   }
 };