@eluvio/elv-client-js 4.2.6 → 4.2.7

package/dist/src/client/Contracts.js

@@ -36,18 +36,18 @@ var Utils = require("../Utils");
  * @return {Promise<string>} - Name of the contract
  */
 exports.ContractName = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
     var contractAddress;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           contractAddress = _ref.contractAddress;
           contractAddress = ValidateAddress(contractAddress);
-          _context.next = 4;
+          _context.next = 1;
           return this.ethClient.ContractName(contractAddress);
-        case 4:
+        case 1:
           return _context.abrupt("return", _context.sent);
-        case 5:
+        case 2:
         case "end":
           return _context.stop();
       }
@@ -71,27 +71,27 @@ exports.ContractName = /*#__PURE__*/function () {
  * @throws If ABI is not able to be determined, throws an error
  */
 exports.ContractAbi = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
     var contractAddress, id, contractInfo;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           contractAddress = _ref3.contractAddress, id = _ref3.id;
-          _context2.next = 3;
+          _context2.next = 1;
           return this.authClient.ContractInfo({
             address: contractAddress,
             id: id
           });
-        case 3:
+        case 1:
           contractInfo = _context2.sent;
           if (contractInfo) {
-            _context2.next = 6;
+            _context2.next = 2;
             break;
           }
           throw Error("Unable to determine contract info for ".concat(contractAddress));
-        case 6:
+        case 2:
           return _context2.abrupt("return", contractInfo.abi);
-        case 7:
+        case 3:
         case "end":
           return _context2.stop();
       }
@@ -113,9 +113,9 @@ exports.ContractAbi = /*#__PURE__*/function () {
  * @return {Promise<Object>} - The ABI, access type, and isV3 for the given contract
  */
 exports.ContractInfo = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref5) {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref5) {
     var id, address;
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           id = _ref5.id, address = _ref5.address;
@@ -123,7 +123,7 @@ exports.ContractInfo = /*#__PURE__*/function () {
             id: id,
             address: address
           }));
-        case 2:
+        case 1:
         case "end":
           return _context3.stop();
       }
@@ -169,13 +169,13 @@ exports.FormatContractArguments = function (_ref7) {
  * @returns {Promise<Object>} - Response containing the deployed contract address and the transaction hash of the deployment
  */
 exports.DeployContract = /*#__PURE__*/function () {
-  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref8) {
+  var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref8) {
     var abi, bytecode, constructorArgs, _ref8$overrides, overrides;
-    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+    return _regeneratorRuntime.wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           abi = _ref8.abi, bytecode = _ref8.bytecode, constructorArgs = _ref8.constructorArgs, _ref8$overrides = _ref8.overrides, overrides = _ref8$overrides === void 0 ? {} : _ref8$overrides;
-          _context4.next = 3;
+          _context4.next = 1;
           return this.ethClient.DeployContract({
             abi: abi,
             bytecode: bytecode,
@@ -183,9 +183,9 @@ exports.DeployContract = /*#__PURE__*/function () {
             overrides: overrides,
             signer: this.signer
           });
-        case 3:
+        case 1:
           return _context4.abrupt("return", _context4.sent);
-        case 4:
+        case 2:
         case "end":
           return _context4.stop();
       }
@@ -211,34 +211,34 @@ exports.DeployContract = /*#__PURE__*/function () {
  * @returns {Promise<Array<Array<Object>>>} - List of blocks, in ascending order by block number, each containing a list of the events in the block.
  */
 exports.ContractEvents = /*#__PURE__*/function () {
-  var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref10) {
-    var contractAddress, abi, _ref10$fromBlock, fromBlock, toBlock, _ref10$count, count, topics, _ref10$includeTransac, includeTransaction, blocks;
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+  var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref0) {
+    var contractAddress, abi, _ref0$fromBlock, fromBlock, toBlock, _ref0$count, count, topics, _ref0$includeTransact, includeTransaction, blocks;
+    return _regeneratorRuntime.wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          contractAddress = _ref10.contractAddress, abi = _ref10.abi, _ref10$fromBlock = _ref10.fromBlock, fromBlock = _ref10$fromBlock === void 0 ? 0 : _ref10$fromBlock, toBlock = _ref10.toBlock, _ref10$count = _ref10.count, count = _ref10$count === void 0 ? 1000 : _ref10$count, topics = _ref10.topics, _ref10$includeTransac = _ref10.includeTransaction, includeTransaction = _ref10$includeTransac === void 0 ? false : _ref10$includeTransac;
+          contractAddress = _ref0.contractAddress, abi = _ref0.abi, _ref0$fromBlock = _ref0.fromBlock, fromBlock = _ref0$fromBlock === void 0 ? 0 : _ref0$fromBlock, toBlock = _ref0.toBlock, _ref0$count = _ref0.count, count = _ref0$count === void 0 ? 1000 : _ref0$count, topics = _ref0.topics, _ref0$includeTransact = _ref0.includeTransaction, includeTransaction = _ref0$includeTransact === void 0 ? false : _ref0$includeTransact;
           contractAddress = ValidateAddress(contractAddress);
           if (abi) {
-            _context5.next = 6;
+            _context5.next = 2;
             break;
           }
-          _context5.next = 5;
+          _context5.next = 1;
           return this.ContractAbi({
             contractAddress: contractAddress
           });
-        case 5:
+        case 1:
           abi = _context5.sent;
-        case 6:
-          _context5.next = 8;
+        case 2:
+          _context5.next = 3;
           return this.FormatBlockNumbers({
             fromBlock: fromBlock,
             toBlock: toBlock,
             count: count
           });
-        case 8:
+        case 3:
           blocks = _context5.sent;
           this.Log("Querying contract events ".concat(contractAddress, " - Blocks ").concat(blocks.fromBlock, " to ").concat(blocks.toBlock));
-          _context5.next = 12;
+          _context5.next = 4;
           return this.ethClient.ContractEvents({
             contractAddress: contractAddress,
             abi: abi,
@@ -247,16 +247,16 @@ exports.ContractEvents = /*#__PURE__*/function () {
             topics: topics,
             includeTransaction: includeTransaction
           });
-        case 12:
+        case 4:
           return _context5.abrupt("return", _context5.sent);
-        case 13:
+        case 5:
         case "end":
           return _context5.stop();
       }
     }, _callee5, this);
   }));
   return function (_x5) {
-    return _ref11.apply(this, arguments);
+    return _ref1.apply(this, arguments);
   };
 }();
 
@@ -279,12 +279,12 @@ exports.ContractEvents = /*#__PURE__*/function () {
  * @returns {Promise<*>} - Response containing information about the transaction
  */
 exports.CallContractMethod = /*#__PURE__*/function () {
-  var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref12) {
-    var contractAddress, abi, methodName, _ref12$methodArgs, methodArgs, value, _ref12$overrides, overrides, _ref12$formatArgument, formatArguments, _ref12$cacheContract, cacheContract, _ref12$overrideCached, overrideCachedContract;
-    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+  var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref10) {
+    var contractAddress, abi, methodName, _ref10$methodArgs, methodArgs, value, _ref10$overrides, overrides, _ref10$formatArgument, formatArguments, _ref10$cacheContract, cacheContract, _ref10$overrideCached, overrideCachedContract;
+    return _regeneratorRuntime.wrap(function (_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          contractAddress = _ref12.contractAddress, abi = _ref12.abi, methodName = _ref12.methodName, _ref12$methodArgs = _ref12.methodArgs, methodArgs = _ref12$methodArgs === void 0 ? [] : _ref12$methodArgs, value = _ref12.value, _ref12$overrides = _ref12.overrides, overrides = _ref12$overrides === void 0 ? {} : _ref12$overrides, _ref12$formatArgument = _ref12.formatArguments, formatArguments = _ref12$formatArgument === void 0 ? true : _ref12$formatArgument, _ref12$cacheContract = _ref12.cacheContract, cacheContract = _ref12$cacheContract === void 0 ? true : _ref12$cacheContract, _ref12$overrideCached = _ref12.overrideCachedContract, overrideCachedContract = _ref12$overrideCached === void 0 ? false : _ref12$overrideCached;
+          contractAddress = _ref10.contractAddress, abi = _ref10.abi, methodName = _ref10.methodName, _ref10$methodArgs = _ref10.methodArgs, methodArgs = _ref10$methodArgs === void 0 ? [] : _ref10$methodArgs, value = _ref10.value, _ref10$overrides = _ref10.overrides, overrides = _ref10$overrides === void 0 ? {} : _ref10$overrides, _ref10$formatArgument = _ref10.formatArguments, formatArguments = _ref10$formatArgument === void 0 ? true : _ref10$formatArgument, _ref10$cacheContract = _ref10.cacheContract, cacheContract = _ref10$cacheContract === void 0 ? true : _ref10$cacheContract, _ref10$overrideCached = _ref10.overrideCachedContract, overrideCachedContract = _ref10$overrideCached === void 0 ? false : _ref10$overrideCached;
           contractAddress = ValidateAddress(contractAddress);
 
           // Delete cached visibility value if it is being changed
@@ -293,17 +293,17 @@ exports.CallContractMethod = /*#__PURE__*/function () {
             delete this.visibilityInfo[contractAddress];
           }
           if (abi) {
-            _context6.next = 8;
+            _context6.next = 2;
             break;
           }
-          _context6.next = 7;
+          _context6.next = 1;
           return this.ContractAbi({
             contractAddress: contractAddress
           });
-        case 7:
+        case 1:
           abi = _context6.sent;
-        case 8:
-          _context6.next = 10;
+        case 2:
+          _context6.next = 3;
           return this.ethClient.CallContractMethod({
             contractAddress: contractAddress,
             abi: abi,
@@ -315,16 +315,16 @@ exports.CallContractMethod = /*#__PURE__*/function () {
             cacheContract: cacheContract,
             overrideCachedContract: overrideCachedContract
           });
-        case 10:
+        case 3:
           return _context6.abrupt("return", _context6.sent);
-        case 11:
+        case 4:
         case "end":
           return _context6.stop();
       }
     }, _callee6, this);
   }));
   return function (_x6) {
-    return _ref13.apply(this, arguments);
+    return _ref11.apply(this, arguments);
   };
 }();
 
@@ -350,12 +350,12 @@ exports.CallContractMethod = /*#__PURE__*/function () {
  * the resulting event(s)
  */
 exports.CallContractMethodAndWait = /*#__PURE__*/function () {
-  var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref14) {
-    var contractAddress, abi, methodName, methodArgs, value, _ref14$overrides, overrides, _ref14$formatArgument, formatArguments, _ref14$cacheContract, cacheContract, _ref14$overrideCached, overrideCachedContract;
-    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+  var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref12) {
+    var contractAddress, abi, methodName, methodArgs, value, _ref12$overrides, overrides, _ref12$formatArgument, formatArguments, _ref12$cacheContract, cacheContract, _ref12$overrideCached, overrideCachedContract;
+    return _regeneratorRuntime.wrap(function (_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          contractAddress = _ref14.contractAddress, abi = _ref14.abi, methodName = _ref14.methodName, methodArgs = _ref14.methodArgs, value = _ref14.value, _ref14$overrides = _ref14.overrides, overrides = _ref14$overrides === void 0 ? {} : _ref14$overrides, _ref14$formatArgument = _ref14.formatArguments, formatArguments = _ref14$formatArgument === void 0 ? true : _ref14$formatArgument, _ref14$cacheContract = _ref14.cacheContract, cacheContract = _ref14$cacheContract === void 0 ? true : _ref14$cacheContract, _ref14$overrideCached = _ref14.overrideCachedContract, overrideCachedContract = _ref14$overrideCached === void 0 ? false : _ref14$overrideCached;
+          contractAddress = _ref12.contractAddress, abi = _ref12.abi, methodName = _ref12.methodName, methodArgs = _ref12.methodArgs, value = _ref12.value, _ref12$overrides = _ref12.overrides, overrides = _ref12$overrides === void 0 ? {} : _ref12$overrides, _ref12$formatArgument = _ref12.formatArguments, formatArguments = _ref12$formatArgument === void 0 ? true : _ref12$formatArgument, _ref12$cacheContract = _ref12.cacheContract, cacheContract = _ref12$cacheContract === void 0 ? true : _ref12$cacheContract, _ref12$overrideCached = _ref12.overrideCachedContract, overrideCachedContract = _ref12$overrideCached === void 0 ? false : _ref12$overrideCached;
           contractAddress = ValidateAddress(contractAddress);
 
           // Delete cached visibility value if it is being changed
@@ -364,17 +364,17 @@ exports.CallContractMethodAndWait = /*#__PURE__*/function () {
             delete this.visibilityInfo[contractAddress];
           }
           if (abi) {
-            _context7.next = 8;
+            _context7.next = 2;
             break;
           }
-          _context7.next = 7;
+          _context7.next = 1;
           return this.ContractAbi({
             contractAddress: contractAddress
           });
-        case 7:
+        case 1:
           abi = _context7.sent;
-        case 8:
-          _context7.next = 10;
+        case 2:
+          _context7.next = 3;
           return this.ethClient.CallContractMethodAndWait({
             contractAddress: contractAddress,
             abi: abi,
@@ -386,16 +386,16 @@ exports.CallContractMethodAndWait = /*#__PURE__*/function () {
             cacheContract: cacheContract,
             overrideCachedContract: overrideCachedContract
           });
-        case 10:
+        case 3:
           return _context7.abrupt("return", _context7.sent);
-        case 11:
+        case 4:
         case "end":
           return _context7.stop();
       }
     }, _callee7, this);
   }));
   return function (_x7) {
-    return _ref15.apply(this, arguments);
+    return _ref13.apply(this, arguments);
   };
 }();
 
@@ -410,45 +410,42 @@ exports.CallContractMethodAndWait = /*#__PURE__*/function () {
  * @return {Promise<Object|string>}
  */
 exports.ContractMetadata = /*#__PURE__*/function () {
-  var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref16) {
-    var contractAddress, metadataKey, metadata, data;
-    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+  var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref14) {
+    var contractAddress, metadataKey, metadata, data, _t, _t2;
+    return _regeneratorRuntime.wrap(function (_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          contractAddress = _ref16.contractAddress, metadataKey = _ref16.metadataKey;
+          contractAddress = _ref14.contractAddress, metadataKey = _ref14.metadataKey;
           ValidatePresence("contractAddress", contractAddress);
           ValidatePresence("metadataKey", metadataKey);
-          _context8.prev = 3;
-          _context8.next = 6;
+          _context8.prev = 1;
+          _context8.next = 2;
           return this.CallContractMethod({
             contractAddress: contractAddress,
             methodName: "getMeta",
             methodArgs: [metadataKey]
           });
-        case 6:
+        case 2:
           metadata = _context8.sent;
           data = Buffer.from((metadata || "").replace("0x", ""), "hex").toString("utf-8");
-          _context8.prev = 8;
+          _context8.prev = 3;
           return _context8.abrupt("return", JSON.parse(data));
-        case 12:
-          _context8.prev = 12;
-          _context8.t0 = _context8["catch"](8);
+        case 4:
+          _context8.prev = 4;
+          _t = _context8["catch"](3);
           return _context8.abrupt("return", data);
-        case 15:
-          _context8.next = 20;
-          break;
-        case 17:
-          _context8.prev = 17;
-          _context8.t1 = _context8["catch"](3);
+        case 5:
+          _context8.prev = 5;
+          _t2 = _context8["catch"](1);
           return _context8.abrupt("return", "");
-        case 20:
+        case 6:
         case "end":
           return _context8.stop();
       }
-    }, _callee8, this, [[3, 17], [8, 12]]);
+    }, _callee8, this, [[1, 5], [3, 4]]);
   }));
   return function (_x8) {
-    return _ref17.apply(this, arguments);
+    return _ref15.apply(this, arguments);
   };
 }();
 
@@ -462,45 +459,45 @@ exports.ContractMetadata = /*#__PURE__*/function () {
  * @param {string} metadata
  */
 exports.MergeContractMetadata = /*#__PURE__*/function () {
-  var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref18) {
-    var contractAddress, metadataKey, metadata, existingMetadata;
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+  var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref16) {
+    var contractAddress, metadataKey, metadata, existingMetadata, _t3;
+    return _regeneratorRuntime.wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          contractAddress = _ref18.contractAddress, metadataKey = _ref18.metadataKey, metadata = _ref18.metadata;
+          contractAddress = _ref16.contractAddress, metadataKey = _ref16.metadataKey, metadata = _ref16.metadata;
           ValidatePresence("contractAddress", contractAddress);
           ValidatePresence("metadataKey", metadataKey);
-          _context9.next = 5;
+          _context9.next = 1;
           return this.ContractMetadata({
             contractAddress: contractAddress,
             metadataKey: metadataKey
           });
-        case 5:
-          _context9.t0 = _context9.sent;
-          if (_context9.t0) {
-            _context9.next = 8;
+        case 1:
+          _t3 = _context9.sent;
+          if (_t3) {
+            _context9.next = 2;
             break;
           }
-          _context9.t0 = {};
-        case 8:
-          existingMetadata = _context9.t0;
+          _t3 = {};
+        case 2:
+          existingMetadata = _t3;
           if (_typeof(existingMetadata) === "object") {
             metadata = _objectSpread(_objectSpread({}, existingMetadata), metadata);
           }
-          _context9.next = 12;
+          _context9.next = 3;
           return this.CallContractMethodAndWait({
             contractAddress: contractAddress,
             methodName: "putMeta",
             methodArgs: [metadataKey, JSON.stringify(metadata)]
           });
-        case 12:
+        case 3:
         case "end":
           return _context9.stop();
       }
     }, _callee9, this);
   }));
   return function (_x9) {
-    return _ref19.apply(this, arguments);
+    return _ref17.apply(this, arguments);
   };
 }();
 
@@ -514,31 +511,31 @@ exports.MergeContractMetadata = /*#__PURE__*/function () {
  * @param {string|Object} metadata - The metadata to insert
  */
 exports.ReplaceContractMetadata = /*#__PURE__*/function () {
-  var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref20) {
+  var _ref19 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee0(_ref18) {
     var contractAddress, metadataKey, metadata;
-    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:
-          contractAddress = _ref20.contractAddress, metadataKey = _ref20.metadataKey, metadata = _ref20.metadata;
+          contractAddress = _ref18.contractAddress, metadataKey = _ref18.metadataKey, metadata = _ref18.metadata;
           ValidatePresence("contractAddress", contractAddress);
           ValidatePresence("metadataKey", metadataKey);
           if (_typeof(metadata) === "object") {
             metadata = JSON.stringify(metadata);
           }
-          _context10.next = 6;
+          _context0.next = 1;
           return this.CallContractMethodAndWait({
             contractAddress: contractAddress,
             methodName: "putMeta",
             methodArgs: [metadataKey, metadata]
           });
-        case 6:
+        case 1:
         case "end":
-          return _context10.stop();
+          return _context0.stop();
       }
-    }, _callee10, this);
+    }, _callee0, this);
   }));
-  return function (_x10) {
-    return _ref21.apply(this, arguments);
+  return function (_x0) {
+    return _ref19.apply(this, arguments);
   };
 }();
 
@@ -554,12 +551,12 @@ exports.ReplaceContractMetadata = /*#__PURE__*/function () {
  * @returns {Promise<string> | undefined} - If the object has a custom contract, this will return the address of the custom contract
  */
 exports.CustomContractAddress = /*#__PURE__*/function () {
-  var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref22) {
+  var _ref21 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee1(_ref20) {
     var libraryId, objectId, versionHash, abi, customContractAddress;
-    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:
-          libraryId = _ref22.libraryId, objectId = _ref22.objectId, versionHash = _ref22.versionHash;
+          libraryId = _ref20.libraryId, objectId = _ref20.objectId, versionHash = _ref20.versionHash;
           ValidateParameters({
             libraryId: libraryId,
             objectId: objectId,
@@ -569,42 +566,42 @@ exports.CustomContractAddress = /*#__PURE__*/function () {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
           if (!(libraryId === this.contentSpaceLibraryId || this.utils.EqualHash(libraryId, objectId))) {
-            _context11.next = 5;
+            _context1.next = 1;
             break;
           }
-          return _context11.abrupt("return");
-        case 5:
+          return _context1.abrupt("return");
+        case 1:
           this.Log("Retrieving custom contract address: ".concat(objectId));
-          _context11.next = 8;
+          _context1.next = 2;
           return this.ContractAbi({
             id: objectId
           });
-        case 8:
-          abi = _context11.sent;
-          _context11.next = 11;
+        case 2:
+          abi = _context1.sent;
+          _context1.next = 3;
           return this.ethClient.CallContractMethod({
             contractAddress: this.utils.HashToAddress(objectId),
             abi: abi,
             methodName: "contentContractAddress",
             methodArgs: []
           });
-        case 11:
-          customContractAddress = _context11.sent;
+        case 3:
+          customContractAddress = _context1.sent;
           if (!(customContractAddress === this.utils.nullAddress)) {
-            _context11.next = 14;
+            _context1.next = 4;
             break;
           }
-          return _context11.abrupt("return");
-        case 14:
-          return _context11.abrupt("return", this.utils.FormatAddress(customContractAddress));
-        case 15:
+          return _context1.abrupt("return");
+        case 4:
+          return _context1.abrupt("return", this.utils.FormatAddress(customContractAddress));
+        case 5:
         case "end":
-          return _context11.stop();
+          return _context1.stop();
       }
-    }, _callee11, this);
+    }, _callee1, this);
   }));
-  return function (_x11) {
-    return _ref23.apply(this, arguments);
+  return function (_x1) {
+    return _ref21.apply(this, arguments);
   };
 }();
 
@@ -627,12 +624,12 @@ exports.CustomContractAddress = /*#__PURE__*/function () {
  * @returns {Promise<Object>} - Result transaction of calling the setCustomContract method on the content object contract
  */
 exports.SetCustomContentContract = /*#__PURE__*/function () {
-  var _ref25 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(_ref24) {
-    var libraryId, objectId, customContractAddress, name, description, abi, factoryAbi, _ref24$overrides, overrides, setResult, writeToken;
-    return _regeneratorRuntime.wrap(function _callee12$(_context12) {
-      while (1) switch (_context12.prev = _context12.next) {
+  var _ref23 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref22) {
+    var libraryId, objectId, customContractAddress, name, description, abi, factoryAbi, _ref22$overrides, overrides, setResult, writeToken;
+    return _regeneratorRuntime.wrap(function (_context10) {
+      while (1) switch (_context10.prev = _context10.next) {
         case 0:
-          libraryId = _ref24.libraryId, objectId = _ref24.objectId, customContractAddress = _ref24.customContractAddress, name = _ref24.name, description = _ref24.description, abi = _ref24.abi, factoryAbi = _ref24.factoryAbi, _ref24$overrides = _ref24.overrides, overrides = _ref24$overrides === void 0 ? {} : _ref24$overrides;
+          libraryId = _ref22.libraryId, objectId = _ref22.objectId, customContractAddress = _ref22.customContractAddress, name = _ref22.name, description = _ref22.description, abi = _ref22.abi, factoryAbi = _ref22.factoryAbi, _ref22$overrides = _ref22.overrides, overrides = _ref22$overrides === void 0 ? {} : _ref22$overrides;
           ValidateParameters({
             libraryId: libraryId,
             objectId: objectId
@@ -640,23 +637,23 @@ exports.SetCustomContentContract = /*#__PURE__*/function () {
           customContractAddress = ValidateAddress(customContractAddress);
           customContractAddress = this.utils.FormatAddress(customContractAddress);
           this.Log("Setting custom contract address: ".concat(objectId, " ").concat(customContractAddress));
-          _context12.next = 7;
+          _context10.next = 1;
           return this.ethClient.SetCustomContentContract({
             contentContractAddress: this.utils.HashToAddress(objectId),
             customContractAddress: customContractAddress,
             overrides: overrides,
             signer: this.signer
           });
-        case 7:
-          setResult = _context12.sent;
-          _context12.next = 10;
+        case 1:
+          setResult = _context10.sent;
+          _context10.next = 2;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 10:
-          writeToken = _context12.sent.write_token;
-          _context12.next = 13;
+        case 2:
+          writeToken = _context10.sent.write_token;
+          _context10.next = 3;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -670,24 +667,24 @@ exports.SetCustomContentContract = /*#__PURE__*/function () {
               factoryAbi: factoryAbi
             }
           });
-        case 13:
-          _context12.next = 15;
+        case 3:
+          _context10.next = 4;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: writeToken,
             commitMessage: "Set custom contract"
           });
-        case 15:
-          return _context12.abrupt("return", setResult);
-        case 16:
+        case 4:
+          return _context10.abrupt("return", setResult);
+        case 5:
         case "end":
-          return _context12.stop();
+          return _context10.stop();
       }
-    }, _callee12, this);
+    }, _callee10, this);
   }));
-  return function (_x12) {
-    return _ref25.apply(this, arguments);
+  return function (_x10) {
+    return _ref23.apply(this, arguments);
   };
 }();
 
@@ -706,10 +703,10 @@ exports.SetCustomContentContract = /*#__PURE__*/function () {
  *
  * @returns {Promise<Object>} - The parsed event log from the event
  */
-exports.ExtractEventFromLogs = function (_ref26) {
-  var abi = _ref26.abi,
-    event = _ref26.event,
-    eventName = _ref26.eventName;
+exports.ExtractEventFromLogs = function (_ref24) {
+  var abi = _ref24.abi,
+    event = _ref24.event,
+    eventName = _ref24.eventName;
   return this.ethClient.ExtractEventFromLogs({
     abi: abi,
     event: event,
@@ -731,11 +728,11 @@ exports.ExtractEventFromLogs = function (_ref26) {
  *
  * @returns {Promise<string>} The value extracted from the event
  */
-exports.ExtractValueFromEvent = function (_ref27) {
-  var abi = _ref27.abi,
-    event = _ref27.event,
-    eventName = _ref27.eventName,
-    eventValue = _ref27.eventValue;
+exports.ExtractValueFromEvent = function (_ref25) {
+  var abi = _ref25.abi,
+    event = _ref25.event,
+    eventName = _ref25.eventName,
+    eventValue = _ref25.eventValue;
   var eventLog = this.ethClient.ExtractEventFromLogs({
     abi: abi,
     event: event,
@@ -745,16 +742,16 @@ exports.ExtractValueFromEvent = function (_ref27) {
   return eventLog ? eventLog.args[eventValue] : undefined;
 };
 exports.FormatBlockNumbers = /*#__PURE__*/function () {
-  var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref28) {
-    var fromBlock, toBlock, _ref28$count, count, latestBlock;
-    return _regeneratorRuntime.wrap(function _callee13$(_context13) {
-      while (1) switch (_context13.prev = _context13.next) {
+  var _ref27 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref26) {
+    var fromBlock, toBlock, _ref26$count, count, latestBlock;
+    return _regeneratorRuntime.wrap(function (_context11) {
+      while (1) switch (_context11.prev = _context11.next) {
         case 0:
-          fromBlock = _ref28.fromBlock, toBlock = _ref28.toBlock, _ref28$count = _ref28.count, count = _ref28$count === void 0 ? 10 : _ref28$count;
-          _context13.next = 3;
+          fromBlock = _ref26.fromBlock, toBlock = _ref26.toBlock, _ref26$count = _ref26.count, count = _ref26$count === void 0 ? 10 : _ref26$count;
+          _context11.next = 1;
           return this.BlockNumber();
-        case 3:
-          latestBlock = _context13.sent;
+        case 1:
+          latestBlock = _context11.sent;
           if (!toBlock) {
             if (!fromBlock) {
               toBlock = latestBlock;
@@ -773,18 +770,18 @@ exports.FormatBlockNumbers = /*#__PURE__*/function () {
           if (fromBlock < 0) {
             fromBlock = 0;
           }
-          return _context13.abrupt("return", {
+          return _context11.abrupt("return", {
             fromBlock: fromBlock,
             toBlock: toBlock
           });
-        case 8:
+        case 2:
         case "end":
-          return _context13.stop();
+          return _context11.stop();
       }
-    }, _callee13, this);
+    }, _callee11, this);
   }));
-  return function (_x13) {
-    return _ref29.apply(this, arguments);
+  return function (_x11) {
+    return _ref27.apply(this, arguments);
   };
 }();
 
@@ -802,42 +799,42 @@ exports.FormatBlockNumbers = /*#__PURE__*/function () {
  * Note: This requires two extra network calls per transaction, so it should not be used for very large ranges
  * @returns {Promise<Array<Array<Object>>>} - List of blocks, in ascending order by block number, each containing a list of the events in the block.
  */
-exports.Events = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14() {
-  var _ref31,
+exports.Events = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+  var _ref29,
     toBlock,
     fromBlock,
-    _ref31$count,
+    _ref29$count,
     count,
-    _ref31$includeTransac,
+    _ref29$includeTransac,
     includeTransaction,
     blocks,
-    _args14 = arguments;
-  return _regeneratorRuntime.wrap(function _callee14$(_context14) {
-    while (1) switch (_context14.prev = _context14.next) {
+    _args12 = arguments;
+  return _regeneratorRuntime.wrap(function (_context12) {
+    while (1) switch (_context12.prev = _context12.next) {
       case 0:
-        _ref31 = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {}, toBlock = _ref31.toBlock, fromBlock = _ref31.fromBlock, _ref31$count = _ref31.count, count = _ref31$count === void 0 ? 10 : _ref31$count, _ref31$includeTransac = _ref31.includeTransaction, includeTransaction = _ref31$includeTransac === void 0 ? false : _ref31$includeTransac;
-        _context14.next = 3;
+        _ref29 = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {}, toBlock = _ref29.toBlock, fromBlock = _ref29.fromBlock, _ref29$count = _ref29.count, count = _ref29$count === void 0 ? 10 : _ref29$count, _ref29$includeTransac = _ref29.includeTransaction, includeTransaction = _ref29$includeTransac === void 0 ? false : _ref29$includeTransac;
+        _context12.next = 1;
         return this.FormatBlockNumbers({
           fromBlock: fromBlock,
           toBlock: toBlock,
           count: count
         });
-      case 3:
-        blocks = _context14.sent;
+      case 1:
+        blocks = _context12.sent;
         this.Log("Querying events - Blocks ".concat(blocks.fromBlock, " to ").concat(blocks.toBlock));
-        _context14.next = 7;
+        _context12.next = 2;
         return this.ethClient.Events({
           fromBlock: blocks.fromBlock,
           toBlock: blocks.toBlock,
           includeTransaction: includeTransaction
         });
-      case 7:
-        return _context14.abrupt("return", _context14.sent);
-      case 8:
+      case 2:
+        return _context12.abrupt("return", _context12.sent);
+      case 3:
       case "end":
-        return _context14.stop();
+        return _context12.stop();
     }
-  }, _callee14, this);
+  }, _callee12, this);
 }));
 
 /**
@@ -847,21 +844,21 @@ exports.Events = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntim
  *
  * @returns {Promise<number>} - The latest block number
  */
-exports.BlockNumber = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15() {
-  return _regeneratorRuntime.wrap(function _callee15$(_context15) {
-    while (1) switch (_context15.prev = _context15.next) {
+exports.BlockNumber = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
+  return _regeneratorRuntime.wrap(function (_context13) {
+    while (1) switch (_context13.prev = _context13.next) {
       case 0:
-        _context15.next = 2;
+        _context13.next = 1;
         return this.ethClient.MakeProviderCall({
           methodName: "getBlockNumber"
         });
+      case 1:
+        return _context13.abrupt("return", _context13.sent);
       case 2:
-        return _context15.abrupt("return", _context15.sent);
-      case 3:
       case "end":
-        return _context15.stop();
+        return _context13.stop();
     }
-  }, _callee15, this);
+  }, _callee13, this);
 }));
 
 /**
@@ -874,29 +871,29 @@ exports.BlockNumber = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorR
  * @returns {Promise<string>} - Balance of the account, in ether (as string)
  */
 exports.GetBalance = /*#__PURE__*/function () {
-  var _ref34 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref33) {
+  var _ref32 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref31) {
     var address, balance;
-    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:
-          address = _ref33.address;
+          address = _ref31.address;
           address = ValidateAddress(address);
-          _context16.next = 4;
+          _context14.next = 1;
           return this.ethClient.MakeProviderCall({
             methodName: "getBalance",
             args: [address]
           });
-        case 4:
-          balance = _context16.sent;
-          return _context16.abrupt("return", Ethers.utils.formatEther(balance));
-        case 6:
+        case 1:
+          balance = _context14.sent;
+          return _context14.abrupt("return", Ethers.utils.formatEther(balance));
+        case 2:
         case "end":
-          return _context16.stop();
+          return _context14.stop();
       }
-    }, _callee16, this);
+    }, _callee14, this);
   }));
-  return function (_x14) {
-    return _ref34.apply(this, arguments);
+  return function (_x12) {
+    return _ref32.apply(this, arguments);
   };
 }();
 
@@ -911,83 +908,83 @@ exports.GetBalance = /*#__PURE__*/function () {
  * @returns {Promise<Object>} - The transaction receipt
  */
 exports.SendFunds = /*#__PURE__*/function () {
-  var _ref36 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref35) {
+  var _ref34 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref33) {
     var recipient, ether, transaction;
-    return _regeneratorRuntime.wrap(function _callee17$(_context17) {
-      while (1) switch (_context17.prev = _context17.next) {
+    return _regeneratorRuntime.wrap(function (_context15) {
+      while (1) switch (_context15.prev = _context15.next) {
         case 0:
-          recipient = _ref35.recipient, ether = _ref35.ether;
+          recipient = _ref33.recipient, ether = _ref33.ether;
           recipient = ValidateAddress(recipient);
-          _context17.next = 4;
+          _context15.next = 1;
           return this.signer.sendTransaction({
             to: recipient,
             value: Ethers.utils.parseEther(ether.toString())
           });
-        case 4:
-          transaction = _context17.sent;
-          _context17.next = 7;
+        case 1:
+          transaction = _context15.sent;
+          _context15.next = 2;
           return transaction.wait();
-        case 7:
-          return _context17.abrupt("return", _context17.sent);
-        case 8:
+        case 2:
+          return _context15.abrupt("return", _context15.sent);
+        case 3:
         case "end":
-          return _context17.stop();
+          return _context15.stop();
       }
-    }, _callee17, this);
+    }, _callee15, this);
   }));
-  return function (_x15) {
-    return _ref36.apply(this, arguments);
+  return function (_x13) {
+    return _ref34.apply(this, arguments);
   };
 }();
 var GetObjectIDAndContractAddress = /*#__PURE__*/function () {
-  var _ref38 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref37) {
+  var _ref36 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee16(_ref35) {
     var contractAddress, objectId, versionHash;
-    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:
-          contractAddress = _ref37.contractAddress, objectId = _ref37.objectId, versionHash = _ref37.versionHash;
+          contractAddress = _ref35.contractAddress, objectId = _ref35.objectId, versionHash = _ref35.versionHash;
           if (!contractAddress) {
-            _context18.next = 6;
+            _context16.next = 1;
             break;
           }
           ValidateAddress(contractAddress);
           objectId = Utils.AddressToObjectId(contractAddress);
-          _context18.next = 18;
+          _context16.next = 4;
           break;
-        case 6:
+        case 1:
           if (!versionHash) {
-            _context18.next = 12;
+            _context16.next = 2;
             break;
           }
           ValidateVersion(versionHash);
           objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           contractAddress = Utils.HashToAddress(objectId);
-          _context18.next = 18;
+          _context16.next = 4;
           break;
-        case 12:
+        case 2:
           if (!objectId) {
-            _context18.next = 17;
+            _context16.next = 3;
             break;
           }
           ValidateObject(objectId);
           contractAddress = Utils.HashToAddress(objectId);
-          _context18.next = 18;
+          _context16.next = 4;
           break;
-        case 17:
+        case 3:
           throw Error("contractAddress or objectId or versionHash not specified");
-        case 18:
-          return _context18.abrupt("return", {
+        case 4:
+          return _context16.abrupt("return", {
             contractAddress: contractAddress,
             objectId: objectId
           });
-        case 19:
+        case 5:
         case "end":
-          return _context18.stop();
+          return _context16.stop();
       }
-    }, _callee18, this);
+    }, _callee16, this);
   }));
-  return function GetObjectIDAndContractAddress(_x16) {
-    return _ref38.apply(this, arguments);
+  return function GetObjectIDAndContractAddress(_x14) {
+    return _ref36.apply(this, arguments);
   };
 }();
 
@@ -1003,74 +1000,74 @@ var GetObjectIDAndContractAddress = /*#__PURE__*/function () {
  * @returns {Promise<string|undefined>}
  */
 exports.TenantId = /*#__PURE__*/function () {
-  var _ref40 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref39) {
-    var contractAddress, objectId, versionHash, tenantId, hasGetMetaMethod, libraryId;
-    return _regeneratorRuntime.wrap(function _callee19$(_context19) {
-      while (1) switch (_context19.prev = _context19.next) {
+  var _ref38 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref37) {
+    var contractAddress, objectId, versionHash, tenantId, hasGetMetaMethod, libraryId, _t4;
+    return _regeneratorRuntime.wrap(function (_context17) {
+      while (1) switch (_context17.prev = _context17.next) {
         case 0:
-          contractAddress = _ref39.contractAddress, objectId = _ref39.objectId, versionHash = _ref39.versionHash;
-          _context19.next = 3;
+          contractAddress = _ref37.contractAddress, objectId = _ref37.objectId, versionHash = _ref37.versionHash;
+          _context17.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context19.sent;
+        case 1:
+          objectInfo = _context17.sent;
           contractAddress = objectInfo.contractAddress;
           objectId = objectInfo.objectId;
-          _context19.prev = 6;
-          _context19.next = 9;
+          _context17.prev = 2;
+          _context17.next = 3;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "getMeta"
           });
-        case 9:
-          hasGetMetaMethod = _context19.sent;
+        case 3:
+          hasGetMetaMethod = _context17.sent;
           if (!hasGetMetaMethod) {
-            _context19.next = 14;
+            _context17.next = 5;
             break;
           }
-          _context19.next = 13;
+          _context17.next = 4;
           return this.ContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_tenantId"
           });
-        case 13:
-          tenantId = _context19.sent;
-        case 14:
+        case 4:
+          tenantId = _context17.sent;
+        case 5:
           if (!(tenantId === undefined)) {
-            _context19.next = 21;
+            _context17.next = 8;
             break;
           }
-          _context19.next = 17;
+          _context17.next = 6;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 17:
-          libraryId = _context19.sent;
-          _context19.next = 20;
+        case 6:
+          libraryId = _context17.sent;
+          _context17.next = 7;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             metadataSubtree: "tenantId"
           });
-        case 20:
-          tenantId = _context19.sent;
-        case 21:
-          return _context19.abrupt("return", tenantId);
-        case 24:
-          _context19.prev = 24;
-          _context19.t0 = _context19["catch"](6);
-          return _context19.abrupt("return", "");
-        case 27:
+        case 7:
+          tenantId = _context17.sent;
+        case 8:
+          return _context17.abrupt("return", tenantId);
+        case 9:
+          _context17.prev = 9;
+          _t4 = _context17["catch"](2);
+          return _context17.abrupt("return", "");
+        case 10:
         case "end":
-          return _context19.stop();
+          return _context17.stop();
       }
-    }, _callee19, this, [[6, 24]]);
+    }, _callee17, this, [[2, 9]]);
   }));
