@eluvio/elv-client-js 3.2.19 → 3.2.22

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.2.19",
+  "version": "3.2.22",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@eluvio/elv-client-js",
-      "version": "3.2.18",
+      "version": "3.2.21",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.2.19",
+  "version": "3.2.22",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/ElvClient.js

@@ -708,6 +708,22 @@ class ElvClient {
     json                    79b  {"adr":"VVf4DQU357tDnZGYQeDrntRJ5rs=","spc":"ispc3ANoVSzNA3P6t7abLR69ho5YPPZU"}
    */
 
+  async PersonalSign({
+    message,
+    addEthereumPrefix,
+    Sign
+  }) {
+    if(!Sign) {
+      Sign = async message => this.authClient.Sign(message);
+    }
+
+    if(addEthereumPrefix) {
+      message = Ethers.utils.keccak256(Buffer.from(`\x19Ethereum Signed Message:\n${message.length}${message}`, "utf-8"));
+    }
+
+    return await Sign(message);
+  }
+
   /**
    * Create a signed authorization token that can be used to authorize against the fabric
    *
@@ -737,17 +753,9 @@ class ElvClient {
       exp: Date.now() + duration,
     };
 
-    if(!Sign) {
-      Sign = async message => this.authClient.Sign(message);
-    }
-
     let message = `Eluvio Content Fabric Access Token 1.0\n${JSON.stringify(token)}`;
 
-    if(addEthereumPrefix) {
-      message = Ethers.utils.keccak256(Buffer.from(`\x19Ethereum Signed Message:\n${message.length}${message}`, "utf-8"));
-    }
-
-    const signature = await Sign(message);
+    const signature = await this.PersonalSign({message, addEthereumPrefix, Sign});
 
     const compressedToken = Pako.deflateRaw(Buffer.from(JSON.stringify(token), "utf-8"));
     return `acspjc${this.utils.B58(

package/src/walletClient/Configuration.js

@@ -23,9 +23,12 @@ let WalletConfiguration = {
     }
   },
   __MARKETPLACE_ORDER: [
+    "PREVIEW",
+    "wwe-marketplace-main",
+    "maskverse-marketplace",
     "dolly-marketplace",
     "oc-marketplace",
-    "maskverse-marketplace",
+    "cirkay-marketplace",
     "emp-marketplace",
     "microsoft",
     "indieflix-marketplace",

package/src/walletClient/Utils.js

@@ -56,6 +56,7 @@ const FormatNFTDetails = function(entry) {
     ContractId: `ictr${Utils.AddressToHash(info.contract_addr)}`,
     ContractName: info.contract_name,
     Cap: info.cap,
+    Offers: info.offers || [],
     TokenIdStr: info.token_id_str,
     TokenUri: info.token_uri,
     TokenOrdinal: info.ordinal,

package/src/walletClient/index.js

@@ -16,7 +16,7 @@ const embedded = inBrowser && window.top !== window.self;
  * See the Modules section on the sidebar for all client methods unrelated to login and authorization
  */
 class ElvWalletClient {
-  constructor({appId, client, network, mode, marketplaceInfo, storeAuthToken}) {
+  constructor({appId, client, network, mode, marketplaceInfo, previewMarketplaceHash, storeAuthToken}) {
     this.appId = appId;
 
     this.client = client;
@@ -31,6 +31,8 @@ class ElvWalletClient {
     this.storeAuthToken = storeAuthToken;
 
     this.selectedMarketplaceInfo = marketplaceInfo;
+    this.previewMarketplaceId = previewMarketplaceHash ? Utils.DecodeVersionHash(previewMarketplaceHash).objectId : undefined;
+    this.previewMarketplaceHash = previewMarketplaceHash;
 
     this.availableMarketplaces = {};
     this.availableMarketplacesById = {};
@@ -82,6 +84,7 @@ class ElvWalletClient {
     network="main",
     mode="production",
     marketplaceParams,
+    previewMarketplaceId,
     storeAuthToken=true
   }) {
     let { tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash } = (marketplaceParams || {});
@@ -94,6 +97,11 @@ class ElvWalletClient {
 
     const client = await ElvClient.FromNetworkName({networkName: network, assumeV3: true});
 
+    let previewMarketplaceHash = previewMarketplaceId;
+    if(previewMarketplaceHash && !previewMarketplaceHash.startsWith("hq__")) {
+      previewMarketplaceHash = await client.LatestVersionHash({objectId: previewMarketplaceId});
+    }
+
     const walletClient = new ElvWalletClient({
       appId,
       client,
@@ -105,6 +113,7 @@ class ElvWalletClient {
         marketplaceId: marketplaceHash ? client.utils.DecodeVersionHash(marketplaceHash).objectId : marketplaceId,
         marketplaceHash
       },
+      previewMarketplaceHash,
       storeAuthToken
     });
 
@@ -565,14 +574,13 @@ class ElvWalletClient {
 
 
 
-  // If marketplace slug is specified, load only that marketplace. Otherwise load all
   async LoadAvailableMarketplaces(forceReload=false) {
     if(!forceReload && Object.keys(this.availableMarketplaces) > 0) {
       return;
     }
 
     const mainSiteHash = await this.client.LatestVersionHash({objectId: this.mainSiteId});
-    const metadata = await this.client.ContentObjectMetadata({
+    let metadata = await this.client.ContentObjectMetadata({
       versionHash: mainSiteHash,
       metadataSubtree: "public/asset_metadata/tenants",
       resolveLinks: true,
@@ -594,13 +602,74 @@ class ElvWalletClient {
       ]
     });
 
+    // If preview marketplace is specified, load it appropriately
+    if(this.previewMarketplaceId) {
+      let previewTenantSlug = "PREVIEW";
+      let previewMarketplaceSlug, previewMarketplaceMetadata;
+      Object.keys(metadata || {}).forEach(tenantSlug =>
+        Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(marketplaceSlug => {
+          const versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
+          const objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+
+          if(objectId === this.previewMarketplaceId) {
+            // Marketplace exists in site meta
+            previewTenantSlug = tenantSlug;
+            previewMarketplaceSlug = marketplaceSlug;
+
+            // Deployed marketplace is same as preview marketplace
+            if(versionHash === this.previewMarketplaceHash) {
+              previewMarketplaceMetadata = metadata[tenantSlug].marketplaces[marketplaceSlug];
+            }
+          }
+        })
+      );
+
+      // Marketplace not present in branch, or preview version is different - Load metadata directly
+      if(!previewMarketplaceMetadata) {
+        previewMarketplaceMetadata = await this.client.ContentObjectMetadata({
+          versionHash: this.previewMarketplaceHash,
+          metadataSubtree: "public/asset_metadata",
+          produceLinkUrls: true,
+          authorizationToken: this.publicStaticToken,
+          noAuth: true,
+          select: [
+            "slug",
+            "info/tenant_id",
+            "info/tenant_name",
+            "info/branding",
+          ],
+          remove: [
+            "info/branding/custom_css"
+          ]
+        });
+
+        if(!previewMarketplaceSlug) {
+          previewMarketplaceSlug = previewMarketplaceMetadata.slug;
+        }
+      }
+
+      previewMarketplaceMetadata["."] = {
+        source: this.previewMarketplaceHash
+      };
+
+      previewMarketplaceMetadata.info["."] = {
+        source: this.previewMarketplaceHash
+      };
+
+      previewMarketplaceMetadata.info.branding.preview = true;
+      previewMarketplaceMetadata.info.branding.show = true;
+
+      metadata[previewTenantSlug] = metadata[previewTenantSlug] || {};
+      metadata[previewTenantSlug].marketplaces = metadata[previewTenantSlug].marketplaces || {};
+      metadata[previewTenantSlug].marketplaces[previewMarketplaceSlug] = previewMarketplaceMetadata;
+    }
+
     let availableMarketplaces = { ...(this.availableMarketplaces || {}) };
     let availableMarketplacesById = { ...(this.availableMarketplacesById || {}) };
     Object.keys(metadata || {}).forEach(tenantSlug => {
       try {
-        availableMarketplaces[tenantSlug] = {
-          versionHash: metadata[tenantSlug]["."].source
-        };
+        availableMarketplaces[tenantSlug] = metadata[tenantSlug]["."] ?
+          { versionHash: metadata[tenantSlug]["."].source } : { };
 
         Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(marketplaceSlug => {
           try {
@@ -642,11 +711,17 @@ class ElvWalletClient {
   }
 
   // Get the hash of the currently linked marketplace
-  async LatestMarketplaceHash({tenantSlug, marketplaceSlug}) {
+  async LatestMarketplaceHash({marketplaceParams}) {
+    const marketplaceInfo = await this.MarketplaceInfo({marketplaceParams});
+
+    if(this.previewMarketplaceId && this.previewMarketplaceId === marketplaceInfo.marketplaceId) {
+      return this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source;
+    }
+
     const mainSiteHash = await this.client.LatestVersionHash({objectId: this.mainSiteId});
     const marketplaceLink = await this.client.ContentObjectMetadata({
       versionHash: mainSiteHash,
-      metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", tenantSlug, "marketplaces", marketplaceSlug),
+      metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug),
       resolveLinks: false
     });
 
@@ -657,7 +732,7 @@ class ElvWalletClient {
     const marketplaceInfo = this.MarketplaceInfo({marketplaceParams});
 
     const marketplaceId = marketplaceInfo.marketplaceId;
-    const marketplaceHash = await this.LatestMarketplaceHash({tenantSlug: marketplaceInfo.tenantSlug, marketplaceSlug: marketplaceInfo.marketplaceSlug});
+    const marketplaceHash = await this.LatestMarketplaceHash({marketplaceParams});
 
     if(this.cachedMarketplaces[marketplaceId] && this.cachedMarketplaces[marketplaceId].versionHash !== marketplaceHash) {
       delete this.cachedMarketplaces[marketplaceId];
@@ -711,6 +786,10 @@ class ElvWalletClient {
       marketplace.marketplaceId = marketplaceId;
       marketplace.versionHash = marketplaceHash;
 
+      if(this.previewMarketplaceId && marketplaceId === this.previewMarketplaceId) {
+        marketplace.branding.preview = true;
+      }
+
       // Generate embed URLs for pack opening animations
       ["purchase_animation", "purchase_animation__mobile", "reveal_animation", "reveal_animation_mobile"].forEach(key => {
         try {