Merge branch 'master' into feat/facade-send-transaction-methods

Author: r4mmer

__tests__/integration/hathorwallet_facade.test.ts

@@ -1736,6 +1736,61 @@ describe('sendManyOutputsTransaction', () => {
   });
 });
 
+describe('authority utxo selection', () => {
+  afterEach(async () => {
+    await stopAllWallets();
+    await GenesisWalletHelper.clearListeners();
+  });
+
+  it('getMintAuthority', async () => {
+    // Setting up the custom token
+    const hWallet = await generateWalletHelper();
+    await GenesisWalletHelper.injectFunds(hWallet, await hWallet.getAddressAtIndex(0), 1);
+    const { hash: tokenUid } = await createTokenHelper(hWallet, 'Token to test', 'ATST', 100);
+
+    // Mark mint authority as selected_as_input
+    const [mintInput] = await hWallet.getMintAuthority(tokenUid, { many: false });
+    await hWallet.markUtxoSelected(mintInput.txId, mintInput.index, true);
+
+    // getMintAuthority should return even if the utxo is already selected_as_input
+    await expect(hWallet.getMintAuthority(tokenUid, { many: false })).resolves.toStrictEqual([
+      mintInput,
+    ]);
+    await expect(
+      hWallet.getMintAuthority(tokenUid, { many: false, only_available_utxos: false })
+    ).resolves.toStrictEqual([mintInput]);
+
+    // getMintAuthority should not return selected_as_input utxos if only_available_utxos is true
+    await expect(
+      hWallet.getMintAuthority(tokenUid, { many: false, only_available_utxos: true })
+    ).resolves.toStrictEqual([]);
+  });
+
+  it('getMeltAuthority', async () => {
+    // Setting up the custom token
+    const hWallet = await generateWalletHelper();
+    await GenesisWalletHelper.injectFunds(hWallet, await hWallet.getAddressAtIndex(0), 1);
+    const { hash: tokenUid } = await createTokenHelper(hWallet, 'Token to test', 'ATST', 100);
+
+    // Mark melt authority as selected_as_input
+    const [meltInput] = await hWallet.getMeltAuthority(tokenUid, { many: false });
+    await hWallet.markUtxoSelected(meltInput.txId, meltInput.index, true);
+
+    // getMeltAuthority should return even if the utxo is already selected_as_input
+    await expect(hWallet.getMeltAuthority(tokenUid, { many: false })).resolves.toStrictEqual([
+      meltInput,
+    ]);
+    await expect(
+      hWallet.getMeltAuthority(tokenUid, { many: false, only_available_utxos: false })
+    ).resolves.toStrictEqual([meltInput]);
+
+    // getMeltAuthority should not return selected_as_input utxos if only_available_utxos is true
+    await expect(
+      hWallet.getMeltAuthority(tokenUid, { many: false, only_available_utxos: true })
+    ).resolves.toStrictEqual([]);
+  });
+});
+
 describe('createNewToken', () => {
   afterEach(async () => {
     await stopAllWallets();

src/new/wallet.js

@@ -1753,8 +1753,9 @@ class HathorWallet extends EventEmitter {
    * Get mint authorities
    *
    * @param {string} tokenUid UID of the token to select the authority utxo
-   * @param [options] Object with custom options.
+   * @param {Object} [options] Object with custom options.
    * @param {boolean} [options.many=false] if should return many utxos or just one (default false)
+   * @param {boolean} [options.only_available_utxos=false] If we should filter for available utxos.
    *
    * @return {Promise<{
    *   txId: string,
@@ -1769,6 +1770,7 @@ class HathorWallet extends EventEmitter {
     const newOptions = {
       token: tokenUid,
       authorities: 1, // mint authority
+      only_available_utxos: options.only_available_utxos ?? false,
     };
     if (!options.many) {
       // limit number of utxos to select if many is false
@@ -1785,8 +1787,9 @@ class HathorWallet extends EventEmitter {
    * Get melt authorities
    *
    * @param {string} tokenUid UID of the token to select the authority utxo
-   * @param [options] Object with custom options.
+   * @param {Object} [options] Object with custom options.
    * @param {boolean} [options.many=false] if should return many utxos or just one (default false)
+   * @param {boolean} [options.only_available_utxos=false] If we should filter for available utxos.
    *
    * @return {Promise<{
    *   txId: string,
@@ -1801,6 +1804,7 @@ class HathorWallet extends EventEmitter {
     const newOptions = {
       token: tokenUid,
       authorities: 2, // melt authority
+      only_available_utxos: options.only_available_utxos ?? false,
     };
     if (!options.many) {
       // limit number of utxos to select if many is false
@@ -1873,7 +1877,10 @@ class HathorWallet extends EventEmitter {
 
     const mintAddress = newOptions.address || (await this.getCurrentAddress()).address;
 
-    const mintInput = await this.getMintAuthority(tokenUid, { many: false });
+    const mintInput = await this.getMintAuthority(tokenUid, {
+      many: false,
+      only_available_utxos: true,
+    });
 
     if (!mintInput || mintInput.length === 0) {
       throw new Error("Don't have mint authority output available.");
@@ -1990,7 +1997,10 @@ class HathorWallet extends EventEmitter {
       }
     }
 
-    const meltInput = await this.getMeltAuthority(tokenUid, { many: false });
+    const meltInput = await this.getMeltAuthority(tokenUid, {
+      many: false,
+      only_available_utxos: true,
+    });
 
     if (!meltInput || meltInput.length === 0) {
       throw new Error("Don't have melt authority output available.");
@@ -2083,9 +2093,15 @@ class HathorWallet extends EventEmitter {
     const { createAnother } = newOptions;
     let delegateInput;
     if (type === 'mint') {
-      delegateInput = await this.getMintAuthority(tokenUid, { many: false });
+      delegateInput = await this.getMintAuthority(tokenUid, {
+        many: false,
+        only_available_utxos: true,
+      });
     } else if (type === 'melt') {
-      delegateInput = await this.getMeltAuthority(tokenUid, { many: false });
+      delegateInput = await this.getMeltAuthority(tokenUid, {
+        many: false,
+        only_available_utxos: true,
+      });
     } else {
       throw new Error('This should never happen.');
     }
@@ -2182,9 +2198,15 @@ class HathorWallet extends EventEmitter {
     }
     let destroyInputs;
     if (type === 'mint') {
-      destroyInputs = await this.getMintAuthority(tokenUid, { many: true });
+      destroyInputs = await this.getMintAuthority(tokenUid, {
+        many: true,
+        only_available_utxos: true,
+      });
     } else if (type === 'melt') {
-      destroyInputs = await this.getMeltAuthority(tokenUid, { many: true });
+      destroyInputs = await this.getMeltAuthority(tokenUid, {
+        many: true,
+        only_available_utxos: true,
+      });
     } else {
       throw new Error('This should never happen.');
     }