@eluvio/elv-client-js 4.0.147 → 4.2.0

package/dist/src/AuthorizationClient.js

@@ -3,9 +3,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
-var _v, _v2;
-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; }
+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; }
 var HttpClient = require("./HttpClient");
 var Ethers = require("ethers");
 var Utils = require("./Utils");
@@ -38,8 +37,8 @@ var ACCESS_TYPES = {
   OTHER: "other"
 };
 var CONTRACTS = {
-  v2: (_v = {}, _defineProperty(_v, ACCESS_TYPES.SPACE, require("./contracts/v2/BaseContentSpace")), _defineProperty(_v, ACCESS_TYPES.LIBRARY, require("./contracts/v2/BaseLibrary")), _defineProperty(_v, ACCESS_TYPES.TYPE, require("./contracts/v2/BaseContentType")), _defineProperty(_v, ACCESS_TYPES.OBJECT, require("./contracts/v2/BaseContent")), _defineProperty(_v, ACCESS_TYPES.WALLET, require("./contracts/v2/BaseAccessWallet")), _defineProperty(_v, ACCESS_TYPES.GROUP, require("./contracts/v2/BaseAccessControlGroup")), _defineProperty(_v, ACCESS_TYPES.ACCESSIBLE, require("./contracts/v2/Accessible")), _defineProperty(_v, ACCESS_TYPES.EDITABLE, require("./contracts/v2/Editable")), _v),
-  v3: (_v2 = {}, _defineProperty(_v2, ACCESS_TYPES.SPACE, require("./contracts/v3/BaseContentSpace")), _defineProperty(_v2, ACCESS_TYPES.LIBRARY, require("./contracts/v3/BaseLibrary")), _defineProperty(_v2, ACCESS_TYPES.TYPE, require("./contracts/v3/BaseContentType")), _defineProperty(_v2, ACCESS_TYPES.OBJECT, require("./contracts/v3/BaseContent")), _defineProperty(_v2, ACCESS_TYPES.WALLET, require("./contracts/v3/BaseAccessWallet")), _defineProperty(_v2, ACCESS_TYPES.GROUP, require("./contracts/v3/BaseAccessControlGroup")), _defineProperty(_v2, ACCESS_TYPES.ACCESSIBLE, require("./contracts/v3/Accessible")), _defineProperty(_v2, ACCESS_TYPES.EDITABLE, require("./contracts/v3/Editable")), _defineProperty(_v2, ACCESS_TYPES.TENANT, require("./contracts/v3/BaseTenantSpace")), _v2),
+  v2: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ACCESS_TYPES.SPACE, require("./contracts/v2/BaseContentSpace")), ACCESS_TYPES.LIBRARY, require("./contracts/v2/BaseLibrary")), ACCESS_TYPES.TYPE, require("./contracts/v2/BaseContentType")), ACCESS_TYPES.OBJECT, require("./contracts/v2/BaseContent")), ACCESS_TYPES.WALLET, require("./contracts/v2/BaseAccessWallet")), ACCESS_TYPES.GROUP, require("./contracts/v2/BaseAccessControlGroup")), ACCESS_TYPES.ACCESSIBLE, require("./contracts/v2/Accessible")), ACCESS_TYPES.EDITABLE, require("./contracts/v2/Editable")),
+  v3: _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ACCESS_TYPES.SPACE, require("./contracts/v3/BaseContentSpace")), ACCESS_TYPES.LIBRARY, require("./contracts/v3/BaseLibrary")), ACCESS_TYPES.TYPE, require("./contracts/v3/BaseContentType")), ACCESS_TYPES.OBJECT, require("./contracts/v3/BaseContent")), ACCESS_TYPES.WALLET, require("./contracts/v3/BaseAccessWallet")), ACCESS_TYPES.GROUP, require("./contracts/v3/BaseAccessControlGroup")), ACCESS_TYPES.ACCESSIBLE, require("./contracts/v3/Accessible")), ACCESS_TYPES.EDITABLE, require("./contracts/v3/Editable")), ACCESS_TYPES.TENANT, require("./contracts/v3/BaseTenantSpace")),
   v3b: _defineProperty({}, ACCESS_TYPES.GROUP, require("./contracts/v3b/BaseAccessControlGroup"))
 };
 var AuthorizationClient = /*#__PURE__*/function () {
@@ -77,7 +76,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }
 
   // Return authorization token in appropriate headers
-  _createClass(AuthorizationClient, [{
+  return _createClass(AuthorizationClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -86,14 +85,14 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AuthorizationHeader",
     value: function () {
-      var _AuthorizationHeader = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
+      var _AuthorizationHeader = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
         var authorizationToken, headers;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              _context.next = 1;
               return this.AuthorizationToken(params);
-            case 2:
+            case 1:
               authorizationToken = _context.sent;
               headers = {
                 Authorization: "Bearer " + authorizationToken
@@ -102,7 +101,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 headers["X-Content-Fabric-Encryption-Scheme"] = params.encryption;
               }
               return _context.abrupt("return", headers);
-            case 6:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -116,60 +115,60 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AuthorizationToken",
     value: function () {
-      var _AuthorizationToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
-        var libraryId, objectId, versionHash, partHash, encryption, audienceData, context, _ref2$update, update, _ref2$makeAccessReque, makeAccessRequest, _ref2$channelAuth, channelAuth, oauthToken, _ref2$noCache, noCache, _ref2$noAuth, noAuth, isWalletRequest, initialNoCache, authorizationToken;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      var _AuthorizationToken = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
+        var libraryId, objectId, versionHash, partHash, encryption, audienceData, context, _ref2$update, update, _ref2$makeAccessReque, makeAccessRequest, _ref2$channelAuth, channelAuth, oauthToken, _ref2$noCache, noCache, _ref2$noAuth, noAuth, isWalletRequest, initialNoCache, authorizationToken, _t, _t2, _t3, _t4, _t5;
+        return _regeneratorRuntime.wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               libraryId = _ref2.libraryId, objectId = _ref2.objectId, versionHash = _ref2.versionHash, partHash = _ref2.partHash, encryption = _ref2.encryption, audienceData = _ref2.audienceData, context = _ref2.context, _ref2$update = _ref2.update, update = _ref2$update === void 0 ? false : _ref2$update, _ref2$makeAccessReque = _ref2.makeAccessRequest, makeAccessRequest = _ref2$makeAccessReque === void 0 ? false : _ref2$makeAccessReque, _ref2$channelAuth = _ref2.channelAuth, channelAuth = _ref2$channelAuth === void 0 ? false : _ref2$channelAuth, oauthToken = _ref2.oauthToken, _ref2$noCache = _ref2.noCache, noCache = _ref2$noCache === void 0 ? false : _ref2$noCache, _ref2$noAuth = _ref2.noAuth, noAuth = _ref2$noAuth === void 0 ? false : _ref2$noAuth;
               if (versionHash) {
                 objectId = this.client.utils.DecodeVersionHash(versionHash).objectId;
               }
-              _context2.t0 = objectId && this.client.signer && !this.client.signer.anonymous;
-              if (!_context2.t0) {
-                _context2.next = 10;
+              _t = objectId && this.client.signer && !this.client.signer.anonymous;
+              if (!_t) {
+                _context2.next = 2;
                 break;
               }
-              _context2.t1 = this.client.utils;
-              _context2.next = 7;
+              _t2 = this.client.utils;
+              _context2.next = 1;
               return this.client.userProfileClient.WalletAddress(false);
-            case 7:
-              _context2.t2 = _context2.sent;
-              _context2.t3 = this.client.utils.HashToAddress(objectId);
-              _context2.t0 = _context2.t1.EqualAddress.call(_context2.t1, _context2.t2, _context2.t3);
-            case 10:
-              isWalletRequest = _context2.t0;
+            case 1:
+              _t3 = _context2.sent;
+              _t4 = this.client.utils.HashToAddress(objectId);
+              _t = _t2.EqualAddress.call(_t2, _t3, _t4);
+            case 2:
+              isWalletRequest = _t;
               if (!(this.client.staticToken && !isWalletRequest && !update)) {
-                _context2.next = 15;
+                _context2.next = 3;
                 break;
               }
               return _context2.abrupt("return", this.client.staticToken);
-            case 15:
+            case 3:
               if (!(this.client.staticUpdateToken && !isWalletRequest)) {
-                _context2.next = 17;
+                _context2.next = 4;
                 break;
               }
               return _context2.abrupt("return", this.client.staticUpdateToken);
-            case 17:
+            case 4:
               initialNoCache = this.noCache;
-              _context2.prev = 18;
+              _context2.prev = 5;
               // noCache enabled for this call
               if (noCache && !this.noCache) {
                 this.noCache = true;
               }
               if (!(channelAuth && this.client.signer && this.client.signer.remoteSigner)) {
-                _context2.next = 22;
+                _context2.next = 6;
                 break;
               }
               return _context2.abrupt("return", this.client.CreateFabricToken({
                 context: context
               }));
-            case 22:
+            case 6:
               if (!channelAuth) {
-                _context2.next = 28;
+                _context2.next = 8;
                 break;
               }
-              _context2.next = 25;
+              _context2.next = 7;
               return this.GenerateChannelContentToken({
                 objectId: objectId,
                 versionHash: versionHash,
@@ -177,20 +176,20 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 context: context,
                 oauthToken: oauthToken
               });
-            case 25:
+            case 7:
               authorizationToken = _context2.sent;
-              _context2.next = 33;
+              _context2.next = 11;
               break;
-            case 28:
+            case 8:
               if (!(noAuth && this.client.signer && this.client.signer.remoteSigner && this.client.signer.unsignedPublicAuth)) {
-                _context2.next = 30;
+                _context2.next = 9;
                 break;
               }
               return _context2.abrupt("return", this.client.CreateStaticToken({
                 libraryId: libraryId
               }));
-            case 30:
-              _context2.next = 32;
+            case 9:
+              _context2.next = 10;
               return this.GenerateAuthorizationToken({
                 libraryId: libraryId,
                 objectId: objectId,
@@ -200,23 +199,23 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 update: update,
                 makeAccessRequest: makeAccessRequest
               });
-            case 32:
+            case 10:
               authorizationToken = _context2.sent;
-            case 33:
+            case 11:
               return _context2.abrupt("return", authorizationToken);
-            case 36:
-              _context2.prev = 36;
-              _context2.t4 = _context2["catch"](18);
-              throw _context2.t4;
-            case 39:
-              _context2.prev = 39;
+            case 12:
+              _context2.prev = 12;
+              _t5 = _context2["catch"](5);
+              throw _t5;
+            case 13:
+              _context2.prev = 13;
               this.noCache = initialNoCache;
-              return _context2.finish(39);
-            case 42:
+              return _context2.finish(13);
+            case 14:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[18, 36, 39, 42]]);
+        }, _callee2, this, [[5, 12, 13, 14]]);
       }));
       function AuthorizationToken(_x2) {
         return _AuthorizationToken.apply(this, arguments);
@@ -226,9 +225,9 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "GenerateAuthorizationToken",
     value: function () {
-      var _GenerateAuthorizationToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref3) {
-        var libraryId, objectId, versionHash, partHash, encryption, _ref3$update, update, _ref3$makeAccessReque, makeAccessRequest, publicKey, owner, ownerCapKey, ownerCap, cap, token, _yield$this$MakeAcces, transactionHash, signature, multiSig;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      var _GenerateAuthorizationToken = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref3) {
+        var libraryId, objectId, versionHash, partHash, encryption, _ref3$update, update, _ref3$makeAccessReque, makeAccessRequest, publicKey, owner, ownerCapKey, ownerCap, cap, token, _yield$this$MakeAcces, transactionHash, signature, multiSig, _t6, _t7, _t8;
+        return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               libraryId = _ref3.libraryId, objectId = _ref3.objectId, versionHash = _ref3.versionHash, partHash = _ref3.partHash, encryption = _ref3.encryption, _ref3$update = _ref3.update, update = _ref3$update === void 0 ? false : _ref3$update, _ref3$makeAccessReque = _ref3.makeAccessRequest, makeAccessRequest = _ref3$makeAccessReque === void 0 ? false : _ref3$makeAccessReque;
@@ -237,60 +236,60 @@ var AuthorizationClient = /*#__PURE__*/function () {
               }
 
               // Generate AFGH public key if encryption is specified
-              _context3.t0 = encryption && encryption !== "none" && objectId;
-              if (!_context3.t0) {
-                _context3.next = 9;
+              _t6 = encryption && encryption !== "none" && objectId;
+              if (!_t6) {
+                _context3.next = 2;
                 break;
               }
-              _context3.next = 6;
+              _context3.next = 1;
               return this.AccessType(objectId);
-            case 6:
-              _context3.t1 = _context3.sent;
-              _context3.t2 = ACCESS_TYPES.OBJECT;
-              _context3.t0 = _context3.t1 === _context3.t2;
-            case 9:
-              if (!_context3.t0) {
-                _context3.next = 22;
+            case 1:
+              _t7 = _context3.sent;
+              _t8 = ACCESS_TYPES.OBJECT;
+              _t6 = _t7 === _t8;
+            case 2:
+              if (!_t6) {
+                _context3.next = 6;
                 break;
               }
-              _context3.next = 12;
+              _context3.next = 3;
               return this.Owner({
                 id: objectId
               });
-            case 12:
+            case 3:
               owner = _context3.sent;
               ownerCapKey = "eluv.caps.iusr".concat(Utils.AddressToHash(this.client.signer.address));
-              _context3.next = 16;
+              _context3.next = 4;
               return this.client.ContentObjectMetadata({
                 libraryId: libraryId,
                 objectId: objectId,
                 versionHash: versionHash,
                 metadataSubtree: ownerCapKey
               });
-            case 16:
+            case 4:
               ownerCap = _context3.sent;
               if (!(!Utils.EqualAddress(owner, this.client.signer.address) && !ownerCap)) {
-                _context3.next = 22;
+                _context3.next = 6;
                 break;
               }
-              _context3.next = 20;
+              _context3.next = 5;
               return this.ReEncryptionConk({
                 libraryId: libraryId,
                 objectId: objectId
               });
-            case 20:
+            case 5:
               cap = _context3.sent;
               publicKey = cap.public_key;
-            case 22:
+            case 6:
               token = {
                 qspace_id: this.contentSpaceId,
                 addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
               };
               if (!(update || makeAccessRequest)) {
-                _context3.next = 29;
+                _context3.next = 8;
                 break;
               }
-              _context3.next = 26;
+              _context3.next = 7;
               return this.MakeAccessRequest({
                 libraryId: libraryId,
                 objectId: objectId,
@@ -299,13 +298,13 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 publicKey: publicKey,
                 noCache: this.noCache
               });
-            case 26:
+            case 7:
               _yield$this$MakeAcces = _context3.sent;
               transactionHash = _yield$this$MakeAcces.transactionHash;
               if (transactionHash) {
                 token.tx_id = transactionHash;
               }
-            case 29:
+            case 8:
               if (libraryId) {
                 token.qlib_id = libraryId;
               }
@@ -316,13 +315,13 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 token.afgh_pk = publicKey;
               }
               token = Utils.B64(JSON.stringify(token));
-              _context3.next = 35;
+              _context3.next = 9;
               return this.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(token)));
-            case 35:
+            case 9:
               signature = _context3.sent;
               multiSig = Utils.FormatSignature(signature);
               return _context3.abrupt("return", "".concat(token, ".").concat(Utils.B64(multiSig)));
-            case 38:
+            case 10:
             case "end":
               return _context3.stop();
           }
@@ -336,61 +335,61 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "MakeAccessRequest",
     value: function () {
-      var _MakeAccessRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref4) {
+      var _MakeAccessRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref4) {
         var _this = this;
-        var libraryId, objectId, versionHash, _ref4$args, args, _ref4$publicKey, publicKey, _ref4$update, update, _ref4$skipCache, skipCache, _ref4$noCache, noCache, cacheOnly, walletContractAddress, walletCreated, id, _yield$this$ContractI, isV3, accessType, abi, _yield$this$AccessInf, accessArgs, checkAccessCharge, address, elapsed, _cache, accessRequest, cache;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        var libraryId, objectId, versionHash, _ref4$args, args, _ref4$publicKey, publicKey, _ref4$update, update, _ref4$skipCache, skipCache, _ref4$noCache, noCache, cacheOnly, walletContractAddress, walletCreated, id, _yield$this$ContractI, isV3, accessType, abi, _yield$this$AccessInf, accessArgs, checkAccessCharge, address, elapsed, _cache, accessRequest, cache, _t9, _t0;
+        return _regeneratorRuntime.wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               libraryId = _ref4.libraryId, objectId = _ref4.objectId, versionHash = _ref4.versionHash, _ref4$args = _ref4.args, args = _ref4$args === void 0 ? [] : _ref4$args, _ref4$publicKey = _ref4.publicKey, publicKey = _ref4$publicKey === void 0 ? "" : _ref4$publicKey, _ref4$update = _ref4.update, update = _ref4$update === void 0 ? false : _ref4$update, _ref4$skipCache = _ref4.skipCache, skipCache = _ref4$skipCache === void 0 ? false : _ref4$skipCache, _ref4$noCache = _ref4.noCache, noCache = _ref4$noCache === void 0 ? false : _ref4$noCache, cacheOnly = _ref4.cacheOnly;
               if (this.client.signer) {
-                _context4.next = 3;
+                _context4.next = 1;
                 break;
               }
               return _context4.abrupt("return", {
                 transactionHash: ""
               });
-            case 3:
-              _context4.next = 5;
+            case 1:
+              _context4.next = 2;
               return this.client.userProfileClient.UserWalletAddress({
                 address: this.client.signer.address
               });
-            case 5:
+            case 2:
               walletContractAddress = _context4.sent;
               if (walletContractAddress) {
-                _context4.next = 12;
+                _context4.next = 4;
                 break;
               }
-              _context4.next = 9;
+              _context4.next = 3;
               return this.client.userProfileClient.WalletAddress();
-            case 9:
+            case 3:
               walletCreated = _context4.sent;
               if (walletCreated) {
-                _context4.next = 12;
+                _context4.next = 4;
                 break;
               }
               throw Error("User wallet contract is required to make access requests");
-            case 12:
+            case 4:
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               id = objectId || libraryId || this.contentSpaceId;
-              _context4.next = 16;
+              _context4.next = 5;
               return this.ContractInfo({
                 id: id
               });
-            case 16:
+            case 5:
               _yield$this$ContractI = _context4.sent;
               isV3 = _yield$this$ContractI.isV3;
               accessType = _yield$this$ContractI.accessType;
               abi = _yield$this$ContractI.abi;
               if (!(typeof accessType === "undefined")) {
-                _context4.next = 22;
+                _context4.next = 6;
                 break;
               }
               throw Error("Unable to determine contract info for ".concat(id, " (").concat(this.client.utils.HashToAddress(id), ") - Wrong network?"));
-            case 22:
-              _context4.next = 24;
+            case 6:
+              _context4.next = 7;
               return this.AccessInfo({
                 accessType: accessType,
                 publicKey: publicKey,
@@ -398,102 +397,102 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 args: args,
                 isV3: isV3
               });
-            case 24:
+            case 7:
               _yield$this$AccessInf = _context4.sent;
               accessArgs = _yield$this$AccessInf.accessArgs;
               checkAccessCharge = _yield$this$AccessInf.checkAccessCharge;
               address = Utils.HashToAddress(id);
               elapsed = 0;
-            case 29:
+            case 8:
               if (!this.transactionLocks[id]) {
-                _context4.next = 36;
+                _context4.next = 10;
                 break;
               }
-              _context4.next = 32;
+              _context4.next = 9;
               return new Promise(function (resolve) {
                 return setTimeout(resolve, 100);
               });
-            case 32:
+            case 9:
               elapsed += 100;
               if (elapsed > 15000) {
                 this.Log("Lock never released for ".concat(id, " - releasing lock"));
                 delete this.transactionLocks[id];
               }
-              _context4.next = 29;
+              _context4.next = 8;
               break;
-            case 36:
-              _context4.prev = 36;
+            case 10:
+              _context4.prev = 10;
               this.transactionLocks[id] = true;
 
               // Check cache for existing transaction
               if (!(!noCache && !skipCache)) {
-                _context4.next = 46;
+                _context4.next = 12;
                 break;
               }
               _cache = update ? this.modifyTransactions : this.accessTransactions;
               if (!_cache[address]) {
-                _context4.next = 46;
+                _context4.next = 12;
                 break;
               }
               if (!(_cache[address].issuedAt > Date.now() - 12 * 60 * 60 * 1000)) {
-                _context4.next = 45;
+                _context4.next = 11;
                 break;
               }
               return _context4.abrupt("return", _cache[address]);
-            case 45:
+            case 11:
               // Token expired
               delete _cache[address];
-            case 46:
+            case 12:
               if (!cacheOnly) {
-                _context4.next = 48;
+                _context4.next = 13;
                 break;
               }
               return _context4.abrupt("return");
-            case 48:
-              _context4.prev = 48;
+            case 13:
+              _context4.prev = 13;
               if (!update) {
-                _context4.next = 56;
+                _context4.next = 15;
                 break;
               }
               this.Log("Making update request on ".concat(accessType, " ").concat(id));
-              _context4.next = 53;
+              _context4.next = 14;
               return this.UpdateRequest({
                 id: id,
                 abi: abi
               });
-            case 53:
+            case 14:
               accessRequest = _context4.sent;
-              _context4.next = 60;
+              _context4.next = 17;
               break;
-            case 56:
+            case 15:
               this.Log("Making access request on ".concat(accessType, " ").concat(id));
-              _context4.next = 59;
+              _context4.next = 16;
               return this.AccessRequest({
                 id: id,
                 args: accessArgs,
                 checkAccessCharge: checkAccessCharge
               });
-            case 59:
+            case 16:
               accessRequest = _context4.sent;
-            case 60:
-              _context4.next = 69;
+            case 17:
+              _context4.next = 20;
               break;
-            case 62:
-              _context4.prev = 62;
-              _context4.t0 = _context4["catch"](48);
-              if (!_context4.t0.message.includes("UNPREDICTABLE_GAS_LIMIT")) {
-                _context4.next = 67;
+            case 18:
+              _context4.prev = 18;
+              _t9 = _context4["catch"](13);
+              if (!_t9.message.includes("UNPREDICTABLE_GAS_LIMIT")) {
+                _context4.next = 19;
                 break;
               }
-              this.Log("Permission denied for ".concat(id, ": ").concat(_context4.t0.message));
+              this.Log("Permission denied for ".concat(id, ": ").concat(_t9.message));
               throw Error("Permission denied for ".concat(Utils.FormatAddress(this.client.signer.address), " on ").concat(id, " or \n          ").concat(Utils.FormatAddress(this.client.signer.address), " have insufficient funds"));
-            case 67:
+            case 19:
               // Handle other unexpected errors
-              this.Log("Error during request for ".concat(id, ": ").concat(_context4.t0.message));
-              throw _context4.t0;
-            case 69:
+              this.Log("Error during request for ".concat(id, ": ").concat(_t9.message));
+              throw _t9;
+            case 20:
               cache = update ? this.modifyTransactions : this.accessTransactions;
-              _context4.prev = 70;
+              _context4.prev = 21;
               if (!noCache) {
                 cache[address] = {
                   issuedAt: Date.now(),
@@ -509,22 +508,22 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 });
               }
               return _context4.abrupt("return", accessRequest);
-            case 75:
-              _context4.prev = 75;
-              _context4.t1 = _context4["catch"](70);
+            case 22:
+              _context4.prev = 22;
+              _t0 = _context4["catch"](21);
               if (!noCache) {
                 delete cache[address];
               }
-              throw _context4.t1;
-            case 79:
-              _context4.prev = 79;
+              throw _t0;
+            case 23:
+              _context4.prev = 23;
               delete this.transactionLocks[id];
-              return _context4.finish(79);
-            case 82:
+              return _context4.finish(23);
+            case 24:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[36,, 79, 82], [48, 62], [70, 75]]);
+        }, _callee4, this, [[10,, 23, 24], [13, 18], [21, 22]]);
       }));
       function MakeAccessRequest(_x4) {
         return _MakeAccessRequest.apply(this, arguments);
@@ -534,17 +533,17 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AccessRequest",
     value: function () {
-      var _AccessRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref5) {
-        var id, _ref5$args, args, _ref5$checkAccessChar, checkAccessCharge, _yield$this$ContractI2, isV3, accessType, abi, accessCharge, owner, accessChargeArgs, event, methodName, contractAddress;
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      var _AccessRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref5) {
+        var id, _ref5$args, args, _ref5$checkAccessChar, checkAccessCharge, _yield$this$ContractI2, isV3, accessType, abi, accessCharge, owner, accessChargeArgs, event, methodName, contractAddress, _t1, _t10, _t11;
+        return _regeneratorRuntime.wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               id = _ref5.id, _ref5$args = _ref5.args, args = _ref5$args === void 0 ? [] : _ref5$args, _ref5$checkAccessChar = _ref5.checkAccessCharge, checkAccessCharge = _ref5$checkAccessChar === void 0 ? false : _ref5$checkAccessChar;
-              _context5.next = 3;
+              _context5.next = 1;
               return this.ContractInfo({
                 id: id
               });
-            case 3:
+            case 1:
               _yield$this$ContractI2 = _context5.sent;
               isV3 = _yield$this$ContractI2.isV3;
               accessType = _yield$this$ContractI2.accessType;
@@ -552,43 +551,43 @@ var AuthorizationClient = /*#__PURE__*/function () {
               // Send some bux if access charge is required
               accessCharge = 0;
               if (!(checkAccessCharge && accessType === ACCESS_TYPES.OBJECT)) {
-                _context5.next = 27;
+                _context5.next = 6;
                 break;
               }
-              _context5.next = 11;
+              _context5.next = 2;
               return this.Owner({
                 id: id,
                 abi: abi
               });
-            case 11:
+            case 2:
               owner = _context5.sent;
               if (Utils.EqualAddress(this.client.signer.address, owner)) {
-                _context5.next = 27;
+                _context5.next = 6;
                 break;
               }
-              _context5.prev = 13;
+              _context5.prev = 3;
               // Extract level, custom values and stakeholders from accessRequest arguments
               accessChargeArgs = isV3 ? [0, [], []] : [args[0], args[3], args[4]]; // Access charge is in wei, but methods take ether - convert to charge to ether
-              _context5.t0 = Utils;
-              _context5.next = 18;
+              _t1 = Utils;
+              _context5.next = 4;
               return this.GetAccessCharge({
                 objectId: id,
                 args: accessChargeArgs
               });
-            case 18:
-              _context5.t1 = _context5.sent;
-              accessCharge = _context5.t0.WeiToEther.call(_context5.t0, _context5.t1);
+            case 4:
+              _t10 = _context5.sent;
+              accessCharge = _t1.WeiToEther.call(_t1, _t10);
               if (isNaN(accessCharge) || !accessCharge) {
                 accessCharge = 0;
               }
-              _context5.next = 27;
+              _context5.next = 6;
               break;
-            case 23:
-              _context5.prev = 23;
-              _context5.t2 = _context5["catch"](13);
+            case 5:
+              _context5.prev = 5;
+              _t11 = _context5["catch"](3);
               this.Log("Failed to get access charge for", id);
-              this.Log(_context5.t2);
-            case 27:
+              this.Log(_t11);
+            case 6:
               if (accessCharge > 0) {
                 this.Log("Access charge: ".concat(accessCharge));
               }
@@ -598,15 +597,15 @@ var AuthorizationClient = /*#__PURE__*/function () {
               } else {
                 methodName = "accessRequest";
               }
-              _context5.next = 32;
+              _context5.next = 7;
               return this.ContractHasMethod({
                 contractAddress: contractAddress,
                 abi: abi,
                 methodName: methodName
               });
-            case 32:
+            case 7:
               if (_context5.sent) {
-                _context5.next = 35;
+                _context5.next = 8;
                 break;
               }
               this.Log("".concat(accessType, " ").concat(id, " has no ").concat(methodName, " method. Skipping"));
@@ -614,8 +613,8 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 transactionHash: "",
                 logs: []
               });
-            case 35:
-              _context5.next = 37;
+            case 8:
+              _context5.next = 9;
               return this.client.CallContractMethodAndWait({
                 contractAddress: contractAddress,
                 abi: abi,
@@ -623,20 +622,20 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 methodArgs: args,
                 value: accessCharge
               });
-            case 37:
+            case 9:
               event = _context5.sent;
               if (!(event.logs.length === 0)) {
-                _context5.next = 40;
+                _context5.next = 10;
                 break;
               }
               throw Error("Access denied (".concat(id, ")"));
-            case 40:
+            case 10:
               return _context5.abrupt("return", event);
-            case 41:
+            case 11:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[13, 23]]);
+        }, _callee5, this, [[3, 5]]);
       }));
       function AccessRequest(_x5) {
         return _AccessRequest.apply(this, arguments);
@@ -646,20 +645,20 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "UpdateRequest",
     value: function () {
-      var _UpdateRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref6) {
+      var _UpdateRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref6) {
         var id, abi, event, updateRequestEvent;
-        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+        return _regeneratorRuntime.wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               id = _ref6.id, abi = _ref6.abi;
-              _context6.next = 3;
+              _context6.next = 1;
               return this.client.CallContractMethodAndWait({
                 contractAddress: Utils.HashToAddress(id),
                 abi: abi,
                 methodName: "updateRequest",
                 methodArgs: []
               });
-            case 3:
+            case 1:
               event = _context6.sent;
               updateRequestEvent = this.client.ExtractEventFromLogs({
                 abi: abi,
@@ -667,13 +666,13 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 eventName: "UpdateRequest"
               });
               if (!(event.logs.length === 0 || !updateRequestEvent)) {
-                _context6.next = 7;
+                _context6.next = 2;
                 break;
               }
               throw Error("Update request denied for ".concat(id));
-            case 7:
+            case 2:
               return _context6.abrupt("return", event);
-            case 8:
+            case 3:
             case "end":
               return _context6.stop();
           }
@@ -720,70 +719,70 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "GenerateChannelContentToken",
     value: function () {
-      var _GenerateChannelContentToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref8) {
-        var objectId, versionHash, issuer, code, email, audienceData, context, oauthToken, _ref8$value, value, token, tenantId, kmsAddress, stateChannelApi, additionalParams, payload, signature, multiSig;
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      var _GenerateChannelContentToken = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref8) {
+        var objectId, versionHash, issuer, code, email, audienceData, context, oauthToken, _ref8$value, value, token, tenantId, kmsAddress, stateChannelApi, additionalParams, payload, signature, multiSig, _t12, _t13;
+        return _regeneratorRuntime.wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               objectId = _ref8.objectId, versionHash = _ref8.versionHash, issuer = _ref8.issuer, code = _ref8.code, email = _ref8.email, audienceData = _ref8.audienceData, context = _ref8.context, oauthToken = _ref8.oauthToken, _ref8$value = _ref8.value, value = _ref8$value === void 0 ? 0 : _ref8$value;
               if (!oauthToken) {
-                _context7.next = 5;
+                _context7.next = 2;
                 break;
               }
-              _context7.next = 4;
+              _context7.next = 1;
               return this.GenerateOauthChannelToken({
                 objectId: objectId,
                 token: oauthToken
               });
-            case 4:
+            case 1:
               return _context7.abrupt("return", _context7.sent);
-            case 5:
+            case 2:
               if (!(!this.noCache && this.channelContentTokens[objectId])) {
-                _context7.next = 11;
+                _context7.next = 4;
                 break;
               }
               if (!(this.channelContentTokens[objectId].issuedAt > Date.now() - 12 * 60 * 60 * 1000)) {
-                _context7.next = 10;
+                _context7.next = 3;
                 break;
               }
               return _context7.abrupt("return", this.channelContentTokens[objectId].token);
-            case 10:
+            case 3:
               // Token expired
               delete this.channelContentTokens[objectId];
-            case 11:
+            case 4:
               this.Log("Making state channel access request: ".concat(objectId));
               if (!issuer) {
-                _context7.next = 43;
+                _context7.next = 15;
                 break;
               }
               // Ticket API
               tenantId = issuer.replace(/^\//, "").split("/")[2];
-              _context7.prev = 14;
-              _context7.next = 17;
+              _context7.prev = 5;
+              _context7.next = 6;
               return this.client.CallContractMethod({
                 contractAddress: Utils.HashToAddress(tenantId),
                 methodName: "addressKMS"
               });
-            case 17:
+            case 6:
               kmsAddress = _context7.sent;
               if (kmsAddress) {
-                _context7.next = 20;
+                _context7.next = 7;
                 break;
               }
               throw "";
-            case 20:
-              _context7.next = 27;
+            case 7:
+              _context7.next = 10;
               break;
-            case 22:
-              _context7.prev = 22;
-              _context7.t0 = _context7["catch"](14);
-              _context7.next = 26;
+            case 8:
+              _context7.prev = 8;
+              _t12 = _context7["catch"](5);
+              _context7.next = 9;
               return this.client.DefaultKMSAddress();
-            case 26:
+            case 9:
               kmsAddress = _context7.sent;
-            case 27:
-              _context7.prev = 27;
-              _context7.next = 30;
+            case 10:
+              _context7.prev = 10;
+              _context7.next = 11;
               return Utils.ResponseToFormat("text", this.MakeAuthServiceRequest({
                 kmsId: "ikms" + Utils.AddressToHash(kmsAddress),
                 method: "POST",
@@ -793,16 +792,16 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   "_EMAIL": email
                 }
               }));
-            case 30:
+            case 11:
               token = _context7.sent;
-              _context7.next = 40;
+              _context7.next = 14;
               break;
-            case 33:
-              _context7.prev = 33;
-              _context7.t1 = _context7["catch"](27);
+            case 12:
+              _context7.prev = 12;
+              _t13 = _context7["catch"](10);
               this.Log("/as token redemption failed:", true);
-              this.Log(_context7.t1, true);
-              _context7.next = 39;
+              this.Log(_t13, true);
+              _context7.next = 13;
               return Utils.ResponseToFormat("text", this.MakeKMSRequest({
                 kmsId: "ikms" + Utils.AddressToHash(kmsAddress),
                 method: "POST",
@@ -812,14 +811,14 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   "_EMAIL": email
                 }
               }));
-            case 39:
+            case 13:
               token = _context7.sent;
-            case 40:
+            case 14:
               // Pull target object from token so token can be cached
               objectId = JSON.parse(Utils.FromB64(token)).qid;
-              _context7.next = 54;
+              _context7.next = 18;
               break;
-            case 43:
+            case 15:
               // State channel API
               if (!audienceData) {
                 audienceData = this.AudienceData({
@@ -830,7 +829,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
               }
               stateChannelApi = "elv_channelContentRequestContext";
               additionalParams = [JSON.stringify(audienceData)];
-              _context7.next = 48;
+              _context7.next = 16;
               return this.MakeKMSCall({
                 objectId: objectId,
                 methodName: stateChannelApi,
@@ -838,15 +837,15 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 params: [this.client.signer.address, Utils.HashToAddress(objectId), value, Date.now()],
                 additionalParams: additionalParams
               });
-            case 48:
+            case 16:
               payload = _context7.sent;
-              _context7.next = 51;
+              _context7.next = 17;
               return this.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(payload)));
-            case 51:
+            case 17:
               signature = _context7.sent;
               multiSig = Utils.FormatSignature(signature);
               token = "".concat(payload, ".").concat(Utils.B64(multiSig));
-            case 54:
+            case 18:
               if (!this.noCache) {
                 this.channelContentTokens[objectId] = {
                   token: token,
@@ -854,11 +853,11 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 };
               }
               return _context7.abrupt("return", token);
-            case 56:
+            case 19:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[14, 22], [27, 33]]);
+        }, _callee7, this, [[5, 8], [10, 12]]);
       }));
       function GenerateChannelContentToken(_x7) {
         return _GenerateChannelContentToken.apply(this, arguments);
@@ -868,14 +867,14 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "ChannelContentFinalize",
     value: function () {
-      var _ChannelContentFinalize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref9) {
+      var _ChannelContentFinalize = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref9) {
         var objectId, versionHash, _ref9$percent, percent, result;
-        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        return _regeneratorRuntime.wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               objectId = _ref9.objectId, versionHash = _ref9.versionHash, _ref9$percent = _ref9.percent, percent = _ref9$percent === void 0 ? 0 : _ref9$percent;
               this.Log("Making state channel finalize request: ".concat(objectId));
-              _context8.next = 4;
+              _context8.next = 1;
               return this.MakeKMSCall({
                 objectId: objectId,
                 methodName: "elv_channelContentFinalizeContext",
@@ -886,11 +885,11 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   versionHash: versionHash
                 }))]
               });
