Merge core and app packages (#1169)

* Merge core and app packages

* Fix test

* Fix test

* Dockerfile

* Fix test

.github/workflows/node.yml

@@ -109,5 +109,3 @@ jobs:
 
       - name: core
         run: yarn workspace @hyperlane-xyz/core run test
-      - name: app
-        run: yarn workspace @hyperlane-xyz/app run test

.gitignore

@@ -19,7 +19,7 @@ tmp.env
 typescript/*/node_modules
 typescript/infra/config/environments/test/create2/*json
 typescript/infra/config/environments/test/testrecipient/*json
-solidity/*/artifacts
+solidity/artifacts
 
 .yarn/install-state.gz
 .yarn/cache

Dockerfile

@@ -16,8 +16,7 @@ COPY typescript/sdk/package.json ./typescript/sdk/
 COPY typescript/helloworld/package.json ./typescript/helloworld/
 COPY typescript/ica/package.json ./typescript/ica/
 COPY typescript/infra/package.json ./typescript/infra/
-COPY solidity/core/package.json ./solidity/core/
-COPY solidity/app/package.json ./solidity/app/
+COPY solidity/package.json ./solidity/
 
 RUN yarn install && yarn cache clean
 

package.json

@@ -26,7 +26,7 @@
     "publish:all": "yarn workspaces foreach --no-private --verbose --topological npm publish --access public"
   },
   "workspaces": [
-    "solidity/*",
+    "solidity",
     "typescript/*"
   ],
   "resolutions": {

solidity/.solcover.js

@@ -0,0 +1,3 @@
+module.exports = {
+  skipFiles: ['test'],
+};

solidity/app/.solcover.js

@@ -1,3 +0,0 @@
-module.exports = {
-  skipFiles: ["test"],
-};

solidity/app/hardhat.config.ts

@@ -1,34 +0,0 @@
-import '@nomiclabs/hardhat-waffle';
-import '@typechain/hardhat';
-import 'hardhat-gas-reporter';
-import 'solidity-coverage';
-
-/**
- * @type import('hardhat/config').HardhatUserConfig
- */
-module.exports = {
-  solidity: {
-    compilers: [
-      {
-        version: '0.8.16',
-      },
-      {
-        version: '0.7.6',
-        settings: {
-          optimizer: {
-            enabled: true,
-            runs: 999999,
-          },
-        },
-      },
-    ],
-  },
-  gasReporter: {
-    currency: 'USD',
-  },
-  typechain: {
-    outDir: './types',
-    target: 'ethers-v5',
-    alwaysGenerateOverloads: false,
-  },
-};

solidity/app/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "@hyperlane-xyz/app",
-  "description": "Solidity contracts for Hyperlane apps",
-  "version": "0.5.1",
-  "dependencies": {
-    "@hyperlane-xyz/core": "0.5.1",
-    "@hyperlane-xyz/utils": "0.5.1",
-    "@openzeppelin/contracts-upgradeable": "^4.5.0"
-  },
-  "devDependencies": {
-    "@nomiclabs/hardhat-ethers": "^2.0.5",
-    "@nomiclabs/hardhat-waffle": "^2.0.2",
-    "@typechain/ethers-v5": "10.0.0",
-    "@typechain/hardhat": "^6.0.0",
-    "@types/mocha": "^9.1.0",
-    "chai": "^4.3.0",
-    "ethereum-waffle": "^3.4.4",
-    "ethers": "^5.6.8",
-    "hardhat": "^2.8.4",
-    "hardhat-gas-reporter": "^1.0.7",
-    "prettier": "^2.4.1",
-    "prettier-plugin-solidity": "^1.0.0-beta.5",
-    "solhint": "^3.3.2",
-    "solhint-plugin-prettier": "^0.0.5",
-    "solidity-coverage": "^0.7.14",
-    "ts-node": "^10.8.0",
-    "typechain": "8.0.0",
-    "typescript": "^4.7.2"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "files": [
-    "/dist",
-    "/contracts",
-    "/interfaces"
-  ],
-  "homepage": "https://www.hyperlane.xyz",
-  "keywords": [
-    "Hyperlane",
-    "Solidity"
-  ],
-  "license": "Apache-2.0",
-  "main": "dist/index.js",
-  "repository": "https://github.com/hyperlane-xyz/hyperlane-monorepo",
-  "scripts": {
-    "build": "hardhat compile && tsc",
-    "clean": "hardhat clean && rm -rf ./dist ./cache",
-    "coverage": "hardhat coverage",
-    "prettier": "prettier --write ./contracts ./test",
-    "test": "hardhat test"
-  },
-  "types": "dist/index.d.ts"
-}

solidity/app/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "rootDir": "./types/"
-  },
-  "exclude": ["./node_modules/", "./dist/", "./types/hardhat.d.ts"],
-  "extends": "../../tsconfig.json",
-  "include": ["./types/**/*.ts"]
-}

