Skip to content

Remove admin and implementation getters from TransparentUpgradeableProxy #3820

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
frangio merged 15 commits into from
Nov 25, 2022
Merged

Remove admin and implementation getters from TransparentUpgradeableProxy #3820

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5bc5eab
Remove admin and implementation getters
JulissaDantes Nov 16, 2022
07920a3
create changelog entry
JulissaDantes Nov 17, 2022
0f238ea
Include PR number
JulissaDantes Nov 17, 2022
9032c18
Update test
JulissaDantes Nov 17, 2022
7b08af9
Update test
JulissaDantes Nov 17, 2022
3974b81
Update CHANGELOG.md
JulissaDantes Nov 25, 2022
1da2602
Update ProxyAdmin tests
JulissaDantes Nov 25, 2022
6f773c7
Use helper function
JulissaDantes Nov 25, 2022
55527a0
Update documentation
JulissaDantes Nov 25, 2022
69b9662
remove extra space
frangio Nov 25, 2022
a1a636b
remove extra space
frangio Nov 25, 2022
76291fe
Add helper
JulissaDantes Nov 25, 2022
ae2e0e8
Merge branch 'remove-ifAdmin' of https://github.com/JulissaDantes/ope…
JulissaDantes Nov 25, 2022
46f866a
rename variable
frangio Nov 25, 2022
c2751e7
Merge branch 'next-v5.0' into remove-ifAdmin
frangio Nov 25, 2022
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
Prev Previous commit
Next Next commit
Update ProxyAdmin tests
  • Loading branch information
@JulissaDantes
JulissaDantes committed Nov 25, 2022
commit 1da26023b8363327707a8104b1aeceaa7633d2c8
16 changes: 9 additions & 7 deletions test/proxy/transparent/ProxyAdmin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { expectRevert } = require('@openzeppelin/test-helpers');

const { expect } = require('chai');

const { network } = require('hardhat');
const ImplV1 = artifacts.require('DummyImplementation');
const ImplV2 = artifacts.require('DummyImplementationV2');
const ProxyAdmin = artifacts.require('ProxyAdmin');
Expand Down Expand Up @@ -40,8 +40,9 @@ contract('ProxyAdmin', function (accounts) {

it('changes proxy admin', async function () {
await this.proxyAdmin.changeProxyAdmin(this.proxy.address, newAdmin, { from: proxyAdminOwner });
// Allows new admin to call ifAdmin functions
await this.proxy.changeAdmin(newAdmin, { from: newAdmin });// expect to not revert

const admin = '0x'+(await network.provider.send('eth_getStorageAt', [this.proxy.address,'0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103','latest'])).substring(26);
expect(admin.toUpperCase()).to.be.eq(newAdmin.toUpperCase());
});
});

Expand All @@ -58,8 +59,9 @@ contract('ProxyAdmin', function (accounts) {
context('with authorized account', function () {
it('upgrades implementation', async function () {
await this.proxyAdmin.upgrade(this.proxy.address, this.implementationV2.address, { from: proxyAdminOwner });
const dummy = await new ImplV2(this.proxy.address);
expect(await dummy.version()).to.be.equals('V2');

const implementation = '0x'+(await network.provider.send('eth_getStorageAt', [this.proxy.address,'0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc','latest'])).substring(26);
expect(implementation.toUpperCase()).to.be.eq(this.implementationV2.address.toUpperCase());
});
});
});
Expand Down Expand Up @@ -95,8 +97,8 @@ contract('ProxyAdmin', function (accounts) {
await this.proxyAdmin.upgradeAndCall(this.proxy.address, this.implementationV2.address, callData,
{ from: proxyAdminOwner },
);
const dummy = await new ImplV2(this.proxy.address);
expect(await dummy.version()).to.be.equals('V2');
const implementation = '0x'+(await network.provider.send('eth_getStorageAt', [this.proxy.address,'0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc','latest'])).substring(26);
expect(implementation.toUpperCase()).to.be.eq(this.implementationV2.address.toUpperCase());
});
});
});
Expand Down