@portal-hq/web 3.7.0 → 3.8.0

package/lib/commonjs/mpc/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MpcErrorCodes = exports.MpcError = void 0;
 const errors_1 = require("./errors");
 const index_1 = require("../index");
-const WEB_SDK_VERSION = '3.7.0';
+const WEB_SDK_VERSION = '3.8.0';
 class Mpc {
     get ready() {
         return this._ready;
@@ -55,172 +55,64 @@ class Mpc {
         // Noop
     }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const message = {
-                type: 'portal:wasm:backup',
-                data,
-            };
             // validates password config for password backup
             this.validateBackupConfig(data);
-            return new Promise((resolve, reject) => {
-                // Create a function to be bound when backup is triggered
-                const handleBackup = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:backupError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleBackup);
-                        window.removeEventListener('message', handleProgress);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:backupResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleBackup);
-                        window.removeEventListener('message', handleProgress);
-                        const resultData = result;
-                        const backupIds = Array.isArray(resultData.backupIds)
-                            ? resultData.backupIds
-                            : [];
-                        const storageCallback = () => __awaiter(this, void 0, void 0, function* () {
-                            yield this.setBackupStatus('STORED_CLIENT_BACKUP_SHARE', backupIds);
-                        });
-                        // Resolve the promise with the result
-                        resolve({
-                            cipherText: resultData.cipherText,
-                            encryptionKey: typeof resultData.encryptionKey === 'string'
-                                ? resultData.encryptionKey
-                                : undefined,
-                            storageCallback,
-                        });
-                    }
-                };
-                const handleProgress = (message) => {
-                    const { type, data: status } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:backupProgress') {
-                        void progress(status);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleBackup);
-                window.addEventListener('message', handleProgress);
-                // Send the request to the iframe
-                this.postMessage(message);
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:backup',
+                errorMessage: 'portal:wasm:backupError',
+                resultMessage: 'portal:wasm:backupResult',
+                data,
+                progressMessage: 'portal:wasm:backupProgress',
+                progressCallback: progress,
+                mapReturnValue: (result) => {
+                    const resultData = result;
+                    const backupIds = Array.isArray(resultData.backupIds)
+                        ? resultData.backupIds
+                        : [];
+                    const storageCallback = () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.setBackupStatus('STORED_CLIENT_BACKUP_SHARE', backupIds);
+                    });
+                    return {
+                        cipherText: result.cipherText,
+                        encryptionKey: typeof resultData.encryptionKey === 'string'
+                            ? resultData.encryptionKey
+                            : undefined,
+                        storageCallback,
+                    };
+                },
             });
         });
     }
     clearLocalWallet() {
-        return new Promise((resolve) => {
-            const handleClearLocalWallet = (event) => {
-                const { type } = event.data;
-                const { origin } = event;
-                // ignore any broadcast postMessages
-                if (origin !== this.getOrigin()) {
-                    return;
-                }
-                if (type === 'portal:destroyResult') {
-                    // Remove the event listener
-                    window.removeEventListener('message', handleClearLocalWallet);
-                    // Resolve the promise with the result
-                    resolve(true);
-                }
-            };
-            // Bind the function to the message event
-            window.addEventListener('message', handleClearLocalWallet);
-            // Send the request to the iframe
-            this.postMessage({
-                type: 'portal:destroy',
-                data: {},
-            });
+        return this.handleRequestToIframeAndPost({
+            methodMessage: 'portal:destroy',
+            errorMessage: 'portal:destroyError',
+            resultMessage: 'portal:destroyResult',
+            data: {},
+            mapReturnValue: () => true,
         });
     }
     generate(data, progress = () => {
         // Noop
     }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const message = {
-                type: 'portal:wasm:generate',
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:generate',
+                errorMessage: 'portal:wasm:generateError',
+                resultMessage: 'portal:wasm:generateResult',
                 data,
-            };
-            return new Promise((resolve, reject) => {
-                // Create a function to be bound when generate is triggered
-                const handleGenerate = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    // Handle errors
-                    if (type === 'portal:wasm:generateError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleGenerate);
-                        window.removeEventListener('message', handleProgress);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:generateResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleGenerate);
-                        window.removeEventListener('message', handleProgress);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                const handleProgress = (message) => {
-                    const { type, data: status } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:generateProgress') {
-                        void progress(status);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGenerate);
-                window.addEventListener('message', handleProgress);
-                // Send the request to the iframe
-                this.postMessage(message);
+                progressMessage: 'portal:wasm:generateProgress',
+                progressCallback: progress,
             });
         });
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            const message = {
-                type: 'portal:address',
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:address',
+                errorMessage: 'portal:addressError',
+                resultMessage: 'portal:addressResult',
                 data: {},
-            };
-            return new Promise((resolve) => {
-                // Create a function to be bound when getAddress is triggered
-                const handleGetAddress = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    // Check that the message is the one we're looking for
-                    if (type === 'portal:addressResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetAddress);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetAddress);
-                // Send the request to the iframe
-                this.postMessage(message);
             });
         });
     }
@@ -228,138 +120,46 @@ class Mpc {
         // Noop
     }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleRecover = (message) => {
-                    const { type, data } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:recoverError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleRecover);
-                        window.removeEventListener('message', handleProgress);
-                        reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:wasm:recoverResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleRecover);
-                        window.removeEventListener('message', handleProgress);
-                        resolve(data);
-                    }
-                };
-                const handleProgress = (message) => {
-                    const { type, data: status } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:recoverProgress') {
-                        void progress(status);
-                    }
-                };
-                window.addEventListener('message', handleRecover);
-                window.addEventListener('message', handleProgress);
-                this.postMessage({
-                    type: 'portal:wasm:recover',
-                    data,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:recover',
+                errorMessage: 'portal:wasm:recoverError',
+                resultMessage: 'portal:wasm:recoverResult',
+                data,
+                progressMessage: 'portal:wasm:recoverProgress',
+                progressCallback: progress,
             });
         });
     }
     eject(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleEject = (message) => {
-                    const { type, data: result } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:ejectError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleEject);
-                        reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:ejectResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleEject);
-                        resolve(result);
-                    }
-                };
-                window.addEventListener('message', handleEject);
-                this.postMessage({
-                    type: 'portal:wasm:eject',
-                    data,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:eject',
+                errorMessage: 'portal:wasm:ejectError',
+                resultMessage: 'portal:wasm:ejectResult',
+                data,
             });
         });
     }
     ejectPrivateKeys(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleEject = (message) => {
-                    const { type, data: result } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:ejectPrivateKeysError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleEject);
-                        reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:ejectPrivateKeysResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleEject);
-                        resolve(result);
-                    }
-                };
-                window.addEventListener('message', handleEject);
-                this.postMessage({
-                    type: 'portal:wasm:ejectPrivateKeys',
-                    data,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:ejectPrivateKeys',
+                errorMessage: 'portal:wasm:ejectPrivateKeysError',
+                resultMessage: 'portal:wasm:ejectPrivateKeysResult',
+                data,
             });
         });
     }
     rawSign(curve, param) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleRawSign = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:mpc:rawSignError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleRawSign);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:mpc:rawSignResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleRawSign);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleRawSign);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:mpc:rawSign',
-                    data: {
-                        curve,
-                        param,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:mpc:rawSign',
+                errorMessage: 'portal:mpc:rawSignError',
+                resultMessage: 'portal:mpc:rawSignResult',
+                data: {
+                    curve,
+                    param,
+                },
             });
         });
     }
@@ -367,82 +167,23 @@ class Mpc {
         // Noop
     }) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                // Create a function to be bound when sign is triggered
-                const handleSign = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:signError') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleSign);
-                        window.removeEventListener('message', handleProgress);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:signResult') {
-                        // Remove the event listeners
-                        window.removeEventListener('message', handleSign);
-                        window.removeEventListener('message', handleProgress);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                const handleProgress = (message) => {
-                    const { type, data: status } = message.data;
-                    const { origin } = message;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:signProgress') {
-                        void progress(status);
-                    }
-                };
-                // Bind the functions to the message event
-                window.addEventListener('message', handleSign);
-                window.addEventListener('message', handleProgress);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:wasm:sign',
-                    data,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:sign',
+                errorMessage: 'portal:wasm:signError',
+                resultMessage: 'portal:wasm:signResult',
+                data,
+                progressMessage: 'portal:wasm:signProgress',
+                progressCallback: progress,
             });
         });
     }
     checkSharesOnDevice() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleCheckSharesOnDevice = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:checkSharesOnDeviceError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleCheckSharesOnDevice);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:checkSharesOnDeviceResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleCheckSharesOnDevice);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleCheckSharesOnDevice);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:checkSharesOnDevice',
-                    data: {},
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:checkSharesOnDevice',
+                errorMessage: 'portal:checkSharesOnDeviceError',
+                resultMessage: 'portal:checkSharesOnDeviceResult',
+                data: {},
             });
         });
     }
@@ -451,551 +192,185 @@ class Mpc {
      *******************************/
     getBalances(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetBalances = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getBalancesError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetBalances);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getBalancesResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetBalances);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetBalances);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getBalances',
