@eluvio/elv-client-js 4.0.27 → 4.0.29

package/dist/src/FrameClient.js

@@ -14,8 +14,6 @@ var permissionLevels = require("./client/ContentAccess").permissionLevels;
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Crypto = require("./Crypto");
-var _require2 = require("./walletClient/index"),
-  ElvWalletClient = _require2.ElvWalletClient;
 var FrameClient = /*#__PURE__*/function () {
   "use strict";
 
@@ -160,15 +158,12 @@ var FrameClient = /*#__PURE__*/function () {
       _iterator2.f();
     }
     this.walletClient = {};
-    var forbiddenMethods = ElvWalletClient.ForbiddenMethods();
-    var _iterator3 = _createForOfIteratorHelper(Object.getOwnPropertyNames(ElvWalletClient.prototype)),
+    // Dynamically defined wallet client methods defined in AllowedWalletClientMethods
+    var _iterator3 = _createForOfIteratorHelper(this.AllowedWalletClientMethods()),
       _step3;
     try {
       var _loop3 = function _loop3() {
         var methodName = _step3.value;
-        if (forbiddenMethods.includes(methodName)) {
-          return "continue";
-        }
         _this.walletClient[methodName] = /*#__PURE__*/function () {
           var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(args) {
             var callback;
@@ -202,8 +197,7 @@ var FrameClient = /*#__PURE__*/function () {
         }();
       };
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var _ret = _loop3();
-        if (_ret === "continue") continue;
+        _loop3();
       }
     } catch (err) {
       _iterator3.e(err);
@@ -462,6 +456,11 @@ var FrameClient = /*#__PURE__*/function () {
     value: function AllowedUserProfileMethods() {
       return ["AccessLevel", "CollectedTags", "CreateWallet", "DeleteUserMetadata", "MergeUserMetadata", "PublicUserMetadata", "ReplaceUserMetadata", "TenantId", "UserMetadata", "UserProfileImage", "UserWalletAddress", "UserWalletObjectInfo", "WalletAddress"];
     }
+  }, {
+    key: "AllowedWalletClientMethods",
+    value: function AllowedWalletClientMethods() {
+      return ["AcceptMarketplaceOffer", "AddNotificationListener", "AvailableMarketplaces", "CanSign", "CastVote", "ClaimItem", "ClaimStatus", "CollectionRedemptionStatus", "CreateListing", "CreateMarketplaceOffer", "DropStatus", "ExchangeRate", "FilteredQuery", "LatestMarketplaceHash", "Leaderboard", "Listing", "ListingAttributes", "ListingEditionNames", "ListingNames", "ListingPurchaseStatus", "ListingStats", "ListingStatus", "Listings", "LoadAvailableMarketplaces", "LoadDrop", "LoadMarketplace", "Marketplace", "MarketplaceCSS", "MarketplaceInfo", "MarketplaceOffers", "MarketplaceStock", "MintingStatus", "NFT", "NFTContractStats", "Notifications", "PackOpenStatus", "Profile", "ProfileMetadata", "PurchaseStatus", "PushNotification", "RejectMarketplaceOffer", "RemoveListing", "RemoveMarketplaceOffer", "RemoveProfileMetadata", "RevokeVote", "Sales", "SalesNames", "SalesStats", "SetProfileMetadata", "SubmitDropVote", "TenantConfiguration", "TransferNFT", "Transfers", "UserAddress", "UserInfo", "UserItemAttributes", "UserItemEditionNames", "UserItemNames", "UserItems", "UserListings", "UserNameToAddress", "UserSales", "UserTransfers", "UserWalletBalance", "VoteStatus"];
+    }
   }], [{
     key: "PromptedMethods",
     value: function PromptedMethods() {
@@ -480,7 +479,7 @@ var FrameClient = /*#__PURE__*/function () {
   }]);
   return FrameClient;
 }();
-var _require3 = require("./client/Files"),
-  UploadFiles = _require3.UploadFiles;
+var _require2 = require("./client/Files"),
+  UploadFiles = _require2.UploadFiles;
 FrameClient.prototype.UploadFiles = UploadFiles;
 exports.FrameClient = FrameClient;

package/dist/src/client/ContentAccess.js

@@ -1874,37 +1874,44 @@ exports.LatestVersionHash = /*#__PURE__*/function () {
           _context27.t0 = _context27["catch"](3);
         case 11:
           if (latestHash) {
-            _context27.next = 20;
+            _context27.next = 25;
             break;
           }
-          _context27.next = 14;
+          _context27.prev = 12;
+          _context27.next = 15;
           return this.CallContractMethod({
             contractAddress: this.utils.HashToAddress(objectId),
             methodName: "countVersionHashes"
           });
-        case 14:
+        case 15:
           versionCount = _context27.sent;
+          _context27.next = 20;
+          break;
+        case 18:
+          _context27.prev = 18;
+          _context27.t1 = _context27["catch"](12);
+        case 20:
           if (versionCount.toNumber()) {
-            _context27.next = 17;
+            _context27.next = 22;
             break;
           }
           throw Error("Unable to determine latest version hash for ".concat(versionHash || objectId, " - Item deleted?"));
-        case 17:
-          _context27.next = 19;
+        case 22:
+          _context27.next = 24;
           return this.CallContractMethod({
             contractAddress: this.utils.HashToAddress(objectId),
             methodName: "versionHashes",
             methodArgs: [versionCount - 1]
           });
-        case 19:
+        case 24:
           latestHash = _context27.sent;
-        case 20:
+        case 25:
           return _context27.abrupt("return", latestHash);
-        case 21:
+        case 26:
         case "end":
           return _context27.stop();
       }
-    }, _callee27, this, [[3, 9]]);
+    }, _callee27, this, [[3, 9], [12, 18]]);
   }));
   return function (_x28) {
     return _ref47.apply(this, arguments);

package/dist/src/walletClient/Configuration.js

@@ -27,7 +27,7 @@ var WalletConfiguration = {
       appUrl: "https://wallet.contentfabric.io"
     }
   },
