@audius/sdk 1.0.36 → 1.0.37

package/dist/index.cjs.js

@@ -37174,9 +37174,9 @@ exports.ChatPermission = void 0;
 })(exports.ChatPermission || (exports.ChatPermission = {}));
 
 var name = "@audius/sdk";
-var version = "1.0.36";
+var version = "1.0.37";
 var audius = {
-	releaseSHA: "f5d39ff9c22d1fe9b5ca9c14261a1690575af34d"
+	releaseSHA: "dd0ddae94286c577c8a34ada50f2f79f613b55d2"
 };
 var description = "";
 var main = "dist/index.cjs.js";
@@ -55194,14 +55194,12 @@ var Account = /*#__PURE__*/function (_Base) {
             userBankOutcomes,
             feePayerOverride,
             generateRecoveryLink,
-            useEntityManager,
             phases,
             phase,
             userId,
             blockHash,
             blockNumber,
             ownerWallet,
-            response,
             newMetadata,
             _args4 = arguments;
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
@@ -55216,7 +55214,6 @@ var Account = /*#__PURE__*/function (_Base) {
                 userBankOutcomes = _args4.length > 8 && _args4[8] !== undefined ? _args4[8] : {};
                 feePayerOverride = _args4.length > 9 && _args4[9] !== undefined ? _args4[9] : null;
                 generateRecoveryLink = _args4.length > 10 && _args4[10] !== undefined ? _args4[10] : true;
-                useEntityManager = _args4.length > 11 && _args4[11] !== undefined ? _args4[11] : false;
                 phases = {
                   ADD_REPLICA_SET: 'ADD_REPLICA_SET',
                   CREATE_USER_RECORD: 'CREATE_USER_RECORD',
@@ -55226,50 +55223,50 @@ var Account = /*#__PURE__*/function (_Base) {
                   ADD_USER: 'ADD_USER'
                 };
                 phase = '';
-                _context4.prev = 11;
+                _context4.prev = 10;
                 this.REQUIRES(Services.CREATOR_NODE, Services.IDENTITY_SERVICE);
 
                 if (!this.web3Manager.web3IsExternal()) {
-                  _context4.next = 19;
+                  _context4.next = 18;
                   break;
                 }
 
                 phase = phases.CREATE_USER_RECORD;
-                _context4.next = 17;
+                _context4.next = 16;
                 return this.identityService.createUserRecord(email, this.web3Manager.getWalletAddress());
 
-              case 17:
-                _context4.next = 29;
+              case 16:
+                _context4.next = 28;
                 break;
 
-              case 19:
+              case 18:
                 this.REQUIRES(Services.HEDGEHOG); // If an owner wallet already exists, don't try to recreate it
 
                 if (hasWallet) {
-                  _context4.next = 29;
+                  _context4.next = 28;
                   break;
                 }
 
                 phase = phases.HEDGEHOG_SIGNUP;
-                _context4.next = 24;
+                _context4.next = 23;
                 return this.hedgehog.signUp(email, password);
 
-              case 24:
+              case 23:
                 ownerWallet = _context4.sent;
                 this.web3Manager.setOwnerWallet(ownerWallet);
 
                 if (!generateRecoveryLink) {
-                  _context4.next = 29;
+                  _context4.next = 28;
                   break;
                 }
 
-                _context4.next = 29;
+                _context4.next = 28;
                 return this.generateRecoveryLink({
                   handle: metadata.handle,
                   host: host
                 });
 
-              case 29:
+              case 28:
                 // Create a wAudio user bank address.
                 // If userbank creation fails, we still proceed
                 // through signup
@@ -55325,75 +55322,42 @@ var Account = /*#__PURE__*/function (_Base) {
                 } // Add user to chain
 
 
-                if (useEntityManager) {
-                  _context4.next = 47;
-                  break;
-                }
-
-                phase = phases.ADD_USER;
-                _context4.next = 34;
-                return this.User.addUser(metadata);
-
-              case 34:
-                response = _context4.sent;
-                userId = response.userId;
-                blockHash = response.blockHash;
-                blockNumber = response.blockNumber; // Assign replica set to user, updates creator_node_endpoint on chain, and then update metadata object on content node + chain (in this order)
-
-                phase = phases.ADD_REPLICA_SET;
-                _context4.next = 41;
-                return this.User.assignReplicaSet({
-                  userId: userId
-                });
-
-              case 41:
-                metadata = _context4.sent;
-                // Upload profile pic and cover photo to primary Content Node and sync across secondaries
-                phase = phases.UPLOAD_PROFILE_IMAGES;
-                _context4.next = 45;
-                return this.User.uploadProfileImages(profilePictureFile, coverPhotoFile, metadata, useEntityManager);
-
-              case 45:
-                _context4.next = 52;
-                break;
-
-              case 47:
-                _context4.next = 49;
+                _context4.next = 31;
                 return this.User.createEntityManagerUser({
                   metadata: metadata
                 });
 
-              case 49:
+              case 31:
                 newMetadata = _context4.sent;
-                _context4.next = 52;
-                return this.User.uploadProfileImages(profilePictureFile, coverPhotoFile, newMetadata, useEntityManager);
+                _context4.next = 34;
+                return this.User.uploadProfileImages(profilePictureFile, coverPhotoFile, newMetadata);
 
-              case 52:
-                _context4.next = 57;
+              case 34:
+                _context4.next = 39;
                 break;
 
-              case 54:
-                _context4.prev = 54;
-                _context4.t0 = _context4["catch"](11);
+              case 36:
+                _context4.prev = 36;
+                _context4.t0 = _context4["catch"](10);
                 return _context4.abrupt("return", {
                   error: _context4.t0.message,
                   phase: phase,
                   errorStatus: _context4.t0.response ? _context4.t0.response.status : null
                 });
 
-              case 57:
+              case 39:
                 return _context4.abrupt("return", {
                   blockHash: blockHash,
                   blockNumber: blockNumber,
                   userId: userId
                 });
 
-              case 58:
+              case 40:
               case "end":
                 return _context4.stop();
             }
           }
-        }, _callee4, this, [[11, 54]]);
+        }, _callee4, this, [[10, 36]]);
       }));
 
       function signUp(_x3, _x4, _x5) {
@@ -57479,7 +57443,7 @@ var Users = /*#__PURE__*/function (_Base) {
   }, {
     key: "uploadProfileImages",
     value: function () {
-      var _uploadProfileImages = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(profilePictureFile, coverPhotoFile, metadata, useEntityManager) {
+      var _uploadProfileImages = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13(profilePictureFile, coverPhotoFile, metadata) {
         var didMetadataUpdate, resp, _resp;
 
         return regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -57524,8 +57488,7 @@ var Users = /*#__PURE__*/function (_Base) {
                 _context13.next = 16;
                 return this.updateAndUploadMetadata({
                   newMetadata: metadata,
-                  userId: metadata.user_id,
-                  useEntityManager: useEntityManager
+                  userId: metadata.user_id
                 });
 
               case 16:
@@ -57539,7 +57502,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee13, this);
       }));
 
-      function uploadProfileImages(_x10, _x11, _x12, _x13) {
+      function uploadProfileImages(_x10, _x11, _x12) {
         return _uploadProfileImages.apply(this, arguments);
       }
 
@@ -57620,7 +57583,7 @@ var Users = /*#__PURE__*/function (_Base) {
                     }, _callee14);
                   }));
 
