@eluvio/elv-client-js 4.0.62 → 4.0.64

package/dist/src/walletClient/index.js

@@ -1155,11 +1155,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
               });
             case 3:
               marketplaceInfo = _context17.sent;
-              if (!(this.previewMarketplaceId && this.previewMarketplaceId === marketplaceInfo.marketplaceId)) {
+              if (!(this.previewMarketplaceId && Utils.EqualHash(this.previewMarketplaceId, marketplaceInfo.marketplaceId))) {
                 _context17.next = 6;
                 break;
               }
-              return _context17.abrupt("return", this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source);
+              return _context17.abrupt("return", this.previewMarketplaceHash);
             case 6:
               _context17.next = 8;
               return this.client.ContentObjectMetadata({
@@ -1206,15 +1206,36 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 delete this.cachedMarketplaces[marketplaceId];
               }
               if (this.cachedMarketplaces[marketplaceId]) {
-                _context19.next = 28;
+                _context19.next = 34;
                 break;
               }
-              _context19.next = 9;
+              if (!(this.previewMarketplaceId && Utils.EqualHash(marketplaceId, this.previewMarketplaceId))) {
+                _context19.next = 13;
+                break;
+              }
+              _context19.next = 10;
+              return this.client.ContentObjectMetadata({
+                versionHash: this.previewMarketplaceHash,
+                metadataSubtree: "/public/asset_metadata/info",
+                localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : undefined,
+                linkDepthLimit: 1,
+                resolveLinks: true,
+                resolveIgnoreErrors: true,
+                resolveIncludeSource: true,
+                produceLinkUrls: true,
+                authorizationToken: this.publicStaticToken
+              });
+            case 10:
+              marketplace = _context19.sent;
+              _context19.next = 16;
+              break;
+            case 13:
+              _context19.next = 15;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
                 metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "info"),
-                localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : "",
+                localizationSubtree: this.localization ? UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "localizations", this.localization, "info") : undefined,
                 linkDepthLimit: 1,
                 resolveLinks: true,
                 resolveIgnoreErrors: true,
@@ -1222,13 +1243,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken
               });
-            case 9:
+            case 15:
               marketplace = _context19.sent;
+            case 16:
               if (!marketplace.branding.use_tenant_styling) {
-                _context19.next = 17;
+                _context19.next = 23;
                 break;
               }
-              _context19.next = 13;
+              _context19.next = 19;
               return this.client.ContentObjectMetadata({
                 libraryId: this.mainSiteLibraryId,
                 objectId: this.mainSiteId,
@@ -1236,17 +1258,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 authorizationToken: this.publicStaticToken,
                 produceLinkUrls: true
               });
-            case 13:
+            case 19:
               _context19.t0 = _context19.sent;
               if (_context19.t0) {
-                _context19.next = 16;
+                _context19.next = 22;
                 break;
               }
               _context19.t0 = {};
-            case 16:
+            case 22:
               marketplace.tenantBranding = _context19.t0;
-            case 17:
-              _context19.next = 19;
+            case 23:
+              _context19.next = 25;
               return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
                 var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(item, index) {
                   var authorizationToken;
@@ -1296,7 +1318,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return _ref18.apply(this, arguments);
                 };
               }()));
-            case 19:
+            case 25:
               marketplace.items = _context19.sent;
               marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                 return _objectSpread(_objectSpread({}, collection), {}, {
@@ -1332,9 +1354,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 } catch (error) {}
               });
               this.cachedMarketplaces[marketplaceId] = marketplace;
-            case 28:
+            case 34:
               return _context19.abrupt("return", this.cachedMarketplaces[marketplaceId]);
-            case 29:
+            case 35:
             case "end":
               return _context19.stop();
           }
@@ -1385,6 +1407,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
           marketplaceInfo,
           marketplace,
           filters,
+          headers,
           path,
           _ref21,
           contents,
@@ -1534,70 +1557,78 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 filters.push("info/cap:le:".concat(parseInt(capLimit)));
               }
               _context20.t0 = mode;
-              _context20.next = _context20.t0 === "owned" ? 29 : _context20.t0 === "listings" ? 31 : _context20.t0 === "transfers" ? 33 : _context20.t0 === "sales" ? 37 : _context20.t0 === "listing-stats" ? 41 : _context20.t0 === "sales-stats" ? 43 : _context20.t0 === "leaderboard" ? 46 : 48;
+              _context20.next = _context20.t0 === "owned" ? 29 : _context20.t0 === "owned-full-meta" ? 31 : _context20.t0 === "listings" ? 34 : _context20.t0 === "transfers" ? 36 : _context20.t0 === "sales" ? 40 : _context20.t0 === "listing-stats" ? 44 : _context20.t0 === "sales-stats" ? 46 : _context20.t0 === "leaderboard" ? 49 : 51;
               break;
             case 29:
               path = UrlJoin("as", "wlt", userAddress || this.UserAddress());
