Skip to content

contracts-bedrock: add l1 deploy tag #5312

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

Merged
tynes merged 1 commit into from
Mar 31, 2023
Merged

contracts-bedrock: add l1 deploy tag #5312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 bedrock-devnet/devnet/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def main():
addresses = read_json(addresses_json_path)
else:
log.info('Deploying contracts.')
run_command(['yarn', 'hardhat', '--network', 'devnetL1', 'deploy'], env={
run_command(['yarn', 'hardhat', '--network', 'devnetL1', 'deploy', '--tags', 'l1'], env={
'CHAIN_ID': '900',
'L1_RPC': 'http://localhost:8545',
'PRIVATE_KEY_DEPLOYER': 'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/000-ProxyAdmin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['ProxyAdmin', 'setup']
deployFn.tags = ['ProxyAdmin', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/001-AddressManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['AddressManager', 'setup']
deployFn.tags = ['AddressManager', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1StandardBridgeProxy', 'setup']
deployFn.tags = ['L1StandardBridgeProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L2OutputOracleProxy', 'setup']
deployFn.tags = ['L2OutputOracleProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1CrossDomainMessengerProxy', 'setup']
deployFn.tags = ['L1CrossDomainMessengerProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['OptimismPortalProxy', 'setup']
deployFn.tags = ['OptimismPortalProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['OptimismMintableERC20FactoryProxy', 'setup']
deployFn.tags = ['OptimismMintableERC20FactoryProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1ERC721BridgeProxy', 'setup']
deployFn.tags = ['L1ERC721BridgeProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['SystemConfigProxy', 'setup']
deployFn.tags = ['SystemConfigProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['SystemDictatorProxy', 'setup']
deployFn.tags = ['SystemDictatorProxy', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/010-L1CrossDomainMessengerImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1CrossDomainMessengerImpl', 'setup']
deployFn.tags = ['L1CrossDomainMessengerImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/011-L1StandardBridgeImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1StandardBridgeImpl', 'setup']
deployFn.tags = ['L1StandardBridgeImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/012-L2OutputOracleImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L2OutputOracleImpl', 'setup']
deployFn.tags = ['L2OutputOracleImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['OptimismPortalImpl', 'setup']
deployFn.tags = ['OptimismPortalImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/014-OptimismMintableERC20FactoryImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['OptimismMintableERC20FactoryImpl', 'setup']
deployFn.tags = ['OptimismMintableERC20FactoryImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/015-L1ERC721BridgeImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['L1ERC721BridgeImpl', 'setup']
deployFn.tags = ['L1ERC721BridgeImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/016-PortalSenderImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['PortalSenderImpl', 'setup']
deployFn.tags = ['PortalSenderImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['SystemConfigImpl', 'setup']
deployFn.tags = ['SystemConfigImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/018-SystemDictatorImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ const deployFn: DeployFunction = async (hre) => {
})
}

deployFn.tags = ['SystemDictatorImpl', 'setup']
deployFn.tags = ['SystemDictatorImpl', 'setup', 'l1']

export default deployFn
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,6 @@ const deployFn: DeployFunction = async (hre) => {
}
}

deployFn.tags = ['SystemDictatorImpl', 'setup']
deployFn.tags = ['SystemDictatorImpl', 'setup', 'l1']

export default deployFn
8 changes: 4 additions & 4 deletions packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,14 +279,14 @@ const deployFn: DeployFunction = async (hre) => {
need to restart the system, run exit1() followed by finalize().
`,
checks: async () => {
assert(
(await AddressManager.getAddress('OVM_L1CrossDomainMessenger')) ===
ethers.constants.AddressZero
const messenger = await AddressManager.getAddress(
'OVM_L1CrossDomainMessenger'
)
assert(messenger === ethers.constants.AddressZero)
},
})
}

deployFn.tags = ['SystemDictatorSteps', 'phase1']
deployFn.tags = ['SystemDictatorSteps', 'phase1', 'l1']

export default deployFn
8 changes: 3 additions & 5 deletions packages/contracts-bedrock/deploy/021-SystemDictatorSteps-2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,8 @@ const deployFn: DeployFunction = async (hre) => {
'BondManager',
]
for (const dead of deads) {
assert(
(await AddressManager.getAddress(dead)) ===
ethers.constants.AddressZero
)
const addr = await AddressManager.getAddress(dead)
assert(addr === ethers.constants.AddressZero)
}
},
})
Expand Down Expand Up @@ -372,6 +370,6 @@ const deployFn: DeployFunction = async (hre) => {
}
}

deployFn.tags = ['SystemDictatorSteps', 'phase2']
deployFn.tags = ['SystemDictatorSteps', 'phase2', 'l1']

export default deployFn