Skip to content

chore: Organize contracts folder#1308

Open
fusmanii wants to merge 4 commits intomasterfrom
faisal/acp-45-organize-contracts-folder
Open

chore: Organize contracts folder#1308
fusmanii wants to merge 4 commits intomasterfrom
faisal/acp-45-organize-contracts-folder

Conversation

@fusmanii
Copy link
Contributor

Completed: Organize contracts folder (ACP-45)

Files moved (32 total):

  • contracts/spoke-pools/ (20 files): All spoke pool contracts + PolygonTokenBridger
  • contracts/hub-pool/ (7 files): HubPool, BondToken, LpTokenFactory, AcrossConfigStore, PermissionSplitterProxy, AdapterStore, Blast_DaiRetriever
  • contracts/libraries/ (2 files): MerkleLib.sol, Lockable.sol
  • contracts/periphery/ (3 files): SpokePoolPeriphery, SpokePoolVerifier, AcrossEventEmitter

Import updates across ~70+ files:

  • Moved files: ./interfaces/ → ../interfaces/, etc.
  • Test mocks (contracts/test/): Updated paths to spoke-pools/, hub-pool/, libraries/
  • Chain adapters: Updated Blast_DaiRetriever and Ovm_SpokePool references
  • ERC7683: Updated SpokePool import
  • Libraries: Updated AdapterStore reference in OFTTransportAdapterWithStore
  • Foundry tests (~27 files): Updated all import paths
  • Deployment scripts (~17 files): Updated all import paths

Config updates:

  • foundry.toml: zksync profile path updated
  • hardhat.config.ts: All 12 compiler override paths updated

Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
@linear
Copy link

linear bot commented Feb 10, 2026

Comment on lines +10 to +12
constructor(
address _wrappedNativeTokenAddress
) Ovm_SpokePool(_wrappedNativeTokenAddress, 1 hours, 9 hours, IERC20(address(0)), ITokenMessenger(address(0))) {} // solhint-disable-line no-empty-blocks
Copy link
Contributor Author

Choose a reason for hiding this comment

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

formatting

Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
@fusmanii fusmanii marked this pull request as ready for review February 21, 2026 01:27
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.

1 participant