Skip to content

Commit

Permalink
Ancient8 new ism, misc infra fixes (#3606)
Browse files Browse the repository at this point in the history
### Description

- Deploys ancient8 with a new ISM where we are not quorum
- Pulls out warp config to live in a single file / function so that
deploy.ts and check-deploy.ts are in sync. Otherwise fork.sh is broken
for warp routes
- Shuffles around the aw multisig serialization stuff - now they're
segmented by environment and context and are written to
`config/{env}/aw-validators/{context}.json`. This was in response to
some confusing merging logic, see
https://discord.com/channels/935678348330434570/1228377321082327141/1229464197297868910

### Drive-by changes

Needed to specify pino to work in pretty mode for warp monitoring :/
this is necessary because pino doesn't work otherwise. After #3582 we
should change this

### Related issues

<!--
- Fixes #[issue number here]
-->

### Backward compatibility

<!--
Are these changes backward compatible? Are there any infrastructure
implications, e.g. changes that would prohibit deploying older commits
using this infra tooling?

Yes/No
-->

### Testing

<!--
What kind of testing have these changes undergone?

None/Manual/Unit Tests
-->
  • Loading branch information
tkporter authored Apr 17, 2024
1 parent f4626eb commit 700240e
Show file tree
Hide file tree
Showing 22 changed files with 323 additions and 276 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ const DOMAINS: &[RawDomain] = &[
is_test_net: true,
is_deprecated: false,
},
RawDomain {
name: "ancient8",
token: "ETH",
domain: 888888888,
chain_id: 888888888,
is_test_net: false,
is_deprecated: false,
},
RawDomain {
name: "arbitrum",
token: "ETH",
Expand Down
41 changes: 20 additions & 21 deletions typescript/infra/config/environments/mainnet3/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const hyperlaneContextAgentChainConfig: AgentChainConfig = {
},
[Role.Scraper]: {
[Chains.arbitrum]: true,
[Chains.ancient8]: false,
[Chains.ancient8]: true,
[Chains.avalanche]: true,
[Chains.bsc]: true,
[Chains.celo]: true,
Expand Down Expand Up @@ -143,11 +143,20 @@ const hyperlane: RootAgentConfig = {
tag: '2a16200-20240408-214947',
},
gasPaymentEnforcement: [
// Temporary measure to ensure all inEVM warp route messages are delivered -
// we saw some issues with IGP indexing.
// To cover ourselves against IGP indexing issues and to ensure Nexus
// users have the best possible experience, we whitelist messages between
// warp routes that we know are certainly paying for gas.
{
type: GasPaymentEnforcementPolicyType.None,
matchingList: routerMatchingList(injectiveInevmInjAddresses),
matchingList: [
...routerMatchingList(injectiveInevmInjAddresses),
...matchingList(inevmEthereumUsdcAddresses),
...matchingList(inevmEthereumUsdtAddresses),
...routerMatchingList(victionEthereumEthAddresses),
...routerMatchingList(victionEthereumUsdcAddresses),
...routerMatchingList(victionEthereumUsdtAddresses),
...routerMatchingList(ancient8EthereumUsdcAddresses),
],
},
{
type: GasPaymentEnforcementPolicyType.None,
Expand Down Expand Up @@ -199,7 +208,7 @@ const hyperlane: RootAgentConfig = {
validators: {
docker: {
repo,
tag: 'c1da894-20240321-175000',
tag: '2a16200-20240408-214947',
},
rpcConsensusType: RpcConsensusType.Quorum,
chains: validatorChainConfig(Contexts.Hyperlane),
Expand All @@ -208,7 +217,7 @@ const hyperlane: RootAgentConfig = {
rpcConsensusType: RpcConsensusType.Fallback,
docker: {
repo,
tag: 'ae0990a-20240313-215426',
tag: '2a16200-20240408-214947',
},
},
};
Expand All @@ -222,7 +231,7 @@ const releaseCandidate: RootAgentConfig = {
rpcConsensusType: RpcConsensusType.Fallback,
docker: {
repo,
tag: 'a72c3cf-20240314-173418',
tag: '2a16200-20240408-214947',
},
whitelist: releaseCandidateHelloworldMatchingList,
gasPaymentEnforcement,
Expand All @@ -234,7 +243,7 @@ const releaseCandidate: RootAgentConfig = {
validators: {
docker: {
repo,
tag: 'ae0990a-20240313-215426',
tag: '2a16200-20240408-214947',
},
rpcConsensusType: RpcConsensusType.Quorum,
chains: validatorChainConfig(Contexts.ReleaseCandidate),
Expand All @@ -258,24 +267,14 @@ const neutron: RootAgentConfig = {
rpcConsensusType: RpcConsensusType.Fallback,
docker: {
repo,
tag: 'a72c3cf-20240314-173418',
tag: '2a16200-20240408-214947',
},
gasPaymentEnforcement: [
{
type: GasPaymentEnforcementPolicyType.None,
matchingList: [
{
originDomain: getDomainId(chainMetadata.neutron),
destinationDomain: getDomainId(chainMetadata.mantapacific),
senderAddress: '*',
recipientAddress: '*',
},
{
originDomain: getDomainId(chainMetadata.neutron),
destinationDomain: getDomainId(chainMetadata.arbitrum),
senderAddress: '*',
recipientAddress: '*',
},
...routerMatchingList(mantaTIAAddresses),
...routerMatchingList(arbitrumTIAAddresses),
],
},
...gasPaymentEnforcement,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"alfajores": {
"validators": [
"0x2233a5ce12f814bd64c9cdd73410bb8693124d40",
"0xba279f965489d90f90490e3c49e860e0b43c2ae6",
"0x86485dcec5f7bb8478dd251676372d054dea6653"
]
},
"ancient8": {
"validators": ["0xbb5842ae0e05215b53df4787a29144efb7e67551"]
},
Expand Down Expand Up @@ -37,37 +30,20 @@
"0x03047213365800f065356b4a2fe97c3c3a52296a"
]
},
"bsctestnet": {
"validators": [
"0x242d8a855a8c932dec51f7999ae7d1e48b10c95e",
"0xf620f5e3d25a3ae848fec74bccae5de3edcd8796",
"0x1f030345963c54ff8229720dd3a711c15c554aeb"
]
},
"celo": {
"validators": [
"0x63478422679303c3e4fc611b771fa4a707ef7f4a",
"0x2f4e808744df049d8acc050628f7bdd8265807f9",
"0x7bf30afcb6a7d92146d5a910ea4c154fba38d25e"
]
},
"eclipsetestnet": {
"validators": ["0xf344f34abca9a444545b5295066348a0ae22dda3"]
},
"ethereum": {
"validators": [
"0x03c842db86a6a3e524d4a6615390c1ea8e2b9541",
"0x4346776b10f5e0d9995d884b7a1dbaee4e24c016",
"0x749d6e7ad949e522c92181dc77f7bbc1c5d71506"
]
},
"fuji": {
"validators": [
"0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e",
"0x895ae30bc83ff1493b9cf7781b0b813d23659857",
"0x43e915573d9f1383cbf482049e4a012290759e7f"
]
},
"gnosis": {
"validators": [
"0xd4df66a859585678f2ea8357161d896be19cc1ca",
Expand Down Expand Up @@ -113,13 +89,6 @@
"0x779a17e035018396724a6dec8a59bda1b5adf738"
]
},
"plumetestnet": {
"validators": [
"0xe765a214849f3ecdf00793b97d00422f2d408ea6",
"0xb59998f71efc65190a85ac5e81b66bd72a192a3b",
"0xc906470a73e6b5aad65a4ceb4acd73e3eaf80e2c"
]
},
"polygon": {
"validators": [
"0x12ecb319c7f4e8ac5eb5226662aeb8528c5cefac",
Expand All @@ -141,23 +110,6 @@
"0x7210fa0a6be39a75cb14d682ebfb37e2b53ecbe5"
]
},
"scrollsepolia": {
"validators": [
"0xbe18dbd758afb367180260b524e6d4bcd1cb6d05",
"0x9a11ed23ae962974018ab45bc133caabff7b3271",
"0x7867bea3c9761fe64e6d124b171f91fd5dd79644"
]
},
"sepolia": {
"validators": [
"0xb22b65f202558adf86a8bb2847b76ae1036686a5",
"0x469f0940684d147defc44f3647146cb90dd0bc8e",
"0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83"
]
},
"solanatestnet": {
"validators": ["0xd4ce8fa138d4e083fc0e480cca0dbfa4f5f30bd5"]
},
"viction": {
"validators": ["0x1f87c368f8e05a85ef9126d984a980a20930cb9c"]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{
"alfajores": {
"validators": [
"0x2233a5ce12f814bd64c9cdd73410bb8693124d40",
"0xba279f965489d90f90490e3c49e860e0b43c2ae6",
"0x86485dcec5f7bb8478dd251676372d054dea6653"
]
},
"ancient8": {
"validators": ["0xaae4d879a04e3d8b956eb4ffbefd57fdbed09cae"]
},
Expand Down Expand Up @@ -37,37 +30,20 @@
"0x50ff94984161976a13e9ec3b2a7647da5319448f"
]
},
"bsctestnet": {
"validators": [
"0x242d8a855a8c932dec51f7999ae7d1e48b10c95e",
"0xf620f5e3d25a3ae848fec74bccae5de3edcd8796",
"0x1f030345963c54ff8229720dd3a711c15c554aeb"
]
},
"celo": {
"validators": [
"0xb51768c1388e976486a43dbbbbf9ce04cf45e990",
"0x6325de37b33e20089c091950518a471e29c52883",
"0xd796c1d4fcfb3c63acfa6e4113aa6ae1399b337c"
]
},
"eclipsetestnet": {
"validators": ["0xf344f34abca9a444545b5295066348a0ae22dda3"]
},
"ethereum": {
"validators": [
"0x0580884289890805802012b9872afa5ae41a5fa6",
"0xa5465cb5095a2e6093587e644d6121d6ed55c632",
"0x87cf8a85465118aff9ec728ca157798201b1e368"
]
},
"fuji": {
"validators": [
"0xd8154f73d04cc7f7f0c332793692e6e6f6b2402e",
"0x895ae30bc83ff1493b9cf7781b0b813d23659857",
"0x43e915573d9f1383cbf482049e4a012290759e7f"
]
},
"gnosis": {
"validators": [
"0xd5122daa0c3dfc94a825ae928f3ea138cdb6a2e1",
Expand All @@ -82,13 +58,6 @@
"0xe83d36fd00d9ef86243d9f7147b29e98d11df0ee"
]
},
"injective": {
"validators": [
"0xbfb8911b72cfb138c7ce517c57d9c691535dc517",
"0x6faa139c33a7e6f53cb101f6b2ae392298283ed2",
"0x0115e3a66820fb99da30d30e2ce52a453ba99d92"
]
},
"mantapacific": {
"validators": [
"0x84fcb05e6e5961df2dfd9f36e8f2b3e87ede7d76",
Expand All @@ -103,13 +72,6 @@
"0xcaa9c6e6efa35e4a8b47565f3ce98845fa638bf3"
]
},
"mumbai": {
"validators": [
"0xebc301013b6cd2548e347c28d2dc43ec20c068f2",
"0x315db9868fc8813b221b1694f8760ece39f45447",
"0x17517c98358c5937c5d9ee47ce1f5b4c2b7fc9f5"
]
},
"neutron": {
"validators": [
"0x307a8fe091b8273c7ce3d277b161b4a2167279b1",
Expand All @@ -124,13 +86,6 @@
"0x2d58cdb2bed9aac57b488b1bad06839ddc280a78"
]
},
"plumetestnet": {
"validators": [
"0xe765a214849f3ecdf00793b97d00422f2d408ea6",
"0xb59998f71efc65190a85ac5e81b66bd72a192a3b",
"0xc906470a73e6b5aad65a4ceb4acd73e3eaf80e2c"
]
},
"polygon": {
"validators": [
"0xf0a990959f833ccde624c8bcd4c7669286a57a0f",
Expand All @@ -152,23 +107,6 @@
"0x07c2f32a402543badc3141f6b98969d75ef2ac28"
]
},
"scrollsepolia": {
"validators": [
"0xbe18dbd758afb367180260b524e6d4bcd1cb6d05",
"0x9a11ed23ae962974018ab45bc133caabff7b3271",
"0x7867bea3c9761fe64e6d124b171f91fd5dd79644"
]
},
"sepolia": {
"validators": [
"0xb22b65f202558adf86a8bb2847b76ae1036686a5",
"0x469f0940684d147defc44f3647146cb90dd0bc8e",
"0xd3c75dcf15056012a4d74c483a0c6ea11d8c2b83"
]
},
"solanatestnet": {
"validators": ["0xd4ce8fa138d4e083fc0e480cca0dbfa4f5f30bd5"]
},
"viction": {
"validators": [
"0xe858971cd865b11d3e8fb6b6af72db0d85881baf",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
},
"ethereum": {
"HypERC20Collateral": "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D",
"collateral": "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D"
"collateral": "0x8b4192B9Ad1fCa440A5808641261e5289e6de95D",
"proxyAdmin": "0x7d0c8b23c5b35091972023ccc689cfedcd881c7d"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Configs and artifacts for the deployment of Hyperlane Warp Routes
# Between ancient8 and Ethereum
description: Hyperlane Warp Route artifacts
timestamp: '2024-04-15T16:00:00.000Z'
deployer: Abacus Works (Hyperlane)
data:
config:
ethereum:
protocolType: ethereum
type: collateral
hypAddress: '0x8b4192B9Ad1fCa440A5808641261e5289e6de95D'
tokenAddress: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' # USDC
name: USDC
symbol: USDC
decimals: 6
ancient8:
protocolType: ethereum
type: synthetic
hypAddress: '0x97423A68BAe94b5De52d767a17aBCc54c157c0E5'
name: USDC
symbol: USDC
decimals: 6
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@
"constructorArguments": "0000000000000000000000009fa986acb22953c504fcf5985dfa476d481c3b1b000000000000000000000000db670e1a1e312bf17425b08ce55bdf2cd8f8ed5400000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000144e80a7c79000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a7eccdb9be08178f896c26b7bbd8c3d4e844d9ba000000000000000000000000000000000000000000000000000000000000000855534420436f696e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004555344430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"isProxy": true,
"name": "TransparentUpgradeableProxy"
},
{
"address": "0x086eF95a2F74582Ee30E7D698518a872fb18301f",
"constructorArguments": "",
"isProxy": false,
"name": "ProxyAdmin"
},
{
"address": "0x8358D8291e3bEDb04804975eEa0fe9fe0fAfB147",
"constructorArguments": "",
"isProxy": false,
"name": "ProxyAdmin"
}
],
"arbitrum": [
Expand Down
Loading

0 comments on commit 700240e

Please sign in to comment.