diff --git a/Dockerfile.miden-node b/Dockerfile.miden-node index 1930549..c3e5a76 100644 --- a/Dockerfile.miden-node +++ b/Dockerfile.miden-node @@ -14,9 +14,8 @@ RUN apt-get update && apt-get install -y \ WORKDIR /build -# Clone miden-node from exp-agglayer-v0.2 branch -# Source: https://github.com/0xMiden/miden-node -RUN git clone --depth 1 --branch exp-agglayer-v0.2 \ +# Clone miden-node +RUN git clone --depth 1 --branch v0.13.4 \ https://github.com/0xMiden/miden-node.git . # Save the miden-node commit SHA for labeling @@ -49,7 +48,7 @@ COPY config/genesis.toml /app/genesis.toml # Add label with miden-node source info LABEL org.opencontainers.image.source="https://github.com/0xMiden/miden-node" \ - org.opencontainers.image.ref.name="exp-agglayer-v0.2" + org.opencontainers.image.ref.name="v0.13.4" # gRPC port EXPOSE 57291 @@ -73,7 +72,7 @@ RUN printf '%s\n' \ 'fi' \ '' \ '# Bootstrap if data directory is empty (no database yet)' \ - 'if [ ! -d "$DATA_DIR/db" ]; then' \ + 'if [ ! -f "$DATA_DIR/miden-store.sqlite3" ]; then' \ ' echo "Bootstrapping miden-node..."' \ ' miden-node bundled bootstrap \' \ ' --genesis-config-file /app/genesis.toml \' \ diff --git a/kurtosis/miden-cdk/miden_services.star b/kurtosis/miden-cdk/miden_services.star index 7fc95bb..1be17ca 100644 --- a/kurtosis/miden-cdk/miden_services.star +++ b/kurtosis/miden-cdk/miden_services.star @@ -65,8 +65,6 @@ def deploy(plan, miden_args, contract_setup_addresses, cdk_args): deployment_suffix, miden_proxy_image, miden_network_id, - bridge_address, - bridge_faucet_id, ) # Wait for proxy to be ready @@ -144,7 +142,7 @@ def _deploy_miden_node(plan, deployment_suffix, image): ) -def _deploy_miden_proxy(plan, deployment_suffix, image, network_id, bridge_address, faucet_id): +def _deploy_miden_proxy(plan, deployment_suffix, image, network_id): """Deploy Miden RPC proxy service.""" service_name = "miden-proxy" + deployment_suffix miden_node_url = "http://miden-node{}:{}".format(deployment_suffix, MIDEN_NODE_PORT) @@ -160,13 +158,13 @@ def _deploy_miden_proxy(plan, deployment_suffix, image, network_id, bridge_addre application_protocol="http", ), }, + cmd=[ + "--chain-id={}".format(network_id), + "--miden-node={}".format(miden_node_url), + "--miden-store-dir=/var/lib/miden-agglayer-service", + "--port={}".format(MIDEN_PROXY_PORT), + ], env_vars={ - "CHAIN_ID": str(network_id), - "MIDEN_RPC_URL": miden_node_url, - "MIDEN_STORE_PATH": "/app/data/miden-client", - "BRIDGE_FAUCET_ID": faucet_id, - "BRIDGE_ADDRESS": bridge_address, - "LISTEN_PORT": str(MIDEN_PROXY_PORT), "RUST_LOG": "info", }, # Docker Desktop grouping label @@ -194,7 +192,8 @@ events {{ }} stream {{ upstream miden_proxy {{ - server {proxy_host}:{proxy_port}; + server host.docker.internal:{proxy_port}; + server {proxy_host}:{proxy_port} backup; }} server {{ listen {forwarder_port}; diff --git a/kurtosis/miden-cdk/params.yaml b/kurtosis/miden-cdk/params.yaml index 955b3e9..0f6acb2 100644 --- a/kurtosis/miden-cdk/params.yaml +++ b/kurtosis/miden-cdk/params.yaml @@ -42,7 +42,7 @@ miden: miden_node_port: 57291 # Miden RPC proxy image - # Build with: docker build -t miden-infra/miden-proxy:latest . + # Build with: docker build https://github.com/gateway-fm/miden-agglayer.git#master -t miden-infra/miden-proxy:latest miden_proxy_image: "miden-infra/miden-proxy:latest" miden_proxy_port: 8546 diff --git a/scripts/send-deposit.sh b/scripts/send-deposit.sh index c28329a..611ca86 100755 --- a/scripts/send-deposit.sh +++ b/scripts/send-deposit.sh @@ -67,13 +67,6 @@ fi # Bridge contract address - get from env, Docker (proxy), or kurtosis BRIDGE_ADDRESS="${BRIDGE_ADDRESS:-}" -if [[ -z "$BRIDGE_ADDRESS" ]]; then - # Try reading from the proxy container's env (works even if kurtosis tracking is broken) - _proxy=$(docker ps --format '{{.Names}}' 2>/dev/null | grep -E '^miden-proxy' | head -1) - if [[ -n "$_proxy" ]]; then - BRIDGE_ADDRESS=$(docker exec "$_proxy" printenv BRIDGE_ADDRESS 2>/dev/null || true) - fi -fi if [[ -z "$BRIDGE_ADDRESS" ]]; then # Fallback: kurtosis combined.json BRIDGE_ADDRESS=$(kurtosis service exec miden-cdk contracts-001 "cat /opt/output/combined.json" 2>/dev/null | jq -r '.polygonZkEVMBridgeAddress // empty')