Skip to content

Update and prepare scripts for X Layer network deployment #58

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

Jump to bottom
Merged
merged 4 commits into from
Oct 24, 2025
Merged

Update and prepare scripts for X Layer network deployment #58

merged 4 commits into from
Oct 24, 2025

Conversation

@sendra
Copy link
Collaborator

@sendra sendra commented Oct 22, 2025 •
edited
Loading

In this pr we prepare adi-deploy for X Layer network deployment.

Update scripts to add XLayer network: (some of the addresses are pending on XLayer update to OP Stack)

  • GranularGuardianNetworkDeploys (also adds new deployed safe guardians):
  • DeployXLayerAdapter (script to deploy the new XLayer adapter on ethereum and x layer) (some addresses are missing as we have to wait for OP Stack upgrade)
  • DeployCCC
  • Set_CCF_Sender_Adapters
  • Set_CCR_Confirmations
  • Set_CCR_Receiver_Adapters
  • BaseDeployerScript (add the new xlayerAdapter address to the deployment struct)
  • InitialDeployments (pending deployment of executor)
  • helpers (various helpers that are used for pre / post deployment operations)

Makefile: it has been updated with correct chain ids for deployment
Deployments: deployment jsons have been updated with the new xlayerAdapter (with address(0)) so that they do not break when read / writen

@github-actions
Copy link

github-actions bot commented Oct 22, 2025 •
edited
Loading

Forge Build Sizes