-            case 4:
+            case 1:
               result = _context8.sent;
               this.channelContentTokens[objectId] = undefined;
               return _context8.abrupt("return", result);
-            case 7:
+            case 2:
             case "end":
               return _context8.stop();
           }
@@ -904,29 +903,29 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "GenerateOauthChannelToken",
     value: function () {
-      var _GenerateOauthChannelToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref10) {
+      var _GenerateOauthChannelToken = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref0) {
         var objectId, versionHash, token, fabricToken;
-        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+        return _regeneratorRuntime.wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              objectId = _ref10.objectId, versionHash = _ref10.versionHash, token = _ref10.token;
+              objectId = _ref0.objectId, versionHash = _ref0.versionHash, token = _ref0.token;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               if (!(!this.noCache && this.channelContentTokens[objectId])) {
-                _context9.next = 6;
+                _context9.next = 2;
                 break;
               }
               if (!(this.channelContentTokens[objectId].issuedAt > Date.now() - 12 * 60 * 60 * 1000)) {
-                _context9.next = 5;
+                _context9.next = 1;
                 break;
               }
               return _context9.abrupt("return", this.channelContentTokens[objectId].token);
-            case 5:
+            case 1:
               // Token expired
               this.channelContentTokens[objectId] = undefined;
-            case 6:
-              _context9.next = 8;
+            case 2:
+              _context9.next = 3;
               return this.MakeKMSRequest({
                 objectId: objectId,
                 versionHash: versionHash,
@@ -937,10 +936,10 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   Authorization: "Bearer ".concat(token)
                 }
               });
-            case 8:
-              _context9.next = 10;
+            case 3:
+              _context9.next = 4;
               return _context9.sent.text();
-            case 10:
+            case 4:
               fabricToken = _context9.sent;
               if (!this.noCache) {
                 this.channelContentTokens[objectId] = {
@@ -949,7 +948,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 };
               }
               return _context9.abrupt("return", fabricToken);
-            case 13:
+            case 5:
             case "end":
               return _context9.stop();
           }
@@ -963,22 +962,22 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "IsV3",
     value: function () {
-      var _IsV = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref11) {
+      var _IsV = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(_ref1) {
         var id, contractName;
-        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regeneratorRuntime.wrap(function (_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
-              id = _ref11.id;
+              id = _ref1.id;
               if (!this.client.assumeV3) {
-                _context10.next = 3;
+                _context0.next = 1;
                 break;
               }
-              return _context10.abrupt("return", true);
-            case 3:
-              _context10.next = 5;
+              return _context0.abrupt("return", true);
+            case 1:
+              _context0.next = 2;
               return this.client.ethClient.ContractName(Utils.HashToAddress(id), true);
-            case 5:
-              contractName = _context10.sent;
+            case 2:
+              contractName = _context0.sent;
               if (!this.accessVersions[contractName]) {
                 this.accessVersions[contractName] = this.ContractHasMethod({
                   contractAddress: this.client.utils.HashToAddress(id),
@@ -986,17 +985,17 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   methodName: "accessRequestV3"
                 });
               }
-              _context10.next = 9;
+              _context0.next = 3;
               return this.accessVersions[contractName];
-            case 9:
-              return _context10.abrupt("return", _context10.sent);
-            case 10:
+            case 3:
+              return _context0.abrupt("return", _context0.sent);
+            case 4:
             case "end":
-              return _context10.stop();
+              return _context0.stop();
           }
-        }, _callee10, this);
+        }, _callee0, this);
       }));
-      function IsV3(_x10) {
+      function IsV3(_x0) {
         return _IsV.apply(this, arguments);
       }
       return IsV3;
@@ -1004,12 +1003,12 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AccessInfo",
     value: function () {
-      var _AccessInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref12) {
+      var _AccessInfo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(_ref10) {
         var accessType, publicKey, args, isV3, checkAccessCharge;
-        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+        return _regeneratorRuntime.wrap(function (_context1) {
+          while (1) switch (_context1.prev = _context1.next) {
             case 0:
-              accessType = _ref12.accessType, publicKey = _ref12.publicKey, args = _ref12.args, isV3 = _ref12.isV3;
+              accessType = _ref10.accessType, publicKey = _ref10.publicKey, args = _ref10.args, isV3 = _ref10.isV3;
               checkAccessCharge = false;
               if (accessType === ACCESS_TYPES.OBJECT) {
                 checkAccessCharge = true;
@@ -1032,24 +1031,23 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   }
                 }
               }
-
               if (isV3 && (!args || args.length === 0)) {
                 args = [[],
                 // customValues
                 [] // stakeholders
                 ];
               }
-              return _context11.abrupt("return", {
+              return _context1.abrupt("return", {
                 accessArgs: args,
                 checkAccessCharge: checkAccessCharge
               });
-            case 5:
+            case 1:
             case "end":
-              return _context11.stop();
+              return _context1.stop();
           }
-        }, _callee11, this);
+        }, _callee1, this);
       }));