-                    data: { chainId },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getBalances',
+                errorMessage: 'portal:getBalancesError',
+                resultMessage: 'portal:getBalancesResult',
+                data: { chainId },
             });
         });
     }
     fund(chainId, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleFund = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // Ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:fundError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleFund);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:fundResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleFund);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleFund);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:fund',
-                    data: { chainId, params },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:fund',
+                errorMessage: 'portal:fundError',
+                resultMessage: 'portal:fundResult',
+                data: { chainId, params },
             });
         });
     }
     getClient() {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetClient = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getClientError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetClient);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getClientResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetClient);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetClient);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getClient',
-                    data: {},
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getClient',
+                errorMessage: 'portal:getClientError',
+                resultMessage: 'portal:getClientResult',
+                data: {},
             });
         });
     }
     getNFTs(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetNFTs = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getNFTsError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetNFTs);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getNFTsResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetNFTs);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetNFTs);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getNFTs',
-                    data: { chainId },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getNFTs',
+                errorMessage: 'portal:getNFTsError',
+                resultMessage: 'portal:getNFTsResult',
+                data: { chainId },
             });
         });
     }
     getNFTAssets(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetNFTAssets = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getNFTAssetsError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetNFTAssets);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getNFTAssetsResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetNFTAssets);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetNFTAssets);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getNFTAssets',
-                    data: { chainId },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getNFTAssets',
+                errorMessage: 'portal:getNFTAssetsError',
+                resultMessage: 'portal:getNFTAssetsResult',
+                data: { chainId },
             });
         });
     }
     getAssets(chainId, includeNfts = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetAssets = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getAssetsError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetAssets);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getAssetsResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetAssets);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetAssets);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getAssets',
-                    data: { chainId, includeNfts },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getAssets',
+                errorMessage: 'portal:getAssetsError',
+                resultMessage: 'portal:getAssetsResult',
+                data: { chainId, includeNfts },
             });
         });
     }
     buildTransaction(chainId, to, token, amount) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handlebuildTransaction = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:buildTransactionError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handlebuildTransaction);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:buildTransactionResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handlebuildTransaction);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handlebuildTransaction);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:buildTransaction',
-                    data: { chainId, to, token, amount },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:buildTransaction',
+                errorMessage: 'portal:buildTransactionError',
+                resultMessage: 'portal:buildTransactionResult',
+                data: { chainId, to, token, amount },
             });
         });
     }
     getQuote(chainId, args, apiKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetQuote = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:swaps:getQuoteError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetQuote);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:swaps:getQuoteResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetQuote);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetQuote);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:swaps:getQuote',
-                    data: {
-                        apiKey,
-                        args,
-                        chainId,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:swaps:getQuote',
+                errorMessage: 'portal:swaps:getQuoteError',
+                resultMessage: 'portal:swaps:getQuoteResult',
+                data: {
+                    apiKey,
+                    args,
+                    chainId,
+                },
             });
         });
     }
     getSources(chainId, apiKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetSources = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:swaps:getSourcesError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetSources);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:swaps:getSourcesResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetSources);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetSources);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:swaps:getSources',
-                    data: {
-                        apiKey,
-                        chainId,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:swaps:getSources',
+                errorMessage: 'portal:swaps:getSourcesError',
+                resultMessage: 'portal:swaps:getSourcesResult',
+                data: {
+                    apiKey,
+                    chainId,
+                },
             });
         });
     }
     getTransactions(chainId, limit, offset, order) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetTransactions = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getTransactionsError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetTransactions);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getTransactionsResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetTransactions);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetTransactions);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getTransactions',
-                    data: {
-                        chainId,
-                        limit,
-                        offset,
-                        order,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:getTransactions',
+                errorMessage: 'portal:getTransactionsError',
+                resultMessage: 'portal:getTransactionsResult',
+                data: {
+                    chainId,
+                    limit,
+                    offset,
+                    order,
+                },
             });
         });
     }
     setBackupStatus(status, backupIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleSetBackupStatus = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:api:setBackupStatusError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleSetBackupStatus);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:api:setBackupStatusResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleSetBackupStatus);
-                        // Resolve the promise with the result
-                        return resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleSetBackupStatus);
-                this.postMessage({
-                    type: 'portal:api:setBackupStatus',
-                    data: {
-                        backupIds,
-                        status,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:api:setBackupStatus',
+                errorMessage: 'portal:api:setBackupStatusError',
+                resultMessage: 'portal:api:setBackupStatusResult',
+                data: {
+                    backupIds,
+                    status,
+                },
             });
         });
     }
     simulateTransaction(transaction, chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleSimulateTransaction = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:simulateTransactionError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleSimulateTransaction);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:simulateTransactionResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleSimulateTransaction);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleSimulateTransaction);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:simulateTransaction',
