From cd12c50be4434154355b581a6c6d5ea8e8c72aa5 Mon Sep 17 00:00:00 2001 From: platfowner Date: Mon, 9 Sep 2024 17:24:48 +0900 Subject: [PATCH 1/2] Assign different ports for testnet and mainnet --- blockchain-configs/mainnet-prod/node_params.json | 6 +++--- blockchain-configs/testnet-prod/node_params.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/blockchain-configs/mainnet-prod/node_params.json b/blockchain-configs/mainnet-prod/node_params.json index 786cf3de6..fed330653 100644 --- a/blockchain-configs/mainnet-prod/node_params.json +++ b/blockchain-configs/mainnet-prod/node_params.json @@ -33,7 +33,7 @@ "EVENT_HANDLER_FILTER_DELETION_TIMEOUT_MS": 100000, "EVENT_HANDLER_HEARTBEAT_INTERVAL_MS": 15000, "EVENT_HANDLER_MAX_CUSTOM_CLIENT_ID_LENGTH": 100, - "EVENT_HANDLER_PORT": 5100, + "EVENT_HANDLER_PORT": 5102, "EXPRESS_RATE_LIMIT_WINDOW_SECS": 60, "FREE_TX_POOL_SIZE_LIMIT_RATIO": 0.1, "FREE_TX_POOL_SIZE_LIMIT_RATIO_PER_ACCOUNT": 0.1, @@ -56,7 +56,7 @@ "ON_MEMORY_CHAIN_LENGTH": 10, "P2P_HEARTBEAT_INTERVAL_MS": 15000, "P2P_MESSAGE_TIMEOUT_MS": 600000, - "P2P_PORT": 5000, + "P2P_PORT": 5002, "P2P_WAIT_FOR_ADDRESS_TIMEOUT_MS": 10000, "PEER_CANDIDATE_JSON_RPC_URL": "https://mainnet-api.ainetwork.ai/json-rpc", "PEER_CANDIDATES_CONNECTION_INTERVAL_MS": 20000, @@ -64,7 +64,7 @@ "PEER_REORG_MIN_OUTBOUND": 3, "PEER_REORG_STEADY_INTERVAL_COUNT": 15, "PEER_WHITELIST": "*", - "PORT": 8080, + "PORT": 8082, "REST_FUNCTION_CALL_TIMEOUT_MS": 10000, "REQUEST_BODY_SIZE_LIMIT": "100kb", "SEND_SNAPSHOT_CHUNK_SLEEP_TIME_MS": 1000, diff --git a/blockchain-configs/testnet-prod/node_params.json b/blockchain-configs/testnet-prod/node_params.json index 01be4f404..5824972dd 100644 --- a/blockchain-configs/testnet-prod/node_params.json +++ b/blockchain-configs/testnet-prod/node_params.json @@ -34,7 +34,7 @@ "EVENT_HANDLER_FILTER_DELETION_TIMEOUT_MS": 100000, "EVENT_HANDLER_HEARTBEAT_INTERVAL_MS": 15000, "EVENT_HANDLER_MAX_CUSTOM_CLIENT_ID_LENGTH": 100, - "EVENT_HANDLER_PORT": 5100, + "EVENT_HANDLER_PORT": 5101, "EXPRESS_RATE_LIMIT_WINDOW_SECS": 60, "FREE_TX_POOL_SIZE_LIMIT_RATIO": 0.1, "FREE_TX_POOL_SIZE_LIMIT_RATIO_PER_ACCOUNT": 0.1, @@ -57,7 +57,7 @@ "ON_MEMORY_CHAIN_LENGTH": 10, "P2P_HEARTBEAT_INTERVAL_MS": 15000, "P2P_MESSAGE_TIMEOUT_MS": 600000, - "P2P_PORT": 5000, + "P2P_PORT": 5001, "P2P_WAIT_FOR_ADDRESS_TIMEOUT_MS": 10000, "PEER_CANDIDATE_JSON_RPC_URL": "https://testnet-api.ainetwork.ai/json-rpc", "PEER_CANDIDATES_CONNECTION_INTERVAL_MS": 20000, @@ -65,7 +65,7 @@ "PEER_REORG_MIN_OUTBOUND": 3, "PEER_REORG_STEADY_INTERVAL_COUNT": 15, "PEER_WHITELIST": "*", - "PORT": 8080, + "PORT": 8081, "REST_FUNCTION_CALL_TIMEOUT_MS": 10000, "REQUEST_BODY_SIZE_LIMIT": "100kb", "SEND_SNAPSHOT_CHUNK_SLEEP_TIME_MS": 1000, From 52066e8b44b8f855ab3bf80f973247ca5543b43e Mon Sep 17 00:00:00 2001 From: platfowner Date: Tue, 10 Sep 2024 10:40:26 +0900 Subject: [PATCH 2/2] Re-assign port numbers for gcp and onprem blockchain jobs --- blockchain-configs/mainnet-prod/node_params.json | 6 +++--- blockchain-configs/testnet-prod/node_params.json | 6 +++--- blockchain-configs/testnet-staging/node_params.json | 2 +- start_node_genesis_onprem.sh | 6 ++++++ start_node_incremental_onprem.sh | 6 ++++++ 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/blockchain-configs/mainnet-prod/node_params.json b/blockchain-configs/mainnet-prod/node_params.json index fed330653..5bbbd3e59 100644 --- a/blockchain-configs/mainnet-prod/node_params.json +++ b/blockchain-configs/mainnet-prod/node_params.json @@ -33,7 +33,7 @@ "EVENT_HANDLER_FILTER_DELETION_TIMEOUT_MS": 100000, "EVENT_HANDLER_HEARTBEAT_INTERVAL_MS": 15000, "EVENT_HANDLER_MAX_CUSTOM_CLIENT_ID_LENGTH": 100, - "EVENT_HANDLER_PORT": 5102, + "EVENT_HANDLER_PORT": 5100, "EXPRESS_RATE_LIMIT_WINDOW_SECS": 60, "FREE_TX_POOL_SIZE_LIMIT_RATIO": 0.1, "FREE_TX_POOL_SIZE_LIMIT_RATIO_PER_ACCOUNT": 0.1, @@ -56,7 +56,7 @@ "ON_MEMORY_CHAIN_LENGTH": 10, "P2P_HEARTBEAT_INTERVAL_MS": 15000, "P2P_MESSAGE_TIMEOUT_MS": 600000, - "P2P_PORT": 5002, + "P2P_PORT": 4997, "P2P_WAIT_FOR_ADDRESS_TIMEOUT_MS": 10000, "PEER_CANDIDATE_JSON_RPC_URL": "https://mainnet-api.ainetwork.ai/json-rpc", "PEER_CANDIDATES_CONNECTION_INTERVAL_MS": 20000, @@ -64,7 +64,7 @@ "PEER_REORG_MIN_OUTBOUND": 3, "PEER_REORG_STEADY_INTERVAL_COUNT": 15, "PEER_WHITELIST": "*", - "PORT": 8082, + "PORT": 8080, "REST_FUNCTION_CALL_TIMEOUT_MS": 10000, "REQUEST_BODY_SIZE_LIMIT": "100kb", "SEND_SNAPSHOT_CHUNK_SLEEP_TIME_MS": 1000, diff --git a/blockchain-configs/testnet-prod/node_params.json b/blockchain-configs/testnet-prod/node_params.json index 5824972dd..8683b50de 100644 --- a/blockchain-configs/testnet-prod/node_params.json +++ b/blockchain-configs/testnet-prod/node_params.json @@ -34,7 +34,7 @@ "EVENT_HANDLER_FILTER_DELETION_TIMEOUT_MS": 100000, "EVENT_HANDLER_HEARTBEAT_INTERVAL_MS": 15000, "EVENT_HANDLER_MAX_CUSTOM_CLIENT_ID_LENGTH": 100, - "EVENT_HANDLER_PORT": 5101, + "EVENT_HANDLER_PORT": 5100, "EXPRESS_RATE_LIMIT_WINDOW_SECS": 60, "FREE_TX_POOL_SIZE_LIMIT_RATIO": 0.1, "FREE_TX_POOL_SIZE_LIMIT_RATIO_PER_ACCOUNT": 0.1, @@ -57,7 +57,7 @@ "ON_MEMORY_CHAIN_LENGTH": 10, "P2P_HEARTBEAT_INTERVAL_MS": 15000, "P2P_MESSAGE_TIMEOUT_MS": 600000, - "P2P_PORT": 5001, + "P2P_PORT": 4998, "P2P_WAIT_FOR_ADDRESS_TIMEOUT_MS": 10000, "PEER_CANDIDATE_JSON_RPC_URL": "https://testnet-api.ainetwork.ai/json-rpc", "PEER_CANDIDATES_CONNECTION_INTERVAL_MS": 20000, @@ -65,7 +65,7 @@ "PEER_REORG_MIN_OUTBOUND": 3, "PEER_REORG_STEADY_INTERVAL_COUNT": 15, "PEER_WHITELIST": "*", - "PORT": 8081, + "PORT": 8080, "REST_FUNCTION_CALL_TIMEOUT_MS": 10000, "REQUEST_BODY_SIZE_LIMIT": "100kb", "SEND_SNAPSHOT_CHUNK_SLEEP_TIME_MS": 1000, diff --git a/blockchain-configs/testnet-staging/node_params.json b/blockchain-configs/testnet-staging/node_params.json index 084bbe96a..d00659f37 100644 --- a/blockchain-configs/testnet-staging/node_params.json +++ b/blockchain-configs/testnet-staging/node_params.json @@ -57,7 +57,7 @@ "ON_MEMORY_CHAIN_LENGTH": 10, "P2P_HEARTBEAT_INTERVAL_MS": 15000, "P2P_MESSAGE_TIMEOUT_MS": 600000, - "P2P_PORT": 5000, + "P2P_PORT": 4999, "P2P_WAIT_FOR_ADDRESS_TIMEOUT_MS": 10000, "PEER_CANDIDATE_JSON_RPC_URL": "https://staging-api.ainetwork.ai/json-rpc", "PEER_CANDIDATES_CONNECTION_INTERVAL_MS": 20000, diff --git a/start_node_genesis_onprem.sh b/start_node_genesis_onprem.sh index 92a26b71e..6f5f9426e 100644 --- a/start_node_genesis_onprem.sh +++ b/start_node_genesis_onprem.sh @@ -212,6 +212,8 @@ fi if [[ $SEASON = 'mainnet' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/mainnet-prod + export PORT=8077 + export EVENT_HANDLER_PORT=5097 export PEER_CANDIDATE_JSON_RPC_URL="http://104.199.237.250:8080/json-rpc" if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x000C63907F7Aeca56A72F5a4F7cd00EfFCF11c3A,0x001C3C9C4a5669eCD8b78946f6fa5549b33362F8,0x002C76f0aeA9Ba615428d9dF7fedEC6f8ed5369f,0x003C9d091584fEC96bC3bD8423c884680BEAaf4E,0x004C4328B6c2ABF7c4Df897a8124b36E3f00a2FC,0x005C99Db64845e5BF24cd152b22c932989479907,0x006C672861e9DBb09232307c17Be6554BC90687c,0x007C36bf5D0F77836eE138EEAc8df7051b43209b,0x008C287187a5626D0a25DbD67327B36AC55B998E,0x009C66DBce144003f8C4B859fFFce78F80fDD639" @@ -225,6 +227,8 @@ elif [[ $SEASON = 'summer' ]]; then fi elif [[ $SEASON = 'spring' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/testnet-prod + export PORT=8078 + export EVENT_HANDLER_PORT=5098 export PEER_CANDIDATE_JSON_RPC_URL="http://35.221.184.48:8080/json-rpc" if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x000AF024FEDb636294867bEff390bCE6ef9C5fc4,0x001Ac309EFFFF6d307CbC2d09C811aCD7dD8A35d,0x002A273ECd3aAEc4d8748f4E06eAdE3b34d83211,0x003AD6FdB06684175e7D95EcC36758B014517E4b,0x004A2550661c8a306207C9dabb279d5701fFD66e,0x005A3c55EcE1A593b761D408B6E6BC778E0a638B,0x006Af719E197bC81BBb75d2fec7Ea217D1750bAe,0x007Ac58EAc5F0D0bDd10Af8b90799BcF849c2E74,0x008AeBc041B7ceABc53A4cf393ccF16c10c29dba,0x009A97c0cF07fdbbcdA1197aE11792258b6EcedD" @@ -240,6 +244,8 @@ elif [[ "$SEASON" = "sandbox" ]]; then fi elif [[ $SEASON = 'staging' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/testnet-staging + export PORT=8079 + export EVENT_HANDLER_PORT=5099 export PEER_CANDIDATE_JSON_RPC_URL="http://101.202.37.2:8080/json-rpc" if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x00ADEc28B6a845a085e03591bE7550dd68673C1C,0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204,0x02A2A1DF4f630d760c82BE07F18e5065d103Fa00,0x03AAb7b6f16A92A1dfe018Fe34ee420eb098B98A,0x04A456C92A880cd59D7145C457475515a6f6E0f2,0x05A1247A7400f0C2A893611adD1505743552c631,0x06AD9C8F611f1e9d9CACD4738167A51aA2e80a1A,0x07A43138CC760C85A5B1F115aa60eADEaa0bf417,0x08Aed7AF9354435c38d52143EE50ac839D20696b,0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" diff --git a/start_node_incremental_onprem.sh b/start_node_incremental_onprem.sh index 296a57252..bed0cc280 100644 --- a/start_node_incremental_onprem.sh +++ b/start_node_incremental_onprem.sh @@ -129,6 +129,8 @@ printf "\n#### [Step 1] Configure env vars ####\n\n" if [[ $SEASON = 'mainnet' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/mainnet-prod + export PORT=8077 + export EVENT_HANDLER_PORT=5097 if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x000C63907F7Aeca56A72F5a4F7cd00EfFCF11c3A,0x001C3C9C4a5669eCD8b78946f6fa5549b33362F8,0x002C76f0aeA9Ba615428d9dF7fedEC6f8ed5369f,0x003C9d091584fEC96bC3bD8423c884680BEAaf4E,0x004C4328B6c2ABF7c4Df897a8124b36E3f00a2FC,0x005C99Db64845e5BF24cd152b22c932989479907,0x006C672861e9DBb09232307c17Be6554BC90687c,0x007C36bf5D0F77836eE138EEAc8df7051b43209b,0x008C287187a5626D0a25DbD67327B36AC55B998E,0x009C66DBce144003f8C4B859fFFce78F80fDD639" fi @@ -141,6 +143,8 @@ elif [[ $SEASON = 'summer' ]]; then fi elif [[ $SEASON = 'spring' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/testnet-prod + export PORT=8078 + export EVENT_HANDLER_PORT=5098 if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x000AF024FEDb636294867bEff390bCE6ef9C5fc4,0x001Ac309EFFFF6d307CbC2d09C811aCD7dD8A35d,0x002A273ECd3aAEc4d8748f4E06eAdE3b34d83211,0x003AD6FdB06684175e7D95EcC36758B014517E4b,0x004A2550661c8a306207C9dabb279d5701fFD66e,0x005A3c55EcE1A593b761D408B6E6BC778E0a638B,0x006Af719E197bC81BBb75d2fec7Ea217D1750bAe,0x007Ac58EAc5F0D0bDd10Af8b90799BcF849c2E74,0x008AeBc041B7ceABc53A4cf393ccF16c10c29dba,0x009A97c0cF07fdbbcdA1197aE11792258b6EcedD" fi @@ -153,6 +157,8 @@ elif [[ "$SEASON" = "sandbox" ]]; then # (https://sandbox-api.ainetwork.ai/json-rpc) is used. elif [[ $SEASON = 'staging' ]]; then export BLOCKCHAIN_CONFIGS_DIR=blockchain-configs/testnet-staging + export PORT=8079 + export EVENT_HANDLER_PORT=5099 if [[ $NODE_INDEX -ge $PEER_WHITELIST_NODE_INDEX_GE ]] && [[ $NODE_INDEX -le $PEER_WHITELIST_NODE_INDEX_LE ]]; then export PEER_WHITELIST="0x00ADEc28B6a845a085e03591bE7550dd68673C1C,0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204,0x02A2A1DF4f630d760c82BE07F18e5065d103Fa00,0x03AAb7b6f16A92A1dfe018Fe34ee420eb098B98A,0x04A456C92A880cd59D7145C457475515a6f6E0f2,0x05A1247A7400f0C2A893611adD1505743552c631,0x06AD9C8F611f1e9d9CACD4738167A51aA2e80a1A,0x07A43138CC760C85A5B1F115aa60eADEaa0bf417,0x08Aed7AF9354435c38d52143EE50ac839D20696b,0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" fi