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

import paths updated for zkSync scripts #811

Merged
merged 10 commits into from
Sep 30, 2024
Merged

import paths updated for zkSync scripts #811

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4badbaf
import paths updated for zkSync scripts
0xDEnYO Sep 25, 2024
199488d
fixes one more import
0xDEnYO Sep 26, 2024
fca5bf1
adds ready_for_review triggers to git actions
0xDEnYO Sep 26, 2024
f9095d6
Merge branch 'addReadyForReviewTriggerToActions' into fixZkSyncScripts
0xDEnYO Sep 26, 2024
5d1918a
Merge branch 'main' into fixZkSyncScripts
ezynda3 Sep 27, 2024
2282d4f
Merge branch 'main' of github.com:lifinance/contracts into fixZkSyncS…
0xDEnYO Sep 27, 2024
6de323c
Merge branch 'fixZkSyncScripts' of github.com:lifinance/contracts int…
0xDEnYO Sep 27, 2024
3980991
adds logic to not execute checks when triggered by non-label event types
0xDEnYO Sep 30, 2024
bca49eb
Merge branch 'fixProtectAuditLabelsAction' into fixZkSyncScripts
0xDEnYO Sep 30, 2024
dfdd520
bugfix
0xDEnYO Sep 30, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@
"solhint --fix"
]
}
}
}
8 changes: 4 additions & 4 deletions script/deploy/zksync/006_deploy_receiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { ethers, network } from 'hardhat'
import { Receiver, PeripheryRegistryFacet } from '../typechain'
import { Receiver, PeripheryRegistryFacet } from '../../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
import {
diamondContractName,
updateDeploymentLogs,
verifyContract,
} from './9999_utils'
import globalConfig from '../config/global.json'
import stargateConfig from '../config/stargate.json'
import amarokConfig from '../config/amarok.json'
import globalConfig from '../../../config/global.json'
import stargateConfig from '../../../config/stargate.json'
import amarokConfig from '../../../config/amarok.json'

interface StargateConfig {
routers: { [network: string]: string }
Expand Down
4 changes: 2 additions & 2 deletions script/deploy/zksync/007_deploy_fee_collector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { ethers, network } from 'hardhat'
import { PeripheryRegistryFacet } from '../typechain'
import { PeripheryRegistryFacet } from '../../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
import {
diamondContractName,
updateDeploymentLogs,
verifyContract,
} from './9999_utils'
import globalConfig from '../config/global.json'
import globalConfig from '../../../config/global.json'

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
// Protect against unwanted redeployments
Expand Down
4 changes: 2 additions & 2 deletions script/deploy/zksync/008_deploy_service_fee_collector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { ethers, network } from 'hardhat'
import { PeripheryRegistryFacet } from '../typechain'
import { PeripheryRegistryFacet } from '../../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
import {
diamondContractName,
updateDeploymentLogs,
verifyContract,
} from './9999_utils'
import globalConfig from '../config/global.json'
import globalConfig from '../../../config/global.json'

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
// Protect against unwanted redeployments
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/zksync/010_deploy_cbridge_facet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { network } from 'hardhat'
import { diamondContractName, deployFacet } from './9999_utils'
import config from '../config/cbridge.json'
import config from '../../../config/cbridge.json'

interface CBridgeConfig {
[network: string]: {
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/zksync/011_deploy_cbridge_facet_packed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { network } from 'hardhat'
import { diamondContractName, deployFacet } from './9999_utils'
import config from '../config/cbridge.json'
import config from '../../../config/cbridge.json'

interface CBridgeConfig {
[network: string]: {
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/zksync/012_deploy_across_facet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { network } from 'hardhat'
import { diamondContractName, deployFacet } from './9999_utils'
import config from '../config/across.json'
import config from '../../../config/across.json'

interface AcrossConfig {
[network: string]: {
Expand Down
4 changes: 2 additions & 2 deletions script/deploy/zksync/013_deploy_lifuel_fee_collector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { ethers, network } from 'hardhat'
import { PeripheryRegistryFacet } from '../typechain'
import { PeripheryRegistryFacet } from '../../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
import {
diamondContractName,
updateDeploymentLogs,
verifyContract,
} from './9999_utils'
import globalConfig from '../config/global.json'
import globalConfig from '../../../config/global.json'

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
// Protect against unwanted redeployments
Expand Down
4 changes: 2 additions & 2 deletions script/deploy/zksync/015_deploy_celerim_facet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
addressesFile,
AddressesFile,
} from './9999_utils'
import config from '../config/cbridge.json'
import global from '../config/global.json'
import config from '../../../config/cbridge.json'
import global from '../../../config/global.json'
import fs from 'fs'

interface CBridgeConfig {
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/zksync/016_deploy_across_facet_packed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { network } from 'hardhat'
import { diamondContractName, deployFacet } from './9999_utils'
import config from '../config/across.json'
import config from '../../../config/across.json'

interface AcrossConfig {
[network: string]: {
Expand Down
4 changes: 2 additions & 2 deletions script/deploy/zksync/017_deploy_token_wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { ethers, network } from 'hardhat'
import { PeripheryRegistryFacet } from '../typechain'
import { PeripheryRegistryFacet } from '../../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
import {
diamondContractName,
updateDeploymentLogs,
verifyContract,
} from './9999_utils'
import globalConfig from '../config/tokenwrapper.json'
import globalConfig from '../../../config/tokenwrapper.json'

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
// Protect against unwanted redeployments
Expand Down
2 changes: 1 addition & 1 deletion script/deploy/zksync/018_deploy_symbiosis_facet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types'
import { DeployFunction } from 'hardhat-deploy/types'
import { network } from 'hardhat'
import { deployFacet } from './9999_utils'
import config from '../config/symbiosis.json'
import config from '../../../config/symbiosis.json'

interface SymbiosisConfig {
[network: string]: {
Expand Down
2 changes: 1 addition & 1 deletion script/utils/diamond.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { constants, Contract } from 'ethers'
import { Fragment, FunctionFragment } from 'ethers/lib/utils'
import { ethers } from 'hardhat'
import { IDiamondCut, IDiamondLoupe } from '../typechain'
import { IDiamondCut, IDiamondLoupe } from '../../typechain'
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved

export function getSelectors(contract: Contract): string[] {
const selectors = contract.interface.fragments.reduce(
Expand Down