@eluvio/elv-client-js 3.2.6 → 3.2.9

package/dist/src/walletClient/index.js

@@ -1,11 +1,11 @@
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
 
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
@@ -29,6 +29,8 @@ var _require2 = require("./Utils"),
 var UrlJoin = require("url-join");
 
 var Utils = require("../Utils");
+
+var Ethers = require("ethers");
 /**
  * Use the <a href="#.Initialize">Initialize</a> method to initialize a new client.
  *
@@ -97,10 +99,186 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
 
   }, {
-    key: "LogIn",
+    key: "CanSign",
     value:
     /* Login and authorization */
 
+    /**
+     * Check if this client can sign without opening a popup.
+     *
+     * Generally, Eluvio custodial wallet users will require a popup prompt, while Metamask and custom OAuth users will not.
+     *
+     * @methodGroup Signatures
+     * @returns {boolean} - Whether or not this client can sign a message without a popup.
+     */
+    function CanSign() {
+      if (!this.loggedIn) {
+        return false;
+      }
+
+      return !!this.__authorization.clusterToken || !!(this.UserInfo().walletName.toLowerCase() === "metamask" && window.ethereum && window.ethereum.isMetaMask && window.ethereum.chainId);
+    }
+    /**
+     * <b><i>Requires login</i></b>
+     *
+     * Request the current user sign the specified message.
+     *
+     * If this client is not able to perform the signature (Eluvio custodial OAuth users), a popup will be opened and the user will be prompted to sign.
+     *
+     * To check if the signature can be done without a popup, use the <a href="#CanSign">CanSign</a> method.
+     *
+     * @methodGroup Signatures
+     * @namedParams
+     * @param {string} message - The message to sign
+     *
+     * @throws - If the user rejects the signature or closes the popup, an error will be thrown.
+     *
+     * @returns {Promise<string>} - The signature of the message
+     */
+
+  }, {
+    key: "PersonalSign",
+    value: function () {
+      var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
+        var message, parameters, url;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                message = _ref2.message;
+
+                if (this.loggedIn) {
+                  _context3.next = 3;
+                  break;
+                }
+
+                throw Error("ElvWalletClient: Unable to perform signature - Not logged in");
+
+              case 3:
+                if (!this.CanSign()) {
+                  _context3.next = 17;
+                  break;
+                }
+
+                if (!this.__authorization.clusterToken) {
+                  _context3.next = 12;
+                  break;
+                }
+
+                // Custodial wallet sign
+                message = _typeof(message) === "object" ? JSON.stringify(message) : message;
+                message = Ethers.utils.keccak256(Buffer.from("\x19Ethereum Signed Message:\n".concat(message.length).concat(message), "utf-8"));
+                _context3.next = 9;
+                return this.client.authClient.Sign(message);
+
+              case 9:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 12:
+                if (!(this.UserInfo().walletName.toLowerCase() === "metamask")) {
+                  _context3.next = 16;
+                  break;
+                }
+
+                return _context3.abrupt("return", this.SignMetamask({
+                  message: message,
+                  address: this.UserAddress()
+                }));
+
+              case 16:
+                throw Error("ElvWalletClient: Unable to sign");
+
+              case 17:
+                parameters = {
+                  action: "personal-sign",
+                  message: message,
+                  logIn: true
+                };
+                url = new URL(this.appUrl);
+                url.hash = UrlJoin("/action", "sign", Utils.B58(JSON.stringify(parameters)));
+                url.searchParams.set("origin", window.location.origin);
+                _context3.next = 23;
+                return new Promise( /*#__PURE__*/function () {
+                  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
+                    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+                      while (1) {
+                        switch (_context2.prev = _context2.next) {
+                          case 0:
+                            _context2.next = 2;
+                            return ActionPopup({
+                              mode: "tab",
+                              url: url.toString(),
+                              onCancel: function onCancel() {
+                                return reject("User cancelled sign");
+                              },
+                              onMessage: function () {
+                                var _onMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event, Close) {
+                                  return _regeneratorRuntime.wrap(function _callee$(_context) {
+                                    while (1) {
+                                      switch (_context.prev = _context.next) {
+                                        case 0:
+                                          if (!(!event || !event.data || event.data.type !== "FlowResponse")) {
+                                            _context.next = 2;
+                                            break;
+                                          }
+
+                                          return _context.abrupt("return");
+
+                                        case 2:
+                                          try {
+                                            resolve(event.data.response);
+                                          } catch (error) {
+                                            reject(error);
+                                          } finally {
+                                            Close();
+                                          }
+
+                                        case 3:
+                                        case "end":
+                                          return _context.stop();
+                                      }
+                                    }
+                                  }, _callee);
+                                }));
+
+                                function onMessage(_x4, _x5) {
+                                  return _onMessage.apply(this, arguments);
+                                }
+
+                                return onMessage;
+                              }()
+                            });
+
+                          case 2:
+                          case "end":
+                            return _context2.stop();
+                        }
+                      }
+                    }, _callee2);
+                  }));
+
+                  return function (_x2, _x3) {
+                    return _ref3.apply(this, arguments);
+                  };
+                }());
+
+              case 23:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 24:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function PersonalSign(_x) {
+        return _PersonalSign.apply(this, arguments);
+      }
+
+      return PersonalSign;
+    }()
     /**
      * Direct the user to the Eluvio Media Wallet login page.
      *
@@ -119,17 +297,20 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @throws - If using the popup flow and the user closes the popup, this method will throw an error.
      */
