Update testnet configuration for 2.8 testing

ArweaveTeam · Aug 13, 2024 · 3fe3df0 · 3fe3df0
1 parent 306926e
commit 3fe3df0
Show file tree

Hide file tree

Showing 19 changed files with 190 additions and 418 deletions.
diff --git a/rebar.config b/rebar.config
@@ -466,7 +466,7 @@
 
 			%% The following values all assume the testnet is restarted from height 1365819 using
 			%% the flag:
-			%% start_from_block oyKLLRQGK1JKF5hFOl4bSRBidS-embtW0vh4Wy8hU5FlJQSDY0EwA-CqMvKifu0d
+			%% start_from_block LS6NNKEjFE5vu9fuUW6TCYCy3Tcgcjk_3iF4Gu-N_05bw5BHwYc5g7YEHO-2C3hG
 
 			%% TESTNET_FORK_HEIGHT should meet the following requirements:
 			%% 1. Set to a difficulty retargeting height - i.e. a multiple of
@@ -479,21 +479,15 @@
 			%% For example, if the testnet was forked off mainnet at
 			%% height 1265219 (either through the use of start_from_latest_state or
 			%% start_from_block), then TESTNET_FORK_HEIGHT should be set to 1265220.
-			{d, 'TESTNET_FORK_HEIGHT', 1365820},
+			{d, 'TESTNET_FORK_HEIGHT', 1485210},
 
 			%% -------------------------------------------------------------------------------------
 			%% Optional configuration for testnet
 			%% Any values below here are not required and can be cleared/deleted as needed
 			%% -------------------------------------------------------------------------------------
 			% {d, 'TESTNET_REWARD_HISTORY_BLOCKS', 40},
 			{d, 'TESTNET_TARGET_BLOCK_TIME', 45},
-			{d, 'FORK_2_7_2_HEIGHT', 1366160},
-			{d, 'PRICE_2_7_2_PER_GIB_MINUTE_UPPER_BOUND', 440},
-			{d, 'PRICE_2_7_2_PER_GIB_MINUTE_LOWER_BOUND', 430},
-			{d, 'PRICE_2_6_8_TRANSITION_START', 176350}, %% 1365910
-			{d, 'PRICE_2_6_8_TRANSITION_BLOCKS', 1000},
-			{d, 'PRICE_2_7_2_TRANSITION_START', 176850}, %% 1366410
-			{d, 'PRICE_2_7_2_TRANSITION_BLOCKS', 2000}
+			{d, 'FORK_2_8_HEIGHT', 1485400}
 		]},
 		{relx, [
 			{dev_mode, false},

diff --git a/testnet/assert_testnet.sh b/testnet/assert_testnet.sh
@@ -2,7 +2,14 @@
 
 ARWEAVE_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 
-source $ARWEAVE_DIR/testnet/testnet_nodes.sh
+ALL_NODES+=(
+testnet-1
+testnet-2
+testnet-3
+testnet-4
+testnet-5
+testnet-6
+)
 
 # Get the current hostname
 current_host=$(hostname -f)

diff --git a/testnet/build_data_flags.sh b/testnet/build_data_flags.sh
diff --git a/testnet/build_peer_flags.sh b/testnet/build_peer_flags.sh
diff --git a/testnet/config/testnet-1.json b/testnet/config/testnet-1.json
@@ -0,0 +1,30 @@
+{
+    "storage_modules": [
+        "7,1099511627776,PyDuArRDMyRzK1IR5aoM6woO6YhVTUavldx-ZlTluDk",
+        "7,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "112,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs"
+    ],
+    "mining_addr": "HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+    "peers": [
+        "testnet-2.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-4.arweave.net",
+        "testnet-5.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "coordinated_mining": true,
+    "cm_api_secret": "testnet_cm_secret",
+    "cm_exit_peer": "testnet-2.arweave.net",
+    "cm_peers": [
+        "testnet-2.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "debug": true,
+    "mine": true,
+    "enable": [
+        "remove_orphaned_storage_module_data"
+    ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/config/testnet-2.json b/testnet/config/testnet-2.json
@@ -0,0 +1,31 @@
+{
+    "storage_modules": [
+        "40,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "8,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs"
+    ],
+    "mining_addr": "HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+    "peers": [
+        "testnet-1.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-4.arweave.net",
+        "testnet-5.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "vdf_server_trusted_peers": [
+        "testnet-4.arweave.net"
+    ],
+    "coordinated_mining": true,
+    "cm_api_secret": "testnet_cm_secret",
+    "cm_peers": [
+        "testnet-1.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "debug": true,
+    "mine": true,
+    "enable": [
+        "remove_orphaned_storage_module_data"
+    ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/config/testnet-3.json b/testnet/config/testnet-3.json
@@ -0,0 +1,25 @@
+{
+    "storage_modules": [
+        "51,1099511627776,peHwdWtsEr27dC7SeTT1hoympOePTO7vlJt2zhQMAtg",
+        "137969,1073741824,peHwdWtsEr27dC7SeTT1hoympOePTO7vlJt2zhQMAtg",
+        "137970,1073741824,peHwdWtsEr27dC7SeTT1hoympOePTO7vlJt2zhQMAtg"
+    ],
+    "mining_addr": "peHwdWtsEr27dC7SeTT1hoympOePTO7vlJt2zhQMAtg",
+    "peers": [
+        "testnet-1.arweave.net",
+        "testnet-2.arweave.net",
+        "testnet-4.arweave.net",
+        "testnet-5.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "vdf_server_trusted_peers": [
+        "testnet-4.arweave.net"
+    ],
+    "debug": true,
+    "mine": true,
+    "enable": [
+        "remove_orphaned_storage_module_data"
+    ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/config/testnet-4.json b/testnet/config/testnet-4.json
@@ -0,0 +1,21 @@
+{
+    "storage_modules": [
+        "70,1099511627776,hDdptPiuAlrP5RxEHwZoffm7obIyvvBi40T5PPvp57w",
+        "71,1099511627776,hDdptPiuAlrP5RxEHwZoffm7obIyvvBi40T5PPvp57w",
+        "245,500000000000,hDdptPiuAlrP5RxEHwZoffm7obIyvvBi40T5PPvp57w",
+        "1226,100000000000,hDdptPiuAlrP5RxEHwZoffm7obIyvvBi40T5PPvp57w"
+    ],
+    "mining_addr": "hDdptPiuAlrP5RxEHwZoffm7obIyvvBi40T5PPvp57w",
+    "vdf_client_peers": [
+        "testnet-3.arweave.net"
+    ],
+    "header_sync_jobs": 0,
+    "debug": true,
+    "mine": true,
+    "enable": [
+        "remove_orphaned_storage_module_data",
+        "public_vdf_server"
+    ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/config/testnet-5.json b/testnet/config/testnet-5.json
@@ -0,0 +1,24 @@
+{
+    "storage_modules": [
+        "53,1099511627776,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "19,3298534883328,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "20,3298534883328,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "7,1099511627776,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "40,1099511627776,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "70,1099511627776,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+        "71,1099511627776,v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc"
+    ],
+    "mining_addr": "v0AnxIi2DhwdyKUEHR_GrHjIGJtv1ImSB2z2ZWyQzSc",
+    "peers": [
+        "testnet-1.arweave.net",
+        "testnet-2.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-4.arweave.net",
+        "testnet-6.arweave.net"
+    ],
+    "debug": true,
+    "mine": true,
+    "enable": [ "remove_orphaned_storage_module_data" ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/config/testnet-6.json b/testnet/config/testnet-6.json
@@ -0,0 +1,36 @@
+{
+    "storage_modules": [
+        "19,3298534883328,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "20,3298534883328,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "40,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "53,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "70,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "71,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+        "7,1099511627776,HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs"
+    ],
+    "mining_addr": "HnjnoDf25mJroiFgY3FJLYw3EsUtcF9LDcJYMI3gKZs",
+    "peers": [
+        "testnet-1.arweave.net",
+        "testnet-2.arweave.net",
+        "testnet-3.arweave.net",
+        "testnet-4.arweave.net",
+        "testnet-5.arweave.net"
+    ],
+    "vdf_server_trusted_peers": [
+        "testnet-4.arweave.net"
+    ],
+    "cm_api_secret": "testnet_cm_secret",
+    "cm_exit_peer": "testnet-2.arweave.net",
+    "cm_peers": [
+        "testnet-1.arweave.net",
+        "testnet-2.arweave.net",
+        "testnet-3.arweave.net"
+    ],
+    "debug": true,
+    "mine": true,
+    "enable": [
+        "remove_orphaned_storage_module_data"
+    ],
+    "data_dir": "/arweave-data",
+    "requests_per_minute_limit": 9000
+}
diff --git a/testnet/rebuild_mainnet.sh b/testnet/rebuild_mainnet.sh
@@ -13,7 +13,7 @@ rm -rf /arweave-build/mainnet/*
 echo "$0 $@" > /arweave-build/mainnet/build.command
 
 cd $ARWEAVE_DIR
-rm $ARWEAVE_DIR/_build/prod/rel/arweave/*.tar.gz
+rm -rf $ARWEAVE_DIR/_build/prod/rel/arweave/*
 $ARWEAVE_DIR/rebar3 as prod tar
 tar xf $ARWEAVE_DIR/_build/prod/rel/arweave/arweave-*.tar.gz -C /arweave-build/mainnet
 
diff --git a/testnet/ssh_restart_testnet.sh b/testnet/ssh_restart_testnet.sh