@eluvio/elv-client-js 3.2.45 → 4.0.1

package/dist/src/AuthorizationClient.js

@@ -353,7 +353,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
                 };
 
-                if (this.noAuth || noAuth) {
+                if (!update) {
                   _context3.next = 29;
                   break;
                 }
@@ -602,8 +602,8 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   }; // Save request ID if present
 
                   accessRequest.logs.some(function (log) {
-                    if (log.values && (log.values.requestID || log.values.requestNonce)) {
-                      _this.requestIds[address] = (log.values.requestID || log.values.requestNonce || "").toString().replace(/^0x/, "");
+                    if (log.args && (log.args.requestID || log.args.requestNonce)) {
+                      _this.requestIds[address] = (log.args.requestID || log.args.requestNonce || "").toString().replace(/^0x/, "");
                       return true;
                     }
                   });
@@ -1231,11 +1231,11 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   if (!isV3) {
                     if (args && args.length > 0) {
                       // Inject public key of requester
-                      args[1] = this.client.signer.signingKey ? this.client.signer.signingKey.publicKey : "";
+                      args[1] = this.client.signer._signingKey ? this.client.signer._signingKey().publicKey : "";
                     } else {
                       // Set default args
                       args = [0, // Access level
-                      this.client.signer.signingKey ? this.client.signer.signingKey.publicKey : "", // Public key of requester
+                      this.client.signer._signingKey ? this.client.signer._signingKey().publicKey : "", // Public key of requester
                       publicKey, //cap.public_key,
                       [], // Custom values
                       [] // Stakeholders
@@ -1607,7 +1607,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
 
               case 7:
                 _context17.next = 9;
-                return this.client.signer.signingKey.signDigest(message);
+                return this.client.signer._signingKey().signDigest(message);
 
               case 9:
                 _context17.t1 = _context17.sent;

package/dist/src/ElvClient.js

@@ -87,7 +87,8 @@ var ElvClient = /*#__PURE__*/function () {
    * @param {number} fabricVersion - The version of the target content fabric
    * @param {Array<string>} fabricURIs - A list of full URIs to content fabric nodes
    * @param {Array<string>} ethereumURIs - A list of full URIs to ethereum nodes
-   * @param {Array<string>} ethereumURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>} authServiceURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
    * @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
    * @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
@@ -104,6 +105,7 @@ var ElvClient = /*#__PURE__*/function () {
         fabricURIs = _ref.fabricURIs,
         ethereumURIs = _ref.ethereumURIs,
         authServiceURIs = _ref.authServiceURIs,
+        searchURIs = _ref.searchURIs,
         _ref$ethereumContract = _ref.ethereumContractTimeout,
         ethereumContractTimeout = _ref$ethereumContract === void 0 ? 10 : _ref$ethereumContract,
         trustAuthorityId = _ref.trustAuthorityId,
@@ -128,6 +130,7 @@ var ElvClient = /*#__PURE__*/function () {
     this.fabricURIs = fabricURIs;
     this.authServiceURIs = authServiceURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
     this.ethereumContractTimeout = ethereumContractTimeout;
     this.trustAuthorityId = trustAuthorityId;
     this.noCache = noCache;
@@ -364,7 +367,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "UseRegion",
     value: function () {
       var _UseRegion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
-        var region, _yield$ElvClient$Conf, fabricURIs, ethereumURIs, authServiceURIs;
+        var region, _yield$ElvClient$Conf, fabricURIs, ethereumURIs, authServiceURIs, searchURIs;
 
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
@@ -391,19 +394,22 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricURIs = _yield$ElvClient$Conf.fabricURIs;
                 ethereumURIs = _yield$ElvClient$Conf.ethereumURIs;
                 authServiceURIs = _yield$ElvClient$Conf.authServiceURIs;
+                searchURIs = _yield$ElvClient$Conf.searchURIs;
                 this.authServiceURIs = authServiceURIs;
                 this.fabricURIs = fabricURIs;
                 this.ethereumURIs = ethereumURIs;
+                this.searchURIs = searchURIs;
                 this.HttpClient.uris = fabricURIs;
                 this.HttpClient.uriIndex = 0;
                 this.ethClient.ethereumURIs = ethereumURIs;
                 this.ethClient.ethereumURIIndex = 0;
                 return _context3.abrupt("return", {
                   fabricURIs: fabricURIs,
-                  ethereumURIs: ethereumURIs
+                  ethereumURIs: ethereumURIs,
+                  searchURIs: searchURIs
                 });
 
-              case 17:
+              case 19:
               case "end":
                 return _context3.stop();
             }
@@ -1479,7 +1485,7 @@ var ElvClient = /*#__PURE__*/function () {
               case 3:
                 ValidatePresence("message", message);
                 _context17.next = 6;
-                return this.Crypto.EncryptConk(message, publicKey || this.signer.signingKey.keyPair.publicKey);
+                return this.Crypto.EncryptConk(message, publicKey || this.signer._signingKey().publicKey);
 
               case 6:
                 return _context17.abrupt("return", _context17.sent);
@@ -1528,7 +1534,7 @@ var ElvClient = /*#__PURE__*/function () {
               case 3:
                 ValidatePresence("message", message);
                 _context18.next = 6;
-                return this.Crypto.DecryptCap(message, this.signer.signingKey.privateKey);
+                return this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
 
               case 6:
                 return _context18.abrupt("return", _context18.sent);
@@ -1598,7 +1604,7 @@ var ElvClient = /*#__PURE__*/function () {
     value: function FrameAllowedMethods() {
       var _this2 = this;
 
-      var forbiddenMethods = ["constructor", "AccessGroupMembershipMethod", "CallFromFrameMessage", "ClearSigner", "CreateAccount", "EnableMethodLogging", "FormatBlockNumbers", "FrameAllowedMethods", "FromConfigurationUrl", "GenerateWallet", "InitializeClients", "Log", "SetRemoteSigner", "SetSigner", "SetSignerFromWeb3Provider", "Sign", "ToggleLogging"];
+      var forbiddenMethods = ["constructor", "AccessGroupMembershipMethod", "CallFromFrameMessage", "ClearSigner", "CreateAccount", "EnableMethodLogging", "FormatBlockNumbers", "FrameAllowedMethods", "FromConfigurationUrl", "GenerateWallet", "InitializeClients", "Log", "PersonalSign", "SetRemoteSigner", "SetSigner", "SetSignerFromWeb3Provider", "Sign", "ToggleLogging"];
       return Object.getOwnPropertyNames(Object.getPrototypeOf(this)).filter(function (method) {
         return typeof _this2[method] === "function" && !forbiddenMethods.includes(method);
       });
@@ -1715,7 +1721,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "Configuration",
     value: function () {
       var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref22) {
-        var configUrl, _ref22$kmsUrls, kmsUrls, region, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, fabricVersion;
+        var configUrl, _ref22$kmsUrls, kmsUrls, region, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, searchURIs, fabricVersion;
 
         return _regeneratorRuntime.wrap(function _callee21$(_context21) {
           while (1) {
@@ -1759,6 +1765,7 @@ var ElvClient = /*#__PURE__*/function () {
                   authServiceURIs = authServiceURIs.filter(filterHTTPS);
                 }
 
+                searchURIs = fabricInfo.network.services.search || [];
                 fabricVersion = Math.max.apply(Math, _toConsumableArray(fabricInfo.network.api_versions || [2]));
                 return _context21.abrupt("return", {
                   nodeId: fabricInfo.node_id,
@@ -1769,11 +1776,12 @@ var ElvClient = /*#__PURE__*/function () {
                   ethereumURIs: ethereumURIs,
                   authServiceURIs: authServiceURIs,
                   kmsURIs: kmsUrls,
+                  searchURIs: searchURIs,
                   fabricVersion: fabricVersion
                 });
 
-              case 19:
-                _context21.prev = 19;
+              case 20:
+                _context21.prev = 20;
                 _context21.t0 = _context21["catch"](1);
                 // eslint-disable-next-line no-console
                 console.error("Error retrieving fabric configuration:"); // eslint-disable-next-line no-console
@@ -1781,12 +1789,12 @@ var ElvClient = /*#__PURE__*/function () {
                 console.error(_context21.t0);
                 throw _context21.t0;
 
-              case 24:
+              case 25:
               case "end":
                 return _context21.stop();
             }
           }
-        }, _callee21, null, [[1, 19]]);
+        }, _callee21, null, [[1, 20]]);
       }));
 
       function Configuration(_x18) {
@@ -1881,7 +1889,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "FromConfigurationUrl",
     value: function () {
       var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref24) {
-        var configUrl, region, trustAuthorityId, staticToken, _ref24$ethereumContra, ethereumContractTimeout, _ref24$noCache, noCache, _ref24$noAuth, noAuth, _ref24$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, fabricVersion, client;
+        var configUrl, region, trustAuthorityId, staticToken, _ref24$ethereumContra, ethereumContractTimeout, _ref24$noCache, noCache, _ref24$noAuth, noAuth, _ref24$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, searchURIs, fabricVersion, client;
 
         return _regeneratorRuntime.wrap(function _callee23$(_context23) {
           while (1) {
@@ -1902,6 +1910,7 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricURIs = _yield$ElvClient$Conf3.fabricURIs;
                 ethereumURIs = _yield$ElvClient$Conf3.ethereumURIs;
                 authServiceURIs = _yield$ElvClient$Conf3.authServiceURIs;
+                searchURIs = _yield$ElvClient$Conf3.searchURIs;
                 fabricVersion = _yield$ElvClient$Conf3.fabricVersion;
                 client = new ElvClient({
                   contentSpaceId: contentSpaceId,
@@ -1911,6 +1920,7 @@ var ElvClient = /*#__PURE__*/function () {
                   fabricURIs: fabricURIs,
                   ethereumURIs: ethereumURIs,
                   authServiceURIs: authServiceURIs,
+                  searchURIs: searchURIs,
                   ethereumContractTimeout: ethereumContractTimeout,
                   trustAuthorityId: trustAuthorityId,
                   staticToken: staticToken,
@@ -1921,7 +1931,7 @@ var ElvClient = /*#__PURE__*/function () {
                 client.configUrl = configUrl;
                 return _context23.abrupt("return", client);
 
-              case 14:
+              case 15:
               case "end":
                 return _context23.stop();
             }

package/dist/src/ElvWallet.js

@@ -19,8 +19,6 @@ var ElvWallet = /*#__PURE__*/function () {
    * NOTE: It is recommended to initialize wallets from the ElvClient, not using this constructor
    *
    * @see ElvClient#GenerateWallet()
-   *
-   * @param {string} providerUrl - URL of blockchain provider
    */
   function ElvWallet(provider) {
     _classCallCheck(this, ElvWallet);
@@ -38,7 +36,7 @@ var ElvWallet = /*#__PURE__*/function () {
   _createClass(ElvWallet, [{
     key: "GenerateMnemonic",
     value: function GenerateMnemonic() {
-      return Ethers.utils.HDNode.entropyToMnemonic(Ethers.utils.randomBytes(16));
+      return Ethers.Wallet.createRandom().mnemonic.phrase;
     }
     /**
      * Generate a private key from the given mnemonic

package/dist/src/EthClient.js

@@ -71,8 +71,7 @@ var EthClient = /*#__PURE__*/function () {
     this.HttpClient = new HttpClient({
       uris: this.ethereumURIs,
       debug: this.debug
-    });
-    Ethers.errors.setLogLevel("error");
+    }); //Ethers.errors.setLogLevel("error");
   }
 
   _createClass(EthClient, [{
@@ -429,7 +428,7 @@ var EthClient = /*#__PURE__*/function () {
     key: "CallContractMethod",
     value: function () {
       var _CallContractMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref9) {
-        var contract, contractAddress, abi, methodName, _ref9$methodArgs, methodArgs, value, _ref9$overrides, overrides, _ref9$formatArguments, formatArguments, _ref9$cacheContract, cacheContract, _ref9$overrideCachedC, overrideCachedContract, methodAbi, result, success, _contract$functions, latestBlock;
+        var contract, contractAddress, abi, methodName, _ref9$methodArgs, methodArgs, value, _ref9$overrides, overrides, _ref9$formatArguments, formatArguments, _ref9$cacheContract, cacheContract, _ref9$overrideCachedC, overrideCachedContract, methodAbi, result, success, _contract, latestBlock;
 
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
@@ -457,7 +456,7 @@ var EthClient = /*#__PURE__*/function () {
                   cacheContract: cacheContract,
                   overrideCachedContract: overrideCachedContract
                 });
-                abi = contract["interface"].abi; // Automatically format contract arguments
+                abi = contract["interface"].fragments; // Automatically format contract arguments
 
                 if (formatArguments) {
                   methodArgs = this.FormatContractArguments({
@@ -481,7 +480,7 @@ var EthClient = /*#__PURE__*/function () {
 
               case 11:
                 this.Log("Calling contract method:\n        Provider: ".concat(this.Provider().connection.url, "\n        Address: ").concat(contract.address, "\n        Method: ").concat(methodName, "\n        Args: [").concat(methodArgs.join(", "), "]"));
-                methodAbi = contract["interface"].abi.find(function (method) {
+                methodAbi = contract["interface"].fragments.find(function (method) {
                   return method.name === methodName;
                 }); // Lock if performing a transaction
 
@@ -520,7 +519,7 @@ var EthClient = /*#__PURE__*/function () {
 
                 _context6.prev = 23;
                 _context6.next = 26;
-                return (_contract$functions = contract.functions)[methodName].apply(_contract$functions, _toConsumableArray(methodArgs).concat([overrides]));
+                return (_contract = contract)[methodName].apply(_contract, _toConsumableArray(methodArgs).concat([overrides]));
 
               case 26:
                 result = _context6.sent;
@@ -673,7 +672,13 @@ var EthClient = /*#__PURE__*/function () {
                 }
 
                 methodEvent.logs = methodEvent.logs.map(function (log) {
-                  return _objectSpread(_objectSpread({}, log), contract["interface"].parseLog(log));
+                  var parsedLogs = {};
+
+                  try {
+                    parsedLogs = contract["interface"].parseLog(log); // eslint-disable-next-line no-empty
+                  } catch (error) {}
+
+                  return _objectSpread(_objectSpread({}, log), parsedLogs);
                 });
                 return _context7.abrupt("break", 25);
 
@@ -766,11 +771,15 @@ var EthClient = /*#__PURE__*/function () {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var log = _step.value;
-          var parsedLog = contractInterface.parseLog(log);
 
-          if (parsedLog && parsedLog.name === eventName) {
-            return parsedLog;
-          }
+          try {
+            var parsedLog = contractInterface.parseLog(log);
+
+            if (parsedLog && parsedLog.name === eventName) {
+              return parsedLog;
+            } // eslint-disable-next-line no-empty
+
+          } catch (error) {}
         }
       } catch (err) {
         _iterator.e(err);
@@ -821,7 +830,7 @@ var EthClient = /*#__PURE__*/function () {
                 throw Error("".concat(methodName, " failed - Log not present in transaction"));
 
               case 10:
-                newContractAddress = eventLog.values[eventValue];
+                newContractAddress = eventLog.args[eventValue];
                 return _context9.abrupt("return", {
                   contractAddress: Utils.FormatAddress(newContractAddress),
                   transactionHash: event.transactionHash

package/dist/src/FrameClient.js

@@ -480,19 +480,22 @@ var FrameClient = /*#__PURE__*/function () {
     }() // List of methods that may require a prompt - these should have an unlimited timeout period
 
   }, {
-    key: "AllowedMethods",
-    value: // List of allowed methods available to frames
+    key: "OverriddenMethods",
+    value: // List of methods that are defined separately in FrameClient
+    function OverriddenMethods() {
+      return ["UploadFiles"];
+    } // List of allowed methods available to frames
     // This should match ElvClient.FrameAvailableMethods()
     // ElvClient will also reject any disallowed methods
 
     /**
      * @returns {Array<string>} - List of ElvClient methods available to a FrameClient
      */
-    function AllowedMethods() {
-      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateSignedToken", "CurrentAccountAddress", "CustomContractAddress", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GetBalance", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LROStatus", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RedeemCode", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "SendFunds", "SetAccessCharge", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetVisibility", "SetPermission", "StartABRMezzanineJobs", "SuspendNTPInstance", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UploadFileData",
-      /*"UploadFiles",*/
-      //Override
-      "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "VerifyContentObject", "Visibility"];
+
+  }, {
+    key: "AllowedMethods",
+    value: function AllowedMethods() {
+      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFabricToken", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateSignedToken", "CurrentAccountAddress", "CustomContractAddress", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GenerateSignedLinkToken", "GetBalance", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LROStatus", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RedeemCode", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "SendFunds", "SetAccessCharge", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetVisibility", "SetPermission", "StartABRMezzanineJobs", "SuspendNTPInstance", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UploadFileData", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "VerifyContentObject", "Visibility"];
     }
   }, {
     key: "AllowedUserProfileMethods",

package/dist/src/HttpClient.js

@@ -36,8 +36,8 @@ var HttpClient = /*#__PURE__*/function () {
     }
   }, {
     key: "BaseURI",
-    value: function BaseURI() {
-      return new URI(this.uris[this.uriIndex]);
+    value: function BaseURI(url) {
+      return new URI(url || this.uris[this.uriIndex]);
     }
   }, {
     key: "RecordWriteToken",
@@ -65,14 +65,15 @@ var HttpClient = /*#__PURE__*/function () {
     key: "Request",
     value: function () {
       var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
-        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$failover, failover, _ref2$forceFailover, forceFailover, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
+        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$failover, failover, _ref2$forceFailover, forceFailover, nodeUrl, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$failover = _ref2.failover, failover = _ref2$failover === void 0 ? true : _ref2$failover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover;
-                baseURI = this.BaseURI(); // If URL contains a write token, it must go to the correct server and can not fail over
+                method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$failover = _ref2.failover, failover = _ref2$failover === void 0 ? true : _ref2$failover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover, nodeUrl = _ref2.nodeUrl;
+                // if nodeUrl passed in, restrict communication to that node only (unless previously recorded write token is found in next step)
+                baseURI = this.BaseURI(nodeUrl); // If URL contains a write token, it must go to the correct server and can not fail over
 
                 writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
                 writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
@@ -127,7 +128,7 @@ var HttpClient = /*#__PURE__*/function () {
                   break;
                 }
 
-                if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
+                if (!(!writeToken && !nodeUrl && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
                   _context.next = 24;
                   break;
                 }

package/dist/src/client/ContentAccess.js

@@ -4392,7 +4392,7 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             }
 
             _context46.next = 17;
-            return this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
 
           case 17:
             this.encryptionConks[objectId] = _context46.sent;
@@ -4414,7 +4414,7 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             _context46.t3 = writeToken;
             _context46.t4 = capKey;
             _context46.next = 30;
-            return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer.signingKey.publicKey);
+            return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer._signingKey().publicKey);
 
           case 30:
             _context46.t5 = _context46.sent;
@@ -4631,7 +4631,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
             }
 
             _context47.next = 29;
-            return this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
 
           case 29:
             this.encryptionConks[objectId] = _context47.sent;

package/dist/src/client/ContentManagement.js

@@ -1219,7 +1219,7 @@ exports.CopyContentObject = /*#__PURE__*/function () {
             }
 
             _context13.next = 20;
-            return this.Crypto.DecryptCap(metadata[userCapKey], this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
 
           case 20:
             userConkKey = _context13.sent;
@@ -1230,7 +1230,7 @@ exports.CopyContentObject = /*#__PURE__*/function () {
             _context13.t3 = writeToken;
             _context13.t4 = userCapKey;
             _context13.next = 29;
-            return this.Crypto.EncryptConk(userConkKey, this.signer.signingKey.publicKey);
+            return this.Crypto.EncryptConk(userConkKey, this.signer._signingKey().publicKey);
 
           case 29:
             _context13.t5 = _context13.sent;
@@ -1357,7 +1357,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
 
           case 7:
             _context14.next = 9;
-            return this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
 
           case 9:
             userConk = _context14.sent;
@@ -1428,6 +1428,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
  * @param {object=} options -
  * meta: New metadata for the object - will be merged into existing metadata if specified
  * type: New type for the object - Object ID, version hash or name of type
+ * nodeUrl: Node URL to use in HTTP call
  *
  * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
@@ -1517,26 +1518,28 @@ exports.EditContentObject = /*#__PURE__*/function () {
             _context15.t1 = _context15.sent;
             _context15.t2 = path;
             _context15.t3 = options;
-            _context15.t4 = {
+            _context15.t4 = options.nodeUrl;
+            _context15.t5 = {
               headers: _context15.t1,
               method: "POST",
               path: _context15.t2,
-              body: _context15.t3
+              body: _context15.t3,
+              nodeUrl: _context15.t4
             };
-            _context15.next = 33;
-            return _context15.t0.Request.call(_context15.t0, _context15.t4);
+            _context15.next = 34;
+            return _context15.t0.Request.call(_context15.t0, _context15.t5);
 
-          case 33:
+          case 34:
             rawEditResponse = _context15.sent;
             actualUrl = new URL(rawEditResponse.url);
             actualUrl.pathname = "";
             actualUrl.search = "";
             actualUrl.hash = "";
             nodeUrl = actualUrl.href;
-            _context15.next = 41;
+            _context15.next = 42;
             return this.utils.ResponseToJson(rawEditResponse);
 
-          case 41:
+          case 42:
             editResponse = _context15.sent;
             // Record the node used in creating this write token
             this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);
@@ -1545,7 +1548,7 @@ exports.EditContentObject = /*#__PURE__*/function () {
             editResponse.nodeUrl = nodeUrl;
             return _context15.abrupt("return", editResponse);
 
-          case 47:
+          case 48:
           case "end":
             return _context15.stop();
         }
@@ -2095,7 +2098,7 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
                       events = _context21.sent;
                       confirmEvent = events.find(function (blockEvents) {
                         return blockEvents.find(function (event) {
-                          return objectHash === (event && event.values && event.values.objectHash);
+                          return objectHash === (event && event.args && event.args.objectHash);
                         });
                       });
 

package/dist/src/client/Contracts.js

@@ -813,7 +813,7 @@ exports.ExtractValueFromEvent = function (_ref25) {
     eventName: eventName,
     eventValue: eventValue
   });
-  return eventLog ? eventLog.values[eventValue] : undefined;
+  return eventLog ? eventLog.args[eventValue] : undefined;
 };
 
 exports.FormatBlockNumbers = /*#__PURE__*/function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.2.45",
+  "version": "4.0.1",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -74,7 +74,7 @@
     "crocks": "^0.12.4",
     "deep-equal": "^1.0.1",
     "ellipsize": "^0.1.0",
-    "ethers": "^4.0.26",
+    "ethers": "^5.7.2",
     "fraction.js": "^4.0.12",
     "hash.js": "^1.1.7",
     "image-type": "^4.1.0",

package/src/AuthorizationClient.js

@@ -204,7 +204,7 @@ class AuthorizationClient {
       addr: Utils.FormatAddress(((this.client.signer && this.client.signer.address) || ""))
     };
 
-    if(!(this.noAuth || noAuth)) {
+    if(update) {
       const { transactionHash } =  await this.MakeAccessRequest({
         libraryId,
         objectId,
@@ -344,8 +344,8 @@ class AuthorizationClient {
 
           // Save request ID if present
           accessRequest.logs.some(log => {
-            if(log.values && (log.values.requestID || log.values.requestNonce)) {
-              this.requestIds[address] = (log.values.requestID || log.values.requestNonce || "").toString().replace(/^0x/, "");
+            if(log.args && (log.args.requestID || log.args.requestNonce)) {
+              this.requestIds[address] = (log.args.requestID || log.args.requestNonce || "").toString().replace(/^0x/, "");
               return true;
             }
           });
@@ -653,12 +653,12 @@ class AuthorizationClient {
       if(!isV3) {
         if(args && args.length > 0) {
           // Inject public key of requester
-          args[1] = this.client.signer.signingKey ? this.client.signer.signingKey.publicKey : "";
+          args[1] = this.client.signer._signingKey ? this.client.signer._signingKey().publicKey : "";
         } else {
           // Set default args
           args = [
             0, // Access level
-            this.client.signer.signingKey ? this.client.signer.signingKey.publicKey : "", // Public key of requester
+            this.client.signer._signingKey ? this.client.signer._signingKey().publicKey : "", // Public key of requester
             publicKey, //cap.public_key,
             [], // Custom values
             [] // Stakeholders
@@ -803,7 +803,7 @@ class AuthorizationClient {
     return await Ethers.utils.joinSignature(
       this.client.signer.signDigest ?
         await this.client.signer.signDigest(message) :
-        await this.client.signer.signingKey.signDigest(message)
+        await this.client.signer._signingKey().signDigest(message)
     );
   }