-                  return function (_x15) {
+                  return function (_x14) {
                     return _ref3.apply(this, arguments);
                   };
                 }()));
@@ -57669,8 +57632,7 @@ var Users = /*#__PURE__*/function (_Base) {
                 _context15.next = 42;
                 return this.updateAndUploadMetadata({
                   newMetadata: newMetadata,
-                  userId: userId,
-                  useEntityManager: true
+                  userId: userId
                 });
 
               case 42:
@@ -57702,7 +57664,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee15, this, [[7, 47]]);
       }));
 
-      function createEntityManagerUser(_x14) {
+      function createEntityManagerUser(_x13) {
         return _createEntityManagerUser.apply(this, arguments);
       }
 
@@ -57778,7 +57740,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee16, this);
       }));
 
-      function addUser(_x16) {
+      function addUser(_x15) {
         return _addUser.apply(this, arguments);
       }
 
@@ -57813,7 +57775,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee17, this);
       }));
 
-      function updateEntityManagerReplicaSet(_x17) {
+      function updateEntityManagerReplicaSet(_x16) {
         return _updateEntityManagerReplicaSet.apply(this, arguments);
       }
 
@@ -57876,7 +57838,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee18, this);
       }));
 
-      function updateUser(_x18, _x19) {
+      function updateUser(_x17, _x18) {
         return _updateUser.apply(this, arguments);
       }
 
@@ -57889,8 +57851,8 @@ var Users = /*#__PURE__*/function (_Base) {
   }, {
     key: "updateCreator",
     value: function () {
-      var _updateCreator = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19(userId, metadata, useEntityManager) {
-        var newMetadata, logPrefix, fnStartMs, startMs, user, oldMetadata, updateEndpointTxBlockNumber, _yield$this$creatorNo, metadataMultihash, metadataFileUUID, txReceipt, latestBlockHash, latestBlockNumber, updatedMultihashDecoded, updateMultiHashResp, updateUserResp, response;
+      var _updateCreator = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19(userId, metadata) {
+        var newMetadata, logPrefix, fnStartMs, startMs, user, oldMetadata, updateEndpointTxBlockNumber, _yield$this$creatorNo, metadataMultihash, metadataFileUUID, response, txReceipt, latestBlockNumber, latestBlockHash;
 
         return regeneratorRuntime.wrap(function _callee19$(_context19) {
           while (1) {
@@ -57902,7 +57864,7 @@ var Users = /*#__PURE__*/function (_Base) {
 
                 this._validateUserMetadata(newMetadata);
 
-                logPrefix = "[User:updateCreator()] [userId: ".concat(userId, "] [useEntityManager: ").concat(useEntityManager, "]");
+                logPrefix = "[User:updateCreator()] [userId: ".concat(userId, "]");
                 fnStartMs = Date.now();
                 startMs = fnStartMs; // Error if libs instance does not already have existing user state
 
@@ -57951,60 +57913,28 @@ var Users = /*#__PURE__*/function (_Base) {
                 _yield$this$creatorNo = _context19.sent;
                 metadataMultihash = _yield$this$creatorNo.metadataMultihash;
                 metadataFileUUID = _yield$this$creatorNo.metadataFileUUID;
-
-                if (useEntityManager) {
-                  _context19.next = 37;
-                  break;
-                }
-
-                // Write metadata multihash to chain
-                updatedMultihashDecoded = Utils.decodeMultihash(metadataMultihash);
-                _context19.next = 28;
-                return this.contracts.UserFactoryClient.updateMultihash(userId, updatedMultihashDecoded.digest);
-
-              case 28:
-                updateMultiHashResp = _context19.sent;
-                txReceipt = updateMultiHashResp.txReceipt; // Write remaining metadata fields to chain
-
-                _context19.next = 32;
-                return this._updateUserOperations(newMetadata, oldMetadata, userId);
-
-              case 32:
-                updateUserResp = _context19.sent;
-                latestBlockHash = updateUserResp.latestBlockHash;
-                latestBlockNumber = Math.max(txReceipt.blockNumber, updateUserResp.latestBlockNumber);
-                _context19.next = 42;
-                break;
-
-              case 37:
-                _context19.next = 39;
+                _context19.next = 26;
                 return this.contracts.EntityManagerClient.manageEntity(userId, EntityManagerClient.EntityType.USER, userId, EntityManagerClient.Action.UPDATE, metadataMultihash);
 
-              case 39:
+              case 26:
                 response = _context19.sent;
                 txReceipt = response.txReceipt;
                 latestBlockNumber = txReceipt.blockNumber;
+                latestBlockHash = txReceipt.blockHash; // Write to CN to associate blockchain user id with updated metadata and block number
 
-              case 42:
-                _context19.next = 44;
+                _context19.next = 32;
                 return this.creatorNode.associateCreator(userId, metadataFileUUID, latestBlockNumber);
 
-              case 44:
+              case 32:
                 // Update libs instance with new user metadata object
                 this.userStateManager.setCurrentUser(_objectSpread2(_objectSpread2({}, oldMetadata), newMetadata));
-
-                if (!latestBlockHash || !latestBlockNumber) {
-                  latestBlockHash = txReceipt.blockHash;
-                  latestBlockNumber = txReceipt.blockNumber;
-                }
-
                 return _context19.abrupt("return", {
                   blockHash: latestBlockHash,
                   blockNumber: latestBlockNumber,
                   userId: userId
                 });
 
-              case 47:
+              case 34:
               case "end":
                 return _context19.stop();
             }
@@ -58012,7 +57942,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee19, this);
       }));
 
-      function updateCreator(_x20, _x21, _x22) {
+      function updateCreator(_x19, _x20) {
         return _updateCreator.apply(this, arguments);
       }
 
@@ -58025,30 +57955,18 @@ var Users = /*#__PURE__*/function (_Base) {
   }, {
     key: "updateIsVerified",
     value: function () {
-      var _updateIsVerified = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20(userId, isVerified, privateKey, useEntityManager) {
+      var _updateIsVerified = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20(userId, privateKey) {
         return regeneratorRuntime.wrap(function _callee20$(_context20) {
           while (1) {
             switch (_context20.prev = _context20.next) {
               case 0:
-                if (!useEntityManager) {
-                  _context20.next = 6;
-                  break;
-                }
-
-                _context20.next = 3;
+                _context20.next = 2;
                 return this.contracts.EntityManagerClient.getManageEntityParams(userId, EntityManagerClient.EntityType.USER, userId, EntityManagerClient.Action.VERIFY, '', privateKey);
 
-              case 3:
-                return _context20.abrupt("return", _context20.sent);
-
-              case 6:
-                _context20.next = 8;
-                return this.contracts.UserFactoryClient.updateIsVerified(userId, isVerified, privateKey);
-
-              case 8:
+              case 2:
                 return _context20.abrupt("return", _context20.sent);
 
-              case 9:
+              case 3:
               case "end":
                 return _context20.stop();
             }
@@ -58056,7 +57974,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee20, this);
       }));
 
-      function updateIsVerified(_x23, _x24, _x25, _x26) {
+      function updateIsVerified(_x21, _x22) {
         return _updateIsVerified.apply(this, arguments);
       }
 
@@ -58090,7 +58008,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee21, this);
       }));
 
-      function addUserFollow(_x27) {
+      function addUserFollow(_x23) {
         return _addUserFollow.apply(this, arguments);
       }
 
@@ -58124,7 +58042,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee22, this);
       }));
 
-      function deleteUserFollow(_x28) {
+      function deleteUserFollow(_x24) {
         return _deleteUserFollow.apply(this, arguments);
       }
 
@@ -58170,7 +58088,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee23, this, [[0, 8]]);
       }));
 
