Skip to content
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.

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

[REG-1434] fixed RegistrarCustody sandbox #375

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.9.40

- Fixed `RegistrarCustody` minting permissions setup in sandbox

## v0.9.39

- Deployed `[email protected]` on Amoy
Expand Down
62 changes: 31 additions & 31 deletions dist/ens-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,45 +73,45 @@
"1337": {
"contracts": {
"ENSRegistry": {
"address": "0xd70Ab4F5767a8fa0e1e261A2f51189316a7C0d86",
"deploymentBlock": "0x63",
"legacyAddresses": []
},
"BaseRegistrarImplementation": {
"address": "0x7a7d9531c7d9D270e7b12e60761546f4e432eEb3",
"deploymentBlock": "0x64",
"legacyAddresses": []
},
"ReverseRegistrar": {
"BaseRegistrarImplementation": {
"address": "0x6D264795bBa755974bBBB84Ea5E66eA893BbF606",
"deploymentBlock": "0x65",
"legacyAddresses": []
},
"NameWrapper": {
"address": "0x942518378eb0f32aAaB57B9c8176432AcCCdA331",
"deploymentBlock": "0x68",
"ReverseRegistrar": {
"address": "0x25D0359804421aDF8E28c3629f611bfD4F04F4fD",
"deploymentBlock": "0x66",
"legacyAddresses": []
},
"DummyOracle": {
"address": "0x0E2b61C5F7BCA3d8Fb1CBf5710B4157efCE36349",
"deploymentBlock": "0x6a",
"NameWrapper": {
"address": "0x862a36475c0B44C166a1479392Bd638eDf18BC9d",
"deploymentBlock": "0x69",
"legacyAddresses": []
},
"StablePriceOracle": {
"DummyOracle": {
"address": "0x437e64920801CB57C4694d30239586b5509F547f",
"deploymentBlock": "0x6b",
"legacyAddresses": []
},
"ETHRegistrarController": {
"StablePriceOracle": {
"address": "0x011a1B341147Cc649B17a2B0C5ED06DdE57734A0",
"deploymentBlock": "0x6c",
"legacyAddresses": []
},
"ETHRegistrarController": {
"address": "0xeA28Fff014B7B8BbB2106E543c38aE089212c0D1",
"deploymentBlock": "0x6d",
"legacyAddresses": []
},
"PublicResolver": {
"address": "0xae163b2898C6DD4b64531bF208886ba51A0A4b54",
"deploymentBlock": "0x75",
"address": "0x05c96e6cb7E29087FD8c42666fBcF6f6ccfa57F1",
"deploymentBlock": "0x76",
"legacyAddresses": [
"0x05c96e6cb7E29087FD8c42666fBcF6f6ccfa57F1"
"0x05ade0dd3865F9Ee2F74323b19504bd07F39329C"
]
},
"ProxyAdmin": {
Expand All @@ -120,34 +120,34 @@
"legacyAddresses": []
},
"ENSCustody": {
"address": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"deploymentBlock": "0x8c",
"implementation": "0x573F444Ba748a243da6Aa478a70d1488e1F02FEd",
"forwarder": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"address": "0x0a4b7604F265f9165708B3f3DE427F0C7d8B81Cd",
"deploymentBlock": "0x8d",
"implementation": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"forwarder": "0x0a4b7604F265f9165708B3f3DE427F0C7d8B81Cd",
"legacyAddresses": []
},
"LegacyENSRegistry": {
"address": "0xE22d997f9f86801B0405a691B28CF74285fBbC79",
"deploymentBlock": "0x78",
"address": "0x6EACD6613004f5B029fe62DC800CB22172be286A",
"deploymentBlock": "0x79",
"legacyAddresses": []
},
"LegacyETHRegistrarController": {
"address": "0xeA28Fff014B7B8BbB2106E543c38aE089212c0D1",
"deploymentBlock": "0x6d",
"address": "0xFC047CFaAb3b3a81D629f5192202756b3103987F",
"deploymentBlock": "0x6e",
"legacyAddresses": []
},
"DNSSECImpl": {
"address": "0x56e87da626B8D91d93f512064400470C7Eb6f24f",
"deploymentBlock": "0x7f"
"address": "0x0F5cF62AD1c3D5d524d9Ed283abe9554aAE181FC",
"deploymentBlock": "0x80"
},
"DNSRegistrar": {
"address": "0x97e711b69fa03aA2859153FCA5656F213A7b51c3",
"deploymentBlock": "0x86"
},
"Root": {
"address": "0x57b1b0EABC6d5004a227A707625BdCD2257Acd63",
"deploymentBlock": "0x87"
},
"Root": {
"address": "0x8983E25f3c75058eCa30Ae81645611fE6C439936",
"deploymentBlock": "0x88"
},
"LegacyPublicResolver": {
"address": "0x4fbf7B2f171336958BE5D15FF762a5CfF5363568",
"deploymentBlock": "0x3b"
Expand Down
2 changes: 1 addition & 1 deletion dist/sandbox/state.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions dist/uns-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,16 @@
"deploymentBlock": "0x0f"
},
"DotCoinBurner": {
"address": "0x399Da84d05f49e44338fe949D0eC54dACf7cb7F2",
"address": "0xd70Ab4F5767a8fa0e1e261A2f51189316a7C0d86",
"legacyAddresses": [],
"deploymentBlock": "0x62"
"deploymentBlock": "0x63"
},
"ZilliqaRecover": {
"address": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9",
"deploymentBlock": "0x32",
"implementation": "0x4Eb9dE1Fc0d800e941F326d6699E9E11969557ea",
"address": "0xc965345EDaC823D56812cD20A10316233916a605",
"deploymentBlock": "0x33",
"implementation": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9",
"legacyAddresses": [],
"forwarder": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9"
"forwarder": "0xc965345EDaC823D56812cD20A10316233916a605"
},
"Seaport": {
"address": "0x5CC819C9915eADfcEBd76952B8C1BC36CADd7376",
Expand Down
62 changes: 31 additions & 31 deletions ens-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,45 +73,45 @@
"1337": {
"contracts": {
"ENSRegistry": {
"address": "0xd70Ab4F5767a8fa0e1e261A2f51189316a7C0d86",
"deploymentBlock": "0x63",
"legacyAddresses": []
},
"BaseRegistrarImplementation": {
"address": "0x7a7d9531c7d9D270e7b12e60761546f4e432eEb3",
"deploymentBlock": "0x64",
"legacyAddresses": []
},
"ReverseRegistrar": {
"BaseRegistrarImplementation": {
"address": "0x6D264795bBa755974bBBB84Ea5E66eA893BbF606",
"deploymentBlock": "0x65",
"legacyAddresses": []
},
"NameWrapper": {
"address": "0x942518378eb0f32aAaB57B9c8176432AcCCdA331",
"deploymentBlock": "0x68",
"ReverseRegistrar": {
"address": "0x25D0359804421aDF8E28c3629f611bfD4F04F4fD",
"deploymentBlock": "0x66",
"legacyAddresses": []
},
"DummyOracle": {
"address": "0x0E2b61C5F7BCA3d8Fb1CBf5710B4157efCE36349",
"deploymentBlock": "0x6a",
"NameWrapper": {
"address": "0x862a36475c0B44C166a1479392Bd638eDf18BC9d",
"deploymentBlock": "0x69",
"legacyAddresses": []
},
"StablePriceOracle": {
"DummyOracle": {
"address": "0x437e64920801CB57C4694d30239586b5509F547f",
"deploymentBlock": "0x6b",
"legacyAddresses": []
},
"ETHRegistrarController": {
"StablePriceOracle": {
"address": "0x011a1B341147Cc649B17a2B0C5ED06DdE57734A0",
"deploymentBlock": "0x6c",
"legacyAddresses": []
},
"ETHRegistrarController": {
"address": "0xeA28Fff014B7B8BbB2106E543c38aE089212c0D1",
"deploymentBlock": "0x6d",
"legacyAddresses": []
},
"PublicResolver": {
"address": "0xae163b2898C6DD4b64531bF208886ba51A0A4b54",
"deploymentBlock": "0x75",
"address": "0x05c96e6cb7E29087FD8c42666fBcF6f6ccfa57F1",
"deploymentBlock": "0x76",
"legacyAddresses": [
"0x05c96e6cb7E29087FD8c42666fBcF6f6ccfa57F1"
"0x05ade0dd3865F9Ee2F74323b19504bd07F39329C"
]
},
"ProxyAdmin": {
Expand All @@ -120,34 +120,34 @@
"legacyAddresses": []
},
"ENSCustody": {
"address": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"deploymentBlock": "0x8c",
"implementation": "0x573F444Ba748a243da6Aa478a70d1488e1F02FEd",
"forwarder": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"address": "0x0a4b7604F265f9165708B3f3DE427F0C7d8B81Cd",
"deploymentBlock": "0x8d",
"implementation": "0xbb510a1AeF199Ab2B02e056bc1c2e1d7C986a5be",
"forwarder": "0x0a4b7604F265f9165708B3f3DE427F0C7d8B81Cd",
"legacyAddresses": []
},
"LegacyENSRegistry": {
"address": "0xE22d997f9f86801B0405a691B28CF74285fBbC79",
"deploymentBlock": "0x78",
"address": "0x6EACD6613004f5B029fe62DC800CB22172be286A",
"deploymentBlock": "0x79",
"legacyAddresses": []
},
"LegacyETHRegistrarController": {
"address": "0xeA28Fff014B7B8BbB2106E543c38aE089212c0D1",
"deploymentBlock": "0x6d",
"address": "0xFC047CFaAb3b3a81D629f5192202756b3103987F",
"deploymentBlock": "0x6e",
"legacyAddresses": []
},
"DNSSECImpl": {
"address": "0x56e87da626B8D91d93f512064400470C7Eb6f24f",
"deploymentBlock": "0x7f"
"address": "0x0F5cF62AD1c3D5d524d9Ed283abe9554aAE181FC",
"deploymentBlock": "0x80"
},
"DNSRegistrar": {
"address": "0x97e711b69fa03aA2859153FCA5656F213A7b51c3",
"deploymentBlock": "0x86"
},
"Root": {
"address": "0x57b1b0EABC6d5004a227A707625BdCD2257Acd63",
"deploymentBlock": "0x87"
},
"Root": {
"address": "0x8983E25f3c75058eCa30Ae81645611fE6C439936",
"deploymentBlock": "0x88"
},
"LegacyPublicResolver": {
"address": "0x4fbf7B2f171336958BE5D15FF762a5CfF5363568",
"deploymentBlock": "0x3b"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uns",
"version": "0.9.39",
"version": "0.9.40",
"description": "UNS contracts and tools",
"repository": "https://github.com/unstoppabledomains/uns.git",
"main": "./dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion sandbox/state.json

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -561,14 +561,14 @@
const mintUnsTldsTask: Task = {
tags: ['min_uns_tlds', 'uns', 'full'],
priority: 110,
run: async (ctx: Deployer, dependencies: DependenciesMap, params?: Record<string, string>) => {

Check warning on line 564 in src/tasks.ts

View workflow job for this annotation

GitHub Actions / lint

'dependencies' is defined but never used

Check warning on line 564 in src/tasks.ts

View workflow job for this annotation

GitHub Actions / lint

'params' is defined but never used
const { owner } = ctx.accounts;
if (!isSandbox) {
throw new Error('This task is only available for sandbox');
}

const mintingManagerAddr =
ctx.getNetworkConfig().networks[network.config.chainId!].contracts[UnsContractName.MintingManager].address;

Check warning on line 571 in src/tasks.ts

View workflow job for this annotation

GitHub Actions / lint

Forbidden non-null assertion

const mintingManager = await ethers.getContractAt(ArtifactName.MintingManager, mintingManagerAddr, owner);
await mintUnsTlds(mintingManager, owner);
Expand Down Expand Up @@ -1296,6 +1296,11 @@
ctx.log(`Added ${array.length} minters`);
}
}

const mintingManager = await ethers.getContractAt(ArtifactName.MintingManager, MintingManager.address, owner);
const addMintingRightTx = await mintingManager.addMinters([await registrarCustody.getAddress()]);
await addMintingRightTx.wait();

const proxyAdmin = await upgrades.admin.getInstance();
const registrarCustodyImpl = await proxyAdmin.getProxyImplementation.staticCall(
await registrarCustody.getAddress(),
Expand Down
12 changes: 6 additions & 6 deletions uns-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -388,16 +388,16 @@
"deploymentBlock": "0x0f"
},
"DotCoinBurner": {
"address": "0x399Da84d05f49e44338fe949D0eC54dACf7cb7F2",
"address": "0xd70Ab4F5767a8fa0e1e261A2f51189316a7C0d86",
"legacyAddresses": [],
"deploymentBlock": "0x62"
"deploymentBlock": "0x63"
},
"ZilliqaRecover": {
"address": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9",
"deploymentBlock": "0x32",
"implementation": "0x4Eb9dE1Fc0d800e941F326d6699E9E11969557ea",
"address": "0xc965345EDaC823D56812cD20A10316233916a605",
"deploymentBlock": "0x33",
"implementation": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9",
"legacyAddresses": [],
"forwarder": "0x3F1194B9019002863Ad0DBBE295294547c0d36A9"
"forwarder": "0xc965345EDaC823D56812cD20A10316233916a605"
},
"Seaport": {
"address": "0x5CC819C9915eADfcEBd76952B8C1BC36CADd7376",
Expand Down
Loading