Skip to content

Removes '-v3' from kovan and goerli contracts folders#844

Merged
gigamesh merged 3 commits intodevelopfrom
task/rename-contracts-folders
May 12, 2021
Merged

Removes '-v3' from kovan and goerli contracts folders#844
gigamesh merged 3 commits intodevelopfrom
task/rename-contracts-folders

Conversation

@gigamesh
Copy link
Copy Markdown
Contributor

@gigamesh gigamesh commented May 11, 2021

Deleted the folders without -v3, then renamed the -v3 folders.

The reason it is showing as line changes is git is interpretting it all as changes to the files in the folders I deleted:
image

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented May 11, 2021

⚠️ No Changeset found

Latest commit: f627ed0

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@@ -1,5 +1,5 @@
{
"address": "0x0E8917aF9eB7812c7819EF4e80D2217679d11324",
"address": "0x25bb69ee5665536Ce6aeb51094F0bed9e4DACc30",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this PR changing addresses?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe because I deleted the folders without -v3, then renamed the -v3 folders, so git is interpretting it all as changes to the files in the folders I deleted?

image

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 11, 2021

Codecov Report

Merging #844 (f627ed0) into develop (63f2cdd) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #844   +/-   ##
========================================
  Coverage    82.21%   82.21%           
========================================
  Files           48       48           
  Lines         1895     1895           
  Branches       303      303           
========================================
  Hits          1558     1558           
  Misses         337      337           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 63f2cdd...f627ed0. Read the comment docs.

@tynes
Copy link
Copy Markdown
Contributor

tynes commented May 12, 2021

Can you regenerate the README? Its currently incorrect - using old kovan addresses

@gigamesh gigamesh force-pushed the task/rename-contracts-folders branch from ec442be to 91b5a1b Compare May 12, 2021 16:20
Copy link
Copy Markdown
Contributor

@maurelian maurelian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from updating the README, this should only rename files right?
ie. there were a lot of lines deleted:

+851 
−7,529 

Actually, looking again, I think the kovan-v3 folder was deleted, and a preexisting kovan folder was modified.

Request: please just add some more description as to what steps resulted in this diff, and also why we're doing it. :)

@gigamesh
Copy link
Copy Markdown
Contributor Author

Aside from updating the README, this should only rename files right?
ie. there were a lot of lines deleted:

+851 
−7,529 

Actually, looking again, I think the kovan-v3 folder was deleted, and a preexisting kovan folder was modified.

Request: please just add some more description as to what steps resulted in this diff, and also why we're doing it. :)

added

@tynes
Copy link
Copy Markdown
Contributor

tynes commented May 12, 2021

@gigamesh This is going to need to fix merge conflicts now, sorry about that

@maurelian maurelian self-requested a review May 12, 2021 17:32
Copy link
Copy Markdown
Contributor

@tynes tynes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will merge once the tests are done

@gigamesh gigamesh merged commit 4390321 into develop May 12, 2021
@gigamesh gigamesh deleted the task/rename-contracts-folders branch May 12, 2021 17:57
InoMurko pushed a commit to omgnetwork/optimism that referenced this pull request May 25, 2021
…ereum-optimism#844)

* Removes '-v3' from kovan and goerli contracts folders

* Generatees new README
theochap pushed a commit that referenced this pull request Dec 10, 2025
* chore(host): cleanup hint parsing

* fix: fmt

* fix: fmt

* fixes
OptimismBot pushed a commit that referenced this pull request Feb 25, 2026
* chore: remove unnecesary casting on L2CM

* feat: add interface for XForkL2ContractsManager

* chore: add natspec to XForkL2ContractsManager

* chore: pr ready
github-merge-queue bot pushed a commit that referenced this pull request Feb 25, 2026
* feat: l2cm impl l2contractsmanager (#837)

* feat: add initial iteration of L2ContractsManager

* feat: add network configuration structs

* feat: load full config for L2ContractsManager

* feat: implement L2CM::_apply

* feat: add gas price oracle

* refactor: move L2CM types to library

* fix: upgrade ProxyAdmin predeploy

* chore: enforce delegatecall for L2CM::upgrade

* feat: add conditional upgrade for CGT

* refactor: remove non-proxied predeploys

* chore: renamed l2cm

* refactor: l2cm address comments (#839)

* refactor: rename _fullConfig to _loadFullConfig to match OPCM v2

* chore: remove non-proxied weth from implementations struct

* test: add config preservation test

* test: add CGT specific tests

* refactor: avoid casting network config values to address

* test: add test cases

* chore: pr ready (#844)

* chore: remove unnecesary casting on L2CM

* feat: add interface for XForkL2ContractsManager

* chore: add natspec to XForkL2ContractsManager

* chore: pr ready

* refactor: moves util functions out of L2CM implementation (#848)

* feat: l2cm address comments (#850)

* chore: add comment clarifying use `useCustomGasToken`

* chore: upgrade both native native asset liquidity and liquidity controller predeploys together

* feat: prohibit downgrading predeploy implementations

* refactor: make isCustomGasToken part of the network full config

* fix: add missing import

* fix: use FeeVault legacy getters for backward compat

* chore: update name XForkL2ContractsManager to L2ContractsManager

* feat: conditionally skip some predeploys based on them being supported in a given chain (#857)

* fix: l2cm address comments (#872)

* chore: add todo tracking removal of L2ProxyAdmin skips

* chore: add natspec comment for isPredeployNamespace

* chore: use vm.prank(address,bool) to prank a delegatecall

* chore: add todo for dev flags for CrossL2Inbox and L2ToL2CrossDomainMessenger

* feat: allow immutables for L2CM in semgrep rules

* chore: pr ready

* test: L2CM verify testing (#874)

* test: add coverage test for predeploy upgrades

* chore: update test natspec

* chore: just pr ready

* chore: L2CM round comments (#877)

* refactor: move helper function into Predeploys.s.sol

* fix: add conditional deployer to L2CM

* chore: update to l1block and l1blockCGT

* test: fixes issue where OptimismSuperchainERC20 tests fail due to profile ambiguity

* chore: just pr ready

* chore: l2cm round comments2 (#883)

* fix: move code length check out of isUpgradeable

* chore: inline fullCofig_.isCustomGasToken initialization

* chore: add public getters for the implementations on the L2CM

* chore: remove XForkL2ContractsManager sol rule exclusion

* test: add downgrade prevention test suite

* chore: just pr ready

* refactor: check for address 0 instead code length

* Revert "refactor: check for address 0 instead code length"

This reverts commit 1fa8694.

* chore: remove non-needed check

* chore: remove unused function in tests (#884)

* refactor: l2cm group impls (#885)

* refactor: remove individual getters in favor of a unified one

* test: add test for getImplementations

* test: add OZ v5 Initializable compatibility in L2ContractsManagerUtils (#887)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants