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

feature(networks): Adding deployment on zkSync #13078

Merged
merged 59 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
bf27fda
adding zksync file
julien51 Dec 6, 2023
e523f6b
wip
julien51 Dec 6, 2023
f2336c2
fix deployment script
julien51 Dec 6, 2023
660acc0
wip
julien51 Dec 6, 2023
53b62d7
lint
julien51 Dec 6, 2023
7b80514
undue change
julien51 Dec 6, 2023
7bb7932
set zksync flag
clemsos Dec 7, 2023
f5ca5d9
wip
julien51 Dec 8, 2023
57728d0
wip
julien51 Jan 5, 2024
473b49d
ignore cache files
clemsos Jan 25, 2024
ff746e2
bump zksync libs
clemsos Jan 25, 2024
727104f
bump zksync-solc
clemsos Jan 25, 2024
2f4c19a
remove dev deps
clemsos Jan 25, 2024
f98f4c6
comment upgredeable that throws on import
clemsos Jan 25, 2024
7f133f5
move zksync deploy deps to helpers
clemsos Jan 25, 2024
313d4dd
zkSync deploy tasks
clemsos Jan 25, 2024
feb98f4
add zksync deps to helpers
clemsos Jan 25, 2024
b19d504
add zksync Sepolia network
clemsos Jan 25, 2024
0db015f
use tmp provider
clemsos Jan 25, 2024
3b1b99e
ignore artifacts
clemsos Jan 25, 2024
8ca79a0
use actual artifact in function
clemsos Jan 26, 2024
0d34349
move verification to helpers
clemsos Jan 26, 2024
4fdaec3
zksync verification
clemsos Jan 26, 2024
955834e
zksync networks testnet support
clemsos Jan 26, 2024
a273c86
add `ethNetwork`in networks types
clemsos Jan 26, 2024
66f1457
parse zkync opts into hardhat network
clemsos Jan 26, 2024
d6d0864
fix versions
clemsos Jan 26, 2024
61a4aeb
pass `deployOptions` to zksync upgrades
clemsos Jan 26, 2024
8c6efc4
avoid duplicate improt
clemsos Jan 26, 2024
bf8650b
workaround to get `Deployer` class
clemsos Jan 26, 2024
8879a79
delete unwanted file
clemsos Jan 26, 2024
13f18f0
make zksync compile step programmatic
clemsos Jan 26, 2024
79956a8
remove log
clemsos Jan 26, 2024
dfc45d3
remove `ethNetwork`
clemsos Jan 29, 2024
5db7fbe
allow zksync on local nets
clemsos Jan 29, 2024
5f7b4c4
add manifest
clemsos Jan 31, 2024
f127639
Update provider/src/types.ts
clemsos Jan 26, 2024
11a2a14
Merge branch 'master' of github.com:unlock-protocol/unlock into zksyn…
clemsos Feb 1, 2024
3f09a4a
parse network name properly
clemsos Feb 1, 2024
9ee7a88
Merge branch 'master' into zksync-support
clemsos Feb 1, 2024
dddc6e4
add zksync mainnet manifest
clemsos Feb 2, 2024
f2941fc
Merge branch 'zksync-support' of github.com:unlock-protocol/unlock in…
clemsos Feb 2, 2024
15648fa
merged conflicts
julien51 Feb 5, 2024
650da09
Merge branch 'master' into zksync-support
clemsos Feb 6, 2024
2946a4d
fix issue with `Deployer` - thanks to matter-labs/hardhat-zksync#711
clemsos Feb 6, 2024
9c29f74
bump upgradable lib - fix matter-labs/hardhat-zksync/#753
clemsos Feb 6, 2024
0daf50c
sepolia manifest - fixed in matter-labs/hardhat-zksync/#696
clemsos Feb 6, 2024
78f1e4a
add sepolia deployment
clemsos Feb 6, 2024
6bcd0ac
add zksync deployment
clemsos Feb 6, 2024
c119518
prevent verification fallback to testnet explorer
clemsos Feb 6, 2024
9565227
remove sepolia
clemsos Feb 8, 2024
c3a3126
remove zksync sepolia manifest
clemsos Feb 8, 2024
ac2a5c3
add startBlock
clemsos Feb 8, 2024
2ce63e3
add multisig
clemsos Feb 8, 2024
60598bc
correct subgraph network name
clemsos Feb 8, 2024
4b76672
Merge branch 'master' of github.com:unlock-protocol/unlock into zksyn…
clemsos Feb 8, 2024
743f24b
add subgraph endpoint
clemsos Feb 12, 2024
e0ffb0a
Merge branch 'master' of github.com:unlock-protocol/unlock into zksyn…
clemsos Feb 12, 2024
a41c798
Merge branch 'master' into zksync-support
julien51 Feb 14, 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
8 changes: 7 additions & 1 deletion governance/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
cache
contracts
artifacts
artifacts

# zksync
zk-artifacts
zk-cache
artifacts-zk
cache-zk
284 changes: 284 additions & 0 deletions governance/.upgradable/zkSync-era.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
{
"manifestVersion": "3.2",
"admin": {
"address": "0xdab03e5E7f51065F4c41945a0718Bed21Ef9A9EF",
"txHash": "0x86d758ffa577b99326b57d35240cb7904d22f17d7a13460b36cb3ac505f750a6"
},
"proxies": [
{
"address": "0x32CF553582159F12fBb1Ae1649b3670395610F24",
"txHash": "0x7af40bdb7142000fc3fe8aeb942a665d0ee88a5702bdbcfab28a2db49a33a836",
"kind": "transparent"
}
],
"impls": {
"1e08e5aeb4050c1e4057c7ed73ca81b9710d240e2d74086cc15337008288f4b6": {
"address": "0xb52E38541e709622D86142DC2D50e2eE94017a06",
"txHash": "0x4ede332025cc8d43558fa6585e09269e26a6a5ffc880d3aba5c27c4aa0da41a3",
"layout": {
"solcVersion": "0.8.21",
"storage": [
{
"label": "initialized",
"offset": 0,
"slot": "0",
"type": "t_bool",
"contract": "UnlockInitializable",
"src": "contracts/past-versions/UnlockV13.sol:1327"
},
{
"label": "initializing",
"offset": 1,
"slot": "0",
"type": "t_bool",
"contract": "UnlockInitializable",
"src": "contracts/past-versions/UnlockV13.sol:1332"
},
{
"label": "______gap",
"offset": 0,
"slot": "1",
"type": "t_array(t_uint256)50_storage",
"contract": "UnlockContextUpgradeable",
"src": "contracts/past-versions/UnlockV13.sol:1406"
},
{
"label": "_owner",
"offset": 0,
"slot": "51",
"type": "t_address",
"contract": "UnlockOwnable",
"src": "contracts/past-versions/UnlockV13.sol:1435"
},
{
"label": "______gap",
"offset": 0,
"slot": "52",
"type": "t_array(t_uint256)50_storage",
"contract": "UnlockOwnable",
"src": "contracts/past-versions/UnlockV13.sol:1501"
},
{
"label": "grossNetworkProduct",
"offset": 0,
"slot": "102",
"type": "t_uint256",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2786"
},
{
"label": "totalDiscountGranted",
"offset": 0,
"slot": "103",
"type": "t_uint256",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2788"
},
{
"label": "locks",
"offset": 0,
"slot": "104",
"type": "t_mapping(t_address,t_struct(LockBalances)3109_storage)",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2791"
},
{
"label": "globalBaseTokenURI",
"offset": 0,
"slot": "105",
"type": "t_string_storage",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2795"
},
{
"label": "globalTokenSymbol",
"offset": 0,
"slot": "106",
"type": "t_string_storage",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2799"
},
{
"label": "publicLockAddress",
"offset": 0,
"slot": "107",
"type": "t_address",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2802"
},
{
"label": "uniswapOracles",
"offset": 0,
"slot": "108",
"type": "t_mapping(t_address,t_contract(IUniswapOracleV3)757)",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2806"
},
{
"label": "weth",
"offset": 0,
"slot": "109",
"type": "t_address",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2809"
},
{
"label": "udt",
"offset": 0,
"slot": "110",
"type": "t_address",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2812"
},
{
"label": "estimatedGasForPurchase",
"offset": 0,
"slot": "111",
"type": "t_uint256",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2815"
},
{
"label": "chainId",
"offset": 0,
"slot": "112",
"type": "t_uint256",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2818"
},
{
"label": "proxyAdminAddress",
"offset": 0,
"slot": "113",
"type": "t_address",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2821"
},
{
"label": "proxyAdmin",
"offset": 0,
"slot": "114",
"type": "t_contract(ProxyAdmin)3095",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2822"
},
{
"label": "_publicLockVersions",
"offset": 0,
"slot": "115",
"type": "t_mapping(t_address,t_uint16)",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2825"
},
{
"label": "_publicLockImpls",
"offset": 0,
"slot": "116",
"type": "t_mapping(t_uint16,t_address)",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2826"
},
{
"label": "publicLockLatestVersion",
"offset": 0,
"slot": "117",
"type": "t_uint16",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2827"
},
{
"label": "protocolFee",
"offset": 0,
"slot": "118",
"type": "t_uint256",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2830"
},
{
"label": "swapBurnerAddress",
"offset": 0,
"slot": "119",
"type": "t_address",
"contract": "Unlock",
"src": "contracts/past-versions/UnlockV13.sol:2833"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
"numberOfBytes": "1600"
},
"t_bool": {
"label": "bool",
"numberOfBytes": "1"
},
"t_contract(IUniswapOracleV3)757": {
"label": "contract IUniswapOracleV3",
"numberOfBytes": "20"
},
"t_contract(ProxyAdmin)3095": {
"label": "contract ProxyAdmin",
"numberOfBytes": "20"
},
"t_mapping(t_address,t_contract(IUniswapOracleV3)757)": {
"label": "mapping(address => contract IUniswapOracleV3)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_struct(LockBalances)3109_storage)": {
"label": "mapping(address => struct Unlock.LockBalances)",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_uint16)": {
"label": "mapping(address => uint16)",
"numberOfBytes": "32"
},
"t_mapping(t_uint16,t_address)": {
"label": "mapping(uint16 => address)",
"numberOfBytes": "32"
},
"t_string_storage": {
"label": "string",
"numberOfBytes": "32"
},
"t_struct(LockBalances)3109_storage": {
"label": "struct Unlock.LockBalances",
"members": [
{
"label": "deployed",
"type": "t_bool",
"offset": 0,
"slot": "0"
},
{
"label": "totalSales",
"type": "t_uint256",
"offset": 0,
"slot": "1"
},
{
"label": "yieldedDiscountTokens",
"type": "t_uint256",
"offset": 0,
"slot": "2"
}
],
"numberOfBytes": "96"
},
"t_uint16": {
"label": "uint16",
"numberOfBytes": "2"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
}
},
"namespaces": {}
}
}
}
}
Loading
Loading