Skip to content

Fix incremental deploy address collision #146

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
AdamSpitz merged 1 commit into from
Sep 1, 2026
Merged

Fix incremental deploy address collision #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion hardhat/scripts/deploy-incremental.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,18 @@ async function main() {
// Reuse when the manifest fingerprint matches, or (adopt mode) whenever a live
// on-chain address exists — pinning it at the current fingerprint so later runs
// treat it as unchanged.
if (codePresent && (fingerprintMatch || adoptExisting)) {
const claimedBy = oldAddress && ethers.isAddress(oldAddress)
? Object.entries(addresses).find(([, addr]) => ethers.getAddress(addr) === ethers.getAddress(oldAddress))?.[0]
: undefined;
if (codePresent && (fingerprintMatch || adoptExisting) && !claimedBy) {
addresses[name] = ethers.getAddress(oldAddress);
manifest.contracts[name] = { contractName, address: addresses[name], fingerprint: fp, reused: true, constructorArgs: args, ...(fingerprintMatch ? {} : { adopted: true }) };
console.log(`↻ ${name}: ${fingerprintMatch ? 'unchanged' : 'ADOPTED from env'}, reusing ${addresses[name]}`);
return addresses[name];
}
if (claimedBy) {
console.log(`↻ ${name}: env ${keys[0]}=${oldAddress} is already ${claimedBy}; deploying a new ${contractName} instead`);
}
if (planOnly) {
// Genuinely new (no live address to adopt): record the intent, deploy nothing.
wouldDeploy.push(name);
Expand Down
Loading