Fix missing changes after portal-rpc-url config change (#2516)

status-im · Jul 23, 2024 · 1e1bc66 · 1e1bc66
1 parent 84ce0c9
commit 1e1bc66
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/fluffy/docs/the_fluffy_book/docs/beacon-content-bridging.md b/fluffy/docs/the_fluffy_book/docs/beacon-content-bridging.md
@@ -14,7 +14,8 @@ make portal_bridge
 
 TRUSTED_BLOCK_ROOT=0x1234567890123456789012345678901234567890123456789012345678901234 # Replace with trusted block root.
 # --rest-url = access to beacon node API, default http://127.0.0.1:5052
-./build/portal_bridge beacon --trusted-block-root:${TRUSTED_BLOCK_ROOT} --rest-url:http://127.0.0.1:5052
+# --portal-rpc=url = access to the Portal node API, default http://127.0.0.1:8545
+./build/portal_bridge beacon --trusted-block-root:${TRUSTED_BLOCK_ROOT} --rest-url:http://127.0.0.1:5052 --portal-rpc-url:http://127.0.0.1:8545
 ```
 
 The `portal_bridge` will connect to Fluffy node over the JSON-RPC

diff --git a/fluffy/docs/the_fluffy_book/docs/history-content-bridging.md b/fluffy/docs/the_fluffy_book/docs/history-content-bridging.md
@@ -27,7 +27,7 @@ Build & run the `portal_bridge`:
 ```bash
 make portal_bridge
 
-WEB3_URL="http://127.0.0.1:8546" # Replace with your provider.
+WEB3_URL="http://127.0.0.1:8548" # Replace with your provider.
 ./build/portal_bridge history --web3-url:${WEB3_URL}
 ```
 
@@ -41,7 +41,7 @@ network.
 
 E.g. run latest + backfill with audit mode:
 ```bash
-WEB3_URL="http://127.0.0.1:8546" # Replace with your provider.
+WEB3_URL="http://127.0.0.1:8548" # Replace with your provider.
 ./build/portal_bridge history --latest:true --backfill:true --audit:true --era1-dir:/somedir/era1/ --web3-url:${WEB3_URL}
 ```
 

diff --git a/fluffy/docs/the_fluffy_book/docs/testnet-beacon-network.md b/fluffy/docs/the_fluffy_book/docs/testnet-beacon-network.md
@@ -44,5 +44,5 @@ make portal_bridge
 
 # --rpc-port 10000 = default node0
 # --rest-url = access to beacon node API, default http://127.0.0.1:5052
-./build/portal_bridge beacon --trusted-block-root:${TRUSTED_BLOCK_ROOT} --rest-url:http://127.0.0.1:5052 --backfill-amount:128 --rpc-port:10000
+./build/portal_bridge beacon --trusted-block-root:${TRUSTED_BLOCK_ROOT} --rest-url:http://127.0.0.1:5052 --backfill-amount:128 --portal-rpc-url:http://127.0.0.1:10000
 ```
diff --git a/fluffy/scripts/launch_local_testnet.sh b/fluffy/scripts/launch_local_testnet.sh
@@ -334,8 +334,7 @@ if [[ "$PORTAL_BRIDGE" == "1" ]]; then
   echo "Starting portal bridge for beacon network."
   ./build/portal_bridge beacon \
     --rest-url="${REST_URL}" \
-    --rpc-address="127.0.0.1" \
-    --rpc-port="${BASE_RPC_PORT}" \
+    --portal-rpc-url="http://127.0.0.1:${BASE_RPC_PORT}"
     --backfill-amount=128 \
     ${TRUSTED_BLOCK_ROOT_ARG} \
     > "${DATA_DIR}/log_portal_bridge.txt" 2>&1 &

diff --git a/fluffy/tools/portal_bridge/portal_bridge_conf.nim b/fluffy/tools/portal_bridge/portal_bridge_conf.nim
@@ -65,8 +65,11 @@ type
       name: "log-format"
     .}: StdoutLogKind
 
-    portalRpcUrl* {.desc: "Portal node JSON-RPC API URL", name: "portal-rpc-url".}:
-      JsonRpcUrl
+    portalRpcUrl* {.
+      desc: "Portal node JSON-RPC API URL",
+      defaultValue: JsonRpcUrl(kind: HttpUrl, value: "http://127.0.0.1:8545"),
+      name: "portal-rpc-url"
+    .}: JsonRpcUrl
 
     case cmd* {.command, desc: "".}: PortalBridgeCmd
     of PortalBridgeCmd.beacon: