Add tx validation for flyover

rsksmart · Jan 22, 2025 · f2edad8 · f2edad8
1 parent ce01532
commit f2edad8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 4 deletions.
diff --git a/src/common/services/FlyoverService.ts b/src/common/services/FlyoverService.ts
@@ -493,4 +493,29 @@ export default class FlyoverService {
         });
     });
   }
+
+  public validatePegin(quote: PeginQuote, signature: string, depositAddress: string, tx: string) {
+    return new Promise<string>((resolve, reject) => {
+      this.flyover?.validatePeginTransaction({
+        quoteInfo: {
+          quote: quote.originalQuote,
+          quoteHash: quote.quoteHash,
+        },
+        acceptInfo: {
+          signature,
+          bitcoinDepositAddressHash: depositAddress,
+        },
+        btcTx: tx,
+      })
+        .then(resolve)
+        .catch((error) => {
+          reject(new ServiceError(
+            'FlyoverService',
+            'validatePegin',
+            'There was an error validating the peg-in transaction, can not be completed.',
+            error.message,
+          ));
+        });
+    });
+  }
 }
diff --git a/src/common/types/Flyover/PeginQuote.ts b/src/common/types/Flyover/PeginQuote.ts
@@ -8,7 +8,10 @@ export default class PeginQuote implements QuotePegIn2WP {
 
     quoteHash: string;
 
+    originalQuote;
+
     constructor({ quote, quoteHash }: Quote) {
+      this.originalQuote = quote;
       this.quote = {
         ...quote,
         timeForDepositInSeconds: quote.timeForDeposit,

diff --git a/src/pegin/components/create/ConfirmTx.vue b/src/pegin/components/create/ConfirmTx.vue
@@ -29,7 +29,7 @@ import {
 import { Machine } from '@/common/utils';
 import TxBuilder from '@/pegin/middleware/TxBuilder/TxBuilder';
 import * as constants from '@/common/store/constants';
-import { ApiService, WalletService } from '@/common/services';
+import { ApiService, FlyoverService, WalletService } from '@/common/services';
 import { useState, useGetter, useStateAttribute } from '@/common/store/helper';
 import {
   LiquidityProvider2WP,
@@ -67,6 +67,7 @@ export default defineComponent({
     const recipientAddress = useStateAttribute<string>('flyoverPegin', 'rootstockRecipientAddress');
     const peginType = useStateAttribute<string>('pegInTx', 'peginType');
     const acceptedQuoteSignature = useStateAttribute<string>('flyoverPegin', 'acceptedQuoteSignature');
+    const flyoverService = useStateAttribute<FlyoverService>('flyoverPegin', 'flyoverService');
     const isFlyover = computed(() => peginType.value === constants.peginType.FLYOVER);
 
     function getLPName(): string {
@@ -128,8 +129,17 @@ export default defineComponent({
           pegInTxState.value.selectedAccount,
         ))
         .then((tx) => walletService.value.sign(tx))
-        .then(({ signedTx }) => ApiService
-          .broadcast(signedTx))
+        .then(async ({ signedTx }) => {
+          if (isFlyover.value) {
+            await flyoverService.value.validatePegin(
+              selectedQuote.value,
+              acceptedQuoteSignature.value,
+              pegInTxState.value.normalizedTx.outputs[0].address as string,
+              signedTx,
+            );
+          }
+          return ApiService.broadcast(signedTx);
+        })
         .then((id) => {
           ApiService.registerTx({
             txHash: id,

diff --git a/src/pegin/components/create/SendBitcoin.vue b/src/pegin/components/create/SendBitcoin.vue
@@ -184,8 +184,8 @@ export default defineComponent({
               ? selectedFlyoverQuote.value.quote.confirmations : 0,
           },
         });
+        clearWallets();
       }
-      clearWallets();
     }
 
     function closeErrorDialog() {