-      function AccessInfo(_x11) {
+      function AccessInfo(_x1) {
         return _AccessInfo.apply(this, arguments);
       }
       return AccessInfo;
@@ -1057,56 +1055,56 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AccessType",
     value: function () {
-      var _AccessType = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(id) {
-        var contractName, accessType;
-        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      var _AccessType = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(id) {
+        var contractName, accessType, _t14;
+        return _regeneratorRuntime.wrap(function (_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context12.next = 2;
+              _context10.next = 1;
               return this.client.ethClient.ContractName(Utils.HashToAddress(id));
-            case 2:
-              contractName = _context12.sent;
+            case 1:
+              contractName = _context10.sent;
               if (this.accessTypes[id]) {
-                _context12.next = 23;
+                _context10.next = 11;
                 break;
               }
-              _context12.t0 = contractName;
-              _context12.next = _context12.t0 === "BaseContentSpace" ? 7 : _context12.t0 === "BaseLibrary" ? 9 : _context12.t0 === "BaseContentType" ? 11 : _context12.t0 === "BsAccessWallet" ? 13 : _context12.t0 === "BsAccessCtrlGrp" ? 15 : _context12.t0 === "BaseContent" ? 17 : _context12.t0 === "BaseTenantSpace" ? 19 : 21;
+              _t14 = contractName;
+              _context10.next = _t14 === "BaseContentSpace" ? 2 : _t14 === "BaseLibrary" ? 3 : _t14 === "BaseContentType" ? 4 : _t14 === "BsAccessWallet" ? 5 : _t14 === "BsAccessCtrlGrp" ? 6 : _t14 === "BaseContent" ? 7 : _t14 === "BaseTenantSpace" ? 8 : 9;
               break;
-            case 7:
+            case 2:
               accessType = ACCESS_TYPES.SPACE;
-              return _context12.abrupt("break", 22);
-            case 9:
+              return _context10.abrupt("continue", 10);
+            case 3:
               accessType = ACCESS_TYPES.LIBRARY;
-              return _context12.abrupt("break", 22);
-            case 11:
+              return _context10.abrupt("continue", 10);
+            case 4:
               accessType = ACCESS_TYPES.TYPE;
-              return _context12.abrupt("break", 22);
-            case 13:
+              return _context10.abrupt("continue", 10);
+            case 5:
               accessType = ACCESS_TYPES.WALLET;
-              return _context12.abrupt("break", 22);
-            case 15:
+              return _context10.abrupt("continue", 10);
+            case 6:
               accessType = ACCESS_TYPES.GROUP;
-              return _context12.abrupt("break", 22);
-            case 17:
+              return _context10.abrupt("continue", 10);
+            case 7:
               accessType = ACCESS_TYPES.OBJECT;
-              return _context12.abrupt("break", 22);
-            case 19:
+              return _context10.abrupt("continue", 10);
+            case 8:
               accessType = ACCESS_TYPES.TENANT;
-              return _context12.abrupt("break", 22);
-            case 21:
+              return _context10.abrupt("continue", 10);
+            case 9:
               accessType = ACCESS_TYPES.OTHER;
-            case 22:
+            case 10:
               this.accessTypes[id] = accessType;
-            case 23:
-              return _context12.abrupt("return", this.accessTypes[id]);
-            case 24:
+            case 11:
+              return _context10.abrupt("return", this.accessTypes[id]);
+            case 12:
             case "end":
-              return _context12.stop();
+              return _context10.stop();
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
-      function AccessType(_x12) {
+      function AccessType(_x10) {
         return _AccessType.apply(this, arguments);
       }
       return AccessType;
@@ -1114,156 +1112,156 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "AccessComplete",
     value: function () {
-      var _AccessComplete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref13) {
+      var _AccessComplete = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref11) {
         var id, score, _yield$this$ContractI3, abi, isV3, address, requestId, event;
-        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime.wrap(function (_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              id = _ref13.id, score = _ref13.score;
+              id = _ref11.id, score = _ref11.score;
               this.Log("Calling access complete on ".concat(id, " with score ").concat(score));
-              _context13.next = 4;
+              _context11.next = 1;
               return this.ContractInfo({
                 id: id
               });
-            case 4:
-              _yield$this$ContractI3 = _context13.sent;
+            case 1:
+              _yield$this$ContractI3 = _context11.sent;
               abi = _yield$this$ContractI3.abi;
               isV3 = _yield$this$ContractI3.isV3;
               address = Utils.HashToAddress(id);
               requestId = this.requestIds[address];
               if (requestId) {
-                _context13.next = 11;
+                _context11.next = 2;
                 break;
               }
               throw Error("Unknown request ID for " + id);
-            case 11:
+            case 2:
               if (!isV3) {
-                _context13.next = 17;
+                _context11.next = 4;
                 break;
               }
-              _context13.next = 14;
+              _context11.next = 3;
               return this.client.CallContractMethodAndWait({
                 contractAddress: address,
                 abi: abi,
                 methodName: "accessCompleteV3",
                 methodArgs: [requestId, [], []]
               });
-            case 14:
-              event = _context13.sent;
-              _context13.next = 20;
+            case 3:
+              event = _context11.sent;
+              _context11.next = 6;
               break;
-            case 17:
-              _context13.next = 19;
+            case 4:
+              _context11.next = 5;
               return this.client.CallContractMethodAndWait({
                 contractAddress: address,
                 abi: abi,
                 methodName: isV3 ? "accessCompleteV3" : "accessComplete",
                 methodArgs: [requestId, score, ""]
               });
-            case 19:
-              event = _context13.sent;
-            case 20:
+            case 5:
+              event = _context11.sent;
+            case 6:
               delete this.requestIds[address];
               delete this.accessTransactions[address];
-              return _context13.abrupt("return", event);
-            case 23:
+              return _context11.abrupt("return", event);
+            case 7:
             case "end":
-              return _context13.stop();
+              return _context11.stop();
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
-      function AccessComplete(_x13) {
+      function AccessComplete(_x11) {
         return _AccessComplete.apply(this, arguments);
       }
       return AccessComplete;
     }() /* Utility methods */
   }, {
     key: "ContractInfo",
-    value: function () {
-      var _ContractInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref14) {
+    value: (function () {
+      var _ContractInfo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12(_ref12) {
         var id, address, isV3, contractName, accessType, v3Version, version;
-        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+        return _regeneratorRuntime.wrap(function (_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              id = _ref14.id, address = _ref14.address;
+              id = _ref12.id, address = _ref12.address;
               if (!address) {
                 address = Utils.HashToAddress(id);
               }
               if (!id) {
                 id = Utils.AddressToObjectId(address);
               }
-              _context14.next = 5;
+              _context12.next = 1;
               return this.IsV3({
                 id: id
               });
-            case 5:
-              isV3 = _context14.sent;
-              _context14.next = 8;
+            case 1:
+              isV3 = _context12.sent;
+              _context12.next = 2;
               return this.client.ethClient.ContractName(Utils.HashToAddress(id), true);
-            case 8:
-              contractName = _context14.sent;
-              _context14.next = 11;
+            case 2:
+              contractName = _context12.sent;
+              _context12.next = 3;
               return this.AccessType(id);
-            case 11:
-              accessType = _context14.sent;
+            case 3:
+              accessType = _context12.sent;
               // Contract BsAccessCtrlGrp20210809150000PO has an outdated isAdmin method that checks a managersList array instead of managersMap
               v3Version = contractName === "BsAccessCtrlGrp20210809150000PO" && accessType === this.ACCESS_TYPES.GROUP ? "v3b" : "v3";
               version = isV3 ? v3Version : "v2";
               if (!(accessType === this.ACCESS_TYPES.OTHER)) {
-                _context14.next = 16;
+                _context12.next = 4;
                 break;
               }
-              return _context14.abrupt("return", {});
-            case 16:
-              return _context14.abrupt("return", {
+              return _context12.abrupt("return", {});
+            case 4:
+              return _context12.abrupt("return", {
                 isV3: isV3,
                 accessType: accessType,
                 abi: this.CONTRACTS[version][accessType].abi
               });
-            case 17:
+            case 5:
             case "end":
-              return _context14.stop();
+              return _context12.stop();
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
-      function ContractInfo(_x14) {
+      function ContractInfo(_x12) {
         return _ContractInfo.apply(this, arguments);
       }
       return ContractInfo;
-    }()
+    }())
   }, {
     key: "GetAccessCharge",
     value: function () {
-      var _GetAccessCharge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref15) {
+      var _GetAccessCharge = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref13) {
         var objectId, args, _yield$this$ContractI4, abi, info;
-        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime.wrap(function (_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              objectId = _ref15.objectId, args = _ref15.args;
-              _context15.next = 3;
+              objectId = _ref13.objectId, args = _ref13.args;
+              _context13.next = 1;
               return this.ContractInfo({
                 id: objectId
               });
-            case 3:
-              _yield$this$ContractI4 = _context15.sent;
+            case 1:
+              _yield$this$ContractI4 = _context13.sent;
               abi = _yield$this$ContractI4.abi;
-              _context15.next = 7;
+              _context13.next = 2;
               return this.client.CallContractMethod({
                 contractAddress: Utils.HashToAddress(objectId),
                 abi: abi,
                 methodName: "getAccessInfo",
                 methodArgs: args
               });
-            case 7:
-              info = _context15.sent;
-              return _context15.abrupt("return", info[1] === 0 ? 0 : info[2]);
-            case 9:
+            case 2:
+              info = _context13.sent;
+              return _context13.abrupt("return", info[1] === 0 ? 0 : info[2]);
+            case 3:
             case "end":
-              return _context15.stop();
+              return _context13.stop();
           }
-        }, _callee15, this);
+        }, _callee13, this);
       }));
-      function GetAccessCharge(_x15) {
+      function GetAccessCharge(_x13) {
         return _GetAccessCharge.apply(this, arguments);
       }
       return GetAccessCharge;
@@ -1271,37 +1269,37 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "Owner",
     value: function () {
-      var _Owner = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref16) {
+      var _Owner = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref14) {
         var id, address, ownerAddress;
-        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime.wrap(function (_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              id = _ref16.id, address = _ref16.address;
+              id = _ref14.id, address = _ref14.address;
               if (this.client.signer) {
-                _context16.next = 3;
+                _context14.next = 1;
                 break;
               }
-              return _context16.abrupt("return", false);
-            case 3:
+              return _context14.abrupt("return", false);
+            case 1:
               if (id) {
                 address = Utils.HashToAddress(id);
               }
-              _context16.next = 6;
+              _context14.next = 2;
               return this.client.CallContractMethod({
                 contractAddress: address,
                 methodName: "owner",
                 methodArgs: []
               });
-            case 6:
-              ownerAddress = _context16.sent;
-              return _context16.abrupt("return", Utils.FormatAddress(ownerAddress));
-            case 8:
+            case 2:
+              ownerAddress = _context14.sent;
+              return _context14.abrupt("return", Utils.FormatAddress(ownerAddress));
+            case 3:
             case "end":
-              return _context16.stop();
+              return _context14.stop();
           }
-        }, _callee16, this);
+        }, _callee14, this);
       }));
-      function Owner(_x16) {
+      function Owner(_x14) {
         return _Owner.apply(this, arguments);
       }
       return Owner;
@@ -1309,39 +1307,40 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "Sign",
     value: function () {
-      var _Sign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(message) {
-        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _Sign = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(message) {
+        var _t15, _t16, _t17;
+        return _regeneratorRuntime.wrap(function (_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              _context17.t0 = Ethers.utils;
+              _t15 = Ethers.utils;
               if (!this.client.signer.signDigest) {
-                _context17.next = 7;
+                _context15.next = 2;
                 break;
               }
-              _context17.next = 4;
+              _context15.next = 1;
               return this.client.signer.signDigest(message);
-            case 4:
-              _context17.t1 = _context17.sent;
-              _context17.next = 10;
+            case 1:
+              _t16 = _context15.sent;
+              _context15.next = 4;
               break;
-            case 7:
-              _context17.next = 9;
+            case 2:
+              _context15.next = 3;
               return this.client.signer._signingKey().signDigest(message);
-            case 9:
-              _context17.t1 = _context17.sent;
-            case 10:
-              _context17.t2 = _context17.t1;
-              _context17.next = 13;
-              return _context17.t0.joinSignature.call(_context17.t0, _context17.t2);
-            case 13:
-              return _context17.abrupt("return", _context17.sent);
-            case 14:
+            case 3:
+              _t16 = _context15.sent;
+            case 4:
+              _t17 = _t16;
+              _context15.next = 5;
+              return _t15.joinSignature.call(_t15, _t17);
+            case 5:
+              return _context15.abrupt("return", _context15.sent);
+            case 6:
             case "end":
-              return _context17.stop();
+              return _context15.stop();
           }
-        }, _callee17, this);
+        }, _callee15, this);
       }));
-      function Sign(_x17) {
+      function Sign(_x15) {
         return _Sign.apply(this, arguments);
       }
       return Sign;
@@ -1349,43 +1348,43 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "KMSAddress",
     value: function () {
-      var _KMSAddress = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref17) {
+      var _KMSAddress = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref15) {
         var objectId, versionHash, _yield$this$ContractI5, abi;
-        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.wrap(function (_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              objectId = _ref17.objectId, versionHash = _ref17.versionHash;
+              objectId = _ref15.objectId, versionHash = _ref15.versionHash;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
-              _context18.next = 4;
+              _context16.next = 1;
               return this.ContractInfo({
                 id: objectId
               });
-            case 4:
-              _yield$this$ContractI5 = _context18.sent;
+            case 1:
+              _yield$this$ContractI5 = _context16.sent;
               abi = _yield$this$ContractI5.abi;
               if (abi) {
-                _context18.next = 8;
+                _context16.next = 2;
                 break;
               }
               throw Error("Unable to determine contract info for ".concat(objectId, " - wrong network?"));
-            case 8:
-              _context18.next = 10;
+            case 2:
+              _context16.next = 3;
               return this.client.CallContractMethod({
                 contractAddress: Utils.HashToAddress(objectId),
                 abi: abi,
                 methodName: "addressKMS"
               });
-            case 10:
-              return _context18.abrupt("return", _context18.sent);
-            case 11:
+            case 3:
+              return _context16.abrupt("return", _context16.sent);
+            case 4:
             case "end":
-              return _context18.stop();
+              return _context16.stop();
           }
-        }, _callee18, this);
+        }, _callee16, this);
       }));
-      function KMSAddress(_x18) {
+      function KMSAddress(_x16) {
         return _KMSAddress.apply(this, arguments);
       }
       return KMSAddress;
@@ -1393,24 +1392,24 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "KMSInfo",
     value: function () {
-      var _KMSInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref18) {
+      var _KMSInfo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref16) {
         var objectId, versionHash, kmsId, KMSInfo, _yield$this$ContractI6, abi, _yield$this$ContractI7, _abi, publicKey;
-        return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+        return _regeneratorRuntime.wrap(function (_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              objectId = _ref18.objectId, versionHash = _ref18.versionHash, kmsId = _ref18.kmsId;
+              objectId = _ref16.objectId, versionHash = _ref16.versionHash, kmsId = _ref16.kmsId;
               if (!kmsId) {
-                _context19.next = 11;
+                _context17.next = 3;
                 break;
               }
-              _context19.next = 4;
+              _context17.next = 1;
               return this.ContractInfo({
                 address: this.client.contentSpaceAddress
               });
-            case 4:
-              _yield$this$ContractI6 = _context19.sent;
+            case 1:
+              _yield$this$ContractI6 = _context17.sent;
               abi = _yield$this$ContractI6.abi;
-              _context19.next = 8;
+              _context17.next = 2;
               return this.client.CallContractMethod({
                 contractAddress: this.client.contentSpaceAddress,
                 abi: abi,
@@ -1418,22 +1417,22 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 methodArgs: [kmsId, []],
                 formatArguments: false
               });
-            case 8:
-              KMSInfo = _context19.sent;
-              _context19.next = 19;
+            case 2:
+              KMSInfo = _context17.sent;
+              _context17.next = 6;
               break;
-            case 11:
+            case 3:
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
-              _context19.next = 14;
+              _context17.next = 4;
               return this.ContractInfo({
                 id: objectId
               });
-            case 14:
-              _yield$this$ContractI7 = _context19.sent;
+            case 4:
+              _yield$this$ContractI7 = _context17.sent;
               _abi = _yield$this$ContractI7.abi;
-              _context19.next = 18;
+              _context17.next = 5;
               return this.client.CallContractMethod({
                 contractAddress: Utils.HashToAddress(objectId),
                 abi: _abi,
@@ -1441,22 +1440,22 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 methodArgs: [[]],
                 formatArguments: false
               });
-            case 18:
-              KMSInfo = _context19.sent;
-            case 19:
+            case 5:
+              KMSInfo = _context17.sent;
+            case 6:
               // Public key is compressed and hashed
               publicKey = Ethers.utils.computePublicKey(Utils.HashToAddress(KMSInfo[1]), false);
-              return _context19.abrupt("return", {
+              return _context17.abrupt("return", {
                 urls: KMSInfo[0].split(","),
                 publicKey: publicKey
               });
-            case 21:
+            case 7:
             case "end":
-              return _context19.stop();
+              return _context17.stop();
           }
-        }, _callee19, this);
+        }, _callee17, this);
       }));