-  return function (_x17) {
-    return _ref40.apply(this, arguments);
+  return function (_x15) {
+    return _ref38.apply(this, arguments);
   };
 }();
 
@@ -1086,74 +1083,74 @@ exports.TenantId = /*#__PURE__*/function () {
  * @returns {Promise<string|undefined>}
  */
 exports.TenantContractId = /*#__PURE__*/function () {
-  var _ref42 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref41) {
-    var contractAddress, objectId, versionHash, hasGetMetaMethod, _tenantContractId, libraryId;
-    return _regeneratorRuntime.wrap(function _callee20$(_context20) {
-      while (1) switch (_context20.prev = _context20.next) {
+  var _ref40 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref39) {
+    var contractAddress, objectId, versionHash, hasGetMetaMethod, _tenantContractId, libraryId, _t5;
+    return _regeneratorRuntime.wrap(function (_context18) {
+      while (1) switch (_context18.prev = _context18.next) {
         case 0:
-          contractAddress = _ref41.contractAddress, objectId = _ref41.objectId, versionHash = _ref41.versionHash;
-          _context20.next = 3;
+          contractAddress = _ref39.contractAddress, objectId = _ref39.objectId, versionHash = _ref39.versionHash;
+          _context18.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context20.sent;
+        case 1:
+          objectInfo = _context18.sent;
           contractAddress = objectInfo.contractAddress;
           objectId = objectInfo.objectId;
-          _context20.prev = 6;
-          _context20.next = 9;
+          _context18.prev = 2;
+          _context18.next = 3;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "getMeta"
           });
-        case 9:
-          hasGetMetaMethod = _context20.sent;
+        case 3:
+          hasGetMetaMethod = _context18.sent;
           if (!hasGetMetaMethod) {
-            _context20.next = 14;
+            _context18.next = 5;
             break;
           }
-          _context20.next = 13;
+          _context18.next = 4;
           return this.ContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_ELV_TENANT_ID"
           });
-        case 13:
-          _tenantContractId = _context20.sent;
-        case 14:
+        case 4:
+          _tenantContractId = _context18.sent;
+        case 5:
           if (!(_tenantContractId === undefined)) {
-            _context20.next = 21;
+            _context18.next = 8;
             break;
           }
-          _context20.next = 17;
+          _context18.next = 6;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 17:
-          libraryId = _context20.sent;
-          _context20.next = 20;
+        case 6:
+          libraryId = _context18.sent;
+          _context18.next = 7;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             metadataSubtree: "tenantContractId"
           });
-        case 20:
-          _tenantContractId = _context20.sent;
-        case 21:
-          return _context20.abrupt("return", _tenantContractId);
-        case 24:
-          _context20.prev = 24;
-          _context20.t0 = _context20["catch"](6);
-          return _context20.abrupt("return", "");
-        case 27:
+        case 7:
+          _tenantContractId = _context18.sent;
+        case 8:
+          return _context18.abrupt("return", _tenantContractId);
+        case 9:
+          _context18.prev = 9;
+          _t5 = _context18["catch"](2);
+          return _context18.abrupt("return", "");
+        case 10:
         case "end":
-          return _context20.stop();
+          return _context18.stop();
       }
-    }, _callee20, this, [[6, 24]]);
+    }, _callee18, this, [[2, 9]]);
   }));
-  return function (_x18) {
-    return _ref42.apply(this, arguments);
+  return function (_x16) {
+    return _ref40.apply(this, arguments);
   };
 }();
 
@@ -1172,78 +1169,78 @@ exports.TenantContractId = /*#__PURE__*/function () {
  * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
  */
 exports.SetTenantId = /*#__PURE__*/function () {
-  var _ref44 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref43) {
+  var _ref42 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref41) {
     var contractAddress, objectId, versionHash, tenantId, objectVersion, version;
-    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:
-          contractAddress = _ref43.contractAddress, objectId = _ref43.objectId, versionHash = _ref43.versionHash, tenantId = _ref43.tenantId;
-          _context21.next = 3;
+          contractAddress = _ref41.contractAddress, objectId = _ref41.objectId, versionHash = _ref41.versionHash, tenantId = _ref41.tenantId;
+          _context19.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context21.sent;
+        case 1:
+          objectInfo = _context19.sent;
           contractAddress = objectInfo.contractAddress;
           objectId = objectInfo.objectId;
-          _context21.next = 8;
+          _context19.next = 2;
           return this.authClient.AccessType(objectId);
-        case 8:
-          objectVersion = _context21.sent;
+        case 2:
+          objectVersion = _context19.sent;
           if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
-            _context21.next = 11;
+            _context19.next = 3;
             break;
           }
           throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
-        case 11:
+        case 3:
           ValidateObject(tenantId);
           if (!(!tenantId.startsWith("iten") || !Utils.ValidHash(tenantId))) {
-            _context21.next = 14;
+            _context19.next = 4;
             break;
           }
           throw Error("Invalid tenant ID: ".concat(tenantId));
-        case 14:
-          _context21.next = 16;
+        case 4:
+          _context19.next = 5;
           return this.authClient.AccessType(tenantId);
-        case 16:
-          version = _context21.sent;
+        case 5:
+          version = _context19.sent;
           if (!(version !== this.authClient.ACCESS_TYPES.GROUP)) {
-            _context21.next = 19;
+            _context19.next = 6;
             break;
           }
           throw Error("Invalid tenant ID: " + tenantId);
-        case 19:
-          _context21.next = 21;
+        case 6:
+          _context19.next = 7;
           return this.TenantContractId({
             objectId: tenantId
           });
-        case 21:
-          tenantContractId = _context21.sent;
+        case 7:
+          tenantContractId = _context19.sent;
           if (!tenantContractId) {
-            _context21.next = 28;
+            _context19.next = 9;
             break;
           }
-          _context21.next = 25;
+          _context19.next = 8;
           return this.SetTenantContractId({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash,
             tenantContractId: tenantContractId
           });
-        case 25:
-          return _context21.abrupt("return", _context21.sent);
-        case 28:
+        case 8:
+          return _context19.abrupt("return", _context19.sent);
+        case 9:
           throw Error("Invalid tenantId: tenant contract id not found");
-        case 29:
+        case 10:
         case "end":
-          return _context21.stop();
+          return _context19.stop();
       }
-    }, _callee21, this);
+    }, _callee19, this);
   }));
-  return function (_x19) {
-    return _ref44.apply(this, arguments);
+  return function (_x17) {
+    return _ref42.apply(this, arguments);
   };
 }();
 
@@ -1261,111 +1258,111 @@ exports.SetTenantId = /*#__PURE__*/function () {
  * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
  */
 exports.SetTenantContractId = /*#__PURE__*/function () {
-  var _ref46 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref45) {
+  var _ref44 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee20(_ref43) {
     var contractAddress, objectId, versionHash, tenantContractId, objectVersion, tenantAddress, version, tenantAdminGroupAddress, hasPutMetaMethod, libraryId, editRequest;
-    return _regeneratorRuntime.wrap(function _callee22$(_context22) {
-      while (1) switch (_context22.prev = _context22.next) {
+    return _regeneratorRuntime.wrap(function (_context20) {
+      while (1) switch (_context20.prev = _context20.next) {
         case 0:
-          contractAddress = _ref45.contractAddress, objectId = _ref45.objectId, versionHash = _ref45.versionHash, tenantContractId = _ref45.tenantContractId;
-          _context22.next = 3;
+          contractAddress = _ref43.contractAddress, objectId = _ref43.objectId, versionHash = _ref43.versionHash, tenantContractId = _ref43.tenantContractId;
+          _context20.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context22.sent;
+        case 1:
+          objectInfo = _context20.sent;
           contractAddress = objectInfo.contractAddress;
           objectId = objectInfo.objectId;
-          _context22.next = 8;
+          _context20.next = 2;
           return this.authClient.AccessType(objectId);
-        case 8:
-          objectVersion = _context22.sent;
+        case 2:
+          objectVersion = _context20.sent;
           if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
-            _context22.next = 11;
+            _context20.next = 3;
             break;
           }
           throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
-        case 11:
+        case 3:
           ValidateObject(tenantContractId);
           if (!(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId)))) {
-            _context22.next = 14;
+            _context20.next = 4;
             break;
           }
           throw Error("Invalid tenant ID: ".concat(tenantContractId));
-        case 14:
+        case 4:
           tenantAddress = Utils.HashToAddress(tenantContractId);
-          _context22.next = 17;
+          _context20.next = 5;
           return this.authClient.AccessType(tenantContractId);
-        case 17:
-          version = _context22.sent;
+        case 5:
+          version = _context20.sent;
           if (!(version !== this.authClient.ACCESS_TYPES.TENANT)) {
-            _context22.next = 20;
+            _context20.next = 6;
             break;
           }
           throw Error("Invalid tenant ID: " + tenantContractId);
-        case 20:
-          _context22.next = 22;
+        case 6:
+          _context20.next = 7;
           return this.CallContractMethod({
             contractAddress: tenantAddress,
             methodName: "groupsMapping",
             methodArgs: ["tenant_admin", 0],
             formatArguments: true
           });
-        case 22:
-          tenantAdminGroupAddress = _context22.sent;
-          _context22.next = 25;
+        case 7:
+          tenantAdminGroupAddress = _context20.sent;
+          _context20.next = 8;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "putMeta"
           });
-        case 25:
-          hasPutMetaMethod = _context22.sent;
+        case 8:
+          hasPutMetaMethod = _context20.sent;
           if (!hasPutMetaMethod) {
-            _context22.next = 37;
+            _context20.next = 13;
             break;
           }
-          _context22.next = 29;
+          _context20.next = 9;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_ELV_TENANT_ID",
             metadata: tenantContractId
           });
-        case 29:
+        case 9:
           if (!tenantAdminGroupAddress) {
-            _context22.next = 34;
+            _context20.next = 11;
             break;
           }
-          _context22.next = 32;
+          _context20.next = 10;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_tenantId",
             metadata: "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
           });
-        case 32:
-          _context22.next = 35;
+        case 10:
+          _context20.next = 12;
           break;
-        case 34:
+        case 11:
           // eslint-disable-next-line no-console
           console.warn("No tenant ID associated with current tenant.");
-        case 35:
-          _context22.next = 47;
+        case 12:
+          _context20.next = 17;
           break;
-        case 37:
-          _context22.next = 39;
+        case 13:
+          _context20.next = 14;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 39:
-          libraryId = _context22.sent;
-          _context22.next = 42;
+        case 14:
+          libraryId = _context20.sent;
+          _context20.next = 15;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 42:
-          editRequest = _context22.sent;
-          _context22.next = 45;
+        case 15:
+          editRequest = _context20.sent;
+          _context20.next = 16;
           return this.MergeMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1375,27 +1372,27 @@ exports.SetTenantContractId = /*#__PURE__*/function () {
               tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
             }
           });
-        case 45:
-          _context22.next = 47;
+        case 16:
+          _context20.next = 17;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: editRequest.write_token,
             commitMessage: "set tenant_contract_id"
           });
-        case 47:
-          return _context22.abrupt("return", {
+        case 17:
+          return _context20.abrupt("return", {
             tenantContractId: tenantContractId,
             tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
           });
-        case 48:
+        case 18:
         case "end":
-          return _context22.stop();
+          return _context20.stop();
       }
-    }, _callee22, this);
+    }, _callee20, this);
   }));
-  return function (_x20) {
-    return _ref46.apply(this, arguments);
+  return function (_x18) {
+    return _ref44.apply(this, arguments);
   };
 }();
 
@@ -1411,32 +1408,32 @@ exports.SetTenantContractId = /*#__PURE__*/function () {
  * @returns {Promise<void>}
  */
 exports.ResetTenantId = /*#__PURE__*/function () {
-  var _ref48 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref47) {
+  var _ref46 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref45) {
     var contractAddress, objectId, versionHash, objectVersion, tenantContractId, tenantId, hasPutMetaMethod, libraryId, editRequest;
-    return _regeneratorRuntime.wrap(function _callee23$(_context23) {
-      while (1) switch (_context23.prev = _context23.next) {
+    return _regeneratorRuntime.wrap(function (_context21) {
+      while (1) switch (_context21.prev = _context21.next) {
         case 0:
-          contractAddress = _ref47.contractAddress, objectId = _ref47.objectId, versionHash = _ref47.versionHash;
-          _context23.next = 3;
+          contractAddress = _ref45.contractAddress, objectId = _ref45.objectId, versionHash = _ref45.versionHash;
+          _context21.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context23.sent;
+        case 1:
+          objectInfo = _context21.sent;
           contractAddress = objectInfo.contractAddress;
           objectId = objectInfo.objectId;
-          _context23.next = 8;
+          _context21.next = 2;
           return this.authClient.AccessType(objectId);
-        case 8:
-          objectVersion = _context23.sent;
+        case 2:
+          objectVersion = _context21.sent;
           if (!(objectVersion !== this.authClient.ACCESS_TYPES.GROUP && objectVersion !== this.authClient.ACCESS_TYPES.WALLET && objectVersion !== this.authClient.ACCESS_TYPES.LIBRARY && objectVersion !== this.authClient.ACCESS_TYPES.TYPE && objectVersion !== this.authClient.ACCESS_TYPES.TENANT)) {
-            _context23.next = 11;
+            _context21.next = 3;
             break;
           }
           throw Error("Invalid object ID: ".concat(objectId, ", \n    applicable only for wallet,group, library or content_type object."));
-        case 11:
+        case 3:
           tenantContractId = this.TenantContractId({
             objectId: objectId
           });
@@ -1444,51 +1441,51 @@ exports.ResetTenantId = /*#__PURE__*/function () {
             objectId: objectId
           });
           if (!(tenantContractId || tenantId)) {
-            _context23.next = 36;
+            _context21.next = 12;
             break;
           }
-          _context23.next = 16;
+          _context21.next = 4;
           return this.authClient.ContractHasMethod({
             contractAddress: contractAddress,
             methodName: "putMeta"
           });
-        case 16:
-          hasPutMetaMethod = _context23.sent;
+        case 4:
+          hasPutMetaMethod = _context21.sent;
           if (!hasPutMetaMethod) {
-            _context23.next = 24;
+            _context21.next = 7;
             break;
           }
-          _context23.next = 20;
+          _context21.next = 5;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_ELV_TENANT_ID",
             metadata: ""
           });
-        case 20:
-          _context23.next = 22;
+        case 5:
+          _context21.next = 6;
           return this.ReplaceContractMetadata({
             contractAddress: contractAddress,
             metadataKey: "_tenantId",
             metadata: ""
           });
-        case 22:
-          _context23.next = 34;
+        case 6:
+          _context21.next = 11;
           break;
-        case 24:
-          _context23.next = 26;
+        case 7:
+          _context21.next = 8;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 26:
-          libraryId = _context23.sent;
-          _context23.next = 29;
+        case 8:
+          libraryId = _context21.sent;
+          _context21.next = 9;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 29:
-          editRequest = _context23.sent;
-          _context23.next = 32;
+        case 9:
+          editRequest = _context21.sent;
+          _context21.next = 10;
           return this.MergeMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -1498,28 +1495,28 @@ exports.ResetTenantId = /*#__PURE__*/function () {
               tenantId: undefined
             }
           });
-        case 32:
-          _context23.next = 34;
+        case 10:
+          _context21.next = 11;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: editRequest.write_token,
             commitMessage: "remove tenant_contract_id"
           });
-        case 34:
-          _context23.next = 37;
+        case 11:
+          _context21.next = 13;
           break;
-        case 36:
+        case 12:
           // eslint-disable-next-line no-console
           console.warn("No tenant ID associated with current tenant.");
-        case 37:
+        case 13:
         case "end":
-          return _context23.stop();
+          return _context21.stop();
       }
