From 6113e038fdd786564495e9c62818f3106d9c94ff Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Wed, 7 Aug 2024 14:51:03 +0300
Subject: [PATCH 1/8] Add Conflux testnet and mainnet chains

---
 .changeset/silly-horses-refuse.md |  5 +++++
 chains/conflux-testnet.json       | 31 +++++++++++++++++++++++++++++++
 chains/conflux.json               | 31 +++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 .changeset/silly-horses-refuse.md
 create mode 100644 chains/conflux-testnet.json
 create mode 100644 chains/conflux.json

diff --git a/.changeset/silly-horses-refuse.md b/.changeset/silly-horses-refuse.md
new file mode 100644
index 00000000..ec86d21c
--- /dev/null
+++ b/.changeset/silly-horses-refuse.md
@@ -0,0 +1,5 @@
+---
+"@api3/chains": minor
+---
+
+Add conflux and conflux-tesnet chains
diff --git a/chains/conflux-testnet.json b/chains/conflux-testnet.json
new file mode 100644
index 00000000..e35f3905
--- /dev/null
+++ b/chains/conflux-testnet.json
@@ -0,0 +1,31 @@
+{
+  "alias": "conflux-testnet",
+  "decimals": 18,
+  "explorer": {
+    "api": {
+      "key": {
+        "required": false
+      },
+      "url": "https://evmapi-testnet.confluxscan.io/api/"
+    },
+    "browserUrl": "https://evmtestnet.confluxscan.io/"
+  },
+  "id": "71",
+  "name": "Conflux testnet",
+  "providers": [
+    {
+      "alias": "default",
+      "rpcUrl": "https://evmtestnet.confluxrpc.com/"
+    },
+    {
+      "alias": "public",
+      "rpcUrl": "https://evmtest.confluxrpc.com/"
+    },
+    {
+      "alias": "backup",
+      "rpcUrl": "https://evmtestnet.confluxrpc.org/"
+    }
+  ],
+  "symbol": "CFX",
+  "testnet": true
+}
diff --git a/chains/conflux.json b/chains/conflux.json
new file mode 100644
index 00000000..38a96566
--- /dev/null
+++ b/chains/conflux.json
@@ -0,0 +1,31 @@
+{
+  "alias": "conflux",
+  "decimals": 18,
+  "explorer": {
+    "api": {
+      "key": {
+        "required": false
+      },
+      "url": "https://evmapi.confluxscan.io/api/"
+    },
+    "browserUrl": "https://evm.confluxscan.io/"
+  },
+  "id": "1030",
+  "name": "Conflux",
+  "providers": [
+    {
+      "alias": "default",
+      "rpcUrl": "https://evm.confluxrpc.com/"
+    },
+    {
+      "alias": "public",
+      "rpcUrl": "https://evmmain-global.confluxrpc.com/"
+    },
+    {
+      "alias": "backup",
+      "rpcUrl": "https://evm.confluxrpc.org/"
+    }
+  ],
+  "symbol": "CFX",
+  "testnet": false
+}

From 7d7b85527f960ab4510f0669e67a7cfaf69d0543 Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Wed, 7 Aug 2024 15:03:13 +0300
Subject: [PATCH 2/8] Add Conflux testnet and mainnet chains

---
 src/generated/chains.ts | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/generated/chains.ts b/src/generated/chains.ts
index 65b4ad3b..927169fa 100644
--- a/src/generated/chains.ts
+++ b/src/generated/chains.ts
@@ -457,6 +457,40 @@ export const CHAINS: Chain[] = [
     symbol: 'CANTO',
     testnet: false,
   },
