Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
348 changes: 348 additions & 0 deletions .upgradable/lens.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,348 @@
{
"manifestVersion": "3.2",
"proxies": [
{
"address": "0xe7cb3e167e7475dE1331Cf6E0CEb187654619E12",
"txHash": "0x1c4a4cb801332c5322bb1d6774749e8fe60b2d9addde25f801f65652a09da414",
"kind": "uups"
}
],
"impls": {
"bc55a92b5074236accb62fed2e28a1b33247234cde2e644e6e443f64f546ac0b": {
"address": "0x02D2B95F631E0CF6c203E77f827381B0885F7822",
"txHash": "0xb659b2dff1eaa09d93c94da7633a74cb5a84f31e72ed0f8238c9392262e06108",
"layout": {
"solcVersion": "0.8.23",
"storage": [
{
"label": "_initialized",
"offset": 0,
"slot": "0",
"type": "t_uint8",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
"retypedFrom": "bool"
},
{
"label": "_initializing",
"offset": 1,
"slot": "0",
"type": "t_bool",
"contract": "Initializable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
},
{
"label": "__gap",
"offset": 0,
"slot": "1",
"type": "t_array(t_uint256)50_storage",
"contract": "ERC1967UpgradeUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
},
{
"label": "__gap",
"offset": 0,
"slot": "51",
"type": "t_array(t_uint256)50_storage",
"contract": "UUPSUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
},
{
"label": "_status",
"offset": 0,
"slot": "101",
"type": "t_uint256",
"contract": "ReentrancyGuardUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38"
},
{
"label": "__gap",
"offset": 0,
"slot": "102",
"type": "t_array(t_uint256)49_storage",
"contract": "ReentrancyGuardUpgradeable",
"src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88"
},
{
"label": "__gap",
"offset": 0,
"slot": "151",
"type": "t_array(t_uint256)1000_storage",
"contract": "MultiCallerUpgradeable",
"src": "contracts/upgradeable/MultiCallerUpgradeable.sol:77"
},
{
"label": "_HASHED_NAME",
"offset": 0,
"slot": "1151",
"type": "t_bytes32",
"contract": "EIP712CrossChainUpgradeable",
"src": "contracts/upgradeable/EIP712CrossChainUpgradeable.sol:21"
},
{
"label": "_HASHED_VERSION",
"offset": 0,
"slot": "1152",
"type": "t_bytes32",
"contract": "EIP712CrossChainUpgradeable",
"src": "contracts/upgradeable/EIP712CrossChainUpgradeable.sol:22"
},
{
"label": "__gap",
"offset": 0,
"slot": "1153",
"type": "t_array(t_uint256)1000_storage",
"contract": "EIP712CrossChainUpgradeable",
"src": "contracts/upgradeable/EIP712CrossChainUpgradeable.sol:85"
},
{
"label": "crossDomainAdmin",
"offset": 0,
"slot": "2153",
"type": "t_address",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:49"
},
{
"label": "withdrawalRecipient",
"offset": 0,
"slot": "2154",
"type": "t_address",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:53"
},
{
"label": "DEPRECATED_wrappedNativeToken",
"offset": 0,
"slot": "2155",
"type": "t_contract(WETH9Interface)32484",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:60"
},
{
"label": "DEPRECATED_depositQuoteTimeBuffer",
"offset": 20,
"slot": "2155",
"type": "t_uint32",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:61"
},
{
"label": "numberOfDeposits",
"offset": 24,
"slot": "2155",
"type": "t_uint32",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:68"
},
{
"label": "pausedFills",
"offset": 28,
"slot": "2155",
"type": "t_bool",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:71"
},
{
"label": "pausedDeposits",
"offset": 29,
"slot": "2155",
"type": "t_bool",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:72"
},
{
"label": "rootBundles",
"offset": 0,
"slot": "2156",
"type": "t_array(t_struct(RootBundle)33256_storage)dyn_storage",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:75"
},
{
"label": "enabledDepositRoutes",
"offset": 0,
"slot": "2157",
"type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:78"
},
{
"label": "DEPRECATED_relayFills",
"offset": 0,
"slot": "2158",
"type": "t_mapping(t_bytes32,t_uint256)",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:83"
},
{
"label": "DEPRECATED_fillCounter",
"offset": 0,
"slot": "2159",
"type": "t_mapping(t_address,t_uint256)",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:95"
},
{
"label": "DEPRECATED_depositCounter",
"offset": 0,
"slot": "2160",
"type": "t_mapping(t_address,t_uint256)",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:99"
},
{
"label": "DEPRECATED_refundsRequested",
"offset": 0,
"slot": "2161",
"type": "t_mapping(t_bytes32,t_uint256)",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:104"
},
{
"label": "fillStatuses",
"offset": 0,
"slot": "2162",
"type": "t_mapping(t_bytes32,t_uint256)",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:108"
},
{
"label": "relayerRefund",
"offset": 0,
"slot": "2163",
"type": "t_mapping(t_address,t_mapping(t_address,t_uint256))",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:112"
},
{
"label": "__gap",
"offset": 0,
"slot": "2164",
"type": "t_array(t_uint256)998_storage",
"contract": "SpokePool",
"src": "contracts/SpokePool.sol:1753"
},
{
"label": "l2Eth",
"offset": 0,
"slot": "3162",
"type": "t_address",
"contract": "ZkSync_SpokePool",
"src": "contracts/ZkSync_SpokePool.sol:32"
},
{
"label": "zkErc20Bridge",
"offset": 0,
"slot": "3163",
"type": "t_contract(ZkBridgeLike)22546",
"contract": "ZkSync_SpokePool",
"src": "contracts/ZkSync_SpokePool.sol:35"
}
],
"types": {
"t_address": {
"label": "address",
"numberOfBytes": "20"
},
"t_array(t_struct(RootBundle)33256_storage)dyn_storage": {
"label": "struct SpokePoolInterface.RootBundle[]",
"numberOfBytes": "32"
},
"t_array(t_uint256)1000_storage": {
"label": "uint256[1000]",
"numberOfBytes": "32000"
},
"t_array(t_uint256)49_storage": {
"label": "uint256[49]",
"numberOfBytes": "1568"
},
"t_array(t_uint256)50_storage": {
"label": "uint256[50]",
"numberOfBytes": "1600"
},
"t_array(t_uint256)998_storage": {
"label": "uint256[998]",
"numberOfBytes": "31936"
},
"t_bool": {
"label": "bool",
"numberOfBytes": "1"
},
"t_bytes32": {
"label": "bytes32",
"numberOfBytes": "32"
},
"t_contract(WETH9Interface)32484": {
"label": "contract WETH9Interface",
"numberOfBytes": "20"
},
"t_contract(ZkBridgeLike)22546": {
"label": "contract ZkBridgeLike",
"numberOfBytes": "20"
},
"t_mapping(t_address,t_mapping(t_address,t_uint256))": {
"label": "mapping(address => mapping(address => uint256))",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_mapping(t_uint256,t_bool))": {
"label": "mapping(address => mapping(uint256 => bool))",
"numberOfBytes": "32"
},
"t_mapping(t_address,t_uint256)": {
"label": "mapping(address => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_bytes32,t_uint256)": {
"label": "mapping(bytes32 => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_bool)": {
"label": "mapping(uint256 => bool)",
"numberOfBytes": "32"
},
"t_mapping(t_uint256,t_uint256)": {
"label": "mapping(uint256 => uint256)",
"numberOfBytes": "32"
},
"t_struct(RootBundle)33256_storage": {
"label": "struct SpokePoolInterface.RootBundle",
"members": [
{
"label": "slowRelayRoot",
"type": "t_bytes32",
"offset": 0,
"slot": "0"
},
{
"label": "relayerRefundRoot",
"type": "t_bytes32",
"offset": 0,
"slot": "1"
},
{
"label": "claimedBitmap",
"type": "t_mapping(t_uint256,t_uint256)",
"offset": 0,
"slot": "2"
}
],
"numberOfBytes": "96"
},
"t_uint256": {
"label": "uint256",
"numberOfBytes": "32"
},
"t_uint32": {
"label": "uint32",
"numberOfBytes": "4"
},
"t_uint8": {
"label": "uint8",
"numberOfBytes": "1"
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion deploy/058_deploy_zkstack_customgas_adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {

const constructorArguments = [
SPOKE_CHAIN_ID,
L1_ADDRESS_MAP[chainId].zkBridgeHub,
L1_ADDRESS_MAP[chainId][`zkBridgeHub_${SPOKE_CHAIN_ID}`],
WETH[chainId],
L2_REFUND_ADDRESS,
L1_ADDRESS_MAP[chainId].donationBox,
Expand Down
4 changes: 2 additions & 2 deletions deploy/059_deploy_lens_spokepool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
import { DeployFunction, DeploymentSubmission } from "hardhat-deploy/types";
import { getDeployedAddress } from "../src/DeploymentUtils";
import { getSpokePoolDeploymentInfo } from "../utils/utils.hre";
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, WGRASS } from "./consts";
import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, WGRASS, WGHO } from "./consts";

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const contractName = "Lens_SpokePool";
Expand All @@ -24,7 +24,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
hubPool.address,
hubPool.address,
];
const constructorArgs = [WGRASS[spokeChainId], QUOTE_TIME_BUFFER, FILL_DEADLINE_BUFFER];
const constructorArgs = [WGHO[spokeChainId], QUOTE_TIME_BUFFER, FILL_DEADLINE_BUFFER];

let newAddress: string;
// On production, we'll rarely want to deploy a new proxy contract so we'll default to deploying a new implementation
Expand Down
Loading
Loading