Skip to content

Commit 19ab7ff

Browse files
georgi-l95georgi-l95
authored
Add Redis container (#387)
Signed-off-by: georgi-l95 <[email protected]>
1 parent a58de60 commit 19ab7ff

16 files changed

+49
-100
lines changed

‎.env

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ NETWORK_NODE_IMAGE_PREFIX=gcr.io/hedera-registry/
44
NETWORK_NODE_IMAGE_NAME=main-network-node
55

66
#### Image Tags/Hashes ####
7-
NETWORK_NODE_IMAGE_TAG=0.40.1
8-
HAVEGED_IMAGE_TAG=0.40.1
7+
NETWORK_NODE_IMAGE_TAG=0.40.4
8+
HAVEGED_IMAGE_TAG=0.40.4
99

1010
#### Java Process Settings ####
1111
PLATFORM_JAVA_HEAP_MIN=256m
@@ -28,7 +28,7 @@ PYTHON_VERSION=python3.7
2828

2929
#### MirrorNode Prefixes & Tags ####
3030
MIRROR_IMAGE_PREFIX=gcr.io/mirrornode/
31-
MIRROR_IMAGE_TAG=0.85.0-rc2
31+
MIRROR_IMAGE_TAG=0.86.1
3232

3333
#### MirrorNode settings ####
3434
MIRROR_POSTGRES_IMAGE=postgres:14-alpine
@@ -44,7 +44,7 @@ MINIO_ROOT_PASSWORD=minioadmin
4444

4545
#### JSON RPC Relay Prefixes & Tags ####
4646
RELAY_IMAGE_PREFIX=ghcr.io/hashgraph/
47-
RELAY_IMAGE_TAG=0.28.0-rc3
47+
RELAY_IMAGE_TAG=0.29.1
4848

4949
#### JSON RPC Relay limits ####
5050
RELAY_MEM_LIMIT=512m
@@ -61,6 +61,8 @@ RELAY_MIRROR_NODE_RETRY_DELAY=250
6161
RELAY_LOCAL_NODE=true
6262
RELAY_SERVER_PORT=7546
6363
RELAY_E2E_HOST=http://127.0.0.1:7546
64+
RELAY_REDIS_ENABLED=false
65+
RELAY_REDIS_URL=redis://127.0.0.1:6379
6466
RELAY_FEE_HISTORY_MAX_RESULTS=10
6567
RELAY_DEFAULT_RATE_LIMIT=200
6668
RELAY_TIER_1_RATE_LIMIT=100
@@ -69,11 +71,10 @@ RELAY_TIER_3_RATE_LIMIT=1600
6971
RELAY_LIMIT_DURATION=60000
7072
RELAY_HBAR_RATE_LIMIT_TINYBAR=0
7173
RELAY_HBAR_RATE_LIMIT_DURATION=0
72-
RELAY_ETH_GET_LOGS_BLOCK_RANGE_LIMIT=2000
74+
RELAY_ETH_GET_LOGS_BLOCK_RANGE_LIMIT=1000
7375
RELAY_DEV_MODE=false
7476
RELAY_INPUT_SIZE_LIMIT=1
7577
RELAY_RATE_LIMIT_DISABLED=true
76-
RELAY_ETH_POPULATE_SYNTHETIC_CONTRACT_RESULTS=true
7778

7879
#### Record Stream Uploader ####
7980
STREAM_EXTENSION=rcd.gz

‎compose-network/mirror-node/application.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ hedera:
1818
secretKey: minioadmin
1919
bucketName: hedera-streams
2020
endpointOverride: http://minio:9000
21-
timeout: 180s
2221
sources:
2322
- type: LOCAL
2423
initialAddressBook: /usr/etc/hedera-mirror-importer/local-dev-1-node.addressbook.f102.json.bin
@@ -43,7 +42,7 @@ hedera:
4342
transferTypes:
4443
- CRYPTO
4544
receiptPercent: 1
46-
tps: 10
45+
tps: 1
4746
type: CRYPTO_TRANSFER
4847
subscribe:
4948
grpc:

‎compose-network/network-node/data/config/bootstrap.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ contracts.chainId=298
44
hedera.recordStream.logPeriod=1
55
balances.exportPeriodSecs=400
66
files.maxSizeKb=2048
7-
contracts.precompile.atomicCryptoTransfer.enabled=true
7+
hedera.recordStream.compressFilesOnCreation=true
8+
balances.compressOnCreation=true
9+
contracts.maxNumWithHapiSigsAccess=0

‎compose-network/network-node/settings.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ useLoopbackIp, false
1919
waitAtStartup, false
2020
jasperDb.iteratorInputBufferBytes, 16777216
2121
prometheusEndpointEnabled, true
22-
transactionMaxBytes, 30720
22+
transactionMaxBytes, 6144
23+
event.creation.maxCreationRate, 20

‎configs/local.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"maxSizeKb": 2048,
88
"streamExtension": "rcd.gz",
99
"sidecarEnabled": true,
10-
"nodeImageTag": "0.41.0-alpha.3",
11-
"havegedImageTag": "0.41.0-alpha.3",
10+
"nodeImageTag": "0.42.0-alpha.0",
11+
"havegedImageTag": "0.42.0-alpha.0",
1212
"uploaderImageTag": "0.7.0",
13-
"mirrorImageTag": "0.86.0-beta1",
14-
"relayImageTag": "0.29.1",
13+
"mirrorImageTag": "0.87.0-rc3",
14+
"relayImageTag": "0.30.0-rc3",
1515
"mirrorNodeExplorerImageTag": "23.7.0",
1616
"timeout": "180s",
1717
"pythonVersion": "python3.7",

‎configs/mainnet.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"maxSizeKb": 2048,
88
"streamExtension": "rcd.gz",
99
"sidecarEnabled": true,
10-
"nodeImageTag": "0.39.0",
11-
"havegedImageTag": "0.39.0",
10+
"nodeImageTag": "0.40.4",
11+
"havegedImageTag": "0.40.4",
1212
"uploaderImageTag": "0.7.0",
13-
"mirrorImageTag": "0.83.0",
14-
"relayImageTag": "0.27.1",
13+
"mirrorImageTag": "0.86.1",
14+
"relayImageTag": "0.29.1",
1515
"pythonVersion": "python3.7",
1616
"mirrorNodeExplorerImageTag": "23.5.0",
1717
"transactionMaxBytes": "6144",

‎configs/post-0.40-config.multinode.txt

-10
This file was deleted.

‎configs/post-0.40-config.txt

-7
This file was deleted.

‎configs/pre-0.40-config.multinode.txt

-9
This file was deleted.

‎configs/pre-0.40-config.txt

-6
This file was deleted.

‎configs/previewnet.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"maxSizeKb": 2048,
88
"streamExtension": "rcd.gz",
99
"sidecarEnabled": true,
10-
"nodeImageTag": "0.40.1",
11-
"havegedImageTag": "0.40.1",
10+
"nodeImageTag": "0.41.0-alpha.5",
11+
"havegedImageTag": "0.41.0-alpha.5",
1212
"uploaderImageTag": "0.7.0",
13-
"mirrorImageTag": "0.85.0-rc2",
14-
"relayImageTag": "0.28.0-rc3",
13+
"mirrorImageTag": "0.87.0-rc3",
14+
"relayImageTag": "0.30.0-rc1",
1515
"pythonVersion": "python3.7",
1616
"mirrorNodeExplorerImageTag": "23.5.0",
1717
"transactionMaxBytes": "6144",

‎configs/testnet.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"maxSizeKb": 2048,
88
"streamExtension": "rcd.gz",
99
"sidecarEnabled": true,
10-
"nodeImageTag": "0.39.0",
11-
"havegedImageTag": "0.39.0",
10+
"nodeImageTag": "0.41.0",
11+
"havegedImageTag": "0.41.0",
1212
"uploaderImageTag": "0.7.0",
13-
"mirrorImageTag": "0.84.0",
14-
"relayImageTag": "0.28.0-rc3",
13+
"mirrorImageTag": "0.86.1",
14+
"relayImageTag": "0.30.0-rc1",
1515
"pythonVersion": "python3.7",
1616
"mirrorNodeExplorerImageTag": "23.5.0",
1717
"transactionMaxBytes": "6144",

‎docker-compose.yml

+16
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ services:
374374
INPUT_SIZE_LIMIT: "${RELAY_INPUT_SIZE_LIMIT}"
375375
RATE_LIMIT_DISABLED: "${RELAY_RATE_LIMIT_DISABLED}"
376376
ETH_POPULATE_SYNTHETIC_CONTRACT_RESULTS: "${RELAY_ETH_POPULATE_SYNTHETIC_CONTRACT_RESULTS}"
377+
REDIS_ENABLED: "${RELAY_REDIS_ENABLED}"
378+
REDIS_URL: "${RELAY_REDIS_URL}"
377379
ports:
378380
- "7546:7546"
379381
restart: unless-stopped
@@ -422,6 +424,20 @@ services:
422424
network-node-bridge:
423425
ipv4_address: 172.27.0.5
424426

427+
cache:
428+
image: redis:6-alpine
429+
container_name: relay-cache
430+
mem_limit: "${RELAY_MEM_LIMIT}"
431+
memswap_limit: "${RELAY_MEM_LIMIT}"
432+
ports:
433+
- 6379:6379
434+
restart: unless-stopped
435+
stop_signal: SIGTERM
436+
tty: true
437+
networks:
438+
network-node-bridge:
439+
ipv4_address: 172.27.0.50
440+
425441
networks:
426442
network-node-bridge:
427443
name: network-node-bridge

‎src/utils/nodeController.js

-42
Original file line numberDiff line numberDiff line change
@@ -96,32 +96,6 @@ module.exports = class NodeController {
9696
].join(" && ")
9797
);
9898