-              return _context20.abrupt("break", 48);
+              return _context20.abrupt("break", 51);
             case 31:
+              path = UrlJoin("as", "apigw", "nfts");
+              headers = {
+                Authorization: "Bearer ".concat(this.AuthToken())
+              };
+              return _context20.abrupt("break", 51);
+            case 34:
               path = UrlJoin("as", "mkt", "f");
-              return _context20.abrupt("break", 48);
-            case 33:
+              return _context20.abrupt("break", 51);
+            case 36:
               path = UrlJoin("as", "mkt", "hst", "f");
               filters.push("action:eq:TRANSFERRED");
               filters.push("action:eq:SOLD");
-              return _context20.abrupt("break", 48);
-            case 37:
+              return _context20.abrupt("break", 51);
+            case 40:
               path = UrlJoin("as", "mkt", "hst", "f");
               filters.push("action:eq:SOLD");
               filters.push("seller:co:0x");
-              return _context20.abrupt("break", 48);
-            case 41:
+              return _context20.abrupt("break", 51);
+            case 44:
               path = UrlJoin("as", "mkt", "stats", "listed");
-              return _context20.abrupt("break", 48);
-            case 43:
+              return _context20.abrupt("break", 51);
+            case 46:
               path = UrlJoin("as", "mkt", "stats", "sold");
               filters.push("seller:co:0x");
-              return _context20.abrupt("break", 48);
-            case 46:
+              return _context20.abrupt("break", 51);
+            case 49:
               path = UrlJoin("as", "wlt", "leaders");
-              return _context20.abrupt("break", 48);
-            case 48:
+              return _context20.abrupt("break", 51);
+            case 51:
               if (filters.length > 0) {
                 params.filter = filters;
               }
               if (!mode.includes("stats")) {
-                _context20.next = 53;
+                _context20.next = 56;
                 break;
               }
-              _context20.next = 52;
+              _context20.next = 55;
               return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                 path: path,
                 method: "GET",
-                queryParams: params
+                queryParams: params,
+                headers: headers
               }));
-            case 52:
+            case 55:
               return _context20.abrupt("return", _context20.sent);
-            case 53:
+            case 56:
               _context20.t2 = Utils;
-              _context20.next = 56;
+              _context20.next = 59;
               return this.client.authClient.MakeAuthServiceRequest({
                 path: path,
                 method: "GET",
-                queryParams: params
+                queryParams: params,
+                headers: headers
               });
-            case 56:
+            case 59:
               _context20.t3 = _context20.sent;
-              _context20.next = 59;
+              _context20.next = 62;
               return _context20.t2.ResponseToJson.call(_context20.t2, _context20.t3);
-            case 59:
+            case 62:
               _context20.t1 = _context20.sent;
               if (_context20.t1) {
-                _context20.next = 62;
+                _context20.next = 65;
                 break;
               }
               _context20.t1 = [];
-            case 62:
+            case 65:
               _ref21 = _context20.t1;
               contents = _ref21.contents;
               paging = _ref21.paging;
@@ -1612,11 +1643,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   return ["owned", "listings"].includes(mode) ? FormatNFT(_this6, item) : item;
                 })
               });
-            case 68:
-              _context20.prev = 68;
+            case 71:
+              _context20.prev = 71;
               _context20.t4 = _context20["catch"](14);
               if (!(_context20.t4.status && _context20.t4.status.toString() === "404")) {
-                _context20.next = 72;
+                _context20.next = 75;
                 break;
               }
               return _context20.abrupt("return", {
@@ -1628,13 +1659,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 },
                 results: []
               });
-            case 72:
+            case 75:
               throw _context20.t4;
