From 73389f4d3caa936b7a99ff28d4d95c74f7c7e24f Mon Sep 17 00:00:00 2001 From: Xaroz Date: Fri, 3 Jan 2025 10:13:40 -0600 Subject: [PATCH] chore: rework logoURI logic, fix yaml files with issues --- chains/metertestnet/metadata.yaml | 2 +- chains/u2utestnet/metadata.yaml | 3 +++ ...s.yaml => ethereum-zircuit-addresses.yaml} | 0 ....yaml => ancient8-ethereum-addresses.yaml} | 0 ...fig.yaml => ancient8-ethereum-config.yaml} | 0 ...ethereum-optimism-polygon-prom-config.yaml | 1 + .../USDC/bsc-polygon-prom-config.yaml | 2 ++ ...net-ethereum-solanamainnet-addresses.yaml} | 0 ...ainnet-ethereum-solanamainnet-config.yaml} | 0 .../USDT/bsc-polygon-prom-config.yaml | 2 ++ ...=> eclipsemainnet-ethereum-addresses.yaml} | 0 ...ml => eclipsemainnet-ethereum-config.yaml} | 0 scripts/validate-file-data.js | 25 +++++++++++-------- 13 files changed, 24 insertions(+), 11 deletions(-) rename deployments/warp_routes/Re7LRT/{ethereum-zircuit-config-addresses.yaml => ethereum-zircuit-addresses.yaml} (100%) rename deployments/warp_routes/USDC/{ethereum-ancient8-addresses.yaml => ancient8-ethereum-addresses.yaml} (100%) rename deployments/warp_routes/USDC/{ethereum-ancient8-config.yaml => ancient8-ethereum-config.yaml} (100%) rename deployments/warp_routes/USDC/{ethereum-eclipsemainnet-solanamainnet-addresses.yaml => eclipsemainnet-ethereum-solanamainnet-addresses.yaml} (100%) rename deployments/warp_routes/USDC/{ethereum-eclipsemainnet-solanamainnet-config.yaml => eclipsemainnet-ethereum-solanamainnet-config.yaml} (100%) rename deployments/warp_routes/tETH/{ethereum-eclipsemainnet-addresses.yaml => eclipsemainnet-ethereum-addresses.yaml} (100%) rename deployments/warp_routes/tETH/{ethereum-eclipsemainnet-config.yaml => eclipsemainnet-ethereum-config.yaml} (100%) diff --git a/chains/metertestnet/metadata.yaml b/chains/metertestnet/metadata.yaml index 1f51dace8..b401730ae 100644 --- 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 index e8efa1713..f7f3e0a78 100644 --- 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/deployments/warp_routes/Re7LRT/ethereum-zircuit-config-addresses.yaml b/deployments/warp_routes/Re7LRT/ethereum-zircuit-addresses.yaml similarity index 100% rename from deployments/warp_routes/Re7LRT/ethereum-zircuit-config-addresses.yaml rename to deployments/warp_routes/Re7LRT/ethereum-zircuit-addresses.yaml diff --git a/deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml b/deployments/warp_routes/USDC/ancient8-ethereum-addresses.yaml similarity index 100% rename from deployments/warp_routes/USDC/ethereum-ancient8-addresses.yaml rename to deployments/warp_routes/USDC/ancient8-ethereum-addresses.yaml diff --git a/deployments/warp_routes/USDC/ethereum-ancient8-config.yaml b/deployments/warp_routes/USDC/ancient8-ethereum-config.yaml similarity index 100% rename from deployments/warp_routes/USDC/ethereum-ancient8-config.yaml rename to deployments/warp_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 index 36c0cc94c..2ccb1f7bf 100644 --- 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 index 56a735b7c..b46931df2 100644 --- 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/deployments/warp_routes/USDC/ethereum-eclipsemainnet-solanamainnet-addresses.yaml b/deployments/warp_routes/USDC/eclipsemainnet-ethereum-solanamainnet-addresses.yaml similarity index 100% rename from deployments/warp_routes/USDC/ethereum-eclipsemainnet-solanamainnet-addresses.yaml rename to deployments/warp_routes/USDC/eclipsemainnet-ethereum-solanamainnet-addresses.yaml diff --git a/deployments/warp_routes/USDC/ethereum-eclipsemainnet-solanamainnet-config.yaml b/deployments/warp_routes/USDC/eclipsemainnet-ethereum-solanamainnet-config.yaml similarity index 100% rename from deployments/warp_routes/USDC/ethereum-eclipsemainnet-solanamainnet-config.yaml rename to deployments/warp_routes/USDC/eclipsemainnet-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 index 8756ed9c1..05368dbe8 100644 --- 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/deployments/warp_routes/tETH/ethereum-eclipsemainnet-addresses.yaml b/deployments/warp_routes/tETH/eclipsemainnet-ethereum-addresses.yaml similarity index 100% rename from deployments/warp_routes/tETH/ethereum-eclipsemainnet-addresses.yaml rename to deployments/warp_routes/tETH/eclipsemainnet-ethereum-addresses.yaml diff --git a/deployments/warp_routes/tETH/ethereum-eclipsemainnet-config.yaml b/deployments/warp_routes/tETH/eclipsemainnet-ethereum-config.yaml similarity index 100% rename from deployments/warp_routes/tETH/ethereum-eclipsemainnet-config.yaml rename to deployments/warp_routes/tETH/eclipsemainnet-ethereum-config.yaml diff --git a/scripts/validate-file-data.js b/scripts/validate-file-data.js index 92900483f..9dcfae6a8 100644 --- 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(