Fix merge conflicts

bifrost-wallet.providerlist.json

@@ -1,5 +1,5 @@
 {
-  "name": "Bifrost Wallet",
+  "name": "Bifrost Wallet FTSO Provider List",
   "timestamp": "2024-01-15T00:00:00+00:00",
   "version": {
     "major": 4,
@@ -9,18 +9,18 @@
   "providers": [
     {
       "chainId": 19,
-      "name": "Bifrost Oracle",
-      "description": "Bifrost Oracle is a reliable Songbird oracle service run by Towo Labs, a Songbird Network development partner and the company behind Bifrost Wallet.",
-      "url": "https://bifrostoracle.com",
+      "name": "Bifrost Wallet",
+      "description": "Bifrost Wallet runs a competitive, accurate and reliable oracle service since 2021. Developed by Towo Labs a Songbird Network development partner.",
+      "url": "https://bifrostwallet.com",
       "address": "0x69141E890F3a79cd2CFf552c0B71508bE23712dC",
       "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0x69141E890F3a79cd2CFf552c0B71508bE23712dC.png",
       "listed": true
     },
     {
       "chainId": 14,
-      "name": "Bifrost Oracle",
-      "description": "Bifrost Oracle is a reliable Flare oracle service run by Towo Labs, a Flare Network development partner and the company behind Bifrost Wallet.",
-      "url": "https://bifrostoracle.com",
+      "name": "Bifrost Wallet",
+      "description": "Bifrost Wallet runs a competitive, accurate and reliable oracle service since 2021. Developed by Towo Labs a Flare Network development partner.",
+      "url": "https://bifrostwallet.com",
       "address": "0x9A46864A3b0a7805B266C445289C3fAD1E48f18e",
       "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0x9A46864A3b0a7805B266C445289C3fAD1E48f18e.png",
       "listed": true

providerlist.schema.json

@@ -78,7 +78,7 @@
           "maxLength": 32,
           "pattern": "^[ \\w.'+\\-%/À-ÖØ-öø-ÿ:&\\[\\]\\(\\)]+$",
           "examples": [
-            "Bifrost Oracle"
+            "Bifrost Wallet"
           ]
         },
         "description": {
@@ -88,7 +88,7 @@
           "maxLength": 350,
           "pattern": "^[ \\w.'+\\-%/À-ÖØ-öø-ÿ:&\\[\\]\\(\\)]+",
           "examples": [
-            "Bifrost Oracle"
+            "Bifrost Wallet"
           ]
         },
         "url": {
@@ -98,7 +98,7 @@
           "maxLength": 100,
           "pattern": "^https://[A-Za-z0-9\/#.-]*[^/]$",
           "examples": [
-            "https://bifrostoracle.com"
+            "https://bifrostwallet.com"
           ]
         },
         "address": {
@@ -142,7 +142,7 @@
       "type": "string",
       "description": "The name of the FTSO provider list",
       "minLength": 1,
-      "maxLength": 30,
+      "maxLength": 48,
       "pattern": "^[A-Za-z ]+$",
       "examples": [
         "My Provider List"