-    function () {
-      var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
+
+  }, {
+    key: "LogIn",
+    value: function () {
+      var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref4) {
         var _this = this;
 
-        var _ref2$method, method, provider, _ref2$mode, mode, callbackUrl, marketplaceParams, _ref2$clearLogin, clearLogin, callback, loginUrl;
+        var _ref4$method, method, provider, _ref4$mode, mode, callbackUrl, marketplaceParams, _ref4$clearLogin, clearLogin, callback, loginUrl;
 
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                _ref2$method = _ref2.method, method = _ref2$method === void 0 ? "redirect" : _ref2$method, provider = _ref2.provider, _ref2$mode = _ref2.mode, mode = _ref2$mode === void 0 ? "login" : _ref2$mode, callbackUrl = _ref2.callbackUrl, marketplaceParams = _ref2.marketplaceParams, _ref2$clearLogin = _ref2.clearLogin, clearLogin = _ref2$clearLogin === void 0 ? false : _ref2$clearLogin, callback = _ref2.callback;
+                _ref4$method = _ref4.method, method = _ref4$method === void 0 ? "redirect" : _ref4$method, provider = _ref4.provider, _ref4$mode = _ref4.mode, mode = _ref4$mode === void 0 ? "login" : _ref4$mode, callbackUrl = _ref4.callbackUrl, marketplaceParams = _ref4.marketplaceParams, _ref4$clearLogin = _ref4.clearLogin, clearLogin = _ref4$clearLogin === void 0 ? false : _ref4$clearLogin, callback = _ref4.callback;
                 loginUrl = new URL(this.appUrl);
                 loginUrl.hash = "/login";
                 loginUrl.searchParams.set("origin", window.location.origin);
@@ -144,22 +325,22 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }
 
                 if (!marketplaceParams) {
-                  _context3.next = 15;
+                  _context6.next = 15;
                   break;
                 }
 
-                _context3.t0 = loginUrl.searchParams;
-                _context3.next = 11;
+                _context6.t0 = loginUrl.searchParams;
+                _context6.next = 11;
                 return this.MarketplaceInfo({
                   marketplaceParams: marketplaceParams
                 });
 
               case 11:
-                _context3.t1 = _context3.sent.marketplaceHash;
+                _context6.t1 = _context6.sent.marketplaceHash;
 
-                _context3.t0.set.call(_context3.t0, "mid", _context3.t1);
+                _context6.t0.set.call(_context6.t0, "mid", _context6.t1);
 
-                _context3.next = 16;
+                _context6.next = 16;
                 break;
 
               case 15:
@@ -173,7 +354,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }
 
                 if (!(method === "redirect")) {
-                  _context3.next = 24;
+                  _context6.next = 24;
                   break;
                 }
 
@@ -181,20 +362,20 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 loginUrl.searchParams.set("source", "origin");
                 loginUrl.searchParams.set("redirect", callbackUrl);
                 window.location = loginUrl;
-                _context3.next = 28;
+                _context6.next = 28;
                 break;
 
               case 24:
                 loginUrl.searchParams.set("response", "message");
                 loginUrl.searchParams.set("source", "parent");
-                _context3.next = 28;
+                _context6.next = 28;
                 return new Promise( /*#__PURE__*/function () {
-                  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
-                    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+                  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(resolve, reject) {
+                    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                       while (1) {
-                        switch (_context2.prev = _context2.next) {
+                        switch (_context5.prev = _context5.next) {
                           case 0:
-                            _context2.next = 2;
+                            _context5.next = 2;
                             return ActionPopup({
                               mode: "tab",
                               url: loginUrl.toString(),
@@ -202,64 +383,64 @@ var ElvWalletClient = /*#__PURE__*/function () {
                                 return reject("User cancelled login");
                               },
                               onMessage: function () {
-                                var _onMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(event, Close) {
-                                  return _regeneratorRuntime.wrap(function _callee$(_context) {
+                                var _onMessage2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(event, Close) {
+                                  return _regeneratorRuntime.wrap(function _callee4$(_context4) {
                                     while (1) {
-                                      switch (_context.prev = _context.next) {
+                                      switch (_context4.prev = _context4.next) {
                                         case 0:
                                           if (!(!event || !event.data || event.data.type !== "LoginResponse")) {
-                                            _context.next = 2;
+                                            _context4.next = 2;
                                             break;
                                           }
 
-                                          return _context.abrupt("return");
+                                          return _context4.abrupt("return");
 
                                         case 2:
-                                          _context.prev = 2;
+                                          _context4.prev = 2;
 
                                           if (!callback) {
-                                            _context.next = 8;
+                                            _context4.next = 8;
                                             break;
                                           }
 
-                                          _context.next = 6;
+                                          _context4.next = 6;
                                           return callback(event.data.params);
 
                                         case 6:
-                                          _context.next = 10;
+                                          _context4.next = 10;
                                           break;
 
                                         case 8:
-                                          _context.next = 10;
+                                          _context4.next = 10;
                                           return _this.Authenticate({
                                             token: event.data.params.clientSigningToken || event.data.params.clientAuthToken
                                           });
 
                                         case 10:
                                           resolve();
-                                          _context.next = 16;
+                                          _context4.next = 16;
                                           break;
 
                                         case 13:
-                                          _context.prev = 13;
-                                          _context.t0 = _context["catch"](2);
-                                          reject(_context.t0);
+                                          _context4.prev = 13;
+                                          _context4.t0 = _context4["catch"](2);
+                                          reject(_context4.t0);
 
                                         case 16:
-                                          _context.prev = 16;
+                                          _context4.prev = 16;
                                           Close();
-                                          return _context.finish(16);
+                                          return _context4.finish(16);
 
                                         case 19:
                                         case "end":
-                                          return _context.stop();
+                                          return _context4.stop();
                                       }
                                     }
-                                  }, _callee, null, [[2, 13, 16, 19]]);
+                                  }, _callee4, null, [[2, 13, 16, 19]]);
                                 }));
 
-                                function onMessage(_x4, _x5) {
-                                  return _onMessage.apply(this, arguments);
+                                function onMessage(_x9, _x10) {
+                                  return _onMessage2.apply(this, arguments);
                                 }
 
                                 return onMessage;
@@ -268,26 +449,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
                           case 2:
                           case "end":
-                            return _context2.stop();
+                            return _context5.stop();
                         }
                       }
-                    }, _callee2);
+                    }, _callee5);
                   }));
 
-                  return function (_x2, _x3) {
-                    return _ref3.apply(this, arguments);
+                  return function (_x7, _x8) {
+                    return _ref5.apply(this, arguments);
                   };
                 }());
 
               case 28:
               case "end":
-                return _context3.stop();
+                return _context6.stop();
             }
           }
-        }, _callee3, this);
+        }, _callee6, this);
       }));
 
