Skip to content

Update submodules and remove files that migrated to the vanilla repo #176

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.

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from

Conversation

Amxx
Copy link
Collaborator

@Amxx Amxx commented Jun 19, 2025

This is quite big !

  • update submodules for contracts and contracts-upgradeable
  • remove files that migrated to the vanilla repo
  • update import to link to the vanilla repo (contracts and test helpers)
  • update README.adoc
  • update mock generation to get rid of ERC20Mock.sol & co (in favor of $ERC20.sol)
  • update procedural generation to remove variants of EnumerableSet and EnumerableMap that are available in vanilla
  • update procedural generation to add paginated keys/values in Enumerable{Set,Map}Extended
  • update scripts for checks
  • fix minimal pragma for contracts/interfaces/IERC7786.sol (^0.8.0 -> ^0.8.4)
  • update .github/actions/setup/action.yml (migration to node 22.x)

Removed files

contracts/account/Account.sol // migrated
contracts/account/extensions/AccountERC7579.sol // migrated with draft prefix
contracts/account/extensions/AccountERC7579Hooked.sol // migrated with draft prefix
contracts/account/extensions/ERC7821.sol // migrated with draft prefix
contracts/mocks/CallReceiverMock.sol // replaced by contract-exposed
contracts/mocks/Create2Mock.sol // replaced by contract-exposed
contracts/mocks/ERC1155Mock.sol // replaced by contract-exposed
contracts/mocks/ERC20Mock.sol // replaced by contract-exposed
contracts/mocks/ERC721Mock.sol // replaced by contract-exposed
contracts/mocks/account/AccountECDSAMock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountERC7579Mock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountERC7702Mock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountERC7702WithModulesMock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountERC7913Mock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountMock.sol // migrated
contracts/mocks/account/AccountMultiSignerMock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountMultiSignerWeightedMock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountP256Mock.sol // migrated (into AccountMock.sol)
contracts/mocks/account/AccountRSAMock.sol // migrated (into AccountMock.sol)
contracts/mocks/utils/cryptography/ERC7739SignerECDSAMock.sol // migrated
contracts/mocks/utils/cryptography/ERC7739SignerP256Mock.sol // migrated
contracts/mocks/utils/cryptography/ERC7739SignerRSAMock.sol // migrated
contracts/utils/cryptography/ERC7739Utils.sol // migrated with draft prefix
contracts/utils/cryptography/ERC7913Utils.sol // migrated
contracts/utils/cryptography/signers/AbstractSigner.sol // migrated
contracts/utils/cryptography/signers/ERC7739.sol // migrated with draft prefix
contracts/utils/cryptography/signers/MultiSignerERC7913.sol // migrated
contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol // migrated
contracts/utils/cryptography/signers/SignerECDSA.sol // migrated
contracts/utils/cryptography/signers/SignerERC7702.sol // migrated
contracts/utils/cryptography/signers/SignerERC7913.sol // migrated
contracts/utils/cryptography/signers/SignerP256.sol // migrated
contracts/utils/cryptography/signers/SignerRSA.sol // migrated
contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol // migrated
contracts/utils/cryptography/verifiers/ERC7913RSAVerifier.sol // migrated
test/account/Account.behavior.js // migrated
test/account/Account.test.js // migrated
test/account/AccountECDSA.test.js // migrated
test/account/AccountERC7702.t.sol // migrated
test/account/AccountERC7702.test.js // migrated
test/account/AccountERC7913.test.js // migrated
test/account/AccountMultiSigner.test.js // migrated
test/account/AccountMultiSignerWeighted.test.js // migrated
test/account/AccountP256.test.js // migrated
test/account/AccountRSA.test.js // migrated
test/account/examples/AccountERC7702WithModulesMock.test.js // migrated
test/account/extensions/AccountERC7579.behavior.js // migrated
test/account/extensions/AccountERC7579.test.js // migrated
test/account/extensions/AccountERC7579Hooked.test.js // migrated
test/account/extensions/ERC7821.behavior.js // migrated
test/helpers/erc4337.js // migrated
test/helpers/erc7739.js // migrated
test/utils/cryptography/ERC1271.behavior.js // migrated
test/utils/cryptography/ERC7739.test.js // migrated
test/utils/cryptography/ERC7739Utils.test.js // migrated
test/utils/cryptography/ERC7913Utils.test.js // merged into SignatureChecker

@Amxx Amxx requested review from zkfriendly, benceharomi and a team as code owners June 19, 2025 09:50
@Amxx Amxx force-pushed the chore/vanilla-migration-pruning branch from 80a5a78 to 7ea3da9 Compare June 19, 2025 12:41
@ernestognw
Copy link
Member

We can't merge this until the documentation in vanilla is available. Also, we need to remove the documentation that we migrated to vanilla and make sure all references go to vanilla instead

@Amxx
Copy link
Collaborator Author

Amxx commented Jun 20, 2025

Do we get documentation with the RC, or only with final releases?

@ernestognw
Copy link
Member

We get it with the RC afaik.
Also, it may be clever to setup redirects so we don't loose any previously shared link: https://docs.antora.org/antora/latest/page/page-aliases/#create-a-redirect-for-a-renamed-page

@@ -4,10 +4,6 @@ NOTE: This document is better viewed at https://docs.openzeppelin.com/community-

This directory includes contracts to build accounts for ERC-4337. These include:

* {Account}: An ERC-4337 smart account implementation that includes the core logic to process user operations.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor & pretty out-of-scope:

NOTE: This document is better viewed at https://docs.openzeppelin.com/community-contracts/proxy

to be updated in https://docs.openzeppelin.com/community-contracts/access.

Comment on lines +27 to +31
clear: `$clear(uint256)`, // `$clear_EnumerableSetExtended_${name}(uint256)` when more types are added
length: `$length(uint256)`, // `$length_EnumerableSetExtended_${name}(uint256)` when more types are added
at: `$at(uint256,uint256)`, // `$at_EnumerableSetExtended_${name}(uint256,uint256)` when more types are added
values: `$values(uint256)`, // `$values_EnumerableSetExtended_${name}(uint256)` when more types are added
valuesPage: `$values(uint256,uint256,uint256)`, // `$values_EnumerableSetExtended_${name}(uint256,uint256,uint256)` when more types are added
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need these?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants