Merge branch 'master' into ops/esplora-unix-sockets

2023-03-21 14:29:06 +09:00
parent d8bb0e12f4 9018e872bd
commit 21349979e8
113 changed files with 14872 additions and 8274 deletions
--- a/production/elements.conf
+++ b/production/elements.conf
@@ -13,6 +13,7 @@ validatepegin=1
 mainchainrpcport=8332

 [liquidtestnet]
+rpcport=7040
 validatepegin=0
 anyonecanspendaremine=0
 initialfreecoins=2100000000000000
--- a/production/install
+++ b/production/install
@@ -353,7 +353,7 @@ ELEMENTS_REPO_URL=https://github.com/ElementsProject/elements
 ELEMENTS_REPO_NAME=elements
 ELEMENTS_REPO_BRANCH=master
 #ELEMENTS_LATEST_RELEASE=$(curl -s https://api.github.com/repos/ElementsProject/elements/releases/latest|grep tag_name|head -1|cut -d '"' -f4)
-ELEMENTS_LATEST_RELEASE=elements-0.21.0.2
+ELEMENTS_LATEST_RELEASE=elements-22.1
 echo -n '.'

 BITCOIN_ELECTRS_REPO_URL=https://github.com/blockstream/electrs
--- a/production/mempool-config.liquid.json
+++ b/production/mempool-config.liquid.json
@@ -6,7 +6,8 @@
    "MINED_BLOCKS_CACHE": 144,
    "SPAWN_CLUSTER_PROCS": 0,
    "API_URL_PREFIX": "/api/v1/",
-    "POLL_RATE_MS": 1000
+    "POLL_RATE_MS": 1000,
+    "DISK_CACHE_BLOCK_INTERVAL": 1
  },
  "SYSLOG" : {
    "MIN_PRIORITY": "debug"
--- a/production/mempool-config.liquidtestnet.json
+++ b/production/mempool-config.liquidtestnet.json
@@ -6,7 +6,8 @@
    "MINED_BLOCKS_CACHE": 144,
    "SPAWN_CLUSTER_PROCS": 0,
    "API_URL_PREFIX": "/api/v1/",
-    "POLL_RATE_MS": 1000
+    "POLL_RATE_MS": 1000,
+    "DISK_CACHE_BLOCK_INTERVAL": 1
  },
  "SYSLOG" : {
    "MIN_PRIORITY": "debug"
--- a/production/mempool-config.mainnet.json
+++ b/production/mempool-config.mainnet.json
@@ -14,7 +14,8 @@
    "CPFP_INDEXING": true,
    "ADVANCED_GBT_AUDIT": true,
    "ADVANCED_GBT_MEMPOOL": true,
-    "USE_SECOND_NODE_FOR_MINFEE": true
+    "USE_SECOND_NODE_FOR_MINFEE": true,
+    "DISK_CACHE_BLOCK_INTERVAL": 1
  },
  "SYSLOG" : {
    "MIN_PRIORITY": "debug"
--- a/production/mempool-config.signet.json
+++ b/production/mempool-config.signet.json
@@ -10,7 +10,8 @@
    "AUDIT": true,
    "ADVANCED_GBT_AUDIT": true,
    "ADVANCED_GBT_MEMPOOL": true,
-    "POLL_RATE_MS": 1000
+    "POLL_RATE_MS": 1000,
+    "DISK_CACHE_BLOCK_INTERVAL": 1
  },
  "SYSLOG" : {
    "MIN_PRIORITY": "debug"
--- a/production/mempool-config.testnet.json
+++ b/production/mempool-config.testnet.json
@@ -10,7 +10,8 @@
    "AUDIT": true,
    "ADVANCED_GBT_AUDIT": true,
    "ADVANCED_GBT_MEMPOOL": true,
-    "POLL_RATE_MS": 1000
+    "POLL_RATE_MS": 1000,
+    "DISK_CACHE_BLOCK_INTERVAL": 1
  },
  "SYSLOG" : {
    "MIN_PRIORITY": "debug"