Skip to content

Fix/assessment deploy #577

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
merged 3 commits into from
Dec 15, 2022
Merged

Fix/assessment deploy #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac5c371
Update disposable assessment initialize method
mixplore Dec 14, 2022
124a7da
remove bad param
danoctavian Dec 14, 2022
944a70b
add upgrade to Assessment
danoctavian Dec 14, 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
9 changes: 6 additions & 3 deletions contracts/mocks/Disposables/DisposableAssessment.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

pragma solidity ^0.8.9;

import "../../interfaces/ITokenController.sol";
import "../../interfaces/IAssessment.sol";
import "../../abstract/MasterAwareV2.sol";

contract DisposableAssessment is MasterAwareV2 {

/* ========== STATE VARIABLES ========== */

IAssessment.Configuration public config;
Expand All @@ -23,12 +23,15 @@ contract DisposableAssessment is MasterAwareV2 {

/* ========== CONSTRUCTOR ========== */

function initialize (address masterAddress) external {
function initialize(address masterAddress, address payable _tokenControllerAddress) external {
config.minVotingPeriodInDays = 3; // days
config.payoutCooldownInDays = 1; //days
master = INXMMaster(masterAddress);

// to receive nxm
internalContracts[uint(ID.TC)] = _tokenControllerAddress;
ITokenController(_tokenControllerAddress).addToWhitelist(address(this));
}

function changeDependentContractAddress() external override {}

}
7 changes: 5 additions & 2 deletions scripts/deploy/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ async function main() {
console.log('Deploying assessment contracts');
const yt = await deployProxy('YieldTokenIncidents', [tk.address, coverNFT.address]);
const ic = await deployProxy('IndividualClaims', [tk.address, coverNFT.address]);
const assessment = await deployProxy('Assessment', [tk.address]);
const assessment = await deployProxy('DisposableAssessment', []);

console.log('Deploying SwapOperator');
const cowVaultRelayer = await deployImmutable('SOMockVaultRelayer');
Expand Down Expand Up @@ -289,10 +289,12 @@ async function main() {
...proxyContractCodes.map(() => '2'), // proxy
];

console.log('Initialazing contracts');
console.log('Initializing contracts');
await master.initialize(owner, tk.address, owner, codes, types, addresses);
await tc.initialize(master.address, tk.address, ps.address, assessment.address);

await assessment.initialize(master.address, tc.address);

await mr.initialize(
owner,
master.address,
Expand Down Expand Up @@ -385,6 +387,7 @@ async function main() {
await upgradeProxy(gw.address, 'LegacyGateway');
await upgradeProxy(ps.address, 'LegacyPooledStaking', [cover.address, productsV1.address]);
await upgradeProxy(master.address, 'NXMaster');
await upgradeProxy(assessment.address, 'Assessment', [tk.address]);

console.log('Deploying CoverViewer');
await deployImmutable('CoverViewer', [master.address]);
Expand Down