From f5dc10a5406787304e81e8697b48785f1153812e Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 15:17:58 +0200
Subject: [PATCH 01/21] test: filecoin-pin in CI as a testing scenario for
 multi-copy upload

---
 scenarios/test_multi_copy_upload.py | 113 ++++++++++++++++++++++++++++
 scripts/verify_cid.mjs              |  21 ++++++
 2 files changed, 134 insertions(+)
 create mode 100644 scenarios/test_multi_copy_upload.py
 create mode 100644 scripts/verify_cid.mjs

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
new file mode 100644
index 0000000..b300932
--- /dev/null
+++ b/scenarios/test_multi_copy_upload.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+"""Multi-copy upload test: upload a random file via filecoin-pin against the devnet."""
+
+import os
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+from urllib.error import HTTPError, 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
+
+RAND_FILE_NAME = "random_file"
+RAND_FILE_SIZE = 20 * 1024 * 1024
+RAND_FILE_SEED = 42
+
+
+def run():
+    assert_ok("command -v node", "node is installed")
+    assert_ok("command -v pnpm", "pnpm is installed")
+
+    scripts_dir = Path("scripts").resolve()
+
+    with tempfile.TemporaryDirectory(prefix="filecoin-pin-") as tmp:
+        if not run_cmd(["pnpm", "install", "-g", "filecoin-pin"], label="pnpm install -g filecoin-pin"):
+            return
+        if not run_cmd(["pnpm", "install", "-g", "multiformats"], label="pnpm install -g multiformats"):
+            return
+
+        random_file = Path(tmp) / 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")
+
+        add_result = subprocess.run(
+            ["filecoin-pin", "add", "--network", "devnet", tmp],
+            text=True,
+            capture_output=True,
+        )
+        add_details = (add_result.stderr or add_result.stdout or "").strip()
+        if add_result.returncode != 0:
+            fail(f"filecoin-pin add --network devnet {tmp} (exit={add_result.returncode}) {add_details}")
+            return
+
+        root_cid = None
+        piece_cid = None
+        piece_retrieval_urls = []
+
+        for line in add_details.splitlines():
+            stripped = line.strip()
+
+            if root_cid is None and stripped.startswith("Root CID:"):
+                root_cid = stripped.split(":", 1)[1].strip()
+
+            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}")
+            return
+
+        if not piece_cid:
+            fail(f"Could not parse Piece CID from output: {add_details}")
+            return
+
+        if not piece_retrieval_urls:
+            fail(f"Could not parse Piece Retrieval URLs from output: {add_details}")
+            return
+
+        root_retrieval_urls = [
+            url.replace("/piece/", "/ipfs/").replace(piece_cid, root_cid)
+            for url in piece_retrieval_urls
+        ]
+
+        ipfs_dir = Path("ipfs")
+        ipfs_dir.mkdir(parents=True, exist_ok=True)
+
+        for i, url in enumerate(root_retrieval_urls, start=1):
+            file = ipfs_dir / f"{root_cid}_{i}.bin"
+            download_url = f"{url}?format=raw"
+
+            try:
+                with urlopen(download_url, timeout=60) 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:
+                fail(f"Failed to download {download_url}: {e}")
+                return
+
+            if not run_cmd(
+                ["node", str(scripts_dir / "verify_cid.mjs"), root_cid, str(file)],
+                label=f"node {scripts_dir / 'verify_cid.mjs'} {root_cid} {file} ({download_url})",
+            ):
+                return
+
+
+if __name__ == "__main__":
+    run()
diff --git a/scripts/verify_cid.mjs b/scripts/verify_cid.mjs
new file mode 100644
index 0000000..cbb35cb
--- /dev/null
+++ b/scripts/verify_cid.mjs
@@ -0,0 +1,21 @@
+import { readFileSync } from "node:fs";
+import { CID } from "multiformats/cid";
+import { sha256 } from "multiformats/hashes/sha2";
+
+const [cidString, filePath] = process.argv.slice(2);
+
+if (!cidString || !filePath) {
+  console.error("usage: node verify.mjs <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);
+}

From 94847933751f1d7832f57bb9a4c60f05293da791 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 15:22:28 +0200
Subject: [PATCH 02/21] fmt

---
 scenarios/test_multi_copy_upload.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index b300932..25cee9f 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -11,7 +11,14 @@
 
 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
+from scenarios.helpers import (
+    assert_eq,
+    assert_ok,
+    fail,
+    info,
+    run_cmd,
+    write_random_file,
+)
 
 RAND_FILE_NAME = "random_file"
 RAND_FILE_SIZE = 20 * 1024 * 1024
@@ -25,9 +32,15 @@ def run():
     scripts_dir = Path("scripts").resolve()
 
     with tempfile.TemporaryDirectory(prefix="filecoin-pin-") as tmp:
-        if not run_cmd(["pnpm", "install", "-g", "filecoin-pin"], label="pnpm install -g filecoin-pin"):
+        if not run_cmd(
+            ["pnpm", "install", "-g", "filecoin-pin"],
+            label="pnpm install -g filecoin-pin",
+        ):
             return
-        if not run_cmd(["pnpm", "install", "-g", "multiformats"], label="pnpm install -g multiformats"):
+        if not run_cmd(
+            ["pnpm", "install", "-g", "multiformats"],
+            label="pnpm install -g multiformats",
+        ):
             return
 
         random_file = Path(tmp) / RAND_FILE_NAME
@@ -48,7 +61,9 @@ def run():
         )
         add_details = (add_result.stderr or add_result.stdout or "").strip()
         if add_result.returncode != 0:
-            fail(f"filecoin-pin add --network devnet {tmp} (exit={add_result.returncode}) {add_details}")
+            fail(
+                f"filecoin-pin add --network devnet {tmp} (exit={add_result.returncode}) {add_details}"
+            )
             return
 
         root_cid = None

From 9914af25593ae00581eb22a5607f238f599389af Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 18:14:51 +0200
Subject: [PATCH 03/21] test: include new test in the suite

---
 scenarios/run.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scenarios/run.py b/scenarios/run.py
index 8eac053..51be410 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -27,6 +27,7 @@
     ("test_containers", 5),
     ("test_basic_balances", 10),
     ("test_storage_e2e", 100),
+    ("test_multi_copy_upload", 200),
     ("test_caching_subsystem", 200),
 ]
 

From 74699ee63a1a5886ba29aa78b6a0af87cf1ad223 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 18:48:45 +0200
Subject: [PATCH 04/21] pnpm install -g -> npm install -g

---
 scenarios/test_multi_copy_upload.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 25cee9f..4085814 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -33,13 +33,13 @@ def run():
 
     with tempfile.TemporaryDirectory(prefix="filecoin-pin-") as tmp:
         if not run_cmd(
-            ["pnpm", "install", "-g", "filecoin-pin"],
-            label="pnpm install -g filecoin-pin",
+            ["npm", "install", "-g", "filecoin-pin"],
+            label="npm install -g filecoin-pin",
         ):
             return
         if not run_cmd(
-            ["pnpm", "install", "-g", "multiformats"],
-            label="pnpm install -g multiformats",
+            ["npm", "install", "-g", "multiformats"],
+            label="npm install -g multiformats",
         ):
             return
 

From ed79bb3e9e7c24c8fe79919225cdb3ba8bc2eb0b Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 19:19:12 +0200
Subject: [PATCH 05/21] debug: show stdout and stderr on failure

---
 scenarios/test_multi_copy_upload.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 4085814..e670fdc 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -59,10 +59,15 @@ def run():
             text=True,
             capture_output=True,
         )
-        add_details = (add_result.stderr or add_result.stdout or "").strip()
+        add_stdout = (add_result.stdout or "").strip()
+        add_stderr = (add_result.stderr or "").strip()
         if add_result.returncode != 0:
             fail(
-                f"filecoin-pin add --network devnet {tmp} (exit={add_result.returncode}) {add_details}"
+                f"""
+                filecoin-pin add --network devnet {tmp} (exit={add_result.returncode})
+                {add_stdout}
+                {add_stderr}
+                """.strip()
             )
             return
 
@@ -70,7 +75,7 @@ def run():
         piece_cid = None
         piece_retrieval_urls = []
 
-        for line in add_details.splitlines():
+        for line in add_stdout.splitlines():
             stripped = line.strip()
 
             if root_cid is None and stripped.startswith("Root CID:"):

From f44000d901b721ea100bd247a656618de5eb6eba Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 12 Apr 2026 20:10:52 +0200
Subject: [PATCH 06/21] fmt

---
 scenarios/test_multi_copy_upload.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index e670fdc..003cf34 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -62,13 +62,11 @@ def run():
         add_stdout = (add_result.stdout or "").strip()
         add_stderr = (add_result.stderr or "").strip()
         if add_result.returncode != 0:
-            fail(
-                f"""
+            fail(f"""
                 filecoin-pin add --network devnet {tmp} (exit={add_result.returncode})
                 {add_stdout}
                 {add_stderr}
-                """.strip()
-            )
+                """.strip())
             return
 
         root_cid = None

From 0671bd4733b485790eaff2852aa501d30570304a Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 16:57:31 +0200
Subject: [PATCH 07/21] ci: pin synapse-core

---
 scenarios/test_multi_copy_upload.py | 57 +++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 003cf34..a39dafb 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -6,7 +6,7 @@
 import sys
 import tempfile
 from pathlib import Path
-from urllib.error import HTTPError, URLError
+from urllib.error import URLError
 from urllib.request import urlopen
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -31,19 +31,49 @@ def run():
 
     scripts_dir = Path("scripts").resolve()
 
-    with tempfile.TemporaryDirectory(prefix="filecoin-pin-") as tmp:
+    with tempfile.TemporaryDirectory(prefix="filecoin-pin-upload-") as upload_tmp, tempfile.TemporaryDirectory(
+        prefix="filecoin-pin-npm-"
+    ) as npm_tmp:
+        upload_dir = Path(upload_tmp)
+        npm_dir = Path(npm_tmp)
+
+        if not run_cmd(
+            ["npm", "init", "-y"],
+            label="npm init",
+            cwd=npm_dir,
+        ):
+            return
+
+        if not run_cmd(
+            [
+                "npm",
+                "pkg",
+                "set",
+                "type=module",
+                "dependencies.filecoin-pin=0.20.0",
+                "overrides.@filoz/synapse-core=0.4.1",
+            ],
+            label="pin filecoin-pin dependencies",
+            cwd=npm_dir,
+        ):
+            return
+
         if not run_cmd(
-            ["npm", "install", "-g", "filecoin-pin"],
-            label="npm install -g filecoin-pin",
+            ["npm", "install"],
+            label="npm install",
+            cwd=npm_dir,
         ):
             return
+
+        # Keep this global for now; verify_cid.mjs likely imports multiformats
+        # outside the temporary npm project.
         if not run_cmd(
             ["npm", "install", "-g", "multiformats"],
             label="npm install -g multiformats",
         ):
             return
 
-        random_file = Path(tmp) / RAND_FILE_NAME
+        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(
@@ -54,19 +84,24 @@ def run():
 
         info("Running filecoin-pin multi-copy upload script against devnet")
 
+        filecoin_pin_bin = npm_dir / "node_modules" / ".bin" / "filecoin-pin"
+
         add_result = subprocess.run(
-            ["filecoin-pin", "add", "--network", "devnet", tmp],
+            [str(filecoin_pin_bin), "add", "--network", "devnet", str(upload_dir)],
             text=True,
             capture_output=True,
         )
         add_stdout = (add_result.stdout or "").strip()
         add_stderr = (add_result.stderr or "").strip()
+        add_details = f"{add_stdout}\n{add_stderr}".strip()
+
         if add_result.returncode != 0:
-            fail(f"""
-                filecoin-pin add --network devnet {tmp} (exit={add_result.returncode})
-                {add_stdout}
-                {add_stderr}
-                """.strip())
+            fail(
+                f"""
+                filecoin-pin add --network devnet {upload_dir} (exit={add_result.returncode})
+                {add_details}
+                """.strip()
+            )
             return
 
         root_cid = None

From 9012362cddac5c26975f2f23f78d7accc2932263 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 17:01:33 +0200
Subject: [PATCH 08/21] ci: fix pr trigger

---
 .github/workflows/ci_pull_request.yml | 1 -
 1 file changed, 1 deletion(-)

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']
 

From 38c839fbe722f8f94f110e1c99cb84b4cff26804 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 17:03:09 +0200
Subject: [PATCH 09/21] fmt

---
 scenarios/test_multi_copy_upload.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index a39dafb..7c882c6 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -31,9 +31,9 @@ def run():
 
     scripts_dir = Path("scripts").resolve()
 
-    with tempfile.TemporaryDirectory(prefix="filecoin-pin-upload-") as upload_tmp, tempfile.TemporaryDirectory(
-        prefix="filecoin-pin-npm-"
-    ) as npm_tmp:
+    with tempfile.TemporaryDirectory(
+        prefix="filecoin-pin-upload-"
+    ) as upload_tmp, tempfile.TemporaryDirectory(prefix="filecoin-pin-npm-") as npm_tmp:
         upload_dir = Path(upload_tmp)
         npm_dir = Path(npm_tmp)
 
@@ -96,12 +96,10 @@ def run():
         add_details = f"{add_stdout}\n{add_stderr}".strip()
 
         if add_result.returncode != 0:
-            fail(
-                f"""
+            fail(f"""
                 filecoin-pin add --network devnet {upload_dir} (exit={add_result.returncode})
                 {add_details}
-                """.strip()
-            )
+                """.strip())
             return
 
         root_cid = None

From 7c7e3ae9f21e05f4cc607cc2b97e0876b14f7264 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 17:44:49 +0200
Subject: [PATCH 10/21] ci: older version

---
 scenarios/test_multi_copy_upload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 7c882c6..5d0ce39 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -51,7 +51,7 @@ def run():
                 "set",
                 "type=module",
                 "dependencies.filecoin-pin=0.20.0",
-                "overrides.@filoz/synapse-core=0.4.1",
+                "overrides.@filoz/synapse-core=0.3.3",
             ],
             label="pin filecoin-pin dependencies",
             cwd=npm_dir,

From 30a2f93112fba79d916f5cfa27e2ae8e9f2e7686 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 18:42:56 +0200
Subject: [PATCH 11/21] fix: pin filecoin-pin test dependencies

---
 scenarios/run.py                    |   2 +-
 scenarios/test_multi_copy_upload.py | 141 +++++++++++++++++++++-------
 scripts/verify_cid.mjs              |  21 -----
 3 files changed, 107 insertions(+), 57 deletions(-)
 delete mode 100644 scripts/verify_cid.mjs

diff --git a/scenarios/run.py b/scenarios/run.py
index 51be410..38ebde8 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -27,7 +27,7 @@
     ("test_containers", 5),
     ("test_basic_balances", 10),
     ("test_storage_e2e", 100),
-    ("test_multi_copy_upload", 200),
+    ("test_multi_copy_upload", 300),
     ("test_caching_subsystem", 200),
 ]
 
diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 5d0ce39..0878ed1 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -2,9 +2,11 @@
 """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
@@ -20,17 +22,98 @@
     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
+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 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),
+                ],
+                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 pnpm", "pnpm is installed")
 
-    scripts_dir = Path("scripts").resolve()
-
     with tempfile.TemporaryDirectory(
         prefix="filecoin-pin-upload-"
     ) as upload_tmp, tempfile.TemporaryDirectory(prefix="filecoin-pin-npm-") as npm_tmp:
@@ -51,6 +134,8 @@ def run():
                 "set",
                 "type=module",
                 "dependencies.filecoin-pin=0.20.0",
+                "dependencies.multiformats=13.4.2",
+                "overrides.@filoz/synapse-sdk=0.40.2",
                 "overrides.@filoz/synapse-core=0.3.3",
             ],
             label="pin filecoin-pin dependencies",
@@ -65,14 +150,6 @@ def run():
         ):
             return
 
-        # Keep this global for now; verify_cid.mjs likely imports multiformats
-        # outside the temporary npm project.
-        if not run_cmd(
-            ["npm", "install", "-g", "multiformats"],
-            label="npm install -g multiformats",
-        ):
-            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)
@@ -94,11 +171,13 @@ def run():
         add_stdout = (add_result.stdout or "").strip()
         add_stderr = (add_result.stderr or "").strip()
         add_details = f"{add_stdout}\n{add_stderr}".strip()
+        add_stdout_clean = strip_ansi(add_stdout)
+        add_details_clean = strip_ansi(add_details)
 
         if add_result.returncode != 0:
             fail(f"""
                 filecoin-pin add --network devnet {upload_dir} (exit={add_result.returncode})
-                {add_details}
+                {add_details_clean}
                 """.strip())
             return
 
@@ -106,11 +185,13 @@ def run():
         piece_cid = None
         piece_retrieval_urls = []
 
-        for line in add_stdout.splitlines():
+        for line in add_stdout_clean.splitlines():
             stripped = line.strip()
 
-            if root_cid is None and stripped.startswith("Root CID:"):
-                root_cid = stripped.split(":", 1)[1].strip()
+            if root_cid is None:
+                match = re.search(r"\broot CID:\s*(\S+)", stripped, re.IGNORECASE)
+                if match:
+                    root_cid = match.group(1)
 
             if piece_cid is None and stripped.startswith("Piece CID:"):
                 piece_cid = stripped.split(":", 1)[1].strip()
@@ -119,15 +200,18 @@ def run():
                 piece_retrieval_urls.append(stripped.split(":", 1)[1].strip())
 
         if not root_cid:
-            fail(f"Could not parse Root CID from output: {add_details}")
+            fail(f"Could not parse Root CID from output: {add_details_clean}")
             return
 
         if not piece_cid:
-            fail(f"Could not parse Piece CID from output: {add_details}")
+            fail(f"Could not parse Piece CID from output: {add_details_clean}")
             return
 
-        if not piece_retrieval_urls:
-            fail(f"Could not parse Piece Retrieval URLs from output: {add_details}")
+        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 = [
@@ -140,24 +224,11 @@ def run():
 
         for i, url in enumerate(root_retrieval_urls, start=1):
             file = ipfs_dir / f"{root_cid}_{i}.bin"
-            download_url = f"{url}?format=raw"
-
-            try:
-                with urlopen(download_url, timeout=60) 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:
-                fail(f"Failed to download {download_url}: {e}")
-                return
-
-            if not run_cmd(
-                ["node", str(scripts_dir / "verify_cid.mjs"), root_cid, str(file)],
-                label=f"node {scripts_dir / 'verify_cid.mjs'} {root_cid} {file} ({download_url})",
-            ):
+            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__":
diff --git a/scripts/verify_cid.mjs b/scripts/verify_cid.mjs
deleted file mode 100644
index cbb35cb..0000000
--- a/scripts/verify_cid.mjs
+++ /dev/null
@@ -1,21 +0,0 @@
-import { readFileSync } from "node:fs";
-import { CID } from "multiformats/cid";
-import { sha256 } from "multiformats/hashes/sha2";
-
-const [cidString, filePath] = process.argv.slice(2);
-
-if (!cidString || !filePath) {
-  console.error("usage: node verify.mjs <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);
-}

From 0e1ec0fd46fb6c16f27420c69bd0fdaccad23aee Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 19:39:21 +0200
Subject: [PATCH 12/21] test: add local scenario runner

---
 scripts/run-local-scenarios.py | 241 +++++++++++++++++++++++++++++++++
 1 file changed, 241 insertions(+)
 create mode 100755 scripts/run-local-scenarios.py

diff --git a/scripts/run-local-scenarios.py b/scripts/run-local-scenarios.py
new file mode 100755
index 0000000..ff2c5bf
--- /dev/null
+++ b/scripts/run-local-scenarios.py
@@ -0,0 +1,241 @@
+#!/usr/bin/env python3
+"""Run selected scenario tests against a locally started foc-devnet.
+
+Separately installed dependencies:
+  - Docker with the current non-root user able to run Docker commands.
+  - Rust toolchain with cargo, used to build the foc-devnet CLI.
+  - git, node, pnpm, curl, tar, and sudo.
+  - Python 3.11+ for this runner and the scenario scripts.
+  - /etc/hosts entry for host.docker.internal. If it is missing, this runner
+    tries to add "127.0.0.1 host.docker.internal" with sudo.
+
+Dependencies managed by scripts/setup-scenarios-prerequisites.sh:
+  - Foundry cast/forge under ~/.foc-devnet/artifacts/foundry/bin.
+  - Python 3.11.10 via pyenv for cqlsh.
+  - Apache Cassandra cqlsh under ~/.foc-devnet/artifacts/cassandra.
+
+Examples:
+  scripts/run-local-scenarios.py test_containers test_basic_balances
+  scripts/run-local-scenarios.py --all
+  scripts/run-local-scenarios.py --clean --keep-running test_multi_copy_upload
+
+The setup and teardown steps are intentionally kept in separate functions so
+they can be moved into shared local-dev helpers later.
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+import shlex
+import subprocess
+import sys
+import time
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(REPO_ROOT))
+
+from scenarios.report import write_report  # noqa: E402
+from scenarios.run import ORDER, _print_summary, _run_single_test  # noqa: E402
+
+DEFAULT_BINARY = REPO_ROOT / "target" / "release" / "foc-devnet"
+SCENARIO_TIMEOUTS = dict(ORDER)
+
+
+def run_command(cmd: list[str], *, env: dict[str, str] | None = None) -> None:
+    print(f"+ {shlex.join(cmd)}", flush=True)
+    subprocess.run(cmd, cwd=REPO_ROOT, env=env, check=True)
+
+
+def ensure_host_docker_internal() -> None:
+    hosts = Path("/etc/hosts").read_text()
+    if "host.docker.internal" in hosts:
+        return
+
+    run_command(
+        [
+            "sudo",
+            "sh",
+            "-c",
+            "printf '\\n127.0.0.1 host.docker.internal\\n' >> /etc/hosts",
+        ]
+    )
+
+
+def install_scenario_prerequisites() -> None:
+    run_command([str(REPO_ROOT / "scripts" / "setup-scenarios-prerequisites.sh")])
+
+
+def build_foc_devnet() -> Path:
+    run_command(["cargo", "build", "--release"])
+    return DEFAULT_BINARY
+
+
+def clean_devnet(binary: Path, *, all_config: bool) -> None:
+    cmd = [str(binary), "clean"]
+    if all_config:
+        cmd.append("--all")
+    run_command(cmd)
+
+
+def init_devnet(binary: Path, init_flags: str) -> None:
+    run_command([str(binary), "init", *shlex.split(init_flags)])
+
+
+def build_components(binary: Path) -> None:
+    run_command([str(binary), "build", "lotus"])
+    run_command([str(binary), "build", "curio"])
+
+
+def start_devnet(binary: Path, *, parallel: bool) -> None:
+    cmd = [str(binary), "start"]
+    if parallel:
+        cmd.append("--parallel")
+    run_command(cmd)
+
+
+def stop_devnet(binary: Path) -> None:
+    run_command([str(binary), "stop"])
+
+
+def normalize_scenario_name(name: str) -> str:
+    return Path(name).stem
+
+
+def select_scenarios(names: list[str], *, all_scenarios: bool) -> list[tuple[str, int]]:
+    if all_scenarios:
+        return ORDER
+
+    if not names:
+        raise SystemExit("Pass at least one scenario name, or use --all.")
+
+    selected = {normalize_scenario_name(name) for name in names}
+    unknown = sorted(selected - set(SCENARIO_TIMEOUTS))
+    if unknown:
+        known = ", ".join(name for name, _ in ORDER)
+        raise SystemExit(f"Unknown scenario(s): {', '.join(unknown)}. Known: {known}")
+
+    return [(name, timeout) for name, timeout in ORDER if name in selected]
+
+
+def run_selected_scenarios(
+    scenarios: list[tuple[str, int]], env: dict[str, str]
+) -> int:
+    os.environ.update(env)
+    started = time.time()
+    results = []
+
+    for name, timeout in scenarios:
+        scenario_file = REPO_ROOT / "scenarios" / f"{name}.py"
+        result = _run_single_test(str(scenario_file), name, timeout)
+        results.append(result)
+
+    elapsed = int(time.time() - started)
+    _print_summary(results, elapsed)
+    print(f"Report: {write_report(results=results, elapsed=elapsed)}")
+    return 0 if all(result.is_passed for result in results) else 1
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="Set up a local foc-devnet, run selected scenarios, then stop it."
+    )
+    parser.add_argument("scenarios", nargs="*", help="Scenario names to run.")
+    parser.add_argument("--all", action="store_true", help="Run all scenarios.")
+    parser.add_argument(
+        "--init-flags",
+        default="",
+        help="Extra flags forwarded to foc-devnet init, parsed with shell syntax.",
+    )
+    parser.add_argument(
+        "--binary",
+        type=Path,
+        default=None,
+        help="Use an existing foc-devnet binary instead of building target/release.",
+    )
+    parser.add_argument(
+        "--clean",
+        action="store_true",
+        help="Run foc-devnet clean before init, preserving config.toml.",
+    )
+    parser.add_argument(
+        "--clean-all",
+        action="store_true",
+        help="Run foc-devnet clean --all before init.",
+    )
+    parser.add_argument(
+        "--skip-prerequisites",
+        action="store_true",
+        help="Skip scripts/setup-scenarios-prerequisites.sh.",
+    )
+    parser.add_argument("--skip-init", action="store_true", help="Skip init.")
+    parser.add_argument(
+        "--skip-component-build",
+        action="store_true",
+        help="Skip foc-devnet build lotus/curio.",
+    )
+    parser.add_argument("--skip-start", action="store_true", help="Skip start.")
+    parser.add_argument(
+        "--no-parallel-start",
+        action="store_true",
+        help="Start without --parallel.",
+    )
+    parser.add_argument(
+        "--keep-running",
+        action="store_true",
+        help="Do not run foc-devnet stop after scenarios.",
+    )
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = parse_args()
+    selected = select_scenarios(args.scenarios, all_scenarios=args.all)
+    env = {**os.environ, "SCENARIO_RUN_TYPE": "local-selected"}
+    binary = args.binary.resolve() if args.binary else None
+    needs_binary = any(
+        [
+            args.clean,
+            args.clean_all,
+            not args.skip_init,
+            not args.skip_component_build,
+            not args.skip_start,
+        ]
+    )
+    started = False
+
+    try:
+        if not args.skip_prerequisites:
+            install_scenario_prerequisites()
+
+        ensure_host_docker_internal()
+
+        if binary is None and needs_binary:
+            binary = build_foc_devnet()
+
+        if args.clean or args.clean_all:
+            assert binary is not None
+            clean_devnet(binary, all_config=args.clean_all)
+
+        if not args.skip_init:
+            assert binary is not None
+            init_devnet(binary, args.init_flags)
+
+        if not args.skip_component_build:
+            assert binary is not None
+            build_components(binary)
+
+        if not args.skip_start:
+            assert binary is not None
+            started = True
+            start_devnet(binary, parallel=not args.no_parallel_start)
+
+        return run_selected_scenarios(selected, env)
+    finally:
+        if started and not args.keep_running and binary is not None:
+            stop_devnet(binary)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

From fa54bbdc81077360edbe0a42dc04885c990861ac Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 20:07:59 +0200
Subject: [PATCH 13/21] test: retry filecoin-pin add

---
 scenarios/run.py                    |  2 +-
 scenarios/test_multi_copy_upload.py | 65 +++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/scenarios/run.py b/scenarios/run.py
index 38ebde8..9b7c815 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -27,7 +27,7 @@
     ("test_containers", 5),
     ("test_basic_balances", 10),
     ("test_storage_e2e", 100),
-    ("test_multi_copy_upload", 300),
+    ("test_multi_copy_upload", 420),
     ("test_caching_subsystem", 200),
 ]
 
diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 0878ed1..39c52f1 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -26,6 +26,9 @@
 RAND_FILE_NAME = "random_file"
 RAND_FILE_SIZE = 20 * 1024 * 1024
 RAND_FILE_SEED = 42
+ADD_DEADLINE_SECS = 120
+ADD_INTERVAL_SECS = 10
+ADD_ATTEMPT_TIMEOUT_SECS = 75
 RETRIEVAL_DEADLINE_SECS = 90
 RETRIEVAL_INTERVAL_SECS = 5
 RETRIEVAL_REQUEST_TIMEOUT_SECS = 10
@@ -58,6 +61,53 @@ 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 ""
+
+
+def run_filecoin_pin_add(filecoin_pin_bin: Path, upload_dir: Path):
+    cmd = [str(filecoin_pin_bin), "add", "--network", "devnet", 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}")
+
+        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"(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:
@@ -163,13 +213,13 @@ def run():
 
         filecoin_pin_bin = npm_dir / "node_modules" / ".bin" / "filecoin-pin"
 
-        add_result = subprocess.run(
-            [str(filecoin_pin_bin), "add", "--network", "devnet", str(upload_dir)],
-            text=True,
-            capture_output=True,
-        )
-        add_stdout = (add_result.stdout or "").strip()
-        add_stderr = (add_result.stderr or "").strip()
+        add_result = run_filecoin_pin_add(filecoin_pin_bin, upload_dir)
+        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 = f"{add_stdout}\n{add_stderr}".strip()
         add_stdout_clean = strip_ansi(add_stdout)
         add_details_clean = strip_ansi(add_details)
@@ -177,6 +227,7 @@ def run():
         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

From b5b7fb6583ceb30e948e7758f6578ae036e1a605 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Sun, 3 May 2026 22:12:32 +0200
Subject: [PATCH 14/21] fix: rebuild stale builder image for host uid

---
 src/commands/build/docker.rs | 48 +++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/commands/build/docker.rs b/src/commands/build/docker.rs
index 078cb97..c806b29 100644
--- a/src/commands/build/docker.rs
+++ b/src/commands/build/docker.rs
@@ -19,7 +19,7 @@ pub fn build_builder_image(dockerfile_dir: &str) -> Result<String, Box<dyn std::
     let image_tag = crate::constants::BUILDER_DOCKER_IMAGE;
 
     // Check if image already exists in Docker
-    if image_exists(image_tag)? {
+    if image_exists(image_tag)? && builder_image_matches_current_user(image_tag)? {
         info!("Docker image {} already exists, skipping build", image_tag);
     } else {
         info!("Building Docker image for builder...");
@@ -29,6 +29,52 @@ pub fn build_builder_image(dockerfile_dir: &str) -> Result<String, Box<dyn std::
     Ok(image_tag.to_string())
 }
 
+fn builder_image_matches_current_user(image_tag: &str) -> Result<bool, Box<dyn std::error::Error>> {
+    let uid = get_current_uid()?;
+    let gid = get_current_gid()?;
+    let output = std::process::Command::new("docker")
+        .args([
+            "run",
+            "--rm",
+            "--entrypoint",
+            "getent",
+            image_tag,
+            "passwd",
+            "foc-user",
+        ])
+        .output()?;
+
+    if !output.status.success() {
+        info!(
+            "Docker image {} does not expose foc-user metadata, rebuilding",
+            image_tag
+        );
+        return Ok(false);
+    }
+
+    let passwd_entry = String::from_utf8_lossy(&output.stdout);
+    let fields: Vec<&str> = passwd_entry.trim().split(':').collect();
+    if fields.len() < 4 {
+        info!(
+            "Docker image {} has malformed foc-user metadata, rebuilding",
+            image_tag
+        );
+        return Ok(false);
+    }
+
+    let image_uid = fields[2];
+    let image_gid = fields[3];
+    if image_uid == uid && image_gid == gid {
+        return Ok(true);
+    }
+
+    info!(
+        "Docker image {} was built for UID:GID {}:{}, current user is {}:{}, rebuilding",
+        image_tag, image_uid, image_gid, uid, gid
+    );
+    Ok(false)
+}
+
 /// Build Docker image from Dockerfile.
 pub fn build_image_from_dockerfile(
     dockerfile_dir: &str,

From c5f532e57d12b6e4aef562825bb7b6e28d1aebd0 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 00:48:22 +0200
Subject: [PATCH 15/21] fix: stabilize local multi-copy scenario

---
 build.rs                                      |  11 +-
 contracts/MockUSDFC/bytecode/MockUSDFC.bin    |   1 +
 contracts/MockUSDFC/foundry.lock              |  15 +-
 contracts/MockUSDFC/remappings.txt            |   2 -
 contracts/MockUSDFC/script/Deploy.s.sol       |  26 +--
 contracts/MockUSDFC/script/Verify.s.sol       | 102 +-----------
 contracts/MockUSDFC/src/MockUSDFC.sol         | 111 ++++++++++++-
 contracts/Multicall3/bytecode/Multicall3.bin  |   1 +
 scenarios/run.py                              |   2 +-
 scenarios/test_multi_copy_upload.py           | 150 ++++++++++++++----
 scripts/run-local-scenarios.py                |  68 ++++++++
 src/commands/build/docker.rs                  |   7 +-
 src/commands/build/exec.rs                    |  34 +++-
 src/commands/start/curio/verification.rs      |   7 +-
 .../start/multicall3_deploy/deployment.rs     |  53 +++----
 src/commands/start/usdfc_deploy/deployment.rs |  41 ++---
 .../start/usdfc_deploy/foundry_setup.rs       | 120 +-------------
 .../start/usdfc_deploy/verification.rs        |  40 ++++-
 src/commands/start/yugabyte/mod.rs            |   4 +-
 19 files changed, 426 insertions(+), 369 deletions(-)
 create mode 100644 contracts/MockUSDFC/bytecode/MockUSDFC.bin
 create mode 100644 contracts/Multicall3/bytecode/Multicall3.bin

diff --git a/build.rs b/build.rs
index 11289ff..1c19402 100644
--- a/build.rs
+++ b/build.rs
@@ -91,7 +91,16 @@ fn generate_mockusdfc_archive() {
 
     // Create tar.gz archive in contracts/ directory
     let output = Command::new("tar")
-        .args(["-czf", "artifacts/MockUSDFC.tar.gz", "contracts/MockUSDFC"])
+        .env("COPYFILE_DISABLE", "1")
+        .args([
+            "--exclude=._*",
+            "--exclude=*/._*",
+            "--exclude=.DS_Store",
+            "--exclude=*/.DS_Store",
+            "-czf",
+            "artifacts/MockUSDFC.tar.gz",
+            "contracts/MockUSDFC",
+        ])
         .current_dir(".")
         .output();
 
diff --git a/contracts/MockUSDFC/bytecode/MockUSDFC.bin b/contracts/MockUSDFC/bytecode/MockUSDFC.bin
new file mode 100644
index 0000000..e6db165
--- /dev/null
+++ b/contracts/MockUSDFC/bytecode/MockUSDFC.bin
@@ -0,0 +1 @@
+0x608060405234801561000f575f80fd5b50604051610a94380380610a9483398101604081905261002e9161011d565b610038338261003e565b50610159565b6001600160a01b0382166100985760405162461bcd60e51b815260206004820152601b60248201527f45524332303a206d696e7420746f207a65726f20616464726573730000000000604482015260640160405180910390fd5b805f808282546100a89190610134565b90915550506001600160a01b0382165f90815260016020526040812080548392906100d4908490610134565b90915550506040518181526001600160a01b038316905f907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9060200160405180910390a35050565b5f6020828403121561012d575f80fd5b5051919050565b8082018082111561015357634e487b7160e01b5f52601160045260245ffd5b92915050565b61092e806101665f395ff3fe608060405234801561000f575f80fd5b50600436106100a6575f3560e01c806340c10f191161006e57806340c10f191461013757806370a082311461014c57806395d89b41146101745780639dc29fac14610195578063a9059cbb146101a8578063dd62ed3e146101bb575f80fd5b806306fdde03146100aa578063095ea7b3146100e157806318160ddd1461010457806323b872dd14610115578063313ce56714610128575b5f80fd5b6040805180820190915260098152684d6f636b205553444360b81b60208201525b6040516100d891906107a6565b60405180910390f35b6100f46100ef36600461080c565b6101f3565b60405190151581526020016100d8565b5f545b6040519081526020016100d8565b6100f4610123366004610834565b610209565b604051601281526020016100d8565b61014a61014536600461080c565b6102a4565b005b61010761015a36600461086d565b6001600160a01b03165f9081526001602052604090205490565b604080518082019091526005815264555344464360d81b60208201526100cb565b61014a6101a336600461080c565b6102b2565b6100f46101b636600461080c565b6102bc565b6101076101c936600461088d565b6001600160a01b039182165f90815260026020908152604080832093909416825291909152205490565b5f6101ff3384846102c8565b5060015b92915050565b6001600160a01b0383165f908152600260209081526040808320338452909152812054828110156102815760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064015b60405180910390fd5b61028e85338584036102c8565b6102998585856103d5565b506001949350505050565b6102ae8282610592565b5050565b6102ae828261066d565b5f6101ff3384846103d5565b6001600160a01b03831661031e5760405162461bcd60e51b815260206004820181905260248201527f45524332303a20617070726f76652066726f6d207a65726f20616464726573736044820152606401610278565b6001600160a01b0382166103745760405162461bcd60e51b815260206004820152601e60248201527f45524332303a20617070726f766520746f207a65726f206164647265737300006044820152606401610278565b6001600160a01b038381165f8181526002602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6001600160a01b0383166104355760405162461bcd60e51b815260206004820152602160248201527f45524332303a207472616e736665722066726f6d207a65726f206164647265736044820152607360f81b6064820152608401610278565b6001600160a01b03821661048b5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a207472616e7366657220746f207a65726f2061646472657373006044820152606401610278565b6001600160a01b0383165f90815260016020526040902054818110156105025760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610278565b6001600160a01b038085165f908152600160205260408082208585039055918516815290812080548492906105389084906108d2565b92505081905550826001600160a01b0316846001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8460405161058491815260200190565b60405180910390a350505050565b6001600160a01b0382166105e85760405162461bcd60e51b815260206004820152601b60248201527f45524332303a206d696e7420746f207a65726f206164647265737300000000006044820152606401610278565b805f808282546105f891906108d2565b90915550506001600160a01b0382165f90815260016020526040812080548392906106249084906108d2565b90915550506040518181526001600160a01b038316905f907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9060200160405180910390a35050565b6001600160a01b0382166106c35760405162461bcd60e51b815260206004820152601d60248201527f45524332303a206275726e2066726f6d207a65726f20616464726573730000006044820152606401610278565b6001600160a01b0382165f90815260016020526040902054818110156107365760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610278565b6001600160a01b0383165f9081526001602052604081208383039055805483919081906107649084906108e5565b90915550506040518281525f906001600160a01b038516907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906020016103c8565b5f6020808352835180828501525f5b818110156107d1578581018301518582016040015282016107b5565b505f604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b0381168114610807575f80fd5b919050565b5f806040838503121561081d575f80fd5b610826836107f1565b946020939093013593505050565b5f805f60608486031215610846575f80fd5b61084f846107f1565b925061085d602085016107f1565b9150604084013590509250925092565b5f6020828403121561087d575f80fd5b610886826107f1565b9392505050565b5f806040838503121561089e575f80fd5b6108a7836107f1565b91506108b5602084016107f1565b90509250929050565b634e487b7160e01b5f52601160045260245ffd5b80820180821115610203576102036108be565b81810381811115610203576102036108be56fea2646970667358221220f3ab1b3f8a138b152ac6d256f430fb9e29e04016aeca677b8c8e6aa7315267c864736f6c63430008140033
diff --git a/contracts/MockUSDFC/foundry.lock b/contracts/MockUSDFC/foundry.lock
index c805ad9..0967ef4 100644
--- a/contracts/MockUSDFC/foundry.lock
+++ b/contracts/MockUSDFC/foundry.lock
@@ -1,14 +1 @@
-{
-  "lib/forge-std": {
-    "tag": {
-      "name": "v1.12.0",
-      "rev": "7117c90c8cf6c68e5acce4f09a6b24715cea4de6"
-    }
-  },
-  "lib/openzeppelin-contracts": {
-    "tag": {
-      "name": "v5.0.0",
-      "rev": "932fddf69a699a9a80fd2396fd1a2ab91cdda123"
-    }
-  }
-}
\ No newline at end of file
+{}
diff --git a/contracts/MockUSDFC/remappings.txt b/contracts/MockUSDFC/remappings.txt
index 90b2e67..e69de29 100644
--- a/contracts/MockUSDFC/remappings.txt
+++ b/contracts/MockUSDFC/remappings.txt
@@ -1,2 +0,0 @@
-@openzeppelin/=lib/openzeppelin-contracts/
-forge-std/=lib/forge-std/src/
diff --git a/contracts/MockUSDFC/script/Deploy.s.sol b/contracts/MockUSDFC/script/Deploy.s.sol
index 4bf6a2d..affa8d1 100644
--- a/contracts/MockUSDFC/script/Deploy.s.sol
+++ b/contracts/MockUSDFC/script/Deploy.s.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "forge-std/Script.sol";
 import "../src/MockUSDFC.sol";
 
 /**
@@ -14,32 +13,11 @@ import "../src/MockUSDFC.sol";
  *     --private-key <PRIVATE_KEY> \
  *     --broadcast
  */
-contract DeployMockUSDFC is Script {
+contract DeployMockUSDFC {
     // Default initial supply: 1,000,000 tokens with 18 decimals
     uint256 constant DEFAULT_INITIAL_SUPPLY = 1_000_000 * 10**18;
 
     function run() external returns (MockUSDFC) {
-        // Get initial supply from environment variable or use default
-        uint256 initialSupply = vm.envOr("INITIAL_SUPPLY", DEFAULT_INITIAL_SUPPLY);
-
-        console.log("Deploying MockUSDFC with initial supply:", initialSupply);
-        console.log("Deployer address:", msg.sender);
-
-        // Start broadcast with a high gas limit for FEVM
-        vm.startBroadcast();
-
-        // Deploy contract
-        MockUSDFC token = new MockUSDFC(initialSupply);
-
-        vm.stopBroadcast();
-
-        console.log("MockUSDFC deployed at:", address(token));
-        console.log("Token name:", token.name());
-        console.log("Token symbol:", token.symbol());
-        console.log("Token decimals:", token.decimals());
-        console.log("Total supply:", token.totalSupply());
-        console.log("Deployer balance:", token.balanceOf(msg.sender));
-
-        return token;
+        return new MockUSDFC(DEFAULT_INITIAL_SUPPLY);
     }
 }
diff --git a/contracts/MockUSDFC/script/Verify.s.sol b/contracts/MockUSDFC/script/Verify.s.sol
index 92f2d45..060dbaf 100644
--- a/contracts/MockUSDFC/script/Verify.s.sol
+++ b/contracts/MockUSDFC/script/Verify.s.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "forge-std/Script.sol";
 import "../src/MockUSDFC.sol";
 
 /**
@@ -14,115 +13,18 @@ import "../src/MockUSDFC.sol";
  *     --private-key <PRIVATE_KEY> \
  *     --sig "run(address)" <CONTRACT_ADDRESS>
  */
-contract VerifyMockUSDFC is Script {
-    function run(address tokenAddress) external {
+contract VerifyMockUSDFC {
+    function run(address tokenAddress) external view {
         require(tokenAddress != address(0), "Invalid token address");
 
         MockUSDFC token = MockUSDFC(tokenAddress);
 
-        console.log("=== Verifying MockUSDFC at", tokenAddress, "===");
-        console.log("");
-
-        // Test 1: Read basic token information
-        console.log("1. Reading token metadata:");
         string memory name = token.name();
         string memory symbol = token.symbol();
         uint8 decimals = token.decimals();
-        uint256 totalSupply = token.totalSupply();
 
-        console.log("   Name:", name);
-        console.log("   Symbol:", symbol);
-        console.log("   Decimals:", decimals);
-        console.log("   Total Supply:", totalSupply);
-        
         require(keccak256(bytes(name)) == keccak256(bytes("Mock USDC")), "Invalid name");
         require(keccak256(bytes(symbol)) == keccak256(bytes("USDFC")), "Invalid symbol");
         require(decimals == 18, "Invalid decimals");
-        console.log("   [OK] Metadata verification passed");
-        console.log("");
-
-        // Test 2: Check deployer balance
-        console.log("2. Checking deployer balance:");
-        address deployer = msg.sender;
-        uint256 deployerBalance = token.balanceOf(deployer);
-        console.log("   Deployer:", deployer);
-        console.log("   Balance:", deployerBalance);
-        console.log("   [OK] Balance check passed");
-        console.log("");
-
-        // Test 3: Test transfer (if we have balance)
-        if (deployerBalance > 0) {
-            console.log("3. Testing transfer:");
-            address recipient = address(0x1234567890123456789012345678901234567890);
-            uint256 transferAmount = 1000 * 10**18; // 1000 tokens
-
-            if (deployerBalance >= transferAmount) {
-                vm.startBroadcast();
-                token.transfer(recipient, transferAmount);
-                vm.stopBroadcast();
-
-                uint256 recipientBalance = token.balanceOf(recipient);
-                console.log("   Transferred", transferAmount, "to", recipient);
-                console.log("   Recipient balance:", recipientBalance);
-                require(recipientBalance == transferAmount, "Transfer failed");
-                console.log("   [OK] Transfer test passed");
-            } else {
-                console.log("   [WARN] Insufficient balance for transfer test");
-            }
-        } else {
-            console.log("3. Skipping transfer test (no balance)");
-        }
-        console.log("");
-
-        // Test 4: Test mint function
-        console.log("4. Testing mint function:");
-        address mintRecipient = address(0x9876543210987654321098765432109876543210);
-        uint256 mintAmount = 500 * 10**18; // 500 tokens
-
-        uint256 totalSupplyBefore = token.totalSupply();
-        
-        vm.startBroadcast();
-        token.mint(mintRecipient, mintAmount);
-        vm.stopBroadcast();
-
-        uint256 mintRecipientBalance = token.balanceOf(mintRecipient);
-        uint256 totalSupplyAfter = token.totalSupply();
-
-        console.log("   Minted", mintAmount, "to", mintRecipient);
-        console.log("   Recipient balance:", mintRecipientBalance);
-        console.log("   Total supply before:", totalSupplyBefore);
-        console.log("   Total supply after:", totalSupplyAfter);
-        
-        require(mintRecipientBalance == mintAmount, "Mint failed");
-        require(totalSupplyAfter == totalSupplyBefore + mintAmount, "Total supply not updated");
-        console.log("   [OK] Mint test passed");
-        console.log("");
-
-        // Test 5: Test burn function
-        console.log("5. Testing burn function:");
-        uint256 burnAmount = 100 * 10**18; // 100 tokens
-
-        totalSupplyBefore = token.totalSupply();
-        uint256 mintRecipientBalanceBefore = token.balanceOf(mintRecipient);
-
-        vm.startBroadcast();
-        token.burn(mintRecipient, burnAmount);
-        vm.stopBroadcast();
-
-        uint256 mintRecipientBalanceAfter = token.balanceOf(mintRecipient);
-        totalSupplyAfter = token.totalSupply();
-
-        console.log("   Burned", burnAmount, "from", mintRecipient);
-        console.log("   Balance before:", mintRecipientBalanceBefore);
-        console.log("   Balance after:", mintRecipientBalanceAfter);
-        console.log("   Total supply before:", totalSupplyBefore);
-        console.log("   Total supply after:", totalSupplyAfter);
-        
-        require(mintRecipientBalanceAfter == mintRecipientBalanceBefore - burnAmount, "Burn failed");
-        require(totalSupplyAfter == totalSupplyBefore - burnAmount, "Total supply not updated");
-        console.log("   [OK] Burn test passed");
-        console.log("");
-
-        console.log("=== All verifications passed! ===");
     }
 }
diff --git a/contracts/MockUSDFC/src/MockUSDFC.sol b/contracts/MockUSDFC/src/MockUSDFC.sol
index 03bd08d..c503aff 100644
--- a/contracts/MockUSDFC/src/MockUSDFC.sol
+++ b/contracts/MockUSDFC/src/MockUSDFC.sol
@@ -1,29 +1,77 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-
 /**
  * @title MockUSDFC
  * @dev Mock USDC token for testing FOC warm storage services
  */
-contract MockUSDFC is ERC20 {
-    uint8 private _decimals;
+contract MockUSDFC {
+    string private constant _NAME = "Mock USDC";
+    string private constant _SYMBOL = "USDFC";
+    uint8 private constant _DECIMALS = 18;
+
+    uint256 private _totalSupply;
+    mapping(address account => uint256) private _balances;
+    mapping(address owner => mapping(address spender => uint256)) private _allowances;
+
+    event Transfer(address indexed from, address indexed to, uint256 value);
+    event Approval(address indexed owner, address indexed spender, uint256 value);
 
     /**
      * @dev Constructor that gives msg.sender all of initial supply.
      * @param initialSupply The initial supply of tokens (in wei, accounting for decimals)
      */
-    constructor(uint256 initialSupply) ERC20("Mock USDC", "USDFC") {
-        _decimals = 18;
+    constructor(uint256 initialSupply) {
         _mint(msg.sender, initialSupply);
     }
 
+    function name() public pure returns (string memory) {
+        return _NAME;
+    }
+
+    function symbol() public pure returns (string memory) {
+        return _SYMBOL;
+    }
+
     /**
      * @dev Returns the number of decimals used for token amounts.
      */
-    function decimals() public view virtual override returns (uint8) {
-        return _decimals;
+    function decimals() public pure returns (uint8) {
+        return _DECIMALS;
+    }
+
+    function totalSupply() public view returns (uint256) {
+        return _totalSupply;
+    }
+
+    function balanceOf(address account) public view returns (uint256) {
+        return _balances[account];
+    }
+
+    function allowance(address owner, address spender) public view returns (uint256) {
+        return _allowances[owner][spender];
+    }
+
+    function transfer(address to, uint256 amount) external returns (bool) {
+        _transfer(msg.sender, to, amount);
+        return true;
+    }
+
+    function approve(address spender, uint256 amount) external returns (bool) {
+        _approve(msg.sender, spender, amount);
+        return true;
+    }
+
+    function transferFrom(address from, address to, uint256 amount) external returns (bool) {
+        uint256 currentAllowance = _allowances[from][msg.sender];
+        require(currentAllowance >= amount, "ERC20: insufficient allowance");
+
+        unchecked {
+            _approve(from, msg.sender, currentAllowance - amount);
+        }
+
+        _transfer(from, to, amount);
+        return true;
     }
 
     /**
@@ -43,4 +91,51 @@ contract MockUSDFC is ERC20 {
     function burn(address from, uint256 amount) external {
         _burn(from, amount);
     }
+
+    function _transfer(address from, address to, uint256 amount) internal {
+        require(from != address(0), "ERC20: transfer from zero address");
+        require(to != address(0), "ERC20: transfer to zero address");
+
+        uint256 fromBalance = _balances[from];
+        require(fromBalance >= amount, "ERC20: transfer amount exceeds balance");
+
+        unchecked {
+            _balances[from] = fromBalance - amount;
+        }
+        _balances[to] += amount;
+
+        emit Transfer(from, to, amount);
+    }
+
+    function _mint(address to, uint256 amount) internal {
+        require(to != address(0), "ERC20: mint to zero address");
+
+        _totalSupply += amount;
+        _balances[to] += amount;
+
+        emit Transfer(address(0), to, amount);
+    }
+
+    function _burn(address from, uint256 amount) internal {
+        require(from != address(0), "ERC20: burn from zero address");
+
+        uint256 fromBalance = _balances[from];
+        require(fromBalance >= amount, "ERC20: burn amount exceeds balance");
+
+        unchecked {
+            _balances[from] = fromBalance - amount;
+        }
+        _totalSupply -= amount;
+
+        emit Transfer(from, address(0), amount);
+    }
+
+    function _approve(address owner, address spender, uint256 amount) internal {
+        require(owner != address(0), "ERC20: approve from zero address");
+        require(spender != address(0), "ERC20: approve to zero address");
+
+        _allowances[owner][spender] = amount;
+
+        emit Approval(owner, spender, amount);
+    }
 }
diff --git a/contracts/Multicall3/bytecode/Multicall3.bin b/contracts/Multicall3/bytecode/Multicall3.bin
new file mode 100644
index 0000000..8566bbc
--- /dev/null
+++ b/contracts/Multicall3/bytecode/Multicall3.bin
@@ -0,0 +1 @@
+0x608060405234801561001057600080fd5b50610ee0806100206000396000f3fe6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220ff9f02f90192d2ca6e403c5f20b79cd150c47b6fff476c3e6c479e973409984264736f6c634300080c0033
diff --git a/scenarios/run.py b/scenarios/run.py
index 9b7c815..c81fa57 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -27,7 +27,7 @@
     ("test_containers", 5),
     ("test_basic_balances", 10),
     ("test_storage_e2e", 100),
-    ("test_multi_copy_upload", 420),
+    ("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
index 39c52f1..30b8240 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -26,12 +26,13 @@
 RAND_FILE_NAME = "random_file"
 RAND_FILE_SIZE = 20 * 1024 * 1024
 RAND_FILE_SEED = 42
-ADD_DEADLINE_SECS = 120
+ADD_DEADLINE_SECS = 240
 ADD_INTERVAL_SECS = 10
-ADD_ATTEMPT_TIMEOUT_SECS = 75
+ADD_ATTEMPT_TIMEOUT_SECS = 180
 RETRIEVAL_DEADLINE_SECS = 90
 RETRIEVAL_INTERVAL_SECS = 5
 RETRIEVAL_REQUEST_TIMEOUT_SECS = 10
+PROVIDER_IDS = (1, 2)
 VERIFY_CID_SCRIPT = """
 import { readFileSync } from "node:fs";
 import { CID } from "multiformats";
@@ -67,15 +68,74 @@ def output_text(value) -> str:
     return value or ""
 
 
-def run_filecoin_pin_add(filecoin_pin_bin: Path, upload_dir: Path):
-    cmd = [str(filecoin_pin_bin), "add", "--network", "devnet", str(upload_dir)]
+def patch_synapse_core_streaming_upload(npm_dir: Path) -> bool:
+    """Patch the temporary dependency tree for Node's streaming fetch behavior."""
+    patched = False
+    replacements = {
+        """const headers = {
+        'Content-Type': 'application/octet-stream',
+        ...(size == null ? {} : { 'Content-Length': size.toString() }),
+    };""": """const headers = {
+        'Content-Type': 'application/octet-stream',
+    };""",
+    }
+
+    candidates = [
+        npm_dir
+        / "node_modules"
+        / "@filoz"
+        / "synapse-core"
+        / "dist"
+        / "src"
+        / "sp"
+        / "sp.js",
+        npm_dir
+        / "node_modules"
+        / "@filoz"
+        / "synapse-core"
+        / "dist"
+        / "src"
+        / "sp"
+        / "upload-streaming.js",
+    ]
+
+    for candidate in candidates:
+        if not candidate.exists():
+            continue
+
+        text = candidate.read_text()
+        updated = text
+        for old, new in replacements.items():
+            updated = updated.replace(old, new)
+
+        if updated != text:
+            candidate.write_text(updated)
+            patched = True
+
+    return patched
+
+
+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}")
+        info(f"filecoin-pin add attempt {attempt} ({label})")
 
         try:
             result = subprocess.run(
@@ -98,7 +158,7 @@ def run_filecoin_pin_add(filecoin_pin_bin: Path, upload_dir: Path):
         add_details = strip_ansi(f"{add_stdout}\n{add_stderr}".strip())
         info(
             "filecoin-pin add failed; retrying if time remains "
-            f"(attempt={attempt}, exit={result.returncode})"
+            f"(label={label}, attempt={attempt}, exit={result.returncode})"
         )
         if add_details:
             info(add_details[-1200:])
@@ -137,7 +197,7 @@ def download_and_verify(
                     "--eval",
                     VERIFY_CID_SCRIPT,
                     root_cid,
-                    str(file),
+                    str(file.resolve()),
                 ],
                 cwd=npm_dir,
                 text=True,
@@ -200,6 +260,11 @@ def run():
         ):
             return
 
+        if not patch_synapse_core_streaming_upload(npm_dir):
+            fail("Could not patch @filoz/synapse-core streaming upload")
+            return
+        info("Patched @filoz/synapse-core streaming upload in temp npm project")
+
         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)
@@ -213,35 +278,58 @@ def run():
 
         filecoin_pin_bin = npm_dir / "node_modules" / ".bin" / "filecoin-pin"
 
-        add_result = run_filecoin_pin_add(filecoin_pin_bin, upload_dir)
-        if add_result is None:
-            fail(f"filecoin-pin add --network devnet {upload_dir} did not run")
-            return
+        add_results = []
+        for provider_id in PROVIDER_IDS:
+            label = f"provider {provider_id}"
+            add_result = run_filecoin_pin_add(
+                filecoin_pin_bin,
+                upload_dir,
+                ["--copies", "1", "--provider-ids", str(provider_id)],
+                label,
+            )
+            if add_result is None:
+                fail(
+                    f"filecoin-pin add --network devnet {upload_dir} ({label}) did not run"
+                )
+                return
 
-        add_stdout = output_text(add_result.stdout).strip()
-        add_stderr = output_text(add_result.stderr).strip()
-        add_details = f"{add_stdout}\n{add_stderr}".strip()
-        add_stdout_clean = strip_ansi(add_stdout)
-        add_details_clean = strip_ansi(add_details)
-
-        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 = output_text(add_result.stdout).strip()
+            add_stderr = output_text(add_result.stderr).strip()
+            add_details = f"{add_stdout}\n{add_stderr}".strip()
+            add_details_clean = strip_ansi(add_details)
+
+            if add_result.returncode != 0:
+                fail(f"""
+                    filecoin-pin add --network devnet --copies 1 --provider-ids {provider_id} {upload_dir} (exit={add_result.returncode})
+                    Retried for {ADD_DEADLINE_SECS}s.
+                    {add_details_clean}
+                    """.strip())
+                return
+
+            add_results.append(add_result)
+
+        add_stdout_clean = "\n".join(
+            strip_ansi(output_text(result.stdout).strip()) for result in add_results
+        )
+        add_details_clean = "\n".join(
+            strip_ansi(
+                f"{output_text(result.stdout).strip()}\n{output_text(result.stderr).strip()}".strip()
+            )
+            for result in add_results
+        )
 
         root_cid = None
         piece_cid = None
         piece_retrieval_urls = []
+        parsed_root_cids = set()
 
         for line in add_stdout_clean.splitlines():
             stripped = line.strip()
 
-            if root_cid is None:
-                match = re.search(r"\broot CID:\s*(\S+)", stripped, re.IGNORECASE)
-                if match:
+            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:"):
@@ -254,6 +342,12 @@ def run():
             fail(f"Could not parse Root CID from output: {add_details_clean}")
             return
 
+        if len(parsed_root_cids) != 1:
+            fail(
+                f"Provider uploads 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
@@ -270,7 +364,7 @@ def run():
             for url in piece_retrieval_urls
         ]
 
-        ipfs_dir = Path("ipfs")
+        ipfs_dir = Path("ipfs").resolve()
         ipfs_dir.mkdir(parents=True, exist_ok=True)
 
         for i, url in enumerate(root_retrieval_urls, start=1):
diff --git a/scripts/run-local-scenarios.py b/scripts/run-local-scenarios.py
index ff2c5bf..c38755c 100755
--- a/scripts/run-local-scenarios.py
+++ b/scripts/run-local-scenarios.py
@@ -18,6 +18,7 @@
   scripts/run-local-scenarios.py test_containers test_basic_balances
   scripts/run-local-scenarios.py --all
   scripts/run-local-scenarios.py --clean --keep-running test_multi_copy_upload
+  scripts/run-local-scenarios.py --skip-init test_multi_copy_upload
 
 The setup and teardown steps are intentionally kept in separate functions so
 they can be moved into shared local-dev helpers later.
@@ -41,6 +42,16 @@
 
 DEFAULT_BINARY = REPO_ROOT / "target" / "release" / "foc-devnet"
 SCENARIO_TIMEOUTS = dict(ORDER)
+RUNTIME_DOCKER_IMAGES = (
+    ("foc-lotus", REPO_ROOT / "docker" / "lotus" / "Dockerfile", REPO_ROOT),
+    ("foc-lotus-miner", REPO_ROOT / "docker" / "lotus-miner" / "Dockerfile", REPO_ROOT),
+    ("foc-curio", REPO_ROOT / "docker" / "curio" / "Dockerfile", REPO_ROOT),
+    (
+        "foc-yugabyte",
+        REPO_ROOT / "docker" / "yugabyte" / "Dockerfile",
+        Path.home() / ".foc-devnet" / "artifacts",
+    ),
+)
 
 
 def run_command(cmd: list[str], *, env: dict[str, str] | None = None) -> None:
@@ -48,6 +59,15 @@ def run_command(cmd: list[str], *, env: dict[str, str] | None = None) -> None:
     subprocess.run(cmd, cwd=REPO_ROOT, env=env, check=True)
 
 
+def command_succeeds(cmd: list[str]) -> bool:
+    return (
+        subprocess.run(
+            cmd, cwd=REPO_ROOT, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+        ).returncode
+        == 0
+    )
+
+
 def ensure_host_docker_internal() -> None:
     hosts = Path("/etc/hosts").read_text()
     if "host.docker.internal" in hosts:
@@ -83,6 +103,47 @@ def init_devnet(binary: Path, init_flags: str) -> None:
     run_command([str(binary), "init", *shlex.split(init_flags)])
 
 
+def image_exists(image: str) -> bool:
+    return command_succeeds(["docker", "image", "inspect", image])
+
+
+def build_runtime_docker_images() -> None:
+    uid = str(os.getuid())
+    gid = str(os.getgid())
+
+    for image, dockerfile, context in RUNTIME_DOCKER_IMAGES:
+        if image_exists(image):
+            print(
+                f"[INFO] Docker image {image} already exists, skipping build",
+                flush=True,
+            )
+            continue
+
+        if image == "foc-yugabyte" and not (context / "yugabyte").is_dir():
+            raise SystemExit(
+                f"Missing Yugabyte artifact directory: {context / 'yugabyte'}\n"
+                "Run foc-devnet init once, or provide the artifact before using --skip-init."
+            )
+
+        run_command(
+            [
+                "docker",
+                "build",
+                "--progress",
+                "plain",
+                "--build-arg",
+                f"USER_ID={uid}",
+                "--build-arg",
+                f"GROUP_ID={gid}",
+                "-f",
+                str(dockerfile),
+                "-t",
+                image,
+                str(context),
+            ]
+        )
+
+
 def build_components(binary: Path) -> None:
     run_command([str(binary), "build", "lotus"])
     run_command([str(binary), "build", "curio"])
@@ -170,6 +231,11 @@ def parse_args() -> argparse.Namespace:
         help="Skip scripts/setup-scenarios-prerequisites.sh.",
     )
     parser.add_argument("--skip-init", action="store_true", help="Skip init.")
+    parser.add_argument(
+        "--skip-image-build",
+        action="store_true",
+        help="Skip runtime Docker image builds normally covered by init.",
+    )
     parser.add_argument(
         "--skip-component-build",
         action="store_true",
@@ -221,6 +287,8 @@ def main() -> int:
         if not args.skip_init:
             assert binary is not None
             init_devnet(binary, args.init_flags)
+        elif not args.skip_image_build:
+            build_runtime_docker_images()
 
         if not args.skip_component_build:
             assert binary is not None
diff --git a/src/commands/build/docker.rs b/src/commands/build/docker.rs
index c806b29..65a4e02 100644
--- a/src/commands/build/docker.rs
+++ b/src/commands/build/docker.rs
@@ -3,7 +3,7 @@
 //! This module handles Docker image building and container execution for project builds.
 
 use crate::docker::{
-    build::build_docker_image,
+    build::build_image_with_args,
     core::{get_current_gid, get_current_uid, image_exists},
 };
 use crate::embedded_assets;
@@ -81,7 +81,10 @@ pub fn build_image_from_dockerfile(
     image_tag: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let dockerfile_path = "docker/builder/Dockerfile";
-    let output = build_docker_image(dockerfile_path, image_tag, dockerfile_dir)?;
+    let uid = get_current_uid()?;
+    let gid = get_current_gid()?;
+    let build_args = vec![("USER_ID", uid.as_str()), ("GROUP_ID", gid.as_str())];
+    let output = build_image_with_args(dockerfile_path, image_tag, dockerfile_dir, &build_args)?;
 
     if !output.status.success() {
         return Err("Failed to build Docker image".into());
diff --git a/src/commands/build/exec.rs b/src/commands/build/exec.rs
index 11d3699..8e5feed 100644
--- a/src/commands/build/exec.rs
+++ b/src/commands/build/exec.rs
@@ -6,6 +6,7 @@ use super::docker;
 use super::logging;
 use super::Project;
 use crate::docker::core::{get_current_gid, get_current_uid};
+use std::fs;
 use std::fs::OpenOptions;
 use std::io::{BufRead, BufReader, Write};
 use std::path::Path;
@@ -27,7 +28,7 @@ pub fn run_build_in_container(
 
     // Create log file for this build
     let log_path = logging::create_build_log_path()?;
-    fix_directory_ownership(
+    ensure_directory_writable(
         log_path
             .parent()
             .unwrap()
@@ -124,20 +125,41 @@ pub fn execute_build_process(
     Ok(())
 }
 
-/// Fix ownership of a directory to the current user.
+/// Ensure a directory is writable by the current user.
 ///
-/// This ensures the Docker container (running as current user) can access the directory.
-fn fix_directory_ownership(dir: &str) -> Result<(), Box<dyn std::error::Error>> {
+/// Build logs are written by the host process, so avoid invoking sudo unless the
+/// directory is actually not writable.
+fn ensure_directory_writable(dir: &str) -> Result<(), Box<dyn std::error::Error>> {
+    let write_probe_path =
+        Path::new(dir).join(format!(".foc-devnet-write-test-{}", std::process::id()));
+    match OpenOptions::new()
+        .write(true)
+        .create_new(true)
+        .open(&write_probe_path)
+    {
+        Ok(_) => {
+            fs::remove_file(write_probe_path)?;
+            return Ok(());
+        }
+        Err(e) => {
+            warn!("Build log directory {} is not writable: {}", dir, e);
+        }
+    }
+
     let uid = get_current_uid()?;
     let gid = get_current_gid()?;
 
     let output = Command::new("sudo")
-        .args(["chown", "-R", &format!("{}:{}", uid, gid), dir])
+        .args(["-n", "chown", "-R", &format!("{}:{}", uid, gid), dir])
         .output()?;
 
     if !output.status.success() {
         let stderr = String::from_utf8_lossy(&output.stderr);
-        return Err(format!("Failed to fix ownership of {}: {}", dir, stderr).into());
+        return Err(format!(
+            "Build log directory {} is not writable and ownership could not be fixed automatically: {}",
+            dir, stderr
+        )
+        .into());
     }
 
     Ok(())
diff --git a/src/commands/start/curio/verification.rs b/src/commands/start/curio/verification.rs
index e0fb4d0..912c1da 100644
--- a/src/commands/start/curio/verification.rs
+++ b/src/commands/start/curio/verification.rs
@@ -64,8 +64,11 @@ fn verify_pdp_ping(context: &SetupContext, sp_index: usize) -> Result<(), Box<dy
 fn verify_upload_download(context: &SetupContext, sp_index: usize) -> Result<(), Box<dyn Error>> {
     info!("Testing upload/download functionality via pdptool...");
 
-    // Create temporary directory for test files
-    let temp_dir = TempDir::new()?;
+    // Create temporary directory for test files under the foc-devnet home. Docker
+    // on macOS/Colima may not be able to mount the default OS temp directory.
+    let tmp_root = crate::paths::foc_devnet_tmp();
+    fs::create_dir_all(&tmp_root)?;
+    let temp_dir = TempDir::new_in(tmp_root)?;
     let test_file_path = create_random_test_file(&temp_dir)?;
 
     // Upload file via pdptool
diff --git a/src/commands/start/multicall3_deploy/deployment.rs b/src/commands/start/multicall3_deploy/deployment.rs
index 835fb56..8190b6b 100644
--- a/src/commands/start/multicall3_deploy/deployment.rs
+++ b/src/commands/start/multicall3_deploy/deployment.rs
@@ -6,10 +6,12 @@ use super::key_management;
 use super::prerequisites::check_required_addresses;
 use crate::commands::start::lotus_utils::get_lotus_rpc_url;
 use crate::docker::command_logger::run_and_log_command_strings;
-use crate::paths::foc_devnet_multicall3_repo;
 use std::error::Error;
 use tracing::{error, info};
 
+const MULTICALL3_BYTECODE: &str =
+    include_str!("../../../../contracts/Multicall3/bytecode/Multicall3.bin");
+
 /// Deploy Multicall3 using forge create
 pub fn deploy_multicall3(
     private_key: &str,
@@ -19,40 +21,22 @@ pub fn deploy_multicall3(
 ) -> Result<String, Box<dyn Error>> {
     info!("Deploying Multicall3 contract...");
 
-    // Get the multicall3 repository path
-    let multicall3_repo = foc_devnet_multicall3_repo();
-
-    if !multicall3_repo.exists() {
-        return Err(format!(
-            "Multicall3 repository not found at: {}",
-            multicall3_repo.display()
-        )
-        .into());
-    }
-
-    // Check if Multicall3.sol exists in the repo
-    let contract_file = multicall3_repo.join("src/Multicall3.sol");
-    if !contract_file.exists() {
-        return Err(format!("Multicall3.sol not found at: {}", contract_file.display()).into());
-    }
-
-    info!("Compiling and deploying contract...");
+    info!("Creating Multicall3 contract...");
 
-    // Deploy using forge create with explicit gas limit for FEVM
+    // Deploy precompiled bytecode with explicit gas limit for FEVM. Keeping this
+    // path compiler-free avoids startup-time downloads in ephemeral containers.
     let deploy_cmd = format!(
-        "cd /workspace && \
-         forge create src/Multicall3.sol:Multicall3 \
+        "cast send --json \
          --rpc-url {} \
          --private-key {} \
-         --legacy \
          --gas-limit 1000000000 \
-         --broadcast \
-         -vv",
-        lotus_rpc_url, private_key
+         --create {}",
+        lotus_rpc_url,
+        private_key,
+        MULTICALL3_BYTECODE.trim()
     );
 
     let container_name = format!("foc-{}-multicall3-deploy", run_id);
-    let volume_mount = format!("{}:/workspace", multicall3_repo.display());
     let args: Vec<String> = vec![
         "run".to_string(),
         "-u".to_string(),
@@ -61,8 +45,6 @@ pub fn deploy_multicall3(
         container_name,
         "--network".to_string(),
         "host".to_string(), // Use host network to access Lotus RPC on dynamic port
-        "-v".to_string(),
-        volume_mount,
         crate::constants::BUILDER_DOCKER_IMAGE.to_string(),
         "bash".to_string(),
         "-c".to_string(),
@@ -94,12 +76,13 @@ pub fn deploy_multicall3(
         return Err("Multicall3 deployment failed".into());
     }
 
-    // Extract contract address from output
-    // Look for "Deployed to:" in the output
-    let contract_address = stdout
-        .lines()
-        .find(|line| line.contains("Deployed to:"))
-        .and_then(|line| line.split_whitespace().last())
+    // Extract contract address from cast send JSON output.
+    let receipt: serde_json::Value = serde_json::from_str(stdout.trim())
+        .map_err(|e| format!("Failed to parse deployment JSON output: {}", e))?;
+    let contract_address = receipt
+        .get("contractAddress")
+        .and_then(|value| value.as_str())
+        .filter(|value| !value.is_empty())
         .ok_or("Failed to extract contract address from deployment output")?;
 
     info!("✓ Multicall3 deployed at: {}", contract_address);
diff --git a/src/commands/start/usdfc_deploy/deployment.rs b/src/commands/start/usdfc_deploy/deployment.rs
index a8e54e2..08eb512 100644
--- a/src/commands/start/usdfc_deploy/deployment.rs
+++ b/src/commands/start/usdfc_deploy/deployment.rs
@@ -2,7 +2,7 @@
 //!
 //! This module contains the core deployment functionality for the MockUSDFC token.
 
-use super::foundry_setup::{get_mockusdfc_project_dir, setup_foundry_project};
+use super::foundry_setup::get_mockusdfc_project_dir;
 use super::key_management::get_deployer_private_key;
 use super::prerequisites::check_required_addresses;
 use crate::commands::start::lotus_utils::get_lotus_rpc_url;
@@ -12,6 +12,9 @@ use std::error::Error;
 use std::path::PathBuf;
 use tracing::{error, info};
 
+const MOCK_USDFC_BYTECODE: &str =
+    include_str!("../../../../contracts/MockUSDFC/bytecode/MockUSDFC.bin");
+
 /// Deploy MockUSDFC using the Foundry project
 pub fn deploy_mock_usdfc_foundry(
     context: &SetupContext,
@@ -24,22 +27,23 @@ pub fn deploy_mock_usdfc_foundry(
     // Get the contract directory from embedded assets
     let contract_dir = get_mockusdfc_project_dir(run_id)?;
 
-    // Setup the Foundry project (install deps, build)
-    setup_foundry_project(context, &contract_dir, run_id)?;
-
-    // Deploy using forge script with explicit gas limit for FEVM
-    info!("Executing deployment script...");
+    // Deploy precompiled bytecode with explicit gas limit for FEVM. Keeping this
+    // path compiler-free avoids startup-time downloads in ephemeral containers.
+    info!("Creating MockUSDFC contract...");
 
     let deploy_cmd = format!(
         "cd /workspace && \
-         forge script script/Deploy.s.sol:DeployMockUSDFC \
+         CONSTRUCTOR_ARGS=$(cast abi-encode 'constructor(uint256)' {}) && \
+         DEPLOY_BYTECODE={}$(echo $CONSTRUCTOR_ARGS | sed 's/^0x//') && \
+         cast send --json \
          --rpc-url {} \
          --private-key {} \
-         --broadcast \
-         --slow \
-         --gas-estimate-multiplier 10000 \
-         -vv",
-        lotus_rpc_url, private_key
+         --gas-limit 1000000000 \
+         --create \"$DEPLOY_BYTECODE\"",
+        super::usdfc_deploy_step::MOCK_USDFC_INITIAL_SUPPLY,
+        MOCK_USDFC_BYTECODE.trim(),
+        lotus_rpc_url,
+        private_key
     );
 
     let key = format!("usdfc_deploy_{}", run_id);
@@ -86,12 +90,13 @@ pub fn deploy_mock_usdfc_foundry(
         return Err("MockUSDFC deployment failed".into());
     }
 
-    // Extract contract address from output
-    // Look for "MockUSDFC deployed at:" in the output
-    let contract_address = stdout
-        .lines()
-        .find(|line| line.contains("MockUSDFC deployed at:"))
-        .and_then(|line| line.split_whitespace().last())
+    // Extract contract address from cast send JSON output.
+    let receipt: serde_json::Value = serde_json::from_str(stdout.trim())
+        .map_err(|e| format!("Failed to parse deployment JSON output: {}", e))?;
+    let contract_address = receipt
+        .get("contractAddress")
+        .and_then(|value| value.as_str())
+        .filter(|value| !value.is_empty())
         .ok_or("Failed to extract contract address from deployment output")?;
 
     info!("✓ MockUSDFC deployed at: {}", contract_address);
diff --git a/src/commands/start/usdfc_deploy/foundry_setup.rs b/src/commands/start/usdfc_deploy/foundry_setup.rs
index d0fb823..929958f 100644
--- a/src/commands/start/usdfc_deploy/foundry_setup.rs
+++ b/src/commands/start/usdfc_deploy/foundry_setup.rs
@@ -3,14 +3,11 @@
 //! This module handles the setup and preparation of the Foundry project
 //! for deploying the MockUSDFC contract.
 
-use crate::commands::start::step::SetupContext;
-use crate::docker::command_logger::run_and_log_command;
 use crate::embedded_assets;
 use crate::paths::foc_devnet_run_dir;
 use std::error::Error;
 use std::fs;
-use std::path::{Path, PathBuf};
-use tracing::info;
+use std::path::PathBuf;
 
 /// Get or create the MockUSDFC project directory from embedded assets
 ///
@@ -41,118 +38,3 @@ pub fn get_mockusdfc_project_dir(run_id: &str) -> Result<PathBuf, Box<dyn Error>
 
     Ok(mockusdfc_dir)
 }
-
-/// Setup the Foundry project (install dependencies if needed)
-pub fn setup_foundry_project(
-    context: &SetupContext,
-    contract_dir: &Path,
-    run_id: &str,
-) -> Result<(), Box<dyn Error>> {
-    let openzeppelin_path = contract_dir.join("lib/openzeppelin-contracts");
-
-    if !openzeppelin_path.exists() {
-        info!("Installing OpenZeppelin contracts...");
-
-        // First, initialize git repo if it doesn't exist
-        let git_dir = contract_dir.join(".git");
-        if !git_dir.exists() {
-            info!("Initializing git repository...");
-            let key = format!("usdfc_setup_git_init_{}", run_id);
-            let container_name = format!("foc-{}-usdfc-git-init", run_id);
-            let output = run_and_log_command(
-                "docker",
-                &[
-                    "run",
-                    "--name",
-                    &container_name,
-                    "-u",
-                    "foc-user",
-                    "-v",
-                    &format!("{}:/workspace", contract_dir.display()),
-                    crate::constants::BUILDER_DOCKER_IMAGE,
-                    "bash",
-                    "-c",
-                    "cd /workspace && git init && git config user.email 'foc@devnet' && git config user.name 'FOC DevNet'",
-                ],
-                context,
-                &key,
-            )?;
-
-            if !output.status.success() {
-                return Err(format!(
-                    "Failed to initialize git repository: {}",
-                    String::from_utf8_lossy(&output.stderr)
-                )
-                .into());
-            }
-        }
-
-        // Install dependencies
-        let key = format!("usdfc_setup_install_deps_{}", run_id);
-        let container_name = format!("foc-{}-usdfc-install-deps", run_id);
-        let output = run_and_log_command(
-            "docker",
-            &[
-                "run",
-                "--name",
-                &container_name,
-                "-u",
-                "foc-user",
-                "-v",
-                &format!("{}:/workspace", contract_dir.display()),
-                crate::constants::BUILDER_DOCKER_IMAGE,
-                "bash",
-                "-c",
-                "cd /workspace && \
-                 forge install OpenZeppelin/openzeppelin-contracts@v5.0.0 && \
-                 forge install foundry-rs/forge-std",
-            ],
-            context,
-            &key,
-        )?;
-
-        if !output.status.success() {
-            return Err(format!(
-                "Failed to install dependencies: {}",
-                String::from_utf8_lossy(&output.stderr)
-            )
-            .into());
-        }
-
-        info!("Dependencies installed");
-    }
-
-    // Build contracts
-    info!("Building MockUSDFC contract...");
-    let key = format!("usdfc_setup_build_{}", run_id);
-    let container_name = format!("foc-{}-usdfc-build", run_id);
-    let output = run_and_log_command(
-        "docker",
-        &[
-            "run",
-            "--name",
-            &container_name,
-            "-u",
-            "foc-user",
-            "-v",
-            &format!("{}:/workspace", contract_dir.display()),
-            crate::constants::BUILDER_DOCKER_IMAGE,
-            "bash",
-            "-c",
-            "cd /workspace && forge build",
-        ],
-        context,
-        &key,
-    )?;
-
-    if !output.status.success() {
-        return Err(format!(
-            "Failed to build contracts: {}",
-            String::from_utf8_lossy(&output.stderr)
-        )
-        .into());
-    }
-
-    info!("Contracts built");
-    Ok(())
-}
diff --git a/src/commands/start/usdfc_deploy/verification.rs b/src/commands/start/usdfc_deploy/verification.rs
index b2c6c57..00445be 100644
--- a/src/commands/start/usdfc_deploy/verification.rs
+++ b/src/commands/start/usdfc_deploy/verification.rs
@@ -33,13 +33,38 @@ pub fn verify_mock_usdfc(
     let verification_result = retry_with_fixed_delay(
         || {
             let verify_cmd = format!(
-                "cd /workspace && \
-                 forge script script/Verify.s.sol:VerifyMockUSDFC \
-                 --rpc-url {} \
-                 --private-key {} \
-                 --sig 'run(address)' {} \
-                 -vv",
-                lotus_rpc_url, private_key, contract_address
+                "set -euo pipefail && \
+                 DEPLOYER=$(cast wallet address --private-key {}) && \
+                 NAME=$(cast call --rpc-url {} {} 'name()(string)') && \
+                 SYMBOL=$(cast call --rpc-url {} {} 'symbol()(string)') && \
+                 DECIMALS=$(cast call --rpc-url {} {} 'decimals()(uint8)') && \
+                 TOTAL_SUPPLY=$(cast call --rpc-url {} {} 'totalSupply()(uint256)') && \
+                 BALANCE=$(cast call --rpc-url {} {} 'balanceOf(address)(uint256)' $DEPLOYER) && \
+                 echo \"Name: $NAME\" && \
+                 echo \"Symbol: $SYMBOL\" && \
+                 echo \"Decimals: $DECIMALS\" && \
+                 echo \"Total supply: $TOTAL_SUPPLY\" && \
+                 echo \"Deployer balance: $BALANCE\" && \
+                 TOTAL_SUPPLY_VALUE=$(echo \"$TOTAL_SUPPLY\" | awk '{{print $1}}') && \
+                 BALANCE_VALUE=$(echo \"$BALANCE\" | awk '{{print $1}}') && \
+                 ([ \"$NAME\" = 'Mock USDC' ] || [ \"$NAME\" = '\"Mock USDC\"' ]) && \
+                 ([ \"$SYMBOL\" = 'USDFC' ] || [ \"$SYMBOL\" = '\"USDFC\"' ]) && \
+                 [ \"$DECIMALS\" = '18' ] && \
+                 [ \"$TOTAL_SUPPLY_VALUE\" = '{}' ] && \
+                 [ \"$BALANCE_VALUE\" = '{}' ]",
+                private_key,
+                lotus_rpc_url,
+                contract_address,
+                lotus_rpc_url,
+                contract_address,
+                lotus_rpc_url,
+                contract_address,
+                lotus_rpc_url,
+                contract_address,
+                lotus_rpc_url,
+                contract_address,
+                crate::constants::MOCK_USDFC_INITIAL_SUPPLY,
+                crate::constants::MOCK_USDFC_INITIAL_SUPPLY
             );
 
             let key = format!("usdfc_verify_{}", run_id);
@@ -48,6 +73,7 @@ pub fn verify_mock_usdfc(
                 "docker",
                 &[
                     "run",
+                    "--rm",
                     "--name",
                     &container_name,
                     "-u",
diff --git a/src/commands/start/yugabyte/mod.rs b/src/commands/start/yugabyte/mod.rs
index 0f13018..5d0be53 100644
--- a/src/commands/start/yugabyte/mod.rs
+++ b/src/commands/start/yugabyte/mod.rs
@@ -106,8 +106,8 @@ fn spawn_yugabyte_instance(
         "--base_dir=/home/foc-user/yb_base",
         "--ui=true",
         "--callhome=false",
-        "--master_flags=rpc_bind_addresses=0.0.0.0",
-        "--tserver_flags=rpc_bind_addresses=0.0.0.0,pgsql_proxy_bind_address=0.0.0.0:5433,cql_proxy_bind_address=0.0.0.0:9042",
+        "--master_flags=rpc_bind_addresses=0.0.0.0,tablet_replicas_per_core_limit=0,tablet_replicas_per_gib_limit=0",
+        "--tserver_flags=rpc_bind_addresses=0.0.0.0,pgsql_proxy_bind_address=0.0.0.0:5433,cql_proxy_bind_address=0.0.0.0:9042,yb_num_shards_per_tserver=1,ysql_num_shards_per_tserver=1,tablet_replicas_per_core_limit=0,tablet_replicas_per_gib_limit=0",
         "--daemon=false",
     ]);
 

From cac9e69af5cd660b5f5e471cceed546dff1b3c89 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 01:07:39 +0200
Subject: [PATCH 16/21] Revert non-essential changes

---
 build.rs                                      |  11 +-
 contracts/MockUSDFC/bytecode/MockUSDFC.bin    |   1 -
 contracts/MockUSDFC/foundry.lock              |  15 +-
 contracts/MockUSDFC/remappings.txt            |   2 +
 contracts/MockUSDFC/script/Deploy.s.sol       |  26 +-
 contracts/MockUSDFC/script/Verify.s.sol       | 102 +++++-
 contracts/MockUSDFC/src/MockUSDFC.sol         | 111 +------
 contracts/Multicall3/bytecode/Multicall3.bin  |   1 -
 scripts/run-local-scenarios.py                | 309 ------------------
 src/commands/build/docker.rs                  |  55 +---
 src/commands/build/exec.rs                    |  34 +-
 src/commands/start/curio/verification.rs      |   7 +-
 .../start/multicall3_deploy/deployment.rs     |  53 ++-
 src/commands/start/usdfc_deploy/deployment.rs |  41 +--
 .../start/usdfc_deploy/foundry_setup.rs       | 120 ++++++-
 .../start/usdfc_deploy/verification.rs        |  40 +--
 src/commands/start/yugabyte/mod.rs            |   4 +-
 17 files changed, 341 insertions(+), 591 deletions(-)
 delete mode 100644 contracts/MockUSDFC/bytecode/MockUSDFC.bin
 delete mode 100644 contracts/Multicall3/bytecode/Multicall3.bin
 delete mode 100755 scripts/run-local-scenarios.py

diff --git a/build.rs b/build.rs
index 1c19402..11289ff 100644
--- a/build.rs
+++ b/build.rs
@@ -91,16 +91,7 @@ fn generate_mockusdfc_archive() {
 
     // Create tar.gz archive in contracts/ directory
     let output = Command::new("tar")
-        .env("COPYFILE_DISABLE", "1")
-        .args([
-            "--exclude=._*",
-            "--exclude=*/._*",
-            "--exclude=.DS_Store",
-            "--exclude=*/.DS_Store",
-            "-czf",
-            "artifacts/MockUSDFC.tar.gz",
-            "contracts/MockUSDFC",
-        ])
+        .args(["-czf", "artifacts/MockUSDFC.tar.gz", "contracts/MockUSDFC"])
         .current_dir(".")
         .output();
 
diff --git a/contracts/MockUSDFC/bytecode/MockUSDFC.bin b/contracts/MockUSDFC/bytecode/MockUSDFC.bin
deleted file mode 100644
index e6db165..0000000
--- a/contracts/MockUSDFC/bytecode/MockUSDFC.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561000f575f80fd5b50604051610a94380380610a9483398101604081905261002e9161011d565b610038338261003e565b50610159565b6001600160a01b0382166100985760405162461bcd60e51b815260206004820152601b60248201527f45524332303a206d696e7420746f207a65726f20616464726573730000000000604482015260640160405180910390fd5b805f808282546100a89190610134565b90915550506001600160a01b0382165f90815260016020526040812080548392906100d4908490610134565b90915550506040518181526001600160a01b038316905f907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9060200160405180910390a35050565b5f6020828403121561012d575f80fd5b5051919050565b8082018082111561015357634e487b7160e01b5f52601160045260245ffd5b92915050565b61092e806101665f395ff3fe608060405234801561000f575f80fd5b50600436106100a6575f3560e01c806340c10f191161006e57806340c10f191461013757806370a082311461014c57806395d89b41146101745780639dc29fac14610195578063a9059cbb146101a8578063dd62ed3e146101bb575f80fd5b806306fdde03146100aa578063095ea7b3146100e157806318160ddd1461010457806323b872dd14610115578063313ce56714610128575b5f80fd5b6040805180820190915260098152684d6f636b205553444360b81b60208201525b6040516100d891906107a6565b60405180910390f35b6100f46100ef36600461080c565b6101f3565b60405190151581526020016100d8565b5f545b6040519081526020016100d8565b6100f4610123366004610834565b610209565b604051601281526020016100d8565b61014a61014536600461080c565b6102a4565b005b61010761015a36600461086d565b6001600160a01b03165f9081526001602052604090205490565b604080518082019091526005815264555344464360d81b60208201526100cb565b61014a6101a336600461080c565b6102b2565b6100f46101b636600461080c565b6102bc565b6101076101c936600461088d565b6001600160a01b039182165f90815260026020908152604080832093909416825291909152205490565b5f6101ff3384846102c8565b5060015b92915050565b6001600160a01b0383165f908152600260209081526040808320338452909152812054828110156102815760405162461bcd60e51b815260206004820152601d60248201527f45524332303a20696e73756666696369656e7420616c6c6f77616e636500000060448201526064015b60405180910390fd5b61028e85338584036102c8565b6102998585856103d5565b506001949350505050565b6102ae8282610592565b5050565b6102ae828261066d565b5f6101ff3384846103d5565b6001600160a01b03831661031e5760405162461bcd60e51b815260206004820181905260248201527f45524332303a20617070726f76652066726f6d207a65726f20616464726573736044820152606401610278565b6001600160a01b0382166103745760405162461bcd60e51b815260206004820152601e60248201527f45524332303a20617070726f766520746f207a65726f206164647265737300006044820152606401610278565b6001600160a01b038381165f8181526002602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92591015b60405180910390a3505050565b6001600160a01b0383166104355760405162461bcd60e51b815260206004820152602160248201527f45524332303a207472616e736665722066726f6d207a65726f206164647265736044820152607360f81b6064820152608401610278565b6001600160a01b03821661048b5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a207472616e7366657220746f207a65726f2061646472657373006044820152606401610278565b6001600160a01b0383165f90815260016020526040902054818110156105025760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610278565b6001600160a01b038085165f908152600160205260408082208585039055918516815290812080548492906105389084906108d2565b92505081905550826001600160a01b0316846001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8460405161058491815260200190565b60405180910390a350505050565b6001600160a01b0382166105e85760405162461bcd60e51b815260206004820152601b60248201527f45524332303a206d696e7420746f207a65726f206164647265737300000000006044820152606401610278565b805f808282546105f891906108d2565b90915550506001600160a01b0382165f90815260016020526040812080548392906106249084906108d2565b90915550506040518181526001600160a01b038316905f907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9060200160405180910390a35050565b6001600160a01b0382166106c35760405162461bcd60e51b815260206004820152601d60248201527f45524332303a206275726e2066726f6d207a65726f20616464726573730000006044820152606401610278565b6001600160a01b0382165f90815260016020526040902054818110156107365760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610278565b6001600160a01b0383165f9081526001602052604081208383039055805483919081906107649084906108e5565b90915550506040518281525f906001600160a01b038516907fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef906020016103c8565b5f6020808352835180828501525f5b818110156107d1578581018301518582016040015282016107b5565b505f604082860101526040601f19601f8301168501019250505092915050565b80356001600160a01b0381168114610807575f80fd5b919050565b5f806040838503121561081d575f80fd5b610826836107f1565b946020939093013593505050565b5f805f60608486031215610846575f80fd5b61084f846107f1565b925061085d602085016107f1565b9150604084013590509250925092565b5f6020828403121561087d575f80fd5b610886826107f1565b9392505050565b5f806040838503121561089e575f80fd5b6108a7836107f1565b91506108b5602084016107f1565b90509250929050565b634e487b7160e01b5f52601160045260245ffd5b80820180821115610203576102036108be565b81810381811115610203576102036108be56fea2646970667358221220f3ab1b3f8a138b152ac6d256f430fb9e29e04016aeca677b8c8e6aa7315267c864736f6c63430008140033
diff --git a/contracts/MockUSDFC/foundry.lock b/contracts/MockUSDFC/foundry.lock
index 0967ef4..c805ad9 100644
--- a/contracts/MockUSDFC/foundry.lock
+++ b/contracts/MockUSDFC/foundry.lock
@@ -1 +1,14 @@
-{}
+{
+  "lib/forge-std": {
+    "tag": {
+      "name": "v1.12.0",
+      "rev": "7117c90c8cf6c68e5acce4f09a6b24715cea4de6"
+    }
+  },
+  "lib/openzeppelin-contracts": {
+    "tag": {
+      "name": "v5.0.0",
+      "rev": "932fddf69a699a9a80fd2396fd1a2ab91cdda123"
+    }
+  }
+}
\ No newline at end of file
diff --git a/contracts/MockUSDFC/remappings.txt b/contracts/MockUSDFC/remappings.txt
index e69de29..90b2e67 100644
--- a/contracts/MockUSDFC/remappings.txt
+++ b/contracts/MockUSDFC/remappings.txt
@@ -0,0 +1,2 @@
+@openzeppelin/=lib/openzeppelin-contracts/
+forge-std/=lib/forge-std/src/
diff --git a/contracts/MockUSDFC/script/Deploy.s.sol b/contracts/MockUSDFC/script/Deploy.s.sol
index affa8d1..4bf6a2d 100644
--- a/contracts/MockUSDFC/script/Deploy.s.sol
+++ b/contracts/MockUSDFC/script/Deploy.s.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
+import "forge-std/Script.sol";
 import "../src/MockUSDFC.sol";
 
 /**
@@ -13,11 +14,32 @@ import "../src/MockUSDFC.sol";
  *     --private-key <PRIVATE_KEY> \
  *     --broadcast
  */
-contract DeployMockUSDFC {
+contract DeployMockUSDFC is Script {
     // Default initial supply: 1,000,000 tokens with 18 decimals
     uint256 constant DEFAULT_INITIAL_SUPPLY = 1_000_000 * 10**18;
 
     function run() external returns (MockUSDFC) {
-        return new MockUSDFC(DEFAULT_INITIAL_SUPPLY);
+        // Get initial supply from environment variable or use default
+        uint256 initialSupply = vm.envOr("INITIAL_SUPPLY", DEFAULT_INITIAL_SUPPLY);
+
+        console.log("Deploying MockUSDFC with initial supply:", initialSupply);
+        console.log("Deployer address:", msg.sender);
+
+        // Start broadcast with a high gas limit for FEVM
+        vm.startBroadcast();
+
+        // Deploy contract
+        MockUSDFC token = new MockUSDFC(initialSupply);
+
+        vm.stopBroadcast();
+
+        console.log("MockUSDFC deployed at:", address(token));
+        console.log("Token name:", token.name());
+        console.log("Token symbol:", token.symbol());
+        console.log("Token decimals:", token.decimals());
+        console.log("Total supply:", token.totalSupply());
+        console.log("Deployer balance:", token.balanceOf(msg.sender));
+
+        return token;
     }
 }
diff --git a/contracts/MockUSDFC/script/Verify.s.sol b/contracts/MockUSDFC/script/Verify.s.sol
index 060dbaf..92f2d45 100644
--- a/contracts/MockUSDFC/script/Verify.s.sol
+++ b/contracts/MockUSDFC/script/Verify.s.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
+import "forge-std/Script.sol";
 import "../src/MockUSDFC.sol";
 
 /**
@@ -13,18 +14,115 @@ import "../src/MockUSDFC.sol";
  *     --private-key <PRIVATE_KEY> \
  *     --sig "run(address)" <CONTRACT_ADDRESS>
  */
-contract VerifyMockUSDFC {
-    function run(address tokenAddress) external view {
+contract VerifyMockUSDFC is Script {
+    function run(address tokenAddress) external {
         require(tokenAddress != address(0), "Invalid token address");
 
         MockUSDFC token = MockUSDFC(tokenAddress);
 
+        console.log("=== Verifying MockUSDFC at", tokenAddress, "===");
+        console.log("");
+
+        // Test 1: Read basic token information
+        console.log("1. Reading token metadata:");
         string memory name = token.name();
         string memory symbol = token.symbol();
         uint8 decimals = token.decimals();
+        uint256 totalSupply = token.totalSupply();
 
+        console.log("   Name:", name);
+        console.log("   Symbol:", symbol);
+        console.log("   Decimals:", decimals);
+        console.log("   Total Supply:", totalSupply);
+        
         require(keccak256(bytes(name)) == keccak256(bytes("Mock USDC")), "Invalid name");
         require(keccak256(bytes(symbol)) == keccak256(bytes("USDFC")), "Invalid symbol");
         require(decimals == 18, "Invalid decimals");
+        console.log("   [OK] Metadata verification passed");
+        console.log("");
+
+        // Test 2: Check deployer balance
+        console.log("2. Checking deployer balance:");
+        address deployer = msg.sender;
+        uint256 deployerBalance = token.balanceOf(deployer);
+        console.log("   Deployer:", deployer);
+        console.log("   Balance:", deployerBalance);
+        console.log("   [OK] Balance check passed");
+        console.log("");
+
+        // Test 3: Test transfer (if we have balance)
+        if (deployerBalance > 0) {
+            console.log("3. Testing transfer:");
+            address recipient = address(0x1234567890123456789012345678901234567890);
+            uint256 transferAmount = 1000 * 10**18; // 1000 tokens
+
+            if (deployerBalance >= transferAmount) {
+                vm.startBroadcast();
+                token.transfer(recipient, transferAmount);
+                vm.stopBroadcast();
+
+                uint256 recipientBalance = token.balanceOf(recipient);
+                console.log("   Transferred", transferAmount, "to", recipient);
+                console.log("   Recipient balance:", recipientBalance);
+                require(recipientBalance == transferAmount, "Transfer failed");
+                console.log("   [OK] Transfer test passed");
+            } else {
+                console.log("   [WARN] Insufficient balance for transfer test");
+            }
+        } else {
+            console.log("3. Skipping transfer test (no balance)");
+        }
+        console.log("");
+
+        // Test 4: Test mint function
+        console.log("4. Testing mint function:");
+        address mintRecipient = address(0x9876543210987654321098765432109876543210);
+        uint256 mintAmount = 500 * 10**18; // 500 tokens
+
+        uint256 totalSupplyBefore = token.totalSupply();
+        
+        vm.startBroadcast();
+        token.mint(mintRecipient, mintAmount);
+        vm.stopBroadcast();
+
+        uint256 mintRecipientBalance = token.balanceOf(mintRecipient);
+        uint256 totalSupplyAfter = token.totalSupply();
+
+        console.log("   Minted", mintAmount, "to", mintRecipient);
+        console.log("   Recipient balance:", mintRecipientBalance);
+        console.log("   Total supply before:", totalSupplyBefore);
+        console.log("   Total supply after:", totalSupplyAfter);
+        
+        require(mintRecipientBalance == mintAmount, "Mint failed");
+        require(totalSupplyAfter == totalSupplyBefore + mintAmount, "Total supply not updated");
+        console.log("   [OK] Mint test passed");
+        console.log("");
+
+        // Test 5: Test burn function
+        console.log("5. Testing burn function:");
+        uint256 burnAmount = 100 * 10**18; // 100 tokens
+
+        totalSupplyBefore = token.totalSupply();
+        uint256 mintRecipientBalanceBefore = token.balanceOf(mintRecipient);
+
+        vm.startBroadcast();
+        token.burn(mintRecipient, burnAmount);
+        vm.stopBroadcast();
+
+        uint256 mintRecipientBalanceAfter = token.balanceOf(mintRecipient);
+        totalSupplyAfter = token.totalSupply();
+
+        console.log("   Burned", burnAmount, "from", mintRecipient);
+        console.log("   Balance before:", mintRecipientBalanceBefore);
+        console.log("   Balance after:", mintRecipientBalanceAfter);
+        console.log("   Total supply before:", totalSupplyBefore);
+        console.log("   Total supply after:", totalSupplyAfter);
+        
+        require(mintRecipientBalanceAfter == mintRecipientBalanceBefore - burnAmount, "Burn failed");
+        require(totalSupplyAfter == totalSupplyBefore - burnAmount, "Total supply not updated");
+        console.log("   [OK] Burn test passed");
+        console.log("");
+
+        console.log("=== All verifications passed! ===");
     }
 }
diff --git a/contracts/MockUSDFC/src/MockUSDFC.sol b/contracts/MockUSDFC/src/MockUSDFC.sol
index c503aff..03bd08d 100644
--- a/contracts/MockUSDFC/src/MockUSDFC.sol
+++ b/contracts/MockUSDFC/src/MockUSDFC.sol
@@ -1,77 +1,29 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
 /**
  * @title MockUSDFC
  * @dev Mock USDC token for testing FOC warm storage services
  */
-contract MockUSDFC {
-    string private constant _NAME = "Mock USDC";
-    string private constant _SYMBOL = "USDFC";
-    uint8 private constant _DECIMALS = 18;
-
-    uint256 private _totalSupply;
-    mapping(address account => uint256) private _balances;
-    mapping(address owner => mapping(address spender => uint256)) private _allowances;
-
-    event Transfer(address indexed from, address indexed to, uint256 value);
-    event Approval(address indexed owner, address indexed spender, uint256 value);
+contract MockUSDFC is ERC20 {
+    uint8 private _decimals;
 
     /**
      * @dev Constructor that gives msg.sender all of initial supply.
      * @param initialSupply The initial supply of tokens (in wei, accounting for decimals)
      */
-    constructor(uint256 initialSupply) {
+    constructor(uint256 initialSupply) ERC20("Mock USDC", "USDFC") {
+        _decimals = 18;
         _mint(msg.sender, initialSupply);
     }
 
-    function name() public pure returns (string memory) {
-        return _NAME;
-    }
-
-    function symbol() public pure returns (string memory) {
-        return _SYMBOL;
-    }
-
     /**
      * @dev Returns the number of decimals used for token amounts.
      */
-    function decimals() public pure returns (uint8) {
-        return _DECIMALS;
-    }
-
-    function totalSupply() public view returns (uint256) {
-        return _totalSupply;
-    }
-
-    function balanceOf(address account) public view returns (uint256) {
-        return _balances[account];
-    }
-
-    function allowance(address owner, address spender) public view returns (uint256) {
-        return _allowances[owner][spender];
-    }
-
-    function transfer(address to, uint256 amount) external returns (bool) {
-        _transfer(msg.sender, to, amount);
-        return true;
-    }
-
-    function approve(address spender, uint256 amount) external returns (bool) {
-        _approve(msg.sender, spender, amount);
-        return true;
-    }
-
-    function transferFrom(address from, address to, uint256 amount) external returns (bool) {
-        uint256 currentAllowance = _allowances[from][msg.sender];
-        require(currentAllowance >= amount, "ERC20: insufficient allowance");
-
-        unchecked {
-            _approve(from, msg.sender, currentAllowance - amount);
-        }
-
-        _transfer(from, to, amount);
-        return true;
+    function decimals() public view virtual override returns (uint8) {
+        return _decimals;
     }
 
     /**
@@ -91,51 +43,4 @@ contract MockUSDFC {
     function burn(address from, uint256 amount) external {
         _burn(from, amount);
     }
-
-    function _transfer(address from, address to, uint256 amount) internal {
-        require(from != address(0), "ERC20: transfer from zero address");
-        require(to != address(0), "ERC20: transfer to zero address");
-
-        uint256 fromBalance = _balances[from];
-        require(fromBalance >= amount, "ERC20: transfer amount exceeds balance");
-
-        unchecked {
-            _balances[from] = fromBalance - amount;
-        }
-        _balances[to] += amount;
-
-        emit Transfer(from, to, amount);
-    }
-
-    function _mint(address to, uint256 amount) internal {
-        require(to != address(0), "ERC20: mint to zero address");
-
-        _totalSupply += amount;
-        _balances[to] += amount;
-
-        emit Transfer(address(0), to, amount);
-    }
-
-    function _burn(address from, uint256 amount) internal {
-        require(from != address(0), "ERC20: burn from zero address");
-
-        uint256 fromBalance = _balances[from];
-        require(fromBalance >= amount, "ERC20: burn amount exceeds balance");
-
-        unchecked {
-            _balances[from] = fromBalance - amount;
-        }
-        _totalSupply -= amount;
-
-        emit Transfer(from, address(0), amount);
-    }
-
-    function _approve(address owner, address spender, uint256 amount) internal {
-        require(owner != address(0), "ERC20: approve from zero address");
-        require(spender != address(0), "ERC20: approve to zero address");
-
-        _allowances[owner][spender] = amount;
-
-        emit Approval(owner, spender, amount);
-    }
 }
diff --git a/contracts/Multicall3/bytecode/Multicall3.bin b/contracts/Multicall3/bytecode/Multicall3.bin
deleted file mode 100644
index 8566bbc..0000000
--- a/contracts/Multicall3/bytecode/Multicall3.bin
+++ /dev/null
@@ -1 +0,0 @@
-0x608060405234801561001057600080fd5b50610ee0806100206000396000f3fe6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220ff9f02f90192d2ca6e403c5f20b79cd150c47b6fff476c3e6c479e973409984264736f6c634300080c0033
diff --git a/scripts/run-local-scenarios.py b/scripts/run-local-scenarios.py
deleted file mode 100755
index c38755c..0000000
--- a/scripts/run-local-scenarios.py
+++ /dev/null
@@ -1,309 +0,0 @@
-#!/usr/bin/env python3
-"""Run selected scenario tests against a locally started foc-devnet.
-
-Separately installed dependencies:
-  - Docker with the current non-root user able to run Docker commands.
-  - Rust toolchain with cargo, used to build the foc-devnet CLI.
-  - git, node, pnpm, curl, tar, and sudo.
-  - Python 3.11+ for this runner and the scenario scripts.
-  - /etc/hosts entry for host.docker.internal. If it is missing, this runner
-    tries to add "127.0.0.1 host.docker.internal" with sudo.
-
-Dependencies managed by scripts/setup-scenarios-prerequisites.sh:
-  - Foundry cast/forge under ~/.foc-devnet/artifacts/foundry/bin.
-  - Python 3.11.10 via pyenv for cqlsh.
-  - Apache Cassandra cqlsh under ~/.foc-devnet/artifacts/cassandra.
-
-Examples:
-  scripts/run-local-scenarios.py test_containers test_basic_balances
-  scripts/run-local-scenarios.py --all
-  scripts/run-local-scenarios.py --clean --keep-running test_multi_copy_upload
-  scripts/run-local-scenarios.py --skip-init test_multi_copy_upload
-
-The setup and teardown steps are intentionally kept in separate functions so
-they can be moved into shared local-dev helpers later.
-"""
-
-from __future__ import annotations
-
-import argparse
-import os
-import shlex
-import subprocess
-import sys
-import time
-from pathlib import Path
-
-REPO_ROOT = Path(__file__).resolve().parents[1]
-sys.path.insert(0, str(REPO_ROOT))
-
-from scenarios.report import write_report  # noqa: E402
-from scenarios.run import ORDER, _print_summary, _run_single_test  # noqa: E402
-
-DEFAULT_BINARY = REPO_ROOT / "target" / "release" / "foc-devnet"
-SCENARIO_TIMEOUTS = dict(ORDER)
-RUNTIME_DOCKER_IMAGES = (
-    ("foc-lotus", REPO_ROOT / "docker" / "lotus" / "Dockerfile", REPO_ROOT),
-    ("foc-lotus-miner", REPO_ROOT / "docker" / "lotus-miner" / "Dockerfile", REPO_ROOT),
-    ("foc-curio", REPO_ROOT / "docker" / "curio" / "Dockerfile", REPO_ROOT),
-    (
-        "foc-yugabyte",
-        REPO_ROOT / "docker" / "yugabyte" / "Dockerfile",
-        Path.home() / ".foc-devnet" / "artifacts",
-    ),
-)
-
-
-def run_command(cmd: list[str], *, env: dict[str, str] | None = None) -> None:
-    print(f"+ {shlex.join(cmd)}", flush=True)
-    subprocess.run(cmd, cwd=REPO_ROOT, env=env, check=True)
-
-
-def command_succeeds(cmd: list[str]) -> bool:
-    return (
-        subprocess.run(
-            cmd, cwd=REPO_ROOT, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-        ).returncode
-        == 0
-    )
-
-
-def ensure_host_docker_internal() -> None:
-    hosts = Path("/etc/hosts").read_text()
-    if "host.docker.internal" in hosts:
-        return
-
-    run_command(
-        [
-            "sudo",
-            "sh",
-            "-c",
-            "printf '\\n127.0.0.1 host.docker.internal\\n' >> /etc/hosts",
-        ]
-    )
-
-
-def install_scenario_prerequisites() -> None:
-    run_command([str(REPO_ROOT / "scripts" / "setup-scenarios-prerequisites.sh")])
-
-
-def build_foc_devnet() -> Path:
-    run_command(["cargo", "build", "--release"])
-    return DEFAULT_BINARY
-
-
-def clean_devnet(binary: Path, *, all_config: bool) -> None:
-    cmd = [str(binary), "clean"]
-    if all_config:
-        cmd.append("--all")
-    run_command(cmd)
-
-
-def init_devnet(binary: Path, init_flags: str) -> None:
-    run_command([str(binary), "init", *shlex.split(init_flags)])
-
-
-def image_exists(image: str) -> bool:
-    return command_succeeds(["docker", "image", "inspect", image])
-
-
-def build_runtime_docker_images() -> None:
-    uid = str(os.getuid())
-    gid = str(os.getgid())
-
-    for image, dockerfile, context in RUNTIME_DOCKER_IMAGES:
-        if image_exists(image):
-            print(
-                f"[INFO] Docker image {image} already exists, skipping build",
-                flush=True,
-            )
-            continue
-
-        if image == "foc-yugabyte" and not (context / "yugabyte").is_dir():
-            raise SystemExit(
-                f"Missing Yugabyte artifact directory: {context / 'yugabyte'}\n"
-                "Run foc-devnet init once, or provide the artifact before using --skip-init."
-            )
-
-        run_command(
-            [
-                "docker",
-                "build",
-                "--progress",
-                "plain",
-                "--build-arg",
-                f"USER_ID={uid}",
-                "--build-arg",
-                f"GROUP_ID={gid}",
-                "-f",
-                str(dockerfile),
-                "-t",
-                image,
-                str(context),
-            ]
-        )
-
-
-def build_components(binary: Path) -> None:
-    run_command([str(binary), "build", "lotus"])
-    run_command([str(binary), "build", "curio"])
-
-
-def start_devnet(binary: Path, *, parallel: bool) -> None:
-    cmd = [str(binary), "start"]
-    if parallel:
-        cmd.append("--parallel")
-    run_command(cmd)
-
-
-def stop_devnet(binary: Path) -> None:
-    run_command([str(binary), "stop"])
-
-
-def normalize_scenario_name(name: str) -> str:
-    return Path(name).stem
-
-
-def select_scenarios(names: list[str], *, all_scenarios: bool) -> list[tuple[str, int]]:
-    if all_scenarios:
-        return ORDER
-
-    if not names:
-        raise SystemExit("Pass at least one scenario name, or use --all.")
-
-    selected = {normalize_scenario_name(name) for name in names}
-    unknown = sorted(selected - set(SCENARIO_TIMEOUTS))
-    if unknown:
-        known = ", ".join(name for name, _ in ORDER)
-        raise SystemExit(f"Unknown scenario(s): {', '.join(unknown)}. Known: {known}")
-
-    return [(name, timeout) for name, timeout in ORDER if name in selected]
-
-
-def run_selected_scenarios(
-    scenarios: list[tuple[str, int]], env: dict[str, str]
-) -> int:
-    os.environ.update(env)
-    started = time.time()
-    results = []
-
-    for name, timeout in scenarios:
-        scenario_file = REPO_ROOT / "scenarios" / f"{name}.py"
-        result = _run_single_test(str(scenario_file), name, timeout)
-        results.append(result)
-
-    elapsed = int(time.time() - started)
-    _print_summary(results, elapsed)
-    print(f"Report: {write_report(results=results, elapsed=elapsed)}")
-    return 0 if all(result.is_passed for result in results) else 1
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(
-        description="Set up a local foc-devnet, run selected scenarios, then stop it."
-    )
-    parser.add_argument("scenarios", nargs="*", help="Scenario names to run.")
-    parser.add_argument("--all", action="store_true", help="Run all scenarios.")
-    parser.add_argument(
-        "--init-flags",
-        default="",
-        help="Extra flags forwarded to foc-devnet init, parsed with shell syntax.",
-    )
-    parser.add_argument(
-        "--binary",
-        type=Path,
-        default=None,
-        help="Use an existing foc-devnet binary instead of building target/release.",
-    )
-    parser.add_argument(
-        "--clean",
-        action="store_true",
-        help="Run foc-devnet clean before init, preserving config.toml.",
-    )
-    parser.add_argument(
-        "--clean-all",
-        action="store_true",
-        help="Run foc-devnet clean --all before init.",
-    )
-    parser.add_argument(
-        "--skip-prerequisites",
-        action="store_true",
-        help="Skip scripts/setup-scenarios-prerequisites.sh.",
-    )
-    parser.add_argument("--skip-init", action="store_true", help="Skip init.")
-    parser.add_argument(
-        "--skip-image-build",
-        action="store_true",
-        help="Skip runtime Docker image builds normally covered by init.",
-    )
-    parser.add_argument(
-        "--skip-component-build",
-        action="store_true",
-        help="Skip foc-devnet build lotus/curio.",
-    )
-    parser.add_argument("--skip-start", action="store_true", help="Skip start.")
-    parser.add_argument(
-        "--no-parallel-start",
-        action="store_true",
-        help="Start without --parallel.",
-    )
-    parser.add_argument(
-        "--keep-running",
-        action="store_true",
-        help="Do not run foc-devnet stop after scenarios.",
-    )
-    return parser.parse_args()
-
-
-def main() -> int:
-    args = parse_args()
-    selected = select_scenarios(args.scenarios, all_scenarios=args.all)
-    env = {**os.environ, "SCENARIO_RUN_TYPE": "local-selected"}
-    binary = args.binary.resolve() if args.binary else None
-    needs_binary = any(
-        [
-            args.clean,
-            args.clean_all,
-            not args.skip_init,
-            not args.skip_component_build,
-            not args.skip_start,
-        ]
-    )
-    started = False
-
-    try:
-        if not args.skip_prerequisites:
-            install_scenario_prerequisites()
-
-        ensure_host_docker_internal()
-
-        if binary is None and needs_binary:
-            binary = build_foc_devnet()
-
-        if args.clean or args.clean_all:
-            assert binary is not None
-            clean_devnet(binary, all_config=args.clean_all)
-
-        if not args.skip_init:
-            assert binary is not None
-            init_devnet(binary, args.init_flags)
-        elif not args.skip_image_build:
-            build_runtime_docker_images()
-
-        if not args.skip_component_build:
-            assert binary is not None
-            build_components(binary)
-
-        if not args.skip_start:
-            assert binary is not None
-            started = True
-            start_devnet(binary, parallel=not args.no_parallel_start)
-
-        return run_selected_scenarios(selected, env)
-    finally:
-        if started and not args.keep_running and binary is not None:
-            stop_devnet(binary)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/src/commands/build/docker.rs b/src/commands/build/docker.rs
index 65a4e02..078cb97 100644
--- a/src/commands/build/docker.rs
+++ b/src/commands/build/docker.rs
@@ -3,7 +3,7 @@
 //! This module handles Docker image building and container execution for project builds.
 
 use crate::docker::{
-    build::build_image_with_args,
+    build::build_docker_image,
     core::{get_current_gid, get_current_uid, image_exists},
 };
 use crate::embedded_assets;
@@ -19,7 +19,7 @@ pub fn build_builder_image(dockerfile_dir: &str) -> Result<String, Box<dyn std::
     let image_tag = crate::constants::BUILDER_DOCKER_IMAGE;
 
     // Check if image already exists in Docker
-    if image_exists(image_tag)? && builder_image_matches_current_user(image_tag)? {
+    if image_exists(image_tag)? {
         info!("Docker image {} already exists, skipping build", image_tag);
     } else {
         info!("Building Docker image for builder...");
@@ -29,62 +29,13 @@ pub fn build_builder_image(dockerfile_dir: &str) -> Result<String, Box<dyn std::
     Ok(image_tag.to_string())
 }
 
-fn builder_image_matches_current_user(image_tag: &str) -> Result<bool, Box<dyn std::error::Error>> {
-    let uid = get_current_uid()?;
-    let gid = get_current_gid()?;
-    let output = std::process::Command::new("docker")
-        .args([
-            "run",
-            "--rm",
-            "--entrypoint",
-            "getent",
-            image_tag,
-            "passwd",
-            "foc-user",
-        ])
-        .output()?;
-
-    if !output.status.success() {
-        info!(
-            "Docker image {} does not expose foc-user metadata, rebuilding",
-            image_tag
-        );
-        return Ok(false);
-    }
-
-    let passwd_entry = String::from_utf8_lossy(&output.stdout);
-    let fields: Vec<&str> = passwd_entry.trim().split(':').collect();
-    if fields.len() < 4 {
-        info!(
-            "Docker image {} has malformed foc-user metadata, rebuilding",
-            image_tag
-        );
-        return Ok(false);
-    }
-
-    let image_uid = fields[2];
-    let image_gid = fields[3];
-    if image_uid == uid && image_gid == gid {
-        return Ok(true);
-    }
-
-    info!(
-        "Docker image {} was built for UID:GID {}:{}, current user is {}:{}, rebuilding",
-        image_tag, image_uid, image_gid, uid, gid
-    );
-    Ok(false)
-}
-
 /// Build Docker image from Dockerfile.
 pub fn build_image_from_dockerfile(
     dockerfile_dir: &str,
     image_tag: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let dockerfile_path = "docker/builder/Dockerfile";
-    let uid = get_current_uid()?;
-    let gid = get_current_gid()?;
-    let build_args = vec![("USER_ID", uid.as_str()), ("GROUP_ID", gid.as_str())];
-    let output = build_image_with_args(dockerfile_path, image_tag, dockerfile_dir, &build_args)?;
+    let output = build_docker_image(dockerfile_path, image_tag, dockerfile_dir)?;
 
     if !output.status.success() {
         return Err("Failed to build Docker image".into());
diff --git a/src/commands/build/exec.rs b/src/commands/build/exec.rs
index 8e5feed..11d3699 100644
--- a/src/commands/build/exec.rs
+++ b/src/commands/build/exec.rs
@@ -6,7 +6,6 @@ use super::docker;
 use super::logging;
 use super::Project;
 use crate::docker::core::{get_current_gid, get_current_uid};
-use std::fs;
 use std::fs::OpenOptions;
 use std::io::{BufRead, BufReader, Write};
 use std::path::Path;
@@ -28,7 +27,7 @@ pub fn run_build_in_container(
 
     // Create log file for this build
     let log_path = logging::create_build_log_path()?;
-    ensure_directory_writable(
+    fix_directory_ownership(
         log_path
             .parent()
             .unwrap()
@@ -125,41 +124,20 @@ pub fn execute_build_process(
     Ok(())
 }
 
-/// Ensure a directory is writable by the current user.
+/// Fix ownership of a directory to the current user.
 ///
-/// Build logs are written by the host process, so avoid invoking sudo unless the
-/// directory is actually not writable.
-fn ensure_directory_writable(dir: &str) -> Result<(), Box<dyn std::error::Error>> {
-    let write_probe_path =
-        Path::new(dir).join(format!(".foc-devnet-write-test-{}", std::process::id()));
-    match OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(&write_probe_path)
-    {
-        Ok(_) => {
-            fs::remove_file(write_probe_path)?;
-            return Ok(());
-        }
-        Err(e) => {
-            warn!("Build log directory {} is not writable: {}", dir, e);
-        }
-    }
-
+/// This ensures the Docker container (running as current user) can access the directory.
+fn fix_directory_ownership(dir: &str) -> Result<(), Box<dyn std::error::Error>> {
     let uid = get_current_uid()?;
     let gid = get_current_gid()?;
 
     let output = Command::new("sudo")
-        .args(["-n", "chown", "-R", &format!("{}:{}", uid, gid), dir])
+        .args(["chown", "-R", &format!("{}:{}", uid, gid), dir])
         .output()?;
 
     if !output.status.success() {
         let stderr = String::from_utf8_lossy(&output.stderr);
-        return Err(format!(
-            "Build log directory {} is not writable and ownership could not be fixed automatically: {}",
-            dir, stderr
-        )
-        .into());
+        return Err(format!("Failed to fix ownership of {}: {}", dir, stderr).into());
     }
 
     Ok(())
diff --git a/src/commands/start/curio/verification.rs b/src/commands/start/curio/verification.rs
index 912c1da..e0fb4d0 100644
--- a/src/commands/start/curio/verification.rs
+++ b/src/commands/start/curio/verification.rs
@@ -64,11 +64,8 @@ fn verify_pdp_ping(context: &SetupContext, sp_index: usize) -> Result<(), Box<dy
 fn verify_upload_download(context: &SetupContext, sp_index: usize) -> Result<(), Box<dyn Error>> {
     info!("Testing upload/download functionality via pdptool...");
 
-    // Create temporary directory for test files under the foc-devnet home. Docker
-    // on macOS/Colima may not be able to mount the default OS temp directory.
-    let tmp_root = crate::paths::foc_devnet_tmp();
-    fs::create_dir_all(&tmp_root)?;
-    let temp_dir = TempDir::new_in(tmp_root)?;
+    // Create temporary directory for test files
+    let temp_dir = TempDir::new()?;
     let test_file_path = create_random_test_file(&temp_dir)?;
 
     // Upload file via pdptool
diff --git a/src/commands/start/multicall3_deploy/deployment.rs b/src/commands/start/multicall3_deploy/deployment.rs
index 8190b6b..835fb56 100644
--- a/src/commands/start/multicall3_deploy/deployment.rs
+++ b/src/commands/start/multicall3_deploy/deployment.rs
@@ -6,12 +6,10 @@ use super::key_management;
 use super::prerequisites::check_required_addresses;
 use crate::commands::start::lotus_utils::get_lotus_rpc_url;
 use crate::docker::command_logger::run_and_log_command_strings;
+use crate::paths::foc_devnet_multicall3_repo;
 use std::error::Error;
 use tracing::{error, info};
 
-const MULTICALL3_BYTECODE: &str =
-    include_str!("../../../../contracts/Multicall3/bytecode/Multicall3.bin");
-
 /// Deploy Multicall3 using forge create
 pub fn deploy_multicall3(
     private_key: &str,
@@ -21,22 +19,40 @@ pub fn deploy_multicall3(
 ) -> Result<String, Box<dyn Error>> {
     info!("Deploying Multicall3 contract...");
 
-    info!("Creating Multicall3 contract...");
+    // Get the multicall3 repository path
+    let multicall3_repo = foc_devnet_multicall3_repo();
+
+    if !multicall3_repo.exists() {
+        return Err(format!(
+            "Multicall3 repository not found at: {}",
+            multicall3_repo.display()
+        )
+        .into());
+    }
+
+    // Check if Multicall3.sol exists in the repo
+    let contract_file = multicall3_repo.join("src/Multicall3.sol");
+    if !contract_file.exists() {
+        return Err(format!("Multicall3.sol not found at: {}", contract_file.display()).into());
+    }
+
+    info!("Compiling and deploying contract...");
 
-    // Deploy precompiled bytecode with explicit gas limit for FEVM. Keeping this
-    // path compiler-free avoids startup-time downloads in ephemeral containers.
+    // Deploy using forge create with explicit gas limit for FEVM
     let deploy_cmd = format!(
-        "cast send --json \
+        "cd /workspace && \
+         forge create src/Multicall3.sol:Multicall3 \
          --rpc-url {} \
          --private-key {} \
+         --legacy \
          --gas-limit 1000000000 \
-         --create {}",
-        lotus_rpc_url,
-        private_key,
-        MULTICALL3_BYTECODE.trim()
+         --broadcast \
+         -vv",
+        lotus_rpc_url, private_key
     );
 
     let container_name = format!("foc-{}-multicall3-deploy", run_id);
+    let volume_mount = format!("{}:/workspace", multicall3_repo.display());
     let args: Vec<String> = vec![
         "run".to_string(),
         "-u".to_string(),
@@ -45,6 +61,8 @@ pub fn deploy_multicall3(
         container_name,
         "--network".to_string(),
         "host".to_string(), // Use host network to access Lotus RPC on dynamic port
+        "-v".to_string(),
+        volume_mount,
         crate::constants::BUILDER_DOCKER_IMAGE.to_string(),
         "bash".to_string(),
         "-c".to_string(),
@@ -76,13 +94,12 @@ pub fn deploy_multicall3(
         return Err("Multicall3 deployment failed".into());
     }
 
-    // Extract contract address from cast send JSON output.
-    let receipt: serde_json::Value = serde_json::from_str(stdout.trim())
-        .map_err(|e| format!("Failed to parse deployment JSON output: {}", e))?;
-    let contract_address = receipt
-        .get("contractAddress")
-        .and_then(|value| value.as_str())
-        .filter(|value| !value.is_empty())
+    // Extract contract address from output
+    // Look for "Deployed to:" in the output
+    let contract_address = stdout
+        .lines()
+        .find(|line| line.contains("Deployed to:"))
+        .and_then(|line| line.split_whitespace().last())
         .ok_or("Failed to extract contract address from deployment output")?;
 
     info!("✓ Multicall3 deployed at: {}", contract_address);
diff --git a/src/commands/start/usdfc_deploy/deployment.rs b/src/commands/start/usdfc_deploy/deployment.rs
index 08eb512..a8e54e2 100644
--- a/src/commands/start/usdfc_deploy/deployment.rs
+++ b/src/commands/start/usdfc_deploy/deployment.rs
@@ -2,7 +2,7 @@
 //!
 //! This module contains the core deployment functionality for the MockUSDFC token.
 
-use super::foundry_setup::get_mockusdfc_project_dir;
+use super::foundry_setup::{get_mockusdfc_project_dir, setup_foundry_project};
 use super::key_management::get_deployer_private_key;
 use super::prerequisites::check_required_addresses;
 use crate::commands::start::lotus_utils::get_lotus_rpc_url;
@@ -12,9 +12,6 @@ use std::error::Error;
 use std::path::PathBuf;
 use tracing::{error, info};
 
-const MOCK_USDFC_BYTECODE: &str =
-    include_str!("../../../../contracts/MockUSDFC/bytecode/MockUSDFC.bin");
-
 /// Deploy MockUSDFC using the Foundry project
 pub fn deploy_mock_usdfc_foundry(
     context: &SetupContext,
@@ -27,23 +24,22 @@ pub fn deploy_mock_usdfc_foundry(
     // Get the contract directory from embedded assets
     let contract_dir = get_mockusdfc_project_dir(run_id)?;
 
-    // Deploy precompiled bytecode with explicit gas limit for FEVM. Keeping this
-    // path compiler-free avoids startup-time downloads in ephemeral containers.
-    info!("Creating MockUSDFC contract...");
+    // Setup the Foundry project (install deps, build)
+    setup_foundry_project(context, &contract_dir, run_id)?;
+
+    // Deploy using forge script with explicit gas limit for FEVM
+    info!("Executing deployment script...");
 
     let deploy_cmd = format!(
         "cd /workspace && \
-         CONSTRUCTOR_ARGS=$(cast abi-encode 'constructor(uint256)' {}) && \
-         DEPLOY_BYTECODE={}$(echo $CONSTRUCTOR_ARGS | sed 's/^0x//') && \
-         cast send --json \
+         forge script script/Deploy.s.sol:DeployMockUSDFC \
          --rpc-url {} \
          --private-key {} \
-         --gas-limit 1000000000 \
-         --create \"$DEPLOY_BYTECODE\"",
-        super::usdfc_deploy_step::MOCK_USDFC_INITIAL_SUPPLY,
-        MOCK_USDFC_BYTECODE.trim(),
-        lotus_rpc_url,
-        private_key
+         --broadcast \
+         --slow \
+         --gas-estimate-multiplier 10000 \
+         -vv",
+        lotus_rpc_url, private_key
     );
 
     let key = format!("usdfc_deploy_{}", run_id);
@@ -90,13 +86,12 @@ pub fn deploy_mock_usdfc_foundry(
         return Err("MockUSDFC deployment failed".into());
     }
 
-    // Extract contract address from cast send JSON output.
-    let receipt: serde_json::Value = serde_json::from_str(stdout.trim())
-        .map_err(|e| format!("Failed to parse deployment JSON output: {}", e))?;
-    let contract_address = receipt
-        .get("contractAddress")
-        .and_then(|value| value.as_str())
-        .filter(|value| !value.is_empty())
+    // Extract contract address from output
+    // Look for "MockUSDFC deployed at:" in the output
+    let contract_address = stdout
+        .lines()
+        .find(|line| line.contains("MockUSDFC deployed at:"))
+        .and_then(|line| line.split_whitespace().last())
         .ok_or("Failed to extract contract address from deployment output")?;
 
     info!("✓ MockUSDFC deployed at: {}", contract_address);
diff --git a/src/commands/start/usdfc_deploy/foundry_setup.rs b/src/commands/start/usdfc_deploy/foundry_setup.rs
index 929958f..d0fb823 100644
--- a/src/commands/start/usdfc_deploy/foundry_setup.rs
+++ b/src/commands/start/usdfc_deploy/foundry_setup.rs
@@ -3,11 +3,14 @@
 //! This module handles the setup and preparation of the Foundry project
 //! for deploying the MockUSDFC contract.
 
+use crate::commands::start::step::SetupContext;
+use crate::docker::command_logger::run_and_log_command;
 use crate::embedded_assets;
 use crate::paths::foc_devnet_run_dir;
 use std::error::Error;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+use tracing::info;
 
 /// Get or create the MockUSDFC project directory from embedded assets
 ///
@@ -38,3 +41,118 @@ pub fn get_mockusdfc_project_dir(run_id: &str) -> Result<PathBuf, Box<dyn Error>
 
     Ok(mockusdfc_dir)
 }
+
+/// Setup the Foundry project (install dependencies if needed)
+pub fn setup_foundry_project(
+    context: &SetupContext,
+    contract_dir: &Path,
+    run_id: &str,
+) -> Result<(), Box<dyn Error>> {
+    let openzeppelin_path = contract_dir.join("lib/openzeppelin-contracts");
+
+    if !openzeppelin_path.exists() {
+        info!("Installing OpenZeppelin contracts...");
+
+        // First, initialize git repo if it doesn't exist
+        let git_dir = contract_dir.join(".git");
+        if !git_dir.exists() {
+            info!("Initializing git repository...");
+            let key = format!("usdfc_setup_git_init_{}", run_id);
+            let container_name = format!("foc-{}-usdfc-git-init", run_id);
+            let output = run_and_log_command(
+                "docker",
+                &[
+                    "run",
+                    "--name",
+                    &container_name,
+                    "-u",
+                    "foc-user",
+                    "-v",
+                    &format!("{}:/workspace", contract_dir.display()),
+                    crate::constants::BUILDER_DOCKER_IMAGE,
+                    "bash",
+                    "-c",
+                    "cd /workspace && git init && git config user.email 'foc@devnet' && git config user.name 'FOC DevNet'",
+                ],
+                context,
+                &key,
+            )?;
+
+            if !output.status.success() {
+                return Err(format!(
+                    "Failed to initialize git repository: {}",
+                    String::from_utf8_lossy(&output.stderr)
+                )
+                .into());
+            }
+        }
+
+        // Install dependencies
+        let key = format!("usdfc_setup_install_deps_{}", run_id);
+        let container_name = format!("foc-{}-usdfc-install-deps", run_id);
+        let output = run_and_log_command(
+            "docker",
+            &[
+                "run",
+                "--name",
+                &container_name,
+                "-u",
+                "foc-user",
+                "-v",
+                &format!("{}:/workspace", contract_dir.display()),
+                crate::constants::BUILDER_DOCKER_IMAGE,
+                "bash",
+                "-c",
+                "cd /workspace && \
+                 forge install OpenZeppelin/openzeppelin-contracts@v5.0.0 && \
+                 forge install foundry-rs/forge-std",
+            ],
+            context,
+            &key,
+        )?;
+
+        if !output.status.success() {
+            return Err(format!(
+                "Failed to install dependencies: {}",
+                String::from_utf8_lossy(&output.stderr)
+            )
+            .into());
+        }
+
+        info!("Dependencies installed");
+    }
+
+    // Build contracts
+    info!("Building MockUSDFC contract...");
+    let key = format!("usdfc_setup_build_{}", run_id);
+    let container_name = format!("foc-{}-usdfc-build", run_id);
+    let output = run_and_log_command(
+        "docker",
+        &[
+            "run",
+            "--name",
+            &container_name,
+            "-u",
+            "foc-user",
+            "-v",
+            &format!("{}:/workspace", contract_dir.display()),
+            crate::constants::BUILDER_DOCKER_IMAGE,
+            "bash",
+            "-c",
+            "cd /workspace && forge build",
+        ],
+        context,
+        &key,
+    )?;
+
+    if !output.status.success() {
+        return Err(format!(
+            "Failed to build contracts: {}",
+            String::from_utf8_lossy(&output.stderr)
+        )
+        .into());
+    }
+
+    info!("Contracts built");
+    Ok(())
+}
diff --git a/src/commands/start/usdfc_deploy/verification.rs b/src/commands/start/usdfc_deploy/verification.rs
index 00445be..b2c6c57 100644
--- a/src/commands/start/usdfc_deploy/verification.rs
+++ b/src/commands/start/usdfc_deploy/verification.rs
@@ -33,38 +33,13 @@ pub fn verify_mock_usdfc(
     let verification_result = retry_with_fixed_delay(
         || {
             let verify_cmd = format!(
-                "set -euo pipefail && \
-                 DEPLOYER=$(cast wallet address --private-key {}) && \
-                 NAME=$(cast call --rpc-url {} {} 'name()(string)') && \
-                 SYMBOL=$(cast call --rpc-url {} {} 'symbol()(string)') && \
-                 DECIMALS=$(cast call --rpc-url {} {} 'decimals()(uint8)') && \
-                 TOTAL_SUPPLY=$(cast call --rpc-url {} {} 'totalSupply()(uint256)') && \
-                 BALANCE=$(cast call --rpc-url {} {} 'balanceOf(address)(uint256)' $DEPLOYER) && \
-                 echo \"Name: $NAME\" && \
-                 echo \"Symbol: $SYMBOL\" && \
-                 echo \"Decimals: $DECIMALS\" && \
-                 echo \"Total supply: $TOTAL_SUPPLY\" && \
-                 echo \"Deployer balance: $BALANCE\" && \
-                 TOTAL_SUPPLY_VALUE=$(echo \"$TOTAL_SUPPLY\" | awk '{{print $1}}') && \
-                 BALANCE_VALUE=$(echo \"$BALANCE\" | awk '{{print $1}}') && \
-                 ([ \"$NAME\" = 'Mock USDC' ] || [ \"$NAME\" = '\"Mock USDC\"' ]) && \
-                 ([ \"$SYMBOL\" = 'USDFC' ] || [ \"$SYMBOL\" = '\"USDFC\"' ]) && \
-                 [ \"$DECIMALS\" = '18' ] && \
-                 [ \"$TOTAL_SUPPLY_VALUE\" = '{}' ] && \
-                 [ \"$BALANCE_VALUE\" = '{}' ]",
-                private_key,
-                lotus_rpc_url,
-                contract_address,
-                lotus_rpc_url,
-                contract_address,
-                lotus_rpc_url,
-                contract_address,
-                lotus_rpc_url,
-                contract_address,
-                lotus_rpc_url,
-                contract_address,
-                crate::constants::MOCK_USDFC_INITIAL_SUPPLY,
-                crate::constants::MOCK_USDFC_INITIAL_SUPPLY
+                "cd /workspace && \
+                 forge script script/Verify.s.sol:VerifyMockUSDFC \
+                 --rpc-url {} \
+                 --private-key {} \
+                 --sig 'run(address)' {} \
+                 -vv",
+                lotus_rpc_url, private_key, contract_address
             );
 
             let key = format!("usdfc_verify_{}", run_id);
@@ -73,7 +48,6 @@ pub fn verify_mock_usdfc(
                 "docker",
                 &[
                     "run",
-                    "--rm",
                     "--name",
                     &container_name,
                     "-u",
diff --git a/src/commands/start/yugabyte/mod.rs b/src/commands/start/yugabyte/mod.rs
index 5d0be53..0f13018 100644
--- a/src/commands/start/yugabyte/mod.rs
+++ b/src/commands/start/yugabyte/mod.rs
@@ -106,8 +106,8 @@ fn spawn_yugabyte_instance(
         "--base_dir=/home/foc-user/yb_base",
         "--ui=true",
         "--callhome=false",
-        "--master_flags=rpc_bind_addresses=0.0.0.0,tablet_replicas_per_core_limit=0,tablet_replicas_per_gib_limit=0",
-        "--tserver_flags=rpc_bind_addresses=0.0.0.0,pgsql_proxy_bind_address=0.0.0.0:5433,cql_proxy_bind_address=0.0.0.0:9042,yb_num_shards_per_tserver=1,ysql_num_shards_per_tserver=1,tablet_replicas_per_core_limit=0,tablet_replicas_per_gib_limit=0",
+        "--master_flags=rpc_bind_addresses=0.0.0.0",
+        "--tserver_flags=rpc_bind_addresses=0.0.0.0,pgsql_proxy_bind_address=0.0.0.0:5433,cql_proxy_bind_address=0.0.0.0:9042",
         "--daemon=false",
     ]);
 

From 51ece7aed45bf5c8fef2245c5b921ebae8026094 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 20:49:38 +0200
Subject: [PATCH 17/21] fix: use latest synapse filecoin-pin test deps

---
 scenarios/test_multi_copy_upload.py | 56 ++---------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 30b8240..f69adfb 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -68,53 +68,6 @@ def output_text(value) -> str:
     return value or ""
 
 
-def patch_synapse_core_streaming_upload(npm_dir: Path) -> bool:
-    """Patch the temporary dependency tree for Node's streaming fetch behavior."""
-    patched = False
-    replacements = {
-        """const headers = {
-        'Content-Type': 'application/octet-stream',
-        ...(size == null ? {} : { 'Content-Length': size.toString() }),
-    };""": """const headers = {
-        'Content-Type': 'application/octet-stream',
-    };""",
-    }
-
-    candidates = [
-        npm_dir
-        / "node_modules"
-        / "@filoz"
-        / "synapse-core"
-        / "dist"
-        / "src"
-        / "sp"
-        / "sp.js",
-        npm_dir
-        / "node_modules"
-        / "@filoz"
-        / "synapse-core"
-        / "dist"
-        / "src"
-        / "sp"
-        / "upload-streaming.js",
-    ]
-
-    for candidate in candidates:
-        if not candidate.exists():
-            continue
-
-        text = candidate.read_text()
-        updated = text
-        for old, new in replacements.items():
-            updated = updated.replace(old, new)
-
-        if updated != text:
-            candidate.write_text(updated)
-            patched = True
-
-    return patched
-
-
 def run_filecoin_pin_add(
     filecoin_pin_bin: Path,
     upload_dir: Path,
@@ -245,8 +198,8 @@ def run():
                 "type=module",
                 "dependencies.filecoin-pin=0.20.0",
                 "dependencies.multiformats=13.4.2",
-                "overrides.@filoz/synapse-sdk=0.40.2",
-                "overrides.@filoz/synapse-core=0.3.3",
+                "overrides.@filoz/synapse-sdk=0.40.4",
+                "overrides.@filoz/synapse-core=0.4.1",
             ],
             label="pin filecoin-pin dependencies",
             cwd=npm_dir,
@@ -260,11 +213,6 @@ def run():
         ):
             return
 
-        if not patch_synapse_core_streaming_upload(npm_dir):
-            fail("Could not patch @filoz/synapse-core streaming upload")
-            return
-        info("Patched @filoz/synapse-core streaming upload in temp npm project")
-
         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)

From 4cb817b36ead8cbf0334fb4731be4df7e09f2344 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 21:32:47 +0200
Subject: [PATCH 18/21] test: use filecoin-pin 0.20.1

---
 scenarios/run.py                    | 2 +-
 scenarios/test_multi_copy_upload.py | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/scenarios/run.py b/scenarios/run.py
index c81fa57..8a366a6 100755
--- a/scenarios/run.py
+++ b/scenarios/run.py
@@ -26,7 +26,7 @@
 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
index f69adfb..cc4bed2 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -196,10 +196,8 @@ def run():
                 "pkg",
                 "set",
                 "type=module",
-                "dependencies.filecoin-pin=0.20.0",
+                "dependencies.filecoin-pin=0.20.1",
                 "dependencies.multiformats=13.4.2",
-                "overrides.@filoz/synapse-sdk=0.40.4",
-                "overrides.@filoz/synapse-core=0.4.1",
             ],
             label="pin filecoin-pin dependencies",
             cwd=npm_dir,

From 2331b6e3a94bc55860c2df951785b50e5db32246 Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 22:04:57 +0200
Subject: [PATCH 19/21] test: patch synapse streaming upload

---
 scenarios/test_multi_copy_upload.py | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index cc4bed2..d86473e 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -68,6 +68,45 @@ def output_text(value) -> str:
     return value or ""
 
 
+def patch_synapse_core_streaming_upload(npm_dir: Path) -> bool:
+    """Patch the temporary dependency tree for Node's streaming fetch behavior."""
+    patched = False
+    replacements = {
+        """const headers = {
+        'Content-Type': 'application/octet-stream',
+        ...(size == null ? {} : { 'Content-Length': size.toString() }),
+    };""": """const headers = {
+        'Content-Type': 'application/octet-stream',
+    };""",
+    }
+
+    candidates = [
+        npm_dir
+        / "node_modules"
+        / "@filoz"
+        / "synapse-core"
+        / "dist"
+        / "src"
+        / "sp"
+        / "upload-streaming.js",
+    ]
+
+    for candidate in candidates:
+        if not candidate.exists():
+            continue
+
+        text = candidate.read_text()
+        updated = text
+        for old, new in replacements.items():
+            updated = updated.replace(old, new)
+
+        if updated != text:
+            candidate.write_text(updated)
+            patched = True
+
+    return patched
+
+
 def run_filecoin_pin_add(
     filecoin_pin_bin: Path,
     upload_dir: Path,
@@ -211,6 +250,11 @@ def run():
         ):
             return
 
+        if not patch_synapse_core_streaming_upload(npm_dir):
+            fail("Could not patch @filoz/synapse-core streaming upload")
+            return
+        info("Patched @filoz/synapse-core streaming upload in temp npm project")
+
         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)

From 8a7558b30bcfae2c373bff014ef8a6eed637eb8d Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Mon, 4 May 2026 23:18:25 +0200
Subject: [PATCH 20/21] test: use single filecoin-pin multi-copy add

---
 scenarios/test_multi_copy_upload.py | 59 ++++++++++-------------------
 1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index d86473e..286edbf 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -32,7 +32,6 @@
 RETRIEVAL_DEADLINE_SECS = 90
 RETRIEVAL_INTERVAL_SECS = 5
 RETRIEVAL_REQUEST_TIMEOUT_SECS = 10
-PROVIDER_IDS = (1, 2)
 VERIFY_CID_SCRIPT = """
 import { readFileSync } from "node:fs";
 import { CID } from "multiformats";
@@ -268,45 +267,29 @@ def run():
 
         filecoin_pin_bin = npm_dir / "node_modules" / ".bin" / "filecoin-pin"
 
-        add_results = []
-        for provider_id in PROVIDER_IDS:
-            label = f"provider {provider_id}"
-            add_result = run_filecoin_pin_add(
-                filecoin_pin_bin,
-                upload_dir,
-                ["--copies", "1", "--provider-ids", str(provider_id)],
-                label,
-            )
-            if add_result is None:
-                fail(
-                    f"filecoin-pin add --network devnet {upload_dir} ({label}) did not run"
-                )
-                return
+        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 = f"{add_stdout}\n{add_stderr}".strip()
-            add_details_clean = strip_ansi(add_details)
-
-            if add_result.returncode != 0:
-                fail(f"""
-                    filecoin-pin add --network devnet --copies 1 --provider-ids {provider_id} {upload_dir} (exit={add_result.returncode})
-                    Retried for {ADD_DEADLINE_SECS}s.
-                    {add_details_clean}
-                    """.strip())
-                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())
 
-            add_results.append(add_result)
+        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 = "\n".join(
-            strip_ansi(output_text(result.stdout).strip()) for result in add_results
-        )
-        add_details_clean = "\n".join(
-            strip_ansi(
-                f"{output_text(result.stdout).strip()}\n{output_text(result.stderr).strip()}".strip()
-            )
-            for result in add_results
-        )
+        add_stdout_clean = strip_ansi(add_stdout)
 
         root_cid = None
         piece_cid = None
@@ -334,7 +317,7 @@ def run():
 
         if len(parsed_root_cids) != 1:
             fail(
-                f"Provider uploads returned different Root CIDs: {sorted(parsed_root_cids)}"
+                f"filecoin-pin output returned different Root CIDs: {sorted(parsed_root_cids)}"
             )
             return
 

From b002be490090297e5c2d22dea5ec77aab4c4a9ea Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Thu, 7 May 2026 19:57:55 +1000
Subject: [PATCH 21/21] test: address multi-copy upload review feedback

- make synapse-core Content-Length patch idempotent and document the
  upstream bug it papers over; only fail when the target file is missing
- assert npm (test only uses npm), not pnpm
- download verified payloads into a tempdir rather than ./ipfs/
- drop dead 'if not run_cmd' early-return branches (helpers.run_cmd
  already calls sys.exit(1) on failure)
- assert URL substitution actually changed each retrieval URL before
  rewriting /piece/<piece_cid> to /ipfs/<root_cid>
---
 scenarios/test_multi_copy_upload.py | 125 +++++++++++++++-------------
 1 file changed, 69 insertions(+), 56 deletions(-)

diff --git a/scenarios/test_multi_copy_upload.py b/scenarios/test_multi_copy_upload.py
index 286edbf..fd2b9d8 100644
--- a/scenarios/test_multi_copy_upload.py
+++ b/scenarios/test_multi_copy_upload.py
@@ -67,19 +67,29 @@ def output_text(value) -> str:
     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:
-    """Patch the temporary dependency tree for Node's streaming fetch behavior."""
-    patched = False
-    replacements = {
-        """const headers = {
-        'Content-Type': 'application/octet-stream',
-        ...(size == null ? {} : { 'Content-Length': size.toString() }),
-    };""": """const headers = {
-        'Content-Type': 'application/octet-stream',
-    };""",
-    }
-
-    candidates = [
+    """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"
@@ -87,23 +97,25 @@ def patch_synapse_core_streaming_upload(npm_dir: Path) -> bool:
         / "dist"
         / "src"
         / "sp"
-        / "upload-streaming.js",
-    ]
-
-    for candidate in candidates:
-        if not candidate.exists():
-            continue
-
-        text = candidate.read_text()
-        updated = text
-        for old, new in replacements.items():
-            updated = updated.replace(old, new)
-
-        if updated != text:
-            candidate.write_text(updated)
-            patched = True
-
-    return patched
+        / "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(
@@ -213,22 +225,22 @@ def download_and_verify(
 
 def run():
     assert_ok("command -v node", "node is installed")
-    assert_ok("command -v pnpm", "pnpm 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:
+    ) 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)
 
-        if not run_cmd(
-            ["npm", "init", "-y"],
-            label="npm init",
-            cwd=npm_dir,
-        ):
-            return
+        run_cmd(["npm", "init", "-y"], label="npm init", cwd=npm_dir)
 
-        if not run_cmd(
+        run_cmd(
             [
                 "npm",
                 "pkg",
@@ -239,20 +251,16 @@ def run():
             ],
             label="pin filecoin-pin dependencies",
             cwd=npm_dir,
-        ):
-            return
+        )
 
-        if not run_cmd(
-            ["npm", "install"],
-            label="npm install",
-            cwd=npm_dir,
-        ):
-            return
+        run_cmd(["npm", "install"], label="npm install", cwd=npm_dir)
 
         if not patch_synapse_core_streaming_upload(npm_dir):
-            fail("Could not patch @filoz/synapse-core streaming upload")
+            fail(
+                "Could not locate @filoz/synapse-core streaming upload "
+                "to patch (file missing under node_modules)"
+            )
             return
-        info("Patched @filoz/synapse-core streaming upload in temp npm project")
 
         random_file = upload_dir / RAND_FILE_NAME
         info(f"Creating random file ({RAND_FILE_SIZE} bytes)")
@@ -332,16 +340,21 @@ def run():
             )
             return
 
-        root_retrieval_urls = [
-            url.replace("/piece/", "/ipfs/").replace(piece_cid, root_cid)
-            for url in piece_retrieval_urls
-        ]
-
-        ipfs_dir = Path("ipfs").resolve()
-        ipfs_dir.mkdir(parents=True, exist_ok=True)
+        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 = ipfs_dir / f"{root_cid}_{i}.bin"
+            file = download_dir / f"{root_cid}_{i}.bin"
             error = download_and_verify(url, file, root_cid, npm_dir)
             if error:
                 fail(error)