@audius/sdk 0.0.35 → 0.0.38

package/dist/index.esm.js

@@ -22,7 +22,7 @@ import { Transaction } from 'ethereumjs-tx';
 import * as AudiusData from '@audius/anchor-audius-data';
 import { idl } from '@audius/anchor-audius-data';
 import anchor, { ProgramError, BN as BN$1 } from '@project-serum/anchor';
-import solanaWeb3, { PublicKey, SYSVAR_RENT_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, Secp256k1Program, TransactionInstruction, Keypair, Transaction as Transaction$1 } from '@solana/web3.js';
+import solanaWeb3, { PublicKey, SYSVAR_RENT_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SystemProgram, Secp256k1Program, TransactionInstruction, Keypair, Transaction as Transaction$1, Connection } from '@solana/web3.js';
 import splToken, { ASSOCIATED_TOKEN_PROGRAM_ID, Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import borsh from 'borsh';
 import BN from 'bn.js';
@@ -33409,9 +33409,9 @@ var formatProviders = function formatProviders(providers) {
 };
 
 var name = "@audius/sdk";
-var version = "0.0.35";
+var version = "0.0.38";
 var audius = {
-	releaseSHA: "87ed35aa1374bdcf5632ef58ce55efbdd4031b03"
+	releaseSHA: "74503074cb96dea181ec2b218c5cb6d528c1db86"
 };
 var description = "";
 var main = "dist/index.cjs.js";
@@ -33507,6 +33507,7 @@ var devDependencies = {
 	"@types/expect": "24.3.0",
 	"@types/form-data": "^2.5.0",
 	"@types/hashids": "2.0.1",
+	"@types/lodash": "4.14.149",
 	"@types/mocha": "9.1.0",
 	"@types/node-localstorage": "1.3.0",
 	"@types/pify": "^5.0.1",
@@ -35919,7 +35920,7 @@ var SolanaWeb3Manager = /*#__PURE__*/function () {
               case 0:
                 _this$solanaWeb3Confi = this.solanaWeb3Config, solanaClusterEndpoint = _this$solanaWeb3Confi.solanaClusterEndpoint, mintAddress = _this$solanaWeb3Confi.mintAddress, solanaTokenAddress = _this$solanaWeb3Confi.solanaTokenAddress, claimableTokenPDA = _this$solanaWeb3Confi.claimableTokenPDA, feePayerAddress = _this$solanaWeb3Confi.feePayerAddress, claimableTokenProgramAddress = _this$solanaWeb3Confi.claimableTokenProgramAddress, rewardsManagerProgramId = _this$solanaWeb3Confi.rewardsManagerProgramId, rewardsManagerProgramPDA = _this$solanaWeb3Confi.rewardsManagerProgramPDA, rewardsManagerTokenPDA = _this$solanaWeb3Confi.rewardsManagerTokenPDA, useRelay = _this$solanaWeb3Confi.useRelay, feePayerKeypairs = _this$solanaWeb3Confi.feePayerKeypairs, confirmationTimeout = _this$solanaWeb3Confi.confirmationTimeout, audiusDataProgramId = _this$solanaWeb3Confi.audiusDataProgramId, audiusDataAdminStorageKeypairPublicKey = _this$solanaWeb3Confi.audiusDataAdminStorageKeypairPublicKey, audiusDataIdl = _this$solanaWeb3Confi.audiusDataIdl;
                 this.solanaClusterEndpoint = solanaClusterEndpoint;
-                this.connection = new solanaWeb3.Connection(this.solanaClusterEndpoint, {
+                this.connection = new Connection(this.solanaClusterEndpoint, {
                   confirmTransactionInitialTimeout: confirmationTimeout || DEFAULT_CONNECTION_CONFIRMATION_TIMEOUT_MS
                 });
                 this.transactionHandler = new TransactionHandler({
@@ -35979,9 +35980,8 @@ var SolanaWeb3Manager = /*#__PURE__*/function () {
                 this.audiusDataIdl = audiusDataIdl || idl;
 
                 if (this.audiusDataProgramId && this.audiusDataAdminStorageKeypairPublicKey && this.audiusDataIdl) {
-                  connection = new solanaWeb3.Connection(this.solanaClusterEndpoint, anchor.AnchorProvider.defaultOptions());
-                  anchorProvider = new anchor.AnchorProvider(connection, // @ts-expect-error weirdness with 3rd party types
-                  solanaWeb3.Keypair.generate(), anchor.AnchorProvider.defaultOptions());
+                  connection = new Connection(this.solanaClusterEndpoint, anchor.AnchorProvider.defaultOptions());
+                  anchorProvider = new anchor.AnchorProvider(connection, Keypair.generate(), anchor.AnchorProvider.defaultOptions());
                   this.anchorProgram = new anchor.Program(this.audiusDataIdl, audiusDataProgramId, anchorProvider);
                 }
 
@@ -37023,7 +37023,7 @@ var Base = /*#__PURE__*/function () {
   return Base;
 }();
 
-var decodeHashId$2 = Utils.decodeHashId;
+var decodeHashId$1 = Utils.decodeHashId;
 var GetAttestationError = Object.freeze({
   CHALLENGE_INCOMPLETE: 'CHALLENGE_INCOMPLETE',
   ALREADY_DISBURSED: 'ALREADY_DISBURSED',
@@ -37108,7 +37108,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
 
               case 7:
                 // Aggregate
-                logger.info("submitAndEvaluate: aggregating attestations for userId [".concat(decodeHashId$2(encodedUserId), "], challengeId [").concat(challengeId, "]"));
+                logger.info("submitAndEvaluate: aggregating attestations for userId [".concat(decodeHashId$1(encodedUserId), "], challengeId [").concat(challengeId, "]"));
                 phase = AttestationPhases.AGGREGATE_ATTESTATIONS;
                 _context.next = 11;
                 return this.aggregateAttestations({
@@ -37144,7 +37144,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
 
               case 21:
                 // Submit
-                logger.info("submitAndEvaluate: submitting for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$2(encodedUserId), "] with [").concat(discoveryNodeAttestations === null || discoveryNodeAttestations === void 0 ? void 0 : discoveryNodeAttestations.length, "] DN and [").concat(aaoAttestation ? 1 : 0, "] oracle attestations."));
+                logger.info("submitAndEvaluate: submitting for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$1(encodedUserId), "] with [").concat(discoveryNodeAttestations === null || discoveryNodeAttestations === void 0 ? void 0 : discoveryNodeAttestations.length, "] DN and [").concat(aaoAttestation ? 1 : 0, "] oracle attestations."));
                 fullTokenAmount = new BN(amount * WRAPPED_AUDIO_PRECISION);
                 phase = AttestationPhases.SUBMIT_ATTESTATIONS; // @ts-expect-error the return types are a bit strange here
 
@@ -37182,7 +37182,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
                   break;
                 }
 
-                logger.warn("submitAndEvaluate: saw repeat senders for userId [".concat(decodeHashId$2(encodedUserId), "] challengeId: [").concat(challengeId, "] with err: ").concat(submitErrorCode, ", breaking up into individual transactions"));
+                logger.warn("submitAndEvaluate: saw repeat senders for userId [".concat(decodeHashId$1(encodedUserId), "] challengeId: [").concat(challengeId, "] with err: ").concat(submitErrorCode, ", breaking up into individual transactions"));
                 _context.next = 35;
                 return this.solanaWeb3Manager.submitChallengeAttestations({
                   attestations: discoveryNodeAttestations,
@@ -37205,7 +37205,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
 
               case 38:
                 // Evaluate
-                logger.info("submitAndEvaluate: evaluating for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$2(encodedUserId), "]"));
+                logger.info("submitAndEvaluate: evaluating for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$1(encodedUserId), "]"));
                 phase = AttestationPhases.EVALUATE_ATTESTATIONS;
                 _context.next = 42;
                 return this.solanaWeb3Manager.evaluateChallengeAttestations({
@@ -37244,7 +37244,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
                 _context.t0 = _context["catch"](3);
                 err = _context.t0.message;
                 log = err === GetAttestationError.COGNITO_FLOW || err === GetAttestationError.HCAPTCHA ? logger.info : logger.error;
-                log("submitAndEvaluate: failed for userId: [".concat(decodeHashId$2(encodedUserId), "] challenge-id [").concat(challengeId, "] at phase [").concat(phase, "] with err: ").concat(err));
+                log("submitAndEvaluate: failed for userId: [".concat(decodeHashId$1(encodedUserId), "] challenge-id [").concat(challengeId, "] at phase [").concat(phase, "] with err: ").concat(err));
                 return _context.abrupt("return", {
                   success: false,
                   error: err,
@@ -37359,7 +37359,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
                 _context2.prev = 25;
                 _context2.t0 = _context2["catch"](13);
                 err = _context2.t0.message;
-                logger.error("Failed to aggregate attestations for user [".concat(decodeHashId$2(encodedUserId), "], challenge-id: [").concat(challengeId, "] with err: ").concat(err));
+                logger.error("Failed to aggregate attestations for user [".concat(decodeHashId$1(encodedUserId), "], challenge-id: [").concat(challengeId, "] with err: ").concat(err));
                 return _context2.abrupt("return", {
                   discoveryNodeAttestations: null,
                   aaoAttestation: null,
@@ -37422,7 +37422,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
                 _context2.prev = 43;
                 _context2.t1 = _context2["catch"](30);
                 _err = _context2.t1.message;
-                logger.error("Failed to aggregate attestations for user [".concat(decodeHashId$2(encodedUserId), "], challenge-id: [").concat(challengeId, "] with err: ").concat(_err));
+                logger.error("Failed to aggregate attestations for user [".concat(decodeHashId$1(encodedUserId), "], challenge-id: [").concat(challengeId, "] with err: ").concat(_err));
                 return _context2.abrupt("return", {
                   discoveryNodeAttestations: null,
                   aaoAttestation: null,
@@ -37480,7 +37480,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
                 _context3.prev = 10;
                 _context3.t0 = _context3["catch"](2);
                 err = _context3.t0.message;
-                logger.error("Failed to get challenge attestation for userId [".concat(decodeHashId$2(encodedUserId), "] challengeId [").concat(challengeId, "]from ").concat(discoveryProviderEndpoint, " with ").concat(err));
+                logger.error("Failed to get challenge attestation for userId [".concat(decodeHashId$1(encodedUserId), "] challengeId [").concat(challengeId, "]from ").concat(discoveryProviderEndpoint, " with ").concat(err));
                 mappedErr = GetAttestationError[err] || GetAttestationError.DISCOVERY_NODE_UNKNOWN_RESPONSE;
                 return _context3.abrupt("return", {
                   success: null,
@@ -37753,9 +37753,9 @@ var Rewards = /*#__PURE__*/function (_Base) {
 
               case 16:
                 if (needsAttestations.length || unrecoverableError) {
-                  logger.info("Failed to aggregate attestations for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$2(encodedUserId), "]"));
+                  logger.info("Failed to aggregate attestations for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$1(encodedUserId), "]"));
                 } else {
-                  logger.info("Successfully aggregated attestations for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$2(encodedUserId), "]"));
+                  logger.info("Successfully aggregated attestations for challenge [".concat(challengeId, "], userId: [").concat(decodeHashId$1(encodedUserId), "]"));
                 }
 
                 return _context7.abrupt("return", completedAttestations);
@@ -37980,7 +37980,7 @@ var Rewards = /*#__PURE__*/function (_Base) {
   return Rewards;
 }(Base);
 
-var decodeHashId$1 = Utils.decodeHashId; // `BaseRewardsReporter` is intended to be subclassed, and provides
+var decodeHashId = Utils.decodeHashId; // `BaseRewardsReporter` is intended to be subclassed, and provides
 // "reporting" functionality to RewardsAttester (i.e. posts to Slack if something notable happens)
 
 var BaseRewardsReporter = /*#__PURE__*/function () {
@@ -38984,7 +38984,7 @@ var RewardsAttester = /*#__PURE__*/function () {
             switch (_context17.prev = _context17.next) {
               case 0:
                 challengeId = _ref9.challengeId, userId = _ref9.userId, specifier = _ref9.specifier, amount = _ref9.amount, handle = _ref9.handle, wallet = _ref9.wallet, completedBlocknumber = _ref9.completedBlocknumber;
-                this.logger.info("Attempting to attest for userId [".concat(decodeHashId$1(userId), "], challengeId: [").concat(challengeId, "], quorum size: [").concat(this.quorumSize, "]}"));
+                this.logger.info("Attempting to attest for userId [".concat(decodeHashId(userId), "], challengeId: [").concat(challengeId, "], quorum size: [").concat(this.quorumSize, "]}"));
                 _context17.next = 4;
                 return this.libs.Rewards.submitAndEvaluate({
                   challengeId: challengeId,
@@ -39015,7 +39015,7 @@ var RewardsAttester = /*#__PURE__*/function () {
                   break;
                 }
 
-                this.logger.info("Successfully attestested for challenge [".concat(challengeId, "] for user [").concat(decodeHashId$1(userId), "], amount [").concat(amount, "]!"));
+                this.logger.info("Successfully attestested for challenge [".concat(challengeId, "] for user [").concat(decodeHashId(userId), "], amount [").concat(amount, "]!"));
                 return _context17.abrupt("return", {
                   challengeId: challengeId,
                   userId: userId,
@@ -39029,7 +39029,7 @@ var RewardsAttester = /*#__PURE__*/function () {
 
               case 13:
                 // Handle error path
-                this.logger.error("Failed to attest for challenge [".concat(challengeId, "] for user [").concat(decodeHashId$1(userId), "], amount [").concat(amount, "], oracle: [").concat(this.aaoAddress, "] at phase: [").concat(phase, "] with error [").concat(error, "]"));
+                this.logger.error("Failed to attest for challenge [".concat(challengeId, "] for user [").concat(decodeHashId(userId), "], amount [").concat(amount, "], oracle: [").concat(this.aaoAddress, "] at phase: [").concat(phase, "] with error [").concat(error, "]"));
                 return _context17.abrupt("return", {
                   challengeId: challengeId,
                   userId: userId,
@@ -39287,7 +39287,7 @@ var RewardsAttester = /*#__PURE__*/function () {
                     successful.push(res);
 
                     _this5.reporter.reportSuccess({
-                      userId: (_decodeHashId = decodeHashId$1(res.userId)) !== null && _decodeHashId !== void 0 ? _decodeHashId : -1,
+                      userId: (_decodeHashId = decodeHashId(res.userId)) !== null && _decodeHashId !== void 0 ? _decodeHashId : -1,
                       challengeId: res.challengeId,
                       amount: res.amount,
                       specifier: res.specifier
@@ -39308,7 +39308,7 @@ var RewardsAttester = /*#__PURE__*/function () {
                   var _decodeHashId2;
 
                   var report = {
-                    userId: (_decodeHashId2 = decodeHashId$1(res.userId)) !== null && _decodeHashId2 !== void 0 ? _decodeHashId2 : -1,
+                    userId: (_decodeHashId2 = decodeHashId(res.userId)) !== null && _decodeHashId2 !== void 0 ? _decodeHashId2 : -1,
                     challengeId: res.challengeId,
                     amount: res.amount,
                     error: res.error,
@@ -57079,15 +57079,13 @@ var EntityType;
 (function (EntityType) {
   EntityType["PLAYLIST"] = "Playlist";
 })(EntityType || (EntityType = {}));
-
-var encodeHashId = Utils.encodeHashId,
-    decodeHashId = Utils.decodeHashId;
 /*
   API surface for updated data contract interactions.
   Provides simplified entity management in a generic fashion
   Handles metadata + file upload etc. for entities such as Playlist/Track/User
 */
 
+
 var EntityManager = /*#__PURE__*/function (_Base) {
   _inherits(EntityManager, _Base);
 
@@ -57111,46 +57109,15 @@ var EntityManager = /*#__PURE__*/function (_Base) {
       return Math.floor(Math.random() * (max - min) + min);
     }
   }, {
-    key: "getFullPlaylist",
-    value: function () {
-      var _getFullPlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(playlistId, userId) {
-        var encodedPlaylistId, encodedUserId, playlist;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                encodedPlaylistId = encodeHashId(playlistId);
-                encodedUserId = encodeHashId(userId);
-                _context.next = 4;
-                return this.discoveryProvider.getFullPlaylist(encodedPlaylistId, encodedUserId);
-
-              case 4:
-                playlist = _context.sent[0];
-                return _context.abrupt("return", playlist);
-
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function getFullPlaylist(_x, _x2) {
-        return _getFullPlaylist.apply(this, arguments);
-      }
-
-      return getFullPlaylist;
-    }()
-  }, {
-    key: "mapAddedTimestamps",
-    value: function mapAddedTimestamps(addedTimestamps) {
+    key: "mapTimestamps",
+    value: function mapTimestamps(addedTimestamps) {
       var trackIds = addedTimestamps.map(function (trackObj) {
         var _trackObj$metadata_ti;
 
         return {
-          track: decodeHashId(trackObj.track_id),
-          time: (_trackObj$metadata_ti = trackObj.metadata_timestamp) !== null && _trackObj$metadata_ti !== void 0 ? _trackObj$metadata_ti : trackObj.timestamp
+          track: trackObj.track,
+          time: (_trackObj$metadata_ti = trackObj.metadata_time) !== null && _trackObj$metadata_ti !== void 0 ? _trackObj$metadata_ti : trackObj.time // default to time for legacy playlists
+
         };
       });
       return trackIds;
@@ -57165,7 +57132,6 @@ var EntityManager = /*#__PURE__*/function (_Base) {
       return {
         blockHash: null,
         blockNumber: null,
-        playlistId: null,
         error: null
       };
     }
@@ -57176,105 +57142,94 @@ var EntityManager = /*#__PURE__*/function (_Base) {
   }, {
     key: "createPlaylist",
     value: function () {
-      var _createPlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(_ref) {
-        var playlistId, playlistName, trackIds, description, isAlbum, isPrivate, coverArt, responseValues, currentUserId, userId, createAction, entityType, updatedPlaylistImage, web3, currentBlockNumber, currentBlock, tracks, dirCID, metadata, _yield$this$creatorNo, metadataMultihash, manageEntityResponse, txReceipt, error;
+      var _createPlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(playlist) {
+        var responseValues, _playlist$artwork, _dirCID, userId, createAction, entityType, dirCID, updatedPlaylistImage, tracks, metadata, _yield$this$creatorNo, metadataMultihash, manageEntityResponse, txReceipt, error;
 
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                playlistId = _ref.playlistId, playlistName = _ref.playlistName, trackIds = _ref.trackIds, description = _ref.description, isAlbum = _ref.isAlbum, isPrivate = _ref.isPrivate, coverArt = _ref.coverArt;
                 responseValues = this.getDefaultPlaylistReponseValues();
-                _context2.prev = 2;
-                currentUserId = this.userStateManager.getCurrentUserId();
+                _context.prev = 1;
+                userId = this.userStateManager.getCurrentUserId();
 
-                if (currentUserId) {
-                  _context2.next = 7;
+                if (userId) {
+                  _context.next = 6;
                   break;
                 }
 
                 responseValues.error = 'Missing current user ID';
-                return _context2.abrupt("return", responseValues);
+                return _context.abrupt("return", responseValues);
 
-              case 7:
-                userId = parseInt(currentUserId);
+              case 6:
                 createAction = Action.CREATE;
                 entityType = EntityType.PLAYLIST;
                 this.REQUIRES(Services.CREATOR_NODE);
-                _context2.next = 13;
-                return this.creatorNode.uploadImage(coverArt, true // square
-                );
 
-              case 13:
-                updatedPlaylistImage = _context2.sent;
-                web3 = this.web3Manager.getWeb3();
-                _context2.next = 17;
-                return web3.eth.getBlockNumber();
+                if (!(playlist !== null && playlist !== void 0 && (_playlist$artwork = playlist.artwork) !== null && _playlist$artwork !== void 0 && _playlist$artwork.file)) {
+                  _context.next = 14;
+                  break;
+                }
 
-              case 17:
-                currentBlockNumber = _context2.sent;
-                _context2.next = 20;
-                return web3.eth.getBlock(currentBlockNumber);
+                _context.next = 12;
+                return this.creatorNode.uploadImage(playlist.artwork.file, true // square
+                );
 
-              case 20:
-                currentBlock = _context2.sent;
-                tracks = trackIds.map(function (trackId) {
-                  return {
-                    track: trackId,
-                    time: currentBlock.timestamp
-                  };
-                });
+              case 12:
+                updatedPlaylistImage = _context.sent;
                 dirCID = updatedPlaylistImage.dirCID;
+
+              case 14:
+                tracks = this.mapTimestamps(playlist.playlist_contents.track_ids);
                 metadata = {
-                  playlist_id: playlistId,
+                  playlist_id: playlist.playlist_id,
                   playlist_contents: {
                     track_ids: tracks
                   },
-                  playlist_name: playlistName,
-                  playlist_image_sizes_multihash: dirCID,
-                  description: description,
-                  is_album: isAlbum,
-                  is_private: isPrivate
+                  playlist_name: playlist.playlist_name,
+                  playlist_image_sizes_multihash: (_dirCID = dirCID) !== null && _dirCID !== void 0 ? _dirCID : playlist.cover_art_sizes,
+                  description: playlist.description,
+                  is_album: playlist.is_album,
+                  is_private: playlist.is_private
                 };
-                _context2.next = 26;
+                _context.next = 18;
                 return this.creatorNode.uploadPlaylistMetadata(metadata);
 
-              case 26:
-                _yield$this$creatorNo = _context2.sent;
+              case 18:
+                _yield$this$creatorNo = _context.sent;
                 metadataMultihash = _yield$this$creatorNo.metadataMultihash;
-                _context2.next = 30;
+                _context.next = 22;
                 return this.manageEntity({
                   userId: userId,
                   entityType: entityType,
-                  entityId: playlistId,
+                  entityId: playlist.playlist_id,
                   action: createAction,
                   metadataMultihash: metadataMultihash
                 });
 
-              case 30:
-                manageEntityResponse = _context2.sent;
+              case 22:
+                manageEntityResponse = _context.sent;
                 txReceipt = manageEntityResponse.txReceipt;
                 responseValues.blockHash = txReceipt.blockHash;
                 responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context2.abrupt("return", responseValues);
+                return _context.abrupt("return", responseValues);
 
-              case 38:
-                _context2.prev = 38;
-                _context2.t0 = _context2["catch"](2);
-                error = _context2.t0.message;
+              case 29:
+                _context.prev = 29;
+                _context.t0 = _context["catch"](1);
+                error = _context.t0.message;
                 responseValues.error = error;
-                return _context2.abrupt("return", responseValues);
+                return _context.abrupt("return", responseValues);
 
-              case 43:
+              case 34:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this, [[2, 38]]);
+        }, _callee, this, [[1, 29]]);
       }));
 
-      function createPlaylist(_x3) {
+      function createPlaylist(_x) {
         return _createPlaylist.apply(this, arguments);
       }
 
@@ -57287,29 +57242,26 @@ var EntityManager = /*#__PURE__*/function (_Base) {
   }, {
     key: "deletePlaylist",
     value: function () {
-      var _deletePlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(_ref2) {
-        var playlistId, responseValues, currentUserId, userId, resp, txReceipt, error;
-
-        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      var _deletePlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(playlistId) {
+        var responseValues, userId, resp, txReceipt, error;
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
-                playlistId = _ref2.playlistId;
                 responseValues = this.getDefaultPlaylistReponseValues();
-                currentUserId = this.userStateManager.getCurrentUserId();
+                userId = this.userStateManager.getCurrentUserId();
 
-                if (currentUserId) {
-                  _context3.next = 6;
+                if (userId) {
+                  _context2.next = 5;
                   break;
                 }
 
                 responseValues.error = 'Missing current user ID';
-                return _context3.abrupt("return", responseValues);
+                return _context2.abrupt("return", responseValues);
 
-              case 6:
-                userId = parseInt(currentUserId);
-                _context3.prev = 7;
-                _context3.next = 10;
+              case 5:
+                _context2.prev = 5;
+                _context2.next = 8;
                 return this.manageEntity({
                   userId: userId,
                   entityType: EntityType.PLAYLIST,
@@ -57318,30 +57270,29 @@ var EntityManager = /*#__PURE__*/function (_Base) {
                   metadataMultihash: ''
                 });
 
-              case 10:
-                resp = _context3.sent;
+              case 8:
+                resp = _context2.sent;
                 txReceipt = resp.txReceipt;
                 responseValues.blockHash = txReceipt.blockHash;
                 responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context3.abrupt("return", responseValues);
+                return _context2.abrupt("return", responseValues);
 
-              case 18:
-                _context3.prev = 18;
-                _context3.t0 = _context3["catch"](7);
-                error = _context3.t0.message;
+              case 15:
+                _context2.prev = 15;
+                _context2.t0 = _context2["catch"](5);
+                error = _context2.t0.message;
                 responseValues.error = error;
-                return _context3.abrupt("return", responseValues);
+                return _context2.abrupt("return", responseValues);
 
-              case 23:
+              case 20:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3, this, [[7, 18]]);
+        }, _callee2, this, [[5, 15]]);
       }));
 
-      function deletePlaylist(_x4) {
+      function deletePlaylist(_x2) {
         return _deletePlaylist.apply(this, arguments);
       }
 
@@ -57349,448 +57300,112 @@ var EntityManager = /*#__PURE__*/function (_Base) {
     }()
     /**
      * Update a playlist using updated data contracts flow
-     **/
+     */
 
   }, {
-    key: "editPlaylist",
+    key: "updatePlaylist",
     value: function () {
-      var _editPlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(_ref3) {
-        var playlistId, playlistName, description, isAlbum, isPrivate, coverArt, responseValues, _dirCID, currentUserId, userId, updateAction, entityType, dirCID, updatedPlaylistImage, playlist, existingPlaylistTracks, metadata, _yield$this$creatorNo2, metadataMultihash, resp, txReceipt, error;
+      var _updatePlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(playlist) {
+        var responseValues, _playlist$artwork2, _dirCID2, userId, updateAction, entityType, dirCID, updatedPlaylistImage, trackIds, metadata, _yield$this$creatorNo2, metadataMultihash, resp, txReceipt, error;
 
-        return regeneratorRuntime.wrap(function _callee4$(_context4) {
+        return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                playlistId = _ref3.playlistId, playlistName = _ref3.playlistName, description = _ref3.description, isAlbum = _ref3.isAlbum, isPrivate = _ref3.isPrivate, coverArt = _ref3.coverArt;
                 responseValues = this.getDefaultPlaylistReponseValues();
-                _context4.prev = 2;
-                currentUserId = this.userStateManager.getCurrentUserId();
+                _context3.prev = 1;
+                userId = this.userStateManager.getCurrentUserId();
 
-                if (!(!playlistId || playlistId === undefined)) {
-                  _context4.next = 7;
+                if (!(!playlist || playlist === undefined)) {
+                  _context3.next = 6;
                   break;
                 }
 
-                responseValues.error = 'Missing current playlistId';
-                return _context4.abrupt("return", responseValues);
+                responseValues.error = 'Missing current playlist';
+                return _context3.abrupt("return", responseValues);
 
-              case 7:
-                if (currentUserId) {
-                  _context4.next = 10;
+              case 6:
+                if (userId) {
+                  _context3.next = 9;
                   break;
                 }
 
                 responseValues.error = 'Missing current user ID';
-                return _context4.abrupt("return", responseValues);
+                return _context3.abrupt("return", responseValues);
 
-              case 10:
-                userId = parseInt(currentUserId);
+              case 9:
                 updateAction = Action.UPDATE;
                 entityType = EntityType.PLAYLIST;
                 this.REQUIRES(Services.CREATOR_NODE);
 
-                if (!coverArt) {
-                  _context4.next = 19;
+                if (!(playlist !== null && playlist !== void 0 && (_playlist$artwork2 = playlist.artwork) !== null && _playlist$artwork2 !== void 0 && _playlist$artwork2.file)) {
+                  _context3.next = 17;
                   break;
                 }
 
-                _context4.next = 17;
-                return this.creatorNode.uploadImage(coverArt, true // square
+                _context3.next = 15;
+                return this.creatorNode.uploadImage(playlist.artwork.file, true // square
                 );
 
-              case 17:
-                updatedPlaylistImage = _context4.sent;
+              case 15:
+                updatedPlaylistImage = _context3.sent;
                 dirCID = updatedPlaylistImage.dirCID;
 
-              case 19:
-                _context4.next = 21;
-                return this.getFullPlaylist(playlistId, userId);
-
-              case 21:
-                playlist = _context4.sent;
-                existingPlaylistTracks = this.mapAddedTimestamps(playlist.added_timestamps);
-                metadata = {
-                  playlist_id: playlistId,
-                  playlist_contents: {
-                    track_ids: existingPlaylistTracks
-                  },
-                  playlist_name: playlistName !== null && playlistName !== void 0 ? playlistName : playlist.playlist_name,
-                  playlist_image_sizes_multihash: (_dirCID = dirCID) !== null && _dirCID !== void 0 ? _dirCID : playlist.cover_art,
-                  description: description !== null && description !== void 0 ? description : playlist.description,
-                  is_album: isAlbum !== null && isAlbum !== void 0 ? isAlbum : playlist.is_album,
-                  is_private: isPrivate !== null && isPrivate !== void 0 ? isPrivate : playlist.is_private
-                };
-                _context4.next = 26;
-                return this.creatorNode.uploadPlaylistMetadata(metadata);
-
-              case 26:
-                _yield$this$creatorNo2 = _context4.sent;
-                metadataMultihash = _yield$this$creatorNo2.metadataMultihash;
-                _context4.next = 30;
-                return this.manageEntity({
-                  userId: userId,
-                  entityType: entityType,
-                  entityId: playlistId,
-                  action: updateAction,
-                  metadataMultihash: metadataMultihash
-                });
-
-              case 30:
-                resp = _context4.sent;
-                txReceipt = resp.txReceipt;
-                responseValues.blockHash = txReceipt.blockHash;
-                responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context4.abrupt("return", responseValues);
-
-              case 38:
-                _context4.prev = 38;
-                _context4.t0 = _context4["catch"](2);
-                error = _context4.t0.message;
-                responseValues.error = error;
-                return _context4.abrupt("return", responseValues);
-
-              case 43:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4, this, [[2, 38]]);
-      }));
-
-      function editPlaylist(_x5) {
-        return _editPlaylist.apply(this, arguments);
-      }
-
-      return editPlaylist;
-    }()
-  }, {
-    key: "addPlaylistTrack",
-    value: function () {
-      var _addPlaylistTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(_ref4) {
-        var playlistId, trackId, timestamp, responseValues, currentUserId, userId, updateAction, entityType, playlist, updatedPlaylistTracks, metadata, _yield$this$creatorNo3, metadataMultihash, resp, txReceipt, error;
-
-        return regeneratorRuntime.wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                playlistId = _ref4.playlistId, trackId = _ref4.trackId, timestamp = _ref4.timestamp;
-                responseValues = this.getDefaultPlaylistReponseValues();
-                _context5.prev = 2;
-                currentUserId = this.userStateManager.getCurrentUserId();
-
-                if (!(!playlistId || playlistId === undefined)) {
-                  _context5.next = 7;
-                  break;
-                }
-
-                responseValues.error = 'Missing current playlistId';
-                return _context5.abrupt("return", responseValues);
-
-              case 7:
-                if (currentUserId) {
-                  _context5.next = 10;
-                  break;
-                }
-
-                responseValues.error = 'Missing current user ID';
-                return _context5.abrupt("return", responseValues);
-
-              case 10:
-                userId = parseInt(currentUserId);
-                updateAction = Action.UPDATE;
-                entityType = EntityType.PLAYLIST;
-                this.REQUIRES(Services.CREATOR_NODE);
-                _context5.next = 16;
-                return this.getFullPlaylist(playlistId, userId);
-
-              case 16:
-                playlist = _context5.sent;
-                updatedPlaylistTracks = this.mapAddedTimestamps(playlist.added_timestamps);
-                updatedPlaylistTracks.push({
-                  track: trackId,
-                  time: timestamp
-                });
-                metadata = {
-                  playlist_id: playlistId,
-                  playlist_contents: {
-                    track_ids: updatedPlaylistTracks
-                  },
-                  playlist_name: playlist.playlist_name,
-                  playlist_image_sizes_multihash: playlist.cover_art,
-                  description: playlist.description,
-                  is_album: playlist.is_album,
-                  is_private: playlist.is_private
-                };
-                _context5.next = 22;
-                return this.creatorNode.uploadPlaylistMetadata(metadata);
-
-              case 22:
-                _yield$this$creatorNo3 = _context5.sent;
-                metadataMultihash = _yield$this$creatorNo3.metadataMultihash;
-                _context5.next = 26;
-                return this.manageEntity({
-                  userId: userId,
-                  entityType: entityType,
-                  entityId: playlistId,
-                  action: updateAction,
-                  metadataMultihash: metadataMultihash
-                });
-
-              case 26:
-                resp = _context5.sent;
-                txReceipt = resp.txReceipt;
-                responseValues.blockHash = txReceipt.blockHash;
-                responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context5.abrupt("return", responseValues);
-
-              case 34:
-                _context5.prev = 34;
-                _context5.t0 = _context5["catch"](2);
-                error = _context5.t0.message;
-                responseValues.error = error;
-                return _context5.abrupt("return", responseValues);
-
-              case 39:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5, this, [[2, 34]]);
-      }));
-
-      function addPlaylistTrack(_x6) {
-        return _addPlaylistTrack.apply(this, arguments);
-      }
-
-      return addPlaylistTrack;
-    }()
-  }, {
-    key: "deletePlaylistTrack",
-    value: function () {
-      var _deletePlaylistTrack = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(_ref5) {
-        var playlistId, trackId, timestamp, responseValues, currentUserId, userId, updateAction, entityType, playlist, existingPlaylistTracks, updatedTrackIds, metadata, _yield$this$creatorNo4, metadataMultihash, resp, txReceipt, error;
-
-        return regeneratorRuntime.wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                playlistId = _ref5.playlistId, trackId = _ref5.trackId, timestamp = _ref5.timestamp;
-                responseValues = this.getDefaultPlaylistReponseValues();
-                _context6.prev = 2;
-                currentUserId = this.userStateManager.getCurrentUserId();
-
-                if (!(!playlistId || playlistId === undefined)) {
-                  _context6.next = 7;
-                  break;
-                }
-
-                responseValues.error = 'Missing current playlistId';
-                return _context6.abrupt("return", responseValues);
-
-              case 7:
-                if (currentUserId) {
-                  _context6.next = 10;
-                  break;
-                }
-
-                responseValues.error = 'Missing current user ID';
-                return _context6.abrupt("return", responseValues);
-
-              case 10:
-                userId = parseInt(currentUserId);
-                updateAction = Action.UPDATE;
-                entityType = EntityType.PLAYLIST;
-                this.REQUIRES(Services.CREATOR_NODE);
-                _context6.next = 16;
-                return this.getFullPlaylist(playlistId, userId);
-
-              case 16:
-                playlist = _context6.sent;
-                existingPlaylistTracks = this.mapAddedTimestamps(playlist.added_timestamps);
-                updatedTrackIds = existingPlaylistTracks.filter(function (trackObj) {
-                  var _ref6;
-
-                  return (_ref6 = trackObj.track !== trackId && timestamp !== trackObj.metadata_time) !== null && _ref6 !== void 0 ? _ref6 : trackObj.time;
-                });
+              case 17:
+                trackIds = this.mapTimestamps(playlist.playlist_contents.track_ids);
                 metadata = {
-                  playlist_id: playlistId,
+                  playlist_id: playlist.playlist_id,
                   playlist_contents: {
-                    track_ids: updatedTrackIds
+                    track_ids: trackIds
                   },
                   playlist_name: playlist.playlist_name,
-                  playlist_image_sizes_multihash: playlist.cover_art,
+                  playlist_image_sizes_multihash: (_dirCID2 = dirCID) !== null && _dirCID2 !== void 0 ? _dirCID2 : playlist.cover_art_sizes,
                   description: playlist.description,
                   is_album: playlist.is_album,
                   is_private: playlist.is_private
                 };
-                _context6.next = 22;
+                _context3.next = 21;
                 return this.creatorNode.uploadPlaylistMetadata(metadata);
 
-              case 22:
-                _yield$this$creatorNo4 = _context6.sent;
-                metadataMultihash = _yield$this$creatorNo4.metadataMultihash;
-                _context6.next = 26;
+              case 21:
+                _yield$this$creatorNo2 = _context3.sent;
+                metadataMultihash = _yield$this$creatorNo2.metadataMultihash;
+                _context3.next = 25;
                 return this.manageEntity({
                   userId: userId,
                   entityType: entityType,
-                  entityId: playlistId,
+                  entityId: playlist.playlist_id,
                   action: updateAction,
                   metadataMultihash: metadataMultihash
                 });
 
-              case 26:
-                resp = _context6.sent;
-                txReceipt = resp.txReceipt;
-                responseValues.blockHash = txReceipt.blockHash;
-                responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context6.abrupt("return", responseValues);
-
-              case 34:
-                _context6.prev = 34;
-                _context6.t0 = _context6["catch"](2);
-                error = _context6.t0.message;
-                responseValues.error = error;
-                return _context6.abrupt("return", responseValues);
-
-              case 39:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6, this, [[2, 34]]);
-      }));
-
-      function deletePlaylistTrack(_x7) {
-        return _deletePlaylistTrack.apply(this, arguments);
-      }
-
-      return deletePlaylistTrack;
-    }()
-    /**
-     * Update a playlist using updated data contracts flow
-     **/
-
-  }, {
-    key: "orderPlaylist",
-    value: function () {
-      var _orderPlaylist = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(_ref7) {
-        var playlistId, trackIds, responseValues, currentUserId, userId, updateAction, entityType, playlist, existingPlaylistTracks, trackIdsWithTimes, trackIdTimes, metadata, _yield$this$creatorNo5, metadataMultihash, resp, txReceipt, error;
-
-        return regeneratorRuntime.wrap(function _callee7$(_context7) {
-          while (1) {
-            switch (_context7.prev = _context7.next) {
-              case 0:
-                playlistId = _ref7.playlistId, trackIds = _ref7.trackIds;
-                responseValues = this.getDefaultPlaylistReponseValues();
-                _context7.prev = 2;
-                currentUserId = this.userStateManager.getCurrentUserId();
-
-                if (!(!playlistId || playlistId === undefined)) {
-                  _context7.next = 7;
-                  break;
-                }
-
-                responseValues.error = 'Missing current playlistId';
-                return _context7.abrupt("return", responseValues);
-
-              case 7:
-                if (currentUserId) {
-                  _context7.next = 10;
-                  break;
-                }
-
-                responseValues.error = 'Missing current user ID';
-                return _context7.abrupt("return", responseValues);
-
-              case 10:
-                userId = parseInt(currentUserId);
-                updateAction = Action.UPDATE;
-                entityType = EntityType.PLAYLIST;
-                this.REQUIRES(Services.CREATOR_NODE);
-                _context7.next = 16;
-                return this.getFullPlaylist(playlistId, userId);
-
-              case 16:
-                playlist = _context7.sent;
-                existingPlaylistTracks = this.mapAddedTimestamps(playlist.added_timestamps);
-                trackIdsWithTimes = [];
-                trackIdTimes = {};
-                existingPlaylistTracks.forEach(function (trackObj) {
-                  var _trackObj$metadata_ti2;
-
-                  var trackId = trackObj.track;
-                  var timestamp = (_trackObj$metadata_ti2 = trackObj.metadata_time) !== null && _trackObj$metadata_ti2 !== void 0 ? _trackObj$metadata_ti2 : trackObj.time;
-
-                  if (trackId in trackIdTimes) {
-                    trackIdTimes[trackId].push(timestamp);
-                  } else {
-                    trackIdTimes[trackId] = [timestamp];
-                  }
-                }); // new tracks default to currentBlock timestamp
-
-                trackIdsWithTimes = trackIds.map(function (trackId) {
-                  return {
-                    track: trackId,
-                    time: trackIdTimes[trackId].pop()
-                  };
-                });
-                metadata = {
-                  playlist_id: playlistId,
-                  playlist_contents: {
-                    track_ids: trackIdsWithTimes
-                  },
-                  playlist_name: playlist.playlist_name,
-                  playlist_image_sizes_multihash: playlist.cover_art,
-                  description: playlist.description,
-                  is_album: playlist.is_album,
-                  is_private: playlist.is_private
-                };
-                _context7.next = 25;
-                return this.creatorNode.uploadPlaylistMetadata(metadata);
-
               case 25:
-                _yield$this$creatorNo5 = _context7.sent;
-                metadataMultihash = _yield$this$creatorNo5.metadataMultihash;
-                _context7.next = 29;
-                return this.manageEntity({
-                  userId: userId,
-                  entityType: entityType,
-                  entityId: playlistId,
-                  action: updateAction,
-                  metadataMultihash: metadataMultihash
-                });
-
-              case 29:
-                resp = _context7.sent;
+                resp = _context3.sent;
                 txReceipt = resp.txReceipt;
                 responseValues.blockHash = txReceipt.blockHash;
                 responseValues.blockNumber = txReceipt.blockNumber;
-                responseValues.playlistId = playlistId;
-                return _context7.abrupt("return", responseValues);
+                return _context3.abrupt("return", responseValues);
 
-              case 37:
-                _context7.prev = 37;
-                _context7.t0 = _context7["catch"](2);
-                error = _context7.t0.message;
+              case 32:
+                _context3.prev = 32;
+                _context3.t0 = _context3["catch"](1);
+                error = _context3.t0.message;
                 responseValues.error = error;
-                return _context7.abrupt("return", responseValues);
+                return _context3.abrupt("return", responseValues);
 
-              case 42:
+              case 37:
               case "end":
-                return _context7.stop();
+                return _context3.stop();
             }
           }
-        }, _callee7, this, [[2, 37]]);
+        }, _callee3, this, [[1, 32]]);
       }));
 
-      function orderPlaylist(_x8) {
-        return _orderPlaylist.apply(this, arguments);
+      function updatePlaylist(_x3) {
+        return _updatePlaylist.apply(this, arguments);
       }
 
-      return orderPlaylist;
+      return updatePlaylist;
     }()
     /**
      * Manage an entity with the updated data contract flow
@@ -57800,44 +57415,44 @@ var EntityManager = /*#__PURE__*/function (_Base) {
   }, {
     key: "manageEntity",
     value: function () {
-      var _manageEntity = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(_ref8) {
+      var _manageEntity = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(_ref) {
         var userId, entityType, entityId, action, metadataMultihash, error, resp, _this$contracts$Entit;
 
-        return regeneratorRuntime.wrap(function _callee8$(_context8) {
+        return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                userId = _ref8.userId, entityType = _ref8.entityType, entityId = _ref8.entityId, action = _ref8.action, metadataMultihash = _ref8.metadataMultihash;
+                userId = _ref.userId, entityType = _ref.entityType, entityId = _ref.entityId, action = _ref.action, metadataMultihash = _ref.metadataMultihash;
                 error = null;
-                _context8.prev = 2;
-                _context8.next = 5;
+                _context4.prev = 2;
+                _context4.next = 5;
                 return (_this$contracts$Entit = this.contracts.EntityManagerClient) === null || _this$contracts$Entit === void 0 ? void 0 : _this$contracts$Entit.manageEntity(userId, entityType, entityId, action, metadataMultihash);
 
               case 5:
-                resp = _context8.sent;
-                return _context8.abrupt("return", {
+                resp = _context4.sent;
+                return _context4.abrupt("return", {
                   txReceipt: resp.txReceipt,
                   error: error
                 });
 
               case 9:
-                _context8.prev = 9;
-                _context8.t0 = _context8["catch"](2);
-                error = _context8.t0.message;
-                return _context8.abrupt("return", {
+                _context4.prev = 9;
+                _context4.t0 = _context4["catch"](2);
+                error = _context4.t0.message;
+                return _context4.abrupt("return", {
                   txReceipt: null,
                   error: error
                 });
 
               case 13:
               case "end":
-                return _context8.stop();
+                return _context4.stop();
             }
           }
-        }, _callee8, this, [[2, 9]]);
+        }, _callee4, this, [[2, 9]]);
       }));
 
-      function manageEntity(_x9) {
+      function manageEntity(_x4) {
         return _manageEntity.apply(this, arguments);
       }