NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make TransparentUpgradeableProxy deploy its ProxyAdmin and optimize proxy interfaces (#4382)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Eric Lau <ericglau@outlook.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
This commit is contained in:
Ernesto García
2023-07-13 16:25:22 -06:00
committed by GitHub
parent 9cf873ea14
commit 121be5dd09
27 changed files with 521 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/helpers/erc1967.js
View File

@ -1,3 +1,5 @@
const { getStorageAt, setStorageAt } = require('@nomicfoundation/hardhat-network-helpers');
const ImplementationLabel = 'eip1967.proxy.implementation';
const AdminLabel = 'eip1967.proxy.admin';
const BeaconLabel = 'eip1967.proxy.beacon';
@ -7,15 +9,25 @@ function labelToSlot(label) {
}
function getSlot(address, slot) {
return web3.eth.getStorageAt(
return getStorageAt(
web3.utils.isAddress(address) ? address : address.address,
web3.utils.isHex(slot) ? slot : labelToSlot(slot),
);
}
function setSlot(address, slot, value) {
const hexValue = web3.utils.isHex(value) ? value : web3.utils.toHex(value);
return setStorageAt(
web3.utils.isAddress(address) ? address : address.address,
web3.utils.isHex(slot) ? slot : labelToSlot(slot),
web3.utils.padLeft(hexValue, 64),
);
}
async function getAddressInSlot(address, slot) {
const slotValue = await getSlot(address, slot);
return web3.utils.toChecksumAddress(slotValue.substr(-40));
return web3.utils.toChecksumAddress(slotValue.substring(slotValue.length - 40));
}
module.exports = {
@ -25,6 +37,7 @@ module.exports = {
ImplementationSlot: labelToSlot(ImplementationLabel),
AdminSlot: labelToSlot(AdminLabel),
BeaconSlot: labelToSlot(BeaconLabel),
setSlot,
getSlot,
getAddressInSlot,
};