Merge branch 'main' into hyperlane-typescript-rebrand

typescript/ica/test/accounts.test.ts

@@ -1,7 +1,3 @@
-import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
-import { expect } from 'chai';
-import { ethers } from 'hardhat';
-
 import {
   ChainMap,
   ChainNameToDomainId,
@@ -14,6 +10,9 @@ import {
   getTestMultiProvider,
   testChainConnectionConfigs,
 } from '@abacus-network/sdk';
+import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
+import { expect } from 'chai';
+import { ethers } from 'hardhat';
 
 import { InterchainAccountDeployer } from '../src/deploy';
 import { InterchainAccountRouter, TestRecipient__factory } from '../types';

typescript/infra/config/environments/testnet2/funding.ts

@@ -6,8 +6,8 @@ import { environment } from './chains';
 
 export const keyFunderConfig: KeyFunderConfig = {
   docker: {
-    repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-    tag: 'sha-f3509ac',
+    repo: 'gcr.io/abacus-labs-dev/abacus-monorepo',
+    tag: 'sha-27183b1',
   },
   cronSchedule: '45 * * * *', // Every hour at the 45 minute mark
   namespace: environment,

typescript/infra/config/environments/testnet2/helloworld.ts

@@ -10,8 +10,8 @@ export const hyperlane: HelloWorldConfig<TestnetChains> = {
   addresses: hyperlaneAddresses,
   kathy: {
     docker: {
-      repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-8b8fdde',
+      repo: 'gcr.io/abacus-labs-dev/abacus-monorepo',
+      tag: 'sha-1c67fc9',
     },
     chainsToSkip: [],
     runEnv: environment,
@@ -29,8 +29,8 @@ export const releaseCandidate: HelloWorldConfig<TestnetChains> = {
   addresses: rcAddresses,
   kathy: {
     docker: {
-      repo: 'gcr.io/abacus-labs-dev/hyperlane-monorepo',
-      tag: 'sha-8b8fdde',
+      repo: 'gcr.io/abacus-labs-dev/abacus-monorepo',
+      tag: 'sha-1c67fc9',
     },
     chainsToSkip: [],
     runEnv: environment,

typescript/interchain/scripts/deploy.ts

@@ -1,5 +1,3 @@
-import { Wallet } from 'ethers';
-
 import {
   AbacusCore,
   MultiProvider,
@@ -8,6 +6,7 @@ import {
   objMap,
   serializeContracts,
 } from '@abacus-network/sdk';
+import { Wallet } from 'ethers';
 
 import { InterchainAccountDeployer } from '../src/deploy';
 

typescript/sdk/package.json

@@ -3,8 +3,8 @@
   "description": "The official SDK for the Hyperlane Network",
   "version": "0.5.0-beta0",
   "dependencies": {
-    "@abacus-network/celo-ethers-provider": "^0.1.0",
     "@hyperlane-xyz/app": "0.5.0-beta0",
+    "@hyperlane-xyz/celo-ethers-provider": "^0.1.1",
     "@hyperlane-xyz/core": "0.5.0-beta0",
     "@hyperlane-xyz/utils": "0.5.0-beta0",
     "@types/debug": "^4.1.7",

typescript/sdk/src/consts/chainConnectionConfigs.ts

@@ -1,6 +1,7 @@
-import { StaticCeloJsonRpcProvider } from '@abacus-network/celo-ethers-provider';
 import { ethers } from 'ethers';
 
+import { StaticCeloJsonRpcProvider } from '@hyperlane-xyz/celo-ethers-provider';
+
 import { ChainMap, ChainName, IChainConnection } from '../types';
 
 export const ethereum: IChainConnection = {

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

@@ -1,6 +1,6 @@
-import { StaticCeloJsonRpcProvider } from '@abacus-network/celo-ethers-provider';
 import { Wallet } from 'ethers';
 
+import { StaticCeloJsonRpcProvider } from '@hyperlane-xyz/celo-ethers-provider';
 import { utils } from '@hyperlane-xyz/utils';
 
 export const ALFAJORES_FORNO = 'https://alfajores-forno.celo-testnet.org';

yarn.lock

@@ -5,6 +5,17 @@ __metadata:
   version: 6
   cacheKey: 8
 
+"@abacus-network/app@npm:0.4.1, @abacus-network/app@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@abacus-network/app@npm:0.4.1"
+  dependencies:
+    "@abacus-network/core": 0.4.1
+    "@abacus-network/utils": 0.4.1
+    "@openzeppelin/contracts-upgradeable": ^4.5.0
+  checksum: bf1dc46b769bfef8ef2f1b568b5ea23f5c4148e68e3771d95510adb919b1ea030cff9080f9fc8a05889f973b1ff718b783414d8e5e86749e78f56799c38fe4df
+  languageName: node
+  linkType: hard
+
 "@abacus-network/celo-ethers-provider@npm:^0.1.0":
   version: 0.1.0
   resolution: "@abacus-network/celo-ethers-provider@npm:0.1.0"
@@ -14,6 +25,80 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@abacus-network/core@npm:0.4.1":
+  version: 0.4.1
+  resolution: "@abacus-network/core@npm:0.4.1"
+  dependencies:
+    "@abacus-network/utils": 0.4.1
+    "@openzeppelin/contracts": ^4.6.0
+    "@openzeppelin/contracts-upgradeable": ^4.6.0
+    "@summa-tx/memview-sol": ^2.0.0
+  checksum: 5fdeb32eb33ad6a470b4b7f801ed419da2065cb6c6f155d651576cd66379663e3d1b35f9b9016d581b1ffd7aa038d7cdab8f8574bc259d801bc317753de41e1d
+  languageName: node
+  linkType: hard
+
+"@abacus-network/interchain-accounts@workspace:typescript/ica":
+  version: 0.0.0-use.local
+  resolution: "@abacus-network/interchain-accounts@workspace:typescript/ica"
+  dependencies:
+    "@abacus-network/app": ^0.4.1
+    "@abacus-network/sdk": ^0.4.1
+    "@abacus-network/utils": ^0.4.1
+    "@nomicfoundation/hardhat-chai-matchers": ^1.0.3
+    "@nomicfoundation/hardhat-toolbox": ^1.0.2
+    "@nomiclabs/hardhat-ethers": ^2.0.5
+    "@nomiclabs/hardhat-waffle": ^2.0.2
+    "@openzeppelin/contracts-upgradeable": ^4.6.0
+    "@trivago/prettier-plugin-sort-imports": ^3.2.0
+    "@typechain/ethers-v5": 10.0.0
+    "@typechain/hardhat": ^6.0.0
+    "@types/mocha": ^9.1.0
+    "@typescript-eslint/eslint-plugin": ^5.27.0
+    "@typescript-eslint/parser": ^5.27.0
+    chai: ^4.3.0
+    eslint: ^8.16.0
+    eslint-config-prettier: ^8.5.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
+
+"@abacus-network/sdk@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@abacus-network/sdk@npm:0.4.1"
+  dependencies:
+    "@abacus-network/app": 0.4.1
+    "@abacus-network/celo-ethers-provider": ^0.1.0
+    "@abacus-network/core": 0.4.1
+    "@abacus-network/utils": 0.4.1
+    "@types/debug": ^4.1.7
+    coingecko-api: ^1.0.10
+    cross-fetch: ^3.1.5
+    debug: ^4.3.4
+    ethers: ^5.6.8
+  checksum: d6f43d26666b07711ab82688b4b5d5b3de718019223b048b753dbf04ca38eed79bc3f634c9de66592babb86b1cfcf3250dc7065e3ae8bb3386a98ca7aed7258c
+  languageName: node
+  linkType: hard
+
+"@abacus-network/utils@npm:0.4.1, @abacus-network/utils@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "@abacus-network/utils@npm:0.4.1"
+  dependencies:
+    ethers: ^5.6.8
+  checksum: dd69c911619412b138e12a1bfa1c52a57e56b40cdd416122cb98a4c04032295978b45cfecc47b8038af72d01eab9811245cfb6e3d50cd21ec11b263f426e6b1a
+  languageName: node
+  linkType: hard
+
 "@aws-crypto/crc32@npm:2.0.0":
   version: 2.0.0
   resolution: "@aws-crypto/crc32@npm:2.0.0"
@@ -3714,6 +3799,15 @@ __metadata:
   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"
+  peerDependencies:
+    ethers: ^5
+  checksum: 5ea495505b3e4338ec6c419f69b66af2d35b86e7cdab9bc7ee65ba4a233729b2143b0a72cc637f8e8795ecacc18eeda5ac803e8b3de9a63e7ceb5dc14014b3d4
+  languageName: node
+  linkType: hard
+
 "@hyperlane-xyz/core@0.5.0-beta0, @hyperlane-xyz/core@workspace:solidity/core":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/core@workspace:solidity/core"
@@ -3834,8 +3928,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/sdk@workspace:typescript/sdk"
   dependencies:
-    "@abacus-network/celo-ethers-provider": ^0.1.0
     "@hyperlane-xyz/app": 0.5.0-beta0
+    "@hyperlane-xyz/celo-ethers-provider": ^0.1.1
     "@hyperlane-xyz/core": 0.5.0-beta0
     "@hyperlane-xyz/utils": 0.5.0-beta0
     "@nomiclabs/hardhat-ethers": ^2.0.5