@solana-mobile/dapp-store-publishing-tools 0.7.2 → 0.8.0

package/lib/CoreUtils.js

@@ -189,20 +189,21 @@ export var truncateAddress = function(address) {
     return "".concat(address.slice(0, 4), "...").concat(address.slice(address.length - 4, address.length));
 };
 export var mintNft = function() {
-    var _ref = _async_to_generator(function(metaplex, json, createNftInput) {
-        var uri, txBuilder;
+    var _ref = _async_to_generator(function(metaplex, json, createNftInput, priorityFeeLamports) {
+        var uri, computeBudget, txBuilder, microLamportsPerCU;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    console.info({
-                        json: json
-                    });
                     return [
                         4,
                         metaplex.nfts().uploadMetadata(json)
                     ];
                 case 1:
                     uri = _state.sent().uri;
+                    computeBudget = 250000;
+                    if (priorityFeeLamports < 0) {
+                        throw new Error("Priority fees cannot be negative");
+                    }
                     return [
                         4,
                         metaplex.nfts().builders().create(_object_spread_props(_object_spread({}, createNftInput), {
@@ -216,13 +217,14 @@ export var mintNft = function() {
                     txBuilder = _state.sent();
                     txBuilder.prepend({
                         instruction: ComputeBudgetProgram.setComputeUnitLimit({
-                            units: 250000
+                            units: computeBudget
                         }),
                         signers: []
                     });
+                    microLamportsPerCU = 1000000 * priorityFeeLamports / computeBudget;
                     txBuilder.prepend({
                         instruction: ComputeBudgetProgram.setComputeUnitPrice({
-                            microLamports: 2000000
+                            microLamports: microLamportsPerCU
                         }),
                         signers: []
                     });
@@ -233,7 +235,7 @@ export var mintNft = function() {
             }
         });
     });
-    return function mintNft(metaplex, json, createNftInput) {
+    return function mintNft(metaplex, json, createNftInput, priorityFeeLamports) {
         return _ref.apply(this, arguments);
     };
 }();

package/lib/create/AppCore.js

@@ -151,12 +151,11 @@ export var createAppJson = function(app, publisherAddress) {
 };
 export var createApp = function() {
     var _ref = _async_to_generator(function(param, param1) {
-        var publisherMintAddress, mintAddress, appDetails, metaplex, publisher, appJson, txBuilder;
+        var publisherMintAddress, mintAddress, appDetails, priorityFeeLamports, metaplex, publisher, appJson, txBuilder;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    publisherMintAddress = param.publisherMintAddress, mintAddress = param.mintAddress, appDetails = param.appDetails, metaplex = param1.metaplex, publisher = param1.publisher;
-                    debug("Minting app NFT for publisher: ".concat(publisherMintAddress.toBase58()));
+                    publisherMintAddress = param.publisherMintAddress, mintAddress = param.mintAddress, appDetails = param.appDetails, priorityFeeLamports = param.priorityFeeLamports, metaplex = param1.metaplex, publisher = param1.publisher;
                     appJson = createAppJson(appDetails, publisher.publicKey);
                     validateApp(appJson);
                     return [
@@ -173,7 +172,7 @@ export var createApp = function() {
                                     share: 100
                                 }
                             ]
-                        })
+                        }, priorityFeeLamports)
                     ];
                 case 1:
                     txBuilder = _state.sent();

package/lib/create/PublisherCore.js

@@ -155,12 +155,11 @@ export var createPublisherJson = function(publisher) {
 };
 export var createPublisher = function() {
     var _ref = _async_to_generator(function(param, param1) {
-        var mintAddress, publisherDetails, metaplex, publisherJson, txBuilder;
+        var mintAddress, publisherDetails, priorityFeeLamports, metaplex, publisherJson, txBuilder;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    mintAddress = param.mintAddress, publisherDetails = param.publisherDetails, metaplex = param1.metaplex;
-                    debug("Minting publisher NFT");
+                    mintAddress = param.mintAddress, publisherDetails = param.publisherDetails, priorityFeeLamports = param.priorityFeeLamports, metaplex = param1.metaplex;
                     publisherJson = createPublisherJson(publisherDetails);
                     validatePublisher(publisherJson);
                     return [
@@ -169,7 +168,7 @@ export var createPublisher = function() {
                             isCollection: true,
                             isMutable: true,
                             useNewMint: mintAddress
-                        })
+                        }, priorityFeeLamports)
                     ];
                 case 1:
                     txBuilder = _state.sent();

package/lib/create/ReleaseCore.js

@@ -652,12 +652,11 @@ export var createReleaseJson = function() {
 }();
 export var createRelease = function() {
     var _ref = _async_to_generator(function(param, param1) {
-        var appMintAddress, releaseMintAddress, releaseDetails, appDetails, publisherDetails, publisher, metaplex, releaseJson, suppressedJson, txBuilder;
+        var appMintAddress, releaseMintAddress, releaseDetails, appDetails, publisherDetails, priorityFeeLamports, publisher, metaplex, releaseJson, suppressedJson, txBuilder;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, releaseDetails = param.releaseDetails, appDetails = param.appDetails, publisherDetails = param.publisherDetails, publisher = param1.publisher, metaplex = param1.metaplex;
-                    debug("Minting release NFT for: ".concat(appMintAddress.toBase58()));
+                    appMintAddress = param.appMintAddress, releaseMintAddress = param.releaseMintAddress, releaseDetails = param.releaseDetails, appDetails = param.appDetails, publisherDetails = param.publisherDetails, priorityFeeLamports = param.priorityFeeLamports, publisher = param1.publisher, metaplex = param1.metaplex;
                     return [
                         4,
                         createReleaseJson({
@@ -683,7 +682,7 @@ export var createRelease = function() {
                                 }
                             ],
                             isMutable: false
-                        })
+                        }, priorityFeeLamports)
                     ];
                 case 2:
                     txBuilder = _state.sent();

package/lib/publish/PublishCoreUpdate.js

@@ -223,9 +223,9 @@ export var publishUpdate = function() {
                     ];
                 case 1:
                     updateRequest = _state.sent();
-                    submitRequestToSolanaDappPublisherPortal(updateRequest, URL_FORM_UPDATE, dryRun);
                     return [
-                        2
+                        2,
+                        submitRequestToSolanaDappPublisherPortal(updateRequest, URL_FORM_UPDATE, dryRun)
                     ];
             }
         });

package/lib/publish/dapp_publisher_portal.js

@@ -161,7 +161,6 @@ export var submitRequestToSolanaDappPublisherPortal = function() {
                         },
                         data: JSON.stringify(request)
                     };
