Merge pull request #17 from syscoin/draft-v29

Draft v29

Author: sidhujag

.github/workflows/dead-links.yaml

@@ -19,4 +19,4 @@ jobs:
       - name: Find and check markdown files
         run: |
           GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
-          find . -type f -name "*.md" ! -path "*/node_modules/*" ! -path "*/openzeppelin*" ! -path "*/murky/*" -exec lychee --max-concurrency 1 --cache --retry-wait-time 10 --exclude-path .lycheeignore --github-token $GITHUB_TOKEN {} +
+          find . -type f -name "*.md" ! -path "*/node_modules/*" ! -path "*/openzeppelin*" ! -path "*/murky/*" -exec lychee --accept 200,201,301,302,403,429 --max-retries 5 --max-concurrency 1 --cache --retry-wait-time 30 --exclude-path .lycheeignore --github-token "$GITHUB_TOKEN" {} +

.github/workflows/l1-contracts-foundry-ci.yaml

@@ -114,11 +114,35 @@ jobs:
         # First we need to deploy the ecosystem contracts
         run: forge script ./deploy-scripts/DeployL1CoreContracts.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY --skip '*/l1-contracts/contracts/*'
 
-      - name: Run DeployL1 script
+      - name: Read bridgehub proxy address
+        id: read-bridgehub
         working-directory: ./l1-contracts
-        # l1-contracts are skipped because we don't want to recompile Bridgehub with a high optimizer-runs value.
-        # Otherwise, the Bridgehub contract size would be too large.
-        run: forge script ./deploy-scripts/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY --skip '*/l1-contracts/contracts/*'
+        run: |
+          # Extract bridgehub_proxy_addr allowing leading whitespace
+          BRIDGEHUB=$(
+            sed -nE 's/^[[:space:]]*bridgehub_proxy_addr[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' \
+              ./script-out/output-deploy-l1.toml | head -n1
+          )
+
+          echo "Parsed bridgehub_proxy_addr: $BRIDGEHUB"
+
+          if [[ -z "$BRIDGEHUB" || ! "$BRIDGEHUB" =~ ^0x[0-9a-fA-F]{40}$ ]]; then
+            echo "❌ Failed to parse a valid bridgehub address"
+            exit 1
+          fi
+
+          echo "BRIDGEHUB=$BRIDGEHUB" >> $GITHUB_ENV
+
+      - name: Run DeployCTM script with bridgehub
+        working-directory: ./l1-contracts
+        run: |
+          forge script ./deploy-scripts/DeployCTM.s.sol \
+            --ffi \
+            --rpc-url $ANVIL_RPC_URL \
+            --broadcast \
+            --private-key $ANVIL_PRIVATE_KEY \
+            --sig "runWithBridgehub(address,bool)" $BRIDGEHUB "false" \
+            --skip '*/l1-contracts/contracts/*'
 
       - name: Run DeployErc20 script
         working-directory: ./l1-contracts

.solhintignore

@@ -9,7 +9,7 @@ l1-contracts/node_modules
 l1-contracts/contracts/dev-contracts
 l1-contracts/test
 l1-contracts/deploy-scripts
-!l1-contracts/deploy-scripts/DeployL1.s.sol
+!l1-contracts/deploy-scripts/DeployCTM.s.sol
 !l1-contracts/deploy-scripts/DeployUtils.s.sol
 
 # l1-contracts-foundry

…-contracts/deploy-scripts/DeployL1.s.sol …contracts/deploy-scripts/DeployCTM.s.soll1-contracts/deploy-scripts/DeployL1.s.sol renamed to l1-contracts/deploy-scripts/DeployCTM.s.sol l1-contracts/deploy-scripts/DeployL1.s.sol renamed to l1-contracts/deploy-scripts/DeployCTM.s.sol