-    }, _callee23, this);
+    }, _callee21, this);
   }));
-  return function (_x21) {
-    return _ref48.apply(this, arguments);
+  return function (_x19) {
+    return _ref46.apply(this, arguments);
   };
 }();
 
@@ -1596,288 +1593,288 @@ var ObjectTypesToClean = Object.freeze({
  * }
  */
 exports.ObjectCleanup = /*#__PURE__*/function () {
-  var _ref50 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee29(_ref49) {
+  var _ref48 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref47) {
     var _this = this;
-    var contractAddress, objectId, versionHash, _ref49$objectTypeToCl, objectTypeToClean, isUserWallet, userAddress, allowedTypes, cleanupTasks, runCleanupTasks, results, res, groupsLength, groupAddressPromises, i, groupAddresses, cleanupResults, _iterator, _step, _step$value, addr, _res2;
-    return _regeneratorRuntime.wrap(function _callee29$(_context29) {
-      while (1) switch (_context29.prev = _context29.next) {
+    var contractAddress, objectId, versionHash, _ref47$objectTypeToCl, objectTypeToClean, isUserWallet, userAddress, allowedTypes, cleanupTasks, runCleanupTasks, results, res, groupsLength, groupAddressPromises, i, groupAddresses, cleanupResults, _iterator, _step, _step$value, addr, _res2, _t7, _t8;
+    return _regeneratorRuntime.wrap(function (_context27) {
+      while (1) switch (_context27.prev = _context27.next) {
         case 0:
-          contractAddress = _ref49.contractAddress, objectId = _ref49.objectId, versionHash = _ref49.versionHash, _ref49$objectTypeToCl = _ref49.objectTypeToClean, objectTypeToClean = _ref49$objectTypeToCl === void 0 ? ObjectTypesToClean.ALL : _ref49$objectTypeToCl;
-          _context29.next = 3;
+          contractAddress = _ref47.contractAddress, objectId = _ref47.objectId, versionHash = _ref47.versionHash, _ref47$objectTypeToCl = _ref47.objectTypeToClean, objectTypeToClean = _ref47$objectTypeToCl === void 0 ? ObjectTypesToClean.ALL : _ref47$objectTypeToCl;
+          _context27.next = 1;
           return GetObjectIDAndContractAddress({
             contractAddress: contractAddress,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 3:
-          objectInfo = _context29.sent;
+        case 1:
+          objectInfo = _context27.sent;
           contractAddress = objectInfo.contractAddress;
           isUserWallet = false;
-          _context29.prev = 6;
-          _context29.next = 9;
+          _context27.prev = 2;
+          _context27.next = 3;
           return this.CallContractMethod({
             contractAddress: contractAddress,
             methodName: "getLibrariesLength",
             formatArguments: false
           });
-        case 9:
-          _context29.next = 24;
+        case 3:
+          _context27.next = 8;
           break;
-        case 11:
-          _context29.prev = 11;
-          _context29.t0 = _context29["catch"](6);
-          _context29.prev = 13;
+        case 4:
+          _context27.prev = 4;
+          _t7 = _context27["catch"](2);
+          _context27.prev = 5;
           userAddress = contractAddress;
-          _context29.next = 17;
+          _context27.next = 6;
           return this.userProfileClient.UserWalletAddress({
             address: contractAddress
           });
-        case 17:
-          contractAddress = _context29.sent;
+        case 6:
+          contractAddress = _context27.sent;
           isUserWallet = true;
-          _context29.next = 24;
+          _context27.next = 8;
           break;
-        case 21:
-          _context29.prev = 21;
-          _context29.t1 = _context29["catch"](13);
-          throw new Error("Invalid object: ".concat(_context29.t1.message));
-        case 24:
+        case 7:
+          _context27.prev = 7;
+          _t8 = _context27["catch"](5);
+          throw new Error("Invalid object: ".concat(_t8.message));
+        case 8:
           allowedTypes = Object.values(ObjectTypesToClean);
           if (allowedTypes.includes(objectTypeToClean)) {
-            _context29.next = 27;
+            _context27.next = 9;
             break;
           }
           throw Error("Invalid objectType '".concat(objectTypeToClean, "'. Allowed types: ").concat(allowedTypes.join(", ")));
-        case 27:
+        case 9:
           cleanupTasks = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ObjectTypesToClean.LIBRARY, function () {
-            var _ref52 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref51) {
+            var _ref50 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee22(_ref49) {
               var contractAddress, res, before, after;
-              return _regeneratorRuntime.wrap(function _callee24$(_context24) {
-                while (1) switch (_context24.prev = _context24.next) {
+              return _regeneratorRuntime.wrap(function (_context22) {
+                while (1) switch (_context22.prev = _context22.next) {
                   case 0:
-                    contractAddress = _ref51.contractAddress, res = _ref51.res;
-                    _context24.next = 3;
+                    contractAddress = _ref49.contractAddress, res = _ref49.res;
+                    _context22.next = 1;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getLibrariesLength",
                       formatArguments: false
                     });
-                  case 3:
-                    before = _context24.sent;
+                  case 1:
+                    before = _context22.sent;
                     res.beforeCleanup.librariesLength = before.toNumber();
-                    _context24.next = 7;
+                    _context22.next = 2;
                     return _this.CallContractMethodAndWait({
                       contractAddress: contractAddress,
                       methodName: "cleanUpLibraries",
                       formatArguments: true
                     });
-                  case 7:
-                    _context24.next = 9;
+                  case 2:
+                    _context22.next = 3;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getLibrariesLength",
                       formatArguments: false
                     });
-                  case 9:
-                    after = _context24.sent;
+                  case 3:
+                    after = _context22.sent;
                     res.afterCleanup.librariesLength = after.toNumber();
-                  case 11:
+                  case 4:
                   case "end":
-                    return _context24.stop();
+                    return _context22.stop();
                 }
-              }, _callee24);
+              }, _callee22);
             }));
-            return function (_x23) {
-              return _ref52.apply(this, arguments);
+            return function (_x21) {
+              return _ref50.apply(this, arguments);
             };
           }()), ObjectTypesToClean.CONTENT_OBJECT, function () {
-            var _ref54 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref53) {
+            var _ref52 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref51) {
               var contractAddress, res, before, after;
-              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 = _ref53.contractAddress, res = _ref53.res;
-                    _context25.next = 3;
+                    contractAddress = _ref51.contractAddress, res = _ref51.res;
+                    _context23.next = 1;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getContentObjectsLength",
                       formatArguments: false
                     });
-                  case 3:
-                    before = _context25.sent;
+                  case 1:
+                    before = _context23.sent;
                     res.beforeCleanup.contentObjectsLength = before.toNumber();
-                    _context25.next = 7;
+                    _context23.next = 2;
                     return _this.CallContractMethodAndWait({
                       contractAddress: contractAddress,
                       methodName: "cleanUpContentObjects",
                       formatArguments: true
                     });
-                  case 7:
-                    _context25.next = 9;
+                  case 2:
+                    _context23.next = 3;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getContentObjectsLength",
                       formatArguments: false
                     });
-                  case 9:
-                    after = _context25.sent;
+                  case 3:
+                    after = _context23.sent;
                     res.afterCleanup.contentObjectsLength = after.toNumber();
-                  case 11:
+                  case 4:
                   case "end":
-                    return _context25.stop();
+                    return _context23.stop();
                 }
-              }, _callee25);
+              }, _callee23);
             }));
