Fix merge conflicts

TowoLabs · Dec 2, 2023 · 923a22b · 923a22b
2 parents f6c67f0 + a26f3f6
commit 923a22b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/assets/0x6df84895f1f1f6F6767C59324F94089d4097051A.png b/assets/0x6df84895f1f1f6F6767C59324F94089d4097051A.png
diff --git a/assets/0x86eC5c8Ce7a4DD7762Cff205d64Bfc0C272feB6d.png b/assets/0x86eC5c8Ce7a4DD7762Cff205d64Bfc0C272feB6d.png
diff --git a/assets/0xAc2884A4479Bf7c21AA0462d52bc9c76c3a9A3dD.png b/assets/0xAc2884A4479Bf7c21AA0462d52bc9c76c3a9A3dD.png
diff --git a/assets/0xCaA49C97318b6Bb62b7F9241891D70F87FC05D35.png b/assets/0xCaA49C97318b6Bb62b7F9241891D70F87FC05D35.png
diff --git a/bifrost-wallet.providerlist.json b/bifrost-wallet.providerlist.json
@@ -977,17 +977,17 @@
     },
     {
       "chainId": 19,
-      "name": "BushiFinance",
-      "description": "As samurai are born to serve their lord and die, BushiFinance exists to provide accurate and reliable prices for the Songbird ecosystem.",
+      "name": "Bushido FTSO",
+      "description": "As samurai are born to serve their lord and die, Bushido FTSO exists to provide accurate and reliable prices for the Songbird ecosystem.",
       "url": "https://bushi.finance",
       "address": "0x0d3852Ad415477fFC39ce9351bD4dEdbbd585833",
       "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0x0d3852Ad415477fFC39ce9351bD4dEdbbd585833.png",
       "listed": true
     },
     {
       "chainId": 14,
-      "name": "BushiFinance",
-      "description": "As samurai are born to serve their lord and die, BushiFinance exists to provide accurate and reliable prices for the Flare ecosystem.",
+      "name": "Bushido FTSO",
+      "description": "As samurai are born to serve their lord and die, Bushido FTSO exists to provide accurate and reliable prices for the Flare ecosystem.",
       "url": "https://bushi.finance",
       "address": "0xC7cF3238D2ca63d01Ad4d42B4cCB9dB8b0adE702",
       "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0xC7cF3238D2ca63d01Ad4d42B4cCB9dB8b0adE702.png",
@@ -1762,7 +1762,26 @@
       "description": "Effortless staking with institutional standards",
       "url": "https://restake.net",
       "address": "0xbF55a6eb78487F49197806025CA82DdaF633204e",
-      "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0xbF55a6eb78487F49197806025CA82DdaF633204e.png"
+      "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0xbF55a6eb78487F49197806025CA82DdaF633204e.png",
+      "listed": true
+    },
+    {
+      "chainId": 14,
+      "name": "Kiln",
+      "description": "Enterprise-grade staking made easy",
+      "url": "https://kiln.fi",
+      "address": "0x6df84895f1f1f6F6767C59324F94089d4097051A",
+      "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0x6df84895f1f1f6F6767C59324F94089d4097051A.png",
+      "listed": true
+    },
+    {
+      "chainId": 14,
+      "name": "DataVector",
+      "description": "DataVector is an Infrastructure Provider on Flare Network providing validation services and reliable data provisioning to the Flare oracle system.",
+      "url": "https://datavector.org",
+      "address": "0xCaA49C97318b6Bb62b7F9241891D70F87FC05D35",
+      "logoURI": "https://raw.githubusercontent.com/TowoLabs/ftso-signal-providers/master/assets/0xCaA49C97318b6Bb62b7F9241891D70F87FC05D35.png",
+      "listed": true
     }
   ]
 }