Skip to content

Commit

Permalink
fix: update address printing logic
Browse files Browse the repository at this point in the history
  • Loading branch information
sebsadface committed Oct 12, 2024
1 parent 9b71ffc commit 4feb4c5
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 23 deletions.
6 changes: 3 additions & 3 deletions script/upgrade/UpdateDefaultStoryNFTTemplate.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ contract UpdateDefaultStoryNFTTemplate is UpgradeHelper {
LICENSE_TERMS_ID
);
IStoryNFTFactory(storyNftFactoryAddr).setDefaultStoryNftTemplate(address(newDefaultStoryNftTemplate));
console2.log("New DefaultStoryNFTTemplate: ", address(newDefaultStoryNftTemplate));
_postdeploy("DefaultStoryNftTemplate", address(newDefaultStoryNftTemplate));
_writeOtherAddresses("DefaultStoryNftTemplate");
defaultStoryNftTemplateAddr = address(newDefaultStoryNftTemplate);
console2.log("DefaultStoryNftTemplate deployed to: ", defaultStoryNftTemplateAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeDerivativeWorkflows.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ contract UpgradeDerivativeWorkflows is UpgradeHelper {
)
);
console2.log("New DerivativeWorkflows Implementation: ", newDerivativeWorkflowsImpl);
_postdeploy("DerivativeWorkflows", address(derivativeWorkflows));
_writeOtherAddresses("DerivativeWorkflows");
console2.log("DerivativeWorkflows deployed to: ", derivativeWorkflowsAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeGroupingWorkflows.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ contract UpgradeGroupingWorkflows is UpgradeHelper {
)
);
console2.log("New GroupingWorkflows Implementation: ", newGroupingWorkflowsImpl);
_postdeploy("GroupingWorkflows", address(groupingWorkflows));
_writeOtherAddresses("GroupingWorkflows");
console2.log("GroupingWorkflows deployed to: ", groupingWorkflowsAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeLicenseAttachmentWorkflows.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ contract UpgradeLicenseAttachmentWorkflows is UpgradeHelper {
)
);
console2.log("New LicenseAttachmentWorkflows Implementation: ", newLicenseAttachmentWorkflowsImpl);
_postdeploy("LicenseAttachmentWorkflows", address(licenseAttachmentWorkflows));
_writeOtherAddresses("LicenseAttachmentWorkflows");
console2.log("LicenseAttachmentWorkflows deployed to: ", licenseAttachmentWorkflowsAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeOrgNFT.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ contract UpgradeOrgNFT is UpgradeHelper {
LICENSE_TERMS_ID
);
console2.log("New OrgNFT implementation: ", address(newOrgNft));
_postdeploy("OrgNFT", orgNftAddr);
_writeOtherAddresses("OrgNFT");
console2.log("OrgNFT deployed to: ", orgNftAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeRegistrationWorkflows.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ contract UpgradeRegistrationWorkflows is UpgradeHelper {
)
);
console2.log("New RegistrationWorkflows Implementation: ", newRegistrationWorkflowsImpl);
_postdeploy("RegistrationWorkflows", address(registrationWorkflows));
_writeOtherAddresses("RegistrationWorkflows");
console2.log("RegistrationWorkflows deployed to: ", registrationWorkflowsAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeRoyaltyWorkflows.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ contract UpgradeRoyaltyWorkflows is UpgradeHelper {
_predeploy("RoyaltyWorkflows");
address newRoyaltyWorkflowsImpl = address(new RoyaltyWorkflows(royaltyModuleAddr));
console2.log("New RoyaltyWorkflows Implementation: ", newRoyaltyWorkflowsImpl);
_postdeploy("RoyaltyWorkflows", address(royaltyWorkflows));
_writeOtherAddresses("RoyaltyWorkflows");
console2.log("RoyaltyWorkflows deployed to: ", royaltyWorkflowsAddr);
_writeAllAddresses();
}
}
6 changes: 3 additions & 3 deletions script/upgrade/UpgradeSPGNFT.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ contract UpgradeSPGNFT is UpgradeHelper {
address(licenseAttachmentWorkflows),
address(registrationWorkflows)
);
console2.log("New SPGNFT Implementation: ", address(spgNftImpl));
_postdeploy("SPGNFTImpl", address(spgNftImpl));
_writeOtherAddresses("SPGNFTImpl");
spgNftImplAddr = address(spgNftImpl);
console2.log("SPGNFTImpl deployed to: ", spgNftImplAddr);
_writeAllAddresses();
}
}
4 changes: 2 additions & 2 deletions script/upgrade/UpgradeStoryNFTFactory.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ contract UpgradeStoryNFTFactory is UpgradeHelper {
orgNftAddr
);
console2.log("New StoryNFTFactory implementation: ", address(newStoryNftFactory));
_postdeploy("StoryNFTFactory", storyNftFactoryAddr);
_writeOtherAddresses("StoryNFTFactory");
console2.log("StoryNFTFactory deployed to: ", storyNftFactoryAddr);
_writeAllAddresses();
}
}
4 changes: 1 addition & 3 deletions script/utils/upgrades/UpgradeHelper.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ contract UpgradeHelper is
console2.log(string.concat(contractKey, " deployed to:"), newAddress);
}

function _writeOtherAddresses(string memory upgradedContractKey) internal {
function _writeAllAddresses() internal {
string[] memory contractKeys = new string[](10);
contractKeys[0] = "DerivativeWorkflows";
contractKeys[1] = "GroupingWorkflows";
Expand All @@ -93,8 +93,6 @@ contract UpgradeHelper is
addresses[9] = storyNftFactoryAddr;

for (uint256 i = 0; i < contractKeys.length; i++) {
if (keccak256(abi.encodePacked(contractKeys[i])) == keccak256(abi.encodePacked(upgradedContractKey)))
continue;
_writeAddress(contractKeys[i], addresses[i]);
}
}
Expand Down

0 comments on commit 4feb4c5

Please sign in to comment.