solidity/contracts/AbacusConnectionClient.sol

@@ -2,9 +2,9 @@
 pragma solidity >=0.6.11;
 
 // ============ Internal Imports ============
-import {IInterchainGasPaymaster} from "@hyperlane-xyz/core/interfaces/IInterchainGasPaymaster.sol";
-import {IOutbox} from "@hyperlane-xyz/core/interfaces/IOutbox.sol";
-import {IAbacusConnectionManager} from "@hyperlane-xyz/core/interfaces/IAbacusConnectionManager.sol";
+import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
+import {IOutbox} from "../interfaces/IOutbox.sol";
+import {IAbacusConnectionManager} from "../interfaces/IAbacusConnectionManager.sol";
 
 // ============ External Imports ============
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

solidity/contracts/Router.sol

@@ -3,10 +3,10 @@ pragma solidity >=0.6.11;
 
 // ============ Internal Imports ============
 import {AbacusConnectionClient} from "./AbacusConnectionClient.sol";
-import {IAbacusConnectionManager} from "@hyperlane-xyz/core/interfaces/IAbacusConnectionManager.sol";
-import {IInterchainGasPaymaster} from "@hyperlane-xyz/core/interfaces/IInterchainGasPaymaster.sol";
-import {IMessageRecipient} from "@hyperlane-xyz/core/interfaces/IMessageRecipient.sol";
-import {IOutbox} from "@hyperlane-xyz/core/interfaces/IOutbox.sol";
+import {IAbacusConnectionManager} from "../interfaces/IAbacusConnectionManager.sol";
+import {IInterchainGasPaymaster} from "../interfaces/IInterchainGasPaymaster.sol";
+import {IMessageRecipient} from "../interfaces/IMessageRecipient.sol";
+import {IOutbox} from "../interfaces/IOutbox.sol";
 
 abstract contract Router is AbacusConnectionClient, IMessageRecipient {
     string constant NO_ROUTER_ENROLLED_REVERT_MESSAGE =

solidity/contracts/test/TestAbacusConnectionClient.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity >=0.6.11;
-import {IOutbox} from "@hyperlane-xyz/core/interfaces/IOutbox.sol";
+import {IOutbox} from "../../interfaces/IOutbox.sol";
 
 import "../AbacusConnectionClient.sol";
 

solidity/core/.gitignore

@@ -1,8 +0,0 @@
-node_modules/
-cache/
-artifacts/
-types/
-dist/
-coverage/
-coverage.json
-.env

solidity/core/.solcover.js

@@ -1,3 +0,0 @@
-module.exports = {
-  skipFiles: ["test"],
-};

solidity/core/.solhint.json

@@ -1,10 +0,0 @@
-{
-  "extends": "solhint:recommended",
-  "rules": {
-    "compiler-version": ["error", "^0.6.11"],
-    "func-visibility": ["warn", {"ignoreConstructors":true}],
-    "not-rely-on-time": "off",
-    "avoid-low-level-calls": "off",
-    "no-inline-assembly": "off"
-  }
-}

solidity/core/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "rootDir": "./types/"
-  },
-  "exclude": ["./node_modules/", "./dist/", "./types/hardhat.d.ts"],
-  "extends": "../../tsconfig.json",
-  "include": ["./types/**/*.ts"]
-}

solidity/test/abacusConnectionClient.test.ts