-      function addUserSubscribe(_x29) {
+      function addUserSubscribe(_x25) {
         return _addUserSubscribe.apply(this, arguments);
       }
 
@@ -58216,7 +58134,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee24, this, [[0, 8]]);
       }));
 
-      function deleteUserSubscribe(_x30) {
+      function deleteUserSubscribe(_x26) {
         return _deleteUserSubscribe.apply(this, arguments);
       }
 
@@ -58233,13 +58151,13 @@ var Users = /*#__PURE__*/function (_Base) {
     key: "updateAndUploadMetadata",
     value: function () {
       var _updateAndUploadMetadata = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25(_ref5) {
-        var newMetadata, userId, useEntityManager, phases, phase, oldMetadata, logPrefix, fnStartMs, startMs, _yield$this$_updateRe, _txReceipt, replicaSetSPIDs, _yield$this$creatorNo2, metadataMultihash, metadataFileUUID, txReceipt, blockNumber, response, updatedMultihashDecoded, res, _yield$this$_updateUs2, latestBlockNumber, errorMsg;
+        var newMetadata, userId, phases, phase, oldMetadata, logPrefix, fnStartMs, startMs, _yield$this$_updateRe, _txReceipt, replicaSetSPIDs, _yield$this$creatorNo2, metadataMultihash, metadataFileUUID, response, txReceipt, blockNumber, errorMsg;
 
         return regeneratorRuntime.wrap(function _callee25$(_context25) {
           while (1) {
             switch (_context25.prev = _context25.next) {
               case 0:
-                newMetadata = _ref5.newMetadata, userId = _ref5.userId, useEntityManager = _ref5.useEntityManager;
+                newMetadata = _ref5.newMetadata, userId = _ref5.userId;
                 this.REQUIRES(Services.CREATOR_NODE, Services.DISCOVERY_PROVIDER);
                 this.IS_OBJECT(newMetadata);
                 phases = {
@@ -58270,7 +58188,7 @@ var Users = /*#__PURE__*/function (_Base) {
                 _context25.prev = 13;
 
                 if (!(newMetadata.creator_node_endpoint !== oldMetadata.creator_node_endpoint)) {
-                  _context25.next = 35;
+                  _context25.next = 28;
                   break;
                 }
 
@@ -58283,39 +58201,23 @@ var Users = /*#__PURE__*/function (_Base) {
                 _txReceipt = _yield$this$_updateRe.txReceipt;
                 replicaSetSPIDs = _yield$this$_updateRe.replicaSetSPIDs;
                 console.log("".concat(logPrefix, " [phase: ").concat(phase, "] _updateReplicaSetOnChain() completed in ").concat(Date.now() - startMs, "ms"));
-
-                if (!useEntityManager) {
-                  _context25.next = 31;
-                  break;
-                }
-
                 startMs = Date.now();
-                _context25.next = 26;
+                _context25.next = 25;
                 return this.waitForReplicaSetDiscoveryIndexing(userId, replicaSetSPIDs, _txReceipt.blockNumber);
 
-              case 26:
+              case 25:
                 // @ts-expect-error
                 newMetadata.primary_id = replicaSetSPIDs[0];
                 newMetadata.secondary_ids = replicaSetSPIDs.slice(1);
                 console.log("".concat(logPrefix, " [phase: ").concat(phase, "] waitForReplicaSetDiscoveryIndexing() completed in ").concat(Date.now() - startMs, "ms"));
-                _context25.next = 35;
-                break;
-
-              case 31:
-                startMs = Date.now();
-                _context25.next = 34;
-                return this._waitForURSMCreatorNodeEndpointIndexing(userId, replicaSetSPIDs);
-
-              case 34:
-                console.log("".concat(logPrefix, " [phase: ").concat(phase, "] _waitForURSMCreatorNodeEndpointIndexing() completed in ").concat(Date.now() - startMs, "ms"));
 
-              case 35:
+              case 28:
                 // Upload new metadata object to CN
                 phase = phases.UPLOAD_METADATA;
-                _context25.next = 38;
+                _context25.next = 31;
                 return this.creatorNode.uploadCreatorContent(newMetadata);
 
-              case 38:
+              case 31:
                 _yield$this$creatorNo2 = _context25.sent;
                 metadataMultihash = _yield$this$creatorNo2.metadataMultihash;
                 metadataFileUUID = _yield$this$creatorNo2.metadataFileUUID;
@@ -58323,85 +58225,54 @@ var Users = /*#__PURE__*/function (_Base) {
                 startMs = Date.now(); // Write metadata multihash to chain
 
                 phase = phases.UPDATE_METADATA_ON_CHAIN;
-
-                if (!useEntityManager) {
-                  _context25.next = 52;
-                  break;
-                }
-
-                _context25.next = 47;
+                _context25.next = 39;
                 return this.contracts.EntityManagerClient.manageEntity(userId, EntityManagerClient.EntityType.USER, userId, EntityManagerClient.Action.UPDATE, metadataMultihash);
 
-              case 47:
+              case 39:
                 response = _context25.sent;
                 txReceipt = response.txReceipt;
                 blockNumber = txReceipt.blockNumber;
-                _context25.next = 66;
-                break;
-
-              case 52:
-                updatedMultihashDecoded = Utils.decodeMultihash(metadataMultihash);
-                _context25.next = 55;
-                return this.contracts.UserFactoryClient.updateMultihash(userId, updatedMultihashDecoded.digest);
-
-              case 55:
-                res = _context25.sent;
-                txReceipt = res.txReceipt;
-                console.log("".concat(logPrefix, " [phase: ").concat(phase, "] UserFactoryClient.updateMultihash() completed in ").concat(Date.now() - startMs, "ms"));
-                startMs = Date.now(); // Write remaining metadata fields to chain
-
-                phase = phases.UPDATE_USER_ON_CHAIN_OPS;
-                _context25.next = 62;
-                return this._updateUserOperations(newMetadata, oldMetadata, userId, ['creator_node_endpoint']);
-
-              case 62:
-                _yield$this$_updateUs2 = _context25.sent;
-                latestBlockNumber = _yield$this$_updateUs2.latestBlockNumber;
-                console.log("".concat(logPrefix, " [phase: ").concat(phase, "] _updateUserOperations() completed in ").concat(Date.now() - startMs, "ms"));
-                blockNumber = Math.max(txReceipt.blockNumber, latestBlockNumber);
-
-              case 66:
                 startMs = Date.now(); // Write to CN to associate blockchain user id with updated metadata and block number
 
                 phase = phases.ASSOCIATE_USER;
-                _context25.next = 70;
+                _context25.next = 46;
                 return this.creatorNode.associateCreator(userId, metadataFileUUID, blockNumber);
 
-              case 70:
+              case 46:
                 console.log("".concat(logPrefix, " [phase: ").concat(phase, "] creatorNode.associateCreator() completed in ").concat(Date.now() - startMs, "ms"));
                 startMs = Date.now(); // Update libs instance with new user metadata object
 
                 this.userStateManager.setCurrentUser(_objectSpread2(_objectSpread2({}, oldMetadata), newMetadata));
                 console.log("".concat(logPrefix, " completed in ").concat(Date.now() - fnStartMs, "ms"));
-                _context25.next = 83;
+                _context25.next = 59;
                 break;
 
-              case 76:
-                _context25.prev = 76;
+              case 52:
+                _context25.prev = 52;
                 _context25.t0 = _context25["catch"](13);
                 // TODO: think about handling the update metadata on chain and associating..
                 errorMsg = "updateAndUploadMetadata() Error -- Phase ".concat(phase, " in ").concat(Date.now() - fnStartMs, "ms: ").concat(_context25.t0);
 
                 if (!(_context25.t0 instanceof Error)) {
-                  _context25.next = 82;
+                  _context25.next = 58;
                   break;
                 }
 
                 _context25.t0.message = errorMsg;
                 throw _context25.t0;
 
-              case 82:
+              case 58:
                 throw new Error(errorMsg);
 
-              case 83:
+              case 59:
               case "end":
                 return _context25.stop();
             }
           }
-        }, _callee25, this, [[13, 76]]);
+        }, _callee25, this, [[13, 52]]);
       }));
 
-      function updateAndUploadMetadata(_x31) {
+      function updateAndUploadMetadata(_x27) {
         return _updateAndUploadMetadata.apply(this, arguments);
       }
 
@@ -58520,7 +58391,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee27, this);
       }));
 
