From 34732cc1b7e7250f1aeaff82e9952a3e6c70bc67 Mon Sep 17 00:00:00 2001
From: gpBlockchain <744158715@qq.com>
Date: Fri, 3 Mar 2023 15:29:10 +0800
Subject: [PATCH] fix apiKeyName add get block node

---
 ckb/resource/ckb.json               | 126 ++++++++++++++++++++++++++--
 ckb/service/ckbNodeConfigService.ts |   2 +-
 2 files changed, 120 insertions(+), 8 deletions(-)

diff --git a/ckb/resource/ckb.json b/ckb/resource/ckb.json
index 24e4dfb..123e06c 100644
--- a/ckb/resource/ckb.json
+++ b/ckb/resource/ckb.json
@@ -4,42 +4,154 @@
     "url": "https://mainnet.ckb.dev/",
     "network": "MIRANA",
     "rpc": "https://mainnet.ckb.dev/",
-    "excludeMethods": ["send_alert","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","subscribe","unsubscribe"]
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
   },
   {
     "name": "publicApp",
     "url": "https://mainnet.ckbapp.dev/",
     "network": "MIRANA",
     "rpc": "https://mainnet.ckbapp.dev/",
-    "excludeMethods": ["send_alert","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","subscribe","unsubscribe"]
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
   },
   {
     "name": "public",
     "url": "https://testnet.ckb.dev/",
     "network": "PUDGE",
     "rpc": "https://testnet.ckb.dev/",
-    "excludeMethods": ["send_alert","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","subscribe","unsubscribe"]
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
   },
   {
     "name": "publicApp",
     "url": "https://testnet.ckbapp.dev/",
     "network": "PUDGE",
     "rpc": "https://testnet.ckbapp.dev/",
-    "excludeMethods": ["send_alert","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","subscribe","unsubscribe"]
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
   },
   {
     "name": "unifra",
     "url": "https://docs.unifra.io/chain-apis/nervos-api/module-chain",
     "network": "MIRANA",
-    "rpc": "https://ckb-mirana.unifra.io/v1/",
+    "rpc": "https://ckb-mirana.unifra.io/v1/${apiKeyName}",
     "apiKeyName": "UNIFRA_API_KEY",
-    "excludeMethods": ["send_alert","get_fee_rate_statics","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","get_banned_addresses","ping_peers","subscribe","unsubscribe"]
+    "excludeMethods": [
+      "send_alert",
+      "get_fee_rate_statics",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "get_banned_addresses",
+      "ping_peers",
+      "subscribe",
+      "unsubscribe"
+    ]
   },
   {
     "name": "ankr",
     "url": "",
     "network": "MIRANA",
     "rpc": "https://rpc.ankr.com/nervos_ckb",
-    "excludeMethods": ["send_alert","clear_banned_addresses","set_ban","set_network_active","add_node","remove_node","remove_transaction","clear_tx_pool","get_banned_addresses","ping_peers","subscribe","unsubscribe","local_node_info","get_peers","sync_state"]
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "get_banned_addresses",
+      "ping_peers",
+      "subscribe",
+      "unsubscribe",
+      "local_node_info",
+      "get_peers",
+      "sync_state"
+    ]
+  },
+  {
+    "name": "getblock",
+    "url": "https://account.getblock.io/",
+    "network": "MIRANA",
+    "apiKeyName": "GET_BLOCK_API_KEY",
+    "rpc": "https://ckb.getblock.io/${apiKeyName}/mainnet/",
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
+  },
+  {
+    "name": "getblock",
+    "url": "https://account.getblock.io/",
+    "network": "PUDGE",
+    "apiKeyName": "GET_BLOCK_API_KEY",
+    "rpc": "https://ckb.getblock.io/${apiKeyName}/testnet/",
+    "excludeMethods": [
+      "send_alert",
+      "clear_banned_addresses",
+      "set_ban",
+      "set_network_active",
+      "add_node",
+      "remove_node",
+      "remove_transaction",
+      "clear_tx_pool",
+      "subscribe",
+      "unsubscribe"
+    ]
   }
 ]
diff --git a/ckb/service/ckbNodeConfigService.ts b/ckb/service/ckbNodeConfigService.ts
index 8d05665..8850d7b 100644
--- a/ckb/service/ckbNodeConfigService.ts
+++ b/ckb/service/ckbNodeConfigService.ts
@@ -17,7 +17,7 @@ export function getCkbNodeConfigByFile(path: string): CkbNodeConfig[] {
     return JSON.parse(rawData.toString())
         .map(config => {
             if (process.env[config.apiKeyName] != undefined) {
-                config.rpc = config.rpc + process.env[config.apiKeyName]
+                config.rpc = config.rpc.replace("${apiKeyName}" , process.env[config.apiKeyName])
             }
             return {
                 name: config.name,