@@ -10,8 +10,7 @@ import {
   Outbox__factory,
   TestInbox__factory,
   TestMultisigValidatorManager__factory,
-} from '@hyperlane-xyz/core';
-
+} from '../types';
 import {
   TestAbacusConnectionClient,
   TestAbacusConnectionClient__factory,

solidity/test/merkle.test.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { ethers } from 'hardhat';
 
-import merkleTestCases from '../../../vectors/merkle.json';
+import merkleTestCases from '../../vectors/merkle.json';
 import { TestMerkle, TestMerkle__factory } from '../types';
 
 describe('Merkle', async () => {

solidity/test/message.test.ts

@@ -5,7 +5,7 @@ import { utils } from '@hyperlane-xyz/utils';
 
 import { TestMessage, TestMessage__factory } from '../types';
 
-const testCases = require('../../../vectors/message.json');
+const testCases = require('../../vectors/message.json');
 
 const remoteDomain = 1000;
 const localDomain = 2000;

solidity/test/router.test.ts

@@ -4,6 +4,8 @@ import { expect } from 'chai';
 import { ContractTransaction } from 'ethers';
 import { ethers } from 'hardhat';
 
+import { utils } from '@hyperlane-xyz/utils';
+
 import {
   AbacusConnectionManager,
   AbacusConnectionManager__factory,
@@ -14,9 +16,7 @@ import {
   TestInbox,
   TestInbox__factory,
   TestMultisigValidatorManager__factory,
-} from '@hyperlane-xyz/core';
-import { utils } from '@hyperlane-xyz/utils';
-
+} from '../types';
 import { TestRouter, TestRouter__factory } from '../types';
 
 const ONLY_OWNER_REVERT_MSG = 'Ownable: caller is not the owner';

solidity/test/validator-manager/multisigValidatorManager.test.ts

@@ -16,7 +16,7 @@ const OUTBOX_DOMAIN = 1234;
 const QUORUM_THRESHOLD = 1;
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const domainHashTestCases = require('../../../../vectors/domainHash.json');
+const domainHashTestCases = require('../../../vectors/domainHash.json');
 
 describe('MultisigValidatorManager', async () => {
   let validatorManager: TestMultisigValidatorManager,

solidity/tsconfig.json

@@ -1,3 +1,9 @@
 {
-  "extends": "../tsconfig.json"
+  "compilerOptions": {
+    "outDir": "./dist/",
+    "rootDir": "./types/"
+  },
+  "exclude": ["./node_modules/", "./dist/", "./types/hardhat.d.ts"],
+  "extends": "../tsconfig.json",
+  "include": ["./types/**/*.ts"]
 }

solidity/update_abis.sh

@@ -4,7 +4,7 @@ copy() {
     # Optionally allow path to be passed in, and extract the contract name
     # as the string following the last instance of `/`
     CONTRACT_NAME="${1##*/}"
-    jq .abi < artifacts/contracts/"$1".sol/"$CONTRACT_NAME".json > ../../rust/chains/abacus-ethereum/abis/"$CONTRACT_NAME".abi.json
+    jq .abi < artifacts/contracts/"$1".sol/"$CONTRACT_NAME".json > ../rust/chains/abacus-ethereum/abis/"$CONTRACT_NAME".abi.json
 }
 
 copy Inbox && copy Outbox && copy validator-manager/InboxValidatorManager && copy InterchainGasPaymaster

typescript/helloworld/contracts/HelloWorld.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 // ============ External Imports ============
-import {Router} from "@hyperlane-xyz/app/contracts/Router.sol";
+import {Router} from "@hyperlane-xyz/core/contracts/Router.sol";
 
 /*
  * @title The Hello World App

typescript/ica/contracts/InterchainAccountRouter.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import {OwnableMulticall, Call} from "./OwnableMulticall.sol";
 
 // ============ External Imports ============
-import {Router} from "@hyperlane-xyz/app/contracts/Router.sol";
+import {Router} from "@hyperlane-xyz/core/contracts/Router.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";

typescript/ica/contracts/InterchainQueryRouter.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import {OwnableMulticall, Call} from "./OwnableMulticall.sol";
 
 // ============ External Imports ============
-import {Router} from "@hyperlane-xyz/app/contracts/Router.sol";
+import {Router} from "@hyperlane-xyz/core/contracts/Router.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";

typescript/ica/package.json

@@ -3,7 +3,7 @@
   "description": "A router middleware for interchain accounts",
   "version": "0.5.1",
   "dependencies": {
-    "@hyperlane-xyz/app": "0.5.1",
+    "@hyperlane-xyz/core": "0.5.1",
     "@hyperlane-xyz/sdk": "0.5.1",
     "@hyperlane-xyz/utils": "0.5.1",
     "@openzeppelin/contracts-upgradeable": "^4.6.0",

typescript/sdk/package.json

@@ -3,7 +3,6 @@
   "description": "The official SDK for the Hyperlane Network",
   "version": "0.5.1",
   "dependencies": {
-    "@hyperlane-xyz/app": "0.5.1",
     "@hyperlane-xyz/celo-ethers-provider": "^0.1.1",
     "@hyperlane-xyz/core": "0.5.1",
     "@hyperlane-xyz/utils": "0.5.1",

typescript/sdk/src/router.ts

@@ -1,6 +1,6 @@
 import type { ethers } from 'ethers';
 
-import { Router } from '@hyperlane-xyz/app';
+import { Router } from '@hyperlane-xyz/core';
 import type { types } from '@hyperlane-xyz/utils';
 
 import { HyperlaneContracts, HyperlaneFactories } from './contracts';
@@ -25,4 +25,4 @@ export type ConnectionClientConfig = {
   interchainGasPaymaster: types.Address;
 };
 
-export { Router } from '@hyperlane-xyz/app';
+export { Router } from '@hyperlane-xyz/core';

typescript/sdk/src/test/envSubsetDeployer/app.ts

@@ -1,4 +1,4 @@
-import { TestRouter__factory } from '@hyperlane-xyz/app';
+import { TestRouter__factory } from '@hyperlane-xyz/core';
 
 import { HyperlaneApp } from '../../HyperlaneApp';
 import { chainConnectionConfigs } from '../../consts/chainConnectionConfigs';

yarn.lock

@@ -3677,34 +3677,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperlane-xyz/app@0.5.1, @hyperlane-xyz/app@workspace:solidity/app":
-  version: 0.0.0-use.local
-  resolution: "@hyperlane-xyz/app@workspace:solidity/app"
-  dependencies:
-    "@hyperlane-xyz/core": 0.5.1
-    "@hyperlane-xyz/utils": 0.5.1
-    "@nomiclabs/hardhat-ethers": ^2.0.5
-    "@nomiclabs/hardhat-waffle": ^2.0.2
-    "@openzeppelin/contracts-upgradeable": ^4.5.0
-    "@typechain/ethers-v5": 10.0.0
-    "@typechain/hardhat": ^6.0.0
-    "@types/mocha": ^9.1.0
-    chai: ^4.3.0
-    ethereum-waffle: ^3.4.4
-    ethers: ^5.6.8
-    hardhat: ^2.8.4
-    hardhat-gas-reporter: ^1.0.7
-    prettier: ^2.4.1
-    prettier-plugin-solidity: ^1.0.0-beta.5
-    solhint: ^3.3.2
-    solhint-plugin-prettier: ^0.0.5
-    solidity-coverage: ^0.7.14
-    ts-node: ^10.8.0
-    typechain: 8.0.0
-    typescript: ^4.7.2
-  languageName: unknown
-  linkType: soft
-
 "@hyperlane-xyz/celo-ethers-provider@npm:^0.1.1":
   version: 0.1.1
   resolution: "@hyperlane-xyz/celo-ethers-provider@npm:0.1.1"
@@ -3714,9 +3686,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hyperlane-xyz/core@0.5.1, @hyperlane-xyz/core@workspace:solidity/core":
+"@hyperlane-xyz/core@0.5.1, @hyperlane-xyz/core@workspace:solidity":
   version: 0.0.0-use.local
-  resolution: "@hyperlane-xyz/core@workspace:solidity/core"
+  resolution: "@hyperlane-xyz/core@workspace:solidity"
   dependencies:
     "@hyperlane-xyz/utils": 0.5.1
     "@nomiclabs/hardhat-ethers": ^2.0.5
@@ -3819,7 +3791,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/interchain-accounts@workspace:typescript/ica"
   dependencies:
-    "@hyperlane-xyz/app": 0.5.1
+    "@hyperlane-xyz/core": 0.5.1
     "@hyperlane-xyz/sdk": 0.5.1
     "@hyperlane-xyz/utils": 0.5.1
     "@nomicfoundation/hardhat-chai-matchers": ^1.0.3
@@ -3870,7 +3842,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/sdk@workspace:typescript/sdk"
   dependencies:
-    "@hyperlane-xyz/app": 0.5.1
     "@hyperlane-xyz/celo-ethers-provider": ^0.1.1
     "@hyperlane-xyz/core": 0.5.1
     "@hyperlane-xyz/utils": 0.5.1
@@ -4235,7 +4206,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openzeppelin/contracts-upgradeable@npm:^4.5.0, @openzeppelin/contracts-upgradeable@npm:^4.6.0":
+"@openzeppelin/contracts-upgradeable@npm:^4.6.0":
   version: 4.6.0
   resolution: "@openzeppelin/contracts-upgradeable@npm:4.6.0"
   checksum: f9802c9cccf31bd475412ba5d862ed15eed5352302c30b29c38f84aed2dcfe0d957687935a72068f3d44292a4a55b0ff26cd018b2e14a47f16f74f087009aa29