Merge remote-tracking branch 'origin/main' into pb/jan23

Dockerfile

@@ -30,9 +30,16 @@ COPY solidity ./solidity
 
 RUN yarn build
 
+# Baked-in registry version
+# keep for back-compat until we update all usage of the monorepo image (e.g. key-funder)
 ENV REGISTRY_URI="/hyperlane-registry"
 ARG REGISTRY_COMMIT="main"
 RUN git clone https://github.com/hyperlane-xyz/hyperlane-registry.git "$REGISTRY_URI" \
     && cd "$REGISTRY_URI" \
     && git fetch origin "$REGISTRY_COMMIT" \
     && git checkout "$REGISTRY_COMMIT"
+
+# Add entrypoint script that allows overriding the registry commit
+COPY docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT ["docker-entrypoint.sh"]

docker-entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+# Set default registry URI, same as Dockerfile
+REGISTRY_URI="/hyperlane-registry"
+
+# Only update registry if REGISTRY_COMMIT is set
+if [ -n "$REGISTRY_COMMIT" ]; then
+  echo "Updating Hyperlane registry to commit: ${REGISTRY_COMMIT}"
+  OLDPWD=$(pwd)
+  cd "$REGISTRY_URI"
+  git fetch origin "$REGISTRY_COMMIT"
+  git checkout "$REGISTRY_COMMIT"
+  cd "$OLDPWD"
+fi
+
+# Execute the main container command
+exec "$@"

solidity/.gitignore

@@ -15,10 +15,3 @@ docs
 flattened/
 buildArtifact.json
 fixtures/
-# ZKSync
-artifacts-zk
-cache-zk
-core-utils/zksync/artifacts/output
-.zksolc-libraries-cache/
-typechain-types/
-typechain/

solidity/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @hyperlane-xyz/core
 
+## 5.10.0
+
+### Minor Changes
+
+- db8c09011: Add ZKSync support and restructure build artifacts:
+
+  - Add ZKSync compilation support
+  - Restructure typechain directory location to core-utils/typechain
+  - Add ZKSync-specific artifact generation and exports
+  - Update build process to handle both standard and ZKSync artifacts
+  - Add new exports for ZKSync build artifacts and contract types
+
+### Patch Changes
+
+- 11cf66c5e: Export empty zksync buildArtifact to satisfy package.json exports
+  - @hyperlane-xyz/utils@8.3.0
+
 ## 5.9.2
 
 ### Patch Changes

solidity/contracts/PackageVersioned.sol

@@ -7,5 +7,5 @@ pragma solidity >=0.6.11;
  **/
 abstract contract PackageVersioned {
     // GENERATED CODE - DO NOT EDIT
-    string public constant PACKAGE_VERSION = "5.9.2";
+    string public constant PACKAGE_VERSION = "5.10.0";
 }

solidity/exportBuildArtifact.sh

@@ -37,42 +37,3 @@ else
   echo 'Failed to process build artifact with jq'
   exit 1
 fi
-
-# ZKSYNC
-
-if [ "$ZKSYNC" = "true" ]; then
-  # Define the artifacts directory
-  artifactsDir="./artifacts-zk/build-info"
-  # Define the output file
-  outputFileJson="./dist/zksync/buildArtifact.json"
-  outputFileJs="./dist/zksync/buildArtifact.js"
-  outputFileTsd="./dist/zksync/buildArtifact.d.ts"
-
-  # log that we're in the script
-  echo 'Finding and processing ZKSync hardhat build artifact...'
-
-  # Find most recently modified JSON build artifact
-  if [ "$(uname)" = "Darwin" ]; then
-    # for local flow
-    jsonFiles=$(find "$artifactsDir" -type f -name "*.json" -exec stat -f "%m %N" {} \; | sort -rn | head -n 1 | cut -d' ' -f2-)
-  else
-    # for CI flow
-    jsonFiles=$(find "$artifactsDir" -type f -name "*.json" -exec stat -c "%Y %n" {} \; | sort -rn | head -n 1 | cut -d' ' -f2-)
-  fi
-
-  if [ ! -f "$jsonFiles" ]; then
-    echo 'Failed to find ZKSync build artifact'
-    exit 1
-  fi
-
-  # Extract required keys and write to outputFile
-  if jq -c '{input, solcLongVersion, zk_version: .output.zk_version}' "$jsonFiles" >"$outputFileJson"; then
-    echo "export const buildArtifact = " >"$outputFileJs"
-    cat "$outputFileJson" >>"$outputFileJs"
-    echo "export const buildArtifact: any" >"$outputFileTsd"
-    echo 'Finished processing ZKSync build artifact.'
-  else
-    echo 'Failed to process ZKSync build artifact with jq'
-    exit 1
-  fi
-fi

solidity/hardhat.config.cts

@@ -22,7 +22,7 @@ module.exports = {
     currency: 'USD',
   },
   typechain: {
-    outDir: './core-utils/typechain',
+    outDir: './types',
     target: 'ethers-v5',
     alwaysGenerateOverloads: true,
     node16Modules: true,