-      function KMSInfo(_x19) {
+      function KMSInfo(_x17) {
         return _KMSInfo.apply(this, arguments);
       }
       return KMSInfo;
@@ -1464,61 +1463,61 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "RetrieveConk",
     value: function () {
-      var _RetrieveConk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref19) {
+      var _RetrieveConk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref17) {
         var libraryId, objectId, kmsAddress, kmsCapId, kmsCap, cap;
-        return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+        return _regeneratorRuntime.wrap(function (_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              libraryId = _ref19.libraryId, objectId = _ref19.objectId;
+              libraryId = _ref17.libraryId, objectId = _ref17.objectId;
               if (libraryId) {
-                _context20.next = 5;
+                _context18.next = 2;
                 break;
               }
-              _context20.next = 4;
+              _context18.next = 1;
               return this.client.ContentObjectLibraryId({
                 objectId: objectId
               });
-            case 4:
-              libraryId = _context20.sent;
-            case 5:
-              _context20.next = 7;
+            case 1:
+              libraryId = _context18.sent;
+            case 2:
+              _context18.next = 3;
               return this.KMSAddress({
                 objectId: objectId
               });
-            case 7:
-              kmsAddress = _context20.sent;
+            case 3:
+              kmsAddress = _context18.sent;
               kmsCapId = "eluv.caps.ikms".concat(Utils.AddressToHash(kmsAddress));
-              _context20.next = 11;
+              _context18.next = 4;
               return this.client.ContentObjectMetadata({
                 libraryId: libraryId,
                 objectId: objectId,
                 metadataSubtree: kmsCapId
               });
-            case 11:
-              kmsCap = _context20.sent;
+            case 4:
+              kmsCap = _context18.sent;
               if (kmsCap) {
-                _context20.next = 14;
+                _context18.next = 5;
                 break;
               }
               throw Error("No KMS key set for this object");
-            case 14:
-              _context20.next = 16;
+            case 5:
+              _context18.next = 6;
               return this.MakeKMSCall({
                 objectId: objectId,
                 methodName: "elv_getEncryptionKey",
                 paramTypes: ["string", "string", "string", "string", "string"],
                 params: [this.client.contentSpaceId, libraryId, objectId, kmsCap || "", ""]
               });
-            case 16:
-              cap = _context20.sent;
-              return _context20.abrupt("return", JSON.parse(Utils.FromB58(cap.replace(/^kp__/, "")).toString("utf-8")));
-            case 18:
+            case 6:
+              cap = _context18.sent;
+              return _context18.abrupt("return", JSON.parse(Utils.FromB58(cap.replace(/^kp__/, "")).toString("utf-8")));
+            case 7:
             case "end":
-              return _context20.stop();
+              return _context18.stop();
           }
-        }, _callee20, this);
+        }, _callee18, this);
       }));
-      function RetrieveConk(_x20) {
+      function RetrieveConk(_x18) {
         return _RetrieveConk.apply(this, arguments);
       }
       return RetrieveConk;
@@ -1526,60 +1525,60 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "RetrieveReencryptionSymmetricKey",
     value: function () {
-      var _RetrieveReencryptionSymmetricKey = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref20) {
+      var _RetrieveReencryptionSymmetricKey = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref18) {
         var libraryId, objectId, kmsAddress, kmsCapId, kmsCap;
-        return _regeneratorRuntime.wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime.wrap(function (_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              libraryId = _ref20.libraryId, objectId = _ref20.objectId;
+              libraryId = _ref18.libraryId, objectId = _ref18.objectId;
               if (libraryId) {
-                _context21.next = 5;
+                _context19.next = 2;
                 break;
               }
-              _context21.next = 4;
+              _context19.next = 1;
               return this.client.ContentObjectLibraryId({
                 objectId: objectId
               });
-            case 4:
-              libraryId = _context21.sent;
-            case 5:
-              _context21.next = 7;
+            case 1:
+              libraryId = _context19.sent;
+            case 2:
+              _context19.next = 3;
               return this.KMSAddress({
                 objectId: objectId
               });
-            case 7:
-              kmsAddress = _context21.sent;
+            case 3:
+              kmsAddress = _context19.sent;
               kmsCapId = "eluv.caps.ikms".concat(Utils.AddressToHash(kmsAddress));
-              _context21.next = 11;
+              _context19.next = 4;
               return this.client.ContentObjectMetadata({
                 libraryId: libraryId,
                 objectId: objectId,
                 metadataSubtree: kmsCapId
               });
-            case 11:
-              kmsCap = _context21.sent;
+            case 4:
+              kmsCap = _context19.sent;
               if (kmsCap) {
-                _context21.next = 14;
+                _context19.next = 5;
                 break;
               }
               throw Error("No KMS key set for this object");
-            case 14:
-              _context21.next = 16;
+            case 5:
+              _context19.next = 6;
               return this.MakeKMSCall({
                 objectId: objectId,
                 methodName: "elv_getSymmetricKeyAuth",
                 paramTypes: ["string", "string", "string", "string", "string"],
                 params: [this.client.contentSpaceId, libraryId, objectId, kmsCap || "", ""]
               });
-            case 16:
-              return _context21.abrupt("return", _context21.sent);
-            case 17:
+            case 6:
+              return _context19.abrupt("return", _context19.sent);
+            case 7:
             case "end":
-              return _context21.stop();
+              return _context19.stop();
           }
-        }, _callee21, this);
+        }, _callee19, this);
       }));
-      function RetrieveReencryptionSymmetricKey(_x21) {
+      function RetrieveReencryptionSymmetricKey(_x19) {
         return _RetrieveReencryptionSymmetricKey.apply(this, arguments);
       }
       return RetrieveReencryptionSymmetricKey;
@@ -1587,89 +1586,89 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "MakeKMSCall",
     value: function () {
-      var _MakeKMSCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref21) {
-        var kmsId, tenantId, objectId, versionHash, methodName, params, paramTypes, _ref21$additionalPara, additionalParams, _ref21$signature, signature, packedHash, KMSUrls, i, kmsUrl;
-        return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+      var _MakeKMSCall = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref19) {
+        var kmsId, tenantId, objectId, versionHash, methodName, params, paramTypes, _ref19$additionalPara, additionalParams, _ref19$signature, signature, packedHash, KMSUrls, i, kmsUrl, _t18, _t19, _t20, _t21, _t22, _t23, _t24;
+        return _regeneratorRuntime.wrap(function (_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              kmsId = _ref21.kmsId, tenantId = _ref21.tenantId, objectId = _ref21.objectId, versionHash = _ref21.versionHash, methodName = _ref21.methodName, params = _ref21.params, paramTypes = _ref21.paramTypes, _ref21$additionalPara = _ref21.additionalParams, additionalParams = _ref21$additionalPara === void 0 ? [] : _ref21$additionalPara, _ref21$signature = _ref21.signature, signature = _ref21$signature === void 0 ? true : _ref21$signature;
+              kmsId = _ref19.kmsId, tenantId = _ref19.tenantId, objectId = _ref19.objectId, versionHash = _ref19.versionHash, methodName = _ref19.methodName, params = _ref19.params, paramTypes = _ref19.paramTypes, _ref19$additionalPara = _ref19.additionalParams, additionalParams = _ref19$additionalPara === void 0 ? [] : _ref19$additionalPara, _ref19$signature = _ref19.signature, signature = _ref19$signature === void 0 ? true : _ref19$signature;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               if (objectId) {
-                _context22.next = 10;
+                _context20.next = 2;
                 break;
               }
-              _context22.t0 = "ikms";
-              _context22.t1 = Utils;
-              _context22.next = 7;
+              _t18 = "ikms";
+              _t19 = Utils;
+              _context20.next = 1;
               return this.client.DefaultKMSAddress({
                 tenantId: tenantId
               });
-            case 7:
-              _context22.t2 = _context22.sent;
-              _context22.t3 = _context22.t1.AddressToHash.call(_context22.t1, _context22.t2);
-              kmsId = _context22.t0.concat.call(_context22.t0, _context22.t3);
-            case 10:
+            case 1:
+              _t20 = _context20.sent;
+              _t21 = _t19.AddressToHash.call(_t19, _t20);
+              kmsId = _t18.concat.call(_t18, _t21);
+            case 2:
               if (!signature) {
-                _context22.next = 17;
+                _context20.next = 4;
                 break;
               }
               packedHash = Ethers.utils.solidityKeccak256(paramTypes, params);
-              _context22.t4 = params;
-              _context22.next = 15;
+              _t22 = params;
+              _context20.next = 3;
               return this.Sign(packedHash);
-            case 15:
-              _context22.t5 = _context22.sent;
-              _context22.t4.push.call(_context22.t4, _context22.t5);
-            case 17:
+            case 3:
+              _t23 = _context20.sent;
+              _t22.push.call(_t22, _t23);
+            case 4:
               params = params.concat(additionalParams);
-              _context22.next = 20;
+              _context20.next = 5;
               return this.KMSInfo({
                 kmsId: kmsId,
                 objectId: objectId,
                 versionHash: versionHash
               });
-            case 20:
-              KMSUrls = _context22.sent.urls;
+            case 5:
+              KMSUrls = _context20.sent.urls;
               i = 0;
-            case 22:
+            case 6:
               if (!(i < KMSUrls.length)) {
-                _context22.next = 40;
+                _context20.next = 11;
                 break;
               }
-              _context22.prev = 23;
+              _context20.prev = 7;
               this.Log("Making KMS request:\n          URL: ".concat(KMSUrls[i], "\n          Method: ").concat(methodName, "\n          Params: ").concat(params.join(", ")));
               kmsUrl = KMSUrls[i];
               if (!this.providers[kmsUrl]) {
                 this.providers[kmsUrl] = new Ethers.providers.StaticJsonRpcProvider(kmsUrl, this.client.networkId);
               }
-              _context22.next = 29;
+              _context20.next = 8;
               return this.providers[kmsUrl].send(methodName, params);
-            case 29:
-              return _context22.abrupt("return", _context22.sent);
-            case 32:
-              _context22.prev = 32;
-              _context22.t6 = _context22["catch"](23);
-              this.Log("KMS Call Error: ".concat(_context22.t6), true);
+            case 8:
+              return _context20.abrupt("return", _context20.sent);
+            case 9:
+              _context20.prev = 9;
+              _t24 = _context20["catch"](7);
+              this.Log("KMS Call Error: ".concat(_t24), true);
 
               // If the request has been attempted on all KMS urls, throw the error
               if (!(i === KMSUrls.length - 1)) {
-                _context22.next = 37;
+                _context20.next = 10;
                 break;
               }
-              throw _context22.t6;
-            case 37:
+              throw _t24;
+            case 10:
               i++;
-              _context22.next = 22;
+              _context20.next = 6;
               break;
-            case 40:
+            case 11:
             case "end":
-              return _context22.stop();
+              return _context20.stop();
           }
-        }, _callee22, this, [[23, 32]]);
+        }, _callee20, this, [[7, 9]]);
       }));
-      function MakeKMSCall(_x22) {
+      function MakeKMSCall(_x20) {
         return _MakeKMSCall.apply(this, arguments);
       }
       return MakeKMSCall;
@@ -1677,17 +1676,17 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "MakeAuthServiceRequest",
     value: function () {
-      var _MakeAuthServiceRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref22) {
-        var kmsId, objectId, versionHash, _ref22$method, method, path, bodyType, _ref22$body, body, _ref22$queryParams, queryParams, headers;
-        return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+      var _MakeAuthServiceRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref20) {
+        var kmsId, objectId, versionHash, _ref20$method, method, path, bodyType, _ref20$body, body, _ref20$queryParams, queryParams, headers;
+        return _regeneratorRuntime.wrap(function (_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              kmsId = _ref22.kmsId, objectId = _ref22.objectId, versionHash = _ref22.versionHash, _ref22$method = _ref22.method, method = _ref22$method === void 0 ? "GET" : _ref22$method, path = _ref22.path, bodyType = _ref22.bodyType, _ref22$body = _ref22.body, body = _ref22$body === void 0 ? {} : _ref22$body, _ref22$queryParams = _ref22.queryParams, queryParams = _ref22$queryParams === void 0 ? {} : _ref22$queryParams, headers = _ref22.headers;
+              kmsId = _ref20.kmsId, objectId = _ref20.objectId, versionHash = _ref20.versionHash, _ref20$method = _ref20.method, method = _ref20$method === void 0 ? "GET" : _ref20$method, path = _ref20.path, bodyType = _ref20.bodyType, _ref20$body = _ref20.body, body = _ref20$body === void 0 ? {} : _ref20$body, _ref20$queryParams = _ref20.queryParams, queryParams = _ref20$queryParams === void 0 ? {} : _ref20$queryParams, headers = _ref20.headers;
               if (!(this.client.authServiceURIs.length === 0)) {
-                _context23.next = 5;
+                _context21.next = 2;
                 break;
               }
-              _context23.next = 4;
+              _context21.next = 1;
               return this.MakeKMSRequest({
                 kmsId: kmsId,
                 objectId: objectId,
@@ -1699,10 +1698,10 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 queryParams: queryParams,
                 headers: headers
               });
-            case 4:
-              return _context23.abrupt("return", _context23.sent);
-            case 5:
-              _context23.next = 7;
+            case 1:
+              return _context21.abrupt("return", _context21.sent);
+            case 2:
+              _context21.next = 3;
               return this.client.AuthHttpClient.Request({
                 method: method,
                 path: path,
@@ -1711,15 +1710,15 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 headers: headers,
                 queryParams: queryParams
               });
-            case 7:
-              return _context23.abrupt("return", _context23.sent);
-            case 8:
+            case 3:
+              return _context21.abrupt("return", _context21.sent);
+            case 4:
             case "end":
-              return _context23.stop();
+              return _context21.stop();
           }
-        }, _callee23, this);
+        }, _callee21, this);
       }));
-      function MakeAuthServiceRequest(_x23) {
+      function MakeAuthServiceRequest(_x21) {
         return _MakeAuthServiceRequest.apply(this, arguments);
       }
       return MakeAuthServiceRequest;
@@ -1727,46 +1726,46 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "MakeKMSRequest",
     value: function () {
-      var _MakeKMSRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref23) {
-        var kmsId, objectId, versionHash, _ref23$method, method, path, bodyType, _ref23$body, body, _ref23$queryParams, queryParams, headers, kmsUrls, kmsHttpClient;
-        return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+      var _MakeKMSRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref21) {
+        var kmsId, objectId, versionHash, _ref21$method, method, path, bodyType, _ref21$body, body, _ref21$queryParams, queryParams, headers, kmsUrls, kmsHttpClient, _t25, _t26, _t27, _t28;
+        return _regeneratorRuntime.wrap(function (_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              kmsId = _ref23.kmsId, objectId = _ref23.objectId, versionHash = _ref23.versionHash, _ref23$method = _ref23.method, method = _ref23$method === void 0 ? "GET" : _ref23$method, path = _ref23.path, bodyType = _ref23.bodyType, _ref23$body = _ref23.body, body = _ref23$body === void 0 ? {} : _ref23$body, _ref23$queryParams = _ref23.queryParams, queryParams = _ref23$queryParams === void 0 ? {} : _ref23$queryParams, headers = _ref23.headers;
+              kmsId = _ref21.kmsId, objectId = _ref21.objectId, versionHash = _ref21.versionHash, _ref21$method = _ref21.method, method = _ref21$method === void 0 ? "GET" : _ref21$method, path = _ref21.path, bodyType = _ref21.bodyType, _ref21$body = _ref21.body, body = _ref21$body === void 0 ? {} : _ref21$body, _ref21$queryParams = _ref21.queryParams, queryParams = _ref21$queryParams === void 0 ? {} : _ref21$queryParams, headers = _ref21.headers;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               if (!(!objectId && !kmsId)) {
-                _context24.next = 10;
+                _context22.next = 2;
                 break;
               }
-              _context24.t0 = "ikms";
-              _context24.t1 = Utils;
-              _context24.next = 7;
+              _t25 = "ikms";
+              _t26 = Utils;
+              _context22.next = 1;
               return this.client.DefaultKMSAddress();
-            case 7:
-              _context24.t2 = _context24.sent;
-              _context24.t3 = _context24.t1.AddressToHash.call(_context24.t1, _context24.t2);
-              kmsId = _context24.t0.concat.call(_context24.t0, _context24.t3);
-            case 10:
-              _context24.next = 12;
+            case 1:
+              _t27 = _context22.sent;
+              _t28 = _t26.AddressToHash.call(_t26, _t27);
+              kmsId = _t25.concat.call(_t25, _t28);
+            case 2:
+              _context22.next = 3;
               return this.KMSInfo({
                 kmsId: kmsId,
                 objectId: objectId,
                 versionHash: versionHash
               });
-            case 12:
-              kmsUrls = _context24.sent.urls;
+            case 3:
+              kmsUrls = _context22.sent.urls;
               if (!(!kmsUrls || !kmsUrls[0])) {
-                _context24.next = 15;
+                _context22.next = 4;
                 break;
               }
               throw Error("No KMS info set for ".concat(versionHash || objectId || "default KMS"));
-            case 15:
+            case 4:
               kmsHttpClient = new HttpClient({
                 uris: kmsUrls
               });
-              _context24.next = 18;
+              _context22.next = 5;
               return kmsHttpClient.Request({
                 method: method,
                 path: path,
@@ -1775,15 +1774,15 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 headers: headers,
                 queryParams: queryParams
               });
-            case 18:
-              return _context24.abrupt("return", _context24.sent);
-            case 19:
+            case 5:
+              return _context22.abrupt("return", _context22.sent);
+            case 6:
             case "end":
-              return _context24.stop();
+              return _context22.stop();
           }
-        }, _callee24, this);
+        }, _callee22, this);
       }));
-      function MakeKMSRequest(_x24) {
+      function MakeKMSRequest(_x22) {
         return _MakeKMSRequest.apply(this, arguments);
       }
       return MakeKMSRequest;
@@ -1791,65 +1790,65 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "ContractHasMethod",
     value: function () {
-      var _ContractHasMethod = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
+      var _ContractHasMethod = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref22) {
         var contractAddress, abi, methodName, key, method, methodSignature, methodId;
-        return _regeneratorRuntime.wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime.wrap(function (_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
             case 0:
-              contractAddress = _ref24.contractAddress, abi = _ref24.abi, methodName = _ref24.methodName;
+              contractAddress = _ref22.contractAddress, abi = _ref22.abi, methodName = _ref22.methodName;
               contractAddress = Utils.FormatAddress(contractAddress);
               key = "".concat(contractAddress, "-").concat(methodName);
               if (!(this.methodAvailability[key] === undefined)) {
-                _context25.next = 19;
+                _context23.next = 6;
                 break;
               }
               this.Log("Checking method availability: ".concat(contractAddress, " ").concat(methodName));
               if (abi) {
-                _context25.next = 9;
+                _context23.next = 2;
                 break;
               }
-              _context25.next = 8;
+              _context23.next = 1;
               return this.ContractInfo({
                 address: contractAddress
               });
-            case 8:
-              abi = _context25.sent.abi;
-            case 9:
+            case 1:
+              abi = _context23.sent.abi;
+            case 2:
               if (abi) {
-                _context25.next = 11;
+                _context23.next = 3;
                 break;
               }
               throw Error("No ABI for contract ".concat(contractAddress, " - Wrong network or deleted item?"));
-            case 11:
+            case 3:
               method = abi.find(function (method) {
                 return method.name === methodName;
               });
               if (method) {
-                _context25.next = 14;
+                _context23.next = 4;
                 break;
               }
-              return _context25.abrupt("return", false);
-            case 14:
+              return _context23.abrupt("return", false);
+            case 4:
               methodSignature = "".concat(method.name, "(").concat(method.inputs.map(function (i) {
                 return i.type;
               }).join(","), ")");
               methodId = Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(methodSignature)).replace("0x", "").slice(0, 8);
-              _context25.next = 18;
+              _context23.next = 5;
               return this.MakeElvMasterCall({
                 methodName: "elv_deployedContractHasMethod",
                 params: [contractAddress, methodId]
               });
-            case 18:
-              this.methodAvailability[key] = _context25.sent;
-            case 19:
-              return _context25.abrupt("return", this.methodAvailability[key]);
-            case 20:
+            case 5:
+              this.methodAvailability[key] = _context23.sent;
+            case 6:
+              return _context23.abrupt("return", this.methodAvailability[key]);
+            case 7:
             case "end":
-              return _context25.stop();
+              return _context23.stop();
           }
-        }, _callee25, this);
+        }, _callee23, this);
       }));
-      function ContractHasMethod(_x25) {
+      function ContractHasMethod(_x23) {
         return _ContractHasMethod.apply(this, arguments);
       }
       return ContractHasMethod;
@@ -1857,26 +1856,26 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "MakeElvMasterCall",
     value: function () {
-      var _MakeElvMasterCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref25) {
+      var _MakeElvMasterCall = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref23) {
         var methodName, params;
-        return _regeneratorRuntime.wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime.wrap(function (_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              methodName = _ref25.methodName, params = _ref25.params;
-              _context26.next = 3;
+              methodName = _ref23.methodName, params = _ref23.params;
+              _context24.next = 1;
               return this.client.ethClient.MakeProviderCall({
                 methodName: "send",
                 args: [methodName, params]
               });
-            case 3:
-              return _context26.abrupt("return", _context26.sent);
-            case 4:
+            case 1:
+              return _context24.abrupt("return", _context24.sent);
+            case 2:
             case "end":
-              return _context26.stop();
+              return _context24.stop();
           }
-        }, _callee26, this);
+        }, _callee24, this);
       }));
-      function MakeElvMasterCall(_x26) {
+      function MakeElvMasterCall(_x24) {
         return _MakeElvMasterCall.apply(this, arguments);
       }
       return MakeElvMasterCall;
@@ -1884,40 +1883,40 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "ReEncryptionConk",
     value: function () {
-      var _ReEncryptionConk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref26) {
+      var _ReEncryptionConk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var libraryId, objectId, versionHash, cap;
-        return _regeneratorRuntime.wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime.wrap(function (_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              libraryId = _ref26.libraryId, objectId = _ref26.objectId, versionHash = _ref26.versionHash;
+              libraryId = _ref24.libraryId, objectId = _ref24.objectId, versionHash = _ref24.versionHash;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               if (this.reencryptionKeys[objectId]) {
-                _context27.next = 10;
+                _context25.next = 3;
                 break;
               }
-              _context27.next = 5;
+              _context25.next = 1;
               return this.client.Crypto.GenerateTargetConk();
-            case 5:
-              cap = _context27.sent;
-              _context27.next = 8;
+            case 1:
+              cap = _context25.sent;
+              _context25.next = 2;
               return this.RetrieveReencryptionSymmetricKey({
                 libraryId: libraryId,
                 objectId: objectId
               });
-            case 8:
-              cap.symm_key = _context27.sent;
+            case 2:
+              cap.symm_key = _context25.sent;
               this.reencryptionKeys[objectId] = cap;
-            case 10:
-              return _context27.abrupt("return", this.reencryptionKeys[objectId]);
-            case 11:
+            case 3:
+              return _context25.abrupt("return", this.reencryptionKeys[objectId]);
+            case 4:
             case "end":
-              return _context27.stop();
+              return _context25.stop();
           }
-        }, _callee27, this);
+        }, _callee25, this);
       }));
-      function ReEncryptionConk(_x27) {
+      function ReEncryptionConk(_x25) {
         return _ReEncryptionConk.apply(this, arguments);
       }
       return ReEncryptionConk;
@@ -1925,57 +1924,57 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "EncryptionConk",
     value: function () {
-      var _EncryptionConk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee28(_ref27) {
+      var _EncryptionConk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref25) {
         var libraryId, objectId, versionHash, conk, _yield$this$client$Cr, secret_key;
-        return _regeneratorRuntime.wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime.wrap(function (_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              libraryId = _ref27.libraryId, objectId = _ref27.objectId, versionHash = _ref27.versionHash;
+              libraryId = _ref25.libraryId, objectId = _ref25.objectId, versionHash = _ref25.versionHash;
               if (versionHash) {
                 objectId = Utils.DecodeVersionHash(versionHash).objectId;
               }
               if (libraryId) {
-                _context28.next = 6;
+                _context26.next = 2;
                 break;
               }
-              _context28.next = 5;
+              _context26.next = 1;
               return this.client.ContentObjectLibraryId({
                 objectId: objectId
               });
-            case 5:
-              libraryId = _context28.sent;
-            case 6:
+            case 1:
+              libraryId = _context26.sent;
+            case 2:
               if (this.encryptionKeys[objectId]) {
-                _context28.next = 16;
+                _context26.next = 5;
                 break;
               }
-              _context28.next = 9;
+              _context26.next = 3;
               return this.RetrieveConk({
                 libraryId: libraryId,
                 objectId: objectId
               });
-            case 9:
-              conk = _context28.sent;
-              _context28.next = 12;
+            case 3:
+              conk = _context26.sent;
+              _context26.next = 4;
               return this.client.Crypto.GeneratePrimaryConk({
                 objectId: objectId
               });
-            case 12:
-              _yield$this$client$Cr = _context28.sent;
+            case 4:
+              _yield$this$client$Cr = _context26.sent;
               secret_key = _yield$this$client$Cr.secret_key;
               conk.secret_key = secret_key;
 
               // { secret_key, public_key, symm_key, block_size }
               this.encryptionKeys[objectId] = conk;
-            case 16:
-              return _context28.abrupt("return", this.encryptionKeys[objectId]);
-            case 17:
+            case 5:
+              return _context26.abrupt("return", this.encryptionKeys[objectId]);
+            case 6:
             case "end":
-              return _context28.stop();
+              return _context26.stop();
           }
-        }, _callee28, this);
+        }, _callee26, this);
       }));
-      function EncryptionConk(_x28) {
+      function EncryptionConk(_x26) {
         return _EncryptionConk.apply(this, arguments);
       }
       return EncryptionConk;
@@ -1983,111 +1982,111 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "RecordTags",
     value: function () {
-      var _RecordTags = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee29(_ref28) {
+      var _RecordTags = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref26) {
         var accessType, libraryId, objectId, versionHash, _yield$this$ContractI8, abi, owner;
-        return _regeneratorRuntime.wrap(function _callee29$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime.wrap(function (_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              accessType = _ref28.accessType, libraryId = _ref28.libraryId, objectId = _ref28.objectId, versionHash = _ref28.versionHash;
+              accessType = _ref26.accessType, libraryId = _ref26.libraryId, objectId = _ref26.objectId, versionHash = _ref26.versionHash;
               if (!(accessType !== ACCESS_TYPES.OBJECT)) {
-                _context29.next = 3;
+                _context27.next = 1;
                 break;
               }
-              return _context29.abrupt("return");
-            case 3:
-              _context29.next = 5;
+              return _context27.abrupt("return");
+            case 1:
+              _context27.next = 2;
               return this.ContractInfo({
                 id: objectId
               });
-            case 5:
-              _yield$this$ContractI8 = _context29.sent;
+            case 2:
+              _yield$this$ContractI8 = _context27.sent;
               abi = _yield$this$ContractI8.abi;
-              _context29.next = 9;
+              _context27.next = 3;
               return this.Owner({
                 id: objectId,
                 abi: abi
               });
-            case 9:
-              owner = _context29.sent;
+            case 3:
+              owner = _context27.sent;
               if (Utils.EqualAddress(owner, this.client.signer.address)) {
-                _context29.next = 13;
+                _context27.next = 4;
                 break;
               }
-              _context29.next = 13;
+              _context27.next = 4;
               return this.client.userProfileClient.RecordTags({
                 libraryId: libraryId,
                 objectId: objectId,
                 versionHash: versionHash
               });
-            case 13:
+            case 4:
             case "end":
-              return _context29.stop();
+              return _context27.stop();
           }
-        }, _callee29, this);
+        }, _callee27, this);
       }));
-      function RecordTags(_x29) {
+      function RecordTags(_x27) {
         return _RecordTags.apply(this, arguments);
       }
       return RecordTags;
     }() /* Creation methods */
   }, {
     key: "CreateAccessGroup",
-    value: function () {
-      var _CreateAccessGroup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee30() {
+    value: (function () {
+      var _CreateAccessGroup = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee28() {
         var _yield$this$client$et, contractAddress, transactionHash;
-        return _regeneratorRuntime.wrap(function _callee30$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime.wrap(function (_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              _context30.next = 2;
+              _context28.next = 1;
               return this.client.ethClient.DeployAccessGroupContract({
                 contentSpaceAddress: Utils.HashToAddress(this.contentSpaceId),
                 signer: this.client.signer
               });
-            case 2:
-              _yield$this$client$et = _context30.sent;
+            case 1:
+              _yield$this$client$et = _context28.sent;
               contractAddress = _yield$this$client$et.contractAddress;
               transactionHash = _yield$this$client$et.transactionHash;
-              return _context30.abrupt("return", {
+              return _context28.abrupt("return", {
                 contractAddress: contractAddress,
                 transactionHash: transactionHash
               });
-            case 6:
+            case 2:
             case "end":
-              return _context30.stop();
+              return _context28.stop();
           }
-        }, _callee30, this);
+        }, _callee28, this);
       }));
       function CreateAccessGroup() {
         return _CreateAccessGroup.apply(this, arguments);
       }
       return CreateAccessGroup;
-    }()
+    }())
   }, {
     key: "CreateContentType",
     value: function () {
-      var _CreateContentType = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee31() {
+      var _CreateContentType = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee29() {
         var _yield$this$client$et2, contractAddress, transactionHash;
-        return _regeneratorRuntime.wrap(function _callee31$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime.wrap(function (_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              _context31.next = 2;
+              _context29.next = 1;
               return this.client.ethClient.DeployTypeContract({
                 contentSpaceAddress: Utils.HashToAddress(this.contentSpaceId),
                 signer: this.client.signer
               });
-            case 2:
-              _yield$this$client$et2 = _context31.sent;
+            case 1:
+              _yield$this$client$et2 = _context29.sent;
               contractAddress = _yield$this$client$et2.contractAddress;
               transactionHash = _yield$this$client$et2.transactionHash;
-              return _context31.abrupt("return", {
+              return _context29.abrupt("return", {
                 contractAddress: contractAddress,
                 transactionHash: transactionHash
               });
-            case 6:
+            case 2:
             case "end":
-              return _context31.stop();
+              return _context29.stop();
           }
-        }, _callee31, this);
+        }, _callee29, this);
       }));
       function CreateContentType() {
         return _CreateContentType.apply(this, arguments);
@@ -2097,33 +2096,33 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "CreateContentLibrary",
     value: function () {
-      var _CreateContentLibrary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee32(_ref29) {
+      var _CreateContentLibrary = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee30(_ref27) {
         var kmsId, _yield$this$client$et3, contractAddress, transactionHash;
-        return _regeneratorRuntime.wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime.wrap(function (_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
-              kmsId = _ref29.kmsId;
-              _context32.next = 3;
+              kmsId = _ref27.kmsId;
+              _context30.next = 1;
               return this.client.ethClient.DeployLibraryContract({
                 contentSpaceAddress: Utils.HashToAddress(this.contentSpaceId),
                 kmsId: kmsId,
                 signer: this.client.signer
               });
-            case 3:
-              _yield$this$client$et3 = _context32.sent;
+            case 1:
+              _yield$this$client$et3 = _context30.sent;
               contractAddress = _yield$this$client$et3.contractAddress;
               transactionHash = _yield$this$client$et3.transactionHash;
-              return _context32.abrupt("return", {
+              return _context30.abrupt("return", {
                 contractAddress: contractAddress,
                 transactionHash: transactionHash
               });
-            case 7:
+            case 2:
             case "end":
-              return _context32.stop();
+              return _context30.stop();
           }
-        }, _callee32, this);
+        }, _callee30, this);
       }));
-      function CreateContentLibrary(_x30) {
+      function CreateContentLibrary(_x28) {
         return _CreateContentLibrary.apply(this, arguments);
       }
       return CreateContentLibrary;
@@ -2131,33 +2130,33 @@ var AuthorizationClient = /*#__PURE__*/function () {
   }, {
     key: "CreateContentObject",
     value: function () {
-      var _CreateContentObject = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee33(_ref30) {
+      var _CreateContentObject = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee31(_ref28) {
         var libraryId, typeId, _yield$this$client$et4, contractAddress, transactionHash;
-        return _regeneratorRuntime.wrap(function _callee33$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime.wrap(function (_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
-              libraryId = _ref30.libraryId, typeId = _ref30.typeId;
-              _context33.next = 3;
+              libraryId = _ref28.libraryId, typeId = _ref28.typeId;
+              _context31.next = 1;
               return this.client.ethClient.DeployContentContract({
                 contentLibraryAddress: Utils.HashToAddress(libraryId),
                 typeAddress: typeId ? Utils.HashToAddress(typeId) : Utils.nullAddress,
                 signer: this.client.signer
               });
-            case 3:
-              _yield$this$client$et4 = _context33.sent;
+            case 1:
+              _yield$this$client$et4 = _context31.sent;
               contractAddress = _yield$this$client$et4.contractAddress;
               transactionHash = _yield$this$client$et4.transactionHash;
-              return _context33.abrupt("return", {
+              return _context31.abrupt("return", {
                 contractAddress: contractAddress,
                 transactionHash: transactionHash
               });
-            case 7:
+            case 2:
             case "end":
-              return _context33.stop();
+              return _context31.stop();
           }
-        }, _callee33, this);
+        }, _callee31, this);
       }));
-      function CreateContentObject(_x31) {
+      function CreateContentObject(_x29) {
         return _CreateContentObject.apply(this, arguments);
       }
       return CreateContentObject;
@@ -2170,6 +2169,5 @@ var AuthorizationClient = /*#__PURE__*/function () {
       this.channelContentTokens = {};
     }
   }]);
-  return AuthorizationClient;
 }();
 module.exports = AuthorizationClient;