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

feat: Added proxy infra #2

Merged
merged 9 commits into from
Jun 19, 2023
Merged

feat: Added proxy infra #2

merged 9 commits into from
Jun 19, 2023

Conversation

JGcarv
Copy link
Contributor

@JGcarv JGcarv commented Jun 14, 2023

Added the contract that will be used as the Proxy, which overrides the setImplementation.

Since there's a need to reference globals on both the Proxy and the proxied, I opt to use the eip1967 standard to save the address, but not sure if that's allowed.

@JGcarv JGcarv self-assigned this Jun 14, 2023
@JGcarv JGcarv requested a review from a team as a code owner June 14, 2023 19:12
@shortcut-integration
Copy link

This pull request has been linked to Shortcut Story #12659: [MPLv2] Expose setImplementation on MPLv2.

@JGcarv JGcarv requested a review from vbidin June 14, 2023 19:18
vbidin
vbidin reviewed Jun 14, 2023
View reviewed changes
contracts/MapleToken.sol Outdated Show resolved Hide resolved
@JGcarv JGcarv force-pushed the sc-12659-feature-mplv2-setimplementation branch from bcae25c to f48d985 Compare June 15, 2023 22:36
@JGcarv JGcarv changed the base branch from feat/token to main June 15, 2023 22:36
@github-actions
Copy link

LCOV of commit cfd73c2 during Forge Tests (PR) #30

Summary coverage rate:
  lines......: 37.5% (3 of 8 lines)
  functions..: 50.0% (2 of 4 functions)
  branches...: 100.0% (2 of 2 branches)

Files changed coverage rate:
                               |Lines       |Functions  |Branches    
  Filename                     |Rate     Num|Rate    Num|Rate     Num
  ===================================================================
  contracts/MapleToken.sol     | 100%      1| 100%     1|    -      0
  contracts/MapleTokenProxy.sol| 100%      2| 100%     1| 100%      2
  tests/MapleToken.t.sol       | 0.0%      4| 0.0%     1|    -      0
  tests/utils/Mocks.sol        | 0.0%      1| 0.0%     1|    -      0

⛔ The code coverage is too low: 37.5. Expected at least 50.

@github-actions
Copy link

LCOV of commit 5ed30b9 during Forge Tests (PR) #32

Summary coverage rate:
  lines......: 100.0% (3 of 3 lines)
  functions..: 100.0% (2 of 2 functions)
  branches...: no data found

Files changed coverage rate:
                               |Lines       |Functions  |Branches    
  Filename                     |Rate     Num|Rate    Num|Rate     Num
  ===================================================================
  contracts/MapleToken.sol     | 100%      1| 100%     1|    -      0
  contracts/MapleTokenProxy.sol| 100%      2| 100%     1|    -      0

@github-actions
Copy link

LCOV of commit 7f29699 during Forge Tests (PR) #33

Summary coverage rate:
  lines......: 100.0% (3 of 3 lines)
  functions..: 100.0% (2 of 2 functions)
  branches...: no data found

Files changed coverage rate:
                               |Lines       |Functions  |Branches    
  Filename                     |Rate     Num|Rate    Num|Rate     Num
  ===================================================================
  contracts/MapleToken.sol     | 100%      1| 100%     1|    -      0
  contracts/MapleTokenProxy.sol| 100%      2| 100%     1|    -      0

@JGcarv JGcarv requested a review from vbidin June 15, 2023 23:21
@github-actions
Copy link

LCOV of commit 396cd96 during Forge Tests (PR) #35

Summary coverage rate:
  lines......: 100.0% (6 of 6 lines)
  functions..: 100.0% (5 of 5 functions)
  branches...: no data found

Files changed coverage rate:
                               |Lines       |Functions  |Branches    
  Filename                     |Rate     Num|Rate    Num|Rate     Num
  ===================================================================
  contracts/MapleToken.sol     | 100%      4| 100%     4|    -      0
  contracts/MapleTokenProxy.sol| 100%      2| 100%     1|    -      0

@JGcarv JGcarv mentioned this pull request Jun 16, 2023
Merged
vbidin
vbidin requested changes Jun 19, 2023
View reviewed changes
.github/workflows/forge.yaml Outdated Show resolved Hide resolved
contracts/MapleToken.sol Outdated Show resolved Hide resolved
contracts/MapleToken.sol Outdated Show resolved Hide resolved
tests/MapleToken.t.sol Outdated Show resolved Hide resolved
@JGcarv JGcarv requested a review from vbidin June 19, 2023 16:34
@github-actions
Copy link

LCOV of commit 7dafbe0 during Forge Tests (PR) #38

Summary coverage rate:
  lines......: 100.0% (6 of 6 lines)
  functions..: 100.0% (5 of 5 functions)
  branches...: no data found

Files changed coverage rate:
                               |Lines       |Functions  |Branches    
  Filename                     |Rate     Num|Rate    Num|Rate     Num
  ===================================================================
  contracts/MapleToken.sol     | 100%      4| 100%     4|    -      0
  contracts/MapleTokenProxy.sol| 100%      2| 100%     1|    -      0

@JGcarv JGcarv merged commit 4484b18 into main Jun 19, 2023
@JGcarv JGcarv deleted the sc-12659-feature-mplv2-setimplementation branch June 21, 2023 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vbidin vbidin vbidin approved these changes

Assignees

@JGcarv JGcarv

Labels
Priority: Medium Status: Ready for Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JGcarv @vbidin