From 2b859ea1b745bbcdb1848f1df9b96b37d933541c Mon Sep 17 00:00:00 2001 From: Rootul P Date: Mon, 20 Jan 2025 09:46:17 -0700 Subject: [PATCH] chore: modify configure-v3 to update all default overrides (#4248) Closes https://github.com/celestiaorg/celestia-app/issues/4235 ## Testing I modified my local config and ran `make configure-v3` and the values for these 6 configs match what I expect. ## FLUPs After this merges, @rootulp will send a message in Discord to ask validators to run `make configure-v3` to update their local configs. --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fadd9abc20..74b36104f6 100644 --- a/Makefile +++ b/Makefile @@ -332,18 +332,25 @@ disable-mptcp: mptcp-disable: disable-mptcp CONFIG_FILE ?= ${HOME}/.celestia-app/config/config.toml -SEND_RECV_RATE ?= 10485760 # 10 MiB +# SEND_RECV_RATE is 10 MiB +SEND_RECV_RATE ?= 10485760 ## configure-v3: Modifies config file in-place to conform to v3.x recommendations. configure-v3: - @echo "Using config file at: $(CONFIG_FILE)" + @echo "Modifying the config file at: $(CONFIG_FILE)" @if [ "$$(uname)" = "Darwin" ]; then \ sed -i '' "s/^recv_rate = .*/recv_rate = $(SEND_RECV_RATE)/" $(CONFIG_FILE); \ sed -i '' "s/^send_rate = .*/send_rate = $(SEND_RECV_RATE)/" $(CONFIG_FILE); \ - sed -i '' "s/ttl-num-blocks = .*/ttl-num-blocks = 12/" $(CONFIG_FILE); \ + sed -i '' "s/^ttl-num-blocks = .*/ttl-num-blocks = 12/" $(CONFIG_FILE); \ + sed -i '' "s/^ttl-duration = .*/ttl-duration = \"1m15s\"/" $(CONFIG_FILE); \ + sed -i '' "s/^max_tx_bytes = .*/max_tx_bytes = 7897088/" $(CONFIG_FILE); \ + sed -i '' "s/^max_txs_bytes = .*/max_txs_bytes = 39485440/" $(CONFIG_FILE); \ else \ sed -i "s/^recv_rate = .*/recv_rate = $(SEND_RECV_RATE)/" $(CONFIG_FILE); \ sed -i "s/^send_rate = .*/send_rate = $(SEND_RECV_RATE)/" $(CONFIG_FILE); \ - sed -i "s/ttl-num-blocks = .*/ttl-num-blocks = 12/" $(CONFIG_FILE); \ + sed -i "s/^ttl-num-blocks = .*/ttl-num-blocks = 12/" $(CONFIG_FILE); \ + sed -i "s/^ttl-duration = .*/ttl-duration = \"1m15s\"/" $(CONFIG_FILE); \ + sed -i "s/^max_txs_bytes = .*/max_tx_bytes = 7897088/" $(CONFIG_FILE); \ + sed -i '' "s/^max_txs_bytes = .*/max_txs_bytes = 39485440/" $(CONFIG_FILE); \ fi .PHONY: configure-v3