From f16084de639ed38ab31a834875a6fea6716e4a8d Mon Sep 17 00:00:00 2001 From: Amie Corso Date: Fri, 17 Jul 2026 12:50:03 -0700 Subject: [PATCH] fix(remappings): pin ds-test to direct forge-std path The committed remappings.txt resolves ds-test through a nested copy (lib/p256-verifier/lib/forge-std/lib/ds-test/src/). Solidity records the full remappings list in contract metadata, and with bytecodeHash=ipfs that metadata hash is appended to the creation bytecode. Since CREATE2 hashes the full init code, the stray path shifts the deterministic deployment address and 'make deploy' fails at the EXPECTED_IMPLEMENTATION assert in DeployFactory.s.sol. Pin ds-test to lib/forge-std/lib/ds-test/src/ to match the canonical v1.1 deployment. Verified locally (forge clean + forge build, deploy profile) that both the implementation (0x00000110...) and factory (0xBA5ED1...) addresses reproduce exactly. Co-authored-by: OpenCode --- remappings.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remappings.txt b/remappings.txt index 0e07371..aa0b8e8 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,7 +1,7 @@ @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/ FreshCryptoLib/=lib/webauthn-sol/lib/FreshCryptoLib/solidity/src/ account-abstraction/=lib/account-abstraction/contracts/ -ds-test/=lib/p256-verifier/lib/forge-std/lib/ds-test/src/ +ds-test/=lib/forge-std/lib/ds-test/src/ erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/ forge-std/=lib/forge-std/src/ openzeppelin-contracts/=lib/openzeppelin-contracts/