-      function LogIn(_x) {
+      function LogIn(_x6) {
         return _LogIn.apply(this, arguments);
       }
 
@@ -323,26 +504,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "Authenticate",
     value: function () {
-      var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref4) {
+      var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref6) {
         var token, decodedToken;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
-                token = _ref4.token;
-                _context4.prev = 1;
+                token = _ref6.token;
+                _context7.prev = 1;
                 decodedToken = JSON.parse(this.utils.FromB58ToStr(token)) || {};
-                _context4.next = 8;
+                _context7.next = 8;
                 break;
 
               case 5:
-                _context4.prev = 5;
-                _context4.t0 = _context4["catch"](1);
+                _context7.prev = 5;
+                _context7.t0 = _context7["catch"](1);
                 throw new Error("Invalid authorization token " + token);
 
               case 8:
                 if (!(!decodedToken.expiresAt || Date.now() > decodedToken.expiresAt)) {
-                  _context4.next = 10;
+                  _context7.next = 10;
                   break;
                 }
 
@@ -350,11 +531,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 10:
                 if (!decodedToken.clusterToken) {
-                  _context4.next = 13;
+                  _context7.next = 13;
                   break;
                 }
 
-                _context4.next = 13;
+                _context7.next = 13;
                 return this.client.SetRemoteSigner({
                   authToken: decodedToken.clusterToken
                 });
@@ -363,17 +544,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 this.client.SetStaticToken({
                   token: decodedToken.fabricToken
                 });
-                return _context4.abrupt("return", this.SetAuthorization(decodedToken));
+                return _context7.abrupt("return", this.SetAuthorization(decodedToken));
 
               case 15:
               case "end":
-                return _context4.stop();
+                return _context7.stop();
             }
           }
-        }, _callee4, this, [[1, 5]]);
+        }, _callee7, this, [[1, 5]]);
       }));
 
-      function Authenticate(_x6) {
+      function Authenticate(_x11) {
         return _Authenticate.apply(this, arguments);
       }
 
@@ -402,28 +583,28 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "AuthenticateOAuth",
     value: function () {
-      var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref5) {
-        var idToken, tenantId, email, _ref5$shareEmail, shareEmail, _ref5$tokenDuration, tokenDuration, expiresAt, fabricToken, address, decodedToken;
+      var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref7) {
+        var idToken, tenantId, email, _ref7$shareEmail, shareEmail, _ref7$tokenDuration, tokenDuration, expiresAt, fabricToken, address, decodedToken;
 
-        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
-                idToken = _ref5.idToken, tenantId = _ref5.tenantId, email = _ref5.email, _ref5$shareEmail = _ref5.shareEmail, shareEmail = _ref5$shareEmail === void 0 ? false : _ref5$shareEmail, _ref5$tokenDuration = _ref5.tokenDuration, tokenDuration = _ref5$tokenDuration === void 0 ? 24 : _ref5$tokenDuration;
+                idToken = _ref7.idToken, tenantId = _ref7.tenantId, email = _ref7.email, _ref7$shareEmail = _ref7.shareEmail, shareEmail = _ref7$shareEmail === void 0 ? false : _ref7$shareEmail, _ref7$tokenDuration = _ref7.tokenDuration, tokenDuration = _ref7$tokenDuration === void 0 ? 24 : _ref7$tokenDuration;
 
                 if (!(!tenantId && this.selectedMarketplaceInfo)) {
-                  _context5.next = 5;
+                  _context8.next = 5;
                   break;
                 }
 
-                _context5.next = 4;
+                _context8.next = 4;
                 return this.AvailableMarketplaces();
 
               case 4:
                 tenantId = this.selectedMarketplaceInfo.tenantId;
 
               case 5:
-                _context5.next = 7;
+                _context8.next = 7;
                 return this.client.SetRemoteSigner({
                   idToken: idToken,
                   tenantId: tenantId,
@@ -435,36 +616,36 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 7:
                 expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-                _context5.next = 10;
+                _context8.next = 10;
                 return this.client.CreateFabricToken({
                   duration: tokenDuration * 60 * 60 * 1000
                 });
 
               case 10:
-                fabricToken = _context5.sent;
+                fabricToken = _context8.sent;
                 address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
 
                 if (email) {
-                  _context5.next = 21;
+                  _context8.next = 21;
                   break;
                 }
 
-                _context5.prev = 13;
+                _context8.prev = 13;
                 decodedToken = JSON.parse(this.utils.FromB64URL(idToken.split(".")[1]));
                 email = decodedToken.email;
-                _context5.next = 21;
+                _context8.next = 21;
                 break;
 
               case 18:
-                _context5.prev = 18;
-                _context5.t0 = _context5["catch"](13);
+                _context8.prev = 18;
+                _context8.t0 = _context8["catch"](13);
                 throw Error("Failed to decode ID token");
 
               case 21:
                 this.client.SetStaticToken({
                   token: fabricToken
                 });
-                return _context5.abrupt("return", {
+                return _context8.abrupt("return", {
                   authToken: this.SetAuthorization({
                     fabricToken: fabricToken,
                     tenantId: tenantId,
@@ -488,13 +669,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 23:
               case "end":
-                return _context5.stop();
+                return _context8.stop();
             }
           }
-        }, _callee5, this, [[13, 18]]);
+        }, _callee8, this, [[13, 18]]);
       }));
 
-      function AuthenticateOAuth(_x7) {
+      function AuthenticateOAuth(_x12) {
         return _AuthenticateOAuth.apply(this, arguments);
       }
 
@@ -517,16 +698,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "AuthenticateExternalWallet",
     value: function () {
-      var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref6) {
+      var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref8) {
         var _this2 = this;
 
-        var address, _ref6$tokenDuration, tokenDuration, _ref6$walletName, walletName, Sign, expiresAt, fabricToken;
+        var address, _ref8$tokenDuration, tokenDuration, _ref8$walletName, walletName, Sign, expiresAt, fabricToken;
 
-        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                address = _ref6.address, _ref6$tokenDuration = _ref6.tokenDuration, tokenDuration = _ref6$tokenDuration === void 0 ? 24 : _ref6$tokenDuration, _ref6$walletName = _ref6.walletName, walletName = _ref6$walletName === void 0 ? "Metamask" : _ref6$walletName, Sign = _ref6.Sign;
+                address = _ref8.address, _ref8$tokenDuration = _ref8.tokenDuration, tokenDuration = _ref8$tokenDuration === void 0 ? 24 : _ref8$tokenDuration, _ref8$walletName = _ref8.walletName, walletName = _ref8$walletName === void 0 ? "Metamask" : _ref8$walletName, Sign = _ref8.Sign;
 
                 if (!address) {
                   address = window.ethereum.selectedAddress;
@@ -536,32 +717,32 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
                 if (!Sign) {
                   Sign = /*#__PURE__*/function () {
-                    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(message) {
-                      return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+                    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(message) {
+                      return _regeneratorRuntime.wrap(function _callee9$(_context9) {
                         while (1) {
-                          switch (_context6.prev = _context6.next) {
+                          switch (_context9.prev = _context9.next) {
                             case 0:
-                              return _context6.abrupt("return", _this2.SignMetamask({
+                              return _context9.abrupt("return", _this2.SignMetamask({
                                 message: message,
                                 address: address
                               }));
 
                             case 1:
                             case "end":
-                              return _context6.stop();
+                              return _context9.stop();
                           }
                         }
-                      }, _callee6);
+                      }, _callee9);
                     }));
 
-                    return function Sign(_x9) {
-                      return _ref7.apply(this, arguments);
+                    return function Sign(_x14) {
+                      return _ref9.apply(this, arguments);
                     };
                   }();
                 }
 
                 expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-                _context7.next = 7;
+                _context10.next = 7;
                 return this.client.CreateFabricToken({
                   address: address,
                   duration: tokenDuration * 60 * 60 * 1000,
@@ -570,8 +751,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
               case 7:
-                fabricToken = _context7.sent;
-                return _context7.abrupt("return", this.SetAuthorization({
+                fabricToken = _context10.sent;
+                return _context10.abrupt("return", this.SetAuthorization({
                   fabricToken: fabricToken,
                   address: address,
                   expiresAt: expiresAt,
@@ -581,13 +762,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 9:
               case "end":
-                return _context7.stop();
+                return _context10.stop();
             }
           }
-        }, _callee7, this);
+        }, _callee10, this);
       }));
 
-      function AuthenticateExternalWallet(_x8) {
+      function AuthenticateExternalWallet(_x13) {
         return _AuthenticateExternalWallet.apply(this, arguments);
       }
 
@@ -621,15 +802,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
     }
   }, {
     key: "SetAuthorization",
-    value: function SetAuthorization(_ref8) {
-      var clusterToken = _ref8.clusterToken,
-          fabricToken = _ref8.fabricToken,
-          tenantId = _ref8.tenantId,
-          address = _ref8.address,
-          email = _ref8.email,
-          expiresAt = _ref8.expiresAt,
-          walletType = _ref8.walletType,
-          walletName = _ref8.walletName;
+    value: function SetAuthorization(_ref10) {
+      var clusterToken = _ref10.clusterToken,
+          fabricToken = _ref10.fabricToken,
+          tenantId = _ref10.tenantId,
+          address = _ref10.address,
+          email = _ref10.email,
+          expiresAt = _ref10.expiresAt,
+          walletType = _ref10.walletType,
+          walletName = _ref10.walletName;
       address = this.client.utils.FormatAddress(address);
       this.__authorization = {
         fabricToken: fabricToken,
@@ -660,47 +841,57 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "SignMetamask",
     value: function () {
-      var _SignMetamask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref9) {
-        var message, address, from;
-        return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      var _SignMetamask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref11) {
+        var message, address, accounts;
+        return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
-                message = _ref9.message, address = _ref9.address;
+                message = _ref11.message, address = _ref11.address;
 
                 if (window.ethereum) {
-                  _context8.next = 3;
+                  _context11.next = 3;
                   break;
                 }
 
                 throw Error("ElvWalletClient: Unable to initialize - Metamask not available");
 
               case 3:
-                _context8.next = 5;
+                address = address || this.UserAddress();
+                _context11.next = 6;
                 return window.ethereum.request({
                   method: "eth_requestAccounts"
                 });
 
-              case 5:
-                from = address || window.ethereum.selectedAddress;
-                _context8.next = 8;
+              case 6:
+                accounts = _context11.sent;
+
+                if (!(address && !Utils.EqualAddress(accounts[0], address))) {
+                  _context11.next = 9;
+                  break;
+                }
+
+                throw Error("ElvWalletClient: Incorrect MetaMask account selected. Expected ".concat(address, ", got ").concat(accounts[0]));
+
+              case 9:
+                _context11.next = 11;
                 return window.ethereum.request({
                   method: "personal_sign",
-                  params: [message, from, ""]
+                  params: [message, address, ""]
                 });
 
-              case 8:
-                return _context8.abrupt("return", _context8.sent);
+              case 11:
+                return _context11.abrupt("return", _context11.sent);
 
-              case 9:
+              case 12:
               case "end":
-                return _context8.stop();
+                return _context11.stop();
             }
           }
-        }, _callee8);
+        }, _callee11, this);
       }));
 
