Merge pull request #2817 from build-5/bugfix/missing_nft_credit

Credit tokens if nft was not sent

packages/functions/src/services/payment/nft/nft-deposit.service.ts

@@ -16,6 +16,7 @@ import {
   PropStats,
   Space,
   Transaction,
+  TransactionPayloadType,
   WenError,
 } from '@build-5/interfaces';
 import { NftOutput } from '@iota/sdk';
@@ -54,7 +55,11 @@ export class NftDepositService extends BaseService {
       });
     } catch (error) {
       const payment = await this.transactionService.createPayment(order, match, true);
-      this.transactionService.createNftCredit(payment, match, error as Record<string, unknown>);
+      if (tranEntry.nftOutput) {
+        this.transactionService.createNftCredit(payment, match, error as Record<string, unknown>);
+      } else {
+        this.transactionService.createCredit(TransactionPayloadType.DEPOSIT_NFT, payment, match);
+      }
     }
   };
 
@@ -64,7 +69,7 @@ export class NftDepositService extends BaseService {
     match: TransactionMatch,
   ) => {
     if (!transactionEntry.nftOutput) {
-      throw WenError.invalid_params;
+      throw WenError.invalid_nft_id;
     }
     const nft = await getNftByMintingId(transactionEntry.nftOutput.nftId);
     if (!nft) {

packages/functions/src/services/payment/nft/nft-stake.service.ts

@@ -78,7 +78,13 @@ export class NftStakeService extends BaseService {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       const payment = await this.transactionService.createPayment(order, match, true);
-      this.transactionService.createNftCredit(payment, match, error, customErrorParams);
+
+      if (tranEntry.nftOutput) {
+        this.transactionService.createNftCredit(payment, match, error, customErrorParams);
+      } else {
+        this.transactionService.createCredit(TransactionPayloadType.DEPOSIT_NFT, payment, match);
+      }
+
       console.error('nft stake error', order.uid, payment.uid, error, customErrorParams);
     }
   };

packages/functions/test-tangle/nft-staking/nft-staking_10.spec.ts

@@ -0,0 +1,50 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { build5Db } from '@build-5/database';
+import {
+  COL,
+  MIN_IOTA_AMOUNT,
+  Network,
+  StakeType,
+  Transaction,
+  TransactionType,
+} from '@build-5/interfaces';
+import { stakeNft } from '../../src/runtime/firebase/nft/index';
+import { mockWalletReturnValue, wait } from '../../test/controls/common';
+import { testEnv } from '../../test/set-up';
+import { requestFundsFromFaucet } from '../faucet';
+import { Helper } from './Helper';
+
+describe('Collection minting', () => {
+  const helper = new Helper();
+
+  beforeAll(async () => {
+    await helper.beforeAll();
+  });
+
+  beforeEach(async () => {
+    await helper.beforeEach();
+  });
+
+  it('Should return credits when nft deposit order does not receive nft', async () => {
+    mockWalletReturnValue(helper.walletSpy, helper.guardian!, {
+      network: Network.RMS,
+      weeks: 25,
+      type: StakeType.DYNAMIC,
+    });
+    const order = await testEnv.wrap(stakeNft)({});
+    await requestFundsFromFaucet(Network.RMS, order.payload.targetAddress, MIN_IOTA_AMOUNT);
+
+    const query = build5Db()
+      .collection(COL.TRANSACTION)
+      .where('type', '==', TransactionType.CREDIT)
+      .where('member', '==', helper.guardian!);
+    await wait(async () => {
+      const snap = await query.get<Transaction>();
+      return (
+        snap.length === 1 &&
+        snap[0].payload.walletReference?.confirmed &&
+        snap[0].payload.amount === MIN_IOTA_AMOUNT
+      );
+    });
+  });
+});

packages/functions/test-tangle/withdraw-deposit-nft/deposit-withraw-nft_16.spec.ts

@@ -0,0 +1,39 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { build5Db } from '@build-5/database';
+import { COL, MIN_IOTA_AMOUNT, Network, Transaction, TransactionType } from '@build-5/interfaces';
+import { depositNft } from '../../src/runtime/firebase/nft/index';
+import { mockWalletReturnValue, wait } from '../../test/controls/common';
+import { testEnv } from '../../test/set-up';
+import { requestFundsFromFaucet } from '../faucet';
+import { Helper } from './Helper';
+
+describe('Collection minting', () => {
+  const helper = new Helper();
+
+  beforeAll(async () => {
+    await helper.beforeAll();
+  });
+
+  beforeEach(async () => {
+    await helper.beforeEach();
+  });
+
+  it('Should return credits when nft deposit order does not receive nft', async () => {
+    mockWalletReturnValue(helper.walletSpy, helper.guardian!, { network: helper.network });
+    const order = await testEnv.wrap(depositNft)({});
+    await requestFundsFromFaucet(Network.RMS, order.payload.targetAddress, MIN_IOTA_AMOUNT);
+
+    const query = build5Db()
+      .collection(COL.TRANSACTION)
+      .where('type', '==', TransactionType.CREDIT)
+      .where('member', '==', helper.guardian!);
+    await wait(async () => {
+      const snap = await query.get<Transaction>();
+      return (
+        snap.length === 1 &&
+        snap[0].payload.walletReference?.confirmed &&
+        snap[0].payload.amount === MIN_IOTA_AMOUNT
+      );
+    });
+  });
+});