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.

Sign up for GitHub

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

Jump to bottom

Merge release-v4.8 #4188

Merged
merged 31 commits into from
Apr 24, 2023
Merged

Merge release-v4.8 #4188

merged 31 commits into from
Apr 24, 2023

Conversation

frangio
Copy link
Contributor

@frangio frangio commented Apr 21, 2023 •
edited
Loading

Merges deleted changesets and updated file headers from 4.8.3.

frangio and others added 30 commits November 25, 2022 13:11
@frangio
Improve some NatSpec (OpenZeppelin#3809)
53eb531 
Co-authored-by: JulissaDantes <julissadcj@gmail.com>
(cherry picked from commit 8f8fd84)
@bxmmm1 @frangio
Add Ownable2Step to the docs (OpenZeppelin#3836)
fad1172 
Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit 24d1bb6)
@frangio
Add ERC-4626 Upgrade Note (OpenZeppelin#3849)
3e97221 
(cherry picked from commit c30fad9)
@frangio
Improve documentation of Initializable getters (OpenZeppelin#3861)
4e5b119 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit 3d7a938)
@frangio
Add documentation about the security of overrides (OpenZeppelin#3725)
011a0fb 
(cherry picked from commit e2362ce)
@omurovec @frangio
Fix governance tutorial contract (OpenZeppelin#3948)
873a01b 
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
(cherry picked from commit 5dbde1a)
@Amxx @frangio
Use a staticcall to fetch ERC20.decimals in ERC4626 (OpenZeppelin#3943)
cd50a86 
Co-authored-by: Francisco <frangio.1@gmail.com>
(cherry picked from commit 6b17b33)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>
@frangio
Add explicit permissions to docs workflow
472b996 
(cherry picked from commit ac30219)
@frangio @Amxx
Add docs on non-stability of internal function use (OpenZeppelin#3952)
1dfccff 
(cherry picked from commit 717fbc4)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>
@frangio
4.8.1
0457042
@JulissaDantes @frangio
Show if event parameter is indexed in docs (OpenZeppelin#3958)
3ab2e11 
Co-authored-by: Francisco <frangio.1@gmail.com>
(cherry picked from commit 18691d1)
@ernestognw @frangio
Add ERC*Pausable warning for public pausing mechanism (OpenZeppelin…
d13316e 
…#4007)

Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit 1684c57)
@frangio
Remove outdated note about virtual view functions (OpenZeppelin#4014)
c018c9c 
(cherry picked from commit 591c12d)
@YamenMerhi @frangio
Add warning for supportsERC165InterfaceUnchecked edge case (OpenZep…
9b610d3 
…pelin#4017)

(cherry picked from commit d13ec90)
@frangio
Update Tally screenshots (OpenZeppelin#4030)
357022c 
(cherry picked from commit 1575cc6)
@frangio
Add Subgraphs to docs sidebar
82d47ca 
(cherry picked from commit 5e76b26)
@Amxx @frangio
Fix ERC721Consecutive balance update on batch size 1
167bf67 
Merge pull request from GHSA-878m-3g6q-594q

Co-authored-by: Francisco Giordano <fg@frang.io>
(cherry picked from commit 8ba26f3)
@pcaversaccio @frangio
Update forge-std submodule to v1.2.0 (OpenZeppelin#3885)
43aa7ff 
Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch>
(cherry picked from commit 96ff934)
@0xalpharush @frangio
Ignore reentrancy inexecuteBatch and update Slither config (OpenZep…
ab9cc4c 
…pelin#3955)

Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit a5af0ad)
@frangio
4.8.2
d00acef
@PaulRBerg @frangio
Bump and pin Forge Std submodule (OpenZeppelin#4102)
9eee01c 
(cherry picked from commit 58a6291)
@Amxx @frangio
Improve TransparentUpgradeableProxy's transparency (OpenZeppelin#3977)
8dfeb5d 
Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit 2a62fb4)
@Amxx @frangio
Fix TransparentUpgradeableProxy's transparency (OpenZeppelin#4154)
c01ea99 
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit 5523c14)
@frangio
Merge changesets for transparency improvements (OpenZeppelin#4165)
db9ee95 
(cherry picked from commit cf86fd9)
@frangio
Improve docs for transparent proxy (OpenZeppelin#4181)
61b45a2 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
(cherry picked from commit 3b11799)
@Amxx @frangio
Merge pull request from GHSA-93hq-5wgc-jc82
ea595f5 
Co-authored-by: Francisco <fg@frang.io>
(cherry picked from commit 8d633cb)
@frangio
Update changelog
7bdd255
@frangio
4.8.3
0a25c19
@frangio
Merge branch 'master' into merge/release-v4.8
0da9c50
@frangio
Sync changesets with master
d79fc6d
@changeset-bot
Copy link

changeset-bot bot commented Apr 21, 2023 •
edited
Loading

⚠️ No Changeset found

Latest commit: 586e123

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 review from ernestognw and removed request for ernestognw April 21, 2023 11:33
ernestognw
ernestognw reviewed Apr 22, 2023
View reviewed changes
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.

Why are we removing the changesets if they didn't make it into the CHANGELOG.md?

ernestognw
ernestognw requested changes Apr 22, 2023
View reviewed changes
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.

My impression is that conflicts from 0da9c50 where not correctly solved, am I missing something?

@frangio
Copy link
Contributor Author

frangio commented Apr 22, 2023

You're right. I ran a command like this one:

openzeppelin-contracts/scripts/release/workflow/prepare-release-merge.sh

Line 15 in 91df66c

git merge origin/master -m "Merge master to $GITHUB_REF_NAME" -X theirs

I think the merge error was because of -X theirs.

We may need to fix this in that script.

@frangio frangio requested a review from ernestognw April 22, 2023 18:37
@ernestognw
Copy link
Member

You're right. I ran a command like this one:

openzeppelin-contracts/scripts/release/workflow/prepare-release-merge.sh

Line 15 in 91df66c

git merge origin/master -m "Merge master to $GITHUB_REF_NAME" -X theirs

I think the merge error was because of -X theirs.

We may need to fix this in that script.

I see, but this is because the update was made on this branch, whereas a CHANGELOG update should be done on the v4.8 branch. Shouldn't happen when using the automation

@frangio frangio merged commit 6aac66d into OpenZeppelin:master Apr 24, 2023
@frangio frangio deleted the merge/release-v4.8 branch April 24, 2023 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ernestognw ernestognw ernestognw approved these changes

Assignees
No one assigned
Labels
ignore-changeset
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@frangio @ernestognw @bxmmm1 @omurovec @Amxx @JulissaDantes @YamenMerhi @pcaversaccio @0xalpharush @PaulRBerg