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

[C-739] Patch @openzeppelin/upgrades Initializable.sol fields #3584

Merged
merged 10 commits into from
Aug 4, 2022

Conversation

dylanjeffers
Copy link
Contributor

@dylanjeffers dylanjeffers commented Jul 29, 2022

Description

  • Adds patch-package to modify @openzeppelin/upgrades Initializable.sol
  • Adds filler after proxyAdmin mem slot to ensure classes inheriting Initializable can define fields that don't clash with proxyAdmin slot.

Tests

This code is already live on eth mainnet, this is just to finalize our contracts in source code

Note: the lock file had a lot of unnecessary deps. was able to clear them out by removing node_modules and running npm i to ensure the package-lock.json generation is correct and reproducible

@dylanjeffers dylanjeffers changed the title [C-739] Patch @openzeppelin/upgrades Initializable mem slots [C-739] Patch @openzeppelin/upgrades Initializable.sol fields Jul 29, 2022
@raymondjacobson
Copy link
Member

@hareeshnagaraj for confirmation, but amazing ty!

@pull-request-size pull-request-size bot added size/S and removed size/M labels Jul 30, 2022
@hareeshnagaraj
Copy link
Contributor

Looks great will confirm post manual verification on my end

dylanjeffers and others added 4 commits August 1, 2022 22:13
…diusProject/audius-protocol into dj-c-739-patch-zeppelin-initializable
* Add test cases verifying patch functionality
@pull-request-size pull-request-size bot added size/M and removed size/S labels Aug 2, 2022
Copy link
Contributor

@hareeshnagaraj hareeshnagaraj left a comment

Choose a reason for hiding this comment

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

Thanks for handling this one!!

@dylanjeffers dylanjeffers merged commit 1e04215 into master Aug 4, 2022
@dylanjeffers dylanjeffers deleted the dj-c-739-patch-zeppelin-initializable branch August 4, 2022 17:49
audius-infra pushed a commit that referenced this pull request Aug 4, 2022
## Changelog