99-
// Network node versions before and after 0.40.0 require different formats of the config.txt file
100-
const isPost40 = await NodeController.isNetworkNodePost40();
101-
102-
if (isPost40) {
103-
await fs.copyFileSync(
104-
path.resolve(__dirname, `${configRoot}/configs/post-0.40-config.txt`),
105-
path.resolve(__dirname, `${baseFolder}/compose-network/network-node/config.txt`),
106-
);
107-
108-
await fs.copyFileSync(
109-
path.resolve(__dirname, `${configRoot}/configs/post-0.40-config.multinode.txt`),
110-
path.resolve(__dirname, `${baseFolder}/compose-network/network-node/config.multinode.txt`)
111-
);
112-
}
113-
else {
114-
await fs.copyFileSync(
115-
path.resolve(__dirname, `${configRoot}/configs/pre-0.40-config.txt`),
116-
path.resolve(__dirname, `${baseFolder}/compose-network/network-node/config.txt`),
117-
);
118-
119-
await fs.copyFileSync(
120-
path.resolve(__dirname, `${configRoot}/configs/pre-0.40-config.multinode.txt`),
121-
path.resolve(__dirname, `${baseFolder}/compose-network/network-node/config.multinode.txt`)
122-
);
123-
}
124-
12599
const relayRateLimitDisabled = !limits;
126100
if (relayRateLimitDisabled) {
127101
NodeController.setEnvValue(
@@ -226,20 +200,4 @@ module.exports = class NodeController {
226200
});
227201
return varsParsed;
228202
}
229-
230-
static async isNetworkNodePost40() {
231-
// If the version number format is not standard then it is assumed to be post 0.40.0
232-
const envVarsParsed = await NodeController.parseEnvFile();
233-
const networkNodeEnvVar = 'NETWORK_NODE_IMAGE_TAG';
234-
const networkNodeVersion = process.env[networkNodeEnvVar] || envVarsParsed[networkNodeEnvVar];
235-
let isPost40 = true;
236-
if (networkNodeVersion) {
237-
const versionSplit = networkNodeVersion.split('.').map(v => parseInt(v));
238-
if (versionSplit.length >= 3 && versionSplit[0] === 0 && versionSplit[1] < 40) {
239-
isPost40 = false;
240-
}
241-
}
242-
243-
return isPost40;
244-
}
245203
};

