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.

Sign up for GitHub

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

Deploy diamond to X Layer #806

Merged
merged 8 commits into from
Sep 25, 2024
Merged

Deploy diamond to X Layer #806

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e5ba97
Update configs for xlayer
ezynda3 Sep 19, 2024
1361797
Deploy to X Layer
ezynda3 Sep 20, 2024
87e4f3d
verify contracts and update logs
ezynda3 Sep 23, 2024
d1b5e8f
Setup SAFE configuration for xlayer
ezynda3 Sep 24, 2024
145fe44
Add RPC to .env.example
ezynda3 Sep 24, 2024
6e190c5
Add XLAYER_ETHERSCAN_API_KEY to .env.example
ezynda3 Sep 24, 2024
18c5b00
Remove harcoded verification stuff
ezynda3 Sep 24, 2024
bd71182
Merge branch 'main' into deploy-to-xlayer
ezynda3 Sep 24, 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
12 changes: 8 additions & 4 deletions config/amarok.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@
"chainId": 34443,
"connextHandler": "0x7380511493DD4c2f1dD75E9CCe5bD52C787D4B51",
"domain": "1836016741",
"tokensToApprove": [
"0x4200000000000000000000000000000000000006"
]
"tokensToApprove": ["0x4200000000000000000000000000000000000006"]
},
"arbitrum": {
"chainId": 42161,
Expand Down Expand Up @@ -300,5 +298,11 @@
"connextHandler": "0x0000000000000000000000000000000000000000",
"domain": "",
"tokensToApprove": []
},
"xlayer": {
"chainId": 196,
"connextHandler": "0x0000000000000000000000000000000000000000",
"domain": "",
"tokensToApprove": []
}
}
}
3 changes: 2 additions & 1 deletion config/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"rootstock": "0x0000000000000000000000000000000000000000",
"scroll": "0x0000000000000000000000000000000000000000",
"sei": "0x0000000000000000000000000000000000000000",
"xlayer": "0x0000000000000000000000000000000000000000",
"taiko": "0x0000000000000000000000000000000000000000",
"zksync": "0x0000000000000000000000000000000000000000"
},
Expand All @@ -146,4 +147,4 @@
"TokenWrapper",
"LiFiDEXAggregator"
]
}
}
11 changes: 10 additions & 1 deletion config/networks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@
"status": "active",
"type": "mainnet"
},
"xlayer": {
"name": "X Layer",
"chainId": 196,
"nativeAddress": "0x0000000000000000000000000000000000000000",
"nativeCurrecy" "OKB",
ezynda3 marked this conversation as resolved.
Show resolved Hide resolved
"wrappedNativeAddress": "0xe538905cf8410324e03a5a23c1c177a474d59b2b",
"status": "active",
"type": "mainnet"
},
"zksync": {
"name": "zkSync Era Mainnet",
"chainId": 324,
Expand Down Expand Up @@ -305,4 +314,4 @@
"status": "active",
"type": "testnet"
}
}
}
5 changes: 4 additions & 1 deletion config/stargate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"mantle": "0x1a44076050125825900e736c501f859c50fE728c",
"scroll": "0x1a44076050125825900e736c501f859c50fE728c",
"taiko": "0x1a44076050125825900e736c501f859c50fE728c",
"xlayer": "0x0000000000000000000000000000000000000000",
"zksync": "0xd07C30aF3Ff30D96BDc9c6044958230Eb797DDBF",
"sei": "0x1a44076050125825900e736c501f859c50fE728c",
"localanvil": "0x0000000000000000000000000000000000000000",
Expand Down Expand Up @@ -224,6 +225,7 @@
"mode": "0x0000000000000000000000000000000000000000",
"mantle": "0x296F55F8Fb28E498B858d0BcDA06D955B2Cb3f97",
"scroll": "0x0000000000000000000000000000000000000000",
"xlayer": "0x0000000000000000000000000000000000000000",
"taiko": "0x0000000000000000000000000000000000000000",
"localanvil": "0x0000000000000000000000000000000000000000",
"mumbai": "0x0000000000000000000000000000000000000000",
Expand Down Expand Up @@ -263,9 +265,10 @@
"mantle": "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590",
"metis": "0x2F6F07CDcf3588944Bf4C42aC74ff24bF56e7590",
"scroll": "0x36d4686e19c052787D7f24E6913cEbC025714895",
"xlayer": "0x0000000000000000000000000000000000000000",
"taiko": "0x0000000000000000000000000000000000000000",
"localanvil": "0x0000000000000000000000000000000000000000",
"mumbai": "0x817436a076060D158204d955E5403b6Ed0A5fac0",
"sepolia": "0x0000000000000000000000000000000000000000"
}
}
}
3 changes: 2 additions & 1 deletion config/tokenwrapper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"blast": "0x4300000000000000000000000000000000000004",
"rootstock": "0x542fda317318ebf1d3deaf76e0b632741a7e677d",
"sei": "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7",
"xlayer": "0xe538905cf8410324e03a5a23c1c177a474d59b2b",
"taiko": "0xA51894664A773981C6C112C43ce576f315d5b1B6",
"immutablezkevm": "0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d"
}
}
2 changes: 2 additions & 0 deletions foundry.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ rootstock = "${ETH_NODE_URI_ROOTSTOCK}"
sei = "${ETH_NODE_URI_SEI}"
taiko = "${ETH_NODE_URI_TAIKO}"
velas = "${ETH_NODE_URI_VELAS}"
xlayer = "${ETH_NODE_URI_XLAYER}"
zksync = "${ETH_NODE_URI_ZKSYNC}"
scroll = "${ETH_NODE_URI_SCROLL}"

Expand Down Expand Up @@ -92,6 +93,7 @@ polygonzkevm = { key = "${POLYGONZKEVM_ETHERSCAN_API_KEY}", url = "https://api-z
scroll = { key = "${SCROLL_ETHERSCAN_API_KEY}", url = "https://api.scrollscan.com/api", chain = "534352" }
sei = { key = "${SEI_ETHERSCAN_API_KEY}", url = "https://seitrace.com/pacific-1/api", chain = "1329" }
taiko = { key = "${TAIKO_ETHERSCAN_API_KEY}", url = "https://api.taikoscan.io/api", chain = "167000" }
xlayer = { key = "${XLAYER_ETHERSCAN_API_KEY}", url = "https://www.oklink.com/api/v5/explorer/xlayer/api", chain = "196" }

#testnets
goerli = { key = "${MAINNET_ETHERSCAN_API_KEY}" }
Expand Down
1 change: 1 addition & 0 deletions networks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ rootstock
scroll
sei
taiko
xlayer
zksync
bsc-testnet
lineatest
Expand Down
108 changes: 107 additions & 1 deletion script/deploy/_targetState.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2254,5 +2254,111 @@
"ReceiverStargateV2": "1.0.0"
}
}
},
"xlayer": {
"production": {
"LiFiDiamond": {
"DiamondCutFacet": "1.0.0",
"DiamondLoupeFacet": "1.0.0",
"OwnershipFacet": "1.0.0",
"DexManagerFacet": "1.0.1",
"AccessManagerFacet": "1.0.0",
"WithdrawFacet": "1.0.0",
"PeripheryRegistryFacet": "1.0.0",
"GenericSwapFacet": "1.0.0",
"GenericSwapFacetV3": "1.0.1",
"LIFuelFacet": "1.0.1",
"CalldataVerificationFacet": "1.1.1",
"StandardizedCallFacet": "1.1.0",
"LiFiDiamond": "1.0.0",
"ERC20Proxy": "1.0.0",
"Executor": "2.0.0",
"FeeCollector": "1.0.0",
"Receiver": "2.0.2",
"LiFuelFeeCollector": "1.0.1",
"TokenWrapper": "1.0.0",
"LiFiDEXAggregator": "1.0.0",
"CBridgeFacet": "1.0.0",
"CBridgeFacetPacked": "1.0.3",
"RelayerCelerIM": "2.0.0",
"CelerIMFacetMutable": "2.0.0",
"StargateFacetV2": "1.0.1",
"ReceiverStargateV2": "1.0.0"
},
"LiFiDiamondImmutable": {
"DiamondCutFacet": "1.0.0",
"DiamondLoupeFacet": "1.0.0",
"OwnershipFacet": "1.0.0",
"DexManagerFacet": "1.0.1",
"AccessManagerFacet": "1.0.0",
"WithdrawFacet": "1.0.0",
"PeripheryRegistryFacet": "1.0.0",
"GenericSwapFacet": "1.0.0",
"GenericSwapFacetV3": "1.0.1",
"LIFuelFacet": "1.0.1",
"CalldataVerificationFacet": "1.1.1",
"StandardizedCallFacet": "1.1.0",
"LiFiDiamondImmutable": "1.0.0",
"ERC20Proxy": "1.0.0",
"Executor": "2.0.0",
"FeeCollector": "1.0.0",
"Receiver": "2.0.2",
"LiFuelFeeCollector": "1.0.1",
"TokenWrapper": "1.0.0",
"LiFiDEXAggregator": "1.0.0",
"CBridgeFacet": "1.0.0",
"CBridgeFacetPacked": "1.0.3",
"RelayerCelerIM": "2.0.0",
"CelerIMFacetImmutable": "2.0.0",
"StargateFacetV2": "1.0.1",
"ReceiverStargateV2": "1.0.0"
}
}
},
"beratest": {
"production": {
"LiFiDiamond": {
"DiamondCutFacet": "1.0.0",
"DiamondLoupeFacet": "1.0.0",
"OwnershipFacet": "1.0.0",
"DexManagerFacet": "1.0.1",
"AccessManagerFacet": "1.0.0",
"WithdrawFacet": "1.0.0",
"PeripheryRegistryFacet": "1.0.0",
"GenericSwapFacet": "1.0.0",
"GenericSwapFacetV3": "1.0.1",
"LIFuelFacet": "1.0.1",
"CalldataVerificationFacet": "1.1.1",
"StandardizedCallFacet": "1.1.0",
"LiFiDiamond": "1.0.0",
"ERC20Proxy": "1.0.0",
"Executor": "2.0.0",
"FeeCollector": "1.0.0",
"Receiver": "2.0.2",
"LiFuelFeeCollector": "1.0.1",
"LiFiDEXAggregator": "1.0.0"
},
"LiFiDiamondImmutable": {
"DiamondCutFacet": "1.0.0",
"DiamondLoupeFacet": "1.0.0",
"OwnershipFacet": "1.0.0",
"DexManagerFacet": "1.0.1",
"AccessManagerFacet": "1.0.0",
"WithdrawFacet": "1.0.0",
"PeripheryRegistryFacet": "1.0.0",
"GenericSwapFacet": "1.0.0",
"GenericSwapFacetV3": "1.0.1",
"LIFuelFacet": "1.0.1",
"CalldataVerificationFacet": "1.1.1",
"StandardizedCallFacet": "1.1.0",
"LiFiDiamondImmutable": "1.0.0",
"ERC20Proxy": "1.0.0",
"Executor": "2.0.0",
"FeeCollector": "1.0.0",
"Receiver": "2.0.2",
"LiFuelFeeCollector": "1.0.1",
"LiFiDEXAggregator": "1.0.0"
}
}
}
}
}
4 changes: 4 additions & 0 deletions script/helperFunctions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2948,6 +2948,10 @@ function getChainId() {
echo "13371"
return 0
;;
"xlayer")
echo "196"
return 0
;;
"taiko")
echo "167000"
return 0
Expand Down