From 1f4e3ee2b199c6c08720e195996b1146264ccad8 Mon Sep 17 00:00:00 2001 From: Liam Horne Date: Tue, 27 Apr 2021 16:10:51 -0700 Subject: [PATCH 1/2] refactor: rename deployments filenames to remove colons --- ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 ...atches.json => OVM_ChainStorageContainer-CTC-batches.json} | 0 ...TC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} | 0 ...atches.json => OVM_ChainStorageContainer-SCC-batches.json} | 0 packages/contracts/scripts/generate-markdown.js | 4 +++- packages/contracts/src/contract-defs.ts | 2 +- 20 files changed, 4 insertions(+), 2 deletions(-) rename packages/contracts/deployments/goerli-v1/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/goerli-v1/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/goerli-v1/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) rename packages/contracts/deployments/goerli-v2/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/goerli-v2/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/goerli-v2/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) rename packages/contracts/deployments/kovan-v1/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/kovan-v1/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/kovan-v1/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) rename packages/contracts/deployments/kovan-v2/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/kovan-v2/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/kovan-v2/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) rename packages/contracts/deployments/mainnet-v1/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/mainnet-v1/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/mainnet-v1/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) rename packages/contracts/deployments/mainnet-v2/{OVM_ChainStorageContainer:CTC:batches.json => OVM_ChainStorageContainer-CTC-batches.json} (100%) rename packages/contracts/deployments/mainnet-v2/{OVM_ChainStorageContainer:CTC:queue.json => OVM_ChainStorageContainer-CTC-queue.json} (100%) rename packages/contracts/deployments/mainnet-v2/{OVM_ChainStorageContainer:SCC:batches.json => OVM_ChainStorageContainer-SCC-batches.json} (100%) diff --git a/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/goerli-v1/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/goerli-v2/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/kovan-v1/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/kovan-v2/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/mainnet-v1/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:CTC:batches.json b/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-CTC-batches.json similarity index 100% rename from packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:CTC:batches.json rename to packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-CTC-batches.json diff --git a/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:CTC:queue.json b/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-CTC-queue.json similarity index 100% rename from packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:CTC:queue.json rename to packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-CTC-queue.json diff --git a/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:SCC:batches.json b/packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-SCC-batches.json similarity index 100% rename from packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer:SCC:batches.json rename to packages/contracts/deployments/mainnet-v2/OVM_ChainStorageContainer-SCC-batches.json diff --git a/packages/contracts/scripts/generate-markdown.js b/packages/contracts/scripts/generate-markdown.js index e1c78b68d84..cf4b333ec2a 100644 --- a/packages/contracts/scripts/generate-markdown.js +++ b/packages/contracts/scripts/generate-markdown.js @@ -75,11 +75,13 @@ const networks = { }); for (const contract of contracts) { + const colonizedName = contract.split(':').join('-'); + const deploymentInfo = require(`../deployments/${deployment}/${contract}.json`); const escPrefix = chainId !== 1 ? `${network}.` : ""; const etherscanUrl = `https://${escPrefix}etherscan.io/address/${deploymentInfo.address}`; - md += `|${contract}|[${deploymentInfo.address}](${etherscanUrl})|\n`; + md += `|${colonizedName}|[${deploymentInfo.address}](${etherscanUrl})|\n`; } md += `---\n`; } diff --git a/packages/contracts/src/contract-defs.ts b/packages/contracts/src/contract-defs.ts index 9a42297ff31..4d98fd2f06b 100644 --- a/packages/contracts/src/contract-defs.ts +++ b/packages/contracts/src/contract-defs.ts @@ -13,7 +13,7 @@ import { Interface } from 'ethers/lib/utils' export const getContractDefinition = (name: string, ovm?: boolean): any => { const match = glob.sync( path.resolve(__dirname, `../artifacts${ovm ? '-ovm' : ''}`) + - `/**/${name}.json` + `/**/${name.split('-').join(':')}.json` ) if (match.length > 0) { From f6776a54137dab65eaaecc07eaa8ada2bed21829 Mon Sep 17 00:00:00 2001 From: Liam Horne Date: Tue, 27 Apr 2021 16:15:14 -0700 Subject: [PATCH 2/2] build: add changeset --- .changeset/late-beers-lay.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/late-beers-lay.md diff --git a/.changeset/late-beers-lay.md b/.changeset/late-beers-lay.md new file mode 100644 index 00000000000..90f7f2fc052 --- /dev/null +++ b/.changeset/late-beers-lay.md @@ -0,0 +1,5 @@ +--- +"@eth-optimism/contracts": patch +--- + +Updates deployment files to remove colon filenames