@eluvio/elv-client-js 4.0.142 → 4.0.144

package/dist/src/ElvClient.js

@@ -24,7 +24,8 @@ var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Pako = require("pako");
 var _require2 = require("./Validation"),
-  ValidatePresence = _require2.ValidatePresence;
+  ValidatePresence = _require2.ValidatePresence,
+  ValidateWriteToken = _require2.ValidateWriteToken;
 var UrlJoin = require("url-join");
 var networks = {
   "main": "https://main.net955305.contentfabric.io",
@@ -125,6 +126,10 @@ var ElvClient = /*#__PURE__*/function () {
     }
     this.service = service;
     this.debug = false;
+
+    // Use a default key when client is unauthed. This key should not be used for any other purpose.
+    // Break it up to avoid automatic private key detection warnings
+    this.defaultKey = "0x" + "5d52d808f10f64f0dffff8c73edff" + "3f7b467411216e2350940f869e6ac5a7db6";
     this.InitializeClients({
       staticToken: staticToken
     });
@@ -277,9 +282,10 @@ var ElvClient = /*#__PURE__*/function () {
               });
               if (!this.signer) {
                 wallet = this.GenerateWallet();
-                signer = wallet.AddAccountFromMnemonic({
-                  mnemonic: wallet.GenerateMnemonic()
+                signer = wallet.AddAccount({
+                  privateKey: this.defaultKey
                 });
+                signer.anonymous = true;
                 this.SetSigner({
                   signer: signer,
                   reset: false
@@ -545,6 +551,7 @@ var ElvClient = /*#__PURE__*/function () {
      * @namedParams
      * @param {string=} matchEndpoint - Return node(s) matching the specified endpoint
      * @param {string=} matchNodeId - Return node(s) matching the specified node ID
+     * @param {string=} matchWriteToken - Return node(s) matching the specified write token
      *
      * @return {Promise<Array<Object>>} - A list of nodes in the space matching the parameters
      */
@@ -556,14 +563,17 @@ var ElvClient = /*#__PURE__*/function () {
         var _ref7,
           matchEndpoint,
           matchNodeId,
+          matchWriteToken,
           nodes,
           _yield$this$utils$Res,
           node,
+          _yield$this$utils$Res2,
+          _nodes,
           _args6 = arguments;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _ref7 = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {}, matchEndpoint = _ref7.matchEndpoint, matchNodeId = _ref7.matchNodeId;
+              _ref7 = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {}, matchEndpoint = _ref7.matchEndpoint, matchNodeId = _ref7.matchNodeId, matchWriteToken = _ref7.matchWriteToken;
               this.SetStaticToken();
               if (!matchEndpoint) {
                 _context6.next = 12;
@@ -604,7 +614,7 @@ var ElvClient = /*#__PURE__*/function () {
               }));
             case 12:
               if (!matchNodeId) {
-                _context6.next = 19;
+                _context6.next = 21;
                 break;
               }
               this.SetStaticToken();
@@ -620,7 +630,29 @@ var ElvClient = /*#__PURE__*/function () {
               node = _context6.sent;
               this.ClearStaticToken();
               return _context6.abrupt("return", [node]);
-            case 19:
+            case 21:
+              if (!matchWriteToken) {
+                _context6.next = 29;
+                break;
+              }
+              this.SetStaticToken();
+              _context6.next = 25;
+              return this.utils.ResponseToJson(this.HttpClient.Request({
+                path: UrlJoin("nodes"),
+                method: "GET",
+                headers: {
+                  Authorization: "Bearer ".concat(this.staticToken)
+                },
+                queryParams: {
+                  token: matchWriteToken
+                }
+              }));
+            case 25:
+              _yield$this$utils$Res2 = _context6.sent;
+              _nodes = _yield$this$utils$Res2.nodes;
+              this.ClearStaticToken();
+              return _context6.abrupt("return", _nodes);
+            case 29:
             case "end":
               return _context6.stop();
           }
@@ -646,18 +678,75 @@ var ElvClient = /*#__PURE__*/function () {
         configUrl: this.configUrl
       };
     }
+
+    /**
+     * Return node url for a given write token via a network call
+     *
+     * @methodGroup Nodes
+     * @namedParams
+     * @param {string} writeToken - The write token to match to a node
+     *
+     * @returns {Promise<string>} - The node url for a write token
+     */
+  }, {
+    key: "WriteTokenNodeUrlNetwork",
+    value: function () {
+      var _WriteTokenNodeUrlNetwork = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref8) {
+        var writeToken, nodes, nodeUrl;
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              writeToken = _ref8.writeToken;
+              ValidateWriteToken(writeToken);
+              _context7.next = 4;
+              return this.SpaceNodes({
+                matchWriteToken: writeToken
+              });
+            case 4:
+              nodes = _context7.sent;
+              nodeUrl = nodes && nodes[0] && nodes[0].services && nodes[0].services.fabric_api && nodes[0].services.fabric_api.urls && nodes[0].services.fabric_api.urls[0];
+              if (nodeUrl) {
+                _context7.next = 9;
+                break;
+              }
+              // eslint-disable-next-line no-console
+              console.error("No node url found for write token: ".concat(writeToken));
+              return _context7.abrupt("return", "");
+            case 9:
+              return _context7.abrupt("return", nodeUrl ? nodeUrl.toString() : undefined);
+            case 10:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7, this);
+      }));
+      function WriteTokenNodeUrlNetwork(_x3) {
+        return _WriteTokenNodeUrlNetwork.apply(this, arguments);
+      }
+      return WriteTokenNodeUrlNetwork;
+    }()
+    /**
+     * Return node url for a given write token via local lookup
+     *
+     * @methodGroup Nodes
+     * @namedParams
+     * @param {string} writeToken - The write token to match to a node
+     *
+     * @returns {string} - The node url for a write token
+     */
   }, {
-    key: "WriteTokenNodeUrl",
-    value: function WriteTokenNodeUrl(_ref8) {
-      var writeToken = _ref8.writeToken;
+    key: "WriteTokenNodeUrlLocal",
+    value: function WriteTokenNodeUrlLocal(_ref9) {
+      var writeToken = _ref9.writeToken;
+      ValidateWriteToken(writeToken);
       var nodeUrl = this.HttpClient.draftURIs[writeToken];
       return nodeUrl ? nodeUrl.toString() : undefined;
     }
   }, {
     key: "RecordWriteToken",
-    value: function RecordWriteToken(_ref9) {
-      var writeToken = _ref9.writeToken,
-        fabricNodeUrl = _ref9.fabricNodeUrl;
+    value: function RecordWriteToken(_ref10) {
+      var writeToken = _ref10.writeToken,
+        fabricNodeUrl = _ref10.fabricNodeUrl;
       this.HttpClient.RecordWriteToken(writeToken, fabricNodeUrl);
     }
 
@@ -707,18 +796,14 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "SetSigner",
-    value: function SetSigner(_ref10) {
-      var _this2 = this;
-      var signer = _ref10.signer,
-        _ref10$reset = _ref10.reset,
-        reset = _ref10$reset === void 0 ? true : _ref10$reset;
+    value: function SetSigner(_ref11) {
+      var signer = _ref11.signer,
+        _ref11$reset = _ref11.reset,
+        reset = _ref11$reset === void 0 ? true : _ref11$reset;
       this.staticToken = undefined;
       signer.connect(this.ethClient.Provider());
       signer.provider.pollingInterval = 500;
       this.signer = signer;
-      this.CreateFabricToken({}).then(function (token) {
-        return _this2.signedToken = token;
-      });
       if (reset) {
         this.InitializeClients();
       }
@@ -739,34 +824,34 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetRemoteSigner",
     value: function () {
-      var _SetRemoteSigner = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref11) {
+      var _SetRemoteSigner = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref12) {
         var idToken, authToken, tenantId, extraData, signerURIs, unsignedPublicAuth, signer;
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              idToken = _ref11.idToken, authToken = _ref11.authToken, tenantId = _ref11.tenantId, extraData = _ref11.extraData, signerURIs = _ref11.signerURIs, unsignedPublicAuth = _ref11.unsignedPublicAuth;
-              _context7.t0 = RemoteSigner;
-              _context7.t1 = signerURIs || this.authServiceURIs;
-              _context7.t2 = idToken;
-              _context7.t3 = authToken;
-              _context7.t4 = tenantId;
-              _context7.next = 8;
+              idToken = _ref12.idToken, authToken = _ref12.authToken, tenantId = _ref12.tenantId, extraData = _ref12.extraData, signerURIs = _ref12.signerURIs, unsignedPublicAuth = _ref12.unsignedPublicAuth;
+              _context8.t0 = RemoteSigner;
+              _context8.t1 = signerURIs || this.authServiceURIs;
+              _context8.t2 = idToken;
+              _context8.t3 = authToken;
+              _context8.t4 = tenantId;
+              _context8.next = 8;
               return this.ethClient.Provider();
             case 8:
-              _context7.t5 = _context7.sent;
-              _context7.t6 = extraData;
-              _context7.t7 = unsignedPublicAuth;
-              _context7.t8 = {
-                signerURIs: _context7.t1,
-                idToken: _context7.t2,
-                authToken: _context7.t3,
-                tenantId: _context7.t4,
-                provider: _context7.t5,
-                extraData: _context7.t6,
-                unsignedPublicAuth: _context7.t7
+              _context8.t5 = _context8.sent;
+              _context8.t6 = extraData;
+              _context8.t7 = unsignedPublicAuth;
+              _context8.t8 = {
+                signerURIs: _context8.t1,
+                idToken: _context8.t2,
+                authToken: _context8.t3,
+                tenantId: _context8.t4,
+                provider: _context8.t5,
+                extraData: _context8.t6,
+                unsignedPublicAuth: _context8.t7
               };
-              signer = new _context7.t0(_context7.t8);
-              _context7.next = 15;
+              signer = new _context8.t0(_context8.t8);
+              _context8.next = 15;
               return signer.Initialize();
             case 15:
               this.SetSigner({
@@ -774,11 +859,11 @@ var ElvClient = /*#__PURE__*/function () {
               });
             case 16:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
-      function SetRemoteSigner(_x3) {
+      function SetRemoteSigner(_x4) {
         return _SetRemoteSigner.apply(this, arguments);
       }
       return SetRemoteSigner;
@@ -796,29 +881,29 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetSignerFromWeb3Provider",
     value: function () {
-      var _SetSignerFromWeb3Provider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref12) {
+      var _SetSignerFromWeb3Provider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref13) {
         var provider, ethProvider;
-        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              provider = _ref12.provider;
+              provider = _ref13.provider;
               this.staticToken = undefined;
               ethProvider = new Ethers.providers.Web3Provider(provider);
               ethProvider.pollingInterval = 250;
               this.signer = ethProvider.getSigner();
-              _context8.next = 7;
+              _context9.next = 7;
               return this.signer.getAddress();
             case 7:
-              this.signer.address = _context8.sent;
-              _context8.next = 10;
+              this.signer.address = _context9.sent;
+              _context9.next = 10;
               return this.InitializeClients();
             case 10:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function SetSignerFromWeb3Provider(_x4) {
+      function SetSignerFromWeb3Provider(_x5) {
         return _SetSignerFromWeb3Provider.apply(this, arguments);
       }
       return SetSignerFromWeb3Provider;
@@ -841,12 +926,12 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "CreateAccount",
     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) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _CreateAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref14) {
+        var tenantId, fundingToken, _ref14$funds, funds, groupToken, wallet, signer;
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              tenantId = _ref13.tenantId, fundingToken = _ref13.fundingToken, _ref13$funds = _ref13.funds, funds = _ref13$funds === void 0 ? 0.5 : _ref13$funds, groupToken = _ref13.groupToken;
+              tenantId = _ref14.tenantId, fundingToken = _ref14.fundingToken, _ref14$funds = _ref14.funds, funds = _ref14$funds === void 0 ? 0.5 : _ref14$funds, groupToken = _ref14.groupToken;
               if (!this.signer) {
                 wallet = this.GenerateWallet();
                 signer = wallet.AddAccountFromMnemonic({
@@ -856,7 +941,7 @@ var ElvClient = /*#__PURE__*/function () {
                   signer: signer
                 });
               }
-              _context9.next = 4;
+              _context10.next = 4;
               return this.authClient.MakeKMSRequest({
                 method: "POST",
                 path: "/ks/otp/fnd/".concat(tenantId),
@@ -869,20 +954,20 @@ var ElvClient = /*#__PURE__*/function () {
                 }
               });
             case 4:
-              _context9.next = 6;
+              _context10.next = 6;
               return this.userProfileClient.CreateWallet();
             case 6:
-              _context9.next = 8;
+              _context10.next = 8;
               return this.userProfileClient.ReplaceUserMetadata({
                 metadataSubtree: "tenantContractId",
                 metadata: tenantId
               });
             case 8:
               if (!groupToken) {
-                _context9.next = 11;
+                _context10.next = 11;
                 break;
               }
-              _context9.next = 11;
+              _context10.next = 11;
               return this.authClient.MakeKMSRequest({
                 method: "POST",
                 path: "/ks/otp/grp/".concat(tenantId),
@@ -894,14 +979,14 @@ var ElvClient = /*#__PURE__*/function () {
                 }
               });
             case 11:
-              return _context9.abrupt("return", this.utils.FormatAddress(this.signer.address));
+              return _context10.abrupt("return", this.utils.FormatAddress(this.signer.address));
             case 12:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
-      function CreateAccount(_x5) {
+      function CreateAccount(_x6) {
         return _CreateAccount.apply(this, arguments);
       }
       return CreateAccount;
@@ -918,64 +1003,64 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "PersonalSign",
     value: function () {
-      var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref14) {
-        var _this3 = this;
+      var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(_ref15) {
+        var _this2 = this;
         var message, addEthereumPrefix, Sign;
-        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              message = _ref14.message, addEthereumPrefix = _ref14.addEthereumPrefix, Sign = _ref14.Sign;
+              message = _ref15.message, addEthereumPrefix = _ref15.addEthereumPrefix, Sign = _ref15.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) {
+                  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(message) {
+                    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+                      while (1) switch (_context11.prev = _context11.next) {
                         case 0:
-                          _context10.t0 = Ethers.utils;
-                          if (!_this3.signer.signDigest) {
-                            _context10.next = 7;
+                          _context11.t0 = Ethers.utils;
+                          if (!_this2.signer.signDigest) {
+                            _context11.next = 7;
                             break;
                           }
-                          _context10.next = 4;
-                          return _this3.signer.signDigest(message);
+                          _context11.next = 4;
+                          return _this2.signer.signDigest(message);
                         case 4:
-                          _context10.t1 = _context10.sent;
-                          _context10.next = 10;
+                          _context11.t1 = _context11.sent;
+                          _context11.next = 10;
                           break;
                         case 7:
-                          _context10.next = 9;
-                          return _this3.signer._signingKey().signDigest(message);
+                          _context11.next = 9;
+                          return _this2.signer._signingKey().signDigest(message);
                         case 9:
-                          _context10.t1 = _context10.sent;
+                          _context11.t1 = _context11.sent;
                         case 10:
-                          _context10.t2 = _context10.t1;
-                          return _context10.abrupt("return", _context10.t0.joinSignature.call(_context10.t0, _context10.t2));
+                          _context11.t2 = _context11.t1;
+                          return _context11.abrupt("return", _context11.t0.joinSignature.call(_context11.t0, _context11.t2));
                         case 12:
                         case "end":
-                          return _context10.stop();
+                          return _context11.stop();
                       }
-                    }, _callee10);
+                    }, _callee11);
                   }));
-                  return function Sign(_x7) {
-                    return _ref15.apply(this, arguments);
+                  return function Sign(_x8) {
+                    return _ref16.apply(this, arguments);
                   };
                 }();
               }
               if (addEthereumPrefix) {
                 message = Ethers.utils.keccak256(Buffer.from("\x19Ethereum Signed Message:\n".concat(message.length).concat(message), "utf-8"));
               }
-              _context11.next = 5;
+              _context12.next = 5;
               return Sign(message);
             case 5:
-              return _context11.abrupt("return", _context11.sent);
+              return _context12.abrupt("return", _context12.sent);
             case 6:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11);
+        }, _callee12);
       }));
-      function PersonalSign(_x6) {
+      function PersonalSign(_x7) {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
@@ -994,65 +1079,65 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "CreateFabricToken",
     value: function () {
-      var _CreateFabricToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
-        var _ref16,
-          _ref16$duration,
+      var _CreateFabricToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+        var _ref17,
+          _ref17$duration,
           duration,
-          _ref16$spec,
+          _ref17$spec,
           spec,
           address,
           Sign,
-          _ref16$addEthereumPre,
+          _ref17$addEthereumPre,
           addEthereumPrefix,
-          _ref16$context,
+          _ref17$context,
           context,
           token,
           message,
           signature,
           compressedToken,
-          _args12 = arguments;
-        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _ref16 = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {}, _ref16$duration = _ref16.duration, duration = _ref16$duration === void 0 ? 24 * 60 * 60 * 1000 : _ref16$duration, _ref16$spec = _ref16.spec, spec = _ref16$spec === void 0 ? {} : _ref16$spec, address = _ref16.address, Sign = _ref16.Sign, _ref16$addEthereumPre = _ref16.addEthereumPrefix, addEthereumPrefix = _ref16$addEthereumPre === void 0 ? true : _ref16$addEthereumPre, _ref16$context = _ref16.context, context = _ref16$context === void 0 ? {} : _ref16$context;
+              _ref17 = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {}, _ref17$duration = _ref17.duration, duration = _ref17$duration === void 0 ? 24 * 60 * 60 * 1000 : _ref17$duration, _ref17$spec = _ref17.spec, spec = _ref17$spec === void 0 ? {} : _ref17$spec, address = _ref17.address, Sign = _ref17.Sign, _ref17$addEthereumPre = _ref17.addEthereumPrefix, addEthereumPrefix = _ref17$addEthereumPre === void 0 ? true : _ref17$addEthereumPre, _ref17$context = _ref17.context, context = _ref17$context === void 0 ? {} : _ref17$context;
               address = address || this.CurrentAccountAddress();
-              _context12.t0 = _objectSpread;
-              _context12.t1 = _objectSpread({}, spec);
-              _context12.t2 = {};
-              _context12.t3 = "iusr".concat(Utils.AddressToHash(address));
-              _context12.t4 = Buffer.from(address.replace(/^0x/, ""), "hex").toString("base64");
-              _context12.next = 9;
+              _context13.t0 = _objectSpread;
+              _context13.t1 = _objectSpread({}, spec);
+              _context13.t2 = {};
+              _context13.t3 = "iusr".concat(Utils.AddressToHash(address));
+              _context13.t4 = Buffer.from(address.replace(/^0x/, ""), "hex").toString("base64");
+              _context13.next = 9;
               return this.ContentSpaceId();
             case 9:
-              _context12.t5 = _context12.sent;
-              _context12.t6 = Date.now();
-              _context12.t7 = Date.now() + duration;
-              _context12.t8 = context;
-              _context12.t9 = {
-                sub: _context12.t3,
-                adr: _context12.t4,
-                spc: _context12.t5,
-                iat: _context12.t6,
-                exp: _context12.t7,
-                ctx: _context12.t8
+              _context13.t5 = _context13.sent;
+              _context13.t6 = Date.now();
+              _context13.t7 = Date.now() + duration;
+              _context13.t8 = context;
+              _context13.t9 = {
+                sub: _context13.t3,
+                adr: _context13.t4,
+                spc: _context13.t5,
+                iat: _context13.t6,
+                exp: _context13.t7,
+                ctx: _context13.t8
               };
-              token = (0, _context12.t0)(_context12.t1, _context12.t2, _context12.t9);
+              token = (0, _context13.t0)(_context13.t1, _context13.t2, _context13.t9);
               message = "Eluvio Content Fabric Access Token 1.0\n".concat(JSON.stringify(token));
-              _context12.next = 18;
+              _context13.next = 18;
               return this.PersonalSign({
                 message: message,
                 addEthereumPrefix: addEthereumPrefix,
                 Sign: Sign
               });
             case 18:
-              signature = _context12.sent;
+              signature = _context13.sent;
               compressedToken = Pako.deflateRaw(Buffer.from(JSON.stringify(token), "utf-8"));
-              return _context12.abrupt("return", "acspjc".concat(this.utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(compressedToken)]))));
+              return _context13.abrupt("return", "acspjc".concat(this.utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(compressedToken)]))));
             case 21:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function CreateFabricToken() {
         return _CreateFabricToken.apply(this, arguments);
@@ -1074,108 +1159,133 @@ var ElvClient = /*#__PURE__*/function () {
      * @param {boolean} allowDecryption=false - If specified, the re-encryption key will be included in the token,
      * enabling the user of this token to download encrypted content from the specified object
      * @param {Object=} context - Additional JSON context
+     * @param {number=} issueTime - Issue Time in milliseconds
+     * @param {number=} expirationTime - Expiration Time in milliseconds
      */
   }, {
     key: "CreateSignedToken",
     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) {
-          while (1) switch (_context13.prev = _context13.next) {
+      var _CreateSignedToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref18) {
+        var libraryId, objectId, versionHash, policyId, subject, _ref18$grantType, grantType, _ref18$allowDecryptio, allowDecryption, duration, _ref18$context, context, issueTime, expirationTime, issueDateTime, token, cap, compressedToken, signature;
+        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              libraryId = _ref17.libraryId, objectId = _ref17.objectId, versionHash = _ref17.versionHash, policyId = _ref17.policyId, subject = _ref17.subject, _ref17$grantType = _ref17.grantType, grantType = _ref17$grantType === void 0 ? "read" : _ref17$grantType, _ref17$allowDecryptio = _ref17.allowDecryption, allowDecryption = _ref17$allowDecryptio === void 0 ? false : _ref17$allowDecryptio, duration = _ref17.duration, _ref17$context = _ref17.context, context = _ref17$context === void 0 ? {} : _ref17$context;
+              libraryId = _ref18.libraryId, objectId = _ref18.objectId, versionHash = _ref18.versionHash, policyId = _ref18.policyId, subject = _ref18.subject, _ref18$grantType = _ref18.grantType, grantType = _ref18$grantType === void 0 ? "read" : _ref18$grantType, _ref18$allowDecryptio = _ref18.allowDecryption, allowDecryption = _ref18$allowDecryptio === void 0 ? false : _ref18$allowDecryptio, duration = _ref18.duration, _ref18$context = _ref18.context, context = _ref18$context === void 0 ? {} : _ref18$context, issueTime = _ref18.issueTime, expirationTime = _ref18.expirationTime;
               if (subject) {
-                _context13.next = 9;
+                _context14.next = 9;
                 break;
               }
-              _context13.t0 = "iusr";
-              _context13.t1 = this.utils;
-              _context13.next = 6;
+              _context14.t0 = "iusr";
+              _context14.t1 = this.utils;
+              _context14.next = 6;
               return this.CurrentAccountAddress();
             case 6:
-              _context13.t2 = _context13.sent;
-              _context13.t3 = _context13.t1.AddressToHash.call(_context13.t1, _context13.t2);
-              subject = _context13.t0.concat.call(_context13.t0, _context13.t3);
+              _context14.t2 = _context14.sent;
+              _context14.t3 = _context14.t1.AddressToHash.call(_context14.t1, _context14.t2);
+              subject = _context14.t0.concat.call(_context14.t0, _context14.t3);
             case 9:
               if (policyId) {
                 context["elv:delegation-id"] = policyId;
               }
-              _context13.t4 = Buffer;
-              _context13.next = 13;
+              issueDateTime = issueTime || Date.now();
+              _context14.t4 = Buffer;
+              _context14.next = 14;
               return this.CurrentAccountAddress().replace(/^0x/, "");
-            case 13:
-              _context13.t5 = _context13.sent;
-              _context13.t6 = _context13.t4.from.call(_context13.t4, _context13.t5, "hex").toString("base64");
-              _context13.t7 = subject;
-              _context13.next = 18;
+            case 14:
+              _context14.t5 = _context14.sent;
+              _context14.t6 = _context14.t4.from.call(_context14.t4, _context14.t5, "hex").toString("base64");
+              _context14.t7 = subject;
+              _context14.next = 19;
               return this.ContentSpaceId();
-            case 18:
-              _context13.t8 = _context13.sent;
-              _context13.t9 = Date.now();
-              _context13.t10 = Date.now() + duration;
-              _context13.t11 = grantType;
-              _context13.t12 = context;
+            case 19:
+              _context14.t8 = _context14.sent;
+              _context14.t9 = issueDateTime;
+              _context14.t10 = expirationTime || issueDateTime + duration;
+              _context14.t11 = grantType;
+              _context14.t12 = context;
               token = {
-                adr: _context13.t6,
-                sub: _context13.t7,
-                spc: _context13.t8,
-                iat: _context13.t9,
-                exp: _context13.t10,
-                gra: _context13.t11,
-                ctx: _context13.t12
+                adr: _context14.t6,
+                sub: _context14.t7,
+                spc: _context14.t8,
+                iat: _context14.t9,
+                exp: _context14.t10,
+                gra: _context14.t11,
+                ctx: _context14.t12
               };
               if (versionHash) {
                 objectId = this.utils.DecodeVersionHash(versionHash).objectId;
               }
               if (!objectId) {
-                _context13.next = 31;
+                _context14.next = 32;
                 break;
               }
               token.qid = objectId;
               if (libraryId) {
-                _context13.next = 31;
+                _context14.next = 32;
                 break;
               }
-              _context13.next = 30;
+              _context14.next = 31;
               return this.ContentObjectLibraryId({
                 objectId: objectId
               });
-            case 30:
-              libraryId = _context13.sent;
             case 31:
+              libraryId = _context14.sent;
+            case 32:
               if (libraryId) {
                 token.lib = libraryId;
               }
               if (!allowDecryption) {
-                _context13.next = 37;
+                _context14.next = 38;
                 break;
               }
-              _context13.next = 35;
+              _context14.next = 36;
               return this.authClient.ReEncryptionConk({
                 libraryId: libraryId,
                 objectId: objectId
               });
-            case 35:
-              cap = _context13.sent;
+            case 36:
+              cap = _context14.sent;
               token.apk = cap.public_key;
-            case 37:
+            case 38:
               compressedToken = Pako.deflateRaw(Buffer.from(JSON.stringify(token), "utf-8"));
-              _context13.next = 40;
+              _context14.next = 41;
               return this.authClient.Sign(Ethers.utils.keccak256(compressedToken));
-            case 40:
-              signature = _context13.sent;
-              return _context13.abrupt("return", "aessjc".concat(this.utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(compressedToken)]))));
-            case 42:
+            case 41:
+              signature = _context14.sent;
+              return _context14.abrupt("return", "aessjc".concat(this.utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(compressedToken)]))));
+            case 43:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function CreateSignedToken(_x8) {
+      function CreateSignedToken(_x9) {
         return _CreateSignedToken.apply(this, arguments);
       }
       return CreateSignedToken;
     }()
+  }, {
+    key: "CreateAuthorizationToken",
+    value: function () {
+      var _CreateAuthorizationToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(args) {
+        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
+            case 0:
+              _context15.next = 2;
+              return this.authClient.AuthorizationToken(args);
+            case 2:
+              return _context15.abrupt("return", _context15.sent);
+            case 3:
+            case "end":
+              return _context15.stop();
+          }
+        }, _callee15, this);
+      }));
+      function CreateAuthorizationToken(_x10) {
+        return _CreateAuthorizationToken.apply(this, arguments);
+      }
+      return CreateAuthorizationToken;
+    }()
     /**
      * Build a signed message (JSON) using the current signer.
      * Signed messages have a similar format to signed access tokens and they include the message itself
@@ -1193,30 +1303,30 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "CreateSignedMessageJSON",
     value: function () {
-      var _CreateSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref18) {
+      var _CreateSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref19) {
         var message, type, msg, signature;
-        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              message = _ref18.message;
+              message = _ref19.message;
               // Only one kind of signature supported currently
               type = "mje_"; // JSON message, EIP192 signature
               msg = JSON.stringify(message);
-              _context14.next = 5;
+              _context16.next = 5;
               return this.PersonalSign({
                 message: msg,
                 addEthereumPrefix: true
               });
             case 5:
-              signature = _context14.sent;
-              return _context14.abrupt("return", "".concat(type).concat(Utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(msg)]))));
+              signature = _context16.sent;
+              return _context16.abrupt("return", "".concat(type).concat(Utils.B58(Buffer.concat([Buffer.from(signature.replace(/^0x/, ""), "hex"), Buffer.from(msg)]))));
             case 7:
             case "end":
-              return _context14.stop();
+              return _context16.stop();
           }
-        }, _callee14, this);
+        }, _callee16, this);
       }));
-      function CreateSignedMessageJSON(_x9) {
+      function CreateSignedMessageJSON(_x11) {
         return _CreateSignedMessageJSON.apply(this, arguments);
       }
       return CreateSignedMessageJSON;
@@ -1232,15 +1342,15 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "DecodeSignedMessageJSON",
     value: function () {
-      var _DecodeSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref19) {
+      var _DecodeSignedMessageJSON = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref20) {
         var signedMessage, type, msgBytes, signature, msg, obj, prefixedMsgHash, signerAddr;
-        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              signedMessage = _ref19.signedMessage;
+              signedMessage = _ref20.signedMessage;
               type = signedMessage.slice(0, 4);
-              _context15.t0 = type;
-              _context15.next = _context15.t0 === "mje_" ? 5 : 12;
+              _context17.t0 = type;
+              _context17.next = _context17.t0 === "mje_" ? 5 : 12;
               break;
             case 5:
               msgBytes = Utils.FromB58(signedMessage.slice(4));
@@ -1249,7 +1359,7 @@ var ElvClient = /*#__PURE__*/function () {
               obj = JSON.parse(msg);
               prefixedMsgHash = Ethers.utils.keccak256(Buffer.from("\x19Ethereum Signed Message:\n".concat(msg.length).concat(msg), "utf-8"));
               signerAddr = Ethers.utils.recoverAddress(prefixedMsgHash, signature);
-              return _context15.abrupt("return", {
+              return _context17.abrupt("return", {
                 type: type,
                 message: obj,
                 signerAddress: signerAddr,
@@ -1259,11 +1369,11 @@ var ElvClient = /*#__PURE__*/function () {
               throw new Error("Bad message type: ".concat(type));
             case 13:
             case "end":
-              return _context15.stop();
+              return _context17.stop();
           }
-        }, _callee15);
+        }, _callee17);
       }));
-      function DecodeSignedMessageJSON(_x10) {
+      function DecodeSignedMessageJSON(_x12) {
         return _DecodeSignedMessageJSON.apply(this, arguments);
       }
       return DecodeSignedMessageJSON;
@@ -1290,12 +1400,12 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetOauthToken",
     value: function () {
-      var _SetOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref20) {
+      var _SetOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref21) {
         var token, wallet, signer;
-        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              token = _ref20.token;
+              token = _ref21.token;
               this.oauthToken = token;
               wallet = this.GenerateWallet();
               signer = wallet.AddAccountFromMnemonic({
@@ -1306,11 +1416,11 @@ var ElvClient = /*#__PURE__*/function () {
               });
             case 5:
             case "end":
-              return _context16.stop();
+              return _context18.stop();
           }
-        }, _callee16, this);
+        }, _callee18, this);
       }));
-      function SetOauthToken(_x11) {
+      function SetOauthToken(_x13) {
         return _SetOauthToken.apply(this, arguments);
       }
       return SetOauthToken;
@@ -1328,44 +1438,44 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetSignerFromOauthToken",
     value: function () {
-      var _SetSignerFromOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref21) {
+      var _SetSignerFromOauthToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref22) {
         var token, wallet, client, _yield$client$authCli, urls, path, httpClient, response, privateKey;
-        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              token = _ref21.token;
+              token = _ref22.token;
               if (this.trustAuthorityId) {
-                _context17.next = 3;
+                _context19.next = 3;
                 break;
               }
               throw Error("Unable to authorize with OAuth token: No trust authority ID set");
             case 3:
               wallet = this.GenerateWallet();
-              _context17.prev = 4;
+              _context19.prev = 4;
               if (this.kmsURIs) {
-                _context17.next = 17;
+                _context19.next = 17;
                 break;
               }
-              _context17.next = 8;
+              _context19.next = 8;
               return ElvClient.FromConfigurationUrl({
                 configUrl: this.configUrl
               });
             case 8:
-              client = _context17.sent;
+              client = _context19.sent;
               client.SetSigner({
-                signer: wallet.AddAccountFromMnemonic({
-                  mnemonic: wallet.GenerateMnemonic()
+                signer: wallet.AddAccount({
+                  privateKey: this.defaultKey
                 })
               });
-              _context17.next = 12;
+              _context19.next = 12;
               return client.authClient.KMSInfo({
                 kmsId: this.trustAuthorityId
               });
             case 12:
-              _yield$client$authCli = _context17.sent;
+              _yield$client$authCli = _context19.sent;
               urls = _yield$client$authCli.urls;
               if (!(!urls || urls.length === 0)) {
-                _context17.next = 16;
+                _context19.next = 16;
                 break;
               }
               throw Error("Unable to authorize with OAuth token: No KMS URLs set");
@@ -1378,7 +1488,7 @@ var ElvClient = /*#__PURE__*/function () {
                 uris: this.kmsURIs,
                 debug: this.debug
               });
-              _context17.next = 22;
+              _context19.next = 22;
               return this.utils.ResponseToJson(httpClient.Request({
                 headers: {
                   Authorization: "Bearer ".concat(token)
@@ -1388,7 +1498,7 @@ var ElvClient = /*#__PURE__*/function () {
                 forceFailover: true
               }));
             case 22:
-              response = _context17.sent;
+              response = _context19.sent;
               privateKey = response["UserSKHex"];
               this.SetSigner({
                 signer: wallet.AddAccount({
@@ -1397,27 +1507,27 @@ var ElvClient = /*#__PURE__*/function () {
               });
 
               // Ensure wallet is initialized
-              _context17.next = 27;
+              _context19.next = 27;
               return this.userProfileClient.WalletAddress();
             case 27:
-              _context17.next = 36;
+              _context19.next = 36;
               break;
             case 29:
-              _context17.prev = 29;
-              _context17.t0 = _context17["catch"](4);
+              _context19.prev = 29;
+              _context19.t0 = _context19["catch"](4);
               this.Log("Failed to set signer from OAuth token:", true);
-              this.Log(_context17.t0, true);
-              _context17.next = 35;
+              this.Log(_context19.t0, true);
+              _context19.next = 35;
               return this.ClearSigner();
             case 35:
-              throw _context17.t0;
+              throw _context19.t0;
             case 36:
             case "end":
-              return _context17.stop();
+              return _context19.stop();
           }
-        }, _callee17, this, [[4, 29]]);
+        }, _callee19, this, [[4, 29]]);
       }));
-      function SetSignerFromOauthToken(_x12) {
+      function SetSignerFromOauthToken(_x14) {
         return _SetSignerFromOauthToken.apply(this, arguments);
       }
       return SetSignerFromOauthToken;
@@ -1433,8 +1543,8 @@ var ElvClient = /*#__PURE__*/function () {
      */
   }, {
     key: "CreateStaticToken",
-    value: function CreateStaticToken(_ref22) {
-      var libraryId = _ref22.libraryId;
+    value: function CreateStaticToken(_ref23) {
+      var libraryId = _ref23.libraryId;
       var token = {
         qspace_id: this.client.contentSpaceId
       };
@@ -1455,10 +1565,10 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetStaticToken",
     value: function SetStaticToken() {
-      var _ref23 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        token = _ref23.token,
-        _ref23$update = _ref23.update,
-        update = _ref23$update === void 0 ? false : _ref23$update;
+      var _ref24 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        token = _ref24.token,
+        _ref24$update = _ref24.update,
+        update = _ref24$update === void 0 ? false : _ref24$update;
       if (token) {
         this.staticToken = token;
       } else {
@@ -1490,30 +1600,30 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "SetPolicyAuthorization",
     value: function () {
-      var _SetPolicyAuthorization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref24) {
+      var _SetPolicyAuthorization = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref25) {
         var objectId;
-        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              objectId = _ref24.objectId;
-              _context18.t0 = this;
-              _context18.next = 4;
+              objectId = _ref25.objectId;
+              _context20.t0 = this;
+              _context20.next = 4;
               return this.GenerateStateChannelToken({
                 objectId: objectId
               });
             case 4:
-              _context18.t1 = _context18.sent;
-              _context18.t2 = {
-                token: _context18.t1
+              _context20.t1 = _context20.sent;
+              _context20.t2 = {
+                token: _context20.t1
               };
-              _context18.t0.SetStaticToken.call(_context18.t0, _context18.t2);
+              _context20.t0.SetStaticToken.call(_context20.t0, _context20.t2);
             case 7:
             case "end":
-              return _context18.stop();
+              return _context20.stop();
           }
-        }, _callee18, this);
+        }, _callee20, this);
       }));
-      function SetPolicyAuthorization(_x13) {
+      function SetPolicyAuthorization(_x15) {
         return _SetPolicyAuthorization.apply(this, arguments);
       }
       return SetPolicyAuthorization;
@@ -1527,23 +1637,23 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "Sign",
     value: function () {
-      var _Sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(string) {
+      var _Sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(string) {
         var signature;
-        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              _context19.next = 2;
+              _context21.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 = _context21.sent;
+              return _context21.abrupt("return", this.utils.FormatSignature(signature));
             case 4:
             case "end":
-              return _context19.stop();
+              return _context21.stop();
           }
-        }, _callee19, this);
+        }, _callee21, this);
       }));
-      function Sign(_x14) {
+      function Sign(_x16) {
         return _Sign.apply(this, arguments);
       }
       return Sign;
@@ -1560,30 +1670,30 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "EncryptECIES",
     value: function () {
-      var _EncryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref25) {
+      var _EncryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref26) {
         var message, publicKey;
-        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              message = _ref25.message, publicKey = _ref25.publicKey;
+              message = _ref26.message, publicKey = _ref26.publicKey;
               if (this.signer) {
-                _context20.next = 3;
+                _context22.next = 3;
                 break;
               }
               throw "Signer not set";
             case 3:
               ValidatePresence("message", message);
-              _context20.next = 6;
+              _context22.next = 6;
               return this.Crypto.EncryptConk(message, publicKey || this.signer._signingKey().publicKey);
             case 6:
-              return _context20.abrupt("return", _context20.sent);
+              return _context22.abrupt("return", _context22.sent);
             case 7:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20, this);
+        }, _callee22, this);
       }));
-      function EncryptECIES(_x15) {
+      function EncryptECIES(_x17) {
         return _EncryptECIES.apply(this, arguments);
       }
       return EncryptECIES;
@@ -1599,30 +1709,30 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "DecryptECIES",
     value: function () {
-      var _DecryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref26) {
+      var _DecryptECIES = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref27) {
         var message;
-        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              message = _ref26.message;
+              message = _ref27.message;
               if (this.signer) {
-                _context21.next = 3;
+                _context23.next = 3;
                 break;
               }
               throw "Signer not set";
             case 3:
               ValidatePresence("message", message);
-              _context21.next = 6;
+              _context23.next = 6;
               return this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
             case 6:
-              return _context21.abrupt("return", _context21.sent);
+              return _context23.abrupt("return", _context23.sent);
             case 7:
             case "end":
-              return _context21.stop();
+              return _context23.stop();
           }
-        }, _callee21, this);
+        }, _callee23, this);
       }));
-      function DecryptECIES(_x16) {
+      function DecryptECIES(_x18) {
         return _DecryptECIES.apply(this, arguments);
       }
       return DecryptECIES;
@@ -1641,24 +1751,24 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "Request",
     value: function () {
-      var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref27) {
-        var url, _ref27$format, format, _ref27$method, method, _ref27$headers, headers, body;
-        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref28) {
+        var url, _ref28$format, format, _ref28$method, method, _ref28$headers, headers, body;
+        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              url = _ref27.url, _ref27$format = _ref27.format, format = _ref27$format === void 0 ? "json" : _ref27$format, _ref27$method = _ref27.method, method = _ref27$method === void 0 ? "GET" : _ref27$method, _ref27$headers = _ref27.headers, headers = _ref27$headers === void 0 ? {} : _ref27$headers, body = _ref27.body;
-              return _context22.abrupt("return", this.utils.ResponseToFormat(format, HttpClient.Fetch(url, {
+              url = _ref28.url, _ref28$format = _ref28.format, format = _ref28$format === void 0 ? "json" : _ref28$format, _ref28$method = _ref28.method, method = _ref28$method === void 0 ? "GET" : _ref28$method, _ref28$headers = _ref28.headers, headers = _ref28$headers === void 0 ? {} : _ref28$headers, body = _ref28.body;
+              return _context24.abrupt("return", this.utils.ResponseToFormat(format, HttpClient.Fetch(url, {
                 method: method,
                 headers: headers,
                 body: body
               })));
             case 2:
             case "end":
-              return _context22.stop();
+              return _context24.stop();
           }
-        }, _callee22, this);
+        }, _callee24, this);
       }));
-      function Request(_x17) {
+      function Request(_x19) {
         return _Request.apply(this, arguments);
       }
       return Request;
@@ -1666,12 +1776,12 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "MakeAuthServiceRequest",
     value: function () {
-      var _MakeAuthServiceRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref28) {
-        var kmsId, objectId, versionHash, _ref28$method, method, path, bodyType, _ref28$body, body, _ref28$queryParams, queryParams, headers, format, response;
-        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _MakeAuthServiceRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref29) {
+        var kmsId, objectId, versionHash, _ref29$method, method, path, bodyType, _ref29$body, body, _ref29$queryParams, queryParams, headers, format, response;
+        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              kmsId = _ref28.kmsId, objectId = _ref28.objectId, versionHash = _ref28.versionHash, _ref28$method = _ref28.method, method = _ref28$method === void 0 ? "GET" : _ref28$method, path = _ref28.path, bodyType = _ref28.bodyType, _ref28$body = _ref28.body, body = _ref28$body === void 0 ? {} : _ref28$body, _ref28$queryParams = _ref28.queryParams, queryParams = _ref28$queryParams === void 0 ? {} : _ref28$queryParams, headers = _ref28.headers, format = _ref28.format;
+              kmsId = _ref29.kmsId, objectId = _ref29.objectId, versionHash = _ref29.versionHash, _ref29$method = _ref29.method, method = _ref29$method === void 0 ? "GET" : _ref29$method, path = _ref29.path, bodyType = _ref29.bodyType, _ref29$body = _ref29.body, body = _ref29$body === void 0 ? {} : _ref29$body, _ref29$queryParams = _ref29.queryParams, queryParams = _ref29$queryParams === void 0 ? {} : _ref29$queryParams, headers = _ref29.headers, format = _ref29.format;
               response = this.authClient.MakeAuthServiceRequest({
                 kmsId: kmsId,
                 objectId: objectId,
@@ -1683,14 +1793,14 @@ var ElvClient = /*#__PURE__*/function () {
                 queryParams: queryParams,
                 headers: headers
               });
-              return _context23.abrupt("return", !format ? response : this.utils.ResponseToFormat(format, response));
+              return _context25.abrupt("return", !format ? response : this.utils.ResponseToFormat(format, response));
             case 3:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee23, this);
+        }, _callee25, this);
       }));
-      function MakeAuthServiceRequest(_x18) {
+      function MakeAuthServiceRequest(_x20) {
         return _MakeAuthServiceRequest.apply(this, arguments);
       }
       return MakeAuthServiceRequest;
@@ -1700,10 +1810,10 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "FrameAllowedMethods",
     value: function FrameAllowedMethods() {
-      var _this4 = this;
+      var _this3 = 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 _this4[method] === "function" && !forbiddenMethods.includes(method);
+        return typeof _this3[method] === "function" && !forbiddenMethods.includes(method);
       });
     }
 
@@ -1711,21 +1821,21 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "CallFromFrameMessage",
     value: function () {
-      var _CallFromFrameMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(message, Respond) {
-        var _this5 = this;
+      var _CallFromFrameMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(message, Respond) {
+        var _this4 = this;
         var callback, method, methodResults, responseError;
-        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               if (!(message.type !== "ElvFrameRequest")) {
-                _context24.next = 2;
+                _context26.next = 2;
                 break;
               }
-              return _context24.abrupt("return");
+              return _context26.abrupt("return");
             case 2:
               if (message.callbackId) {
                 callback = function callback(result) {
-                  Respond(_this5.utils.MakeClonable({
+                  Respond(_this4.utils.MakeClonable({
                     type: "ElvFrameResponse",
                     requestId: message.callbackId,
                     response: result
@@ -1733,87 +1843,89 @@ var ElvClient = /*#__PURE__*/function () {
                 };
                 message.args.callback = callback;
               }
-              _context24.prev = 3;
+              _context26.prev = 3;
               method = message.calledMethod;
               if (!(message.module === "walletClient")) {
-                _context24.next = 15;
+                _context26.next = 15;
                 break;
               }
               if (this.walletClient) {
-                _context24.next = 8;
+                _context26.next = 8;
                 break;
               }
               throw Error("Wallet client not set");
             case 8:
               if (!this.walletClient.ForbiddenMethods().includes(method)) {
-                _context24.next = 10;
+                _context26.next = 10;
                 break;
               }
               throw Error("Invalid user profile method: " + method);
             case 10:
-              _context24.next = 12;
+              _context26.next = 12;
               return this.walletClient[method](message.args);
             case 12:
-              methodResults = _context24.sent;
-              _context24.next = 28;
+              methodResults = _context26.sent;
+              _context26.next = 28;
               break;
             case 15:
               if (!(message.module === "userProfileClient")) {
-                _context24.next = 23;
+                _context26.next = 23;
                 break;
               }
               if (this.userProfileClient.FrameAllowedMethods().includes(method)) {
-                _context24.next = 18;
+                _context26.next = 18;
                 break;
               }
               throw Error("Invalid user profile method: " + method);
             case 18:
-              _context24.next = 20;
+              _context26.next = 20;
               return this.userProfileClient[method](message.args);
             case 20:
-              methodResults = _context24.sent;
-              _context24.next = 28;
+              methodResults = _context26.sent;
+              _context26.next = 28;
               break;
             case 23:
               if (this.FrameAllowedMethods().includes(method)) {
-                _context24.next = 25;
+                _context26.next = 25;
                 break;
               }
               throw Error("Invalid method: " + method);
             case 25:
-              _context24.next = 27;
+              _context26.next = 27;
               return this[method](message.args);
             case 27:
-              methodResults = _context24.sent;
+              methodResults = _context26.sent;
             case 28:
               Respond(this.utils.MakeClonable({
                 type: "ElvFrameResponse",
                 requestId: message.requestId,
                 response: methodResults
               }));
-              _context24.next = 37;
+              _context26.next = 38;
               break;
             case 31:
-              _context24.prev = 31;
-              _context24.t0 = _context24["catch"](3);
+              _context26.prev = 31;
+              _context26.t0 = _context26["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(_context26.t0) === "object" ? JSON.stringify(_context26.t0, null, 2) : _context26.t0), true);
 
               // eslint-disable-next-line no-console
-              console.error(_context24.t0);
-              responseError = _context24.t0 instanceof Error ? _context24.t0.message : _context24.t0;
+              console.error(message);
+              // eslint-disable-next-line no-console
+              console.error(_context26.t0);
+              responseError = _context26.t0 instanceof Error ? _context26.t0.message : _context26.t0;
               Respond(this.utils.MakeClonable({
                 type: "ElvFrameResponse",
                 requestId: message.requestId,
                 error: responseError
               }));
-            case 37:
+            case 38:
             case "end":
-              return _context24.stop();
+              return _context26.stop();
           }
-        }, _callee24, this, [[3, 31]]);
+        }, _callee26, this, [[3, 31]]);
       }));
-      function CallFromFrameMessage(_x19, _x20) {
+      function CallFromFrameMessage(_x21, _x22) {
         return _CallFromFrameMessage.apply(this, arguments);
       }
       return CallFromFrameMessage;
@@ -1821,13 +1933,13 @@ var ElvClient = /*#__PURE__*/function () {
   }], [{
     key: "Configuration",
     value: function () {
-      var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref29) {
-        var configUrl, _ref29$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) {
+      var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref30) {
+        var configUrl, _ref30$kmsUrls, kmsUrls, region, clientIP, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs, fabricVersion;
+        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              configUrl = _ref29.configUrl, _ref29$kmsUrls = _ref29.kmsUrls, kmsUrls = _ref29$kmsUrls === void 0 ? [] : _ref29$kmsUrls, region = _ref29.region, clientIP = _ref29.clientIP;
-              _context25.prev = 1;
+              configUrl = _ref30.configUrl, _ref30$kmsUrls = _ref30.kmsUrls, kmsUrls = _ref30$kmsUrls === void 0 ? [] : _ref30$kmsUrls, region = _ref30.region, clientIP = _ref30.clientIP;
+              _context27.prev = 1;
               uri = new URI(configUrl);
               uri.pathname("/config");
               if (region) {
@@ -1836,10 +1948,10 @@ var ElvClient = /*#__PURE__*/function () {
               if (clientIP) {
                 uri.addSearch("client_ip", clientIP);
               }
-              _context25.next = 8;
+              _context27.next = 8;
               return Utils.ResponseToJson(HttpClient.Fetch(uri.toString()));
             case 8:
-              fabricInfo = _context25.sent;
+              fabricInfo = _context27.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");
@@ -1862,7 +1974,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 _context27.abrupt("return", {
                 nodeId: fabricInfo.node_id,
                 contentSpaceId: fabricInfo.qspace.id,
                 networkId: (fabricInfo.qspace.ethereum || {}).network_id,
@@ -1876,20 +1988,20 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricVersion: fabricVersion
               });
             case 23:
-              _context25.prev = 23;
-              _context25.t0 = _context25["catch"](1);
+              _context27.prev = 23;
+              _context27.t0 = _context27["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(_context27.t0);
+              throw _context27.t0;
             case 28:
             case "end":
-              return _context25.stop();
+              return _context27.stop();
           }
-        }, _callee25, null, [[1, 23]]);
+        }, _callee27, null, [[1, 23]]);
       }));
-      function Configuration(_x21) {
+      function Configuration(_x23) {
         return _Configuration.apply(this, arguments);
       }
       return Configuration;
@@ -1926,20 +2038,20 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "FromNetworkName",
     value: function () {
-      var _FromNetworkName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref30) {
-        var networkName, region, clientIP, trustAuthorityId, staticToken, _ref30$ethereumContra, ethereumContractTimeout, _ref30$noCache, noCache, _ref30$noAuth, noAuth, assumeV3, configUrl;
-        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _FromNetworkName = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee28(_ref31) {
+        var networkName, region, clientIP, trustAuthorityId, staticToken, _ref31$ethereumContra, ethereumContractTimeout, _ref31$noCache, noCache, _ref31$noAuth, noAuth, assumeV3, configUrl;
+        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              networkName = _ref30.networkName, 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, assumeV3 = _ref30.assumeV3;
+              networkName = _ref31.networkName, region = _ref31.region, clientIP = _ref31.clientIP, trustAuthorityId = _ref31.trustAuthorityId, staticToken = _ref31.staticToken, _ref31$ethereumContra = _ref31.ethereumContractTimeout, ethereumContractTimeout = _ref31$ethereumContra === void 0 ? 10 : _ref31$ethereumContra, _ref31$noCache = _ref31.noCache, noCache = _ref31$noCache === void 0 ? false : _ref31$noCache, _ref31$noAuth = _ref31.noAuth, noAuth = _ref31$noAuth === void 0 ? false : _ref31$noAuth, assumeV3 = _ref31.assumeV3;
               configUrl = networks[networkName];
               if (configUrl) {
-                _context26.next = 4;
+                _context28.next = 4;
                 break;
               }
               throw Error("Invalid network name: " + networkName);
             case 4:
-              _context26.next = 6;
+              _context28.next = 6;
               return this.FromConfigurationUrl({
                 configUrl: configUrl,
                 region: region,
@@ -1952,14 +2064,14 @@ var ElvClient = /*#__PURE__*/function () {
                 assumeV3: assumeV3
               });
             case 6:
-              return _context26.abrupt("return", _context26.sent);
+              return _context28.abrupt("return", _context28.sent);
             case 7:
             case "end":
-              return _context26.stop();
+              return _context28.stop();
           }
-        }, _callee26, this);
+        }, _callee28, this);
       }));
