Skip to content

chore: Organize contracts folder#1308

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

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

Conversation

@fusmanii
Copy link
Contributor

@fusmanii fusmanii commented Feb 10, 2026 •
edited
Loading

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
  • script/chain-adapters/ (9 adapter deploy scripts)
  • script/spoke-pools/ (13 SpokePool deploy scripts)
  • script/hub-pool/ (2 hub pool deploy scripts)
  • script/periphery/ (5 periphery/handler deploy scripts)

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

@fusmanii
chore: Organize contracts folder
0353add 
Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
@linear
Copy link

linear bot commented Feb 10, 2026

ACP-45 Organize contracts folder

fusmanii
fusmanii commented Feb 10, 2026
View reviewed changes
@fusmanii
storage layout
4c011c0 
Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
@fusmanii
Merge branch 'master' of github.com:across-protocol/contracts into fa…
c787b30 
…isal/acp-45-organize-contracts-folder
@fusmanii
fix test
924eea0 
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
fusmanii and others added 3 commits March 19, 2026 11:12
@fusmanii
Merge branch 'master' of github.com:across-protocol/contracts into fa…
1509863 
…isal/acp-45-organize-contracts-folder
@fusmanii
fix build
9c0ee74 
Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>
@fusmanii @claude
chore: organize script folder into subfolders by context
81177db 
Move deploy scripts from the root of script/ into context-based subfolders
matching the contracts directory structure:
- script/chain-adapters/ (9 adapter deploy scripts)
- script/spoke-pools/ (13 SpokePool deploy scripts)
- script/hub-pool/ (2 hub pool deploy scripts)
- script/periphery/ (5 periphery/handler deploy scripts)

Updates all relative import paths and comment references accordingly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@fusmanii
Copy link
Contributor Author

fusmanii commented Mar 19, 2026

Closes https://linear.app/uma/issue/ACP-57/organize-script-folder

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrice32 mrice32 Awaiting requested review from mrice32 mrice32 is a code owner

@nicholaspai nicholaspai Awaiting requested review from nicholaspai nicholaspai is a code owner

@pxrl pxrl Awaiting requested review from pxrl pxrl is a code owner

@bmzig bmzig Awaiting requested review from bmzig bmzig is a code owner

@grasphoper grasphoper Awaiting requested review from grasphoper

@tbwebb22 tbwebb22 Awaiting requested review from tbwebb22

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@fusmanii