Add null checks for new fields in config (#263)

solana-mobile · Apr 24, 2024 · 1f1647a · 1f1647a
1 parent c424801
commit 1f1647a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/packages/cli/src/CliSetup.ts b/packages/cli/src/CliSetup.ts
@@ -310,7 +310,7 @@ publishCommand
  }) => {
  await tryWithErrorMessage(async () => {
  await checkForSelfUpdate();
- await checkSubmissionNetwork(url);
+ checkSubmissionNetwork(url);
 
  const config = await loadPublishDetails(Constants.getConfigFilePath());
 
@@ -320,7 +320,7 @@ publishCommand
 
  const signer = parseKeypair(keypair);
  if (signer) {
- if (hasAddressInConfig(config.lastUpdatedVersionOnStore)) {
+ if (config.lastUpdatedVersionOnStore != null && config.lastSubmittedVersionOnChain.address != null) {
  await publishUpdateCommand({
  appMintAddress: appMintAddress,
  releaseMintAddress: releaseMintAddress,
@@ -397,7 +397,7 @@ publishCommand
  }) => {
  await tryWithErrorMessage(async () => {
  await checkForSelfUpdate();
- await checkSubmissionNetwork(url);
+ checkSubmissionNetwork(url);
 
  const config = await loadPublishDetails(Constants.getConfigFilePath())
 
@@ -467,7 +467,7 @@ publishCommand
  }) => {
  await tryWithErrorMessage(async () => {
  await checkForSelfUpdate();
- await checkSubmissionNetwork(url);
+ checkSubmissionNetwork(url);
 
  const config = await loadPublishDetails(Constants.getConfigFilePath())
 
@@ -530,7 +530,7 @@ publishCommand
  ) => {
  await tryWithErrorMessage(async () => {
  await checkForSelfUpdate();
- await checkSubmissionNetwork(url);
+ checkSubmissionNetwork(url);
 
  const config = await loadPublishDetails(Constants.getConfigFilePath())
 

diff --git a/packages/cli/src/commands/ValidateCommand.ts b/packages/cli/src/commands/ValidateCommand.ts
@@ -11,7 +11,6 @@ import { debug, showMessage } from "../CliUtils.js";
 
 import type { Keypair } from "@solana/web3.js";
 import type { MetaplexFile } from "@metaplex-foundation/js";
-import { isMetaplexFile } from "@metaplex-foundation/js";
 import { loadPublishDetailsWithChecks } from "../config/PublishDetails.js";
 
 export const validateCommand = async ({

diff --git a/packages/cli/src/commands/create/CreateCliPublisher.ts b/packages/cli/src/commands/create/CreateCliPublisher.ts
@@ -97,4 +97,6 @@ export const createPublisherCommand = async ({
 
  return { publisherAddress, transactionSignature };
  }
+
+ return { publisherAddress: "", transactionSignature: "" };
 };
diff --git a/packages/cli/src/commands/create/CreateCliRelease.ts b/packages/cli/src/commands/create/CreateCliRelease.ts
@@ -113,11 +113,11 @@ export const createReleaseCommand = async ({
  const mediaBuffer = await fs.promises.readFile(apkEntry.uri);
  const hash = createHash("sha256").update(mediaBuffer).digest("base64");
 
- if (hash === config.lastSubmittedVersionOnChain.apk_hash) {
+ if (config.lastSubmittedVersionOnChain != null && hash === config.lastSubmittedVersionOnChain.apk_hash) {
  throw new Error(`The last created release used the same apk file.`);
  }
 
- if (config.release.android_details.version_code <= config.lastSubmittedVersionOnChain.version_code) {
+ if (config.lastSubmittedVersionOnChain != null && config.release.android_details.version_code <= config.lastSubmittedVersionOnChain.version_code) {
  throw new Error(`Each release NFT should have higher version code than previous minted release NFT.\nLast released version code is ${config.lastSubmittedVersionOnChain.version_code}.\nCurrent version code from apk file is ${config.release.android_details.version_code}`);
  }
 

diff --git a/packages/cli/src/commands/publish/PublishCliSubmit.ts b/packages/cli/src/commands/publish/PublishCliSubmit.ts
@@ -59,7 +59,7 @@ export const publishSubmitCommand = async ({
  const appAddr = appMintAddress ?? appDetails.address;
  const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
- if (releaseAddr === lastUpdatedVersionOnStore.address) {
+ if (lastUpdatedVersionOnStore != null && releaseAddr === lastUpdatedVersionOnStore.address) {
  throw new Error(`You've already submitted this version for review.`);
  }
 

diff --git a/packages/cli/src/commands/publish/PublishCliUpdate.ts b/packages/cli/src/commands/publish/PublishCliUpdate.ts
@@ -61,7 +61,7 @@ export const publishUpdateCommand = async ({
  const appAddr = appMintAddress ?? appDetails.address;
  const releaseAddr = releaseMintAddress ?? releaseDetails.address;
 
- if (releaseAddr === lastUpdatedVersionOnStore.address) {
+ if (lastUpdatedVersionOnStore != null && releaseAddr === lastUpdatedVersionOnStore.address) {
  throw new Error(`You've already submitted this version for review.`);
  }