From 4f0e2d0a47de0fdb2938eb6bfde03d8c4ada13de Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 10:30:02 +0200
Subject: [PATCH 1/4] fix: support latest synapse sdk localnet

---
 .github/workflows/ci_run.yml | 4 ++--
 src/config.rs                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci_run.yml b/.github/workflows/ci_run.yml
index adb1d91..bf29b7c 100644
--- a/.github/workflows/ci_run.yml
+++ b/.github/workflows/ci_run.yml
@@ -173,14 +173,14 @@ jobs:
       if: steps.cache-docker-images.outputs.cache-hit == 'true'
       run: |
         ./foc-devnet clean --all
-        ./foc-devnet init --no-docker-build
+        ./foc-devnet init --no-docker-build ${{ inputs.init_flags }}
 
     # If Docker images are not cached, do full init (downloads YugabyteDB and builds all images)
     - name: "EXEC: {Initialize without cache}, independent"
       if: steps.cache-docker-images.outputs.cache-hit != 'true'
       run: |
         ./foc-devnet clean --all
-        ./foc-devnet init
+        ./foc-devnet init ${{ inputs.init_flags }}
 
     # CACHE-DOCKER: Save Docker images as tarballs for caching
     - name: "EXEC: {Save Docker images for cache}, DEP: {C-docker-images-cache}"
diff --git a/src/config.rs b/src/config.rs
index 3146f73..750c167 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -291,9 +291,9 @@ impl Default for Config {
                 url: "https://github.com/filecoin-project/curio.git".to_string(),
                 commit: "60f77a618eee24cd3482be5fea545e01f26052a4".to_string(),
             },
