Commit 23d3dc79 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

Merge pull request #5290 from ethereum-optimism/contracts-bedrock/l2-semver

contracts-bedrock: update out of date predeploy semver
parents b00425e9 73cecdd5
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -12,9 +12,9 @@ import { FeeVault } from "../universal/FeeVault.sol"; ...@@ -12,9 +12,9 @@ import { FeeVault } from "../universal/FeeVault.sol";
*/ */
contract BaseFeeVault is FeeVault, Semver { contract BaseFeeVault is FeeVault, Semver {
/** /**
* @custom:semver 1.0.0 * @custom:semver 1.1.0
* *
* @param _recipient Address that will receive the accumulated fees. * @param _recipient Address that will receive the accumulated fees.
*/ */
constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 0, 0) {} constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 1, 0) {}
} }
...@@ -16,5 +16,5 @@ contract L1FeeVault is FeeVault, Semver { ...@@ -16,5 +16,5 @@ contract L1FeeVault is FeeVault, Semver {
* *
* @param _recipient Address that will receive the accumulated fees. * @param _recipient Address that will receive the accumulated fees.
*/ */
constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 0, 0) {} constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 1, 0) {}
} }
...@@ -20,7 +20,7 @@ import { Semver } from "../universal/Semver.sol"; ...@@ -20,7 +20,7 @@ import { Semver } from "../universal/Semver.sol";
*/ */
contract L2ERC721Bridge is ERC721Bridge, Semver { contract L2ERC721Bridge is ERC721Bridge, Semver {
/** /**
* @custom:semver 1.0.0 * @custom:semver 1.1.0
* *
* @param _messenger Address of the CrossDomainMessenger on this network. * @param _messenger Address of the CrossDomainMessenger on this network.
* @param _otherBridge Address of the ERC721 bridge on the other network. * @param _otherBridge Address of the ERC721 bridge on the other network.
......
...@@ -13,11 +13,11 @@ import { FeeVault } from "../universal/FeeVault.sol"; ...@@ -13,11 +13,11 @@ import { FeeVault } from "../universal/FeeVault.sol";
*/ */
contract SequencerFeeVault is FeeVault, Semver { contract SequencerFeeVault is FeeVault, Semver {
/** /**
* @custom:semver 1.0.0 * @custom:semver 1.1.0
* *
* @param _recipient Address that will receive the accumulated fees. * @param _recipient Address that will receive the accumulated fees.
*/ */
constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 0, 0) {} constructor(address _recipient) FeeVault(_recipient, 10 ether) Semver(1, 1, 0) {}
/** /**
* @custom:legacy * @custom:legacy
......
...@@ -351,7 +351,7 @@ const check = { ...@@ -351,7 +351,7 @@ const check = {
signer signer
) )
await assertSemver(SequencerFeeVault, 'SequencerFeeVault') await assertSemver(SequencerFeeVault, 'SequencerFeeVault', '1.1.0')
const RECIPIENT = await SequencerFeeVault.RECIPIENT() const RECIPIENT = await SequencerFeeVault.RECIPIENT()
assert(RECIPIENT !== hre.ethers.constants.AddressZero) assert(RECIPIENT !== hre.ethers.constants.AddressZero)
...@@ -594,7 +594,7 @@ const check = { ...@@ -594,7 +594,7 @@ const check = {
signer signer
) )
await assertSemver(BaseFeeVault, 'BaseFeeVault') await assertSemver(BaseFeeVault, 'BaseFeeVault', '1.1.0')
const MIN_WITHDRAWAL_AMOUNT = await BaseFeeVault.MIN_WITHDRAWAL_AMOUNT() const MIN_WITHDRAWAL_AMOUNT = await BaseFeeVault.MIN_WITHDRAWAL_AMOUNT()
console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`)
...@@ -617,7 +617,7 @@ const check = { ...@@ -617,7 +617,7 @@ const check = {
signer signer
) )
await assertSemver(L1FeeVault, 'L1FeeVault') await assertSemver(L1FeeVault, 'L1FeeVault', '1.1.0')
const MIN_WITHDRAWAL_AMOUNT = await L1FeeVault.MIN_WITHDRAWAL_AMOUNT() const MIN_WITHDRAWAL_AMOUNT = await L1FeeVault.MIN_WITHDRAWAL_AMOUNT()
console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`) console.log(` - MIN_WITHDRAWAL_AMOUNT: ${MIN_WITHDRAWAL_AMOUNT}`)
......
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