Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update remappings.txt for upgradeable contracts and set up submodule #4639

Merged
merged 19 commits into from
Oct 2, 2023

Conversation

frangio
Copy link
Contributor

@frangio frangio commented Sep 29, 2023

Following #4628, this PR sets up the vanilla contracts in a submodule and updates remappings.txt accordingly.

In order for Hardhat to respect remappings.txt, we need the hardhat-foundry plugin to be installed, which needs the forge executable in scope.

Find the result for this PR here: https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/tree/partial-submodules

@changeset-bot
Copy link

changeset-bot bot commented Sep 29, 2023

⚠️ No Changeset found

Latest commit: c791317

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

@frangio frangio requested a review from Amxx September 29, 2023 01:18
@@ -5,6 +5,7 @@ on:
branches:
- master
- release-v*
- partial-submodules
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should be removed before merging.

@socket-security
Copy link

socket-security bot commented Sep 29, 2023

New and updated dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
@nomicfoundation/hardhat-foundry 1.1.1 None +0 25.3 kB fvictorio
@openzeppelin/upgrade-safe-transpiler 0.3.30...0.3.32 None +0/-0 482 kB
hardhat-exposed 0.3.12-1...0.3.13 None +0/-0 131 kB frangio

@Amxx Amxx temporarily deployed to push-upgradeable September 29, 2023 07:54 — with GitHub Actions Inactive
Amxx
Amxx previously approved these changes Sep 29, 2023
Copy link
Collaborator

@Amxx Amxx left a comment

Choose a reason for hiding this comment

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

Naming of the REMOTE envvar is a bit non-intuitive, but otherwize looks good.

Note: I added an argv params to force enable/disable the foundry package.

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
Copy link
Member

Choose a reason for hiding this comment

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

Why is nightly needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, I copied it from the foundry tests job.

hardhat.config.js Show resolved Hide resolved
.github/workflows/upgradeable.yml Outdated Show resolved Hide resolved
scripts/upgradeable/transpile-onto.sh Outdated Show resolved Hide resolved
scripts/upgradeable/transpile-onto.sh Outdated Show resolved Hide resolved
Co-authored-by: Ernesto García <[email protected]>
@frangio frangio temporarily deployed to push-upgradeable September 30, 2023 02:47 — with GitHub Actions Inactive
@frangio frangio temporarily deployed to push-upgradeable September 30, 2023 05:34 — with GitHub Actions Inactive
@frangio frangio temporarily deployed to push-upgradeable September 30, 2023 05:36 — with GitHub Actions Inactive
@frangio frangio temporarily deployed to push-upgradeable September 30, 2023 05:38 — with GitHub Actions Inactive
@Amxx Amxx temporarily deployed to push-upgradeable October 2, 2023 13:29 — with GitHub Actions Inactive
@frangio frangio temporarily deployed to push-upgradeable October 2, 2023 14:05 — with GitHub Actions Inactive
ernestognw
ernestognw previously approved these changes Oct 2, 2023
Copy link
Member

@ernestognw ernestognw left a comment

Choose a reason for hiding this comment

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

LGTM

.github/workflows/upgradeable.yml Outdated Show resolved Hide resolved
@frangio frangio merged commit abba0d0 into master Oct 2, 2023
12 of 13 checks passed
@frangio frangio deleted the partial-submodules branch October 2, 2023 18:41
frangio added a commit that referenced this pull request Oct 2, 2023
…4639)

Co-authored-by: Hadrien Croubois <[email protected]>
Co-authored-by: Ernesto García <[email protected]>
(cherry picked from commit abba0d0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants