Commit f87a2d00 authored by smartcontracts's avatar smartcontracts Committed by Kelvin Fichter

maintenance[contracts]: use dashes in chain container names (#819)

* maintenance: use dashes in chain container names

* chore: add changeset
parent b284dc39
---
'@eth-optimism/batch-submitter': patch
'@eth-optimism/contracts': patch
---
Use dashes instead of colons in contract names
...@@ -619,7 +619,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter { ...@@ -619,7 +619,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
) )
const addr = await manager.getAddress( const addr = await manager.getAddress(
'OVM_ChainStorageContainer:CTC:batches' 'OVM_ChainStorageContainer-CTC-batches'
) )
const container = new Contract( const container = new Contract(
addr, addr,
......
...@@ -94,7 +94,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -94,7 +94,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
) )
{ {
return iOVM_ChainStorageContainer( return iOVM_ChainStorageContainer(
resolve("OVM_ChainStorageContainer:CTC:batches") resolve("OVM_ChainStorageContainer-CTC-batches")
); );
} }
...@@ -111,7 +111,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad ...@@ -111,7 +111,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
) )
{ {
return iOVM_ChainStorageContainer( return iOVM_ChainStorageContainer(
resolve("OVM_ChainStorageContainer:CTC:queue") resolve("OVM_ChainStorageContainer-CTC-queue")
); );
} }
......
...@@ -72,7 +72,7 @@ contract OVM_StateCommitmentChain is iOVM_StateCommitmentChain, Lib_AddressResol ...@@ -72,7 +72,7 @@ contract OVM_StateCommitmentChain is iOVM_StateCommitmentChain, Lib_AddressResol
) )
{ {
return iOVM_ChainStorageContainer( return iOVM_ChainStorageContainer(
resolve("OVM_ChainStorageContainer:SCC:batches") resolve("OVM_ChainStorageContainer-SCC-batches")
); );
} }
......
...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => {
await deployAndRegister({ await deployAndRegister({
hre, hre,
name: 'OVM_ChainStorageContainer:CTC:batches', name: 'OVM_ChainStorageContainer-CTC-batches',
contract: 'OVM_ChainStorageContainer', contract: 'OVM_ChainStorageContainer',
args: [Lib_AddressManager.address, 'OVM_CanonicalTransactionChain'], args: [Lib_AddressManager.address, 'OVM_CanonicalTransactionChain'],
}) })
......
...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => {
await deployAndRegister({ await deployAndRegister({
hre, hre,
name: 'OVM_ChainStorageContainer:CTC:queue', name: 'OVM_ChainStorageContainer-CTC-queue',
contract: 'OVM_ChainStorageContainer', contract: 'OVM_ChainStorageContainer',
args: [Lib_AddressManager.address, 'OVM_CanonicalTransactionChain'], args: [Lib_AddressManager.address, 'OVM_CanonicalTransactionChain'],
}) })
......
...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -15,7 +15,7 @@ const deployFn: DeployFunction = async (hre) => {
await deployAndRegister({ await deployAndRegister({
hre, hre,
name: 'OVM_ChainStorageContainer:SCC:batches', name: 'OVM_ChainStorageContainer-SCC-batches',
contract: 'OVM_ChainStorageContainer', contract: 'OVM_ChainStorageContainer',
args: [Lib_AddressManager.address, 'OVM_StateCommitmentChain'], args: [Lib_AddressManager.address, 'OVM_StateCommitmentChain'],
}) })
......
...@@ -233,15 +233,15 @@ export const makeContractDeployConfig = async ( ...@@ -233,15 +233,15 @@ export const makeContractDeployConfig = async (
'0x0000000000000000000000000000000000000000', // will be overridden by geth when state dump is ingested. Storage key: 0x0000000000000000000000000000000000000000000000000000000000000008 '0x0000000000000000000000000000000000000000', // will be overridden by geth when state dump is ingested. Storage key: 0x0000000000000000000000000000000000000000000000000000000000000008
], ],
}, },
'OVM_ChainStorageContainer:CTC:batches': { 'OVM_ChainStorageContainer-CTC-batches': {
factory: getContractFactory('OVM_ChainStorageContainer'), factory: getContractFactory('OVM_ChainStorageContainer'),
params: [AddressManager.address, 'OVM_CanonicalTransactionChain'], params: [AddressManager.address, 'OVM_CanonicalTransactionChain'],
}, },
'OVM_ChainStorageContainer:CTC:queue': { 'OVM_ChainStorageContainer-CTC-queue': {
factory: getContractFactory('OVM_ChainStorageContainer'), factory: getContractFactory('OVM_ChainStorageContainer'),
params: [AddressManager.address, 'OVM_CanonicalTransactionChain'], params: [AddressManager.address, 'OVM_CanonicalTransactionChain'],
}, },
'OVM_ChainStorageContainer:SCC:batches': { 'OVM_ChainStorageContainer-SCC-batches': {
factory: getContractFactory('OVM_ChainStorageContainer'), factory: getContractFactory('OVM_ChainStorageContainer'),
params: [AddressManager.address, 'OVM_StateCommitmentChain'], params: [AddressManager.address, 'OVM_StateCommitmentChain'],
}, },
......
...@@ -114,12 +114,12 @@ describe('[GAS BENCHMARK] OVM_CanonicalTransactionChain', () => { ...@@ -114,12 +114,12 @@ describe('[GAS BENCHMARK] OVM_CanonicalTransactionChain', () => {
) )
await AddressManager.setAddress( await AddressManager.setAddress(
'OVM_ChainStorageContainer:CTC:batches', 'OVM_ChainStorageContainer-CTC-batches',
batches.address batches.address
) )
await AddressManager.setAddress( await AddressManager.setAddress(
'OVM_ChainStorageContainer:CTC:queue', 'OVM_ChainStorageContainer-CTC-queue',
queue.address queue.address
) )
......
...@@ -164,12 +164,12 @@ describe('OVM_CanonicalTransactionChain', () => { ...@@ -164,12 +164,12 @@ describe('OVM_CanonicalTransactionChain', () => {
) )
await AddressManager.setAddress( await AddressManager.setAddress(
'OVM_ChainStorageContainer:CTC:batches', 'OVM_ChainStorageContainer-CTC-batches',
batches.address batches.address
) )
await AddressManager.setAddress( await AddressManager.setAddress(
'OVM_ChainStorageContainer:CTC:queue', 'OVM_ChainStorageContainer-CTC-queue',
queue.address queue.address
) )
......
...@@ -83,7 +83,7 @@ describe('OVM_StateCommitmentChain', () => { ...@@ -83,7 +83,7 @@ describe('OVM_StateCommitmentChain', () => {
) )
await AddressManager.setAddress( await AddressManager.setAddress(
'OVM_ChainStorageContainer:SCC:batches', 'OVM_ChainStorageContainer-SCC-batches',
batches.address batches.address
) )
......
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