-                    data: {
-                        chainId,
-                        transaction,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:simulateTransaction',
+                errorMessage: 'portal:simulateTransactionError',
+                resultMessage: 'portal:simulateTransactionResult',
+                data: {
+                    chainId,
+                    transaction,
+                },
             });
         });
     }
     evaluateTransaction(chainId, transaction, operationType = 'all') {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleEvaluateTransaction = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:evaluateTransactionError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleEvaluateTransaction);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(data));
-                    }
-                    else if (type === 'portal:evaluateTransactionResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleEvaluateTransaction);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleEvaluateTransaction);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:evaluateTransaction',
-                    data: {
-                        chainId,
-                        transaction,
-                        operationType,
-                    },
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:evaluateTransaction',
+                errorMessage: 'portal:evaluateTransactionError',
+                resultMessage: 'portal:evaluateTransactionResult',
+                data: {
+                    chainId,
+                    transaction,
+                    operationType,
+                },
             });
         });
     }
     storedClientBackupShare(success, backupMethod) {
-        return new Promise((resolve, reject) => {
-            const handleStoredClientBackupShare = (event) => {
-                const { type, data } = event.data;
-                const { origin } = event;
-                // ignore any broadcast postMessages
-                if (origin !== this.getOrigin()) {
-                    return;
-                }
-                if (type === 'portal:storedClientBackupShareError') {
-                    // Remove the event listener
-                    window.removeEventListener('message', handleStoredClientBackupShare);
-                    // Reject the promise with the error
-                    return reject(new errors_1.PortalMpcError(data));
-                }
-                else if (type === 'portal:storedClientBackupShareResult') {
-                    // Remove the event listener
-                    window.removeEventListener('message', handleStoredClientBackupShare);
-                    // Resolve the promise with the result
-                    resolve();
-                }
-            };
-            // Bind the function to the message event
-            window.addEventListener('message', handleStoredClientBackupShare);
-            // Send the request to the iframe
-            this.postMessage({
-                type: 'portal:storedClientBackupShare',
-                data: {
-                    success,
-                    backupMethod,
-                },
-            });
+        return this.handleRequestToIframeAndPost({
+            methodMessage: 'portal:storedClientBackupShare',
+            errorMessage: 'portal:storedClientBackupShareError',
+            resultMessage: 'portal:storedClientBackupShareResult',
+            data: {
+                success,
+                backupMethod,
+            },
+            mapReturnValue: () => undefined,
         });
     }
     formatShares(shares) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleFormatShares = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:formatSharesError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleFormatShares);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:formatSharesResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleFormatShares);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleFormatShares);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:wasm:formatShares',
-                    data: shares,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:formatShares',
+                errorMessage: 'portal:wasm:formatSharesError',
+                resultMessage: 'portal:wasm:formatSharesResult',
+                data: shares,
             });
         });
     }
     getCustodianIdClientIdHashes(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetHashes = (event) => {
-                    const { type, data: result } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:wasm:getCustodianIdClientIdHashesError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetHashes);
-                        // Reject the promise with the error
-                        return reject(new errors_1.PortalMpcError(result));
-                    }
-                    else if (type === 'portal:wasm:getCustodianIdClientIdHashesResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetHashes);
-                        // Resolve the promise with the result
-                        resolve(result);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetHashes);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:wasm:getCustodianIdClientIdHashes',
-                    data,
-                });
+            return this.handleRequestToIframeAndPost({
+                methodMessage: 'portal:wasm:getCustodianIdClientIdHashes',
+                errorMessage: 'portal:wasm:getCustodianIdClientIdHashesError',
+                resultMessage: 'portal:wasm:getCustodianIdClientIdHashesResult',
+                data,
             });
         });
     }
@@ -1228,7 +603,7 @@ class Mpc {
     /**
      * Util to handle requests to the iframe and post the result to the parent
      */
-    handleRequestToIframeAndPost({ methodMessage, errorMessage, resultMessage, data, }) {
+    handleRequestToIframeAndPost({ methodMessage, errorMessage, resultMessage, data, progressMessage, progressCallback, mapReturnValue, }) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const handleRequest = (event) => {
@@ -1248,7 +623,10 @@ class Mpc {
                         // Remove the event listener
                         window.removeEventListener('message', handleRequest);
                         // Resolve the promise with the result
-                        resolve(result);
+                        resolve(mapReturnValue ? mapReturnValue(result) : result);
+                    }
+                    if (type === progressMessage && progressCallback) {
+                        void progressCallback(result);
                     }
                 };
                 // Bind the function to the message event