Contract Runtime Size (B) Initcode Size (B) Runtime Margin (B) Initcode Margin (B)
GovernanceV3Bob 44 94 24,532 49,058
MiscBob 44 94 24,532 49,058
UpdateCCCPermissionsXlayer 301 330 24,275 48,822
XLayerAdapter 2,414 3,980 22,162 45,172
XLayerAdapterDeploymentHelper 44 94 24,532 49,058
🔕 Unchanged
Contract Runtime Size (B) Initcode Size (B) Runtime Margin (B) Initcode Margin (B)
AaveV3InkWhitelabel 44 94 24,532 49,058
AaveV3InkWhitelabelAssets 44 94 24,532 49,058
AaveV3InkWhitelabelEModes 44 94 24,532 49,058
AaveV3InkWhitelabelExternalLibraries 44 94 24,532 49,058
Address (lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/utils/Address.sol) 44 94 24,532 49,058
Address (lib/aave-delivery-infrastructure/src/contracts/old-oz/Address.sol) 44 94 24,532 49,058
AddressAliasHelper (lib/aave-delivery-infrastructure/src/contracts/adapters/arbitrum/libs/AddressAliasHelper.sol) 44 94 24,532 49,058
AddressAliasHelper (lib/aave-delivery-infrastructure/src/contracts/adapters/zkSync/libs/AddressAliasHelper.sol) 44 94 24,532 49,058
ArbAdapter 2,895 4,396 21,681 44,756
ArbAdapterDeploymentHelper 44 94 24,532 49,058
ArbitrumAdapterTestnet 2,901 4,413 21,675 44,739
Arbitrum_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
Avalanche_Add_Shuffle_to_CCC_Payload 918 1,209 23,658 47,943
BaseCrossChainController 15,866 20,587 8,710 28,565
Base_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
Binance_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
BobAdapter 2,416 3,971 22,160 45,181
BobAdapterDeploymentHelper 44 94 24,532 49,058
BytesLib 44 94 24,532 49,058
CBAdapterDeploymentHelper 44 94 24,532 49,058
CBaseAdapter 2,416 3,886 22,160 45,266
CBaseAdapterTestnet 2,422 3,900 22,154 45,252
CCCImplDeploymentHelper 44 94 24,532 49,058
CCCUpdateDeploymentHelper 44 94 24,532 49,058
CCIPAdapter 4,362 6,013 20,214 43,139
CCIPAdapterDeploymentHelper 44 94 24,532 49,058
CCIPAdapterTestnet 4,225 5,886 20,351 43,266
ChainHelpers 44 94 24,532 49,058
ChainIds 44 94 24,532 49,058
Client 109 160 24,467 48,992
ConfiguratorInputTypes 44 94 24,532 49,058
Create2Utils 121 172 24,455 48,980
Create2UtilsZkSync 104 155 24,472 48,997
CrossChainController 16,952 21,673 7,624 27,479
CrossChainControllerUpgradeRev3 17,147 21,868 7,429 27,284
CrossChainControllerWithEmergencyMode 18,135 23,102 6,441 26,050
CrossChainControllerWithEmergencyModeUpgradeRev3 18,330 23,301 6,246 25,851
CrossChainForwarder 9,709 13,350 14,867 35,802
CrossChainReceiver 7,374 9,986 17,202 39,166
DataTypes 44 94 24,532 49,058
DeployerHelpers 44 94 24,532 49,058
ERC1967Proxy 122 967 24,454 48,185
ERC1967Utils 44 94 24,532 49,058
EmergencyRegistry 1,202 1,362 23,374 47,790
EmergencyRegistryDeploymentHelper 44 94 24,532 49,058
EnumerableSet (lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/utils/structs/EnumerableSet.sol) 44 94 24,532 49,058
EnumerableSet (lib/aave-helpers/lib/aave-address-book/src/common/ICrossChainController.sol) 44 94 24,532 49,058
EnvelopeUtils (lib/aave-delivery-infrastructure/src/contracts/libs/EncodingUtils.sol) 44 94 24,532 49,058
EnvelopeUtils (lib/aave-helpers/lib/aave-address-book/src/common/ICrossChainController.sol) 44 94 24,532 49,058
Errors (lib/aave-delivery-infrastructure/lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/utils/Errors.sol) 44 94 24,532 49,058
Errors (lib/aave-delivery-infrastructure/src/contracts/libs/Errors.sol) 2,276 2,329 22,300 46,823
Errors (lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/src/contracts/protocol/libraries/helpers/Errors.sol) 44 94 24,532 49,058
Errors (lib/aave-helpers/lib/aave-address-book/src/governance-v3/Errors.sol) 4,653 4,706 19,923 44,446
Ethereum_Add_Shuffle_to_CCC_Payload 1,133 1,424 23,443 47,728
Ethereum_Celo_Path_Payload 2,601 3,141 21,975 46,011
Ethereum_Plasma_Path_Payload 2,897 3,454 21,679 45,698
Ethereum_Sonic_Path_Payload 2,897 3,454 21,679 45,698
ExecutorOptions 44 94 24,532 49,058
GnosisAdapterDeploymentHelper 44 94 24,532 49,058
GnosisChainAdapter 2,505 4,038 22,071 45,114
Gnosis_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
GovV3Helpers 2,468 2,521 22,108 46,631
GovV3StorageHelpers 44 94 24,532 49,058
GovernanceV3Arbitrum 44 94 24,532 49,058
GovernanceV3Avalanche 44 94 24,532 49,058
GovernanceV3BNB 44 94 24,532 49,058
GovernanceV3Base 44 94 24,532 49,058
GovernanceV3Celo 44 94 24,532 49,058
GovernanceV3Ethereum 44 94 24,532 49,058
GovernanceV3Gnosis 44 94 24,532 49,058
GovernanceV3Ink 44 94 24,532 49,058
GovernanceV3InkWhitelabel 44 94 24,532 49,058
GovernanceV3Linea 44 94 24,532 49,058
GovernanceV3Mantle 44 94 24,532 49,058
GovernanceV3Metis 44 94 24,532 49,058
GovernanceV3Optimism 44 94 24,532 49,058
GovernanceV3Plasma 44 94 24,532 49,058
GovernanceV3Polygon 44 94 24,532 49,058
GovernanceV3PolygonZkEvm 44 94 24,532 49,058
GovernanceV3Scroll 44 94 24,532 49,058
GovernanceV3Soneium 44 94 24,532 49,058
GovernanceV3Sonic 44 94 24,532 49,058
GovernanceV3ZkSync 44 94 24,532 49,058
GranularGuardianAccessControl 6,507 7,392 18,069 41,760
GranularGuardianDeploymentHelper 44 94 24,532 49,058
HLAdapterDeploymentHelper 44 94 24,532 49,058
HyperLaneAdapter 2,694 4,208 21,882 44,944
InkAdapter 2,416 3,971 22,160 45,181
InkAdapterDeploymentHelper 44 94 24,532 49,058
IpfsUtils 44 94 24,532 49,058
LZAdapterDeploymentHelper 44 94 24,532 49,058
LayerZeroAdapter 4,578 6,092 19,998 43,060
LayerZeroAdapterTestnet 4,486 6,009 20,090 43,143
LineaAdapter 2,376 4,009 22,200 45,143
LineaAdapterDeploymentHelper 44 94 24,532 49,058
LineaAdapterTestnet 2,380 4,015 22,196 45,137
MantleAdapter 2,416 3,982 22,160 45,170
MantleAdapterDeploymentHelper 44 94 24,532 49,058
MantleAdapterTestnet 2,420 3,988 22,156 45,164
MetisAdapter 2,425 3,895 22,151 45,257
MetisAdapterDeploymentHelper 44 94 24,532 49,058
MetisAdapterTestnet 2,429 3,907 22,147 45,245
Metis_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
MiscArbitrum 44 94 24,532 49,058
MiscAvalanche 44 94 24,532 49,058
MiscBNB 44 94 24,532 49,058
MiscBase 44 94 24,532 49,058
MiscCelo 44 94 24,532 49,058
MiscEthereum 44 94 24,532 49,058
MiscGnosis 44 94 24,532 49,058
MiscInk 44 94 24,532 49,058
MiscLinea 44 94 24,532 49,058
MiscMantle 44 94 24,532 49,058
MiscMetis 44 94 24,532 49,058
MiscOptimism 44 94 24,532 49,058
MiscPlasma 44 94 24,532 49,058
MiscPolygon 44 94 24,532 49,058
MiscScroll 44 94 24,532 49,058
MiscSoneium 44 94 24,532 49,058
MiscSonic 44 94 24,532 49,058
MiscZkSync 44 94 24,532 49,058
MockDestination 667 894 23,909 48,258
OpAdapter 2,414 3,982 22,162 45,170
OpAdapterDeploymentHelper 44 94 24,532 49,058
OptimismAdapterTestnet 2,422 3,892 22,154 45,260
Optimism_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
OptionsBuilder 44 94 24,532 49,058
PayloadsControllerUtils 44 94 24,532 49,058
PolygonAdapterDeploymentHelper 44 94 24,532 49,058
PolygonAdapterEthereum 2,023 3,477 22,553 45,675
PolygonAdapterPolygon 2,023 3,477 22,553 45,675
Polygon_Add_Shuffle_to_CCC_Payload 918 1,209 23,658 47,943
ProxyAdmin 990 1,235 23,586 47,917
ProxyHelpers (lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/src/../tests/utils/ProxyHelpers.sol) 44 94 24,532 49,058
ProxyHelpers (lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/tests/utils/ProxyHelpers.sol) 44 94 24,532 49,058
SafeCast 44 94 24,532 49,058
SafeERC20 44 94 24,532 49,058
SameChainAdapter 1,635 1,664 22,941 47,488
SameChainAdapterDeploymentHelper 44 94 24,532 49,058
ScrollAdapter 2,580 4,229 21,996 44,923
ScrollAdapterDeploymentHelper 44 94 24,532 49,058
ScrollAdapterTestnet 2,584 4,241 21,992 44,911
Scroll_Add_Shuffle_to_CCC_Payload 846 1,137 23,730 48,015
SimpleAddForwarderAdapter 2,028 2,363 22,548 46,789
SoneiumAdapter 2,416 3,982 22,160 45,170
SoneiumAdapterDeploymentHelper 44 94 24,532 49,058
StandardHookMetadata 97 148 24,479 49,004
StorageHelpers 44 94 24,532 49,058
StorageSlot 44 94 24,532 49,058
TestNetChainIds 44 94 24,532 49,058
TestUtils 44 94 24,532 49,058
TransactionUtils (lib/aave-delivery-infrastructure/src/contracts/libs/EncodingUtils.sol) 44 94 24,532 49,058
TransactionUtils (lib/aave-helpers/lib/aave-address-book/src/common/ICrossChainController.sol) 44 94 24,532 49,058
TransparentProxyFactory 6,830 6,859 17,746 42,293
TransparentUpgradeableProxy 1,088 3,582 23,488 45,570
TypeCasts 44 94 24,532 49,058
UpdateCCCImpl 578 804 23,998 48,348
UpdateCCCPermissionsBob 379 408 24,197 48,744
UpdateCCCPermissionsInk 379 408 24,197 48,744
UpdateCCCPermissionsMantle 379 408 24,197 48,744
UpdateCCCPermissionsPlasma 379 408 24,197 48,744
UpdateCCCPermissionsSoneium 379 408 24,197 48,744
Utils 44 94 24,532 49,058
WormholeAdapter 3,378 4,934 21,198 44,218
WormholeAdapterDeploymentHelper 44 94 24,532 49,058
WormholeAdapterTestnet 3,156 4,723 21,420 44,429
ZkSyncAdapter 2,912 4,474 21,664 44,678
ZkSyncAdapterDeploymentHelper 44 94 24,532 49,058
ZkSyncAdapterTestnet 2,916 4,489 21,660 44,663

@github-actions
Copy link

github-actions bot commented Oct 22, 2025 •
edited
Loading

♻️ Forge Gas Snapshots

Seems like you are not measuring gas of any operations yet. 🤔
Consider adding some snapshot tests to measure regressions & improvements.

@sendra sendra changed the title Feat/x layer Update and prepare scripts for X Layer network deployment Oct 22, 2025
kyzia551
kyzia551 requested changes Oct 24, 2025
View reviewed changes
@sendra sendra merged commit 1f63897 into aave-dao:main Oct 24, 2025
1 of 2 checks passed
@sendra sendra deleted the feat/x-layer branch October 24, 2025 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kyzia551 kyzia551 kyzia551 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sendra @kyzia551