@eluvio/elv-client-js 4.0.109 → 4.0.110

package/dist/src/ElvClient.js

@@ -5,8 +5,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 if (typeof globalThis.Buffer === "undefined") {
   globalThis.Buffer = require("buffer/").Buffer;
 }
@@ -142,7 +142,7 @@ var ElvClient = /*#__PURE__*/function () {
    * @param {string=} clientIP - IP address to use in determining the region to use
    * @return {Promise<Object>} - Object containing content space ID and fabric and ethereum URLs
    */
-  return _createClass(ElvClient, [{
+  _createClass(ElvClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -275,19 +275,23 @@ var ElvClient = /*#__PURE__*/function () {
                 debug: this.debug,
                 timeout: this.ethereumContractTimeout
               });
-              if (!this.signer) {
-                wallet = this.GenerateWallet();
-                signer = wallet.AddAccountFromMnemonic({
-                  mnemonic: wallet.GenerateMnemonic()
-                });
-                this.SetSigner({
-                  signer: signer,
-                  reset: false
-                });
-                this.SetStaticToken({
-                  token: staticToken
-                });
+              if (this.signer) {
+                _context2.next = 21;
+                break;
               }
+              wallet = this.GenerateWallet();
+              signer = wallet.AddAccountFromMnemonic({
+                mnemonic: wallet.GenerateMnemonic()
+              });
+              this.SetSigner({
+                signer: signer,
+                reset: false
+              });
+              _context2.next = 21;
+              return this.SetStaticToken({
+                token: staticToken
+              });
+            case 21:
               this.authClient = new AuthorizationClient({
                 client: this,
                 contentSpaceId: this.contentSpaceId,
@@ -304,7 +308,7 @@ var ElvClient = /*#__PURE__*/function () {
               // Initialize crypto wasm
               this.Crypto = Crypto;
               this.Crypto.ElvCrypto();
-            case 20:
+            case 25:
             case "end":
               return _context2.stop();
           }
@@ -341,7 +345,7 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "UseRegion",
-    value: (function () {
+    value: function () {
       var _UseRegion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
         var region, _yield$ElvClient$Conf, fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -401,10 +405,9 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<Object>} - An object containing the updated fabric and ethereum URLs in order of preference
      */
-    )
   }, {
     key: "ResetRegion",
-    value: (function () {
+    value: function () {
       var _ResetRegion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
@@ -444,10 +447,9 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<string>} - The node ID reported by the fabric
      */
-    )
   }, {
     key: "NodeId",
-    value: (function () {
+    value: function () {
       var _NodeId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref5) {
         var region, _yield$ElvClient$Conf2, nodeId;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
@@ -481,7 +483,6 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<Object>} - An object containing the lists of fabric, ethereum, auth service, and search urls in use by the client
      */
-    )
   }, {
     key: "Nodes",
     value: function Nodes() {
@@ -553,7 +554,7 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "SpaceNodes",
-    value: (function () {
+    value: function () {
       var _SpaceNodes = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
         var _this = this;
         var _ref7,
@@ -567,12 +568,14 @@ var ElvClient = /*#__PURE__*/function () {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _ref7 = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {}, matchEndpoint = _ref7.matchEndpoint, matchNodeId = _ref7.matchNodeId;
-              this.SetStaticToken();
+              _context6.next = 3;
+              return this.SetStaticToken();
+            case 3:
               if (!matchEndpoint) {
-                _context6.next = 12;
+                _context6.next = 13;
                 break;
               }
-              _context6.next = 5;
+              _context6.next = 6;
               return this.utils.ResponseToJson(this.HttpClient.Request({
                 path: UrlJoin("nodes"),
                 method: "GET",
@@ -580,15 +583,15 @@ var ElvClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(this.staticToken)
                 }
               }));
-            case 5:
+            case 6:
               _yield$this$utils$Res = _context6.sent;
               nodes = _yield$this$utils$Res.nodes;
               if (!(!nodes || !Array.isArray(nodes) || nodes.length === 0)) {
-                _context6.next = 9;
+                _context6.next = 10;
                 break;
               }
               return _context6.abrupt("return", []);
-            case 9:
+            case 10:
               return _context6.abrupt("return", nodes.filter(function (node) {
                 var match = false;
                 if (node.services && node.services.fabric_api && node.services.fabric_api.urls) {
@@ -605,13 +608,15 @@ var ElvClient = /*#__PURE__*/function () {
                 _this.ClearStaticToken();
                 return match;
               }));
-            case 12:
+            case 13:
               if (!matchNodeId) {
-                _context6.next = 19;
+                _context6.next = 21;
                 break;
               }
-              this.SetStaticToken();
               _context6.next = 16;
+              return this.SetStaticToken();
+            case 16:
+              _context6.next = 18;
               return this.utils.ResponseToJson(this.HttpClient.Request({
                 path: UrlJoin("nodes", matchNodeId),
                 method: "GET",
@@ -619,11 +624,11 @@ var ElvClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(this.staticToken)
                 }
               }));
-            case 16:
+            case 18:
               node = _context6.sent;
               this.ClearStaticToken();
               return _context6.abrupt("return", [node]);
-            case 19:
+            case 21:
             case "end":
               return _context6.stop();
           }
@@ -640,7 +645,6 @@ var ElvClient = /*#__PURE__*/function () {
      * @methodGroup Nodes
      * @returns {Object} - The name, ID and configuration URL of the network
      */
-    )
   }, {
     key: "NetworkInfo",
     value: function NetworkInfo() {
@@ -738,7 +742,7 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "SetRemoteSigner",
-    value: (function () {
+    value: function () {
       var _SetRemoteSigner = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref11) {
         var idToken, authToken, tenantId, extraData, signerURIs, unsignedPublicAuth, signer;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -793,10 +797,9 @@ var ElvClient = /*#__PURE__*/function () {
      * @namedParams
      * @param {object} provider - The web3 provider object
      */
-    )
   }, {
     key: "SetSignerFromWeb3Provider",
-    value: (function () {
+    value: function () {
       var _SetSignerFromWeb3Provider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref12) {
         var provider, ethProvider;
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
@@ -839,10 +842,9 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {string} - The address of the user
      */
-    )
   }, {
     key: "CreateAccount",
-    value: (function () {
+    value: function () {
       var _CreateAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref13) {
         var tenantId, fundingToken, _ref13$funds, funds, groupToken, wallet, signer;
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -917,10 +919,9 @@ var ElvClient = /*#__PURE__*/function () {
       PAYLOAD                 85b  json-compressed
       json                    79b  {"adr":"VVf4DQU357tDnZGYQeDrntRJ5rs=","spc":"ispc3ANoVSzNA3P6t7abLR69ho5YPPZU"}
      */
-    )
   }, {
     key: "PersonalSign",
-    value: (function () {
+    value: function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref14) {
         var _this2 = this;
         var message, addEthereumPrefix, Sign;
@@ -929,13 +930,32 @@ var ElvClient = /*#__PURE__*/function () {
             case 0:
               message = _ref14.message, addEthereumPrefix = _ref14.addEthereumPrefix, Sign = _ref14.Sign;
               if (!Sign) {
+                // Same as authClient.Sign, but authClient may not yet be initialized
                 Sign = /*#__PURE__*/function () {
                   var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(message) {
                     return _regeneratorRuntime.wrap(function _callee10$(_context10) {
                       while (1) switch (_context10.prev = _context10.next) {
                         case 0:
-                          return _context10.abrupt("return", _this2.authClient.Sign(message));
-                        case 1:
+                          _context10.t0 = Ethers.utils;
+                          if (!_this2.signer.signDigest) {
+                            _context10.next = 7;
+                            break;
+                          }
+                          _context10.next = 4;
+                          return _this2.signer.signDigest(message);
+                        case 4:
+                          _context10.t1 = _context10.sent;
+                          _context10.next = 10;
+                          break;
+                        case 7:
+                          _context10.next = 9;
+                          return _this2.signer._signingKey().signDigest(message);
+                        case 9:
+                          _context10.t1 = _context10.sent;
+                        case 10:
+                          _context10.t2 = _context10.t1;
+                          return _context10.abrupt("return", _context10.t0.joinSignature.call(_context10.t0, _context10.t2));
+                        case 12:
                         case "end":
                           return _context10.stop();
                       }
@@ -975,10 +995,9 @@ var ElvClient = /*#__PURE__*/function () {
      * @param {function=} Sign - If specified, this function will be used to produce the signature instead of the client's current signer
      * @param {boolean=} addEthereumPrefix=true - If specified, the 'Ethereum Signed Message' prefixed hash format will be performed. Disable this if the provided Sign method already does this (e.g. Metamask)
      */
-    )
   }, {
     key: "CreateFabricToken",
-    value: (function () {
+    value: function () {
       var _CreateFabricToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
         var _ref16,
           _ref16$duration,
@@ -1060,10 +1079,9 @@ var ElvClient = /*#__PURE__*/function () {
      * enabling the user of this token to download encrypted content from the specified object
      * @param {Object=} context - Additional JSON context
      */
-    )
   }, {
     key: "CreateSignedToken",
-    value: (function () {
+    value: function () {
       var _CreateSignedToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref17) {
         var libraryId, objectId, versionHash, policyId, subject, _ref17$grantType, grantType, _ref17$allowDecryptio, allowDecryption, duration, _ref17$context, context, token, cap, compressedToken, signature;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -1176,10 +1194,9 @@ var ElvClient = /*#__PURE__*/function () {
      * @namedParams
      * @param {string} messasge - A JSON object representing the message to sign
      */
-    )
   }, {
     key: "CreateSignedMessageJSON",
-    value: (function () {
+    value: function () {
       var _CreateSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref18) {
         var message, type, msg, signature;
         return _regeneratorRuntime.wrap(function _callee14$(_context14) {
@@ -1216,10 +1233,9 @@ var ElvClient = /*#__PURE__*/function () {
      * @param {string} signedMessage - a signed message as created by CreateSignedMessageJSON
      * @returns {Promise<Object>} - The decoded message, signer address, signature and signature type
      */
-    )
   }, {
     key: "DecodeSignedMessageJSON",
-    value: (function () {
+    value: function () {
       var _DecodeSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref19) {
         var signedMessage, type, msgBytes, signature, msg, obj, prefixedMsgHash, signerAddr;
         return _regeneratorRuntime.wrap(function _callee15$(_context15) {
@@ -1262,7 +1278,6 @@ var ElvClient = /*#__PURE__*/function () {
      * @methodGroup Signers
      * @returns {string} - The address of the current signer
      */
-    )
   }, {
     key: "CurrentAccountAddress",
     value: function CurrentAccountAddress() {
@@ -1278,7 +1293,7 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "SetOauthToken",
-    value: (function () {
+    value: function () {
       var _SetOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref20) {
         var token, wallet, signer;
         return _regeneratorRuntime.wrap(function _callee16$(_context16) {
@@ -1314,10 +1329,9 @@ var ElvClient = /*#__PURE__*/function () {
      * @namedParams
      * @param {string} token - The OAuth ID
      */
-    )
   }, {
     key: "SetSignerFromOauthToken",
-    value: (function () {
+    value: function () {
       var _SetSignerFromOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref21) {
         var token, wallet, client, _yield$client$authCli, urls, path, httpClient, response, privateKey;
         return _regeneratorRuntime.wrap(function _callee17$(_context17) {
@@ -1419,20 +1433,38 @@ var ElvClient = /*#__PURE__*/function () {
      * @namedParams
      * @param {string=} token - The static token to use. If not provided, the default static token will be set.
      */
-    )
   }, {
     key: "SetStaticToken",
-    value: function SetStaticToken() {
-      var _ref22 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        token = _ref22.token;
-      if (!token) {
-        token = this.utils.B64(JSON.stringify({
-          qspace_id: this.contentSpaceId
-        }));
+    value: function () {
+      var _SetStaticToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18() {
+        var _this3 = this;
+        var _ref22,
+          token,
+          _args18 = arguments;
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _ref22 = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {}, token = _ref22.token;
+              if (token) {
+                this.staticToken = token;
+              } else {
+                this.CreateFabricToken({
+                  duration: 7 * 24 * 60 * 60 * 1000
+                }).then(function (token) {
+                  return _this3.staticToken = token;
+                });
+              }
+            case 2:
+            case "end":
+              return _context18.stop();
+          }
+        }, _callee18, this);
+      }));
+      function SetStaticToken() {
+        return _SetStaticToken.apply(this, arguments);
       }
-      this.staticToken = token;
-    }
-
+      return SetStaticToken;
+    }()
     /**
      * Clear the set static token for the client
      */
@@ -1453,29 +1485,30 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "SetPolicyAuthorization",
-    value: (function () {
-      var _SetPolicyAuthorization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref23) {
+    value: function () {
+      var _SetPolicyAuthorization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref23) {
         var objectId;
-        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               objectId = _ref23.objectId;
-              _context18.t0 = this;
-              _context18.next = 4;
+              _context19.t0 = this;
+              _context19.next = 4;
               return this.GenerateStateChannelToken({
                 objectId: objectId
               });
             case 4:
-              _context18.t1 = _context18.sent;
-              _context18.t2 = {
-                token: _context18.t1
+              _context19.t1 = _context19.sent;
+              _context19.t2 = {
+                token: _context19.t1
               };
-              _context18.t0.SetStaticToken.call(_context18.t0, _context18.t2);
-            case 7:
+              _context19.next = 8;
+              return _context19.t0.SetStaticToken.call(_context19.t0, _context19.t2);
+            case 8:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, this);
+        }, _callee19, this);
       }));
       function SetPolicyAuthorization(_x13) {
         return _SetPolicyAuthorization.apply(this, arguments);
@@ -1488,25 +1521,24 @@ var ElvClient = /*#__PURE__*/function () {
      * @param {string} string - The string to sign
      * @return {Promise<string>} - The signed string
      */
-    )
   }, {
     key: "Sign",
-    value: (function () {
-      var _Sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(string) {
+    value: function () {
+      var _Sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(string) {
         var signature;
-        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _context19.next = 2;
+              _context20.next = 2;
               return this.authClient.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(string)));
             case 2:
-              signature = _context19.sent;
-              return _context19.abrupt("return", this.utils.FormatSignature(signature));
+              signature = _context20.sent;
+              return _context20.abrupt("return", this.utils.FormatSignature(signature));
             case 4:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
       function Sign(_x14) {
         return _Sign.apply(this, arguments);
@@ -1522,32 +1554,31 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<string>} - The encrypted message
      */
-    )
   }, {
     key: "EncryptECIES",
-    value: (function () {
-      var _EncryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref24) {
+    value: function () {
+      var _EncryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref24) {
         var message, publicKey;
-        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
               message = _ref24.message, publicKey = _ref24.publicKey;
               if (this.signer) {
-                _context20.next = 3;
+                _context21.next = 3;
                 break;
               }
               throw "Signer not set";
             case 3:
               ValidatePresence("message", message);
-              _context20.next = 6;
+              _context21.next = 6;
               return this.Crypto.EncryptConk(message, publicKey || this.signer._signingKey().publicKey);
             case 6:
-              return _context20.abrupt("return", _context20.sent);
+              return _context21.abrupt("return", _context21.sent);
             case 7:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
       function EncryptECIES(_x15) {
         return _EncryptECIES.apply(this, arguments);
@@ -1562,32 +1593,31 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<string | Object>} - The decrypted string or object
      */
-    )
   }, {
     key: "DecryptECIES",
-    value: (function () {
-      var _DecryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref25) {
+    value: function () {
+      var _DecryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref25) {
         var message;
-        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               message = _ref25.message;
               if (this.signer) {
-                _context21.next = 3;
+                _context22.next = 3;
                 break;
               }
               throw "Signer not set";
             case 3:
               ValidatePresence("message", message);
-              _context21.next = 6;
+              _context22.next = 6;
               return this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
             case 6:
-              return _context21.abrupt("return", _context21.sent);
+              return _context22.abrupt("return", _context22.sent);
             case 7:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
       function DecryptECIES(_x16) {
         return _DecryptECIES.apply(this, arguments);
@@ -1605,42 +1635,41 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<*>} - Response in the specified format
      */
-    )
   }, {
     key: "Request",
-    value: (function () {
-      var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref26) {
+    value: function () {
+      var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref26) {
         var url, _ref26$format, format, _ref26$method, method, _ref26$headers, headers, body;
-        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
               url = _ref26.url, _ref26$format = _ref26.format, format = _ref26$format === void 0 ? "json" : _ref26$format, _ref26$method = _ref26.method, method = _ref26$method === void 0 ? "GET" : _ref26$method, _ref26$headers = _ref26.headers, headers = _ref26$headers === void 0 ? {} : _ref26$headers, body = _ref26.body;
-              return _context22.abrupt("return", this.utils.ResponseToFormat(format, HttpClient.Fetch(url, {
+              return _context23.abrupt("return", this.utils.ResponseToFormat(format, HttpClient.Fetch(url, {
                 method: method,
                 headers: headers,
                 body: body
               })));
             case 2:
             case "end":
-              return _context22.stop();
+              return _context23.stop();
           }
-        }, _callee22, this);
+        }, _callee23, this);
       }));
       function Request(_x17) {
         return _Request.apply(this, arguments);
       }
       return Request;
-    }())
+    }()
   }, {
     key: "MakeAuthServiceRequest",
     value: function () {
-      var _MakeAuthServiceRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref27) {
+      var _MakeAuthServiceRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref27) {
         var kmsId, objectId, versionHash, _ref27$method, method, path, bodyType, _ref27$body, body, _ref27$queryParams, queryParams, headers;
-        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
               kmsId = _ref27.kmsId, objectId = _ref27.objectId, versionHash = _ref27.versionHash, _ref27$method = _ref27.method, method = _ref27$method === void 0 ? "GET" : _ref27$method, path = _ref27.path, bodyType = _ref27.bodyType, _ref27$body = _ref27.body, body = _ref27$body === void 0 ? {} : _ref27$body, _ref27$queryParams = _ref27.queryParams, queryParams = _ref27$queryParams === void 0 ? {} : _ref27$queryParams, headers = _ref27.headers;
-              return _context23.abrupt("return", this.authClient.MakeAuthServiceRequest({
+              return _context24.abrupt("return", this.authClient.MakeAuthServiceRequest({
                 kmsId: kmsId,
                 objectId: objectId,
                 versionHash: versionHash,
@@ -1653,9 +1682,9 @@ var ElvClient = /*#__PURE__*/function () {
               }));
             case 2:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
       function MakeAuthServiceRequest(_x18) {
         return _MakeAuthServiceRequest.apply(this, arguments);
@@ -1667,10 +1696,10 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "FrameAllowedMethods",
     value: function FrameAllowedMethods() {
-      var _this3 = this;
+      var _this4 = this;
       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 _this3[method] === "function" && !forbiddenMethods.includes(method);
+        return typeof _this4[method] === "function" && !forbiddenMethods.includes(method);
       });
     }
 
@@ -1678,21 +1707,21 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "CallFromFrameMessage",
     value: function () {
-      var _CallFromFrameMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(message, Respond) {
-        var _this4 = this;
+      var _CallFromFrameMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(message, Respond) {
+        var _this5 = this;
         var callback, method, methodResults, responseError;
-        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
               if (!(message.type !== "ElvFrameRequest")) {
-                _context24.next = 2;
+                _context25.next = 2;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context25.abrupt("return");
             case 2:
               if (message.callbackId) {
                 callback = function callback(result) {
-                  Respond(_this4.utils.MakeClonable({
+                  Respond(_this5.utils.MakeClonable({
                     type: "ElvFrameResponse",
                     requestId: message.callbackId,
                     response: result
@@ -1700,75 +1729,75 @@ var ElvClient = /*#__PURE__*/function () {
                 };
                 message.args.callback = callback;
               }
-              _context24.prev = 3;
+              _context25.prev = 3;
               method = message.calledMethod;
               if (!(message.module === "walletClient")) {
-                _context24.next = 15;
+                _context25.next = 15;
                 break;
               }
               if (this.walletClient) {
-                _context24.next = 8;
+                _context25.next = 8;
                 break;
               }
               throw Error("Wallet client not set");
             case 8:
               if (!this.walletClient.ForbiddenMethods().includes(method)) {
-                _context24.next = 10;
+                _context25.next = 10;
                 break;
               }
               throw Error("Invalid user profile method: " + method);
             case 10:
-              _context24.next = 12;
+              _context25.next = 12;
               return this.walletClient[method](message.args);
             case 12:
-              methodResults = _context24.sent;
-              _context24.next = 28;
+              methodResults = _context25.sent;
+              _context25.next = 28;
               break;
             case 15:
               if (!(message.module === "userProfileClient")) {
-                _context24.next = 23;
+                _context25.next = 23;
                 break;
               }
               if (this.userProfileClient.FrameAllowedMethods().includes(method)) {
-                _context24.next = 18;
+                _context25.next = 18;
                 break;
               }
               throw Error("Invalid user profile method: " + method);
             case 18:
-              _context24.next = 20;
+              _context25.next = 20;
               return this.userProfileClient[method](message.args);
             case 20:
-              methodResults = _context24.sent;
-              _context24.next = 28;
+              methodResults = _context25.sent;
+              _context25.next = 28;
               break;
             case 23:
               if (this.FrameAllowedMethods().includes(method)) {
-                _context24.next = 25;
+                _context25.next = 25;
                 break;
               }
               throw Error("Invalid method: " + method);
             case 25:
-              _context24.next = 27;
+              _context25.next = 27;
               return this[method](message.args);
             case 27:
-              methodResults = _context24.sent;
+              methodResults = _context25.sent;
             case 28:
               Respond(this.utils.MakeClonable({
                 type: "ElvFrameResponse",
                 requestId: message.requestId,
                 response: methodResults
               }));
-              _context24.next = 37;
+              _context25.next = 37;
               break;
             case 31:
-              _context24.prev = 31;
-              _context24.t0 = _context24["catch"](3);
+              _context25.prev = 31;
+              _context25.t0 = _context25["catch"](3);
               // eslint-disable-next-line no-console
-              this.Log("Frame Message Error:\n        Method: ".concat(message.calledMethod, "\n        Arguments: ").concat(JSON.stringify(message.args, null, 2), "\n        Error: ").concat(_typeof(_context24.t0) === "object" ? JSON.stringify(_context24.t0, null, 2) : _context24.t0), true);
+              this.Log("Frame Message Error:\n        Method: ".concat(message.calledMethod, "\n        Arguments: ").concat(JSON.stringify(message.args, null, 2), "\n        Error: ").concat(_typeof(_context25.t0) === "object" ? JSON.stringify(_context25.t0, null, 2) : _context25.t0), true);
 
               // eslint-disable-next-line no-console
-              console.error(_context24.t0);
-              responseError = _context24.t0 instanceof Error ? _context24.t0.message : _context24.t0;
+              console.error(_context25.t0);
+              responseError = _context25.t0 instanceof Error ? _context25.t0.message : _context25.t0;
               Respond(this.utils.MakeClonable({
                 type: "ElvFrameResponse",
                 requestId: message.requestId,
@@ -1776,9 +1805,9 @@ var ElvClient = /*#__PURE__*/function () {
               }));
             case 37:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24, this, [[3, 31]]);
+        }, _callee25, this, [[3, 31]]);
       }));
       function CallFromFrameMessage(_x19, _x20) {
         return _CallFromFrameMessage.apply(this, arguments);
@@ -1787,14 +1816,14 @@ var ElvClient = /*#__PURE__*/function () {
     }()
   }], [{
     key: "Configuration",
-    value: (function () {
-      var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref28) {
+    value: function () {
+      var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref28) {
         var configUrl, _ref28$kmsUrls, kmsUrls, region, clientIP, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs, fabricVersion;
-        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               configUrl = _ref28.configUrl, _ref28$kmsUrls = _ref28.kmsUrls, kmsUrls = _ref28$kmsUrls === void 0 ? [] : _ref28$kmsUrls, region = _ref28.region, clientIP = _ref28.clientIP;
-              _context25.prev = 1;
+              _context26.prev = 1;
               uri = new URI(configUrl);
               uri.pathname("/config");
               if (region) {
@@ -1803,10 +1832,10 @@ var ElvClient = /*#__PURE__*/function () {
               if (clientIP) {
                 uri.addSearch("client_ip", clientIP);
               }
-              _context25.next = 8;
+              _context26.next = 8;
               return Utils.ResponseToJson(HttpClient.Fetch(uri.toString()));
             case 8:
-              fabricInfo = _context25.sent;
+              fabricInfo = _context26.sent;
               // If any HTTPS urls present, throw away HTTP urls so only HTTPS will be used
               filterHTTPS = function filterHTTPS(uri) {
                 return uri.toLowerCase().startsWith("https");
@@ -1829,7 +1858,7 @@ var ElvClient = /*#__PURE__*/function () {
               }
               searchURIs = fabricInfo.network.services.search || [];
               fabricVersion = Math.max.apply(Math, _toConsumableArray(fabricInfo.network.api_versions || [2]));
-              return _context25.abrupt("return", {
+              return _context26.abrupt("return", {
                 nodeId: fabricInfo.node_id,
                 contentSpaceId: fabricInfo.qspace.id,
                 networkId: (fabricInfo.qspace.ethereum || {}).network_id,
@@ -1843,18 +1872,18 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricVersion: fabricVersion
               });
             case 23:
-              _context25.prev = 23;
-              _context25.t0 = _context25["catch"](1);
+              _context26.prev = 23;
+              _context26.t0 = _context26["catch"](1);
               // eslint-disable-next-line no-console
               console.error("Error retrieving fabric configuration:");
               // eslint-disable-next-line no-console
-              console.error(_context25.t0);
-              throw _context25.t0;
+              console.error(_context26.t0);
+              throw _context26.t0;
             case 28:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, null, [[1, 23]]);
+        }, _callee26, null, [[1, 23]]);
       }));
       function Configuration(_x21) {
         return _Configuration.apply(this, arguments);
@@ -1868,7 +1897,6 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Object} - An object using network names as keys and configuration URLs as values.
      */
-    )
   }, {
     key: "Networks",
     value: function Networks() {
@@ -1893,21 +1921,21 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "FromNetworkName",
-    value: (function () {
-      var _FromNetworkName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref29) {
+    value: function () {
+      var _FromNetworkName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref29) {
         var networkName, region, clientIP, trustAuthorityId, staticToken, _ref29$ethereumContra, ethereumContractTimeout, _ref29$noCache, noCache, _ref29$noAuth, noAuth, assumeV3, configUrl;
-        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               networkName = _ref29.networkName, region = _ref29.region, clientIP = _ref29.clientIP, trustAuthorityId = _ref29.trustAuthorityId, staticToken = _ref29.staticToken, _ref29$ethereumContra = _ref29.ethereumContractTimeout, ethereumContractTimeout = _ref29$ethereumContra === void 0 ? 10 : _ref29$ethereumContra, _ref29$noCache = _ref29.noCache, noCache = _ref29$noCache === void 0 ? false : _ref29$noCache, _ref29$noAuth = _ref29.noAuth, noAuth = _ref29$noAuth === void 0 ? false : _ref29$noAuth, assumeV3 = _ref29.assumeV3;
               configUrl = networks[networkName];
               if (configUrl) {
-                _context26.next = 4;
+                _context27.next = 4;
                 break;
               }
               throw Error("Invalid network name: " + networkName);
             case 4:
-              _context26.next = 6;
+              _context27.next = 6;
               return this.FromConfigurationUrl({
                 configUrl: configUrl,
                 region: region,
@@ -1920,12 +1948,12 @@ var ElvClient = /*#__PURE__*/function () {
                 assumeV3: assumeV3
               });
             case 6:
-              return _context26.abrupt("return", _context26.sent);
+              return _context27.abrupt("return", _context27.sent);
             case 7:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
       function FromNetworkName(_x22) {
         return _FromNetworkName.apply(this, arguments);
@@ -1948,24 +1976,23 @@ var ElvClient = /*#__PURE__*/function () {
      *
      * @return {Promise<ElvClient>} - New ElvClient connected to the specified content fabric and blockchain
      */
-    )
   }, {
     key: "FromConfigurationUrl",
-    value: (function () {
-      var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref30) {
+    value: function () {
+      var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee28(_ref30) {
         var configUrl, region, clientIP, trustAuthorityId, staticToken, _ref30$ethereumContra, ethereumContractTimeout, _ref30$noCache, noCache, _ref30$noAuth, noAuth, _ref30$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs, fabricVersion, client;
-        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               configUrl = _ref30.configUrl, region = _ref30.region, clientIP = _ref30.clientIP, trustAuthorityId = _ref30.trustAuthorityId, staticToken = _ref30.staticToken, _ref30$ethereumContra = _ref30.ethereumContractTimeout, ethereumContractTimeout = _ref30$ethereumContra === void 0 ? 10 : _ref30$ethereumContra, _ref30$noCache = _ref30.noCache, noCache = _ref30$noCache === void 0 ? false : _ref30$noCache, _ref30$noAuth = _ref30.noAuth, noAuth = _ref30$noAuth === void 0 ? false : _ref30$noAuth, _ref30$assumeV = _ref30.assumeV3, assumeV3 = _ref30$assumeV === void 0 ? false : _ref30$assumeV;
-              _context27.next = 3;
+              _context28.next = 3;
               return ElvClient.Configuration({
                 configUrl: configUrl,
                 clientIP: clientIP,
                 region: region
               });
             case 3:
-              _yield$ElvClient$Conf3 = _context27.sent;
+              _yield$ElvClient$Conf3 = _context28.sent;
               contentSpaceId = _yield$ElvClient$Conf3.contentSpaceId;
               networkId = _yield$ElvClient$Conf3.networkId;
               networkName = _yield$ElvClient$Conf3.networkName;
@@ -1995,19 +2022,20 @@ var ElvClient = /*#__PURE__*/function () {
               client.configUrl = configUrl;
               client.region = region;
               client.clientIP = clientIP;
-              return _context27.abrupt("return", client);
+              return _context28.abrupt("return", client);
             case 18:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee27);
+        }, _callee28);
       }));
       function FromConfigurationUrl(_x23) {
         return _FromConfigurationUrl.apply(this, arguments);
       }
       return FromConfigurationUrl;
-    }())
+    }()
   }]);
+  return ElvClient;
 }();
 Object.assign(ElvClient.prototype, require("./client/AccessGroups"));
 Object.assign(ElvClient.prototype, require("./client/ContentAccess"));