-            filecoin_services: Location::GitCommit {
+            filecoin_services: Location::GitTag {
                 url: "https://github.com/FilOzone/filecoin-services.git".to_string(),
-                commit: "c79e2c6b37372e9b381d3e2b79e787dc132195dc".to_string(),
+                tag: "v1.2.0".to_string(),
             },
             multicall3: Location::GitTag {
                 url: "https://github.com/mds1/multicall3.git".to_string(),

From 87dcf63983540f760673fe5e82145339f8b7ce61 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 20:12:08 +0200
Subject: [PATCH 2/4] fix: predeploy latest pdp verifier dependencies

---
 src/commands/start/foc_deployer/mod.rs | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/commands/start/foc_deployer/mod.rs b/src/commands/start/foc_deployer/mod.rs
index fb6b2fa..ff4f4b2 100644
--- a/src/commands/start/foc_deployer/mod.rs
+++ b/src/commands/start/foc_deployer/mod.rs
@@ -129,6 +129,40 @@ pub fn deploy_foc_contracts(
 mkdir -p /home/foc-user/.foundry/keystores
 cast wallet import foc-deployer --private-key {} --unsafe-password ''
 cd /service_contracts
+
+# filecoin-services v1.2.0 added three PDPVerifier constructor arguments, but
+# warm-storage-deploy-all.sh still deploys it with only the initializer version.
+# Predeploy the dependencies for that ABI shape and let the upstream script reuse
+# the exported addresses.
+PDP_CONSTRUCTOR_INPUTS="$(jq '[.[] | select(.type == "constructor") | .inputs[]] | length' abi/PDPVerifier.abi.json)"
+if [ "$PDP_CONSTRUCTOR_INPUTS" = "4" ] && [ -z "$PDP_VERIFIER_IMPLEMENTATION_ADDRESS" ]; then
+  PDP_INIT_COUNTER=1
+  if [ -n "$PDP_VERIFIER_PROXY_ADDRESS" ]; then
+    PDP_INIT_COUNTER="$(expr "$(tools/get-initialized-counter.sh "$PDP_VERIFIER_PROXY_ADDRESS")" + "1")"
+  fi
+  PDP_USDFC_SYBIL_FEE="${{PDP_USDFC_SYBIL_FEE:-100000000000000000}}"
+
+  if [ -z "$FILECOIN_PAY_ADDRESS" ]; then
+    echo "Predeploying FilecoinPayV1 for PDPVerifier constructor"
+    FILECOIN_PAY_OUTPUT="$(forge create --password "$PASSWORD" --broadcast lib/fws-payments/src/FilecoinPayV1.sol:FilecoinPayV1)"
+    echo "$FILECOIN_PAY_OUTPUT"
+    export FILECOIN_PAY_ADDRESS="$(echo "$FILECOIN_PAY_OUTPUT" | grep "Deployed to" | awk '{{print $3}}')"
+    if [ -z "$FILECOIN_PAY_ADDRESS" ]; then
+      echo "Failed to extract FilecoinPayV1 address"
+      exit 1
+    fi
+  fi
+
+  echo "Predeploying PDPVerifier implementation with USDFC constructor args"
+  PDP_VERIFIER_OUTPUT="$(forge create --password "$PASSWORD" --broadcast lib/pdp/src/PDPVerifier.sol:PDPVerifier --constructor-args "$PDP_INIT_COUNTER" "$USDFC_TOKEN_ADDRESS" "$PDP_USDFC_SYBIL_FEE" "$FILECOIN_PAY_ADDRESS")"
+  echo "$PDP_VERIFIER_OUTPUT"
+  export PDP_VERIFIER_IMPLEMENTATION_ADDRESS="$(echo "$PDP_VERIFIER_OUTPUT" | grep "Deployed to" | awk '{{print $3}}')"
+  if [ -z "$PDP_VERIFIER_IMPLEMENTATION_ADDRESS" ]; then
+    echo "Failed to extract PDPVerifier implementation address"
+    exit 1
+  fi
+fi
+
 bash /service_contracts/tools/warm-storage-deploy-all.sh 2>&1 | tee /tmp/foc-deploy.log"#,
         private_key
     );

From ebf17534439e35da8e4c80335d7abab2534b0dd0 Mon Sep 17 00:00:00 2001
From: Piotr Galar <piotr.galar@gmail.com>
Date: Thu, 7 May 2026 11:50:37 +0100
Subject: [PATCH 3/4] test: add multi-copy upload testing scenario with
 filecion-pin (#103)

Co-authored-by: Rod Vagg <rod@vagg.org>
---
 .github/workflows/ci_pull_request.yml |   1 -
 scenarios/run.py                      |   3 +-
 scenarios/test_multi_copy_upload.py   | 366 ++++++++++++++++++++++++++
 3 files changed, 368 insertions(+), 2 deletions(-)
 create mode 100644 scenarios/test_multi_copy_upload.py

diff --git a/.github/workflows/ci_pull_request.yml b/.github/workflows/ci_pull_request.yml
index 5e218f2..d911cde 100644
--- a/.github/workflows/ci_pull_request.yml
+++ b/.github/workflows/ci_pull_request.yml
@@ -9,7 +9,6 @@ name: CI (Pull Request)
 
 on:
   pull_request:
-    branches: ['main']
   push:
     branches: ['main']
 
diff --git a/scenarios/run.py b/scenarios/run.py
index 8eac053..8a366a6 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -26,7 +26,8 @@
 ORDER = [
     ("test_containers", 5),
     ("test_basic_balances", 10),
-    ("test_storage_e2e", 100),
+    ("test_storage_e2e", 200),
+    ("test_multi_copy_upload", 600),
     ("test_caching_subsystem", 200),
 ]
 
diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
new file mode 100644
index 0000000..fd2b9d8
--- /dev/null
+++ b/scenarios/test_multi_copy_upload.py
@@ -0,0 +1,366 @@
+#!/usr/bin/env python3
+"""Multi-copy upload test: upload a random file via filecoin-pin against the devnet."""
+
+import os
+import re
+import subprocess
+import sys
+import tempfile
+import time
+from pathlib import Path
+from urllib.error import URLError
+from urllib.request import urlopen
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from scenarios.helpers import (
+    assert_eq,
+    assert_ok,
+    fail,
+    info,
+    run_cmd,
+    write_random_file,
+)
+
+ANSI_RE = re.compile(r"\x1b\[[0-?]*[ -/]*[@-~]")
+RAND_FILE_NAME = "random_file"
+RAND_FILE_SIZE = 20 * 1024 * 1024
+RAND_FILE_SEED = 42
+ADD_DEADLINE_SECS = 240
+ADD_INTERVAL_SECS = 10
+ADD_ATTEMPT_TIMEOUT_SECS = 180
+RETRIEVAL_DEADLINE_SECS = 90
+RETRIEVAL_INTERVAL_SECS = 5
+RETRIEVAL_REQUEST_TIMEOUT_SECS = 10
+VERIFY_CID_SCRIPT = """
+import { readFileSync } from "node:fs";
+import { CID } from "multiformats";
+import { sha256 } from "multiformats/hashes/sha2";
+
+const [cidString, filePath] = process.argv.slice(1);
+
+if (!cidString || !filePath) {
+  console.error("usage: node --input-type=module --eval <script> <cid> <file>");
+  process.exit(1);
+}
+
+const cid = CID.parse(cidString);
+const bytes = readFileSync(filePath);
+const digest = await sha256.digest(bytes);
+
+if (Buffer.from(digest.digest).equals(Buffer.from(cid.multihash.digest))) {
+  console.log("OK");
+} else {
+  console.error("CID mismatch");
+  process.exit(1);
+}
+""".strip()
+
+
+def strip_ansi(value: str) -> str:
+    return ANSI_RE.sub("", value)
+
+
+def output_text(value) -> str:
+    if isinstance(value, bytes):
+        return value.decode(errors="replace")
+    return value or ""
+
+
+_CONTENT_LENGTH_LINE_RE = re.compile(
+    r"^[ \t]*\.\.\.\(size == null \? \{\} : \{ 'Content-Length': size\.toString\(\) \}\),\r?\n",
+    re.MULTILINE,
+)
+
+
+def patch_synapse_core_streaming_upload(npm_dir: Path) -> bool:
+    """Strip Content-Length from @filoz/synapse-core's streaming upload headers.
+
+    synapse-core (as of 0.4.1, which filecoin-pin 0.20.1 resolves to) sets a
+    Content-Length header on a body that flows through a streaming Transform.
+    Node/undici rejects that as 'invalid content-length header', which
+    filecoin-pin surfaces as
+    'StorageContext store failed: Failed to store piece on service provider -
+    Network request failed'.
+
+    TODO: drop this patch once filecoin-pin pins a synapse-core release that
+    omits Content-Length on streaming bodies (track upstream in FilOzone/synapse-sdk).
+
+    Returns True when the target file is in the desired state (whether or not
+    a change was applied). Returns False only when the file is missing.
+    """
+    target = (
+        npm_dir
+        / "node_modules"
+        / "@filoz"
+        / "synapse-core"
+        / "dist"
+        / "src"
+        / "sp"
+        / "upload-streaming.js"
+    )
+    if not target.exists():
+        return False
+
+    text = target.read_text()
+    updated, count = _CONTENT_LENGTH_LINE_RE.subn("", text)
+    if count > 0:
+        target.write_text(updated)
+        info(
+            "Patched @filoz/synapse-core streaming upload "
+            f"(stripped {count} Content-Length line(s))"
+        )
+    else:
+        info(
+            "@filoz/synapse-core streaming upload already free of "
+            "Content-Length header; no patch needed"
+        )
+    return True
+
+
+def run_filecoin_pin_add(
+    filecoin_pin_bin: Path,
+    upload_dir: Path,
+    extra_args: list[str],
+    label: str,
+):
+    cmd = [
+        str(filecoin_pin_bin),
+        "add",
+        "--network",
+        "devnet",
+        *extra_args,
+        str(upload_dir),
+    ]
+    deadline = time.time() + ADD_DEADLINE_SECS
+    attempt = 0
+    last_result = None
+
+    while time.time() < deadline:
+        attempt += 1
+        info(f"filecoin-pin add attempt {attempt} ({label})")
+
+        try:
+            result = subprocess.run(
+                cmd,
+                text=True,
+                capture_output=True,
+                timeout=ADD_ATTEMPT_TIMEOUT_SECS,
+            )
+        except subprocess.TimeoutExpired as e:
+            stdout = e.stdout or ""
+            stderr = e.stderr or ""
+            result = subprocess.CompletedProcess(cmd, -1, stdout, stderr)
+
+        last_result = result
+        if result.returncode == 0:
+            return result
+
+        add_stdout = output_text(result.stdout).strip()
+        add_stderr = output_text(result.stderr).strip()
+        add_details = strip_ansi(f"{add_stdout}\n{add_stderr}".strip())
+        info(
+            "filecoin-pin add failed; retrying if time remains "
+            f"(label={label}, attempt={attempt}, exit={result.returncode})"
+        )
+        if add_details:
+            info(add_details[-1200:])
+
+        time.sleep(ADD_INTERVAL_SECS)
+
+    return last_result
+
+
+def download_and_verify(
+    url: str, file: Path, root_cid: str, npm_dir: Path
+) -> str | None:
+    download_url = f"{url}?format=raw"
+    last_error = ""
+    deadline = time.time() + RETRIEVAL_DEADLINE_SECS
+
+    while time.time() < deadline:
+        file.unlink(missing_ok=True)
+
+        try:
+            with urlopen(
+                download_url, timeout=RETRIEVAL_REQUEST_TIMEOUT_SECS
+            ) as resp, open(file, "wb") as f:
+                while True:
+                    chunk = resp.read(1024 * 1024)
+                    if not chunk:
+                        break
+                    f.write(chunk)
+        except (URLError, OSError) as e:
+            last_error = f"Failed to download {download_url}: {e}"
+        else:
+            verify_result = subprocess.run(
+                [
+                    "node",
+                    "--input-type=module",
+                    "--eval",
+                    VERIFY_CID_SCRIPT,
+                    root_cid,
+                    str(file.resolve()),
+                ],
+                cwd=npm_dir,
+                text=True,
+                capture_output=True,
+            )
+
+            if verify_result.returncode == 0:
+                return None
+
+            verify_details = (
+                verify_result.stderr or verify_result.stdout or ""
+            ).strip()
+            last_error = (
+                f"CID verification failed for {download_url} "
+                f"(exit={verify_result.returncode}) {verify_details}"
+            )
+
+        time.sleep(RETRIEVAL_INTERVAL_SECS)
+
+    return last_error or f"Timed out verifying {download_url}"
+
+
+def run():
+    assert_ok("command -v node", "node is installed")
+    assert_ok("command -v npm", "npm is installed")
+
+    with tempfile.TemporaryDirectory(
+        prefix="filecoin-pin-upload-"
+    ) as upload_tmp, tempfile.TemporaryDirectory(
+        prefix="filecoin-pin-npm-"
+    ) as npm_tmp, tempfile.TemporaryDirectory(
+        prefix="filecoin-pin-download-"
+    ) as download_tmp:
+        upload_dir = Path(upload_tmp)
+        npm_dir = Path(npm_tmp)
+        download_dir = Path(download_tmp)
+
+        run_cmd(["npm", "init", "-y"], label="npm init", cwd=npm_dir)
+
+        run_cmd(
+            [
+                "npm",
+                "pkg",
+                "set",
+                "type=module",
+                "dependencies.filecoin-pin=0.20.1",
+                "dependencies.multiformats=13.4.2",
+            ],
+            label="pin filecoin-pin dependencies",
+            cwd=npm_dir,
+        )
+
+        run_cmd(["npm", "install"], label="npm install", cwd=npm_dir)
+
+        if not patch_synapse_core_streaming_upload(npm_dir):
+            fail(
+                "Could not locate @filoz/synapse-core streaming upload "
+                "to patch (file missing under node_modules)"
+            )
+            return
+
+        random_file = upload_dir / RAND_FILE_NAME
+        info(f"Creating random file ({RAND_FILE_SIZE} bytes)")
+        write_random_file(random_file, RAND_FILE_SIZE, RAND_FILE_SEED)
+        assert_eq(
+            random_file.stat().st_size,
+            RAND_FILE_SIZE,
+            f"{RAND_FILE_NAME} created with exact size {RAND_FILE_SIZE} bytes",
+        )
+
+        info("Running filecoin-pin multi-copy upload script against devnet")
+
+        filecoin_pin_bin = npm_dir / "node_modules" / ".bin" / "filecoin-pin"
+
+        add_result = run_filecoin_pin_add(
+            filecoin_pin_bin,
+            upload_dir,
+            [],
+            "default multi-copy",
+        )
+        if add_result is None:
+            fail(f"filecoin-pin add --network devnet {upload_dir} did not run")
+            return
+
+        add_stdout = output_text(add_result.stdout).strip()
+        add_stderr = output_text(add_result.stderr).strip()
+        add_details_clean = strip_ansi(f"{add_stdout}\n{add_stderr}".strip())
+
+        if add_result.returncode != 0:
+            fail(f"""
+                filecoin-pin add --network devnet {upload_dir} (exit={add_result.returncode})
+                Retried for {ADD_DEADLINE_SECS}s.
+                {add_details_clean}
+                """.strip())
+            return
+
+        add_stdout_clean = strip_ansi(add_stdout)
+
+        root_cid = None
+        piece_cid = None
+        piece_retrieval_urls = []
+        parsed_root_cids = set()
+
+        for line in add_stdout_clean.splitlines():
+            stripped = line.strip()
+
+            match = re.search(r"\broot CID:\s*(\S+)", stripped, re.IGNORECASE)
+            if match:
+                parsed_root_cids.add(match.group(1))
+                if root_cid is None:
+                    root_cid = match.group(1)
+
+            if piece_cid is None and stripped.startswith("Piece CID:"):
+                piece_cid = stripped.split(":", 1)[1].strip()
+
+            if stripped.startswith("Retrieval URL:"):
+                piece_retrieval_urls.append(stripped.split(":", 1)[1].strip())
+
+        if not root_cid:
+            fail(f"Could not parse Root CID from output: {add_details_clean}")
+            return
+
+        if len(parsed_root_cids) != 1:
+            fail(
+                f"filecoin-pin output returned different Root CIDs: {sorted(parsed_root_cids)}"
+            )
+            return
+
+        if not piece_cid:
+            fail(f"Could not parse Piece CID from output: {add_details_clean}")
+            return
+
+        if len(piece_retrieval_urls) < 2:
+            fail(
+                "Could not parse at least two Piece Retrieval URLs from output: "
+                f"{add_details_clean}"
+            )
+            return
+
+        root_retrieval_urls = []
+        for url in piece_retrieval_urls:
+            if "/piece/" not in url or piece_cid not in url:
+                fail(
+                    "Retrieval URL does not match the expected "
+                    "/piece/<piece_cid> shape; cannot rewrite to /ipfs/<root_cid>: "
+                    f"url={url} piece_cid={piece_cid}"
+                )
+                return
+            root_retrieval_urls.append(
+                url.replace("/piece/", "/ipfs/").replace(piece_cid, root_cid)
+            )
+
+        for i, url in enumerate(root_retrieval_urls, start=1):
+            file = download_dir / f"{root_cid}_{i}.bin"
+            error = download_and_verify(url, file, root_cid, npm_dir)
+            if error:
+                fail(error)
+                return
+            info(f"Verified retrieval URL {i}: {url}")
+
+
+if __name__ == "__main__":
+    run()

From f1917608e7987325ee67595a9fec144a417df235 Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Thu, 7 May 2026 21:40:34 +1000
Subject: [PATCH 4/4] chore: address review comments

---
 src/commands/start/foc_deployer/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/commands/start/foc_deployer/mod.rs b/src/commands/start/foc_deployer/mod.rs
index ff4f4b2..1db0c3e 100644
--- a/src/commands/start/foc_deployer/mod.rs
+++ b/src/commands/start/foc_deployer/mod.rs
@@ -125,7 +125,7 @@ pub fn deploy_foc_contracts(
     // Import wallet into keystore first (required by warm-storage-deploy-all.sh)
     // The script uses forge create --password which requires a keystore file
     let deploy_cmd = format!(
-        r#"set -e
+        r#"set -eo pipefail
 mkdir -p /home/foc-user/.foundry/keystores
 cast wallet import foc-deployer --private-key {} --unsafe-password ''
 cd /service_contracts
@@ -134,6 +134,8 @@ cd /service_contracts
 # warm-storage-deploy-all.sh still deploys it with only the initializer version.
 # Predeploy the dependencies for that ABI shape and let the upstream script reuse
 # the exported addresses.
+# TODO: drop this whole block once warm-storage-deploy-all.sh passes the
+# USDFC/sybil-fee/FilecoinPay constructor args to PDPVerifier natively.
 PDP_CONSTRUCTOR_INPUTS="$(jq '[.[] | select(.type == "constructor") | .inputs[]] | length' abi/PDPVerifier.abi.json)"
 if [ "$PDP_CONSTRUCTOR_INPUTS" = "4" ] && [ -z "$PDP_VERIFIER_IMPLEMENTATION_ADDRESS" ]; then
   PDP_INIT_COUNTER=1