+  {
+    alias: 'conflux-testnet',
+    decimals: 18,
+    explorer: {
+      api: { key: { required: false }, url: 'https://evmapi-testnet.confluxscan.io/api/' },
+      browserUrl: 'https://evmtestnet.confluxscan.io/',
+    },
+    id: '71',
+    name: 'Conflux testnet',
+    providers: [
+      { alias: 'default', rpcUrl: 'https://evmtestnet.confluxrpc.com/' },
+      { alias: 'public', rpcUrl: 'https://evmtest.confluxrpc.com/' },
+      { alias: 'backup', rpcUrl: 'https://evmtestnet.confluxrpc.org/' },
+    ],
+    symbol: 'CFX',
+    testnet: true,
+  },
+  {
+    alias: 'conflux',
+    decimals: 18,
+    explorer: {
+      api: { key: { required: false }, url: 'https://evmapi.confluxscan.io/api/' },
+      browserUrl: 'https://evm.confluxscan.io/',
+    },
+    id: '1030',
+    name: 'Conflux',
+    providers: [
+      { alias: 'default', rpcUrl: 'https://evm.confluxrpc.com/' },
+      { alias: 'public', rpcUrl: 'https://evmmain-global.confluxrpc.com/' },
+      { alias: 'backup', rpcUrl: 'https://evm.confluxrpc.org/' },
+    ],
+    symbol: 'CFX',
+    testnet: false,
+  },
   {
     alias: 'core-testnet',
     decimals: 18,

From b4b954ba2550d7c6039c1b553c80e6097a8c8094 Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Wed, 7 Aug 2024 15:21:51 +0300
Subject: [PATCH 3/8] Fix zircuit rpc url

---
 .changeset/dry-mice-judge.md | 5 +++++
 chains/zircuit.json          | 2 +-
 src/generated/chains.ts      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/dry-mice-judge.md

diff --git a/.changeset/dry-mice-judge.md b/.changeset/dry-mice-judge.md
new file mode 100644
index 00000000..9188d212
--- /dev/null
+++ b/.changeset/dry-mice-judge.md
@@ -0,0 +1,5 @@
+---
+"@api3/chains": patch
+---
+
+Fix zircuit rpc url
diff --git a/chains/zircuit.json b/chains/zircuit.json
index 5ba5f1a9..bb96546b 100644
--- a/chains/zircuit.json
+++ b/chains/zircuit.json
@@ -13,7 +13,7 @@
     },
     {
       "alias": "liquify",
-      "homepageUrl": "https://zircuit1-mainnet.liquify.com"
+      "rpcUrl": "https://zircuit1-mainnet.liquify.com"
     },
     {
       "alias": "drpc",
diff --git a/src/generated/chains.ts b/src/generated/chains.ts
index 927169fa..4cc5b9e7 100644
--- a/src/generated/chains.ts
+++ b/src/generated/chains.ts
@@ -1590,7 +1590,7 @@ export const CHAINS: Chain[] = [
     name: 'Zircuit',
     providers: [
       { alias: 'default', rpcUrl: 'https://zircuit1-mainnet.p2pify.com/' },
-      { alias: 'liquify', homepageUrl: 'https://zircuit1-mainnet.liquify.com' },
+      { alias: 'liquify', rpcUrl: 'https://zircuit1-mainnet.liquify.com' },
       { alias: 'drpc', homepageUrl: 'https://drpc.org' },
     ],
     symbol: 'ETH',

From 5ec490799afdaf7a3e2a0926a672be97000623ff Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Thu, 8 Aug 2024 10:16:46 +0300
Subject: [PATCH 4/8] Update Conflux chain aliases and names for eSpace

---
 .../{conflux-testnet.json => conflux-espace-testnet.json} | 4 ++--
 chains/{conflux.json => conflux-espace.json}              | 4 ++--
 src/generated/chains.ts                                   | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename chains/{conflux-testnet.json => conflux-espace-testnet.json} (88%)
 rename chains/{conflux.json => conflux-espace.json} (90%)

diff --git a/chains/conflux-testnet.json b/chains/conflux-espace-testnet.json
similarity index 88%
rename from chains/conflux-testnet.json
rename to chains/conflux-espace-testnet.json
index e35f3905..caa4d7b2 100644
--- a/chains/conflux-testnet.json
+++ b/chains/conflux-espace-testnet.json
@@ -1,5 +1,5 @@
 {
-  "alias": "conflux-testnet",
+  "alias": "conflux-espace-testnet",
   "decimals": 18,
   "explorer": {
     "api": {
@@ -11,7 +11,7 @@
     "browserUrl": "https://evmtestnet.confluxscan.io/"
   },
   "id": "71",
-  "name": "Conflux testnet",
+  "name": "Conflux eSpace testnet",
   "providers": [
     {
       "alias": "default",
diff --git a/chains/conflux.json b/chains/conflux-espace.json
similarity index 90%
rename from chains/conflux.json
rename to chains/conflux-espace.json
index 38a96566..770243d4 100644
--- a/chains/conflux.json
+++ b/chains/conflux-espace.json
@@ -1,5 +1,5 @@
 {
-  "alias": "conflux",
+  "alias": "conflux-espace",
   "decimals": 18,
   "explorer": {
     "api": {
@@ -11,7 +11,7 @@
     "browserUrl": "https://evm.confluxscan.io/"
   },
   "id": "1030",
-  "name": "Conflux",
+  "name": "Conflux eSpace",
   "providers": [
     {
       "alias": "default",
diff --git a/src/generated/chains.ts b/src/generated/chains.ts
index 4cc5b9e7..f554c711 100644
--- a/src/generated/chains.ts
+++ b/src/generated/chains.ts
@@ -458,14 +458,14 @@ export const CHAINS: Chain[] = [
     testnet: false,
   },
   {
-    alias: 'conflux-testnet',
+    alias: 'conflux-espace-testnet',
     decimals: 18,
     explorer: {
       api: { key: { required: false }, url: 'https://evmapi-testnet.confluxscan.io/api/' },
       browserUrl: 'https://evmtestnet.confluxscan.io/',
     },
     id: '71',
-    name: 'Conflux testnet',
+    name: 'Conflux eSpace testnet',
     providers: [
       { alias: 'default', rpcUrl: 'https://evmtestnet.confluxrpc.com/' },
       { alias: 'public', rpcUrl: 'https://evmtest.confluxrpc.com/' },
@@ -475,14 +475,14 @@ export const CHAINS: Chain[] = [
     testnet: true,
   },
   {
-    alias: 'conflux',
+    alias: 'conflux-espace',
     decimals: 18,
     explorer: {
       api: { key: { required: false }, url: 'https://evmapi.confluxscan.io/api/' },
       browserUrl: 'https://evm.confluxscan.io/',
     },
     id: '1030',
-    name: 'Conflux',
+    name: 'Conflux eSpace',
     providers: [
       { alias: 'default', rpcUrl: 'https://evm.confluxrpc.com/' },
       { alias: 'public', rpcUrl: 'https://evmmain-global.confluxrpc.com/' },

From f3200bf1c093eb50bb895f8ad44a59e1af01057a Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Thu, 8 Aug 2024 10:17:18 +0300
Subject: [PATCH 5/8] Fix changeset typo

---
 .changeset/dry-mice-judge.md      | 2 +-
 .changeset/silly-horses-refuse.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.changeset/dry-mice-judge.md b/.changeset/dry-mice-judge.md
index 9188d212..617f5213 100644
--- a/.changeset/dry-mice-judge.md
+++ b/.changeset/dry-mice-judge.md
@@ -2,4 +2,4 @@
 "@api3/chains": patch
 ---
 
-Fix zircuit rpc url
+Fix Zircuit RPC URL
diff --git a/.changeset/silly-horses-refuse.md b/.changeset/silly-horses-refuse.md
index ec86d21c..e1372110 100644
--- a/.changeset/silly-horses-refuse.md
+++ b/.changeset/silly-horses-refuse.md
@@ -2,4 +2,4 @@
 "@api3/chains": minor
 ---
 
-Add conflux and conflux-tesnet chains
+Add conflux-espace and conflux-espace-testnet chains

From 124506a11d8e2f03809ea5ce799c1d88289d0fe4 Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Thu, 8 Aug 2024 10:35:58 +0300
Subject: [PATCH 6/8] Update Conflux chain aliases and names for eSpace

---
 .changeset/silly-horses-refuse.md                            | 2 +-
 chains/{conflux-espace-testnet.json => conflux-testnet.json} | 2 +-
 chains/{conflux-espace.json => conflux.json}                 | 2 +-
 src/generated/chains.ts                                      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename chains/{conflux-espace-testnet.json => conflux-testnet.json} (94%)
 rename chains/{conflux-espace.json => conflux.json} (95%)

diff --git a/.changeset/silly-horses-refuse.md b/.changeset/silly-horses-refuse.md
index e1372110..5ad99fbc 100644
--- a/.changeset/silly-horses-refuse.md
+++ b/.changeset/silly-horses-refuse.md
@@ -2,4 +2,4 @@
 "@api3/chains": minor
 ---
 
-Add conflux-espace and conflux-espace-testnet chains
+Add conflux and conflux-testnet chains
diff --git a/chains/conflux-espace-testnet.json b/chains/conflux-testnet.json
similarity index 94%
rename from chains/conflux-espace-testnet.json
rename to chains/conflux-testnet.json
index caa4d7b2..923f5c07 100644
--- a/chains/conflux-espace-testnet.json
+++ b/chains/conflux-testnet.json
@@ -1,5 +1,5 @@
 {
-  "alias": "conflux-espace-testnet",
+  "alias": "conflux-testnet",
   "decimals": 18,
   "explorer": {
     "api": {
diff --git a/chains/conflux-espace.json b/chains/conflux.json
similarity index 95%
rename from chains/conflux-espace.json
rename to chains/conflux.json
index 770243d4..566685d2 100644
--- a/chains/conflux-espace.json
+++ b/chains/conflux.json
@@ -1,5 +1,5 @@
 {
-  "alias": "conflux-espace",
+  "alias": "conflux",
   "decimals": 18,
   "explorer": {
     "api": {
diff --git a/src/generated/chains.ts b/src/generated/chains.ts
index f554c711..a123a22a 100644
--- a/src/generated/chains.ts
+++ b/src/generated/chains.ts
@@ -458,7 +458,7 @@ export const CHAINS: Chain[] = [
     testnet: false,
   },
   {
-    alias: 'conflux-espace-testnet',
+    alias: 'conflux-testnet',
     decimals: 18,
     explorer: {
       api: { key: { required: false }, url: 'https://evmapi-testnet.confluxscan.io/api/' },
@@ -475,7 +475,7 @@ export const CHAINS: Chain[] = [
     testnet: true,
   },
   {
-    alias: 'conflux-espace',
+    alias: 'conflux',
     decimals: 18,
     explorer: {
       api: { key: { required: false }, url: 'https://evmapi.confluxscan.io/api/' },

From b4cd1fb8983d2f5de4d447c82a02105b97c9dde1 Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Thu, 8 Aug 2024 10:56:18 +0300
Subject: [PATCH 7/8] Remove inconsistent Manta and Zircuit RPC providers

---
 chains/manta.json       | 8 --------
 chains/zircuit.json     | 4 ----
 src/generated/chains.ts | 5 +----
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/chains/manta.json b/chains/manta.json
index 288bcd01..1f3685b0 100644
--- a/chains/manta.json
+++ b/chains/manta.json
@@ -15,20 +15,12 @@
   "providers": [
     {
       "alias": "default",
-      "rpcUrl": "https://pacific-rpc.manta.network/http"
-    },
-    {
-      "alias": "public",
       "rpcUrl": "https://r1.pacific.manta.systems/http"
     },
     {
       "alias": "nirvanalabs",
       "rpcUrl": "https://manta.nirvanalabs.xyz/mantapublic"
     },
-    {
-      "alias": "tencentcloud",
-      "rpcUrl": "https://www.tencentcloud-rpc.com/v2/manta/manta-rpc"
-    },
     {
       "alias": "drpc",
       "homepageUrl": "https://drpc.org"
diff --git a/chains/zircuit.json b/chains/zircuit.json
index bb96546b..16a19623 100644
--- a/chains/zircuit.json
+++ b/chains/zircuit.json
@@ -11,10 +11,6 @@
       "alias": "default",
       "rpcUrl": "https://zircuit1-mainnet.p2pify.com/"
     },
-    {
-      "alias": "liquify",
-      "rpcUrl": "https://zircuit1-mainnet.liquify.com"
-    },
     {
       "alias": "drpc",
       "homepageUrl": "https://drpc.org"
diff --git a/src/generated/chains.ts b/src/generated/chains.ts
index a123a22a..897e22b5 100644
--- a/src/generated/chains.ts
+++ b/src/generated/chains.ts
@@ -920,10 +920,8 @@ export const CHAINS: Chain[] = [
     id: '169',
     name: 'Manta',
     providers: [
-      { alias: 'default', rpcUrl: 'https://pacific-rpc.manta.network/http' },
-      { alias: 'public', rpcUrl: 'https://r1.pacific.manta.systems/http' },
+      { alias: 'default', rpcUrl: 'https://r1.pacific.manta.systems/http' },
       { alias: 'nirvanalabs', rpcUrl: 'https://manta.nirvanalabs.xyz/mantapublic' },
-      { alias: 'tencentcloud', rpcUrl: 'https://www.tencentcloud-rpc.com/v2/manta/manta-rpc' },
       { alias: 'drpc', homepageUrl: 'https://drpc.org' },
     ],
     symbol: 'ETH',
@@ -1590,7 +1588,6 @@ export const CHAINS: Chain[] = [
     name: 'Zircuit',
     providers: [
       { alias: 'default', rpcUrl: 'https://zircuit1-mainnet.p2pify.com/' },
-      { alias: 'liquify', rpcUrl: 'https://zircuit1-mainnet.liquify.com' },
       { alias: 'drpc', homepageUrl: 'https://drpc.org' },
     ],
     symbol: 'ETH',

From 16b4c556eb4370a1a296871c71dba8c79f79e4a7 Mon Sep 17 00:00:00 2001
From: hiletmis <hiletmis@gmail.com>
Date: Thu, 8 Aug 2024 10:56:25 +0300
Subject: [PATCH 8/8] Add changeset

---
 .changeset/clean-windows-move.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/clean-windows-move.md

diff --git a/.changeset/clean-windows-move.md b/.changeset/clean-windows-move.md
new file mode 100644
index 00000000..a8c48d1e
--- /dev/null
+++ b/.changeset/clean-windows-move.md
@@ -0,0 +1,5 @@
+---
+"@api3/chains": patch
+---
+
+Remove inconsistent RPCs from manta and zircuit chains