-            case 73:
+            case 76:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[14, 68]]);
+        }, _callee20, this, [[14, 71]]);
       }));
       function FilteredQuery() {
         return _FilteredQuery.apply(this, arguments);

package/package.json

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

package/src/Utils.js

@@ -444,6 +444,11 @@ const Utils = {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
   },
 
+  FromHex: str => {
+    str = str.replace(/^0x/, "");
+    return Buffer.from(str, "hex").toString();
+  },
+
   B64: (str, encoding="utf-8") => {
     return Buffer.from(str, encoding).toString("base64");
   },

package/src/Validation.js

@@ -88,3 +88,23 @@ exports.ValidateDate = (date) => {
 
   return new Date(date).getTime();
 };
+
+exports.ValidateUserWallet = async ({address, client}) => {
+  if(!address) {
+    throw Error("Address not specified");
+  } else if(!client) {
+    throw Error("Client not specified");
+  }
+
+  const walletAddress = await client.userProfileClient.UserWalletAddress({address});
+
+  if(!walletAddress) {
+    throw Error(`User address has no wallet: ${address}`);
+  }
+
+  const balance = await client.GetBalance({address});
+
+  if(balance < 0.1) {
+    throw Error(`User has no funds: ${address}`);
+  }
+};

package/src/client/AccessGroups.js

@@ -15,7 +15,8 @@ const {
   ValidatePresence,
   ValidateLibrary,
   ValidateObject,
-  ValidateAddress
+  ValidateAddress,
+  ValidateUserWallet
 } = require("../Validation");
 
 
@@ -137,22 +138,39 @@ exports.AccessGroupMembers = async function({contractAddress}) {
 
   this.Log(`Retrieving members for group ${contractAddress}`);
 
-  const length = (await this.CallContractMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
     contractAddress,
-    methodName: "membersNum"
-  })).toNumber();
-
-  return await Promise.all(
-    [...Array(length)].map(async (_, i) =>
-      this.utils.FormatAddress(
-        await this.CallContractMethod({
-          contractAddress,
-          methodName: "membersList",
-          methodArgs: [i]
-        })
+    methodName: "membersList"
+  });
+
+  if(hasMethod) {
+    const length = (await this.CallContractMethod({
+      contractAddress,
+      methodName: "membersNum"
+    })).toNumber();
+
+    return await Promise.all(
+      [...Array(length)].map(async (_, i) =>
+        this.utils.FormatAddress(
+          await this.CallContractMethod({
+            contractAddress,
+            methodName: "membersList",
+            methodArgs: [i]
+          })
+        )
       )
-    )
-  );
+    );
+  } else {
+    const response = this.utils.FromHex(
+      await this.CallContractMethod({
+        contractAddress,
+        methodName: "getMeta",
+        methodArgs: ["members"]
+      })
+    );
+
+    return response && JSON.parse(response) ? JSON.parse(response) : [];
+  }
 };
 
 /**
@@ -170,22 +188,39 @@ exports.AccessGroupManagers = async function({contractAddress}) {
 
   this.Log(`Retrieving managers for group ${contractAddress}`);
 
-  const length = (await this.CallContractMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
     contractAddress,
-    methodName: "managersNum"
-  })).toNumber();
-
-  return await Promise.all(
-    [...Array(length)].map(async (_, i) =>
-      this.utils.FormatAddress(
-        await this.CallContractMethod({
-          contractAddress,
-          methodName: "managersList",
-          methodArgs: [i]
-        })
+    methodName: "managersList"
+  });
+
+  if(hasMethod) {
+    const length = (await this.CallContractMethod({
+      contractAddress,
+      methodName: "managersNum"
+    })).toNumber();
+
+    return await Promise.all(
+      [...Array(length)].map(async (_, i) =>
+        this.utils.FormatAddress(
+          await this.CallContractMethod({
+            contractAddress,
+            methodName: "managersList",
+            methodArgs: [i]
+          })
+        )
       )
-    )
-  );
+    );
+  } else {
+    const response = this.utils.FromHex(
+      await this.CallContractMethod({
+        contractAddress,
+        methodName: "getMeta",
+        methodArgs: ["managers"]
+      })
+    );
+
+    return response && JSON.parse(response) ? JSON.parse(response) : [];
+  }
 };
 
 /**
@@ -202,12 +237,13 @@ exports.AccessGroupManagers = async function({contractAddress}) {
  *
  * @returns {Promise<string>} - Contract address of created access group
  */
-exports.CreateAccessGroup = async function({name, description, metadata={}}={}) {
+exports.CreateAccessGroup = async function({name, description, metadata={}, visibility=1}={}) {
   this.Log(`Creating access group: ${name || ""} ${description || ""}`);
   let { contractAddress } = await this.authClient.CreateAccessGroup();
   contractAddress = this.utils.FormatAddress(contractAddress);
 
   const objectId = this.utils.AddressToObjectId(contractAddress);
+  const tenantId = await this.userProfileClient.TenantId();
 
   this.Log(`Access group: ${contractAddress} ${objectId}`);
 
@@ -216,19 +252,47 @@ exports.CreateAccessGroup = async function({name, description, metadata={}}={})
     objectId: objectId
   });
 
