From 514cf26c51d409bf6eccf81d022ceb8cb641f882 Mon Sep 17 00:00:00 2001
From: Polybius93 <99192647+Polybius93@users.noreply.github.com>
Date: Thu, 25 Apr 2024 18:27:43 +0200
Subject: [PATCH 1/2] feat: modify network fetching for por (#87) (#88)

---
 src/app/hooks/use-bitcoin.ts          | 7 +++++--
 src/app/hooks/use-proof-of-reserve.ts | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/hooks/use-bitcoin.ts b/src/app/hooks/use-bitcoin.ts
index 7ad145a6..4c9904ed 100644
--- a/src/app/hooks/use-bitcoin.ts
+++ b/src/app/hooks/use-bitcoin.ts
@@ -1,11 +1,13 @@
+import { useSelector } from 'react-redux';
+
 import { customShiftValue } from '@common/utilities';
 import { BitcoinNetwork } from '@models/bitcoin-network';
 import { BitcoinError } from '@models/error-types';
-import { ethereumArbSepolia } from '@models/ethereum-network';
 import { Vault } from '@models/vault';
 import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
 import { hex } from '@scure/base';
 import * as btc from '@scure/btc-signer';
+import { RootState } from '@store/index';
 import { payments } from 'bitcoinjs-lib';
 
 import { useAttestors } from './use-attestors';
@@ -109,6 +111,7 @@ export function useBitcoin(): UseBitcoinReturnType {
   } = useEndpoints();
   const { sendClosingTransactionToAttestors } = useAttestors();
   const { getAttestorGroupPublicKey } = useEthereum();
+  const { network } = useSelector((state: RootState) => state.account);
 
   /**
    * Checks if the user's wallet is on the same network as the app.
@@ -439,7 +442,7 @@ export function useBitcoin(): UseBitcoinReturnType {
     const userTaprootAddress = userAddresses[1] as BitcoinTaprootAddress;
     const userPublicKey = userTaprootAddress.tweakedPublicKey;
 
-    const attestorGroupPublicKey = await getAttestorGroupPublicKey(ethereumArbSepolia);
+    const attestorGroupPublicKey = await getAttestorGroupPublicKey(network);
 
     const userUTXOs = await getUTXOs(userAddresses[0] as BitcoinNativeSegwitAddress);
     const multisigTransaction = createMultisigTransaction(
diff --git a/src/app/hooks/use-proof-of-reserve.ts b/src/app/hooks/use-proof-of-reserve.ts
index e22277e9..3559ebf0 100644
--- a/src/app/hooks/use-proof-of-reserve.ts
+++ b/src/app/hooks/use-proof-of-reserve.ts
@@ -1,13 +1,14 @@
 import { useEffect, useState } from 'react';
 import { useQuery } from 'react-query';
+import { useSelector } from 'react-redux';
 
 import { customShiftValue } from '@common/utilities';
 import { BitcoinNetwork } from '@models/bitcoin-network';
 import { BitcoinTransaction, BitcoinTransactionVectorOutput } from '@models/bitcoin-transaction';
-import { ethereumArbSepolia } from '@models/ethereum-network';
 import { RawVault } from '@models/vault';
 import { hex } from '@scure/base';
 import { p2tr, p2tr_ns, taprootTweakPubkey } from '@scure/btc-signer';
+import { RootState } from '@store/index';
 
 import { useEndpoints } from './use-endpoints';
 import { useEthereum } from './use-ethereum';
@@ -19,6 +20,7 @@ interface UseProofOfReserveReturnType {
 export function useProofOfReserve(): UseProofOfReserveReturnType {
   const { bitcoinBlockchainAPIURL, bitcoinNetwork, enabledEthereumNetworks } = useEndpoints();
   const { getAllFundedVaults, getAttestorGroupPublicKey } = useEthereum();
+  const { network } = useSelector((state: RootState) => state.account);
 
   const [shouldFetch, setShouldFetch] = useState(false);
 
@@ -151,7 +153,7 @@ export function useProofOfReserve(): UseProofOfReserveReturnType {
       );
 
       // Get the Attestor Public Key from the Attestor Group
-      const attestorPublicKey = await getAttestorGroupPublicKey(ethereumArbSepolia);
+      const attestorPublicKey = await getAttestorGroupPublicKey(network);
 
       // Create two MultiSig Transactions, because the User and Attestor can sign in any order
       // Create the MultiSig Transaction A

From fafabd7b9e88947f3ad6c7f363069b6b56c3966e Mon Sep 17 00:00:00 2001
From: Polybius93 <99192647+Polybius93@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:38:49 +0200
Subject: [PATCH 2/2] feat: double fee rate (#89)

* feat: double fee rate

---------

Co-authored-by: sosaucily <sosaucily@gmail.com>
---
 src/app/hooks/use-bitcoin.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/hooks/use-bitcoin.ts b/src/app/hooks/use-bitcoin.ts
index 4c9904ed..c8ba4691 100644
--- a/src/app/hooks/use-bitcoin.ts
+++ b/src/app/hooks/use-bitcoin.ts
@@ -189,8 +189,10 @@ export function useBitcoin(): UseBitcoinReturnType {
     }
 
     const feeRate = checkFeeRate(feeRates.fastestFee);
+    const feeRateMultiplier: number = import.meta.env.VITE_FEE_RATE_MULTIPLIER || 1;
+    const doubledFeeRate = feeRate * feeRateMultiplier;
 
-    return feeRate;
+    return doubledFeeRate;
   }
 
   /**