Merge branch 'main' into PNDR

.changeset/afraid-lamps-search.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/registry': patch
+---
+
+Warp Routes: add logoURI for tokens that did not have it and rename chain names that were not sorted alphabetically
+Chains: Add missing deployer field

.changeset/great-carrots-stare.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/registry': minor
+---
+
+feat: add solo testnet

.changeset/unlucky-papayas-pull.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/registry': patch
+---
+
+Upgrade yarn to 4.5.1

.github/workflows/ci.yml

@@ -27,13 +27,13 @@ jobs:
         # Check out the lockfile from main, reinstall, and then
         # verify the lockfile matches what was committed.
         run: |
-            yarn install
-            CHANGES=$(git status -s)
-            if [[ ! -z $CHANGES ]]; then
-              echo "Changes found: $CHANGES"
-              git diff
-              exit 1
-            fi
+          yarn install
+          CHANGES=$(git status -s)
+          if [[ ! -z $CHANGES ]]; then
+            echo "Changes found: $CHANGES"
+            git diff
+            exit 1
+          fi
 
   build:
     runs-on: ubuntu-latest
@@ -97,6 +97,17 @@ jobs:
       - name: test
         run: yarn run test:unit
 
+      - name: validate-file-path
+        run: |
+          node ./scripts/validate-file-path.js
+
+      - name: validate-svg
+        run: |
+          node ./scripts/validate-svg.js
+
+      - name: validate-file-data
+        run: |
+          node ./scripts/validate-file-data.js
 
   # health:
   #   runs-on: ubuntu-latest

.github/workflows/combine.yml

@@ -1,7 +1,9 @@
 name: combine
 
 on:
-  pull_request:
+  push:
+    branches:
+      - main
   # Allows you to run this workflow manually
   workflow_dispatch:
 
@@ -56,7 +58,7 @@ jobs:
           CHANGES=$(git status -s)
           if [[ ! -z $CHANGES ]]; then
             git add .
-            git commit -m "Update chain metadata and address files"
+            git commit -m "Update chain metadata and address files [skip-ci]"
             git push
           else
             echo "No changes to commit."

.github/workflows/optimize-svg.yml

@@ -1,7 +1,9 @@
 name: optimize-svg
 
 on:
-  pull_request:
+  push:
+    branches:
+      - main
   # Allows you to run this workflow manually
   workflow_dispatch:
 
@@ -50,7 +52,7 @@ jobs:
           CHANGES=$(git status -s)
           if [[ ! -z $CHANGES ]]; then
             git add .
-            git commit -m "Optimize SVG files" 
+            git commit -m "Optimize SVG files [skip-ci]" 
             git push
           else
             echo "No changes to commit."

.yarnrc.yml

@@ -6,4 +6,4 @@ enableScripts: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.5.1.cjs

chains/addresses.yaml

@@ -3341,6 +3341,21 @@ solanamainnet:
   mailbox: E588QtVUvresuXq2KoNEwAmoifCzYGpRBdHByN9KQMbi
   merkleTreeHook: E588QtVUvresuXq2KoNEwAmoifCzYGpRBdHByN9KQMbi
   validatorAnnounce: pRgs5vN4Pj7WvFbxf6QDHizo2njq2uksqEUbaSghVA8
+solotestnet:
+  domainRoutingIsmFactory: "0xbC2a336b11a18eC86bA0176E4D43a76cDB969Fe8"
+  interchainAccountIsm: "0xF79Ea4E1542333f2e6077AaC14DB517289cEd9ea"
+  interchainAccountRouter: "0x0b283d88d4c0575866063ca6dE2E511003dE2782"
+  mailbox: "0xcCbFE0425943f8Cc71a73C122943F0Eb6234DCd3"
+  merkleTreeHook: "0xAf513D45b8D775EF71f263115146164B6D446e72"
+  proxyAdmin: "0x71D5457B1772aB7c0912ab4940C6857a6A1B0a69"
+  staticAggregationHookFactory: "0xfC8157361745b8287F178B43dAd67B7d400183D8"
+  staticAggregationIsmFactory: "0xf3b317c08243cd96D72D30Ae6AABf0479eD43aDA"
+  staticMerkleRootMultisigIsmFactory: "0x0f86c4072fF641ab8B9B03339711329cC0Eb60b4"
+  staticMerkleRootWeightedMultisigIsmFactory: "0x90179e790d0a2240Ce0aE572D1024c2346f99544"
+  staticMessageIdMultisigIsmFactory: "0x9De3bfaE2ae2D050e20286cAD3e82e6f920C3D79"
+  staticMessageIdWeightedMultisigIsmFactory: "0xCc7438F81b6CF53CC1e14bD6e98f694E7455D56b"
+  testRecipient: "0xc4D25093EBc8004B02841d8789F01807428478ED"
+  validatorAnnounce: "0x7CE8640Fc5DedBa47D7A028566e31c2dD3BD28b0"
 soneium:
   aggregationHook: "0x2A3E42635E7acAc8Bb7851963Bc9d29B1dAAd409"
   domainRoutingIsm: "0xBD70Ea9D599a0FC8158B026797177773C3445730"

