infa: wire ethapi token and cors options

Signed-off-by: Sander Pick <sanderpick@gmail.com>

Author: sanderpick

fendermint/app/settings/src/lib.rs

@@ -332,7 +332,6 @@ impl Settings {
                     .with_list_parse_key("resolver.connection.external_addresses")
                     .with_list_parse_key("resolver.discovery.static_addresses")
                     .with_list_parse_key("resolver.membership.static_subnets")
-                    .with_list_parse_key("resolver.membership.static_subnets")
                     .with_list_parse_key("eth.cors.allowed_origins")
                     .with_list_parse_key("eth.cors.allowed_methods")
                     .with_list_parse_key("eth.cors.allowed_headers"),

infra/fendermint/Makefile.toml

@@ -37,10 +37,21 @@ BASE_FEE = { value = "1000", condition = { env_not_set = ["BASE_FEE"] } }
 TIMESTAMP = { value = "1680101412", condition = { env_not_set = ["TIMESTAMP"] } }
 POWER_SCALE = { value = "3", condition = { env_not_set = ["POWER_SCALE"] } }
 
+# ETH related parameters
+ETHAPI_ALLOWED_ORIGINS = { value = "*", condition = { env_not_set = [
+    "ETHAPI_ALLOWED_ORIGINS",
+] } }
+ETHAPI_ALLOWED_METHODS = { value = "GET,HEAD,OPTIONS,POST", condition = { env_not_set = [
+    "ETHAPI_ALLOWED_METHODS",
+] } }
+ETHAPI_ALLOWED_HEADERS = { value = "Accept,Authorization,Content-Type,Origin", condition = { env_not_set = [
+    "ETHAPI_ALLOWED_HEADERS",
+] } }
+
 # IPC subnet related parameters
 # Use calibration as default value
 NODE_NAME = { value = "ipc-node", condition = { env_not_set = ["NODE_NAME"] } }
-PARENT_ENDPOINT = { value = "https://api.calibration.node.glif.io/rpc/v1", condition = { env_not_set = [
+PARENT_ENDPOINT = { value = "https://calibration.node.glif.io/archive/lotus/rpc/v1", condition = { env_not_set = [
     "PARENT_ENDPOINT",
 ] } }
 PARENT_GATEWAY = { value = "0x56948d2CFaa2EF355B8C08Ac925202db212146D1", condition = { env_not_set = [
@@ -57,6 +68,9 @@ TOPDOWN_PROPOSAL_DELAY = { value = "2", condition = { env_not_set = ["TOPDOWN_PR
 TOPDOWN_MAX_PROPOSAL_RANGE = { value = "100", condition = { env_not_set = [
     "TOPDOWN_MAX_PROPOSAL_RANGE",
 ] } }
+TOPDOWN_MAX_CACHE_BLOCKS = { value = "20000", condition = { env_not_set = [
+    "TOPDOWN_MAX_CACHE_BLOCKS",
+] } }
 # Comma-separated list of bootstrap nodes to be used by the CometBFT node.
 BOOTSTRAPS = { value = "", condition = { env_not_set = ["BOOTSTRAPS"] } }
 # Comma-separate list of addresses that's allowed to deploy contracts to this subnet.

infra/fendermint/scripts/ethapi.toml

@@ -7,6 +7,9 @@ docker run \
   --user $(id -u) \
   --network ${NETWORK_NAME} \
   --publish ${ETHAPI_HOST_PORT}:8545 \
+  --env FM_ETH__CORS__ALLOWED_ORIGINS=${ETHAPI_ALLOWED_ORIGINS} \
+  --env FM_ETH__CORS__ALLOWED_METHODS=${ETHAPI_ALLOWED_METHODS} \
+  --env FM_ETH__CORS__ALLOWED_HEADERS=${ETHAPI_ALLOWED_HEADERS} \
   --env TENDERMINT_RPC_URL=http://${CMT_CONTAINER_NAME}:26657 \
   --env TENDERMINT_WS_URL=ws://${CMT_CONTAINER_NAME}:26657/websocket \
   --env LOG_LEVEL=${ETHAPI_LOG_LEVEL} \

infra/fendermint/scripts/fendermint.toml

@@ -61,13 +61,15 @@ docker run \
   --env FM_IPC__TOPDOWN__CHAIN_HEAD_DELAY=${TOPDOWN_CHAIN_HEAD_DELAY} \
   --env FM_IPC__TOPDOWN__PARENT_HTTP_ENDPOINT=${PARENT_ENDPOINT} \
   --env FM_IPC__TOPDOWN__PARENT_HTTP_TIMEOUT=60 \
+  --env FM_IPC__TOPDOWN__PARENT_HTTP_AUTH_TOKEN=${PARENT_HTTP_AUTH_TOKEN} \
   --env FM_IPC__TOPDOWN__PARENT_REGISTRY=${PARENT_REGISTRY} \
   --env FM_IPC__TOPDOWN__PARENT_GATEWAY=${PARENT_GATEWAY} \
   --env FM_IPC__TOPDOWN__EXPONENTIAL_BACK_OFF=5 \
   --env FM_IPC__TOPDOWN__EXPONENTIAL_RETRY_LIMIT=5 \
   --env FM_IPC__TOPDOWN__POLLING_INTERVAL=10 \
   --env FM_IPC__TOPDOWN__PROPOSAL_DELAY=${TOPDOWN_PROPOSAL_DELAY} \
   --env FM_IPC__TOPDOWN__MAX_PROPOSAL_RANGE=${TOPDOWN_MAX_PROPOSAL_RANGE} \
+  --env FM_IPC__TOPDOWN__MAX_CACHE_BLOCKS=${TOPDOWN_MAX_CACHE_BLOCKS} \
   --env FM_RESOLVER__NETWORK__LOCAL_KEY=/data/${NODE_NAME}/${NETWORK_PRIV_KEY_PATH} \
   --env FM_RESOLVER__CONNECTION__LISTEN_ADDR=/ip4/0.0.0.0/tcp/${RESOLVER_HOST_PORT} \
   --env FM_RESOLVER__DISCOVERY__STATIC_ADDRESSES=${RESOLVER_BOOTSTRAPS} \

infra/fendermint/scripts/subnet.toml

@@ -104,6 +104,7 @@ run_task = { name = [
     "ethapi-start",
     "proxy-start",
     "ipfs-start",
+    "node-report",
 ] }
 
 [tasks.child-validator-restart-no-parent]
@@ -119,6 +120,7 @@ run_task = { name = [
     "ethapi-start",
     "proxy-start",
     "ipfs-start",
+    "node-report",
 ] }
 
 [tasks.child-fullnode-down]

scripts/deploy_subnet_no_parent/restart.sh

@@ -50,7 +50,7 @@ do
       -e IPFS_GATEWAY_HOST_PORT=${IPFS_GATEWAY_HOST_PORTS[i]} \
       -e IPFS_PROFILE="local-discovery" \
       -e FM_PULL_SKIP=1 \
-      -e FM_LOG_LEVEL="info" \
+      -e FM_LOG_LEVEL="info,fendermint=debug" \
       child-validator-restart-no-parent
 done
 

scripts/deploy_subnet_no_parent/start.sh

@@ -228,7 +228,7 @@ bootstrap_output=$(cargo make --makefile infra/fendermint/Makefile.toml \
     -e IPFS_GATEWAY_HOST_PORT=${IPFS_GATEWAY_HOST_PORTS[0]} \
     -e IPFS_PROFILE="local-discovery" \
     -e FM_PULL_SKIP=1 \
-    -e FM_LOG_LEVEL="info" \
+    -e FM_LOG_LEVEL="info,fendermint=debug" \
     child-validator-no-parent 2>&1)
 echo "$bootstrap_output"
 bootstrap_node_id=$(echo "$bootstrap_output" | sed -n '/CometBFT node ID:/ {n;p;}' | tr -d "[:blank:]")
@@ -261,7 +261,7 @@ do
       -e RESOLVER_BOOTSTRAPS=${bootstrap_resolver_endpoint} \
       -e BOOTSTRAPS=${bootstrap_node_endpoint} \
       -e FM_PULL_SKIP=1 \
-      -e FM_LOG_LEVEL="info" \
+      -e FM_LOG_LEVEL="info,fendermint=debug" \
       child-validator-no-parent
 done
 

scripts/deploy_subnet_under_calibration_net/deploy.sh

@@ -14,6 +14,11 @@ eval `ssh-agent -s`
 ssh-add
 ssh-add ${HOME}/.ssh/id_rsa.ipc
 
+if [[ ! -v PARENT_HTTP_AUTH_TOKEN ]]; then
+    echo "PARENT_HTTP_AUTH_TOKEN is not set"
+    exit 1
+fi
+
 DASHES='------'
 if [[ ! -v IPC_FOLDER ]]; then
     IPC_FOLDER=${HOME}/ipc
@@ -237,10 +242,11 @@ bootstrap_output=$(cargo make --makefile infra/fendermint/Makefile.toml \
     -e IPFS_RPC_HOST_PORT=${IPFS_RPC_HOST_PORTS[0]} \
     -e IPFS_GATEWAY_HOST_PORT=${IPFS_GATEWAY_HOST_PORTS[0]} \
     -e IPFS_PROFILE="local-discovery" \
+    -e PARENT_HTTP_AUTH_TOKEN=${PARENT_HTTP_AUTH_TOKEN} \
     -e PARENT_REGISTRY=${parent_registry_address} \
     -e PARENT_GATEWAY=${parent_gateway_address} \
     -e FM_PULL_SKIP=1 \
-    -e FM_LOG_LEVEL="info" \
+    -e FM_LOG_LEVEL="info,fendermint=debug" \
     child-validator 2>&1)
 echo "$bootstrap_output"
 bootstrap_node_id=$(echo "$bootstrap_output" | sed -n '/CometBFT node ID:/ {n;p;}' | tr -d "[:blank:]")
@@ -272,10 +278,11 @@ do
       -e IPFS_PROFILE="local-discovery" \
       -e RESOLVER_BOOTSTRAPS=${bootstrap_resolver_endpoint} \
       -e BOOTSTRAPS=${bootstrap_node_endpoint} \
+      -e PARENT_HTTP_AUTH_TOKEN=${PARENT_HTTP_AUTH_TOKEN} \
       -e PARENT_REGISTRY=${parent_registry_address} \
       -e PARENT_GATEWAY=${parent_gateway_address} \
       -e FM_PULL_SKIP=1 \
-      -e FM_LOG_LEVEL="info" \
+      -e FM_LOG_LEVEL="info,fendermint=debug" \
       child-validator
 done
 

scripts/deploy_subnet_under_calibration_net/redeploy.sh

@@ -14,6 +14,11 @@ eval `ssh-agent -s`
 ssh-add
 ssh-add ${HOME}/.ssh/id_rsa.ipc
 
+if [[ ! -v PARENT_HTTP_AUTH_TOKEN ]]; then
+    echo "PARENT_HTTP_AUTH_TOKEN is not set"
+    exit 1
+fi
+
 DASHES='------'
 if [[ ! -v IPC_FOLDER ]]; then
     IPC_FOLDER=${HOME}/ipc
@@ -133,10 +138,41 @@ cd ${IPC_FOLDER}/fendermint
 make clean
 make docker-build
 
-# Step 4.2: Start other validator node
-echo "$DASHES Restart validator nodes"
+# Step 4.2: Start first validator node as bootstrap
+echo "$DASHES Start first validator node as bootstrap"
 cd ${IPC_FOLDER}
-for i in {0..2}
+bootstrap_output=$(cargo make --makefile infra/fendermint/Makefile.toml \
+    -e NODE_NAME=validator-0 \
+    -e PRIVATE_KEY_PATH=${IPC_CONFIG_FOLDER}/validator_0.sk \
+    -e SUBNET_ID=${subnet_id} \
+    -e CMT_P2P_HOST_PORT=${CMT_P2P_HOST_PORTS[0]} \
+    -e CMT_RPC_HOST_PORT=${CMT_RPC_HOST_PORTS[0]} \
+    -e ETHAPI_HOST_PORT=${ETHAPI_HOST_PORTS[0]} \
+    -e RESOLVER_HOST_PORT=${RESOLVER_HOST_PORTS[0]} \
+    -e PROXY_HOST_PORT=${PROXY_HOST_PORTS[0]} \
+    -e IPFS_SWARM_HOST_PORT=${IPFS_SWARM_HOST_PORTS[0]} \
+    -e IPFS_RPC_HOST_PORT=${IPFS_RPC_HOST_PORTS[0]} \
+    -e IPFS_GATEWAY_HOST_PORT=${IPFS_GATEWAY_HOST_PORTS[0]} \
+    -e IPFS_PROFILE="local-discovery" \
+    -e PARENT_HTTP_AUTH_TOKEN=${PARENT_HTTP_AUTH_TOKEN} \
+    -e PARENT_REGISTRY=${parent_registry_address} \
+    -e PARENT_GATEWAY=${parent_gateway_address} \
+    -e FM_PULL_SKIP=1 \
+    -e FM_LOG_LEVEL="info,fendermint=debug" \
+    child-validator-restart 2>&1)
+echo "$bootstrap_output"
+bootstrap_node_id=$(echo "$bootstrap_output" | sed -n '/CometBFT node ID:/ {n;p;}' | tr -d "[:blank:]")
+bootstrap_peer_id=$(echo "$bootstrap_output" | sed -n '/IPLD Resolver Multiaddress:/ {n;p;}' | tr -d "[:blank:]" | sed 's/.*\/p2p\///')
+echo "Bootstrap node started. Node id ${bootstrap_node_id}, peer id ${bootstrap_peer_id}"
+
+bootstrap_node_endpoint=${bootstrap_node_id}@validator-0-cometbft:${CMT_P2P_HOST_PORTS[0]}
+echo "Bootstrap node endpoint: ${bootstrap_node_endpoint}"
+bootstrap_resolver_endpoint="/dns/validator-0-fendermint/tcp/${RESOLVER_HOST_PORTS[0]}/p2p/${bootstrap_peer_id}"
+echo "Bootstrap resolver endpoint: ${bootstrap_resolver_endpoint}"
+
+# Step 4.3: Start other validator node
+echo "$DASHES Start the other validator nodes"
+for i in {1..2}
 do
   cargo make --makefile infra/fendermint/Makefile.toml \
       -e NODE_NAME=validator-${i} \
@@ -151,10 +187,13 @@ do
       -e IPFS_RPC_HOST_PORT=${IPFS_RPC_HOST_PORTS[i]} \
       -e IPFS_GATEWAY_HOST_PORT=${IPFS_GATEWAY_HOST_PORTS[i]} \
       -e IPFS_PROFILE="local-discovery" \
+      -e RESOLVER_BOOTSTRAPS=${bootstrap_resolver_endpoint} \
+      -e BOOTSTRAPS=${bootstrap_node_endpoint} \
+      -e PARENT_HTTP_AUTH_TOKEN=${PARENT_HTTP_AUTH_TOKEN} \
       -e PARENT_REGISTRY=${parent_registry_address} \
       -e PARENT_GATEWAY=${parent_gateway_address} \
       -e FM_PULL_SKIP=1 \
-      -e FM_LOG_LEVEL="info" \
+      -e FM_LOG_LEVEL="info,fendermint=debug" \
       child-validator-restart
 done