-      function SignMetamask(_x10) {
+      function SignMetamask(_x15) {
         return _SignMetamask.apply(this, arguments);
       }
 
@@ -711,7 +902,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LoadAvailableMarketplaces",
     value: function () {
-      var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+      var _LoadAvailableMarketplaces = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
         var _this3 = this;
 
         var forceReload,
@@ -719,29 +910,29 @@ var ElvWalletClient = /*#__PURE__*/function () {
             metadata,
             availableMarketplaces,
             availableMarketplacesById,
-            _args9 = arguments;
-        return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+            _args12 = arguments;
+        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context12.prev = _context12.next) {
               case 0:
-                forceReload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : false;
+                forceReload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : false;
 
                 if (!(!forceReload && Object.keys(this.availableMarketplaces) > 0)) {
-                  _context9.next = 3;
+                  _context12.next = 3;
                   break;
                 }
 
-                return _context9.abrupt("return");
+                return _context12.abrupt("return");
 
               case 3:
-                _context9.next = 5;
+                _context12.next = 5;
                 return this.client.LatestVersionHash({
                   objectId: this.mainSiteId
                 });
 
               case 5:
-                mainSiteHash = _context9.sent;
-                _context9.next = 8;
+                mainSiteHash = _context12.sent;
+                _context12.next = 8;
                 return this.client.ContentObjectMetadata({
                   versionHash: mainSiteHash,
                   metadataSubtree: "public/asset_metadata/tenants",
@@ -757,7 +948,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
               case 8:
-                metadata = _context9.sent;
+                metadata = _context12.sent;
                 availableMarketplaces = _objectSpread({}, this.availableMarketplaces || {});
                 availableMarketplacesById = _objectSpread({}, this.availableMarketplacesById || {});
                 Object.keys(metadata || {}).forEach(function (tenantSlug) {
@@ -805,10 +996,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 14:
               case "end":
-                return _context9.stop();
+                return _context12.stop();
             }
           }
-        }, _callee9, this);
+        }, _callee12, this);
       }));
 
       function LoadAvailableMarketplaces() {
@@ -821,21 +1012,21 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LatestMarketplaceHash",
     value: function () {
-      var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref10) {
+      var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref12) {
         var tenantSlug, marketplaceSlug, mainSiteHash, marketplaceLink;
-        return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
-                tenantSlug = _ref10.tenantSlug, marketplaceSlug = _ref10.marketplaceSlug;
-                _context10.next = 3;
+                tenantSlug = _ref12.tenantSlug, marketplaceSlug = _ref12.marketplaceSlug;
+                _context13.next = 3;
                 return this.client.LatestVersionHash({
                   objectId: this.mainSiteId
                 });
 
               case 3:
-                mainSiteHash = _context10.sent;
-                _context10.next = 6;
+                mainSiteHash = _context13.sent;
+                _context13.next = 6;
                 return this.client.ContentObjectMetadata({
                   versionHash: mainSiteHash,
                   metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", tenantSlug, "marketplaces", marketplaceSlug),
@@ -843,18 +1034,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
               case 6:
-                marketplaceLink = _context10.sent;
-                return _context10.abrupt("return", LinkTargetHash(marketplaceLink));
+                marketplaceLink = _context13.sent;
+                return _context13.abrupt("return", LinkTargetHash(marketplaceLink));
 
               case 8:
               case "end":
-                return _context10.stop();
+                return _context13.stop();
             }
           }
-        }, _callee10, this);
+        }, _callee13, this);
       }));
 
-      function LatestMarketplaceHash(_x11) {
+      function LatestMarketplaceHash(_x16) {
         return _LatestMarketplaceHash.apply(this, arguments);
       }
 
@@ -863,37 +1054,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LoadMarketplace",
     value: function () {
-      var _LoadMarketplace = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(marketplaceParams) {
+      var _LoadMarketplace = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(marketplaceParams) {
         var _this4 = this;
 
         var marketplaceInfo, marketplaceId, marketplaceHash, marketplace;
-        return _regeneratorRuntime.wrap(function _callee12$(_context12) {
+        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
           while (1) {
-            switch (_context12.prev = _context12.next) {
+            switch (_context15.prev = _context15.next) {
               case 0:
                 marketplaceInfo = this.MarketplaceInfo({
                   marketplaceParams: marketplaceParams
                 });
                 marketplaceId = marketplaceInfo.marketplaceId;
-                _context12.next = 4;
+                _context15.next = 4;
                 return this.LatestMarketplaceHash({
                   tenantSlug: marketplaceInfo.tenantSlug,
                   marketplaceSlug: marketplaceInfo.marketplaceSlug
                 });
 
               case 4:
-                marketplaceHash = _context12.sent;
+                marketplaceHash = _context15.sent;
 
                 if (this.cachedMarketplaces[marketplaceId] && this.cachedMarketplaces[marketplaceId].versionHash !== marketplaceHash) {
                   delete this.cachedMarketplaces[marketplaceId];
                 }
 
                 if (this.cachedMarketplaces[marketplaceId]) {
-                  _context12.next = 19;
+                  _context15.next = 19;
                   break;
                 }
 
-                _context12.next = 9;
+                _context15.next = 9;
                 return this.client.ContentObjectMetadata({
                   versionHash: marketplaceHash,
                   metadataSubtree: "public/asset_metadata/info",
@@ -906,31 +1097,31 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
               case 9:
-                marketplace = _context12.sent;
-                _context12.next = 12;
+                marketplace = _context15.sent;
+                _context15.next = 12;
                 return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
-                  var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(item, index) {
-                    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
+                  var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(item, index) {
+                    return _regeneratorRuntime.wrap(function _callee14$(_context14) {
                       while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context14.prev = _context14.next) {
                           case 0:
                             if (!item.requires_permissions) {
-                              _context11.next = 14;
+                              _context14.next = 14;
                               break;
                             }
 
                             if (_this4.loggedIn) {
-                              _context11.next = 5;
+                              _context14.next = 5;
                               break;
                             }
 
                             item.authorized = false;
-                            _context11.next = 14;
+                            _context14.next = 14;
                             break;
 
                           case 5:
-                            _context11.prev = 5;
-                            _context11.next = 8;
+                            _context14.prev = 5;
+                            _context14.next = 8;
                             return _this4.client.ContentObjectMetadata({
                               versionHash: LinkTargetHash(item.nft_template),
                               metadataSubtree: "permissioned"
@@ -938,34 +1129,34 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
                           case 8:
                             item.authorized = true;
-                            _context11.next = 14;
+                            _context14.next = 14;
                             break;
 
                           case 11:
-                            _context11.prev = 11;
-                            _context11.t0 = _context11["catch"](5);
+                            _context14.prev = 11;
+                            _context14.t0 = _context14["catch"](5);
                             item.authorized = false;
 
                           case 14:
                             item.nftTemplateMetadata = (item.nft_template || {}).nft || {};
                             item.itemIndex = index;
-                            return _context11.abrupt("return", item);
+                            return _context14.abrupt("return", item);
 
                           case 17:
                           case "end":
-                            return _context11.stop();
+                            return _context14.stop();
                         }
                       }
-                    }, _callee11, null, [[5, 11]]);
+                    }, _callee14, null, [[5, 11]]);
                   }));
 
-                  return function (_x13, _x14) {
-                    return _ref11.apply(this, arguments);
+                  return function (_x18, _x19) {
+                    return _ref13.apply(this, arguments);
                   };
                 }()));
 
               case 12:
-                marketplace.items = _context12.sent;
+                marketplace.items = _context15.sent;
                 marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                   return _objectSpread(_objectSpread({}, collection), {}, {
                     collectionIndex: collectionIndex
@@ -999,17 +1190,17 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 this.cachedMarketplaces[marketplaceId] = marketplace;
 
               case 19:
-                return _context12.abrupt("return", this.cachedMarketplaces[marketplaceId]);
+                return _context15.abrupt("return", this.cachedMarketplaces[marketplaceId]);
 
               case 20:
               case "end":
-                return _context12.stop();
+                return _context15.stop();
             }
           }
-        }, _callee12, this);
+        }, _callee15, this);
       }));
 
-      function LoadMarketplace(_x12) {
+      function LoadMarketplace(_x17) {
         return _LoadMarketplace.apply(this, arguments);
       }
 
@@ -1018,13 +1209,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "FilteredQuery",
     value: function () {
-      var _FilteredQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13() {
-        var _ref12,
-            _ref12$mode,
+      var _FilteredQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
+        var _ref14,
+            _ref14$mode,
             mode,
-            _ref12$sortBy,
+            _ref14$sortBy,
             sortBy,
-            _ref12$sortDesc,
+            _ref14$sortDesc,
             sortDesc,
             filter,
             editionFilter,
@@ -1034,14 +1225,14 @@ var ElvWalletClient = /*#__PURE__*/function () {
             currency,
             marketplaceParams,
             tenantId,
-            _ref12$collectionInde,
+            _ref14$collectionInde,
             collectionIndex,
             sellerAddress,
-            _ref12$lastNDays,
+            _ref14$lastNDays,
             lastNDays,
-            _ref12$start,
+            _ref14$start,
             start,
-            _ref12$limit,
+            _ref14$limit,
             limit,
             params,
             marketplaceInfo,
@@ -1049,16 +1240,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
             filters,
             collection,
             path,
-            _ref14,
+            _ref16,
             contents,
             paging,
-            _args13 = arguments;
+            _args16 = arguments;
 
-        return _regeneratorRuntime.wrap(function _callee13$(_context13) {
+        return _regeneratorRuntime.wrap(function _callee16$(_context16) {
           while (1) {
-            switch (_context13.prev = _context13.next) {
+            switch (_context16.prev = _context16.next) {
               case 0:
-                _ref12 = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {}, _ref12$mode = _ref12.mode, mode = _ref12$mode === void 0 ? "listings" : _ref12$mode, _ref12$sortBy = _ref12.sortBy, sortBy = _ref12$sortBy === void 0 ? "created" : _ref12$sortBy, _ref12$sortDesc = _ref12.sortDesc, sortDesc = _ref12$sortDesc === void 0 ? false : _ref12$sortDesc, filter = _ref12.filter, editionFilter = _ref12.editionFilter, attributeFilters = _ref12.attributeFilters, contractAddress = _ref12.contractAddress, tokenId = _ref12.tokenId, currency = _ref12.currency, marketplaceParams = _ref12.marketplaceParams, tenantId = _ref12.tenantId, _ref12$collectionInde = _ref12.collectionIndex, collectionIndex = _ref12$collectionInde === void 0 ? -1 : _ref12$collectionInde, sellerAddress = _ref12.sellerAddress, _ref12$lastNDays = _ref12.lastNDays, lastNDays = _ref12$lastNDays === void 0 ? -1 : _ref12$lastNDays, _ref12$start = _ref12.start, start = _ref12$start === void 0 ? 0 : _ref12$start, _ref12$limit = _ref12.limit, limit = _ref12$limit === void 0 ? 50 : _ref12$limit;
+                _ref14 = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {}, _ref14$mode = _ref14.mode, mode = _ref14$mode === void 0 ? "listings" : _ref14$mode, _ref14$sortBy = _ref14.sortBy, sortBy = _ref14$sortBy === void 0 ? "created" : _ref14$sortBy, _ref14$sortDesc = _ref14.sortDesc, sortDesc = _ref14$sortDesc === void 0 ? false : _ref14$sortDesc, filter = _ref14.filter, editionFilter = _ref14.editionFilter, attributeFilters = _ref14.attributeFilters, contractAddress = _ref14.contractAddress, tokenId = _ref14.tokenId, currency = _ref14.currency, marketplaceParams = _ref14.marketplaceParams, tenantId = _ref14.tenantId, _ref14$collectionInde = _ref14.collectionIndex, collectionIndex = _ref14$collectionInde === void 0 ? -1 : _ref14$collectionInde, sellerAddress = _ref14.sellerAddress, _ref14$lastNDays = _ref14.lastNDays, lastNDays = _ref14$lastNDays === void 0 ? -1 : _ref14$lastNDays, _ref14$start = _ref14.start, start = _ref14$start === void 0 ? 0 : _ref14$start, _ref14$limit = _ref14.limit, limit = _ref14$limit === void 0 ? 50 : _ref14$limit;
                 collectionIndex = parseInt(collectionIndex);
                 params = {
                   sort_by: sortBy,
@@ -1068,33 +1259,33 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 };
 
                 if (!marketplaceParams) {
-                  _context13.next = 11;
+                  _context16.next = 11;
                   break;
                 }
 
-                _context13.next = 6;
+                _context16.next = 6;
                 return this.MarketplaceInfo({
                   marketplaceParams: marketplaceParams
                 });
 
               case 6:
-                marketplaceInfo = _context13.sent;
+                marketplaceInfo = _context16.sent;
 
                 if (!(collectionIndex >= 0)) {
-                  _context13.next = 11;
+                  _context16.next = 11;
                   break;
                 }
 
-                _context13.next = 10;
+                _context16.next = 10;
                 return this.Marketplace({
                   marketplaceParams: marketplaceParams
                 });
 
               case 10:
-                marketplace = _context13.sent;
+                marketplace = _context16.sent;
 
               case 11:
-                _context13.prev = 11;
+                _context16.prev = 11;
                 filters = [];
 
                 if (sellerAddress) {
@@ -1102,7 +1293,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }
 
                 if (!(marketplace && collectionIndex >= 0)) {
-                  _context13.next = 25;
+                  _context16.next = 25;
                   break;
                 }
 
@@ -1128,19 +1319,19 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }); // No valid items, so there must not be anything relevant in the collection
 
                 if (!(filters.length === 0)) {
-                  _context13.next = 23;
+                  _context16.next = 23;
                   break;
                 }
 
                 if (!mode.includes("stats")) {
-                  _context13.next = 22;
+                  _context16.next = 22;
                   break;
                 }
 
-                return _context13.abrupt("return", {});
+                return _context16.abrupt("return", {});
 
               case 22:
-                return _context13.abrupt("return", {
+                return _context16.abrupt("return", {
                   paging: {
                     start: params.start,
                     limit: params.limit,
@@ -1151,7 +1342,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
               case 23:
-                _context13.next = 26;
+                _context16.next = 26;
                 break;
 
               case 25:
@@ -1193,9 +1384,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }
 
                 if (attributeFilters) {
-                  attributeFilters.map(function (_ref13) {
-                    var name = _ref13.name,
-                        value = _ref13.value;
+                  attributeFilters.map(function (_ref15) {
+                    var name = _ref15.name,
+                        value = _ref15.value;
 
                     if (!name || !value) {
                       return;
@@ -1213,8 +1404,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   filters.push("created:gt:".concat((Date.now() / 1000 - lastNDays * 24 * 60 * 60).toFixed(0)));
                 }
 
-                _context13.t0 = mode;
-                _context13.next = _context13.t0 === "owned" ? 34 : _context13.t0 === "listings" ? 37 : _context13.t0 === "sales" ? 39 : _context13.t0 === "listing-stats" ? 42 : _context13.t0 === "sales-stats" ? 44 : 46;
+                _context16.t0 = mode;
+                _context16.next = _context16.t0 === "owned" ? 34 : _context16.t0 === "listings" ? 37 : _context16.t0 === "transfers" ? 39 : _context16.t0 === "sales" ? 41 : _context16.t0 === "listing-stats" ? 44 : _context16.t0 === "sales-stats" ? 46 : 48;
                 break;
 
               case 34:
@@ -1224,48 +1415,52 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   path = UrlJoin("as", "wlt", "nfts", marketplaceInfo.tenantId);
                 }
 
-                return _context13.abrupt("break", 46);
+                return _context16.abrupt("break", 48);
 
               case 37:
                 path = UrlJoin("as", "mkt", "f");
-                return _context13.abrupt("break", 46);
+                return _context16.abrupt("break", 48);
 
               case 39:
+                path = UrlJoin("as", "mkt", "hst", "f");
+                return _context16.abrupt("break", 48);
+
+              case 41:
                 path = UrlJoin("as", "mkt", "hst", "f");
                 filters.push("action:eq:SOLD");
-                return _context13.abrupt("break", 46);
+                return _context16.abrupt("break", 48);
 
-              case 42:
+              case 44:
                 path = UrlJoin("as", "mkt", "stats", "listed");
-                return _context13.abrupt("break", 46);
+                return _context16.abrupt("break", 48);
 
-              case 44:
+              case 46:
                 path = UrlJoin("as", "mkt", "stats", "sold");
-                return _context13.abrupt("break", 46);
+                return _context16.abrupt("break", 48);
 
-              case 46:
+              case 48:
                 if (filters.length > 0) {
                   params.filter = filters;
                 }
 
                 if (!mode.includes("stats")) {
-                  _context13.next = 51;
+                  _context16.next = 53;
                   break;
                 }
 
-                _context13.next = 50;
+                _context16.next = 52;
                 return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                   path: path,
                   method: "GET",
                   queryParams: params
                 }));
 
-              case 50:
-                return _context13.abrupt("return", _context13.sent);
+              case 52:
+                return _context16.abrupt("return", _context16.sent);
 
-              case 51:
-                _context13.t2 = Utils;
-                _context13.next = 54;
+              case 53:
+                _context16.t2 = Utils;
+                _context16.next = 56;
                 return this.client.authClient.MakeAuthServiceRequest({
                   path: path,
                   method: "GET",
@@ -1275,26 +1470,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   } : {}
                 });
 
-              case 54:
-                _context13.t3 = _context13.sent;
-                _context13.next = 57;
-                return _context13.t2.ResponseToJson.call(_context13.t2, _context13.t3);
+              case 56:
+                _context16.t3 = _context16.sent;
+                _context16.next = 59;
+                return _context16.t2.ResponseToJson.call(_context16.t2, _context16.t3);
 
-              case 57:
-                _context13.t1 = _context13.sent;
+              case 59:
+                _context16.t1 = _context16.sent;
 
-                if (_context13.t1) {
-                  _context13.next = 60;
+                if (_context16.t1) {
+                  _context16.next = 62;
                   break;
                 }
 
-                _context13.t1 = [];
+                _context16.t1 = [];
 
-              case 60:
-                _ref14 = _context13.t1;
-                contents = _ref14.contents;
-                paging = _ref14.paging;
-                return _context13.abrupt("return", {
+              case 62:
+                _ref16 = _context16.t1;
+                contents = _ref16.contents;
+                paging = _ref16.paging;
+                return _context16.abrupt("return", {
                   paging: {
                     start: params.start,
                     limit: params.limit,
@@ -1306,16 +1501,16 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   })
                 });
 
-              case 66:
-                _context13.prev = 66;
-                _context13.t4 = _context13["catch"](11);
+              case 68:
+                _context16.prev = 68;
+                _context16.t4 = _context16["catch"](11);
 
-                if (!(_context13.t4.status && _context13.t4.status.toString() === "404")) {
-                  _context13.next = 70;
+                if (!(_context16.t4.status && _context16.t4.status.toString() === "404")) {
+                  _context16.next = 72;
                   break;
                 }
 
-                return _context13.abrupt("return", {
+                return _context16.abrupt("return", {
                   paging: {
                     start: params.start,
                     limit: params.limit,
@@ -1325,15 +1520,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   results: []
                 });
 
-              case 70:
-                throw _context13.t4;
+              case 72:
+                throw _context16.t4;
 
-              case 71:
+              case 73:
               case "end":
-                return _context13.stop();
+                return _context16.stop();
             }
           }
-        }, _callee13, this, [[11, 66]]);
+        }, _callee16, this, [[11, 68]]);
       }));
 
       function FilteredQuery() {
@@ -1345,31 +1540,31 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "MintingStatus",
     value: function () {
-      var _MintingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(_ref15) {
+      var _MintingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref17) {
         var marketplaceParams, tenantId, marketplaceInfo, response;
-        return _regeneratorRuntime.wrap(function _callee14$(_context14) {
+        return _regeneratorRuntime.wrap(function _callee17$(_context17) {
           while (1) {
-            switch (_context14.prev = _context14.next) {
+            switch (_context17.prev = _context17.next) {
               case 0:
-                marketplaceParams = _ref15.marketplaceParams, tenantId = _ref15.tenantId;
+                marketplaceParams = _ref17.marketplaceParams, tenantId = _ref17.tenantId;
 
                 if (tenantId) {
-                  _context14.next = 6;
+                  _context17.next = 6;
                   break;
                 }
 
-                _context14.next = 4;
+                _context17.next = 4;
                 return this.MarketplaceInfo({
                   marketplaceParams: marketplaceParams || this.selectedMarketplaceInfo
                 });
 
               case 4:
-                marketplaceInfo = _context14.sent;
+                marketplaceInfo = _context17.sent;
                 tenantId = marketplaceInfo.tenantId;
 
               case 6:
-                _context14.prev = 6;
-                _context14.next = 9;
+                _context17.prev = 6;
+                _context17.next = 9;
                 return Utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
                   path: UrlJoin("as", "wlt", "status", "act", tenantId),
                   method: "GET",
@@ -1379,8 +1574,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }));
 
               case 9:
-                response = _context14.sent;
-                return _context14.abrupt("return", response.map(function (status) {
+                response = _context17.sent;
+                return _context17.abrupt("return", response.map(function (status) {
                   var _status$op$split = status.op.split(":"),
                       _status$op$split2 = _slicedToArray(_status$op$split, 3),
                       op = _status$op$split2[0],
@@ -1424,21 +1619,21 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }));
 
               case 13:
-                _context14.prev = 13;
-                _context14.t0 = _context14["catch"](6);
+                _context17.prev = 13;
+                _context17.t0 = _context17["catch"](6);
                 this.Log("Failed to retrieve minting status", true);
-                this.Log(_context14.t0);
-                return _context14.abrupt("return", []);
+                this.Log(_context17.t0);
+                return _context17.abrupt("return", []);
 
               case 18:
               case "end":
-                return _context14.stop();
+                return _context17.stop();
             }
           }
-        }, _callee14, this, [[6, 13]]);
+        }, _callee17, this, [[6, 13]]);
       }));
 
-      function MintingStatus(_x15) {
+      function MintingStatus(_x20) {
         return _MintingStatus.apply(this, arguments);
       }
 
@@ -1447,18 +1642,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }], [{
     key: "Initialize",
     value: function () {
-      var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref16) {
-        var _ref16$network, network, _ref16$mode, mode, marketplaceParams, _ref16$storeAuthToken, storeAuthToken, _ref17, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, client, walletClient, url, savedToken;
+      var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref18) {
+        var _ref18$network, network, _ref18$mode, mode, marketplaceParams, _ref18$storeAuthToken, storeAuthToken, _ref19, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, client, walletClient, url, savedToken;
 
-        return _regeneratorRuntime.wrap(function _callee15$(_context15) {
+        return _regeneratorRuntime.wrap(function _callee18$(_context18) {
           while (1) {
-            switch (_context15.prev = _context15.next) {
+            switch (_context18.prev = _context18.next) {
               case 0:
-                _ref16$network = _ref16.network, network = _ref16$network === void 0 ? "main" : _ref16$network, _ref16$mode = _ref16.mode, mode = _ref16$mode === void 0 ? "production" : _ref16$mode, marketplaceParams = _ref16.marketplaceParams, _ref16$storeAuthToken = _ref16.storeAuthToken, storeAuthToken = _ref16$storeAuthToken === void 0 ? true : _ref16$storeAuthToken;
-                _ref17 = marketplaceParams || {}, tenantSlug = _ref17.tenantSlug, marketplaceSlug = _ref17.marketplaceSlug, marketplaceId = _ref17.marketplaceId, marketplaceHash = _ref17.marketplaceHash;
+                _ref18$network = _ref18.network, network = _ref18$network === void 0 ? "main" : _ref18$network, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "production" : _ref18$mode, marketplaceParams = _ref18.marketplaceParams, _ref18$storeAuthToken = _ref18.storeAuthToken, storeAuthToken = _ref18$storeAuthToken === void 0 ? true : _ref18$storeAuthToken;
+                _ref19 = marketplaceParams || {}, tenantSlug = _ref19.tenantSlug, marketplaceSlug = _ref19.marketplaceSlug, marketplaceId = _ref19.marketplaceId, marketplaceHash = _ref19.marketplaceHash;
 
                 if (Configuration[network]) {
-                  _context15.next = 6;
+                  _context18.next = 6;
                   break;
                 }
 
@@ -1466,21 +1661,21 @@ var ElvWalletClient = /*#__PURE__*/function () {
 
               case 6:
                 if (Configuration[network][mode]) {
-                  _context15.next = 8;
+                  _context18.next = 8;
                   break;
                 }
 
                 throw Error("ElvWalletClient: Invalid mode ".concat(mode));
 
               case 8:
-                _context15.next = 10;
+                _context18.next = 10;
                 return ElvClient.FromNetworkName({
                   networkName: network,
                   assumeV3: true
                 });
 
               case 10:
-                client = _context15.sent;
+                client = _context18.sent;
                 walletClient = new ElvWalletClient({
                   client: client,
                   network: network,
@@ -1495,18 +1690,18 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
 
                 if (!(window && window.location && window.location.href)) {
-                  _context15.next = 31;
+                  _context18.next = 31;
                   break;
                 }
 
                 url = new URL(window.location.href);
 
                 if (!url.searchParams.get("elvToken")) {
-                  _context15.next = 21;
+                  _context18.next = 21;
                   break;
                 }
 
-                _context15.next = 17;
+                _context18.next = 17;
                 return walletClient.Authenticate({
                   token: url.searchParams.get("elvToken")
                 });
@@ -1514,53 +1709,53 @@ var ElvWalletClient = /*#__PURE__*/function () {
               case 17:
                 url.searchParams["delete"]("elvToken");
                 window.history.replaceState("", "", url);
-                _context15.next = 31;
+                _context18.next = 31;
                 break;
 
               case 21:
                 if (!(storeAuthToken && typeof localStorage !== "undefined")) {
-                  _context15.next = 31;
+                  _context18.next = 31;
                   break;
                 }
 
-                _context15.prev = 22;
+                _context18.prev = 22;
                 // Load saved auth token
                 savedToken = localStorage.getItem("__elv-token-".concat(network));
 
                 if (!savedToken) {
-                  _context15.next = 27;
+                  _context18.next = 27;
                   break;
                 }
 
-                _context15.next = 27;
+                _context18.next = 27;
                 return walletClient.Authenticate({
                   token: savedToken
                 });
 
               case 27:
-                _context15.next = 31;
+                _context18.next = 31;
                 break;
 
               case 29:
-                _context15.prev = 29;
-                _context15.t0 = _context15["catch"](22);
+                _context18.prev = 29;
+                _context18.t0 = _context18["catch"](22);
 
               case 31:
-                _context15.next = 33;
+                _context18.next = 33;
                 return walletClient.LoadAvailableMarketplaces();
 
               case 33:
-                return _context15.abrupt("return", walletClient);
+                return _context18.abrupt("return", walletClient);
 
               case 34:
               case "end":
-                return _context15.stop();
+                return _context18.stop();
             }
           }
-        }, _callee15, null, [[22, 29]]);
+        }, _callee18, null, [[22, 29]]);
       }));
 
-      function Initialize(_x16) {
+      function Initialize(_x21) {
         return _Initialize.apply(this, arguments);
       }