-      function FromNetworkName(_x22) {
+      function FromNetworkName(_x24) {
         return _FromNetworkName.apply(this, arguments);
       }
       return FromNetworkName;
@@ -1983,20 +2095,20 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "FromConfigurationUrl",
     value: function () {
-      var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref31) {
-        var configUrl, region, clientIP, trustAuthorityId, staticToken, _ref31$ethereumContra, ethereumContractTimeout, _ref31$noCache, noCache, _ref31$noAuth, noAuth, _ref31$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) {
+      var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee29(_ref32) {
+        var configUrl, region, clientIP, trustAuthorityId, staticToken, _ref32$ethereumContra, ethereumContractTimeout, _ref32$noCache, noCache, _ref32$noAuth, noAuth, _ref32$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, fileServiceURIs, searchURIs, fabricVersion, client;
+        return _regeneratorRuntime.wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              configUrl = _ref31.configUrl, region = _ref31.region, clientIP = _ref31.clientIP, trustAuthorityId = _ref31.trustAuthorityId, staticToken = _ref31.staticToken, _ref31$ethereumContra = _ref31.ethereumContractTimeout, ethereumContractTimeout = _ref31$ethereumContra === void 0 ? 10 : _ref31$ethereumContra, _ref31$noCache = _ref31.noCache, noCache = _ref31$noCache === void 0 ? false : _ref31$noCache, _ref31$noAuth = _ref31.noAuth, noAuth = _ref31$noAuth === void 0 ? false : _ref31$noAuth, _ref31$assumeV = _ref31.assumeV3, assumeV3 = _ref31$assumeV === void 0 ? false : _ref31$assumeV;
-              _context27.next = 3;
+              configUrl = _ref32.configUrl, region = _ref32.region, clientIP = _ref32.clientIP, trustAuthorityId = _ref32.trustAuthorityId, staticToken = _ref32.staticToken, _ref32$ethereumContra = _ref32.ethereumContractTimeout, ethereumContractTimeout = _ref32$ethereumContra === void 0 ? 10 : _ref32$ethereumContra, _ref32$noCache = _ref32.noCache, noCache = _ref32$noCache === void 0 ? false : _ref32$noCache, _ref32$noAuth = _ref32.noAuth, noAuth = _ref32$noAuth === void 0 ? false : _ref32$noAuth, _ref32$assumeV = _ref32.assumeV3, assumeV3 = _ref32$assumeV === void 0 ? false : _ref32$assumeV;
+              _context29.next = 3;
               return ElvClient.Configuration({
                 configUrl: configUrl,
                 clientIP: clientIP,
                 region: region
               });
             case 3:
-              _yield$ElvClient$Conf3 = _context27.sent;
+              _yield$ElvClient$Conf3 = _context29.sent;
               contentSpaceId = _yield$ElvClient$Conf3.contentSpaceId;
               networkId = _yield$ElvClient$Conf3.networkId;
               networkName = _yield$ElvClient$Conf3.networkName;
@@ -2026,14 +2138,14 @@ var ElvClient = /*#__PURE__*/function () {
               client.configUrl = configUrl;
               client.region = region;
               client.clientIP = clientIP;
-              return _context27.abrupt("return", client);
+              return _context29.abrupt("return", client);
             case 18:
             case "end":
-              return _context27.stop();
+              return _context29.stop();
           }
-        }, _callee27);
+        }, _callee29);
       }));
-      function FromConfigurationUrl(_x23) {
+      function FromConfigurationUrl(_x25) {
         return _FromConfigurationUrl.apply(this, arguments);
       }
       return FromConfigurationUrl;