-                    console.info("Sending dApp publisher portal request:", config);
                     if (!!dryRun) return [
                         3,
                         2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana-mobile/dapp-store-publishing-tools",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,

package/src/CoreUtils.ts

@@ -24,10 +24,15 @@ type JsonMetadataMetaplexFile = Omit<JsonMetadata, "image"> & {
 export const mintNft = async (
   metaplex: Metaplex,
   json: JsonMetadataMetaplexFile,
-  createNftInput: Omit<CreateNftInput, "uri" | "name" | "sellerFeeBasisPoints">
+  createNftInput: Omit<CreateNftInput, "uri" | "name" | "sellerFeeBasisPoints">,
+  priorityFeeLamports: number,
 ): Promise<TransactionBuilder> => {
-  console.info({ json });
   const { uri } = await metaplex.nfts().uploadMetadata(json);
+  const computeBudget = 250000
+
+  if (priorityFeeLamports < 0) {
+    throw new Error("Priority fees cannot be negative")
+  }
 
   const txBuilder = await metaplex
     .nfts()
@@ -42,14 +47,16 @@ export const mintNft = async (
 
   txBuilder.prepend({
     instruction: ComputeBudgetProgram.setComputeUnitLimit({
-      units: 250000,
+      units: computeBudget,
     }),
     signers: [],
   });
 
+  const microLamportsPerCU = 1000000 * priorityFeeLamports / computeBudget
+
   txBuilder.prepend({
     instruction: ComputeBudgetProgram.setComputeUnitPrice({
-      microLamports: 2000000,
+      microLamports: microLamportsPerCU,
     }),
     signers: [],
   });

package/src/create/AppCore.ts

@@ -38,25 +38,29 @@ type CreateAppInput = {
   publisherMintAddress: PublicKey;
   mintAddress: Signer;
   appDetails: App;
+  priorityFeeLamports: number;
 };
 
 export const createApp = async (
-  { publisherMintAddress, mintAddress, appDetails }: CreateAppInput,
+  { publisherMintAddress, mintAddress, appDetails, priorityFeeLamports }: CreateAppInput,
   { metaplex, publisher }: Context
 ) => {
-  debug(`Minting app NFT for publisher: ${publisherMintAddress.toBase58()}`);
-
   const appJson = createAppJson(appDetails, publisher.publicKey);
   validateApp(appJson);
 
-  const txBuilder = await mintNft(metaplex, appJson, {
-    useNewMint: mintAddress,
-    collection: publisherMintAddress,
-    collectionAuthority: publisher,
-    isCollection: true,
-    isMutable: true,
-    creators: [{ address: publisher.publicKey, share: 100 }],
-  });
+  const txBuilder = await mintNft(
+    metaplex, 
+    appJson, 
+    {
+      useNewMint: mintAddress,
+      collection: publisherMintAddress,
+      collectionAuthority: publisher,
+      isCollection: true,
+      isMutable: true,
+      creators: [{ address: publisher.publicKey, share: 100 }],
+    },
+    priorityFeeLamports
+  );
 
   txBuilder.append(
     metaplex.nfts().builders().verifyCreator({

package/src/create/PublisherCore.ts

@@ -42,22 +42,26 @@ export const createPublisherJson = (
 type CreatePublisherInput = {
   mintAddress: Signer;
   publisherDetails: Publisher;
+  priorityFeeLamports: number;
 };
 
 export const createPublisher = async (
-  { mintAddress, publisherDetails }: CreatePublisherInput,
+  { mintAddress, publisherDetails, priorityFeeLamports }: CreatePublisherInput,
   { metaplex }: Context
 ): Promise<TransactionBuilder> => {
-  debug(`Minting publisher NFT`);
-
   const publisherJson = createPublisherJson(publisherDetails);
   validatePublisher(publisherJson);
 
-  const txBuilder = await mintNft(metaplex, publisherJson, {
-    isCollection: true,
-    isMutable: true,
-    useNewMint: mintAddress,
-  });
+  const txBuilder = await mintNft(
+    metaplex, 
+    publisherJson, 
+    {
+      isCollection: true,
+      isMutable: true,
+      useNewMint: mintAddress,
+    },
+    priorityFeeLamports
+  );
 
   return txBuilder;
 };

package/src/create/ReleaseCore.ts

@@ -161,6 +161,7 @@ type CreateReleaseInput = {
   releaseDetails: Release;
   publisherDetails: Publisher;
   appDetails: App;
+  priorityFeeLamports: number;
 };
 
 export const createRelease = async (
@@ -170,11 +171,10 @@ export const createRelease = async (
     releaseDetails,
     appDetails,
     publisherDetails,
+    priorityFeeLamports,
   }: CreateReleaseInput,
   { publisher, metaplex }: Context
 ) => {
-  debug(`Minting release NFT for: ${appMintAddress.toBase58()}`);
-
   const releaseJson = await createReleaseJson(
     { releaseDetails, appDetails, publisherDetails },
     publisher.publicKey
@@ -183,13 +183,17 @@ export const createRelease = async (
   const suppressedJson = JSON.stringify(releaseJson, metaplexFileReplacer, 2);
   validateRelease(JSON.parse(suppressedJson));
 
-  const txBuilder = await mintNft(metaplex, releaseJson, {
-    useNewMint: releaseMintAddress,
-    collection: appMintAddress,
-    collectionAuthority: publisher,
-    creators: [{ address: publisher.publicKey, share: 100 }],
-    isMutable: false,
-  });
+  const txBuilder = await mintNft(
+    metaplex, 
+    releaseJson, {
+      useNewMint: releaseMintAddress,
+      collection: appMintAddress,
+      collectionAuthority: publisher,
+      creators: [{ address: publisher.publicKey, share: 100 }],
+      isMutable: false,
+    },
+    priorityFeeLamports
+  );
 
   // TODO(jon): Enable a case where the signer is not the publisher
   // TODO(jon): Allow this to be unverified and to verify later

package/src/publish/PublishCoreUpdate.ts

@@ -140,5 +140,5 @@ export const publishUpdate = async (
     requestorIsAuthorized,
     criticalUpdate);
 
-  submitRequestToSolanaDappPublisherPortal(updateRequest, URL_FORM_UPDATE, dryRun);
+  return submitRequestToSolanaDappPublisherPortal(updateRequest, URL_FORM_UPDATE, dryRun);
 };

package/src/publish/dapp_publisher_portal.ts

@@ -43,8 +43,6 @@ export const submitRequestToSolanaDappPublisherPortal = async (
     data: JSON.stringify(request),
   } as AxiosRequestConfig;
 
-  console.info("Sending dApp publisher portal request:", config);
-
   if (!dryRun) {
     await axios(config)
       .then((response) => {