Skip to content

Fix deployment of KeepRegistryStub for external projects #92

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 1 commit into from
Apr 25, 2022
Merged

Fix deployment of KeepRegistryStub for external projects #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions deploy/00_resolve_keep_registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DeployFunction } from "hardhat-deploy/types"
const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const { getNamedAccounts, deployments, helpers } = hre
const { log } = deployments
const { keepDeployer } = await getNamedAccounts()
const { deployer } = await getNamedAccounts()

const KeepRegistry = await deployments.getOrNull("KeepRegistry")

Expand All @@ -20,7 +20,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {

await deployments.deploy("KeepRegistry", {
contract: "KeepRegistryStub",
from: keepDeployer,
from: deployer,
log: true,
})
}
Expand Down
6 changes: 3 additions & 3 deletions deploy/08_configure_keep_registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import { DeployFunction } from "hardhat-deploy/types"

const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
const { getNamedAccounts, deployments } = hre
const { keepDeployer } = await getNamedAccounts()
const { keepRegistryKeeper } = await getNamedAccounts()
const { execute, log } = deployments

const TokenStaking = await deployments.get("TokenStaking")

await execute(
"KeepRegistry",
{ from: keepDeployer },
{ from: keepRegistryKeeper },
"approveOperatorContract",
TokenStaking.address
)

log(
`Approved T TokenStaking operator contract [${TokenStaking.address}] in Keep registry`
`Approved T TokenStaking operator contract [${TokenStaking.address}] in KeepRegistry`
)
}

Expand Down
4 changes: 2 additions & 2 deletions hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ const config: HardhatUserConfig = {
thresholdCouncil: {
mainnet: "0x9F6e831c8F8939DC0C830C6e492e7cEf4f9C2F5f",
},
keepDeployer: {
default: 0,
keepRegistryKeeper: {
Copy link
Member

@pdyraga pdyraga Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe keepRegistryOwner or keepRegistryGuvnor? Keeper of keep registry sounds weird but if you don't think the alternatives are any better, I can also merge as-is.

Copy link
Member Author

@nkuba nkuba Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it doesn't sound good, but I wanted to match the role that is defined in KeepRegistry that is named registryKeeper.

Copy link
Member

@pdyraga pdyraga Apr 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, makes sense!

default: 0, // same as the deployer
ropsten: "0x923C5Dbf353e99394A21Aa7B67F3327Ca111C67D",
},
},
Expand Down