Skip to content

fix(attach-base): introduce _omniStore #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lekhovitsky merged 2 commits into from
Jul 21, 2026
Merged

fix(attach-base): introduce _omniStore #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef3b211
fix(attach-base): introduce `_omniStore`
lekhovitsky Jul 21, 2026
557e473
fix(attach-base): fix `_omniStore` for script context
lekhovitsky Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions contracts/test/suite/AttachBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,11 @@ abstract contract AttachBase is CommonBase {
bytecodeRepository.submitAuditReport(bytecodeHash, auditReport);

if (bytecodeRepository.isPublicDomain(Domain.extractDomain(contractType))) {
if (bytecodeRepository.getContractTypeOwner(contractType) != address(0)) {
// TODO: check if this works in script contexts, not sure about `checked_write`
stdstore.target(address(bytecodeRepository)).sig("getContractTypeOwner(bytes32)").with_key(contractType)
.checked_write(author.addr);
address owner = bytecodeRepository.getContractTypeOwner(contractType);
if (owner != address(0) && owner != author.addr) {
uint256 slot = stdstore.target(address(bytecodeRepository)).sig("getContractTypeOwner(bytes32)")
.with_key(contractType).find();
_omniStore(address(bytecodeRepository), bytes32(slot), bytes32(uint256(uint160(author.addr))));
}
_omniPrank(deployer);
bytecodeRepository.allowPublicContract(bytecodeHash);
Expand Down Expand Up @@ -512,6 +513,20 @@ abstract contract AttachBase is CommonBase {
}
}

function _omniStore(address target, bytes32 slot, bytes32 value) internal {
if (vm.isContext(VmSafe.ForgeContext.TestGroup)) {
vm.store(target, slot, value);
} else if (vm.isContext(VmSafe.ForgeContext.ScriptGroup)) {
vm.store(target, slot, value);
vm.rpc(
"anvil_setStorageAt",
string.concat('["', vm.toString(target), '","', vm.toString(slot), '","', vm.toString(value), '"]')
);
} else {
revert UnknownExecutionContext();
}
}

function _buildDomainSeparator(address eip712Contract) internal view returns (bytes32) {
(, string memory name, string memory version, uint256 chainId, address verifyingContract,,) =
IERC5267(eip712Contract).eip712Domain();
Expand Down
Loading