+  const groupMetadata = {
+    public: {
+      name,
+      description
+    },
+    name,
+    description,
+    ...metadata
+  };
+
+  if(tenantId) {
+    let tenantAdminGroupAddress = this.utils.HashToAddress(tenantId);
+
+    await this.AddContentObjectGroupPermission({
+      objectId,
+      groupAddress: tenantAdminGroupAddress,
+      permission: "manage"
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "_tenantId",
+      metadata: tenantId
+    });
+
+    groupMetadata["tenantId"] = tenantId;
+  } else {
+    console.warn("No tenant ID associated with current tenant.");
+  }
+
   await this.ReplaceMetadata({
     libraryId: this.contentSpaceLibraryId,
     objectId,
     writeToken: editResponse.write_token,
-    metadata: {
-      public: {
-        name,
-        description
-      },
-      name,
-      description,
-      ...metadata
-    }
+    metadata: groupMetadata
+  });
+
+  await this.CallContractMethodAndWait({
+    contractAddress,
+    methodName: "setVisibility",
+    methodArgs: [visibility],
   });
 
   await this.FinalizeContentObject({
@@ -332,13 +396,39 @@ exports.AccessGroupMembershipMethod = async function({
 exports.AddAccessGroupMember = async function({contractAddress, memberAddress}) {
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
+  await ValidateUserWallet({address: memberAddress, client: this});
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "grantAccess",
     eventName: "MemberAdded"
   });
+
+  if(!hasMethod) {
+    let memberList = await this.AccessGroupMembers({
+      contractAddress
+    });
+
+    memberList.push(memberAddress);
+
+    memberList = memberList.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "members",
+      metadata: memberList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -357,12 +447,33 @@ exports.RemoveAccessGroupMember = async function({contractAddress, memberAddress
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "revokeAccess",
     eventName: "MemberRevoked"
   });
+
+  if(!hasMethod) {
+    let memberList = await this.AccessGroupMembers({
+      contractAddress
+    });
+
+    memberList = memberList.filter(element => element !== memberAddress);
+
+    return await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "members",
+      metadata: memberList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -380,13 +491,39 @@ exports.RemoveAccessGroupMember = async function({contractAddress, memberAddress
 exports.AddAccessGroupManager = async function({contractAddress, memberAddress}) {
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
+  await ValidateUserWallet({address: memberAddress, client: this});
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "membersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "grantManagerAccess",
     eventName: "ManagerAccessGranted"
   });
+
+  if(!hasMethod) {
+    let managerList = await this.AccessGroupManagers({
+      contractAddress
+    });
+
+    managerList.push(memberAddress);
+
+    managerList = managerList.filter((value, index, self) => {
+      return self.indexOf(value) === index;
+    });
+
+    await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "managers",
+      metadata: managerList
+    });
+  }
+
+  return response;
 };
 
 /**
@@ -405,12 +542,33 @@ exports.RemoveAccessGroupManager = async function({contractAddress, memberAddres
   contractAddress = ValidateAddress(contractAddress);
   memberAddress = ValidateAddress(memberAddress);
 
-  return await this.AccessGroupMembershipMethod({
+  const hasMethod = await this.authClient.ContractHasMethod({
+    contractAddress,
+    methodName: "managersList"
+  });
+
+  const response = await this.AccessGroupMembershipMethod({
     contractAddress,
     memberAddress,
     methodName: "revokeManagerAccess",
     eventName: "ManagerAccessRevoked"
   });
+
+  if(!hasMethod) {
+    let managerList = await this.AccessGroupManagers({
+      contractAddress
+    });
+
+    managerList = managerList.filter(element => element !== memberAddress);
+
+    return await this.ReplaceContractMetadata({
+      contractAddress,
+      metadataKey: "managers",
+      metadata: managerList
+    });
+  }
+
+  return response;
 };
 
 /**

package/src/walletClient/ClientMethods.js

@@ -232,6 +232,7 @@ exports.UserItemAttributes = async function({marketplaceParams, displayName, use
  *
  * @methodGroup User
  * @namedParams
+ * @param {boolean=} includeFullMetadata=false - If true, will include full metadata for each item. Ignored if not logged in.
  * @param {string=} userAddress - Address of a user. If not specified, will return results for current user
  * @param {integer=} start=0 - PAGINATION: Index from which the results should start
  * @param {integer=} limit=50 - PAGINATION: Maximum number of results to return
@@ -245,8 +246,12 @@ exports.UserItemAttributes = async function({marketplaceParams, displayName, use
  *
  * @returns {Promise<Object>} - Results of the query and pagination info
  */
-exports.UserItems = async function({sortBy="default"}={}) {
-  return this.FilteredQuery({mode: "owned", sortBy, ...(arguments[0] || {})});
+exports.UserItems = async function ({sortBy = "default", includeFullMetadata = false} = {}) {
+  if(includeFullMetadata && this.loggedIn) {
+    return this.FilteredQuery({mode: "owned-full-meta", sortBy, ...(arguments[0] || {})});
+  } else {
+    return this.FilteredQuery({mode: "owned", sortBy, ...(arguments[0] || {})});
+  }
 };
 
 /**