Skip to content

fix: preserve all removed function selectors #54

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
hiddentao merged 1 commit into from
Aug 11, 2026
Merged

fix: preserve all removed function selectors #54

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/shared/diamond.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const resolveUpgrade = async (params: {
trace(`[Will not remove] method [${f}] pointing to facet ${liveFunctions[f]} (PROTECTED)`)
} else {
trace(`[Remove] method [${f}] pointing to facet ${liveFunctions[f]}`)
todo.remove[ZeroAddress] = todo.remove[liveFunctions[f]] || []
todo.remove[ZeroAddress] ??= []
todo.remove[ZeroAddress].push(f)
}
}
Expand Down
27 changes: 26 additions & 1 deletion test/common-deploy-steps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,32 @@ export const addDeployTestSteps = ({
expect(contract.getInt1()).to.be.rejectedWith('execution reverted')
})

it('and can handle multiple removals from the same facet', async () => {
writeFile(join(cwd, `${contractSrcBasePath}/facets/ExampleFacet.sol`), `
pragma solidity >=0.8.21;
import "../libs/LibAppStorage.sol";
contract ExampleFacet {
function setInt2(uint i) external {
AppStorage storage s = LibAppStorage.diamondStorage();
s.data.i1 = i + 1;
}
}
`)

expect(cli('build', { cwd }).success).to.be.true
expect(cli_deploy([]).success).to.be.true

const { contract } = await loadDiamondContract(cwd, [
'function setInt2(uint i) external',
'function setInt1(uint i) external',
'function getInt1() external view returns (uint)',
])

await sendTx(contract.setInt2(2))
await expect(contract.setInt1(2)).to.be.rejected
await expect(contract.getInt1()).to.be.rejected
})

it('and can prevent removals of protected methods', async () => {
writeFile(join(cwd, `${contractSrcBasePath}/facets/ExampleFacet.sol`), `
pragma solidity >=0.8.21;
Expand Down Expand Up @@ -972,4 +998,3 @@ export const addDeployTestSteps = ({

})
}

Loading