beignet 0.0.1 → 0.0.2

package/dist/wallet/index.js

@@ -45,6 +45,7 @@ class Wallet {
     constructor({ mnemonic, passphrase, name, network = types_1.EAvailableNetworks.mainnet, addressType = types_1.EAddressType.p2wpkh, storage, electrumOptions, onMessage = () => null, customGetAddress, customGetScriptHash, rbf = false, selectedFeeId = types_1.EFeeId.normal }) {
         var _a;
         this._pendingRefreshPromises = [];
+        this.savingOperations = {};
         this.getReceiveAddress = async ({ addressType = this.data.addressType }) => {
             try {
                 const wallet = this.data;
@@ -90,10 +91,15 @@ class Wallet {
             return this.data.boostedTransactions;
         };
         this.getBip32Interface = async () => {
-            const network = bitcoinjs_lib_1.networks[this._network];
-            const seed = await bip39.mnemonicToSeed(this._mnemonic, this._passphrase);
-            const root = bip32.fromSeed(seed, network);
-            return (0, utils_1.ok)(root);
+            try {
+                const network = bitcoinjs_lib_1.networks[this._network];
+                const seed = await bip39.mnemonicToSeed(this._mnemonic, this._passphrase);
+                const root = bip32.fromSeed(seed, network);
+                return (0, utils_1.ok)(root);
+            }
+            catch (e) {
+                return (0, utils_1.err)(e);
+            }
         };
         if (!mnemonic)
             throw new Error('No mnemonic specified.');
@@ -267,7 +273,7 @@ class Wallet {
         try {
             const walletDataKeys = (0, utils_1.getDefaultWalletDataKeys)();
             const walletData = (0, utils_1.getDefaultWalletData)();
-            for (const key of walletDataKeys) {
+            await Promise.all(walletDataKeys.map(async (key) => {
                 let dataResult;
                 try {
                     const walletDataKey = this.getWalletDataKey(key);
@@ -334,7 +340,7 @@ class Wallet {
                     default:
                         return (0, utils_1.err)(`Unhandled key in getWalletData: ${key}`);
                 }
-            }
+            }));
             return (0, utils_1.ok)(walletData);
         }
         catch (e) {
@@ -478,8 +484,8 @@ class Wallet {
                 return await this.getScriptHash({ address, network });
             }));
             const res = await this.electrum.getAddressScriptHashBalances(scriptHashes);
-            if (res.error) {
-                return (0, utils_1.err)(res.data);
+            if (res.error || typeof res.data === 'string') {
+                return (0, utils_1.err)(JSON.stringify(res.data));
             }
             return (0, utils_1.ok)(res.data.reduce((acc, cur) => {
                 var _a, _b, _c, _d;
@@ -663,7 +669,8 @@ class Wallet {
                     addressIndex: addressIndex.index,
                     changeAddressIndex: 0,
                     keyDerivationPath,
-                    addressType
+                    addressType,
+                    saveAddresses: false
                 });
                 if (newAddresses.isOk()) {
                     addresses = newAddresses.value.addresses;
@@ -677,7 +684,8 @@ class Wallet {
                     addressIndex: 0,
                     changeAddressIndex: changeAddressIndex.index,
                     keyDerivationPath,
-                    addressType
+                    addressType,
+                    saveAddresses: false
                 });
                 if (newChangeAddresses.isOk()) {
                     changeAddresses = newChangeAddresses.value.changeAddresses;
@@ -783,7 +791,8 @@ class Wallet {
                         addressIndex: highestStoredIndex.value.addressIndex.index,
                         changeAddressIndex: 0,
                         keyDerivationPath,
-                        addressType
+                        addressType,
+                        saveAddresses: false
                     });
                     if (newAddresses.isOk()) {
                         addresses = newAddresses.value.addresses || {};
@@ -796,7 +805,8 @@ class Wallet {
                         addressIndex: 0,
                         changeAddressIndex: highestStoredIndex.value.changeAddressIndex.index,
                         keyDerivationPath,
-                        addressType
+                        addressType,
+                        saveAddresses: false
                     });
                     if (newChangeAddresses.isOk()) {
                         changeAddresses = newChangeAddresses.value.changeAddresses || {};
@@ -811,6 +821,10 @@ class Wallet {
                 allAddresses = [...allAddresses, ...addressesToScan];
                 allChangeAddresses = [...allChangeAddresses, ...changeAddressesToScan];
             }
+            await Promise.all([
+                this.saveWalletData('addresses', this._data.addresses),
+                this.saveWalletData('changeAddresses', this._data.changeAddresses)
+            ]);
             return lastKnownIndexes;
         }
         catch (e) {
@@ -832,7 +846,7 @@ class Wallet {
             return (0, utils_1.err)(e);
         }
     }
-    async addAddresses({ addressAmount = 5, changeAddressAmount = 5, addressIndex = 0, changeAddressIndex = 0, addressType, keyDerivationPath }) {
+    async addAddresses({ addressAmount = 5, changeAddressAmount = 5, addressIndex = 0, changeAddressIndex = 0, addressType, keyDerivationPath, saveAddresses = true }) {
         if (!addressType) {
             addressType = this.data.addressType;
         }
@@ -870,11 +884,13 @@ class Wallet {
         const changeAddresses = removeDuplicateResponse.value.changeAddresses;
         if (Object.keys(addresses).length) {
             this._data.addresses[addressType] = Object.assign(Object.assign({}, this.data.addresses[addressType]), addresses);
-            await this.saveWalletData('addresses', this._data.addresses);
+            if (saveAddresses)
+                await this.saveWalletData('addresses', this._data.addresses);
         }
         if (Object.keys(changeAddresses).length) {
             this._data.changeAddresses[addressType] = Object.assign(Object.assign({}, this.data.changeAddresses[addressType]), changeAddresses);
-            await this.saveWalletData('changeAddresses', this._data.changeAddresses);
+            if (saveAddresses)
+                await this.saveWalletData('changeAddresses', this._data.changeAddresses);
         }
         return (0, utils_1.ok)(Object.assign(Object.assign({}, generatedAddresses.value), { addressType: type }));
     }
@@ -983,17 +999,19 @@ class Wallet {
                 this._data.lastUsedAddressIndex[addressTypeKey] = lastUsedAddressIndex;
                 this._data.lastUsedChangeAddressIndex[addressTypeKey] =
                     lastUsedChangeAddressIndex;
+                updated = true;
+            }
+        });
+        try {
+            await Promise.all(promises);
+            if (updated) {
                 await Promise.all([
                     this.saveWalletData('addressIndex', this._data.addressIndex),
                     this.saveWalletData('changeAddressIndex', this._data.changeAddressIndex),
                     this.saveWalletData('lastUsedAddressIndex', this._data.lastUsedAddressIndex),
                     this.saveWalletData('lastUsedChangeAddressIndex', this._data.lastUsedChangeAddressIndex)
                 ]);
-                updated = true;
             }
-        });
-        try {
-            await Promise.all(promises);
             return (0, utils_1.ok)(updated ? 'Successfully updated indexes.' : 'No update needed.');
         }
         catch (e) {
@@ -1048,9 +1066,7 @@ class Wallet {
             });
             if (nextAddressIndex) {
                 this._data.addressIndex[addressType] = nextAddressIndex;
-                await Promise.all([
-                    this.saveWalletData('addressIndex', this._data.addressIndex)
-                ]);
+                await this.saveWalletData('addressIndex', this._data.addressIndex);
                 return (0, utils_1.ok)(nextAddressIndex);
             }
             const addAddressesRes = await this.addAddresses({
@@ -1064,14 +1080,13 @@ class Wallet {
             if (addAddressesRes.isErr()) {
                 return (0, utils_1.err)(addAddressesRes.error.message);
             }
-            const addressKeys = Object.keys(addAddressesRes.value.addresses);
-            if (!addressKeys.length) {
+            const addressIndex = Object.values(this.data.addresses[addressType]).find((addr) => addr.index === currentAddressIndex + 1);
+            if (!addressIndex) {
                 return (0, utils_1.err)('Unable to generate addresses at this time.');
             }
-            const newAddressIndex = addAddressesRes.value.addresses[addressKeys[0]];
-            this._data.addressIndex[addressType] = newAddressIndex;
+            this._data.addressIndex[addressType] = addressIndex;
             await this.saveWalletData('addressIndex', this._data.addressIndex);
-            return (0, utils_1.ok)(newAddressIndex);
+            return (0, utils_1.ok)(addressIndex);
         }
         catch (e) {
             return (0, utils_1.err)(e);
@@ -1120,9 +1135,22 @@ class Wallet {
     }
     async saveWalletData(key, data) {
         if (!this._setData)
-            return;
+            return 'No setData method has been provided';
+        if (key in this.savingOperations) {
+            await this.savingOperations[key];
+        }
         const walletDataKey = this.getWalletDataKey(key);
-        await this._setData(walletDataKey, data);
+        this.savingOperations[key] = this._setData(walletDataKey, data)
+            .then(() => {
+            return `${walletDataKey} data saved successfully`;
+        })
+            .catch((error) => {
+            return `Error saving wallet data for ${walletDataKey}: ${error}`;
+        })
+            .finally(() => {
+            delete this.savingOperations[key];
+        });
+        return await this.savingOperations[key];
     }
     async updateAndSaveWalletData(key, data, addressType) {
         if (addressType) {
@@ -1198,15 +1226,15 @@ class Wallet {
         this._data.transactions = Object.assign(Object.assign({}, this._data.transactions), formattedTransactions);
         await this.saveWalletData('transactions', this._data.transactions);
         if (this.onMessage) {
-            confirmedTxs.forEach((tx) => {
-                this.onMessage('transactionConfirmed', tx);
-            });
             sentTxs.forEach((tx) => {
                 this.onMessage('transactionSent', tx);
             });
             receivedTxs.forEach((tx) => {
                 this.onMessage('transactionReceived', tx);
             });
+            confirmedTxs.forEach((tx) => {
+                this.onMessage('transactionConfirmed', tx);
+            });
         }
         return (0, utils_1.ok)(notificationTxid);
     }
@@ -1231,9 +1259,7 @@ class Wallet {
             }
             else {
                 this._data.unconfirmedTransactions = unconfirmedTxs;
-                await Promise.all([
-                    this.saveWalletData('unconfirmedTransactions', this._data.unconfirmedTransactions)
-                ]);
+                await this.saveWalletData('unconfirmedTransactions', this._data.unconfirmedTransactions);
             }
             return (0, utils_1.ok)('Successfully updated unconfirmed transactions.');
         }
@@ -1644,6 +1670,9 @@ class Wallet {
         });
     }
     async sendMany({ txs = [], satsPerByte = this.feeEstimates.normal, rbf, broadcast = true, shuffleOutputs = true }) {
+        if (!this.data.utxos.length) {
+            return (0, utils_1.err)('No UTXOs available.');
+        }
         const setupTransactionRes = await this.transaction.setupTransaction({
             rbf
         });
@@ -1693,6 +1722,39 @@ class Wallet {
             return (0, utils_1.err)(broadcastRes.error.message);
         return (0, utils_1.ok)(broadcastRes.value);
     }
+    async sendMax({ address, satsPerByte, rbf = false, broadcast = true } = {}) {
+        if (!this.data.utxos.length) {
+            return (0, utils_1.err)('No UTXOs available.');
+        }
+        await this.resetSendTransaction();
+        const setupTransactionRes = await this.transaction.setupTransaction();
+        if (setupTransactionRes.isErr()) {
+            return (0, utils_1.err)(setupTransactionRes.error.message);
+        }
+        const sendMaxRes = await this.transaction.sendMax({
+            address,
+            satsPerByte,
+            rbf
+        });
+        if (sendMaxRes.isErr()) {
+            return (0, utils_1.err)(sendMaxRes.error.message);
+        }
+        const createRes = await this.transaction.createTransaction({
+            shuffleOutputs: true
+        });
+        if (createRes.isErr())
+            return (0, utils_1.err)(createRes.error.message);
+        const { hex } = createRes.value;
+        if (!broadcast) {
+            return (0, utils_1.ok)(hex);
+        }
+        const broadcastRes = await this.electrum.broadcastTransaction({
+            rawTx: hex
+        });
+        if (broadcastRes.isErr())
+            return (0, utils_1.err)(broadcastRes.error.message);
+        return (0, utils_1.ok)(broadcastRes.value);
+    }
     async send({ address, amount, message = '', satsPerByte = this.feeEstimates.normal, rbf, broadcast = true, shuffleOutputs = true }) {
         return await this.sendMany({
             txs: [{ address, amount, message }],
@@ -1716,7 +1778,7 @@ class Wallet {
         const currentWallet = this.data;
         let saveAddressIndexes = false;
         let saveChangeAddressIndexes = false;
-        for (const addressType of types) {
+        await Promise.all(types.map(async (addressType) => {
             const addressIndex = currentWallet.addressIndex[addressType];
             const changeAddressIndex = currentWallet.changeAddressIndex[addressType];
             if ((addressIndex === null || addressIndex === void 0 ? void 0 : addressIndex.index) < 0) {
@@ -1727,12 +1789,18 @@ class Wallet {
                 await this.updateAddressIndex(addressType, true);
                 saveChangeAddressIndexes = true;
             }
-        }
+        }));
         if (saveAddressIndexes) {
-            await this.saveWalletData('addressIndex', this._data.addressIndex);
+            await Promise.all([
+                this.saveWalletData('addressIndex', this._data.addressIndex),
+                this.saveWalletData('addresses', this._data.addresses)
+            ]);
         }
         if (saveChangeAddressIndexes) {
-            await this.saveWalletData('changeAddressIndex', this._data.changeAddressIndex);
+            await Promise.all([
+                this.saveWalletData('changeAddressIndex', this._data.changeAddressIndex),
+                this.saveWalletData('changeAddresses', this._data.changeAddresses)
+            ]);
         }
         return (0, utils_1.ok)('Set Zero Index Addresses.');
     }
@@ -1765,7 +1833,8 @@ class Wallet {
                 addressIndex: index,
                 changeAddressAmount: indexToUpdate === 'changeAddressIndex' ? constants_1.GENERATE_ADDRESS_AMOUNT : 0,
                 changeAddressIndex: index,
-                addressType
+                addressType,
+                saveAddresses: false
             });
         }
     }