chains/metadata.yaml

@@ -3422,7 +3422,7 @@ metertestnet:
       name: Meter Testnet Explorer
       url: https://scan.meter.io/
   chainId: 83
-  deployers:
+  deployer:
     name: JaunePomme
     url: https://github.com/JaunePomme
   displayName: Meter testnet
@@ -4891,6 +4891,27 @@ solanatestnet:
   protocol: sealevel
   rpcUrls:
     - http: https://api.testnet.solana.com
+solotestnet:
+  blockExplorers:
+    - apiUrl: https://solo-testnet.explorer.caldera.xyz/api
+      family: blockscout
+      name: Solo Testnet Explorer
+      url: https://solo-testnet.explorer.caldera.xyz/
+  chainId: 8884571
+  deployer:
+    name: Solo Chain
+    url: https://solo.tech/
+  displayName: Solo Testnet
+  domainId: 8884571
+  isTestnet: true
+  name: solotestnet
+  nativeToken:
+    decimals: 18
+    name: Ether
+    symbol: ETH
+  protocol: ethereum
+  rpcUrls:
+    - http: https://solo-testnet.rpc.caldera.xyz/http
 soneium:
   blockExplorers:
     - apiUrl: https://explorer.soneium.org/api
@@ -5511,6 +5532,9 @@ u2utestnet:
       name: u2uscan
       url: https://testnet.u2uscan.xyz
   chainId: 2484
+  deployer:
+    name: junayedmh
+    url: https://github.com/JunayedMh
   displayName: U2U Testnet
   domainId: 2484
   isTestnet: true

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

chains/solotestnet/addresses.yaml

@@ -0,0 +1,14 @@
+domainRoutingIsmFactory: "0xbC2a336b11a18eC86bA0176E4D43a76cDB969Fe8"
+interchainAccountIsm: "0xF79Ea4E1542333f2e6077AaC14DB517289cEd9ea"
+interchainAccountRouter: "0x0b283d88d4c0575866063ca6dE2E511003dE2782"
+mailbox: "0xcCbFE0425943f8Cc71a73C122943F0Eb6234DCd3"
+merkleTreeHook: "0xAf513D45b8D775EF71f263115146164B6D446e72"
+proxyAdmin: "0x71D5457B1772aB7c0912ab4940C6857a6A1B0a69"
+staticAggregationHookFactory: "0xfC8157361745b8287F178B43dAd67B7d400183D8"
+staticAggregationIsmFactory: "0xf3b317c08243cd96D72D30Ae6AABf0479eD43aDA"
+staticMerkleRootMultisigIsmFactory: "0x0f86c4072fF641ab8B9B03339711329cC0Eb60b4"
+staticMerkleRootWeightedMultisigIsmFactory: "0x90179e790d0a2240Ce0aE572D1024c2346f99544"
+staticMessageIdMultisigIsmFactory: "0x9De3bfaE2ae2D050e20286cAD3e82e6f920C3D79"
+staticMessageIdWeightedMultisigIsmFactory: "0xCc7438F81b6CF53CC1e14bD6e98f694E7455D56b"
+testRecipient: "0xc4D25093EBc8004B02841d8789F01807428478ED"
+validatorAnnounce: "0x7CE8640Fc5DedBa47D7A028566e31c2dD3BD28b0"

chains/solotestnet/metadata.yaml

@@ -0,0 +1,21 @@
+# yaml-language-server: $schema=../schema.json
+blockExplorers:
+  - apiUrl: https://solo-testnet.explorer.caldera.xyz/api
+    family: blockscout
+    name: Solo Testnet Explorer
+    url: https://solo-testnet.explorer.caldera.xyz/
+chainId: 8884571
+deployer:
+  name: Solo Chain
+  url: https://solo.tech/
+displayName: Solo Testnet
+domainId: 8884571
+isTestnet: true
+name: solotestnet
+nativeToken:
+  decimals: 18
+  name: Ether
+  symbol: ETH
+protocol: ethereum
+rpcUrls:
+  - http: https://solo-testnet.rpc.caldera.xyz/http

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

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

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

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

package.json

@@ -72,5 +72,5 @@
     "version:prepare": "yarn changeset version && yarn install --no-immutable",
     "version:check": "yarn changeset status"
   },
-  "packageManager": "yarn@4.0.2"
+  "packageManager": "yarn@4.5.1"
 }

scripts/utils.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { parse as yamlParse } from 'yaml';
 
 function findFiles(directory, fileTypes = [], isRecursive = true) {
   const files = fs.readdirSync(directory);
@@ -32,3 +33,7 @@ export function getFilePaths(directories = [], fileTypes = [], isRecursive = tru
     })
     .flatMap((directory) => findFiles(directory, fileTypes, isRecursive));
 }
+
+export function readYaml(filePath) {
+  return yamlParse(fs.readFileSync(filePath, 'utf-8'));
+}