Create new CLI package

.eslintrc

@@ -31,7 +31,7 @@
     "@typescript-eslint/no-require-imports": ["warn"],
     "@typescript-eslint/no-unused-vars": [
       "error",
-      { 
+      {
         "argsIgnorePattern": "^_",
         "varsIgnorePattern": "^_",
         "caughtErrorsIgnorePattern": "^_"
@@ -48,4 +48,4 @@
       }
     ]
   }
-}
+}

.github/CODEOWNERS

@@ -22,5 +22,8 @@ typescript/token @yorhodes @jmrossy @tkporter @aroralanuk
 ## Hello World
 typescript/helloworld @yorhodes @nambrot
 
+## CLI
+typescript/cli @jmrossy @asaj
+
 ## Infra
 typescript/infra @tkporter @nambrot @mattiecnvr

.github/workflows/cli.yml

@@ -0,0 +1,76 @@
+name: CLI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch: 
+
+env:
+  DEBUG: 'hyperlane:*'
+
+jobs:
+  yarn-install:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: yarn-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            .yarn/cache
+          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+      - name: yarn-install
+        run: |
+          yarn install
+          CHANGES=$(git status -s --ignore-submodules)
+          if [[ ! -z $CHANGES ]]; then
+            echo "Changes found: $CHANGES"
+            git diff
+            exit 1
+          fi
+
+  yarn-build:
+    runs-on: ubuntu-latest
+    needs: [yarn-install]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: yarn-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            .yarn/cache
+          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+      - name: build
+        run: yarn build
+
+  deploy:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: yarn-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            .yarn/cache
+          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+      - name: Install Foundry
+        uses: onbjerg/foundry-toolchain@v1
+        with:
+          version: nightly
+      - name: deploy
+        run: ./ci-test.sh

Dockerfile

@@ -15,6 +15,7 @@ COPY typescript/utils/package.json ./typescript/utils/
 COPY typescript/sdk/package.json ./typescript/sdk/
 COPY typescript/helloworld/package.json ./typescript/helloworld/
 COPY typescript/token/package.json ./typescript/token/
+COPY typescript/cli/package.json ./typescript/cli/
 COPY typescript/infra/package.json ./typescript/infra/
 COPY solidity/package.json ./solidity/
 

README.md

@@ -7,8 +7,8 @@
 [codecov-badge]: https://img.shields.io/codecov/c/github/hyperlane-xyz/hyperlane-monorepo
 [foundry]: https://getfoundry.sh/
 [foundry-badge]: https://img.shields.io/badge/Built%20with-Foundry-FFDB1C.svg
-[license]: https://opensource.org/licenses/MIT
-[license-badge]: https://img.shields.io/badge/License-MIT-blue.svg
+[license]: https://www.apache.org/licenses/LICENSE-2.0
+[license-badge]: https://img.shields.io/badge/License-Apache-blue.svg
 
 ## Versioning
 

package.json

@@ -3,14 +3,14 @@
   "description": "A yarn workspace of core Hyperlane packages",
   "version": "0.0.0",
   "devDependencies": {
-    "@trivago/prettier-plugin-sort-imports": "^3.2.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.16.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^8.8.0",
     "husky": "^8.0.0",
     "lint-staged": "^12.4.3",
-    "prettier": "^2.4.1"
+    "prettier": "^2.8.8"
   },
   "packageManager": "[email protected]",
   "private": true,
@@ -37,6 +37,7 @@
     "lodash": "^4.17.21",
     "recursive-readdir": "^2.2.3",
     "underscore": "^1.13",
-    "undici": "^5.11"
+    "undici": "^5.11",
+    "@trivago/prettier-plugin-sort-imports/@babel/parser": "^7.22.7"
   }
 }

solidity/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@hyperlane-xyz/core",
   "description": "Core solidity contracts for Hyperlane",
-  "version": "1.5.1",
+  "version": "1.5.2-beta0",
   "dependencies": {
     "@eth-optimism/contracts": "^0.6.0",
-    "@hyperlane-xyz/utils": "1.5.1",
+    "@hyperlane-xyz/utils": "1.5.2-beta0",
     "@openzeppelin/contracts": "^4.8.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.0"
   },
@@ -18,7 +18,7 @@
     "ethers": "^5.7.2",
     "hardhat": "^2.16.1",
     "hardhat-gas-reporter": "^1.0.9",
-    "prettier": "^2.4.1",
+    "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.0.0-beta.5",
     "solhint": "^3.3.2",
     "solhint-plugin-prettier": "^0.0.5",

