Merge branch 'master' of github.com:across-protocol/contracts into faisal/add-missing-script

Author: fusmanii

.github/actions/setup-node-if-needed/action.yml

@@ -15,7 +15,7 @@ runs:
       id: check-node
       shell: bash
       run: |
-        if command -v node >/dev/null 2>&1; then
+        if node --version 2>/dev/null | grep -q "v${{ inputs.node_version }}"; then
           echo "installed=true" >> "$GITHUB_OUTPUT"
         else
           echo "installed=false" >> "$GITHUB_OUTPUT"

.github/workflows/pr.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - "master"
 env:
-  NODE_VERSION: 20
+  NODE_VERSION: 22.18
 jobs:
   # Multiple jobs depend on having EVM and SVM artifacts available, so we upload them first in separate jobs.
   upload-svm-artifacts:
@@ -144,6 +144,16 @@ jobs:
         with:
           verify_version: 0.4.3
           node_version: ${{ env.NODE_VERSION }}
+      - name: Check which paths changed
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            svm:
+              - 'programs/**'
+              - 'scripts/svm/**'
+              - 'src/svm/**'
+              - 'test/svm/**'
       - name: Download SVM artifacts
         uses: actions/download-artifact@v4
         with:
@@ -165,6 +175,7 @@ jobs:
         if: steps.verified-test-build-cache.outputs.cache-hit != 'true'
         run: tar -cf svm-verified-test-binaries.tar target/deploy
       - name: Test verified SVM build
+        if: steps.filter.outputs.svm == 'true'
         run: anchor test --skip-build
   build-ts:
     name: Build TypeScript

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ on:
 permissions:
   contents: write
 env:
-  NODE_VERSION: "20.x"
+  NODE_VERSION: 22.18
   EVM_ARTIFACTS_PATHS: |
     artifacts
     cache

contracts/AcrossEventEmitter.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+/**
+ * @title AcrossEventEmitter
+ * @notice A simple contract that emits events with bytes encoded metadata
+ */
+contract AcrossEventEmitter {
+    /**
+     * @notice Emitted when metadata is stored
+     * @param data The metadata bytes emitted
+     */
+    event MetadataEmitted(bytes data);
+
+    /**
+     * @notice Emits metadata as an event
+     * @param data The bytes data to emit
+     */
+    function emitData(bytes calldata data) external {
+        require(data.length > 0, "Data cannot be empty");
+        emit MetadataEmitted(data);
+    }
+}

deploy/111_deploy_universal_spokepool.ts

@@ -1,10 +1,20 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
-import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, ZERO_ADDRESS } from "./consts";
+import {
+  EXPECTED_SAFE_ADDRESS,
+  FILL_DEADLINE_BUFFER,
+  L2_ADDRESS_MAP,
+  QUOTE_TIME_BUFFER,
+  USDC,
+  ZERO_ADDRESS,
+} from "./consts";
 import { CHAIN_IDs, PRODUCTION_NETWORKS, TOKEN_SYMBOLS_MAP } from "../utils/constants";
-import { getOftEid, toWei } from "../utils/utils";
+import { getOftEid, toWei, predictedSafe } from "../utils/utils";
+import { getNodeUrl } from "../utils";
 import { getDeployedAddress } from "../src/DeploymentUtils";
+import "@nomiclabs/hardhat-ethers";
+import Safe from "@safe-global/protocol-kit";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { hubPool, hubChainId, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -53,7 +63,38 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   // target address of the spoke pool. This is because the HubPool does not pass in the chainId when calling
   // relayMessage() on the Adapter. Therefore, if Universal SpokePools share the same address,
   // then a message designed to be sent to one chain could be sent to another's SpokePool.
-  await deployNewProxy("Universal_SpokePool", constructorArgs, initArgs);
+  const { proxyAddress } = await deployNewProxy("Universal_SpokePool", constructorArgs, initArgs);
+
+  if (!proxyAddress) {
+    return;
+  }
+
+  const nodeUrl = getNodeUrl(spokeChainId);
+
+  const protocolKit = await Safe.init({
+    provider: nodeUrl,
+    predictedSafe,
+  });
+
+  const existingProtocolKit = await protocolKit.connect({
+    safeAddress: EXPECTED_SAFE_ADDRESS,
+  });
+  const isDeployed = await existingProtocolKit.isSafeDeployed();
+
+  if (!isDeployed) {
+    throw new Error("Expected Safe address is not deployed, please deploy it first");
+  }
+
+  const factory = await hre.ethers.getContractFactory("Universal_SpokePool");
+  const contract = factory.attach(proxyAddress);
+
+  const owner = await contract.owner();
+  if (owner !== EXPECTED_SAFE_ADDRESS) {
+    await (await contract.transferOwnership(EXPECTED_SAFE_ADDRESS)).wait();
+    console.log("Transferred ownership to Expected Safe address:", await contract.owner());
+  } else {
+    console.log("Expected Safe address is already the owner of the Universal SpokePool");
+  }
 };
 module.exports = func;
 func.tags = ["UniversalSpokePool"];

deploy/114_deploy_across_event_emitter.ts

@@ -0,0 +1,15 @@
+import { DeployFunction } from "hardhat-deploy/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployer } = await hre.getNamedAccounts();
+  const instance = await hre.deployments.deploy("AcrossEventEmitter", {
+    from: deployer,
+    log: true,
+    skipIfAlreadyDeployed: true,
+  });
+  await hre.run("verify:verify", { address: instance.address });
+};
+
+module.exports = func;
+func.tags = ["AcrossEventEmitter"];

deploy/consts.ts

@@ -22,6 +22,16 @@ export const ZK_L1_GAS_TO_L2_GAS_PER_PUBDATA_LIMIT = 800;
 export const ZK_L2_GAS_LIMIT = 2000000;
 export const ZK_MAX_GASPRICE = "10000000000000"; // 10k gwei
 
+// Expected Safe address for Universal SpokePool
+export const EXPECTED_SAFE_ADDRESS = "0x0Fc8E2BB9bEd4FDb51a0d36f2415c4C7F9e75F6e";
+export const EXPECTED_SAFE_OWNERS = [
+  "0x868CF19464e17F76D6419ACC802B122c22D2FD34",
+  "0xcc400c09ecBAC3e0033e4587BdFAABB26223e37d",
+  "0x837219D7a9C666F5542c4559Bf17D7B804E5c5fe",
+  "0x1d933Fd71FF07E69f066d50B39a7C34EB3b69F05",
+  "0x996267d7d1B7f5046543feDe2c2Db473Ed4f65e9",
+];
+
 export const L1_ADDRESS_MAP: { [key: number]: { [contractName: string]: string } } = {
   [CHAIN_IDs.MAINNET]: {
     finder: "0x40f941E48A552bF496B154Af6bf55725f18D77c3",

foundry.lock

@@ -1,8 +1,8 @@
 {
   "lib/forge-std": {
     "tag": {
-      "name": "v1.10.0",
-      "rev": "8bbcf6e3f8f62f419e5429a0bd89331c85c37824"
+      "name": "v1.11.0",
+      "rev": "8e40513d678f392f398620b3ef2b418648b33e89"
     }
   }
 }

hardhat.config.ts

@@ -309,6 +309,14 @@ const config: HardhatUserConfig = {
           browserURL: "https://explorer.redstone.xyz",
         },
       },
+      {
+        network: "plasma",
+        chainId: 9745,
+        urls: {
+          apiURL: "https://api.routescan.io/v2/network/mainnet/evm/9745/etherscan",
+          browserURL: "https://plasmascan.to",
+        },
+      },
       {
         network: "soneium",
         chainId: CHAIN_IDs.SONEIUM,