Skip to content

Commit 3295d24

Browse files
authored
Remove DedicatedResolver (#9)
* removed DedicatedResolver * changed deployDedicatedResolver() to deployOwnedResolver() * uninstalled @namestone/ezccip * fixed devnet
1 parent 1394935 commit 3295d24

24 files changed

+171
-1515
lines changed

.gitmodules

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
[submodule "contracts/lib/openzeppelin-contracts"]
1414
path = contracts/lib/openzeppelin-contracts
1515
url = https://github.com/openzeppelin/openzeppelin-contracts
16-
[submodule "contracts/lib/ens-contracts"]
17-
path = contracts/lib/ens-contracts
18-
url = https://github.com/ensdomains/ens-contracts
19-
[submodule "contracts/lib/unruggable-gateways"]
20-
path = contracts/lib/unruggable-gateways
21-
url = https://github.com/unruggable-labs/unruggable-gateways
2216
[submodule "contracts/lib/openzeppelin-contracts-v4"]
2317
path = contracts/lib/openzeppelin-contracts-v4
2418
url = https://github.com/OpenZeppelin/openzeppelin-contracts
2519
[submodule "contracts/lib/solsha1"]
2620
path = contracts/lib/solsha1
2721
url = https://github.com/ensdomains/solsha1
22+
[submodule "contracts/lib/ens-contracts"]
23+
path = contracts/lib/ens-contracts
24+
url = https://github.com/ensdomains/ens-contracts
25+
[submodule "contracts/lib/unruggable-gateways"]
26+
path = contracts/lib/unruggable-gateways
27+
url = https://github.com/unruggable-labs/unruggable-gateways

bun.lock

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export default execute(
1010
});
1111
},
1212
{
13-
tags: ["HCAFactory", "shared"],
13+
tags: ["HCAFactory", "l1"],
1414
},
1515
);

contracts/deploy/shared/00_RegistryDatastore.ts renamed to contracts/deploy/00_RegistryDatastore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ export default execute(
88
args: [],
99
});
1010
},
11-
{ tags: ["RegistryDatastore", "shared"] },
11+
{ tags: ["RegistryDatastore", "l1"] },
1212
);

contracts/deploy/shared/00_VerifiableFactory.ts renamed to contracts/deploy/00_VerifiableFactory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export default execute(
88
});
99
},
1010
{
11-
tags: ["VerifiableFactory", "shared"],
11+
tags: ["VerifiableFactory", "l1"],
1212
},
1313
);

contracts/deploy/shared/01_DedicatedResolver.ts renamed to contracts/deploy/01_OwnedResolver.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ export default execute(
55
const hcaFactory =
66
get<(typeof artifacts.MockHCAFactoryBasic)["abi"]>("HCAFactory");
77

8-
await deploy("DedicatedResolver", {
8+
await deploy("OwnedResolverV2", {
99
account: deployer,
10-
artifact: artifacts.DedicatedResolver,
10+
artifact: artifacts["src/resolver/OwnedResolver.sol/OwnedResolver"],
1111
args: [hcaFactory.address],
1212
});
1313
},
1414
{
15-
tags: ["DedicatedResolver", "shared"],
15+
tags: ["OwnedResolverV2", "l1"],
1616
dependencies: ["HCAFactory"],
1717
},
1818
);

contracts/deploy/shared/01_RegistryMetadata.ts renamed to contracts/deploy/01_RegistryMetadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ export default execute(
1111
args: [hcaFactory.address],
1212
});
1313
},
14-
{ tags: ["RegistryMetadata", "HCAFactory", "shared"] },
14+
{ tags: ["RegistryMetadata", "l1"], dependencies: ["HCAFactory"] },
1515
);

contracts/deploy/shared/01_UserRegistry.ts renamed to contracts/deploy/01_UserRegistry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default execute(
2323
});
2424
},
2525
{
26-
tags: ["UserRegistry", "shared"],
26+
tags: ["UserRegistry", "l1"],
2727
dependencies: ["RegistryDatastore", "HCAFactory", "RegistryMetadata"],
2828
},
2929
);

contracts/foundry.lock

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,30 @@
11
{
2+
"contracts/lib/buffer": {
3+
"rev": "82cc81935de1d1a82e021cf1030d902c5248982b"
4+
},
5+
"contracts/lib/forge-std": {
6+
"rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
7+
},
8+
"contracts/lib/openzeppelin-contracts": {
9+
"rev": "e4f70216d759d8e6a64144a9e1f7bbeed78e7079"
10+
},
11+
"contracts/lib/openzeppelin-contracts-upgradeable": {
12+
"rev": "5fc3fee14043035097ae718387200f4f4daaa982"
13+
},
14+
"contracts/lib/openzeppelin-contracts-v4": {
15+
"rev": "54b3f14346da01ba0d159114b399197fea8b7cda"
16+
},
17+
"contracts/lib/solsha1": {
18+
"rev": "c4fbe97cf5e8c1b8d607001588fd23abb5bfb923"
19+
},
20+
"contracts/lib/verifiable-factory": {
21+
"rev": "c47c0e61ce03b3ab5891a3b743287b54aee9f021"
22+
},
223
"lib/buffer": {
324
"rev": "82cc81935de1d1a82e021cf1030d902c5248982b"
425
},
526
"lib/ens-contracts": {
6-
"rev": "a392133a641f7a88dd8d08616e1113e1b6d0416a"
27+
"rev": "6d877523e11f647ed62e8ee159f48f288c9cd9e9"
728
},
829
"lib/forge-std": {
930
"rev": "77041d2ce690e692d6e03cc812b57d1ddaa4d505"
@@ -20,15 +41,12 @@
2041
"lib/solsha1": {
2142
"rev": "c4fbe97cf5e8c1b8d607001588fd23abb5bfb923"
2243
},
23-
"lib/surge-taiko-mono": {
44+
"lib/unruggable-gateways": {
2445
"tag": {
25-
"name": "v25.1.1",
26-
"rev": "e9c2ae6658ab69afe16f09d2ddca158046b47962"
46+
"name": "v1.3.5",
47+
"rev": "7426ac57509e2023a673956439eed29998d2e371"
2748
}
2849
},
29-
"lib/unruggable-gateways": {
30-
"rev": "3d68742832c68bf9a158c7bcd1aa47fad511b213"
31-
},
3250
"lib/verifiable-factory": {
3351
"rev": "c47c0e61ce03b3ab5891a3b743287b54aee9f021"
3452
}

contracts/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "contracts",
33
"dependencies": {
44
"@ensdomains/hardhat-chai-matchers-viem": "^0.1.14",
5-
"@namestone/ezccip": "^0.1.0",
65
"@nomicfoundation/hardhat-network-helpers": "3.0.0",
76
"@nomicfoundation/hardhat-viem": "3.0.0",
87
"@rocketh/deploy": "0.14.0",

0 commit comments

Comments
 (0)