- 2022-08-04 [be35ce8] INF-210 fix || exit 1 logic (#3635) [Joaquin Casares]
- 2022-08-04 [ae4bd30] [C-765] Add native libs entrypoint (#3626) [Dylan Jeffers]
- 2022-08-04 [1e04215] [C-739] Patch @openzeppelin/upgrades Initializable.sol fields (#3584) [Dylan Jeffers]
- 2022-08-04 [01f924a] Fix add track to playlist notification timestamp (#3629) [Isaac Solo]
- 2022-08-03 [fcfdc3e] Remove unused labels (#3628) [Theo Ilie]
- 2022-08-03 [2d2fcca] [CON-301] add prometheus to queues (#3595) [Johannes Naylor]
- 2022-08-03 [798b7fa] CON-303 Cache CN 200-status /health_check responses for 1sec in nginx (#3624) [Sid Sethi]
- 2022-08-03 [b33a56c] Throw error in syncImmediateQueue (#3625) [Dheeraj Manjunath]
- 2022-08-03 [1239375] Tests for aggregate table triggers (#3623) [Steve Perkins]
- 2022-08-03 [e164665] INF-210 Finishing changes (#3617) [Joaquin Casares]
- 2022-08-03 [9b5f4c9] New queue for immediate sync (#3619) [Dheeraj Manjunath]
- 2022-08-03 [5cef789] Fix attemptNumber not getting updated + increase queue histories (#3622) [Theo Ilie]
- 2022-08-03 [683d545] Related artists index2 (#3621) [Steve Perkins]
- 2022-08-03 [c3a0149] Change path due to recent libs change (#3620) [Cheran]
- 2022-08-03 [216bf25] Land #21 from docs.audius.org (#3514) [Raymond Jacobson]
- 2022-08-02 [54713a7] [C-736] Refactor AudiusLibs to typescript (#3597) [Dylan Jeffers]
- 2022-08-02 [54b7db8] Fix runtime includes TypeError (#3178) [Dylan Jeffers]
- 2022-08-02 [89e0db2] Bump sdk to v0.0.29 [audius-infra]
audius-infra pushed a commit that referenced this pull request Aug 4, 2022
## Changelog

- 2022-08-04 [2d720a6] Fix bundles (#3639) [Sebastian Klingler]
- 2022-08-04 [d2b051d] INF-210 grab VERSION after exiting subshell that bumped version (#3636) [Joaquin Casares]
- 2022-08-04 [27433f5] Remove extra done() callback and add sync job result (#3634) [Theo Ilie]
- 2022-08-04 [be35ce8] INF-210 fix || exit 1 logic (#3635) [Joaquin Casares]
- 2022-08-04 [ae4bd30] [C-765] Add native libs entrypoint (#3626) [Dylan Jeffers]
- 2022-08-04 [1e04215] [C-739] Patch @openzeppelin/upgrades Initializable.sol fields (#3584) [Dylan Jeffers]
- 2022-08-04 [01f924a] Fix add track to playlist notification timestamp (#3629) [Isaac Solo]
- 2022-08-03 [fcfdc3e] Remove unused labels (#3628) [Theo Ilie]
- 2022-08-03 [2d2fcca] [CON-301] add prometheus to queues (#3595) [Johannes Naylor]
- 2022-08-03 [798b7fa] CON-303 Cache CN 200-status /health_check responses for 1sec in nginx (#3624) [Sid Sethi]
- 2022-08-03 [b33a56c] Throw error in syncImmediateQueue (#3625) [Dheeraj Manjunath]
- 2022-08-03 [1239375] Tests for aggregate table triggers (#3623) [Steve Perkins]
- 2022-08-03 [e164665] INF-210 Finishing changes (#3617) [Joaquin Casares]
- 2022-08-03 [9b5f4c9] New queue for immediate sync (#3619) [Dheeraj Manjunath]
- 2022-08-03 [5cef789] Fix attemptNumber not getting updated + increase queue histories (#3622) [Theo Ilie]
- 2022-08-03 [683d545] Related artists index2 (#3621) [Steve Perkins]
- 2022-08-03 [c3a0149] Change path due to recent libs change (#3620) [Cheran]
- 2022-08-03 [216bf25] Land #21 from docs.audius.org (#3514) [Raymond Jacobson]
- 2022-08-02 [54713a7] [C-736] Refactor AudiusLibs to typescript (#3597) [Dylan Jeffers]
- 2022-08-02 [54b7db8] Fix runtime includes TypeError (#3178) [Dylan Jeffers]
- 2022-08-02 [89e0db2] Bump sdk to v0.0.29 [audius-infra]
audius-infra pushed a commit that referenced this pull request Aug 4, 2022
## Changelog

- 2022-08-04 [a3556c3] include v as VERSION prefix (#3641) [Joaquin Casares]
- 2022-08-04 [7755c57] Update SDK (#3633) [Michael Piazza]
- 2022-08-04 [3f6256f] INF-210 rename GIT_TAG to GIT_COMMIT (#3637) [Joaquin Casares]
- 2022-08-04 [2d720a6] Fix bundles (#3639) [Sebastian Klingler]
- 2022-08-04 [d2b051d] INF-210 grab VERSION after exiting subshell that bumped version (#3636) [Joaquin Casares]
- 2022-08-04 [27433f5] Remove extra done() callback and add sync job result (#3634) [Theo Ilie]
- 2022-08-04 [be35ce8] INF-210 fix || exit 1 logic (#3635) [Joaquin Casares]
- 2022-08-04 [ae4bd30] [C-765] Add native libs entrypoint (#3626) [Dylan Jeffers]
- 2022-08-04 [1e04215] [C-739] Patch @openzeppelin/upgrades Initializable.sol fields (#3584) [Dylan Jeffers]
- 2022-08-04 [01f924a] Fix add track to playlist notification timestamp (#3629) [Isaac Solo]
- 2022-08-03 [fcfdc3e] Remove unused labels (#3628) [Theo Ilie]
- 2022-08-03 [2d2fcca] [CON-301] add prometheus to queues (#3595) [Johannes Naylor]
- 2022-08-03 [798b7fa] CON-303 Cache CN 200-status /health_check responses for 1sec in nginx (#3624) [Sid Sethi]
- 2022-08-03 [b33a56c] Throw error in syncImmediateQueue (#3625) [Dheeraj Manjunath]
- 2022-08-03 [1239375] Tests for aggregate table triggers (#3623) [Steve Perkins]
- 2022-08-03 [e164665] INF-210 Finishing changes (#3617) [Joaquin Casares]
- 2022-08-03 [9b5f4c9] New queue for immediate sync (#3619) [Dheeraj Manjunath]
- 2022-08-03 [5cef789] Fix attemptNumber not getting updated + increase queue histories (#3622) [Theo Ilie]
- 2022-08-03 [683d545] Related artists index2 (#3621) [Steve Perkins]
- 2022-08-03 [c3a0149] Change path due to recent libs change (#3620) [Cheran]
- 2022-08-03 [216bf25] Land #21 from docs.audius.org (#3514) [Raymond Jacobson]
- 2022-08-02 [54713a7] [C-736] Refactor AudiusLibs to typescript (#3597) [Dylan Jeffers]
- 2022-08-02 [54b7db8] Fix runtime includes TypeError (#3178) [Dylan Jeffers]
- 2022-08-02 [89e0db2] Bump sdk to v0.0.29 [audius-infra]
sliptype pushed a commit that referenced this pull request Sep 10, 2023
[1957c34] Add remove from playlist overflow action (#3621) Kyle Shanks
[67e0012] [C-2712] Clear favorites on sign-out (#3620) Dylan Jeffers
[97b6b94] [PAY-1421] Fix android reaction offsets (#3611) Michael Piazza
[9867571] [PAY-1494] Change chats copy to beginning of message history (#3617) Reed
[1b7ca71] Add overflow menu options for track list items on mobile (#3608) Kyle Shanks
[810f0df] [PAY-1487] Increase hit slop of mobile dms send button (#3618) Reed
[06dae51]  [PAY-1470] Remove border radius from track/playlist tiles (#3613) Marcus Pasell
[dbdfb84] [PAY-1469] Clear the search after creating a chat (#3616) Marcus Pasell
[3f31554] [PAY-1489] Add more space to reacted to messages (#3615) Marcus Pasell
[ed4f321] [PAY-1473] Clear input on chat change (#3614) Marcus Pasell
[e9683d9] Use emojis instead of 'heart' etc as reactions (#3602) Marcus Pasell
[192fd44] [PAY-1486] DMs: Fix purple border around unfurls (#3612) Marcus Pasell
[b0c2e4a] Lowercase library restricted handle (#3590) Isaac Solo
[a8daa72] Change text to 'Beginning of Conversation' (#3605) Marcus Pasell
[332c0c0] Developer app modal - small fixes (#3609) nicoback2
[0e43db1] [PAY-1476] Inbox unavailable copy update (#3607) Reed
[d862fd5] [PAY-1484] Allow reactions while keyboard is open on mobile (#3606) Reed
[3bd5928] [PAY-944] DMs: Add Mobile Web drawer prompting app download (#3565) Marcus Pasell
[5bea105] Wait for libs to init before initting SDK (#3604) Marcus Pasell
[f4d28e0] Add option to cache bust node_modules (#3603) Dylan Jeffers
[9b165c4] [PAY-1455] Optimize reactions perf (maybe) (#3599) Michael Piazza
[0a1a68b] [PAY-1465] Auto-nav to chat only when permitted (#3598) Reed
[72e9f92] [C-2665 C-2714] Add developer apps settings modal (#3589) Dylan Jeffers
[b787344] [PAY-1456] Fix followee-gated create chat crash (#3593) Reed
[dbae5bd] Reduce MessageLockedButton size on profile screen (#3597) Reed
[097879b] [PAY-1437] Fix drawers sharing state causing crash (#3595) Reed
[818b215] [C-2770] Fix issue where playlist library can disappear (#3596) Dylan Jeffers
[f3ada88] [PAY-1461] Format follower count in chat search screen (#3594) Reed
[eb924e7] [C-2713] Add track metadata fields to new upload form (#3574) Andrew Mendelsohn
[be56d1f] Fix mobile textinput borders + labels (#3592) Reed
[fc7541b] Update collection list id flow to add the create tile (#3591) Kyle Shanks
[dc15518] [PAY-1432] Fix chat playlist artist sometimes undefined (#3585) Reed
[399d0b5] [C-2588] Update share modal and drawer to properly add user twitter handle (#3584) Kyle Shanks
[9f30855] [C-2761] Add mutations to audius-query (#3581) Dylan Jeffers
[597dfe5] [PAY-1448] End the race between SDK and Libs, once and for all (#3588) Marcus Pasell
[56914cf] [C-2768] Update InputV2, add TextField/TextAreaField (#3587) Dylan Jeffers
[c9358b6] [CON-742] Make users and track actions v2 for v2 users/tracks even when feature flags are disabled (#3582) Theo Ilie
[a94f035] audius-query debug flag usage in README (#3586) Reed
[bceb3fe] [INF-417] Generate sourcemaps when running web:prod (#3583) Sebastian Klingler
[f4ad466] [PAY-1454] Redline mobile header to latest figma design (#3576) Michael Piazza
[eec6af0] [PAY-1405] Add padding to bottom of chat user search screen (#3580) Reed
[a6c8ece] [PAY-1435] Navigate to chat after unblocking user on mobile (#3578) Reed
[ee1b6c3] [PLAT-659] Metamask sign in/up on ACDC (#3563) Raymond Jacobson
[fbd4053] [C-2472] Update mobile track list items for playlists to have the overflow menu (#3577) Kyle Shanks
[51f44ac] [PAY-1399] Fix Android chat send button color (#3575) Reed
[7d440de] [PAY-1442] Fix drawer touchables on android (#3572) Reed
[8c90ff6] Allow drag and dropping tracks into chat (#3573) Michael Piazza
[f7489e0] Upgrade dapp store version to v1.5.26 (#3504) Dylan Jeffers
[6be0c64] [PAY-1440][PAY-1441] Mobile inbox settings UI fixes (#3571) Reed
[001007e] [PAY-1434] Dismiss keyboard on create chat screen row press (#3569) Reed
[c70e9fe] [PAY-1446] Set MessageLocked icon in profile screen to 0.4 opacity (#3570) Reed
[2cc8ad0] [C-2716] Improve notifications on fresh account (#3568) Dylan Jeffers
[01f05ba] [C-2474] Generate playlist artwork from track artwork (#3518) Dylan Jeffers
[0355c10] [PAY-1325] Remove userbadges from chat unavailable message in chat screen (#3567) Reed
[da10bbc] [PAY-1389] CTA on create chat when not permitted (#3566) Reed
@AudiusProject AudiusProject deleted a comment from linear bot Sep 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants