Commit 6bc84976 authored by Maurelian's avatar Maurelian Committed by Kelvin Fichter

fix(contracts): Remove fresh tag

parent ea5091e4
...@@ -67,7 +67,6 @@ const main = async () => { ...@@ -67,7 +67,6 @@ const main = async () => {
ovmAddressManagerOwner: deployer.address, ovmAddressManagerOwner: deployer.address,
numDeployConfirmations: 0, numDeployConfirmations: 0,
noCompile: process.env.NO_COMPILE ? true : false, noCompile: process.env.NO_COMPILE ? true : false,
tags: 'fresh',
}) })
// Stuff below this line is currently required for CI to work properly. We probably want to // Stuff below this line is currently required for CI to work properly. We probably want to
......
...@@ -14,6 +14,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -14,6 +14,6 @@ const deployFn: DeployFunction = async (hre) => {
} }
// This is kept during an upgrade. So no upgrade tag. // This is kept during an upgrade. So no upgrade tag.
deployFn.tags = ['fresh', 'Lib_AddressManager'] deployFn.tags = ['Lib_AddressManager']
export default deployFn export default deployFn
...@@ -18,6 +18,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -18,6 +18,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'ChainStorageContainer_ctc_batches'] deployFn.tags = ['upgrade', 'ChainStorageContainer_ctc_batches']
export default deployFn export default deployFn
...@@ -18,6 +18,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -18,6 +18,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'ChainStorageContainer_scc_batches'] deployFn.tags = ['upgrade', 'ChainStorageContainer_scc_batches']
export default deployFn export default deployFn
...@@ -22,6 +22,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -22,6 +22,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'CanonicalTransactionChain'] deployFn.tags = ['upgrade', 'CanonicalTransactionChain']
export default deployFn export default deployFn
...@@ -21,6 +21,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -21,6 +21,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'StateCommitmentChain'] deployFn.tags = ['upgrade', 'StateCommitmentChain']
export default deployFn export default deployFn
...@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'BondManager'] deployFn.tags = ['upgrade', 'BondManager']
export default deployFn export default deployFn
...@@ -36,6 +36,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -36,6 +36,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'L1CrossDomainMessenger'] deployFn.tags = ['upgrade', 'L1CrossDomainMessenger']
export default deployFn export default deployFn
...@@ -25,6 +25,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -25,6 +25,6 @@ const deployFn: DeployFunction = async (hre) => {
} }
// This is kept during an upgrade. So no upgrade tag. // This is kept during an upgrade. So no upgrade tag.
deployFn.tags = ['fresh', 'Proxy__OVM_L1CrossDomainMessenger'] deployFn.tags = ['Proxy__OVM_L1CrossDomainMessenger']
export default deployFn export default deployFn
...@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -17,6 +17,6 @@ const deployFn: DeployFunction = async (hre) => {
} }
// This is kept during an upgrade. So no upgrade tag. // This is kept during an upgrade. So no upgrade tag.
deployFn.tags = ['fresh', 'Proxy__OVM_L1StandardBridge'] deployFn.tags = ['Proxy__OVM_L1StandardBridge']
export default deployFn export default deployFn
...@@ -131,6 +131,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -131,6 +131,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'L1StandardBridge'] deployFn.tags = ['upgrade', 'L1StandardBridge']
export default deployFn export default deployFn
...@@ -85,6 +85,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -85,6 +85,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'upgrade', 'AddressDictator'] deployFn.tags = ['upgrade', 'AddressDictator']
export default deployFn export default deployFn
...@@ -83,6 +83,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -83,6 +83,6 @@ const deployFn: DeployFunction = async (hre) => {
} }
} }
deployFn.tags = ['fresh', 'upgrade', 'set-addresses'] deployFn.tags = ['upgrade', 'set-addresses']
export default deployFn export default deployFn
...@@ -31,6 +31,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -31,6 +31,6 @@ const deployFn: DeployFunction = async (hre) => {
}) })
} }
deployFn.tags = ['fresh', 'finalize'] deployFn.tags = ['finalize']
export default deployFn export default deployFn
...@@ -31,6 +31,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -31,6 +31,6 @@ const deployFn: DeployFunction = async (hre) => {
console.log(`✓ Set owner of Lib_AddressManager to: ${owner}`) console.log(`✓ Set owner of Lib_AddressManager to: ${owner}`)
} }
deployFn.tags = ['fresh', 'upgrade', 'finalize'] deployFn.tags = ['upgrade', 'finalize']
export default deployFn export default deployFn
...@@ -58,6 +58,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -58,6 +58,6 @@ const deployFn: DeployFunction = async (hre) => {
} }
} }
deployFn.tags = ['fresh', 'fund-accounts'] deployFn.tags = ['fund-accounts']
export default deployFn export default deployFn
...@@ -123,7 +123,7 @@ task('deploy') ...@@ -123,7 +123,7 @@ task('deploy')
// When a tagName is provided, it indicates that a new contract will be deployed. // When a tagName is provided, it indicates that a new contract will be deployed.
const validateArgOrTag = (argName: string, tagName: string) => { const validateArgOrTag = (argName: string, tagName: string) => {
// The 'fresh' tag tells us that a new copy of each contract will be deployed. // The 'fresh' tag tells us that a new copy of each contract will be deployed.
const hasTag = args.tags.includes('fresh') || args.tags.includes(tagName) const hasTag = args.tags.includes(tagName)
// Ensure that an arg and tag were NOT BOTH provided for a given contract // Ensure that an arg and tag were NOT BOTH provided for a given contract
if (hasTag && ethers.utils.isAddress(args[argName])) { if (hasTag && ethers.utils.isAddress(args[argName])) {
throw new Error( throw new Error(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment