kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

Add reinitializer for upgrades to Contributor
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
Release Drafter / Update release notes draft (pull_request) Successful in 4s
Details

Browse Source 
In order to be able to re-initialize the upgraded contract with the
profile manager address, we need a new re-initializer function that is
automatically allowed to only be executed once per contract
implementation version.

Co-authored-by: Michael Bumann <hello@michaelbumann.com>
This commit is contained in:
Râu Cao 2023-04-27 11:11:30 +02:00
parent f10af14fae
commit d63f7ca743
Signed by: raucao
GPG Key ID: 15E65F399D084BA9
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Contributor.sol
View File

@ -50,6 +50,10 @@ contract Contributor is Initializable {
profileManager = profileManagerAddress; profileManager = profileManagerAddress;
} }
function reinitialize(address profileManagerAddress) public reinitializer(2) {
profileManager = profileManagerAddress;
}
function setContributionContract(address contribution) public onlyCore { function setContributionContract(address contribution) public onlyCore {
require(address(contributionContract) == address(0) || addressIsCore(msg.sender), "Core only"); require(address(contributionContract) == address(0) || addressIsCore(msg.sender), "Core only");
contributionContract = IContributionBalance(contribution); contributionContract = IContributionBalance(contribution);

14
package-lock.json generated
View File

@ -20,7 +20,7 @@
"@nomicfoundation/hardhat-chai-matchers": "^1.0.3", "@nomicfoundation/hardhat-chai-matchers": "^1.0.3",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@openzeppelin/contracts-upgradeable": "^4.3.2", "@openzeppelin/contracts-upgradeable": "^4.8.3",
"@openzeppelin/hardhat-upgrades": "^1.10.0", "@openzeppelin/hardhat-upgrades": "^1.10.0",
"async-each-series": "^1.1.0", "async-each-series": "^1.1.0",
"chai": "^4.3.6", "chai": "^4.3.6",
@ -1225,9 +1225,9 @@
} }
}, },
"node_modules/@openzeppelin/contracts-upgradeable": { "node_modules/@openzeppelin/contracts-upgradeable": {
"version": "4.5.2", "version": "4.8.3",
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.2.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz",
"integrity": "sha512-xgWZYaPlrEOQo3cBj97Ufiuv79SPd8Brh4GcFYhPgb6WvAq4ppz8dWKL6h+jLAK01rUqMRp/TS9AdXgAeNvCLA==", "integrity": "sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg==",
"dev": true "dev": true
}, },
"node_modules/@openzeppelin/hardhat-upgrades": { "node_modules/@openzeppelin/hardhat-upgrades": {
@ -20951,9 +20951,9 @@
} }
}, },
"@openzeppelin/contracts-upgradeable": { "@openzeppelin/contracts-upgradeable": {
"version": "4.5.2", "version": "4.8.3",
"resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.2.tgz", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.8.3.tgz",
"integrity": "sha512-xgWZYaPlrEOQo3cBj97Ufiuv79SPd8Brh4GcFYhPgb6WvAq4ppz8dWKL6h+jLAK01rUqMRp/TS9AdXgAeNvCLA==", "integrity": "sha512-SXDRl7HKpl2WDoJpn7CK/M9U4Z8gNXDHHChAKh0Iz+Wew3wu6CmFYBeie3je8V0GSXZAIYYwUktSrnW/kwVPtg==",
"dev": true "dev": true
}, },
"@openzeppelin/hardhat-upgrades": { "@openzeppelin/hardhat-upgrades": {

2
package.json
View File

@ -42,7 +42,7 @@
"@nomicfoundation/hardhat-chai-matchers": "^1.0.3", "@nomicfoundation/hardhat-chai-matchers": "^1.0.3",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@openzeppelin/contracts-upgradeable": "^4.3.2", "@openzeppelin/contracts-upgradeable": "^4.8.3",
"@openzeppelin/hardhat-upgrades": "^1.10.0", "@openzeppelin/hardhat-upgrades": "^1.10.0",
"async-each-series": "^1.1.0", "async-each-series": "^1.1.0",
"chai": "^4.3.6", "chai": "^4.3.6",

14
scripts/upgrade-example.js
View File

@ -7,7 +7,17 @@ async function main() {
await kredits.init(); await kredits.init();
const ContributorV2 = await ethers.getContractFactory("Contributor"); const ContributorV2 = await ethers.getContractFactory("Contributor");
const contributor = await upgrades.upgradeProxy(kredits.Contributor.address, ContributorV2); const contributor = await upgrades.upgradeProxy(
kredits.Contributor.address,
ContributorV2,
{
call: {
fn: "reinitialize",
args: [
"0xc80d2513277FA04B10403E2D1d7dAa86F931f4d1"
]
}
});
console.log("Contributor upgraded"); console.log("Contributor upgraded");
console.log(`Contributor address: ${contributor.address}`); console.log(`Contributor address: ${contributor.address}`);
@ -16,4 +26,4 @@ async function main() {
console.log("DONE!"); console.log("DONE!");
} }
main(); main()