-            return function (_x24) {
-              return _ref54.apply(this, arguments);
+            return function (_x22) {
+              return _ref52.apply(this, arguments);
             };
           }()), ObjectTypesToClean.GROUP, function () {
-            var _ref56 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref55) {
+            var _ref54 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref53) {
               var contractAddress, res, before, after;
-              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:
-                    contractAddress = _ref55.contractAddress, res = _ref55.res;
-                    _context26.next = 3;
+                    contractAddress = _ref53.contractAddress, res = _ref53.res;
+                    _context24.next = 1;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getAccessGroupsLength",
                       formatArguments: false
                     });
-                  case 3:
-                    before = _context26.sent;
+                  case 1:
+                    before = _context24.sent;
                     res.beforeCleanup.accessGroupsLength = before.toNumber();
-                    _context26.next = 7;
+                    _context24.next = 2;
                     return _this.CallContractMethodAndWait({
                       contractAddress: contractAddress,
                       methodName: "cleanUpAccessGroups",
                       formatArguments: true
                     });
-                  case 7:
-                    _context26.next = 9;
+                  case 2:
+                    _context24.next = 3;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getAccessGroupsLength",
                       formatArguments: false
                     });
-                  case 9:
-                    after = _context26.sent;
+                  case 3:
+                    after = _context24.sent;
                     res.afterCleanup.accessGroupsLength = after.toNumber();
-                  case 11:
+                  case 4:
                   case "end":
-                    return _context26.stop();
+                    return _context24.stop();
                 }
-              }, _callee26);
+              }, _callee24);
             }));
-            return function (_x25) {
-              return _ref56.apply(this, arguments);
+            return function (_x23) {
+              return _ref54.apply(this, arguments);
             };
           }()), ObjectTypesToClean.CONTENT_TYPE, function () {
-            var _ref58 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee27(_ref57) {
+            var _ref56 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref55) {
               var contractAddress, res, before, after;
-              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:
-                    contractAddress = _ref57.contractAddress, res = _ref57.res;
-                    _context27.next = 3;
+                    contractAddress = _ref55.contractAddress, res = _ref55.res;
+                    _context25.next = 1;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getContentTypesLength",
                       formatArguments: false
                     });
-                  case 3:
-                    before = _context27.sent;
+                  case 1:
+                    before = _context25.sent;
                     res.beforeCleanup.contentTypesLength = before.toNumber();
-                    _context27.next = 7;
+                    _context25.next = 2;
                     return _this.CallContractMethodAndWait({
                       contractAddress: contractAddress,
                       methodName: "cleanUpContentTypes",
                       formatArguments: true
                     });
-                  case 7:
-                    _context27.next = 9;
+                  case 2:
+                    _context25.next = 3;
                     return _this.CallContractMethod({
                       contractAddress: contractAddress,
                       methodName: "getContentTypesLength",
                       formatArguments: false
                     });
-                  case 9:
-                    after = _context27.sent;
+                  case 3:
+                    after = _context25.sent;
                     res.afterCleanup.contentTypesLength = after.toNumber();
-                  case 11:
+                  case 4:
                   case "end":
-                    return _context27.stop();
+                    return _context25.stop();
                 }
-              }, _callee27);
+              }, _callee25);
             }));
-            return function (_x26) {
-              return _ref58.apply(this, arguments);
+            return function (_x24) {
+              return _ref56.apply(this, arguments);
             };
           }());
           runCleanupTasks = /*#__PURE__*/function () {
-            var _ref60 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee28(_ref59) {
-              var contractAddress, _res, _i, _Object$keys, type;
-              return _regeneratorRuntime.wrap(function _callee28$(_context28) {
-                while (1) switch (_context28.prev = _context28.next) {
+            var _ref58 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee26(_ref57) {
+              var contractAddress, _res, _i, _Object$keys, type, _t6;
+              return _regeneratorRuntime.wrap(function (_context26) {
+                while (1) switch (_context26.prev = _context26.next) {
                   case 0:
-                    contractAddress = _ref59.contractAddress;
-                    _context28.prev = 1;
+                    contractAddress = _ref57.contractAddress;
+                    _context26.prev = 1;
                     _res = {
                       beforeCleanup: {},
                       afterCleanup: {}
                     };
                     if (!(objectTypeToClean === ObjectTypesToClean.ALL)) {
-                      _context28.next = 14;
+                      _context26.next = 5;
                       break;
                     }
                     _i = 0, _Object$keys = Object.keys(cleanupTasks);
-                  case 5:
+                  case 2:
                     if (!(_i < _Object$keys.length)) {
-                      _context28.next = 12;
+                      _context26.next = 4;
                       break;
                     }
                     type = _Object$keys[_i];
-                    _context28.next = 9;
+                    _context26.next = 3;
                     return cleanupTasks[type]({
                       contractAddress: contractAddress,
                       res: _res
                     });
-                  case 9:
+                  case 3:
                     _i++;
-                    _context28.next = 5;
+                    _context26.next = 2;
                     break;
-                  case 12:
-                    _context28.next = 16;
+                  case 4:
+                    _context26.next = 6;
                     break;
-                  case 14:
-                    _context28.next = 16;
+                  case 5:
+                    _context26.next = 6;
                     return cleanupTasks[objectTypeToClean]({
                       contractAddress: contractAddress,
                       res: _res
                     });
-                  case 16:
-                    return _context28.abrupt("return", _res);
-                  case 19:
-                    _context28.prev = 19;
-                    _context28.t0 = _context28["catch"](1);
-                    throw new Error("Error during '".concat(objectTypeToClean, "' cleanup for ").concat(contractAddress, ": ").concat(_context28.t0.message));
-                  case 22:
+                  case 6:
+                    return _context26.abrupt("return", _res);
+                  case 7:
+                    _context26.prev = 7;
+                    _t6 = _context26["catch"](1);
+                    throw new Error("Error during '".concat(objectTypeToClean, "' cleanup for ").concat(contractAddress, ": ").concat(_t6.message));
+                  case 8:
                   case "end":
-                    return _context28.stop();
+                    return _context26.stop();
                 }
-              }, _callee28, null, [[1, 19]]);
+              }, _callee26, null, [[1, 7]]);
             }));
-            return function runCleanupTasks(_x27) {
-              return _ref60.apply(this, arguments);
+            return function runCleanupTasks(_x25) {
+              return _ref58.apply(this, arguments);
             };
           }();
           results = {}; // run cleanup on main contract
-          _context29.next = 32;
+          _context27.next = 10;
           return runCleanupTasks({
             contractAddress: contractAddress
           });
-        case 32:
-          res = _context29.sent;
+        case 10:
+          res = _context27.sent;
           if (isUserWallet) {
             results[userAddress] = res;
           } else {
@@ -1886,17 +1883,17 @@ exports.ObjectCleanup = /*#__PURE__*/function () {
 
           // run cleanup on access group contracts if this is a user wallet
           if (!isUserWallet) {
-            _context29.next = 49;
+            _context27.next = 14;
             break;
           }
-          _context29.next = 37;
+          _context27.next = 11;
           return this.CallContractMethod({
             contractAddress: contractAddress,
             methodName: "getAccessGroupsLength",
             formatArguments: false
           });
-        case 37:
-          groupsLength = _context29.sent;
+        case 11:
+          groupsLength = _context27.sent;
           if (groupsLength > 0) {
             results["groups"] = {};
           }
@@ -1909,11 +1906,11 @@ exports.ObjectCleanup = /*#__PURE__*/function () {
               formatArguments: false
             }));
           }
-          _context29.next = 43;
+          _context27.next = 12;
           return Promise.all(groupAddressPromises);
-        case 43:
-          groupAddresses = _context29.sent;
-          _context29.next = 46;
+        case 12:
+          groupAddresses = _context27.sent;
+          _context27.next = 13;
           return Promise.all(groupAddresses.map(function (addr) {
             return runCleanupTasks({
               contractAddress: addr
@@ -1921,8 +1918,8 @@ exports.ObjectCleanup = /*#__PURE__*/function () {
               return [addr, res];
             });
           }));
-        case 46:
-          cleanupResults = _context29.sent;
+        case 13:
+          cleanupResults = _context27.sent;
           _iterator = _createForOfIteratorHelper(cleanupResults);
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -1934,15 +1931,15 @@ exports.ObjectCleanup = /*#__PURE__*/function () {
           } finally {
             _iterator.f();
           }
-        case 49:
-          return _context29.abrupt("return", results);
-        case 50:
+        case 14:
+          return _context27.abrupt("return", results);
+        case 15:
         case "end":
-          return _context29.stop();
+          return _context27.stop();
       }
-    }, _callee29, this, [[6, 11], [13, 21]]);
+    }, _callee27, this, [[2, 4], [5, 7]]);
   }));
-  return function (_x22) {
-    return _ref50.apply(this, arguments);
+  return function (_x20) {
+    return _ref48.apply(this, arguments);
   };
 }();