‎templates/.env.template

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ RELAY_MIRROR_NODE_RETRY_DELAY=250
6161
RELAY_LOCAL_NODE=true
6262
RELAY_SERVER_PORT=7546
6363
RELAY_E2E_HOST=http://127.0.0.1:7546
64+
RELAY_REDIS_ENABLED=false
65+
RELAY_REDIS_URL=redis://127.0.0.1:6379
6466
RELAY_FEE_HISTORY_MAX_RESULTS=10
6567
RELAY_DEFAULT_RATE_LIMIT=200
6668
RELAY_TIER_1_RATE_LIMIT=100

‎templates/local/.env.template

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ RELAY_MIRROR_NODE_RETRY_DELAY={{mirrorNodeRetryDelay}}
6161
RELAY_LOCAL_NODE=true
6262
RELAY_SERVER_PORT=7546
6363
RELAY_E2E_HOST=http://127.0.0.1:7546
64+
RELAY_REDIS_ENABLED=false
65+
RELAY_REDIS_URL=redis://127.0.0.1:6379
6466
RELAY_FEE_HISTORY_MAX_RESULTS={{maxResults}}
6567
RELAY_DEFAULT_RATE_LIMIT={{defaultLimit}}
6668
RELAY_TIER_1_RATE_LIMIT={{tier1Limit}}

0 commit comments

Comments
 (0)