From 27a0112c4c912c5b44d217b2f7ecd8bcc09e902c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren?= <hello@soerenschwert.de>
Date: Mon, 17 Jul 2023 12:12:52 +0200
Subject: [PATCH] Use Alchemy API for testnet Polygon access as well

---
 .gitignore                   | 1 +
 src/config/config.local.ts   | 4 ++--
 src/config/config.testnet.ts | 4 ++--
 src/i18n/fr.po               | 2 +-
 src/lib/KeyReplacer.ts       | 6 ++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37b1dad0b..2f1803b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules
 # local env files
 .env.local
 .env.*.local
+public/k_*
 
 # Log files
 npm-debug.log*
diff --git a/src/config/config.local.ts b/src/config/config.local.ts
index 15f959a59..48d29ae30 100644
--- a/src/config/config.local.ts
+++ b/src/config/config.local.ts
@@ -14,8 +14,8 @@ export default {
     usdc: {
         enabled: true,
         networkId: 80001,
-        rpcEndpoint: 'https://matic-mumbai.chainstacklabs.com',
-        rpcMaxBlockRange: 10_000,
+        rpcEndpoint: 'wss://polygon-mumbai.g.alchemy.com/v2/#ALCHEMY_API_KEY#',
+        rpcMaxBlockRange: 1_296_000, // 30 days - Range not limited, only limited by number of logs returned
         // eslint-disable-next-line max-len
         // rpcEndpoint: 'wss://shy-sparkling-wind.matic-testnet.discover.quiknode.pro/4461ca78cea96dd6a168a58d8fc30a021cabf01d/',
         usdcContract: '0x0FA8781a83E46826621b3BC094Ea2A0212e71B23',
diff --git a/src/config/config.testnet.ts b/src/config/config.testnet.ts
index 7c1588d77..7fff6735a 100644
--- a/src/config/config.testnet.ts
+++ b/src/config/config.testnet.ts
@@ -14,8 +14,8 @@ export default {
     usdc: {
         enabled: true,
         networkId: 80001,
-        rpcEndpoint: 'https://matic-mumbai.chainstacklabs.com',
-        rpcMaxBlockRange: 10_000,
+        rpcEndpoint: 'wss://polygon-mumbai.g.alchemy.com/v2/#ALCHEMY_API_KEY#',
+        rpcMaxBlockRange: 1_296_000, // 30 days - Range not limited, only limited by number of logs returned
         usdcContract: '0x0FA8781a83E46826621b3BC094Ea2A0212e71B23',
         transferContract: '0x2805f3187dcDfa424EFA8c55Db6012Cf08Fa6eEc', // v3
         htlcContract: '0x2EB7cd7791b947A25d629219ead941fCd8f364BF', // v3
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 6c6a69339..8b557a430 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -543,7 +543,7 @@ msgstr "Acheter du NIM sur une plateforme d'échange :"
 #: src/components/UsdcTransactionList.vue:48
 #: src/components/UsdcTransactionList.vue:58
 msgid "Buy USDC"
-msgstr ""
+msgstr "Acheter de l'USDC"
 
 #: src/components/modals/overlays/BuyCryptoBankCheckOverlay.vue:25
 msgid "Buy with Credit Card"
diff --git a/src/lib/KeyReplacer.ts b/src/lib/KeyReplacer.ts
index 5a321c949..0010b541d 100644
--- a/src/lib/KeyReplacer.ts
+++ b/src/lib/KeyReplacer.ts
@@ -8,10 +8,12 @@ export async function replaceKey(input: string): Promise<string> {
 
     const keyName = sections[1];
     const fileName = `k_${btoa(keyName)}`;
-    const encodedKey = await fetch(`/${fileName}`).then((res) => res.text());
+    const encodedKey = await fetch(`/${fileName}`)
+        .then((res) => res.text())
+        .then((text) => text.replace(/\s/g, '')); // Remove any whitespace & newlines
 
     // Replace the key name with the key itself
-    sections[1] = atob(encodedKey.replace(/\s/g, ''));
+    sections[1] = atob(encodedKey);
 
     // Create the resulting string without the delimiters
     return sections.join('');