Infra RunEnv should be SDK env (#1502)

hyperlane-xyz · Jan 4, 2023 · 912793c · 912793c · github-actions · Jan 4, 2023
1 parent 7f89870
commit 912793c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 34 deletions.
diff --git a/typescript/infra/config/environments/mainnet2/agent.ts b/typescript/infra/config/environments/mainnet2/agent.ts
@@ -13,7 +13,7 @@ import { validators } from './validators';
 export const hyperlane: AgentConfig<MainnetChains> = {
   environment,
   namespace: environment,
-  runEnv: environment,
+  runEnv: 'mainnet',
   context: Contexts.Hyperlane,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',

diff --git a/typescript/infra/config/environments/testnet3/agent.ts b/typescript/infra/config/environments/testnet3/agent.ts
@@ -22,7 +22,7 @@ const releaseCandidateHelloworldMatchingList = helloworldMatchingList(
 export const hyperlane: AgentConfig<TestnetChains> = {
   environment,
   namespace: environment,
-  runEnv: environment,
+  runEnv: 'testnet',
   context: Contexts.Hyperlane,
   docker: {
     repo: 'gcr.io/abacus-labs-dev/hyperlane-agent',

diff --git a/typescript/infra/scripts/check-deploy.ts b/typescript/infra/scripts/check-deploy.ts
@@ -1,10 +1,8 @@
 import { HyperlaneCore, HyperlaneCoreChecker } from '@hyperlane-xyz/sdk';
 
-import {
-  deployEnvToSdkEnv,
-  getCoreEnvironmentConfig,
-  getEnvironment,
-} from './utils';
+import { deployEnvToSdkEnv } from '../src/config/environment';
+
+import { getCoreEnvironmentConfig, getEnvironment } from './utils';
 
 async function check() {
   const environment = await getEnvironment();

diff --git a/typescript/infra/scripts/debug-message.ts b/typescript/infra/scripts/debug-message.ts
@@ -9,9 +9,10 @@ import {
 } from '@hyperlane-xyz/sdk';
 import { utils } from '@hyperlane-xyz/utils';
 
+import { deployEnvToSdkEnv } from '../src/config/environment';
 import { assertChain } from '../src/utils/utils';
 
-import { deployEnvToSdkEnv, getArgs, getEnvironment } from './utils';
+import { getArgs, getEnvironment } from './utils';
 
 async function main() {
   const argv = await getArgs()

diff --git a/typescript/infra/scripts/funding/reclaim-from-igp.ts b/typescript/infra/scripts/funding/reclaim-from-igp.ts
@@ -2,11 +2,8 @@ import { BigNumber } from 'ethers';
 
 import { HyperlaneCore, objMap, promiseObjAll } from '@hyperlane-xyz/sdk';
 
-import {
-  deployEnvToSdkEnv,
-  getEnvironment,
-  getEnvironmentConfig,
-} from '../utils';
+import { deployEnvToSdkEnv } from '../../src/config/environment';
+import { getEnvironment, getEnvironmentConfig } from '../utils';
 
 // Some arbitrary treshold for now
 const RECLAIM_BALANCE_THRESHOLD = BigNumber.from(10).pow(17);

diff --git a/typescript/infra/scripts/govern.ts b/typescript/infra/scripts/govern.ts
@@ -1,12 +1,9 @@
 import { HyperlaneCore, HyperlaneCoreChecker } from '@hyperlane-xyz/sdk';
 
+import { deployEnvToSdkEnv } from '../src/config/environment';
 import { HyperlaneCoreGovernor } from '../src/core/govern';
 
-import {
-  deployEnvToSdkEnv,
-  getCoreEnvironmentConfig,
-  getEnvironment,
-} from './utils';
+import { getCoreEnvironmentConfig, getEnvironment } from './utils';
 
 async function check() {
   const environment = await getEnvironment();

diff --git a/typescript/infra/scripts/helloworld/deploy.ts b/typescript/infra/scripts/helloworld/deploy.ts
@@ -14,9 +14,9 @@ import {
 
 import { Contexts } from '../../config/contexts';
 import { KEY_ROLE_ENUM } from '../../src/agents/roles';
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { readJSON, writeJSON } from '../../src/utils/utils';
 import {
-  deployEnvToSdkEnv,
   getContext,
   getCoreEnvironmentConfig,
   getEnvironment,

diff --git a/typescript/infra/scripts/helloworld/kathy.ts b/typescript/infra/scripts/helloworld/kathy.ts
@@ -13,9 +13,10 @@ import { debug, error, log, utils, warn } from '@hyperlane-xyz/utils';
 
 import { KEY_ROLE_ENUM } from '../../src/agents/roles';
 import { ConnectionType } from '../../src/config/agent';
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { startMetricsServer } from '../../src/utils/metrics';
 import { assertChain, diagonalize, sleep } from '../../src/utils/utils';
-import { deployEnvToSdkEnv, getArgs, getCoreEnvironmentConfig } from '../utils';
+import { getArgs, getCoreEnvironmentConfig } from '../utils';
 
 import { getApp } from './utils';
 

diff --git a/typescript/infra/scripts/helloworld/utils.ts b/typescript/infra/scripts/helloworld/utils.ts
@@ -18,8 +18,8 @@ import { Contexts } from '../../config/contexts';
 import { KEY_ROLE_ENUM } from '../../src/agents/roles';
 import { CoreEnvironmentConfig, DeployEnvironment } from '../../src/config';
 import { ConnectionType } from '../../src/config/agent';
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { HelloWorldConfig } from '../../src/config/helloworld';
-import { deployEnvToSdkEnv } from '../utils';
 
 export async function getConfiguration<Chain extends ChainName>(
   environment: DeployEnvironment,

diff --git a/typescript/infra/scripts/middleware/deploy-accounts.ts b/typescript/infra/scripts/middleware/deploy-accounts.ts
@@ -6,11 +6,11 @@ import {
   interchainAccountFactories,
 } from '@hyperlane-xyz/sdk';
 
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { deployWithArtifacts } from '../../src/deploy';
 import { getConfiguration } from '../helloworld/utils';
 import { mergeWithSdkContractAddressArtifacts } from '../merge-sdk-contract-addresses';
 import {
-  deployEnvToSdkEnv,
   getCoreEnvironmentConfig,
   getEnvironment,
   getEnvironmentDirectory,

diff --git a/typescript/infra/scripts/middleware/deploy-liquidity-layer.ts b/typescript/infra/scripts/middleware/deploy-liquidity-layer.ts
@@ -8,10 +8,10 @@ import {
 } from '@hyperlane-xyz/sdk';
 
 import { circleBridgeAdapterConfig } from '../../config/environments/test/liquidityLayer';
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { deployWithArtifacts } from '../../src/deploy';
 import { getConfiguration } from '../helloworld/utils';
 import {
-  deployEnvToSdkEnv,
   getCoreEnvironmentConfig,
   getEnvironment,
   getEnvironmentDirectory,

diff --git a/typescript/infra/scripts/middleware/deploy-queries.ts b/typescript/infra/scripts/middleware/deploy-queries.ts
@@ -6,11 +6,11 @@ import {
   interchainQueryFactories,
 } from '@hyperlane-xyz/sdk';
 
+import { deployEnvToSdkEnv } from '../../src/config/environment';
 import { deployWithArtifacts } from '../../src/deploy';
 import { getConfiguration } from '../helloworld/utils';
 import { mergeWithSdkContractAddressArtifacts } from '../merge-sdk-contract-addresses';
 import {
-  deployEnvToSdkEnv,
   getCoreEnvironmentConfig,
   getEnvironment,
   getEnvironmentDirectory,

diff --git a/typescript/infra/scripts/utils.ts b/typescript/infra/scripts/utils.ts
@@ -7,7 +7,6 @@ import {
   ChainName,
   IChainConnection,
   MultiProvider,
-  coreEnvironments,
   objMap,
   promiseObjAll,
 } from '@hyperlane-xyz/sdk';
@@ -60,13 +59,6 @@ export async function getEnvironment() {
   return assertEnvironment(await getEnvironmentFromArgs());
 }
 
-type SdkEnvironment = keyof typeof coreEnvironments;
-export const deployEnvToSdkEnv: Record<DeployEnvironment, SdkEnvironment> = {
-  mainnet2: 'mainnet',
-  testnet3: 'testnet',
-  test: 'test',
-};
-
 export async function getEnvironmentConfig() {
   return getCoreEnvironmentConfig(await getEnvironment());
 }

diff --git a/typescript/infra/src/config/agent.ts b/typescript/infra/src/config/agent.ts
@@ -10,7 +10,7 @@ import {
 import { KEY_ROLE_ENUM } from '../agents/roles';
 import { gcpSecretExists } from '../utils/gcloud';
 
-import { DeployEnvironment } from './environment';
+import { DeployEnvironment, SdkEnvironment } from './environment';
 
 // Allows a "default" config to be specified and any per-chain overrides.
 interface ChainOverridableConfig<Chain extends ChainName, T> {
@@ -210,7 +210,7 @@ export enum TransactionSubmissionType {
 export interface AgentConfig<Chain extends ChainName> {
   environment: string;
   namespace: string;
-  runEnv: string;
+  runEnv: SdkEnvironment;
   context: Contexts;
   docker: DockerConfig;
   quorumProvider?: boolean;

diff --git a/typescript/infra/src/config/environment.ts b/typescript/infra/src/config/environment.ts
@@ -4,6 +4,7 @@ import {
   CoreConfig,
   EnvironmentConfig,
   MultiProvider,
+  coreEnvironments,
 } from '@hyperlane-xyz/sdk';
 
 import { Contexts } from '../../config/contexts';
@@ -37,3 +38,10 @@ export type CoreEnvironmentConfig<Chain extends ChainName> = {
   helloWorld?: Partial<Record<Contexts, HelloWorldConfig<Chain>>>;
   keyFunderConfig?: KeyFunderConfig;
 };
+
+export type SdkEnvironment = keyof typeof coreEnvironments;
+export const deployEnvToSdkEnv: Record<DeployEnvironment, SdkEnvironment> = {
+  mainnet2: 'mainnet',
+  testnet3: 'testnet',
+  test: 'test',
+};
File	Stmts	Branches	Funcs	Lines	Uncovered Lines
../node_modules/@openzeppelin/contracts-upgradeable/access
OwnableUpgradeable.sol	61.90%	50%	57.14%	70%	30, 34, 56, 67, 75
../node_modules/@openzeppelin/contracts-upgradeable/proxy/utils
Initializable.sol	0%	0%	0%	0%	145, 145, 145–146, 146, 146–148, 156, 163
../node_modules/@openzeppelin/contracts-upgradeable/token/ERC20
ERC20Upgradeable.sol	66%	54.55%	55%	74.14%	100, 187–189, 207–209, 209, 209, 211, 214, 236–237, 242, 265, 291, 296, 326–327, 56, 60–61, 68, 76, 93
../node_modules/@openzeppelin/contracts-upgradeable/utils
AddressUpgradeable.sol	0%	0%	0%	0%	100, 119, 134, 134, 134–136, 146, 160–161, 176, 176, 176–177, 177, 177, 180, 180, 180, 182, 184, 199, 199, 199–200, 202, 208, 208, 208, 216, 41, 61, 61, 61, 63–64, 64, 64, 86
ContextUpgradeable.sol	33.33%	100%	25%	50%	28
../node_modules/@openzeppelin/contracts/access
Ownable.sol	0%	0%	0%	0%	44, 51, 51, 51, 62, 70, 70, 70–71, 79–81
../node_modules/@openzeppelin/contracts/proxy
Proxy.sol	0%	100%	0%	0%	59–60, 68
../node_modules/@openzeppelin/contracts/proxy/ERC1967
ERC1967Proxy.sol	0%	100%	0%	0%	30
ERC1967Upgrade.sol	0%	0%	0%	0%	117, 124, 124, 124–125, 134–135, 153, 160, 160, 160–161, 161, 161, 165, 179–181, 181, 181–182, 39, 46, 46, 46–47, 56–57, 70–71, 71, 71–72, 89, 89, 89–90, 92, 97
../node_modules/@openzeppelin/contracts/proxy/transparent
ProxyAdmin.sol	0%	0%	0%	0%	24–25, 25, 25–26, 39–40, 40, 40–41, 52, 63, 79
TransparentUpgradeableProxy.sol	0%	0%	0%	0%	107, 114, 121, 121, 121–122, 63, 76, 87, 96
../node_modules/@openzeppelin/contracts/utils
Address.sol	0%	0%	0%	0%	100, 119, 134, 134, 134–136, 146, 160–161, 171, 185–186, 201, 201, 201–202, 202, 202, 205, 205, 205, 207, 209, 224, 224, 224–225, 227, 233, 233, 233, 241, 41, 61, 61, 61, 63–64, 64, 64, 86
Context.sol	0%	100%	0%	0%	18, 22
Create2.sol	0%	0%	0%	0%	35, 35, 35–36, 36, 36, 39, 41, 41, 41, 49, 80
StorageSlot.sol	0%	100%	0%	0%	55, 65, 75, 85
Strings.sol	0%	0%	0%	0%	20–22, 25, 28, 33–34, 34, 34, 36, 45, 53–58, 60, 60, 60–61, 68
../node_modules/@openzeppelin/contracts/utils/cryptography
ECDSA.sol	0%	0%	0%	0%	106–108, 121–123, 147, 147, 147–148, 152–153, 153, 153–154, 157, 170–172, 186, 198, 211, 24, 24, 24–26, 26, 26–28, 28, 28–30, 30, 30–31, 56, 56, 56–59, 64–66, 68, 70, 89–91
../node_modules/@openzeppelin/contracts/utils/math
Math.sol	0%	0%	0%	0%	102, 105, 108, 112, 117, 121–126, 132–133, 146–147, 147, 147–148, 150, 159, 159, 159–160, 173, 180–187, 196–197, 20, 206, 208, 208, 208–210, 212, 212, 212–214, 216, 216, 216–218, 220, 220, 220–222, 224, 224, 224–226, 228, 228, 228–230, 232, 232, 232–234, 236, 236, 236–237, 240, 249–250, 259, 261, 261, 261–263, 265, 265, 265–267, 269, 269, 269, 27, 270–271, 273, 273, 273–275, 277, 277, 277–279, 281, 281, 281–283, 285, 285, 285–286, 289, 298–299, 310, 312, 312, 312–314, 316, 316, 316–318, 320, 320, 320–322, 324, 324, 324–326, 328, 328, 328–329, 332,
File	Stmts	Branches	Funcs	Lines	Uncovered Lines
solidity/contracts
Call.sol	100%	100%	100%	100%
Create2Factory.sol	0%	0%	0%	0%	101, 110, 110, 110, 112, 33, 58, 64–65, 65, 65, 77–78, 98, 98, 98
HyperlaneConnectionClient.sol	64.71%	75%	63.64%	63.16%	119, 151–152, 58, 76–77, 85–86
InterchainGasPaymaster.sol	92.31%	50%	100%	100%	72
Mailbox.sol	97.06%	100%	92.31%	97.56%	232
OwnableMulticall.sol	0%	0%	0%	0%	15, 19, 23–24, 27, 27, 27–28, 39–41, 44, 44, 44–45, 51–53, 53, 53–54
PausableReentrancyGuard.sol	95.65%	83.33%	100%	100%	30
Router.sol	89.80%	87.50%	85.71%	92.59%	111, 53, 64
solidity/contracts/isms
MultisigIsm.sol	97.12%	86.36%	100%	100%	102, 155, 263
solidity/contracts/libs
EnumerableMapExtended.sol	53.33%	100%	57.14%	50%	45, 61, 69–70
Merkle.sol	97.14%	87.50%	100%	98.25%	30, 44
Message.sol	90.91%	100%	90.91%	90.91%	109
MinimalProxy.sol	0%	100%	0%	0%	14
MultisigIsmMetadata.sol	92.31%	100%	90.91%	93.33%	152
TypeCasts.sol	44.44%	100%	66.67%	33.33%	11–13, 17
solidity/contracts/middleware
InterchainAccountRouter.sol	0%	0%	0%	0%	101–103, 117, 130–132, 132, 132–136, 138, 152, 165, 178, 182, 39, 41–42, 57, 74, 86
InterchainQueryRouter.sol	0%	0%	0%	0%	100–103, 117–121, 134, 134, 134, 138, 142, 155–156, 156, 156–157, 163–164, 168–169, 169–170, 174–175, 65, 82, 99
solidity/contracts/middleware/liquidity-layer
LiquidityLayerRouter.sol	0%	0%	0%	0%	111, 116, 124, 137–138, 146, 148, 148, 148, 28, 40, 51, 56, 56, 56, 64, 72, 82, 99
solidity/contracts/middleware/liquidity-layer/adapters
CircleBridgeAdapter.sol	0%	0%	0%	0%	100, 100, 100, 107, 107, 107, 112, 119–120, 131, 135, 141–142, 142, 142, 147–148, 148, 148, 157, 157, 157, 159, 169, 176, 178, 185, 185, 185, 191–192, 192, 192, 194–195, 195, 195, 200–201, 203, 211–212, 212, 212, 214–215, 215, 215, 221–222, 224, 240, 58, 58, 58–59, 75, 77–78, 81, 90–91, 91, 91, 96, 99
solidity/contracts/middleware/liquidity-layer/interfaces
ILiquidityLayerAdapter.sol	100%	100%	100%	100%
solidity/contracts/middleware/liquidity-layer/interfaces/circle
ICircleBridge.sol	100%	100%	100%	100%
ICircleMessageTransmitter.sol	100%	100%	100%	100%
solidity/contracts/mock
MockCircleBridge.sol	0%	0%	0%	0%	12, 21–23, 23, 23–25, 35–36
MockCircleMessageTransmitter.sol	0%	100%	0%	0%	12, 20, 28, 36–37, 41
MockHyperlaneEnvironment.sol	0%	100%	0%	0%	21–22, 24–25, 27–28, 30–31, 33–34, 36–37, 39–40, 42, 47, 53, 57, 62–63, 67, 71
MockMailbox.sol	94.74%	50%	100%	100%	41
MockToken.sol	0%	100%	0%	0%	12, 8
solidity/contracts/upgrade
ProxyAdmin.sol	100%	100%	100%	100%
TransparentUpgradeableProxy.sol	100%	100%	100%	100%
Versioned.sol	100%	100%	100%	100%