Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5834 x1 for mainnet prod #6177

Merged
merged 77 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
36c85b4
feat: add x layer domain
liu-zhipeng Mar 27, 2024
0a8e46f
feat: create domain hh task
liu-zhipeng Mar 27, 2024
5592f08
chore: correct str used in domain conversion
just-a-node Mar 27, 2024
849fa93
feat: x layer mainnet hh & amb config
liu-zhipeng Mar 27, 2024
73591dc
Merge branch '5834-x1-for-mainnet' of https://github.com/connext/mono…
liu-zhipeng Mar 27, 2024
8604684
feat: polygon zkevm bridge v2 abi and hh task
liu-zhipeng Mar 27, 2024
066ce78
fix: IPolygonZkEVMBridge
liu-zhipeng Mar 27, 2024
fa37791
fix: comment
liu-zhipeng Mar 27, 2024
a01028c
fix: X Layer L2 bridge contract address
liu-zhipeng Mar 27, 2024
48d2173
fix: update XLayer amb address
liu-zhipeng Apr 1, 2024
69f8d56
feat: x layer config
liu-zhipeng Apr 1, 2024
fec6f83
feat: x layer contract deployed
liu-zhipeng Apr 1, 2024
da53b2f
feat: Xlayer mainnet hub connector deploy
liu-zhipeng Apr 1, 2024
f0c8a73
feat: x layer staging subgraph deploy
liu-zhipeng Apr 1, 2024
8ba4a01
fix: x layer staging init config (TODO: update multisig)
liu-zhipeng Apr 2, 2024
f32ce6e
fix: sendoutboundroot hh task
liu-zhipeng Apr 2, 2024
1e11e81
feat: x layer lighthouse draft
liu-zhipeng Apr 3, 2024
a2c030c
fix: x layer spoke mirror network id and redeploy
liu-zhipeng Apr 8, 2024
ff2a210
fix: x layer claim hh task
liu-zhipeng Apr 8, 2024
25639ea
fix: processFromRoot xlayer
liu-zhipeng Apr 8, 2024
54a66cd
Merge branch 'main' into 5834-x1-for-mainnet
liu-zhipeng Apr 8, 2024
d5f6339
fix: unit tests
liu-zhipeng Apr 8, 2024
63a4a83
fix: typo
liu-zhipeng Apr 8, 2024
2c1e7ec
feat: X Layer prod contract deployment
liu-zhipeng Apr 8, 2024
f369cc5
feat: add multichain safe deploy command
LayneHaber Apr 8, 2024
c572f43
config: add correctly deployed safes
LayneHaber Apr 8, 2024
fcc91ae
config: remove hardcoded gas limit by default
LayneHaber Apr 8, 2024
1355744
feat: add router admin assignment
LayneHaber Apr 8, 2024
8a30f50
Merge branch 'main' into 5834-x1-for-mainnet
LayneHaber Apr 8, 2024
b09bff8
feat: get write tx for single message
LayneHaber Apr 9, 2024
9382be0
fix: handle no-args case
LayneHaber Apr 9, 2024
fd20b83
feat: x layer prod subgraph
liu-zhipeng Apr 9, 2024
5236302
Merge branch '5834-x1-for-mainnet-prod' into safe-cli-deploy
LayneHaber Apr 9, 2024
5f7df99
feat: add xlayer safes
LayneHaber Apr 9, 2024
a591419
Merge pull request #6004 from connext/safe-cli-deploy
liu-zhipeng Apr 9, 2024
01d8872
fix: contract package bump
prathmeshkhandelwal1 Apr 9, 2024
48dd010
fix: x layer WETH init
liu-zhipeng Apr 9, 2024
facbdb8
feat: rebuild graph client
liu-zhipeng Apr 9, 2024
8e5c692
feat: x layer ops
liu-zhipeng Apr 9, 2024
6ab67dd
feat: track roots sent from L1 to L2 in subgraph
LayneHaber Apr 9, 2024
45cfd8f
chore: update dependencies
LayneHaber Apr 10, 2024
15eb3ce
fix: update handler name
LayneHaber Apr 10, 2024
d3f145c
chore: add xlayer graphclient & rebuild
LayneHaber Apr 10, 2024
dbc7cfb
fix: empty claim, correct connector
LayneHaber Apr 10, 2024
07a0d6d
fix: save root message from L2 -> L1
liu-zhipeng Apr 10, 2024
75d83b7
Revert "fix: save root message from L2 -> L1"
liu-zhipeng Apr 11, 2024
dcc1b96
test: add unit tests for sendoutboundroot
liu-zhipeng Apr 11, 2024
932a107
feat: (wip) multiple transactions
LayneHaber Apr 11, 2024
1468561
feat: (wip) process spoke and oull messages from helper
LayneHaber Apr 11, 2024
1b9d9ae
fix: remove subgraph changes
LayneHaber Apr 11, 2024
c6a2715
fix: remove unused imports
LayneHaber Apr 11, 2024
a7b0b31
feat: rebuild graphclient
LayneHaber Apr 11, 2024
b4660f9
fix: LH lint fix
liu-zhipeng Apr 11, 2024
09e849e
fix: processFromRoot for x layer
liu-zhipeng Apr 11, 2024
2a87d59
Merge pull request #6003 from connext/5834-subtask-lighthouse
LayneHaber Apr 15, 2024
8d5e548
Merge branch 'main' into 5834-x1-for-mainnet
LayneHaber Apr 15, 2024
a361aa2
fix: cleaner errors on undefined key
LayneHaber Apr 15, 2024
6891905
fix: comments, logs, id of spoke claim
LayneHaber Apr 15, 2024
c058044
fix: rename
LayneHaber Apr 15, 2024
72b9ca2
fix: existing tests
LayneHaber Apr 15, 2024
672d50f
fix: add xlayer helper tests
LayneHaber Apr 15, 2024
c3e1138
fix: coverage
LayneHaber Apr 15, 2024
e1c5613
fix: coverage
LayneHaber Apr 16, 2024
697b35c
fix: coverage
LayneHaber Apr 16, 2024
eeb540b
fix: coverage
prathmeshkhandelwal1 Apr 22, 2024
5b005e0
fix: coverage
prathmeshkhandelwal1 Apr 22, 2024
7c96f82
ts fix
prathmeshkhandelwal1 Apr 22, 2024
73f61aa
fix: temp
prathmeshkhandelwal1 Apr 25, 2024
48c09a5
fix: remove logs
prathmeshkhandelwal1 Apr 29, 2024
8db4d43
fix: remove consoles
prathmeshkhandelwal1 Apr 29, 2024
1ee1696
feat: merge xlayer -> xlayer-prod
prathmeshkhandelwal1 Apr 29, 2024
367364a
fix: added graph-client
prathmeshkhandelwal1 Apr 29, 2024
bd38efb
fix: merge resolve
prathmeshkhandelwal1 May 15, 2024
7205507
chore: update xlayer rpc
just-a-node May 15, 2024
043dc12
feat: sops xlayer key
just-a-node May 15, 2024
9397a7f
Merge branch 'main' into 5834-x1-for-mainnet-prod
just-a-node May 15, 2024
ad602f8
fix: bad merge
just-a-node May 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ops/env/mainnet/backend/secrets.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"carto_roots_heartbeat": "ENC[AES256_GCM,data:aQUjIO2i5CfDxI/1wDVDwkDv7ltpv8R6,iv:YQ1IRa8Q+gKwbCmZe/WcvGIedkMHO7ZpdI5BCd6eM9M=,tag:SBWMD6zaWhS8ZUIFzDX+dA==,type:str]",
"carto_routers_heartbeat": "ENC[AES256_GCM,data:nNsVs2rwfCvyeb2w4Oe3qei1sHBMZFEF,iv:vgJy5ibp5mItU2ed9oTD7y3V/9kR1s7lI0y8yxgFwKY=,tag:6fEuqTrl64gYlL4sPFPNgQ==,type:str]",
"blast_key": "ENC[AES256_GCM,data:WK8loJvsgQgcXJtkgTRXX3E1PUQ7xL6rKmhEqMiuJGZGSkHF,iv:6+0/wAQBsevYRox2Gklj3kRuFMiuShRApBE4m/WVRDc=,tag:Pv+Ck8suF4yspUy3vtxVdg==,type:str]",
"xlayer_key": "ENC[AES256_GCM,data:r8PZMyGkCRLp,iv:3qilCz4OoIx3UVnhpNEd7hFnnHEpxYEi8EBjTzlsK5Q=,tag:HvZ8/f3V6DFPR/xrJxuDbw==,type:str]",
"carto_transfers_heartbeat": "ENC[AES256_GCM,data:uO12tqnIJicj6w/xKJe6+W0e+ZhSOdMR,iv:82jNsVweODRvpcx76P1Rzy40miQ31xLTtAWtpn1FXlM=,tag:BYccAfJKHrjHNGvhaLnK6g==,type:str]",
"sops": {
"kms": [
Expand All @@ -20,8 +21,8 @@
"azure_kv": null,
"hc_vault": null,
"age": null,
"lastmodified": "2024-02-08T23:32:51Z",
"mac": "ENC[AES256_GCM,data:UF01CGsZd8s0Sit3q0FyEldM17+xJ2srfa9a8JBhA5UlUX1q7v5u88Vif6Q9nXqIpje+AMoVOp29kJrIFRioKh0ESCTXukIULSi4t1fxdL9X3a1T4a8/QEgofgKfj4Gcu64z5aNKVGjU2evjlXoNrpJOllqxZg6TYVlkkHgXAGU=,iv:sD+wXJt8GCOV4mRrHMnsDHWUiY9R8sgLhJvAGjgWzcs=,tag:Oqe7M6j+XKtziFEdREJbbw==,type:str]",
"lastmodified": "2024-05-15T22:20:56Z",
"mac": "ENC[AES256_GCM,data:upt7irDGJ6BvXlDFsrKf5eAab0oqVmAWB5L9DKULFfzFBP2Qz8wORRLnRxZrBSeVqU1o4Emm++TEnQwR8S90pxOA89Iuk7hSTssMRQdn+6sjKlriYIAK4xXTQdz38Xmw+0MMDt5SC+QXLf0KCrENoXTEzxNS3LP/U75wpCF9q68=,iv:Vt1JGErgaCkL9EvCsl9/T0WxXNUkpoTRAYVENDu1Xu8=,tag:g3sYYjnnH0zt9ksZQ4p5aA==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.7.3"
Expand Down
5 changes: 3 additions & 2 deletions ops/env/mainnet/core/secrets.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"arbitrum_alchemy_key_0": "ENC[AES256_GCM,data:s7DiEl80b40CMBFtGF5B4KteWVgLTfiQ81wINr4A/3I=,iv:AR+yuruEw2LdcSn1yWSYRS4l3IViHPhMckR4Lo4vrwU=,tag:KgJyUdg11CBbkEzzvibYlQ==,type:str]",
"arbitrum_alchemy_key_1": "ENC[AES256_GCM,data:YpkTB3bE8H+SRj0NJsSbAZG6bquC8tBppgFrFTdigeY=,iv:MAI4/kQRMpKIVZvIAuU6CjCPDQXpSEsH4jiRsX9942o=,tag:snuC64N+nD9WVNaJKf3yiQ==,type:str]",
"blast_key": "ENC[AES256_GCM,data:wrBspEOVJURCx2yVnwhbHI/y3j0tEjS3fJHjyt0SV0pXgSaa,iv:ujiquRGXLcJAob+n1nnS7PZ8aD3kiImSe0bMIZfonCI=,tag:2XaWmCnsrcntBv7/Xf1WpQ==,type:str]",
"xlayer_key": "ENC[AES256_GCM,data:kkCMGxQ/w/OR,iv:P1G/v/FAmNQrTACJLVV3pHe3iods1hY0MJzLUWx5DSw=,tag:VPgIXxtfTWwgxDno7+cpvg==,type:str]",
"pokt_key": "ENC[AES256_GCM,data:ZMWLD7gKQeo+NPr9rzPNxuV+VRhfrwIQ,iv:oZHdi2+roMe0vVfuJEjBWvEFdZdxYvJfU/HzwQp2Fk0=,tag:tZRUMISbvE/ZH+79vOkvug==,type:str]",
"admin_token_router": "ENC[AES256_GCM,data:kX/AG6A7V3ENXsbuBfGCdJmx3v4=,iv:sVDSZrzrUPlrGLSb82aoyePA71LvwETtbpHR/h/Wseo=,tag:+LoZwqNV26Kxj62XmJj7eQ==,type:str]",
"admin_token_sequencer": "ENC[AES256_GCM,data:HQ238buDVCqD8UdOCQR3segDwuE=,iv:JHFLNNz09vUCxCbwzPDW7sDQB+v8knqaIt75+anhO5Q=,tag:MIF02j/Rm1044M2dDAs+lA==,type:str]",
Expand Down Expand Up @@ -47,8 +48,8 @@
"azure_kv": null,
"hc_vault": null,
"age": null,
"lastmodified": "2024-03-21T02:13:46Z",
"mac": "ENC[AES256_GCM,data:22ATjfRY1++KQkov/59z+dtxB8pkuxHK+kdUQ29JUNQmXKmN2ocK72v1klwOvS0LE4so6grDCi2pUhuF6Ph6vMzbl1FQnPnGclgWaC+qC7hNFK19tIEyg1MOI3p9iTKQ7qCAXJn6TQF3kLOWP9hCjllFGFpZV6dtrVMmIEOdgYg=,iv:K80uj9CLPWAXYjLkUSKjTfUxegwYsvq8uXa89v7XGCQ=,tag:y/zjXYSsdKduv2fIxjrPHg==,type:str]",
"lastmodified": "2024-05-15T22:19:45Z",
"mac": "ENC[AES256_GCM,data:GAhT1yAgx2RVHfCmZXRTp7FVWiEUf4dun5R2Od7sKGq9RkVy8ULE31MViJnz2RweXgMEDBltH8RNYV2ka/hBKe7jeqQAnraoi72ZA0f5S2338Ajpw2Mo4y6BRyi8aAVUrs22cJij3MdBenJyHCBWl7tQcNL8nQ4Iex1mNCXtBSY=,iv:LWzArO7R8A0hB0x3jxe7gND4Mjrg+wXvkPHSsb9CgZo=,tag:m9Mca/Gn35Dozh1BYhwwZQ==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.8.1"
Expand Down
2 changes: 1 addition & 1 deletion ops/mainnet/prod/backend/config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ locals {
providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
}
"2020368761" = {
providers = ["https://rpc.xlayer.tech/unlimited", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
providers = ["https://rpc.xlayer.tech/${var.xlayer_key}", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
}
}

Expand Down
5 changes: 5 additions & 0 deletions ops/mainnet/prod/backend/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,8 @@ variable "blast_key" {
type = string
sensitive = true
}

variable "xlayer_key" {
type = string
sensitive = true
}
2 changes: 1 addition & 1 deletion ops/mainnet/prod/core/config.tf
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ locals {
providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
}
"2020368761" = {
providers = ["https://rpc.xlayer.tech/unlimited", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
providers = ["https://rpc.xlayer.tech/${var.xlayer_key}", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
}
}
web3SignerUrl = "https://${module.sequencer_web3signer.service_endpoint}"
Expand Down
5 changes: 5 additions & 0 deletions ops/mainnet/prod/core/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ variable "blast_key" {
sensitive = true
}

variable "xlayer_key" {
type = string
sensitive = true
}

variable "infura_key" {
type = string
sensitive = true
Expand Down
Loading