-      function _waitForCreatorNodeEndpointIndexing(_x32, _x33) {
+      function _waitForCreatorNodeEndpointIndexing(_x28, _x29) {
         return _waitForCreatorNodeEndpointIndexing2.apply(this, arguments);
       }
 
@@ -58623,7 +58494,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee29);
       }));
 
-      function waitForReplicaSetDiscoveryIndexing(_x34, _x35, _x36) {
+      function waitForReplicaSetDiscoveryIndexing(_x30, _x31, _x32) {
         return _waitForReplicaSetDiscoveryIndexing.apply(this, arguments);
       }
 
@@ -58698,7 +58569,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee31);
       }));
 
-      function _waitForURSMCreatorNodeEndpointIndexing(_x37, _x38) {
+      function _waitForURSMCreatorNodeEndpointIndexing(_x33, _x34) {
         return _waitForURSMCreatorNodeEndpointIndexing2.apply(this, arguments);
       }
 
@@ -58784,7 +58655,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee32, this);
       }));
 
-      function _addUserOperations(_x39, _x40) {
+      function _addUserOperations(_x35, _x36) {
         return _addUserOperations2.apply(this, arguments);
       }
 
@@ -58879,7 +58750,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee33, this);
       }));
 
-      function _updateUserOperations(_x41, _x42, _x43) {
+      function _updateUserOperations(_x37, _x38, _x39) {
         return _updateUserOperations2.apply(this, arguments);
       }
 
@@ -58914,7 +58785,7 @@ var Users = /*#__PURE__*/function (_Base) {
     key: "_updateReplicaSetOnChain",
     value: function () {
       var _updateReplicaSetOnChain2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee34(userId, creatorNodeEndpoint) {
-        var primaryEndpoint, secondaries, _yield$Promise$all, _yield$Promise$all2, primarySpID, secondary1SpID, secondary2SpID, txReceipt, currentUser, updateEndpointTxBlockNumber, replicaSetSPIDs, _this$contracts$UserR, _txReceipt2, _txReceipt3, currentPrimaryEndpoint, currentSecondaries, _yield$Promise$all3, _yield$Promise$all4, oldPrimary, oldSecondary1SpID, oldSecondary2SpID;
+        var primaryEndpoint, secondaries, _yield$Promise$all, _yield$Promise$all2, primarySpID, secondary1SpID, secondary2SpID, currentUser, currentPrimaryEndpoint, currentSecondaries, _yield$Promise$all3, _yield$Promise$all4, oldPrimary, oldSecondary1SpID, oldSecondary2SpID, txReceipt, replicaSetSPIDs, updateEndpointTxBlockNumber;
 
         return regeneratorRuntime.wrap(function _callee34$(_context34) {
           while (1) {
@@ -58959,45 +58830,29 @@ var Users = /*#__PURE__*/function (_Base) {
                 throw new Error('Current user missing');
 
               case 17:
-                _context34.prev = 17;
-                _context34.next = 20;
-                return (_this$contracts$UserR = this.contracts.UserReplicaSetManagerClient) === null || _this$contracts$UserR === void 0 ? void 0 : _this$contracts$UserR.updateReplicaSet(userId, primarySpID, [secondary1SpID, secondary2SpID]);
-
-              case 20:
-                txReceipt = _context34.sent;
-                replicaSetSPIDs = [primarySpID, secondary1SpID, secondary2SpID];
-                updateEndpointTxBlockNumber = (_txReceipt2 = txReceipt) === null || _txReceipt2 === void 0 ? void 0 : _txReceipt2.blockNumber;
-                _context34.next = 25;
-                return this._waitForURSMCreatorNodeEndpointIndexing(userId, replicaSetSPIDs);
-
-              case 25:
-                _context34.next = 47;
-                break;
-
-              case 27:
-                _context34.prev = 27;
-                _context34.t0 = _context34["catch"](17);
+                // First try to update with URSM
+                // Fallback to EntityManager when relay errors
                 currentPrimaryEndpoint = CreatorNode.getPrimary(currentUser.creator_node_endpoint);
                 currentSecondaries = CreatorNode.getSecondaries(currentUser.creator_node_endpoint);
 
                 if (!(currentSecondaries.length < 2)) {
-                  _context34.next = 33;
+                  _context34.next = 21;
                   break;
                 }
 
                 throw new Error("Invalid number of secondaries found - received ".concat(currentSecondaries));
 
-              case 33:
-                _context34.next = 35;
+              case 21:
+                _context34.next = 23;
                 return Promise.all([this._retrieveSpIDFromEndpoint(currentPrimaryEndpoint), this._retrieveSpIDFromEndpoint(currentSecondaries[0]), this._retrieveSpIDFromEndpoint(currentSecondaries[1])]);
 
-              case 35:
+              case 23:
                 _yield$Promise$all3 = _context34.sent;
                 _yield$Promise$all4 = _slicedToArray(_yield$Promise$all3, 3);
                 oldPrimary = _yield$Promise$all4[0];
                 oldSecondary1SpID = _yield$Promise$all4[1];
                 oldSecondary2SpID = _yield$Promise$all4[2];
-                _context34.next = 42;
+                _context34.next = 30;
                 return this.updateEntityManagerReplicaSet({
                   userId: userId,
                   primary: primarySpID,
@@ -59006,36 +58861,36 @@ var Users = /*#__PURE__*/function (_Base) {
                   oldSecondaries: [oldSecondary1SpID, oldSecondary2SpID]
                 });
 
-              case 42:
+              case 30:
                 txReceipt = _context34.sent;
                 replicaSetSPIDs = [primarySpID, secondary1SpID, secondary2SpID];
-                updateEndpointTxBlockNumber = (_txReceipt3 = txReceipt) === null || _txReceipt3 === void 0 ? void 0 : _txReceipt3.blockNumber;
-                _context34.next = 47;
+                updateEndpointTxBlockNumber = txReceipt === null || txReceipt === void 0 ? void 0 : txReceipt.blockNumber;
+                _context34.next = 35;
                 return this.waitForReplicaSetDiscoveryIndexing(userId, replicaSetSPIDs, updateEndpointTxBlockNumber);
 
-              case 47:
+              case 35:
                 if (txReceipt) {
-                  _context34.next = 49;
+                  _context34.next = 37;
                   break;
                 }
 
                 throw new Error('Unable to update replica set on chain');
 
-              case 49:
+              case 37:
                 return _context34.abrupt("return", {
                   txReceipt: txReceipt,
                   replicaSetSPIDs: replicaSetSPIDs
                 });
 
-              case 50:
+              case 38:
               case "end":
                 return _context34.stop();
             }
           }
-        }, _callee34, this, [[17, 27]]);
+        }, _callee34, this);
       }));
 
