Skip to content

feat[contracts]: Make ProxyEOA compatible with eip1967 #592

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

Merged
gakonst merged 4 commits into from
Apr 25, 2021
Merged

feat[contracts]: Make ProxyEOA compatible with eip1967 #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
901aa92
feat[contracts]: Make ProxyEOA compatible with eip1967
smartcontracts Apr 23, 2021
fe09da8
fix[contracts]: Fix bug introduced by indirect constant
smartcontracts Apr 23, 2021
1c27a3d
chore[contracts]: Add changeset
smartcontracts Apr 23, 2021
b8b5b48
Update .changeset/old-cycles-invite.md
gakonst Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/old-cycles-invite.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@eth-optimism/contracts": patch
---

Makes ProxyEOA compatible with EIP1967, not backwards compatible since the storage slot changes.
12 changes: 11 additions & 1 deletion packages/contracts/contracts/optimistic-ethereum/OVM/accounts/OVM_ProxyEOA.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,21 @@ import { Lib_Bytes32Utils } from "../../libraries/utils/Lib_Bytes32Utils.sol";
*/
contract OVM_ProxyEOA {
Copy link
Contributor

@gakonst gakonst Apr 25, 2021

Choose a reason for hiding this comment

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

In general I think we should be inheriting from https://github.com/OpenZeppelin/openzeppelin-contracts/tree/master/contracts/proxy/ERC1967, but not for this PR.


/**********
* Events *
**********/

event Upgraded(
address indexed implementation
);


/*************
* Constants *
*************/

address constant DEFAULT_IMPLEMENTATION = 0x4200000000000000000000000000000000000003;
bytes32 constant IMPLEMENTATION_KEY = 0xdeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddead;
bytes32 constant IMPLEMENTATION_KEY = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc; //bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1);


/*********************
Expand Down Expand Up @@ -68,6 +77,7 @@ contract OVM_ProxyEOA {
);

_setImplementation(_implementation);
emit Upgraded(_implementation);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/test/contracts/OVM/accounts/OVM_ProxyEOA.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('OVM_ProxyEOA', () => {
})
describe('upgrade()', () => {
const implSlotKey =
'0xdeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddeaddead'
'0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc' //bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
it(`should upgrade the proxy implementation`, async () => {
const newImpl = `0x${'81'.repeat(20)}`
const newImplBytes32 = addrToBytes32(newImpl)
Expand Down