fixes #1885, #1961 (#1970)

metaplex-foundation · Mar 16, 2022 · 5852443 · 5852443 · vercel · Mar 16, 2022
1 parent b9c4d56
commit 5852443
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/js/packages/cli/src/candy-machine-v2-cli.ts b/js/packages/cli/src/candy-machine-v2-cli.ts
@@ -295,6 +295,7 @@ programCommand('upload')
         rateLimit,
         collectionMintPubkey,
         setCollectionMint,
+        rpcUrl,
       });
     } catch (err) {
       log.warn('upload was not successful, please re-run.', err);

diff --git a/js/packages/cli/src/commands/upload.ts b/js/packages/cli/src/commands/upload.ts
@@ -58,6 +58,7 @@ export async function uploadV2({
   rateLimit,
   collectionMintPubkey,
   setCollectionMint,
+  rpcUrl,
 }: {
   files: string[];
   cacheName: string;
@@ -99,6 +100,7 @@ export async function uploadV2({
   rateLimit: number;
   collectionMintPubkey: null | PublicKey;
   setCollectionMint: boolean;
+  rpcUrl: null | string;
 }): Promise<boolean> {
   const savedContent = loadCache(cacheName, env);
   const cacheContent = savedContent || {};
@@ -234,6 +236,7 @@ export async function uploadV2({
           : undefined,
         storage === StorageType.ArweaveSol ? walletKeyPair : undefined,
         batchSize,
+        rpcUrl,
       );
 
       let result = arweaveBundleUploadGenerator.next();

diff --git a/js/packages/cli/src/helpers/upload/arweave-bundle.ts b/js/packages/cli/src/helpers/upload/arweave-bundle.ts
@@ -461,6 +461,7 @@ export function* makeArweaveBundleUploadGenerator(
   jwk?: any,
   walletKeyPair?: Keypair,
   batchSize?: number,
+  rpcUrl?: string,
 ): Generator<Promise<UploadGeneratorResult>> {
   let signer: ArweaveSigner;
   const storageType: StorageType = storage;
@@ -487,6 +488,10 @@ export function* makeArweaveBundleUploadGenerator(
             'https://node1.bundlr.network',
             'solana',
             walletKeyPair.secretKey,
+            {
+              timeout: 60000,
+              providerUrl: rpcUrl ?? 'https://api.metaplex.rpcpool.com',
+            },
           )
         : new Bundlr(
             'https://devnet.bundlr.network',
@@ -603,16 +608,17 @@ export function* makeArweaveBundleUploadGenerator(
         ] as unknown as BundlrTransaction[];
         log.info('Uploading bundle via Bundlr... in multiple transactions');
         const bytes = (dataItems as unknown as BundlrTransaction[]).reduce(
-          (c, d) => c + d.getRaw().length,
+          (c, d) => c + Math.max(d.getRaw().length, 12000),
           0,
         );
         const cost = await bundlr.utils.getPrice('solana', bytes);
+        const bufferCost = cost.multipliedBy(3).dividedToIntegerBy(2);
         log.info(
-          `${(cost.toNumber() * 2) / LAMPORTS} SOL to upload ${sizeMB(
+          `${bufferCost.toNumber() / LAMPORTS} SOL to upload ${sizeMB(
             bytes,
           )}MB with buffer. Sending fund txn...`,
         );
-        await bundlr.fund(cost.multipliedBy(2));
+        await bundlr.fund(bufferCost);
         log.info(`Successfully funded Arweave Bundler, starting upload`);
 
         const progressBar = new cliProgress.SingleBar(

diff --git a/js/packages/cli/test/run-test-v2.sh b/js/packages/cli/test/run-test-v2.sh
@@ -37,6 +37,7 @@ SRC_DIR=$PARENT_DIR/src
 CMD_CMV2="ts-node ${SRC_DIR}/candy-machine-v2-cli.ts"
 
 # Remote files to test the upload
+PNG_MIN="https://arweave.net/N3LqmO6yURUK1JxV9MJtH8YeqppEtZhKuy3RB0Tqm3A/?ext=png"
 PNG="https://arweave.net/izpWaFnueKtbRg4TY-CkUYQtwSzPNit3ZvQPY5hOK7E/?ext=png"
 GIF="https://arweave.net/3I50hy1dHhRwyxtKPL60WIl4kV0rqjnl7t_DcZPAp2o/?ext=gif"
 JPG="https://arweave.net/-KqqzJLtD8Pug-aCjbV6RWbGhfB74MBT71afqGFKYHA/?ext=jpg"
@@ -257,6 +258,10 @@ else
     png)
         IMAGE=$PNG
         ;;
+    png_min)
+        IMAGE=$PNG_MIN
+        EXT="png"
+        ;;
     jpg)
         IMAGE=$JPG
         ;;