Merge branch 'feature/2.4' into fix/VULN-601

Author: annipi

.github/workflows/build.yml

@@ -7,7 +7,7 @@ permissions: read-all
 
 jobs:
   checkout-and-build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@163217dfcd28294438ea1c1c149cfaf66eec283e # v4.2.1

package-lock.json

@@ -24,7 +24,7 @@
     "@rsksmart/bridges-core-sdk": "^0.4.1",
     "@rsksmart/flyover-sdk": "^1.6.2",
     "@rsksmart/rlogin": "^1.6.1",
-    "@rsksmart/rlogin-ledger-provider": "^1.0.4",
+    "@rsksmart/rlogin-ledger-provider": "^1.0.5-alpha",
     "@rsksmart/rlogin-trezor-provider": "^1.0.4",
     "@rsksmart/rsk-precompiled-abis": "^6.0.0-ARROWHEAD",
     "@rsksmart/rsk-utils": "^1.1.0",

package.json

@@ -86,7 +86,7 @@ export default defineComponent({
     const btcTicker = environmentContext.getBtcTicker();
     const rbtcTicker = environmentContext.getRbtcTicker();
     const txFailed = computed(() => props.txWithError
-      || status.value.flyoverStatus === FlyoverStatus.FAILED);
+      || status.value.flyoverStatus?.status === FlyoverStatus.FAILED);
     const txDetails = useStateAttribute<PegoutStatusDataModel|PeginStatus|FlyoverStatusModel>('status', 'txDetails');
     const isPegOut = computed((): boolean => status.value.type === TxStatusType.PEGOUT
       || status.value.type === TxStatusType.FLYOVER_PEGOUT);
@@ -122,7 +122,7 @@ export default defineComponent({
           labelOne = `Send ${rbtcTicker} to Liquidity Provider`;
           labelTwo = `Liquidity Provider received ${rbtcTicker}`;
           labelThree = `Liquidity Provider send ${btcTicker}`;
-          switch (status.value.flyoverStatus) {
+          switch (status.value.flyoverStatus?.status) {
             case FlyoverStatus.PENDING:
               zero = 100;
               first = 100;
@@ -203,7 +203,7 @@ export default defineComponent({
         labelOne = `Send ${btcTicker} to Liquidity Provider`;
         labelTwo = `Liquidity Provider received ${btcTicker}`;
         labelThree = `Liquidity Provider send ${rbtcTicker}`;
-        switch (status.value.flyoverStatus) {
+        switch (status.value.flyoverStatus?.status) {
           case FlyoverStatus.PENDING:
             zero = 100;
             first = 100;

src/common/components/status/StatusProgressBar.vue

@@ -152,8 +152,8 @@ export default defineComponent({
         },
         ...(props.withTxIds ? [{
           title: 'Transaction ID',
-          value: props.details.txId || '-',
-          link: getBtcTxExplorerUrl(props.details.txId),
+          value: props.details.btcTxId || '-',
+          link: getBtcTxExplorerUrl(props.details.btcTxId),
         }] : []),
       ];
     });
@@ -206,9 +206,9 @@ export default defineComponent({
         },
         ...(props.withTxIds ? [{
           title: 'Transaction ID',
-          value: props.details.rskTxId && !props.txWithError
-            ? props.details.rskTxId : '-',
-          link: getRskTxExplorerUrl(props.details.rskTxId),
+          value: props.details.txId && !props.txWithError
+            ? props.details.txId : '-',
+          link: getRskTxExplorerUrl(props.details.txId),
         }] : []),
       ];
     });

src/common/components/status/StatusSummary.vue

@@ -32,11 +32,14 @@ import {
   NormalizedSummary,
   TxStatusMessage,
   FlyoverStatusModel,
+  TxStatus,
 } from '@/common/types';
 import EnvironmentContextProviderService from '@/common/providers/EnvironmentContextProvider';
 import * as constants from '@/common/store/constants';
 import { getTime, setStatusMessage, toSatoshiBigIntString } from '@/common/utils';
-import { useAction, useGetter, useStateAttribute } from '@/common/store/helper';
+import {
+  useAction, useGetter, useStateAttribute,
+} from '@/common/store/helper';
 import StatusProgressBar from '@/common/components/status/StatusProgressBar.vue';
 import { EnvironmentAccessorService } from '@/common/services/enviroment-accessor.service';
 import StatusSummary from '@/common/components/status/StatusSummary.vue';
@@ -97,6 +100,7 @@ export default defineComponent({
     const environmentContext = EnvironmentContextProviderService.getEnvironmentContext();
 
     const txDetails = useStateAttribute<PeginStatus | FlyoverStatusModel>('status', 'txDetails');
+    const flyoverStatus = useStateAttribute<TxStatus['flyoverStatus']>('status', 'flyoverStatus');
     const isRejected = useGetter<boolean>('status', constants.STATUS_IS_REJECTED);
     const setAmount = useAction('pegInTx', constants.PEGIN_TX_ADD_AMOUNT_TO_TRANSFER);
     const peginInit = useAction('pegInTx', constants.PEGIN_TX_INIT);
@@ -122,7 +126,7 @@ export default defineComponent({
         amountReceivedString: status.btc.amountTransferred.toString(),
         fee: status.btc.fees,
         recipientAddress: status.rsk.recipientAddress,
-        txId: status.btc.txId,
+        btcTxId: status.btc.txId,
         refundAddress: status.btc.refundAddress,
         federationAddress: status.btc.federationAddress,
         total: total.toBTCTrimmedString(),
@@ -144,7 +148,8 @@ export default defineComponent({
         fee: status.fee,
         recipientAddress: status.recipientAddress,
         senderAddress: status.senderAddress,
-        txId: status.txHash,
+        txId: flyoverStatus.value?.txId,
+        btcTxId: status.txHash,
       };
     });
 

src/common/components/status/TxPegin.vue

@@ -19,6 +19,7 @@ import {
   NormalizedSummary,
   FlyoverStatusModel,
   WeiBig,
+  TxStatus,
 } from '@/common/types';
 import StatusProgressBar from '@/common/components/status/StatusProgressBar.vue';
 import { useStateAttribute } from '@/common/store/helper';
@@ -41,6 +42,7 @@ export default defineComponent({
     const typeSummary = props.isFlyover ? TxStatusType.FLYOVER_PEGOUT : TxStatusType.PEGOUT;
 
     const txDetails = useStateAttribute<PegoutStatusDataModel | FlyoverStatusModel>('status', 'txDetails');
+    const flyoverStatus = useStateAttribute<TxStatus['flyoverStatus']>('status', 'flyoverStatus');
     const pegOutEstimatedFee = useStateAttribute<SatoshiBig>('status', 'pegOutEstimatedFee');
     const calculatedGasFee = useStateAttribute<WeiBig>('pegOutTx', 'calculatedFee');
 
@@ -91,6 +93,7 @@ export default defineComponent({
         recipientAddress: status.recipientAddress,
         senderAddress: status.senderAddress,
         txId: status.txHash,
+        btcTxId: flyoverStatus.value?.txId,
       };
     });
 

src/common/components/status/TxPegout.vue

@@ -459,11 +459,11 @@ export default class FlyoverService {
   }
 
   public getPeginStatus(quoteHash: string) {
-    return new Promise<string>((resolve, reject) => {
+    return new Promise<{status: string, txId: string}>((resolve, reject) => {
       this.flyover?.getPeginStatus(quoteHash)
         .then((detailedStatus) => {
           const status = FlyoverUtils.getSimpleQuoteStatus(detailedStatus.status.state);
-          resolve(status);
+          resolve({ status, txId: detailedStatus.status.callForUserTxHash });
         })
         .catch((error) => {
           reject(new ServiceError(
@@ -477,11 +477,11 @@ export default class FlyoverService {
   }
 
   public getPegoutStatus(quoteHash: string) {
-    return new Promise<string>((resolve, reject) => {
+    return new Promise<{status: string, txId: string}>((resolve, reject) => {
       this.flyover?.getPegoutStatus(quoteHash)
         .then((detailedStatus) => {
           const status = FlyoverUtils.getSimpleQuoteStatus(detailedStatus.status.state);
-          resolve(status);
+          resolve({ status, txId: detailedStatus.status.lpBtcTxHash });
         })
         .catch((error) => {
           reject(new ServiceError(