-  __MARKETPLACE_ORDER: ["PREVIEW", "masked-singer-brazil-marketplace", "de228e92-ed45-4fe0-8e52-658cf366e962", "wwe-marketplace-main", "maskverse-marketplace", "dolly-marketplace", "eluvio-live-marketplace-sonark", "cirkay-marketplace", "eluvio-live-marketplace-fuudge", "oc-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace", "realcannonballrun-marketplace"]
+  __MARKETPLACE_ORDER: ["PREVIEW", "masked-singer-brazil-marketplace", "eluvio-live-marketplace-globo-taf", "de228e92-ed45-4fe0-8e52-658cf366e962", "wwe-marketplace-main", "maskverse-marketplace", "dolly-marketplace", "eluvio-live-marketplace-sonark", "cirkay-marketplace", "eluvio-live-marketplace-fuudge", "oc-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace", "realcannonballrun-marketplace"]
 };
 
 // No production environment on demo

package/dist/src/walletClient/index.js

@@ -1517,6 +1517,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
       return ["constructor", "Authenticate", "AuthenticateOAuth", "AuthenticateExternalWallet", "AuthToken", "ClientAuthToken", "Initialize", "Log", "LogIn", "LogOut", "PersonalSign", "SetAuthorization", "SignMetamask"];
     }
 
