Merge branch 'main' into feat/integrate-zksync-on-cli

Author: mshojaei-txfusion

.changeset/ninety-keys-brush.md

@@ -119,7 +119,7 @@ jobs:
       id-token: write
       contents: write
       pull-requests: write
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -1 +1 @@
-ea6268432101949d2f3b8d304b7aea9be841bf99
+31cc3e1a2c91f6b0e6125ccdcade99628b84fe04

.registryrc

@@ -10,24 +10,24 @@ COPY package.json yarn.lock .yarnrc.yml ./
 COPY .yarn/plugins ./.yarn/plugins
 COPY .yarn/releases ./.yarn/releases
 COPY .yarn/patches ./.yarn/patches
-COPY typescript/utils/package.json ./typescript/utils/
-COPY typescript/sdk/package.json ./typescript/sdk/
-COPY typescript/helloworld/package.json ./typescript/helloworld/
+COPY typescript/ccip-server/package.json ./typescript/ccip-server/
 COPY typescript/cli/package.json ./typescript/cli/
+COPY typescript/cosmos-sdk/package.json ./typescript/cosmos-sdk/
+COPY typescript/cosmos-types/package.json ./typescript/cosmos-types/
+COPY typescript/github-proxy/package.json ./typescript/github-proxy/
+COPY typescript/helloworld/package.json ./typescript/helloworld/
 COPY typescript/infra/package.json ./typescript/infra/
-COPY typescript/ccip-server/package.json ./typescript/ccip-server/
+COPY typescript/sdk/package.json ./typescript/sdk/
+COPY typescript/tsconfig/package.json ./typescript/tsconfig/
+COPY typescript/utils/package.json ./typescript/utils/
 COPY typescript/widgets/package.json ./typescript/widgets/
-COPY typescript/github-proxy/package.json ./typescript/github-proxy/
-COPY typescript/cosmos-types/package.json ./typescript/cosmos-types/
-COPY typescript/cosmos-sdk/package.json ./typescript/cosmos-sdk/
 COPY solidity/package.json ./solidity/
 COPY starknet/package.json ./starknet/
 
 RUN yarn install && yarn cache clean
 
 # Copy everything else
 COPY turbo.json ./
-COPY tsconfig.json ./
 COPY typescript ./typescript
 COPY solidity ./solidity
 COPY starknet ./starknet

Dockerfile

@@ -120,6 +120,7 @@ impl FromRawConf<RawRelayerSettings> for RelayerSettings {
         raw: RawRelayerSettings,
         cwp: &ConfigPath,
         _filter: (),
+        agent_name: &str,
     ) -> ConfigResult<Self> {
         let mut err = ConfigParsingError::default();
 
@@ -136,6 +137,7 @@ impl FromRawConf<RawRelayerSettings> for RelayerSettings {
             .parse_from_raw_config::<Settings, RawAgentConf, Option<&HashSet<&str>>>(
                 relay_chain_names.as_ref(),
                 "Parsing base config",
+                agent_name.to_string(),
             )
             .take_config_err(&mut err);
 

rust/main/agents/relayer/src/settings/mod.rs

@@ -43,6 +43,7 @@ impl FromRawConf<RawScraperSettings> for ScraperSettings {
         raw: RawScraperSettings,
         cwp: &ConfigPath,
         _filter: (),
+        agent_name: &str,
     ) -> ConfigResult<Self> {
         let mut err = ConfigParsingError::default();
 
@@ -59,6 +60,7 @@ impl FromRawConf<RawScraperSettings> for ScraperSettings {
             .parse_from_raw_config::<Settings, RawAgentConf, Option<&HashSet<&str>>>(
                 chains_names_to_scrape.as_ref(),
                 "Parsing base config",
+                agent_name.to_string(),
             )
             .take_config_err(&mut err);
 

rust/main/agents/scraper/src/settings.rs

@@ -70,6 +70,7 @@ impl FromRawConf<RawValidatorSettings> for ValidatorSettings {
         raw: RawValidatorSettings,
         cwp: &ConfigPath,
         _filter: (),
+        agent_name: &str,
     ) -> ConfigResult<Self> {
         let mut err = ConfigParsingError::default();
 
@@ -93,6 +94,7 @@ impl FromRawConf<RawValidatorSettings> for ValidatorSettings {
             .parse_from_raw_config::<Settings, RawAgentConf, Option<&HashSet<&str>>>(
                 origin_chain_name_set.as_ref(),
                 "Expected valid base agent configuration",
+                agent_name.to_string(),
             )
             .take_config_err(&mut err);
 
@@ -111,6 +113,7 @@ impl FromRawConf<RawValidatorSettings> for ValidatorSettings {
             .parse_from_raw_config::<SignerConf, RawAgentSignerConf, NoFilter>(
                 (),
                 "Expected valid validator configuration",
+                agent_name.to_string(),
             )
             .end();
 

rust/main/agents/validator/src/settings.rs

@@ -27,7 +27,7 @@ pub struct HyperlaneAgentCore {
 pub trait LoadableFromSettings: AsRef<Settings> + Sized {
     /// Create a new instance of these settings by reading the configs and env
     /// vars.
-    fn load() -> ConfigResult<Self>;
+    fn load(agent_name: &str) -> ConfigResult<Self>;
 }
 
 /// Metadata of an agent defined from configuration
@@ -93,7 +93,7 @@ pub async fn agent_main<A: BaseAgent>() -> Result<()> {
         git_sha()
     );
 
-    let settings = A::Settings::load()?;
+    let settings = A::Settings::load(A::AGENT_NAME)?;
     let agent_metadata = A::Metadata::build_metadata(&settings);
     let core_settings: &Settings = settings.as_ref();