-      function _updateReplicaSetOnChain(_x44, _x45) {
+      function _updateReplicaSetOnChain(_x40, _x41) {
         return _updateReplicaSetOnChain2.apply(this, arguments);
       }
 
@@ -59090,7 +58945,7 @@ var Users = /*#__PURE__*/function (_Base) {
         }, _callee35, this);
       }));
 
-      function _retrieveSpIDFromEndpoint(_x46) {
+      function _retrieveSpIDFromEndpoint(_x42) {
         return _retrieveSpIDFromEndpoint2.apply(this, arguments);
       }
 
@@ -59937,10 +59792,10 @@ var Track = /*#__PURE__*/function (_Base) {
   }, {
     key: "uploadTrack",
     value: function () {
-      var _uploadTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19(trackFile, coverArtFile, metadata, onProgress, useEntityManager) {
+      var _uploadTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19(trackFile, coverArtFile, metadata, onProgress) {
         var _this2 = this;
 
-        var phases, phase, ownerId, _yield$retry, metadataMultihash, metadataFileUUID, transcodedTrackUUID, transcodedTrackCID, txReceipt, trackId, response, multihashDecoded, _response;
+        var phases, phase, ownerId, _yield$retry, metadataMultihash, metadataFileUUID, transcodedTrackUUID, transcodedTrackCID, trackId, response, txReceipt;
 
         return regeneratorRuntime.wrap(function _callee19$(_context19) {
           while (1) {
@@ -60017,42 +59872,23 @@ var Track = /*#__PURE__*/function (_Base) {
                 transcodedTrackCID = _yield$retry.transcodedTrackCID;
                 phase = phases.ADDING_TRACK; // Write metadata to chain
 
-                if (!useEntityManager) {
-                  _context19.next = 31;
-                  break;
-                }
-
-                _context19.next = 24;
+                _context19.next = 23;
                 return this._generateTrackId();
 
-              case 24:
+              case 23:
                 trackId = _context19.sent;
-                _context19.next = 27;
+                _context19.next = 26;
                 return this.contracts.EntityManagerClient.manageEntity(ownerId, EntityManagerClient.EntityType.TRACK, trackId, EntityManagerClient.Action.CREATE, metadataMultihash);
 
-              case 27:
+              case 26:
                 response = _context19.sent;
                 txReceipt = response.txReceipt;
-                _context19.next = 37;
-                break;
-
-              case 31:
-                multihashDecoded = Utils.decodeMultihash(metadataMultihash);
-                _context19.next = 34;
-                return this.contracts.TrackFactoryClient.addTrack(ownerId, multihashDecoded.digest, multihashDecoded.hashFn, multihashDecoded.size);
-
-              case 34:
-                _response = _context19.sent;
-                txReceipt = _response.txReceipt;
-                trackId = _response.trackId;
-
-              case 37:
                 phase = phases.ASSOCIATING_TRACK; // Associate the track id with the file metadata and block number
 
-                _context19.next = 40;
+                _context19.next = 31;
                 return this.creatorNode.associateTrack(trackId, metadataFileUUID, txReceipt.blockNumber, transcodedTrackUUID);
 
-              case 40:
+              case 31:
                 return _context19.abrupt("return", {
                   blockHash: txReceipt.blockHash,
                   blockNumber: txReceipt.blockNumber,
@@ -60061,23 +59897,23 @@ var Track = /*#__PURE__*/function (_Base) {
                   error: false
                 });
 
-              case 43:
-                _context19.prev = 43;
+              case 34:
+                _context19.prev = 34;
                 _context19.t0 = _context19["catch"](4);
                 return _context19.abrupt("return", {
                   error: _context19.t0.message,
                   phase: phase
                 });
 
-              case 46:
+              case 37:
               case "end":
                 return _context19.stop();
             }
           }
-        }, _callee19, this, [[4, 43]]);
+        }, _callee19, this, [[4, 34]]);
       }));
 
-      function uploadTrack(_x13, _x14, _x15, _x16, _x17) {
+      function uploadTrack(_x13, _x14, _x15, _x16) {
         return _uploadTrack.apply(this, arguments);
       }
 
@@ -60174,7 +60010,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee21, this);
       }));
 
-      function uploadTrackContentToCreatorNode(_x18, _x19, _x20, _x21) {
+      function uploadTrackContentToCreatorNode(_x17, _x18, _x19, _x20) {
         return _uploadTrackContentToCreatorNode.apply(this, arguments);
       }
 
@@ -60189,7 +60025,7 @@ var Track = /*#__PURE__*/function (_Base) {
   }, {
     key: "addTracksToChainAndCnode",
     value: function () {
-      var _addTracksToChainAndCnode = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24(trackMultihashAndUUIDList, useEntityManager) {
+      var _addTracksToChainAndCnode = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24(trackMultihashAndUUIDList) {
         var _this4 = this;
 
         var ownerId, addedToChain, requestFailed, associatedWithCreatorNode;
@@ -60213,8 +60049,7 @@ var Track = /*#__PURE__*/function (_Base) {
                 _context24.next = 8;
                 return Promise.all(trackMultihashAndUUIDList.map( /*#__PURE__*/function () {
                   var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22(trackInfo, i) {
-                    var metadataMultihash, metadataFileUUID, transcodedTrackUUID, txReceipt, trackId, response, multihashDecoded, _response2;
-
+                    var metadataMultihash, metadataFileUUID, transcodedTrackUUID, trackId, response, txReceipt;
                     return regeneratorRuntime.wrap(function _callee22$(_context22) {
                       while (1) {
                         switch (_context22.prev = _context22.next) {
@@ -60222,60 +60057,41 @@ var Track = /*#__PURE__*/function (_Base) {
                             _context22.prev = 0;
                             metadataMultihash = trackInfo.metadataMultihash, metadataFileUUID = trackInfo.metadataFileUUID, transcodedTrackUUID = trackInfo.transcodedTrackUUID; // Write metadata to chain
 
-                            if (!(useEntityManager && _this4.contracts.EntityManagerClient)) {
-                              _context22.next = 12;
-                              break;
-                            }
-
-                            _context22.next = 5;
+                            _context22.next = 4;
                             return _this4._generateTrackId();
 
-                          case 5:
+                          case 4:
                             trackId = _context22.sent;
-                            _context22.next = 8;
+                            _context22.next = 7;
                             return _this4.contracts.EntityManagerClient.manageEntity(ownerId, EntityManagerClient.EntityType.TRACK, trackId, EntityManagerClient.Action.CREATE, metadataMultihash);
 
-                          case 8:
+                          case 7:
                             response = _context22.sent;
                             txReceipt = response.txReceipt;
-                            _context22.next = 18;
-                            break;
-
-                          case 12:
-                            multihashDecoded = Utils.decodeMultihash(metadataMultihash);
-                            _context22.next = 15;
-                            return _this4.contracts.TrackFactoryClient.addTrack(ownerId, multihashDecoded.digest, multihashDecoded.hashFn, multihashDecoded.size);
-
-                          case 15:
-                            _response2 = _context22.sent;
-                            txReceipt = _response2.txReceipt;
-                            trackId = _response2.trackId;
-
-                          case 18:
                             addedToChain[i] = {
                               trackId: trackId,
                               metadataFileUUID: metadataFileUUID,
                               transcodedTrackUUID: transcodedTrackUUID,
                               txReceipt: txReceipt
                             };
-                            _context22.next = 25;
+                            _context22.next = 16;
                             break;
 
-                          case 21:
-                            _context22.prev = 21;
+                          case 12:
+                            _context22.prev = 12;
                             _context22.t0 = _context22["catch"](0);
                             requestFailed = true;
                             console.error(_context22.t0);
 
-                          case 25:
+                          case 16:
                           case "end":
                             return _context22.stop();
                         }
                       }
-                    }, _callee22, null, [[0, 21]]);
+                    }, _callee22, null, [[0, 12]]);
                   }));
 
-                  return function (_x24, _x25) {
+                  return function (_x22, _x23) {
                     return _ref3.apply(this, arguments);
                   };
                 }()));
@@ -60321,7 +60137,7 @@ var Track = /*#__PURE__*/function (_Base) {
                     }, _callee23);
                   }));
 
-                  return function (_x26) {
+                  return function (_x24) {
                     return _ref4.apply(this, arguments);
                   };
                 }()));
@@ -60356,7 +60172,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee24, this, [[11, 16]]);
       }));
 
-      function addTracksToChainAndCnode(_x22, _x23) {
+      function addTracksToChainAndCnode(_x21) {
         return _addTracksToChainAndCnode.apply(this, arguments);
       }
 
@@ -60371,8 +60187,8 @@ var Track = /*#__PURE__*/function (_Base) {
   }, {
     key: "updateTrack",
     value: function () {
-      var _updateTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25(metadata, useEntityManager) {
-        var ownerId, _yield$this$creatorNo, metadataMultihash, metadataFileUUID, txReceipt, trackId, response, multihashDecoded, _response3;
+      var _updateTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25(metadata) {
+        var ownerId, _yield$this$creatorNo, metadataMultihash, metadataFileUUID, trackId, response, txReceipt;
 
         return regeneratorRuntime.wrap(function _callee25$(_context25) {
           while (1) {
@@ -60402,43 +60218,26 @@ var Track = /*#__PURE__*/function (_Base) {
                 _yield$this$creatorNo = _context25.sent;
                 metadataMultihash = _yield$this$creatorNo.metadataMultihash;
                 metadataFileUUID = _yield$this$creatorNo.metadataFileUUID;
+                // Write the new metadata to chain
                 trackId = metadata.track_id;
-
-                if (!useEntityManager) {
-                  _context25.next = 20;
-                  break;
-                }
-
-                _context25.next = 16;
+                _context25.next = 15;
                 return this.contracts.EntityManagerClient.manageEntity(ownerId, EntityManagerClient.EntityType.TRACK, trackId, EntityManagerClient.Action.UPDATE, metadataMultihash);
 
-              case 16:
+              case 15:
                 response = _context25.sent;
-                txReceipt = response.txReceipt;
-                _context25.next = 25;
-                break;
-
-              case 20:
-                multihashDecoded = Utils.decodeMultihash(metadataMultihash);
-                _context25.next = 23;
-                return this.contracts.TrackFactoryClient.updateTrack(trackId, ownerId, multihashDecoded.digest, multihashDecoded.hashFn, multihashDecoded.size);
+                txReceipt = response.txReceipt; // Re-associate the track id with the new metadata
 
-              case 23:
-                _response3 = _context25.sent;
-                txReceipt = _response3.txReceipt;
-
-              case 25:
-                _context25.next = 27;
+                _context25.next = 19;
                 return this.creatorNode.associateTrack(trackId, metadataFileUUID, txReceipt.blockNumber);
 
-              case 27:
+              case 19:
                 return _context25.abrupt("return", {
                   blockHash: txReceipt.blockHash,
                   blockNumber: txReceipt.blockNumber,
                   trackId: trackId
                 });
 
-              case 28:
+              case 20:
               case "end":
                 return _context25.stop();
             }
@@ -60446,7 +60245,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee25, this);
       }));
 
-      function updateTrack(_x27, _x28) {
+      function updateTrack(_x25) {
         return _updateTrack.apply(this, arguments);
       }
 
@@ -60488,7 +60287,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee26, this);
       }));
 
-      function logTrackListen(_x29, _x30) {
+      function logTrackListen(_x26, _x27) {
         return _logTrackListen.apply(this, arguments);
       }
 
@@ -60522,7 +60321,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee27, this);
       }));
 