+    // Used to generate AllowedWalletClientMethods for FrameClient
+    // Note: Do not import ElvWalletClient in FrameClient directly
+  }, {
+    key: "AllowedMethods",
+    value: function AllowedMethods() {
+      return Object.getOwnPropertyNames(ElvWalletClient.prototype).filter(function (methodName) {
+        return !ElvWalletClient.ForbiddenMethods().includes(methodName);
+      }).sort();
+    }
+
     /**
      * Initialize the wallet client.
      *

package/package.json

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

package/src/FrameClient.js

@@ -3,7 +3,6 @@ const Utils = require("./Utils");
 const permissionLevels = require("./client/ContentAccess").permissionLevels;
 const {LogMessage} = require("./LogMessage");
 const Crypto = require("./Crypto");
-const { ElvWalletClient } = require("./walletClient/index");
 
 class FrameClient {
   Log(message, error = false) {
@@ -91,10 +90,8 @@ class FrameClient {
     }
 
     this.walletClient = {};
-    const forbiddenMethods = ElvWalletClient.ForbiddenMethods();
-    for(const methodName of Object.getOwnPropertyNames(ElvWalletClient.prototype)) {
-      if(forbiddenMethods.includes(methodName)) { continue; }
-
+    // Dynamically defined wallet client methods defined in AllowedWalletClientMethods
+    for(const methodName of this.AllowedWalletClientMethods()) {
       this.walletClient[methodName] = async (args) => {
         let callback = args && args.callback;
         if(callback) { delete args.callback; }
@@ -504,6 +501,76 @@ class FrameClient {
       "WalletAddress"
     ];
   }
+
+  AllowedWalletClientMethods() {
+    return [
+      "AcceptMarketplaceOffer",
+      "AddNotificationListener",
+      "AvailableMarketplaces",
+      "CanSign",
+      "CastVote",
+      "ClaimItem",
+      "ClaimStatus",
+      "CollectionRedemptionStatus",
+      "CreateListing",
+      "CreateMarketplaceOffer",
+      "DropStatus",
+      "ExchangeRate",
+      "FilteredQuery",
+      "LatestMarketplaceHash",
+      "Leaderboard",
+      "Listing",
+      "ListingAttributes",
+      "ListingEditionNames",
+      "ListingNames",
+      "ListingPurchaseStatus",
+      "ListingStats",
+      "ListingStatus",
+      "Listings",
+      "LoadAvailableMarketplaces",
+      "LoadDrop",
+      "LoadMarketplace",
+      "Marketplace",
+      "MarketplaceCSS",
+      "MarketplaceInfo",
+      "MarketplaceOffers",
+      "MarketplaceStock",
+      "MintingStatus",
+      "NFT",
+      "NFTContractStats",
+      "Notifications",
+      "PackOpenStatus",
+      "Profile",
+      "ProfileMetadata",
+      "PurchaseStatus",
+      "PushNotification",
+      "RejectMarketplaceOffer",
+      "RemoveListing",
+      "RemoveMarketplaceOffer",
+      "RemoveProfileMetadata",
+      "RevokeVote",
+      "Sales",
+      "SalesNames",
+      "SalesStats",
+      "SetProfileMetadata",
+      "SubmitDropVote",
+      "TenantConfiguration",
+      "TransferNFT",
+      "Transfers",
+      "UserAddress",
+      "UserInfo",
+      "UserItemAttributes",
+      "UserItemEditionNames",
+      "UserItemNames",
+      "UserItems",
+      "UserListings",
+      "UserNameToAddress",
+      "UserSales",
+      "UserTransfers",
+      "UserWalletBalance",
+      "VoteStatus"
+    ];
+  }
 }
 
 const { UploadFiles } = require("./client/Files");

package/src/client/ContentAccess.js

@@ -1099,10 +1099,14 @@ exports.LatestVersionHash = async function({objectId, versionHash}) {
   } catch(error) {}
 
   if(!latestHash) {
-    const versionCount = await this.CallContractMethod({
-      contractAddress: this.utils.HashToAddress(objectId),
-      methodName: "countVersionHashes"
-    });
+    let versionCount;
+    try {
+      versionCount = await this.CallContractMethod({
+        contractAddress: this.utils.HashToAddress(objectId),
+        methodName: "countVersionHashes"
+      });
+    // eslint-disable-next-line no-empty
+    } catch(error) {}
 
     if(!versionCount.toNumber()) {
       throw Error(`Unable to determine latest version hash for ${versionHash || objectId} - Item deleted?`);

package/src/walletClient/Configuration.js

@@ -30,6 +30,7 @@ let WalletConfiguration = {
   __MARKETPLACE_ORDER: [
     "PREVIEW",
     "masked-singer-brazil-marketplace",
+    "eluvio-live-marketplace-globo-taf",
     "de228e92-ed45-4fe0-8e52-658cf366e962",
     "wwe-marketplace-main",
     "maskverse-marketplace",

package/src/walletClient/index.js

@@ -96,6 +96,14 @@ class ElvWalletClient {
     ];
   }
 
+  // Used to generate AllowedWalletClientMethods for FrameClient
+  // Note: Do not import ElvWalletClient in FrameClient directly
+  static AllowedMethods() {
+    return Object.getOwnPropertyNames(ElvWalletClient.prototype)
+      .filter(methodName => !ElvWalletClient.ForbiddenMethods().includes(methodName))
+      .sort();
+  }
+
   /**
    * Initialize the wallet client.
    *

package/testScripts/Test.js

@@ -2,6 +2,7 @@ const { ElvClient } = require("../src/ElvClient");
 const { ElvWalletClient } = require("../src/walletClient/index");
 const ClientConfiguration = require("../TestConfiguration.json");
 const fs = require("fs");
+const HttpClient = require("../src/HttpClient");
 
 const Test = async () => {
   try {
@@ -15,6 +16,20 @@ const Test = async () => {
     });
 
     client.SetSigner({signer});
+
+    client.ToggleLogging(true);
+    const response = await client.CallContractMethod({
+      cacheContract: true,
+      contractAddress: "0xc4958836b7f883a02e9fedcc11f7ebbcc8c2d5bb",
+      formatAgruments: true,
+      methodArgs: [1],
+      methodName: "membersList",
+      overrideCachedContract: false,
+      overrides: {}
+    });
+    client.ToggleLogging(false);
+
+    console.log("response", response)
   } catch(error) {
     console.error(error);
     console.error(JSON.stringify(error, null, 2));