typescript/cli/.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+dist

typescript/cli/.eslintrc

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "no-console": ["off"]
+  }
+}

typescript/cli/.gitignore

@@ -0,0 +1,5 @@
+.env
+/dist
+/cache
+/configs
+/artifacts

typescript/cli/README.md

@@ -0,0 +1,57 @@
+# Hyperlane CLI
+
+The Hyperlane CLI is a command-line tool written in Typescript that facilitates common operations on Hyperlane, such as deploying the core contracts and/or warp routes to new chains.
+
+## Hyperlane overview
+
+Hyperlane is an interchain messaging protocol that allows applications to communicate between blockchains.
+
+Developers can use Hyperlane to share state between blockchains, allowing them to build interchain applications that live natively across multiple chains.
+
+To read more about interchain applications, how the protocol works, and how to integrate with Hyperlane, please see the [documentation](https://docs.hyperlane.xyz).
+
+## Setup
+
+Node 16 or newer is required.
+
+**Option 1: Global install:**
+
+```bash
+# Install with NPM
+npm install -g @hyperlane-xyz/cli
+# Or uninstall old versions
+npm uninstall -g @hyperlane-xyz/cli
+```
+
+**Option 2: Temp install:**
+
+```bash
+# Run via NPM's npx command
+npx @hyperlane-xyz/cli
+# Or via Yarn's dlx command
+yarn dlx @hyperlane-xyz/cli
+```
+
+**Option 3: Run from source:**
+
+```bash
+git clone https://github.com/hyperlane-xyz/hyperlane-monorepo.git
+cd hyperlane-monorepo
+yarn install && yarn build
+cd typescript/cli
+yarn hyperlane
+```
+
+## Common commands
+
+View help: `hyperlane --help`
+
+Create a core deployment config: `hyperlane config create`
+
+Run hyperlane core deployments: `hyperlane deploy core`
+
+Run warp route deployments: `hyperlane deploy warp`
+
+View SDK contract addresses: `hyperlane chains addresses`
+
+Send test message: `hyperlane send message`

typescript/cli/ci-test.sh

@@ -0,0 +1,100 @@
+for CHAIN in anvil1 anvil2
+do
+    mkdir /tmp/$CHAIN \
+    /tmp/$CHAIN/state \
+    /tmp/$CHAIN/validator \
+    /tmp/$CHAIN/relayer && \
+    chmod 777 /tmp/$CHAIN -R
+done
+
+anvil --chain-id 31337 -p 8545 --state /tmp/anvil1/state > /dev/null &
+ANVIL_1_PID=$!
+
+anvil --chain-id 31338 -p 8555 --state /tmp/anvil2/state > /dev/null &
+ANVIL_2_PID=$!
+
+sleep 1
+
+set -e
+
+yarn build
+
+for i in "anvil1 anvil2" "anvil2 anvil1"
+do
+    set -- $i
+    echo "Deploying contracts to $1"
+    yarn hyperlane --local $1 --remotes $2 \
+    --chains ./examples/anvil-chains.yaml \
+    --key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 $3 \
+done
+
+echo "Deploying warp routes"
+yarn hyperlane --local "anvil1" --remotes "anvil2" \
+  --chains ./examples/anvil-chains.yaml \
+  --key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+
+kill $ANVIL_1_PID
+kill $ANVIL_2_PID
+
+anvil --chain-id 31337 -p 8545 --block-time 1 --state /tmp/anvil1/state > /dev/null &
+ANVIL_1_PID=$!
+
+anvil --chain-id 31338 -p 8555 --block-time 1 --state /tmp/anvil2/state > /dev/null &
+ANVIL_2_PID=$!
+
+for i in "anvil1 8545 ANVIL1" "anvil2 8555 ANVIL2"
+do
+    set -- $i
+    echo "Running validator on $1"
+    # Won't work on anything but linux due to -net=host
+    docker run --mount type=bind,source="$(pwd)/artifacts",target=/config \
+      --mount type=bind,source="/tmp",target=/data --net=host \
+      -e CONFIG_FILES=/config/agent_config.json -e HYP_VALIDATOR_ORIGINCHAINNAME=$1 \
+      -e HYP_VALIDATOR_REORGPERIOD=0 -e HYP_VALIDATOR_INTERVAL=1 \
+      -e HYP_BASE_CHAINS_${3}_CONNECTION_URL=http://127.0.0.1:${2} \
+      -e HYP_VALIDATOR_VALIDATOR_TYPE=hexKey \
+      -e HYP_VALIDATOR_VALIDATOR_KEY=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 \
+      -e HYP_VALIDATOR_CHECKPOINTSYNCER_TYPE=localStorage \
+      -e HYP_VALIDATOR_CHECKPOINTSYNCER_PATH=/data/${1}/validator \
+      -e HYP_BASE_TRACING_LEVEL=info -e HYP_BASE_TRACING_FMT=pretty \
+      gcr.io/abacus-labs-dev/hyperlane-agent:40cc4a6-20230420-080111 ./validator &
+done
+
+sleep 10
+
+for i in "anvil1 8545" "anvil2 8555"
+do
+    set -- $i
+    echo "Announcing validator on $1"
+    VALIDATOR_ANNOUNCE_ADDRESS=$(cat ./artifacts/addresses.json | jq -r ".$1.validatorAnnounce")
+    VALIDATOR=$(cat /tmp/$1/validator/announcement.json | jq -r '.value.validator')
+    STORAGE_LOCATION=$(cat /tmp/$1/validator/announcement.json | jq -r '.value.storage_location')
+    SIGNATURE=$(cat /tmp/$1/validator/announcement.json | jq -r '.serialized_signature')
+    cast send $VALIDATOR_ANNOUNCE_ADDRESS  \
+      "announce(address, string calldata, bytes calldata)(bool)" \
+      $VALIDATOR $STORAGE_LOCATION $SIGNATURE --rpc-url http://127.0.0.1:$2 \
+      --private-key 0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
+done
+
+
+for i in "anvil1 anvil2 ANVIL2" "anvil2 anvil1 ANVIL1"
+do
+    set -- $i
+    echo "Running relayer on $1"
+    docker run --mount type=bind,source="$(pwd)/artifacts",target=/config \
+      --mount type=bind,source="/tmp",target=/data --net=host \
+      -e CONFIG_FILES=/config/agent_config.json \
+      -e HYP_BASE_CHAINS_ANVIL1_CONNECTION_URL=http://127.0.0.1:8545 \
+      -e HYP_BASE_CHAINS_ANVIL2_CONNECTION_URL=http://127.0.0.1:8555 \
+      -e HYP_BASE_TRACING_LEVEL=info -e HYP_BASE_TRACING_FMT=pretty \
+      -e HYP_RELAYER_ORIGINCHAINNAME=$1 -e HYP_RELAYER_DESTINATIONCHAINNAMES=$2 \
+      -e HYP_RELAYER_ALLOWLOCALCHECKPOINTSYNCERS=true -e HYP_RELAYER_DB=/data/$1/relayer \
+      -e HYP_RELAYER_GASPAYMENTENFORCEMENT='[{"type":"none"}]' \
+      -e HYP_BASE_CHAINS_${3}_SIGNER_TYPE=hexKey \
+      -e HYP_BASE_CHAINS_${3}_SIGNER_KEY=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97 \
+      gcr.io/abacus-labs-dev/hyperlane-agent:40cc4a6-20230420-080111 ./relayer &
+done
+
+docker ps -aq | xargs docker stop | xargs docker rm
+kill $ANVIL_1_PID
+kill $ANVIL_2_PID

typescript/cli/cli.ts

@@ -0,0 +1,38 @@
+#! /usr/bin/env node
+import chalk from 'chalk';
+import yargs from 'yargs';
+
+import { chainsCommand } from './src/commands/chains.js';
+import { configCommand } from './src/commands/config.js';
+import { deployCommand } from './src/commands/deploy.js';
+import { sendCommand } from './src/commands/send.js';
+import './src/logger.js';
+import { errorRed } from './src/logger.js';
+
+const MISSING_PARAMS_ERROR = 'Not enough non-option arguments';
+
+console.log(chalk.blue('Hyperlane'), chalk.magentaBright('CLI'));
+
+try {
+  await yargs(process.argv.slice(2))
+    .scriptName('hyperlane')
+    // TODO get version num from package.json
+    .version(false)
+    .command(chainsCommand)
+    .command(configCommand)
+    .command(deployCommand)
+    .command(sendCommand)
+    .demandCommand()
+    .strict()
+    .help()
+    .fail((msg, err, yargs) => {
+      if (msg && !msg.includes(MISSING_PARAMS_ERROR)) errorRed('Error: ' + msg);
+      console.log('');
+      yargs.showHelp();
+      console.log('');
+      if (err) errorRed(err.toString());
+      process.exit(1);
+    }).argv;
+} catch (error: any) {
+  errorRed('Error: ' + error.message);
+}