chore: rework logoURI logic, fix yaml files with issues

hyperlane-xyz · Jan 3, 2025 · 73389f4 · 73389f4
1 parent adb58ce
commit 73389f4
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 11 deletions.
diff --git a/chains/metertestnet/metadata.yaml b/chains/metertestnet/metadata.yaml
@@ -5,7 +5,7 @@ blockExplorers:
     name: Meter Testnet Explorer
     url: https://scan.meter.io/
 chainId: 83
-deployers:
+deployer:
   name: JaunePomme
   url: https://github.com/JaunePomme
 displayName: Meter testnet

diff --git a/chains/u2utestnet/metadata.yaml b/chains/u2utestnet/metadata.yaml
@@ -5,6 +5,9 @@ blockExplorers:
     name: u2uscan
     url: https://testnet.u2uscan.xyz
 chainId: 2484
+deployer:
+  name: junayedmh
+  url: https://github.com/JunayedMh
 displayName: U2U Testnet
 domainId: 2484
 isTestnet: true

diff --git a/...RT/ethereum-zircuit-config-addresses.yaml → ...es/Re7LRT/ethereum-zircuit-addresses.yaml b/...RT/ethereum-zircuit-config-addresses.yaml → ...es/Re7LRT/ethereum-zircuit-addresses.yaml
diff --git a/...tes/USDC/ethereum-ancient8-addresses.yaml → ...tes/USDC/ancient8-ethereum-addresses.yaml b/...tes/USDC/ethereum-ancient8-addresses.yaml → ...tes/USDC/ancient8-ethereum-addresses.yaml
diff --git a/...routes/USDC/ethereum-ancient8-config.yaml → ...routes/USDC/ancient8-ethereum-config.yaml b/...routes/USDC/ethereum-ancient8-config.yaml → ...routes/USDC/ancient8-ethereum-config.yaml
diff --git a/deployments/warp_routes/USDC/arbitrum-ethereum-optimism-polygon-prom-config.yaml b/deployments/warp_routes/USDC/arbitrum-ethereum-optimism-polygon-prom-config.yaml
@@ -35,6 +35,7 @@ tokens:
       - token: ethereum|polygon|0x93b637AEA6a0dF51E8E24E49C62da34f616491c5
       - token: ethereum|prom|0xd9c95e2ad330E11D7Dfa58f18504049f625E955e
     decimals: 6
+    logoURI: /deployments/warp_routes/USDC/logo.svg
     name: USD Coin
     standard: EvmHypCollateral
     symbol: USDC

diff --git a/deployments/warp_routes/USDC/bsc-polygon-prom-config.yaml b/deployments/warp_routes/USDC/bsc-polygon-prom-config.yaml
@@ -7,6 +7,7 @@ tokens:
       - token: ethereum|polygon|0xFDf46770Da4F907c09aEd92299552DC9c7996d99
       - token: ethereum|prom|0x424712Bec7c94a0F804c50F77B641A24F33A138e
     decimals: 18
+    logoURI: /deployments/warp_routes/USDC/logo.svg
     name: USD Coin
     standard: EvmHypCollateral
     symbol: USDC
@@ -16,6 +17,7 @@ tokens:
       - token: ethereum|bsc|0x647eeD57dFDd335f9B6f2a9DbDFe09f166b1AdaC
       - token: ethereum|prom|0x424712Bec7c94a0F804c50F77B641A24F33A138e
     decimals: 18
+    logoURI: /deployments/warp_routes/USDC/logo.svg
     name: USD Coin
     standard: EvmHypSynthetic
     symbol: USDC

diff --git a/...lipsemainnet-solanamainnet-addresses.yaml → ...net-ethereum-solanamainnet-addresses.yaml b/...lipsemainnet-solanamainnet-addresses.yaml → ...net-ethereum-solanamainnet-addresses.yaml
diff --git a/...-eclipsemainnet-solanamainnet-config.yaml → ...ainnet-ethereum-solanamainnet-config.yaml b/...-eclipsemainnet-solanamainnet-config.yaml → ...ainnet-ethereum-solanamainnet-config.yaml
diff --git a/deployments/warp_routes/USDT/bsc-polygon-prom-config.yaml b/deployments/warp_routes/USDT/bsc-polygon-prom-config.yaml
@@ -7,6 +7,7 @@ tokens:
       - token: ethereum|polygon|0xd9765D5fE176493808202e63E6B73b523D6A1C3A
       - token: ethereum|prom|0xDf6C58ec668daB037373BC49215722c2b0664484
     decimals: 18
+    logoURI: /deployments/warp_routes/USDT/logo.svg
     name: Tether USD
     standard: EvmHypCollateral
     symbol: USDT
@@ -16,6 +17,7 @@ tokens:
       - token: ethereum|bsc|0x74e19D0c1828be422dDCd367a6ADa8CA7003d1a9
       - token: ethereum|prom|0xDf6C58ec668daB037373BC49215722c2b0664484
     decimals: 18
+    logoURI: /deployments/warp_routes/USDT/logo.svg
     name: Tether USD
     standard: EvmHypSynthetic
     symbol: USDT

diff --git a/...TH/ethereum-eclipsemainnet-addresses.yaml → ...TH/eclipsemainnet-ethereum-addresses.yaml b/...TH/ethereum-eclipsemainnet-addresses.yaml → ...TH/eclipsemainnet-ethereum-addresses.yaml
diff --git a/.../tETH/ethereum-eclipsemainnet-config.yaml → .../tETH/eclipsemainnet-ethereum-config.yaml b/.../tETH/ethereum-eclipsemainnet-config.yaml → .../tETH/eclipsemainnet-ethereum-config.yaml
diff --git a/scripts/validate-file-data.js b/scripts/validate-file-data.js
@@ -12,7 +12,7 @@ const invalidTestnetChains = [];
 // warp routes errors
 const noConfigFileError = [];
 const noLogoFileError = [];
-const noLogoURIError = [];
+const logoURIError = [];
 const unorderedChainNamesError = [];
 
 function validateChains() {
@@ -91,15 +91,20 @@ function validateConfigFiles(entryPath) {
     const configFilePath = path.join(entryPath, configFile);
     const configData = readYaml(configFilePath);
 
+    let foundLogoURIs = 0;
+
     if ('tokens' in configData) {
       configData.tokens.forEach((token) => {
         if (!('logoURI' in token)) {
-          noLogoURIError.push({
-            chainName: token.chainName || 'unknown',
-            path: configFilePath,
-          });
+          foundLogoURIs++;
         }
       });
+
+      // if no entry found, skip check
+      if (foundLogoURIs === 0) return;
+
+      // otherwise all tokens must contain logoURI,
+      if (foundLogoURIs !== configData.tokens.length) logoURIError.push(configFilePath);
     }
   });
 }
@@ -117,7 +122,7 @@ function validateWarpRoutes() {
       const entryPath = path.join(warpRoutesDir, entry.name);
 
       // check if logo file exists
-      const logoFile = fs.readdirSync(entryPath).find((file) => file.includes('logo.svg'));
+      const logoFile = fs.readdirSync(entryPath).find((file) => file.includes('logo'));
       if (!logoFile) noLogoFileError.push(entryPath);
 
       validateConfigFiles(entryPath);
@@ -132,7 +137,7 @@ function validateErrors() {
     invalidTestnetChains.length +
     noConfigFileError.length +
     noLogoFileError.length +
-    noLogoURIError.length +
+    logoURIError.length +
     unorderedChainNamesError.length;
 
   if (errorCount === 0) return;
@@ -154,10 +159,10 @@ function validateErrors() {
   if (noConfigFileError.length > 0)
     console.error('Error: no config file at paths:', noConfigFileError);
 
-  if (noLogoFileError.length > 0)
-    console.error('Error: logo.svg file missing at:', noLogoFileError);
+  if (noLogoFileError.length > 0) console.error('Error: logo file missing at:', noLogoFileError);
 
-  if (noLogoURIError.length > 0) console.error('Error: Missing field logoURI at:', noLogoURIError);
+  if (logoURIError.length > 0)
+    console.error('Error: All tokens must contain logoURI field:', logoURIError);
 
   if (unorderedChainNamesError.length > 0)
     console.error(