@@ -12,8 +12,8 @@ import {Diamond} from "contracts/state-transition/libraries/Diamond.sol";
 import {InitializeDataNewChain as DiamondInitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol";
 import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol";
 import {Create2AndTransfer} from "./Create2AndTransfer.sol";
-
 import {Create2FactoryUtils} from "./Create2FactoryUtils.s.sol";
+import {L2ContractHelper} from "contracts/common/l2-helpers/L2ContractHelper.sol";
 
 // solhint-disable-next-line gas-struct-packing
 struct DeployedAddresses {
@@ -188,67 +188,6 @@ abstract contract DeployUtils is Create2FactoryUtils {
         config.tokens.tokenWethAddress = toml.readAddress("$.tokens.token_weth_address");
     }
 
-    function initializeConfigIfEcosystemDeployedLocally(string memory configPath) internal virtual {
-        string memory toml = vm.readFile(configPath);
-
-        // Bridgehub Related
-        addresses.bridgehub.bridgehubImplementation = toml.readAddress(
-            ".deployed_addresses.bridgehub.bridgehub_implementation_addr"
-        );
-        addresses.bridgehub.bridgehubProxy = toml.readAddress(".deployed_addresses.bridgehub.bridgehub_proxy_addr");
-        addresses.bridgehub.ctmDeploymentTrackerImplementation = toml.readAddress(
-            ".deployed_addresses.bridgehub.ctm_deployment_tracker_implementation_addr"
-        );
-        addresses.bridgehub.ctmDeploymentTrackerProxy = toml.readAddress(
-            ".deployed_addresses.bridgehub.ctm_deployment_tracker_proxy_addr"
-        );
-        addresses.bridgehub.chainAssetHandlerImplementation = toml.readAddress(
-            ".deployed_addresses.bridgehub.chain_asset_handler_implementation_addr"
-        );
-        addresses.bridgehub.chainAssetHandlerProxy = toml.readAddress(
-            ".deployed_addresses.bridgehub.chain_asset_handler_proxy_addr"
-        );
-        addresses.bridgehub.messageRootImplementation = toml.readAddress(
-            ".deployed_addresses.bridgehub.message_root_implementation_addr"
-        );
-        addresses.bridgehub.messageRootProxy = toml.readAddress(
-            ".deployed_addresses.bridgehub.message_root_proxy_addr"
-        );
-
-        // Bridges
-        addresses.bridges.erc20BridgeImplementation = toml.readAddress(
-            ".deployed_addresses.bridges.erc20_bridge_implementation_addr"
-        );
-        addresses.bridges.erc20BridgeProxy = toml.readAddress(".deployed_addresses.bridges.erc20_bridge_proxy_addr");
-        addresses.bridges.l1NullifierImplementation = toml.readAddress(
-            ".deployed_addresses.bridges.l1_nullifier_implementation_addr"
-        );
-        addresses.bridges.l1NullifierProxy = toml.readAddress(".deployed_addresses.bridges.l1_nullifier_proxy_addr");
-        addresses.bridges.l1AssetRouterImplementation = toml.readAddress(
-            ".deployed_addresses.bridges.shared_bridge_implementation_addr"
-        );
-        addresses.bridges.l1AssetRouterProxy = toml.readAddress(".deployed_addresses.bridges.shared_bridge_proxy_addr");
-
-        // Other Important Deployed Addresses
-        addresses.governance = toml.readAddress(".deployed_addresses.governance_addr");
-        addresses.transparentProxyAdmin = toml.readAddress(".deployed_addresses.transparent_proxy_admin_addr");
-        addresses.chainAdmin = toml.readAddress(".deployed_addresses.chain_admin");
-        addresses.daAddresses.rollupDAManager = toml.readAddress(".deployed_addresses.l1_rollup_da_manager");
-        addresses.daAddresses.l1RollupDAValidator = toml.readAddress(".deployed_addresses.rollup_l1_da_validator_addr");
-        addresses.daAddresses.noDAValidiumL1DAValidator = toml.readAddress(
-            ".deployed_addresses.no_da_validium_l1_validator_addr"
-        );
-        addresses.daAddresses.availL1DAValidator = toml.readAddress(".deployed_addresses.avail_l1_da_validator_addr");
-        addresses.vaults.l1NativeTokenVaultProxy = toml.readAddress(".deployed_addresses.native_token_vault_addr");
-        config.contracts.multicall3Addr = toml.readAddress(".multicall3_addr");
-
-        if (vm.keyExistsToml(toml, "$.deployed_addresses.state_transition.state_transition_proxy_addr")) {
-            addresses.stateTransition.chainTypeManagerProxy = toml.readAddress(
-                ".deployed_addresses.state_transition.state_transition_proxy_addr"
-            );
-        }
-    }
-
     function deployStateTransitionDiamondFacets() internal {
         addresses.stateTransition.executorFacet = deploySimpleContract("ExecutorFacet", false);
         addresses.stateTransition.adminFacet = deploySimpleContract("AdminFacet", false);
@@ -519,6 +458,14 @@ abstract contract DeployUtils is Create2FactoryUtils {
         }
     }
 
+    function calculateExpectedL2Address(string memory contractName) internal returns (address) {
+        return Utils.getL2AddressViaCreate2Factory(bytes32(0), getL2BytecodeHash(contractName), hex"");
+    }
+
+    function getL2BytecodeHash(string memory contractName) public view virtual returns (bytes32) {
+        return L2ContractHelper.hashL2Bytecode(getCreationCode(contractName, true));
+    }
+
     function getInitializeCalldata(
         string memory contractName,
         bool isZKBytecode