-      function addTrackRepost(_x31) {
+      function addTrackRepost(_x28) {
         return _addTrackRepost.apply(this, arguments);
       }
 
@@ -60557,7 +60356,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee28, this);
       }));
 
-      function deleteTrackRepost(_x32) {
+      function deleteTrackRepost(_x29) {
         return _deleteTrackRepost.apply(this, arguments);
       }
 
@@ -60592,7 +60391,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee29, this);
       }));
 
-      function addTrackSave(_x33) {
+      function addTrackSave(_x30) {
         return _addTrackSave.apply(this, arguments);
       }
 
@@ -60627,7 +60426,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee30, this);
       }));
 
-      function deleteTrackSave(_x34) {
+      function deleteTrackSave(_x31) {
         return _deleteTrackSave.apply(this, arguments);
       }
 
@@ -60641,41 +60440,29 @@ var Track = /*#__PURE__*/function (_Base) {
   }, {
     key: "deleteTrack",
     value: function () {
-      var _deleteTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee31(trackId, useEntityManager) {
+      var _deleteTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee31(trackId) {
         var ownerId;
         return regeneratorRuntime.wrap(function _callee31$(_context31) {
           while (1) {
             switch (_context31.prev = _context31.next) {
               case 0:
-                if (!useEntityManager) {
-                  _context31.next = 9;
-                  break;
-                }
-
                 ownerId = this.userStateManager.getCurrentUserId();
 
                 if (ownerId) {
-                  _context31.next = 4;
+                  _context31.next = 3;
                   break;
                 }
 
                 throw new Error('No users loaded for this wallet');
 
-              case 4:
-                _context31.next = 6;
+              case 3:
+                _context31.next = 5;
                 return this.contracts.EntityManagerClient.manageEntity(ownerId, EntityManagerClient.EntityType.TRACK, trackId, EntityManagerClient.Action.DELETE, '');
 
-              case 6:
-                return _context31.abrupt("return", _context31.sent);
-
-              case 9:
-                _context31.next = 11;
-                return this.contracts.TrackFactoryClient.deleteTrack(trackId);
-
-              case 11:
+              case 5:
                 return _context31.abrupt("return", _context31.sent);
 
-              case 12:
+              case 6:
               case "end":
                 return _context31.stop();
             }
@@ -60683,7 +60470,7 @@ var Track = /*#__PURE__*/function (_Base) {
         }, _callee31, this);
       }));
 
-      function deleteTrack(_x35, _x36) {
+      function deleteTrack(_x32) {
         return _deleteTrack.apply(this, arguments);
       }
 
@@ -66314,9 +66101,7 @@ var rolloverNodes = /*#__PURE__*/function () {
             newMetadata.creator_node_endpoint = newEndpoints.join(',');
             console.debug("Sanity Check - rolloverNodes - new nodes ".concat(newMetadata.creator_node_endpoint));
             _context4.next = 32;
-            return (_libs$User3 = libs.User) === null || _libs$User3 === void 0 ? void 0 : _libs$User3.updateCreator(user.user_id, newMetadata, true
-            /* useEntityManager */
-            );
+            return (_libs$User3 = libs.User) === null || _libs$User3 === void 0 ? void 0 : _libs$User3.updateCreator(user.user_id, newMetadata);
 
           case 32:
             _context4.next = 37;