fix: fix remapping

foundry.toml

@@ -1,13 +1,13 @@
 [profile.default]
 src = "src"
 out = "out"
-libs = ["lib"]
 ffi = true
+
+solc_version = "0.8.19"
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
 
-solc = '0.8.21'
 extra_output = ["devdoc", "userdoc", "storagelayout"]
-evm_version = 'istanbul'
+evm_version = 'london'
 use_literal_content = true
 fs_permissions = [{ access = "read-write", path = "./" }]
 
@@ -30,6 +30,27 @@ runs = 256
 runs = 256
 
 [dependencies]
-"@fdk" = { version = "0.3.0-beta", url = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.0-beta.zip" }
-"@pythnetwork-pyth-sdk-solidity" = { version = "2.2.0" }
-"@openzeppelin-contracts" = { version = "4.9.3" }
+fdk = { version = "0.3.1-beta", url = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.1-beta.zip" }
+openzeppelin = { version = "4.9.3", url = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v4.9.3.zip" }
+pyth-sdk-solidity = { version = "2.2.0", url = "https://github.com/pyth-network/pyth-sdk-solidity/archive/refs/tags/v2.2.0.zip" }
+
+
+[soldeer]
+# whether soldeer manages remappings
+remappings_generate = false
+
+# whether soldeer re-generates all remappings when installing, updating or uninstalling deps
+remappings_regenerate = false
+
+# whether to suffix the remapping with the version: `name-a.b.c`
+remappings_version = true
+
+# a prefix to add to the remappings ("@" would give `@name`)
+remappings_prefix = "@"
+
+# where to store the remappings ("txt" for `remappings.txt` or "config" for `foundry.toml`)
+# ignored when `soldeer.toml` is used as config (uses `remappings.txt`)
+remappings_location = "txt"
+
+# whether to install sub-dependencies or not. If true this wil install the dependencies of dependencies 1 level down.
+recursive_deps = true

remappings.txt

@@ -1,10 +1,7 @@
-@rns-contracts/=src/
-ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=dependencies/@fdk-0.3.0-beta/dependencies/forge-std-1.8.2/src/
-@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-4.9.3/
-contract-template/=lib/contract-template/src/
-@solady/=dependencies/@fdk-0.3.0-beta/dependencies/solady-0.0.206/src/
-@ensdomains/ens-contracts/=lib/ens-contracts/contracts/
-@ensdomains/buffer/=lib/buffer/
-@pythnetwork/=dependencies/@pythnetwork-pyth-sdk-solidity-2.2.0/
-@fdk/=dependencies/@fdk-0.3.0-beta/script
+forge-std/=dependencies/fdk-0.3.1-beta/dependencies/@forge-std-1.9.1/src/
+@openzeppelin/=dependencies/fdk-0.3.1-beta/dependencies/@openzeppelin-4.9.3/
+@solady/=dependencies/fdk-0.3.1-beta/dependencies/@solady-0.0.228/src/
+@ens-contracts/=lib/ens-contracts/contracts/
+@buffer/=lib/buffer/
+@pythnetwork/=dependencies/pyth-sdk-solidity-2.2.0/
+@fdk/=dependencies/fdk-0.3.1-beta/script

run.sh

@@ -1 +1 @@
-source dependencies/@fdk-0.3.0-beta/run.sh
+source dependencies/fdk-0.3.1-beta/run.sh

script/20231015-deploy/20231015_Deploy.s.sol

@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { StdStyle } from "forge-std/StdStyle.sol";
 import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
 import { Contract } from "script/utils/Contract.sol";
 import {
   RONRegistrarController, RONRegistrarControllerDeploy

script/20231024-upgrade-domain-price/20231024_UpgradeDomainPrice.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { console } from "forge-std/console.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
+import { RNSDomainPrice } from "src/RNSDomainPrice.sol";
 import { ISharedArgument, Config__20231024 } from "./20231024_Config.s.sol";
 
 contract Migration__20231024_UpgradeDomainPrice is Config__20231024 {

script/20231106-config-prelaunch/20231106_RevertRenewalFees.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { Contract } from "script/utils/Contract.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
-import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
+import { RNSDomainPrice } from "src/RNSDomainPrice.sol";
 
 contract Migration__20231106_RevertRenewalFees is Migration {
   function run() public {

script/20231106-config-prelaunch/20231106_SubmitReservedNames.s.sol

@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { JSONParserLib } from "@solady/utils/JSONParserLib.sol";
 import { Migration } from "script/Migration.s.sol";
-import { LibRNSDomain, RNSUnified } from "@rns-contracts/RNSUnified.sol";
+import { LibRNSDomain, RNSUnified } from "src/RNSUnified.sol";
 import { OwnedMulticaller, OwnedMulticallerDeploy } from "script/contracts/OwnedMulticallerDeploy.s.sol";
 
 contract Migration__20231106_SubmitReservedNames is Migration {

script/20231106-config-prelaunch/20231106_TransferOwnership.s.sol

@@ -4,10 +4,10 @@ pragma solidity ^0.8.19;
 import { Contract } from "script/utils/Contract.sol";
 import { console } from "forge-std/console.sol";
 import { Migration } from "script/Migration.s.sol";
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
 import { OwnedMulticallerDeploy } from "script/contracts/OwnedMulticallerDeploy.s.sol";
-import { OwnedMulticaller } from "@rns-contracts/utils/OwnedMulticaller.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
+import { OwnedMulticaller } from "src/utils/OwnedMulticaller.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
 
 contract Migration__20231106_TransferOwnership is Migration {
   function _injectDependencies() internal virtual override {

script/20231106-deploy-mainnet/20231106_Deploy.s.sol

@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { StdStyle } from "forge-std/StdStyle.sol";
 import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
 import { Contract } from "script/utils/Contract.sol";
 import {
   RONRegistrarController, RONRegistrarControllerDeploy

script/20231114-deploy-name-checker-logic/20231114_DeployNameCheckerLogic.s.sol

@@ -7,7 +7,7 @@ import {
   TransparentUpgradeableProxy
 } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import { LibProxy } from "@fdk/libraries/LibProxy.sol";
-import { NameChecker } from "@rns-contracts/NameChecker.sol";
+import { NameChecker } from "src/NameChecker.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";
 

script/20231115-migrate-invalid-auction-names/2021115_MigrateInvalidAuctionNames.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import { console } from "forge-std/console.sol";
-import { INSAuction, EventRange, RNSAuction } from "@rns-contracts/RNSAuction.sol";
+import { INSAuction, EventRange, RNSAuction } from "src/RNSAuction.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";
 

script/20231123-upgrade-auction-claim-unbidded-names/20231123_UpgradeAuctionClaimUnbiddedNames.s.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.19;
 import { console } from "forge-std/console.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
-import { INSAuction, RNSAuction } from "@rns-contracts/RNSAuction.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
+import { INSAuction, RNSAuction } from "src/RNSAuction.sol";
 
 contract Migration__20231123_UpgradeAuctionClaimeUnbiddedNames is Migration {
   function run() public {

script/20231124-deploy-rns-operation/20231124_DeployRNSOperation.s.sol

@@ -5,10 +5,10 @@ import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { console } from "forge-std/console.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
-import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
-import { INSAuction, RNSAuction } from "@rns-contracts/RNSAuction.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
+import { RNSDomainPrice } from "src/RNSDomainPrice.sol";
+import { INSAuction, RNSAuction } from "src/RNSAuction.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
 import { RNSOperation, RNSOperationDeploy } from "script/contracts/RNSOperationDeploy.s.sol";
 
 contract Migration__20231124_DeployRNSOperation is Migration {

script/20240215-separate-tier-and-domain-price/01_UpgradeRNSDomainPrice_OverrideTierForCommunityNames.s.sol

@@ -7,7 +7,7 @@ import { LibString } from "@solady/utils/LibString.sol";
 import { DefaultNetwork } from "@fdk/utils/DefaultNetwork.sol";
 import { DefaultContract } from "@fdk/utils/DefaultContract.sol";
 import { Contract } from "../utils/Contract.sol";
-import { INSDomainPrice, RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
+import { INSDomainPrice, RNSDomainPrice } from "src/RNSDomainPrice.sol";
 import "./20240215_Migration.s.sol";
 
 contract Migration__01_UpgradeRNSDomainPriceAndOverrideTierForCommunityNames_RNSDomainPrice is Migration__20240215 {

script/20240215-separate-tier-and-domain-price/02_ResetCommunityNameRenewalFees_RNSDomainPrice.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { INSDomainPrice, RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
+import { INSDomainPrice, RNSDomainPrice } from "src/RNSDomainPrice.sol";
 import { Contract } from "../utils/Contract.sol";
 import "./20240215_Migration.s.sol";
 

script/20240215-separate-tier-and-domain-price/03_DeployNewRNSOperation_RNSOperation.s.sol

@@ -6,10 +6,10 @@ import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
 import { console } from "forge-std/console.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { Migration } from "script/Migration.s.sol";
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
-import { INSDomainPrice, RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
-import { INSAuction, RNSAuction } from "@rns-contracts/RNSAuction.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
+import { INSDomainPrice, RNSDomainPrice } from "src/RNSDomainPrice.sol";
+import { INSAuction, RNSAuction } from "src/RNSAuction.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
 import { RNSOperation, RNSOperationDeploy } from "script/contracts/RNSOperationDeploy.s.sol";
 
 contract Migration_03_DeployNewRNSOperation_RNSOperation is Migration {

script/20240215-separate-tier-and-domain-price/20240215_Migration.s.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.19;
 import { console } from "forge-std/console.sol";
 import { JSONParserLib } from "@solady/utils/JSONParserLib.sol";
 import { Migration, ISharedArgument } from "../Migration.s.sol";
-import { LibRNSDomain } from "@rns-contracts/libraries/LibRNSDomain.sol";
-import { INSDomainPrice } from "@rns-contracts/interfaces/INSDomainPrice.sol";
+import { LibRNSDomain } from "src/libraries/LibRNSDomain.sol";
+import { INSDomainPrice } from "src/interfaces/INSDomainPrice.sol";
 
 contract Migration__20240215 is Migration {
   using JSONParserLib for *;

script/20240516-revoke-roles/02_GrantAdminRoleForMultisig_Mainnet.s.sol

@@ -109,6 +109,18 @@ contract Migration__02_GrantAdminRoleForMultisig_Mainnet is Migration {
     // Remove another admin roles: https://sky-mavis.slack.com/archives/C06C3HW1HS7/p1712812933009569
     AccessControlEnumerable(address(_domainPrice)).revokeRole(0x0, 0xAdc6a8fEB5C53303323A1D0280c0a0d5F2e1a14D);
 
+    // Remove operator role for RNS Unified
+    AccessControlEnumerable(address(_rns)).revokeRole(_rns.PAUSER_ROLE(), duke);
+    AccessControlEnumerable(address(_rns)).revokeRole(_rns.PROTECTED_SETTLER_ROLE(), duke);
+
+    // Remove operator role for RNS Auction
+    AccessControlEnumerable(address(_auction)).revokeRole(_auction.OPERATOR_ROLE(), duke);
+    // Remove operator role for RNS Domain Price
+    AccessControlEnumerable(address(_domainPrice)).revokeRole(_domainPrice.OVERRIDER_ROLE(), duke);
+    // Remove operator role for RNS Registrar Controller
+    AccessControlEnumerable(address(_ronController)).revokeRole(_ronController.OPERATOR_ROLE(), duke);
+    AccessControlEnumerable(address(_ronController)).revokeRole(_ronController.PAUSER_ROLE(), duke);
+
     // Duke will do this manually
     // Ownable(loadContract(Contract.RNSReverseRegistrar.key())).transferOwnership(multisig);
     console.log(

script/contracts/NameCheckerDeploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { NameChecker } from "@rns-contracts/NameChecker.sol";
+import { NameChecker } from "src/NameChecker.sol";
 
 contract NameCheckerDeploy is Migration {
   function _defaultArguments() internal virtual override returns (bytes memory args) {

script/contracts/OwnedMulticallerDeploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { OwnedMulticaller } from "@rns-contracts/utils/OwnedMulticaller.sol";
+import { OwnedMulticaller } from "src/utils/OwnedMulticaller.sol";
 
 contract OwnedMulticallerDeploy is Migration {
   function _defaultArguments() internal virtual override returns (bytes memory args) {

script/contracts/PublicResolverDeploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { Migration, ISharedArgument } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { PublicResolver } from "@rns-contracts/resolvers/PublicResolver.sol";
+import { PublicResolver } from "src/resolvers/PublicResolver.sol";
 import { RNSUnified, RNSUnifiedDeploy } from "./RNSUnifiedDeploy.s.sol";
 import { RNSReverseRegistrar, RNSReverseRegistrarDeploy } from "./RNSReverseRegistrarDeploy.s.sol";
 

script/contracts/RNSAuctionDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RNSAuction } from "@rns-contracts/RNSAuction.sol";
+import { RNSAuction } from "src/RNSAuction.sol";
 import { RNSUnified, RNSUnifiedDeploy } from "./RNSUnifiedDeploy.s.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";

script/contracts/RNSCommissionDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RNSCommission } from "@rns-contracts/RNSCommission.sol";
+import { RNSCommission } from "src/RNSCommission.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
 import { RONRegistrarController, RONRegistrarControllerDeploy } from "./RONRegistrarControllerDeploy.s.sol";

script/contracts/RNSDomainPriceDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
+import { RNSDomainPrice } from "src/RNSDomainPrice.sol";
 import { RNSAuction, RNSAuctionDeploy } from "./RNSAuctionDeploy.s.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";

script/contracts/RNSOperationDeploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import { Migration, ISharedArgument } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
-import { RNSOperation } from "@rns-contracts/utils/RNSOperation.sol";
+import { RNSOperation } from "src/utils/RNSOperation.sol";
 
 contract RNSOperationDeploy is Migration {
   function _defaultArguments() internal virtual override returns (bytes memory args) {

script/contracts/RNSReverseRegistrarDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RNSReverseRegistrar } from "@rns-contracts/RNSReverseRegistrar.sol";
+import { RNSReverseRegistrar } from "src/RNSReverseRegistrar.sol";
 import { RNSUnified, RNSUnifiedDeploy } from "./RNSUnifiedDeploy.s.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";

script/contracts/RNSUnifiedDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
 import { ISharedArgument, Migration } from "script/Migration.s.sol";
 import { Contract } from "script/utils/Contract.sol";
 

script/contracts/RONRegistrarControllerDeploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import { RONRegistrarController } from "@rns-contracts/RONRegistrarController.sol";
+import { RONRegistrarController } from "src/RONRegistrarController.sol";
 import { RNSUnified, RNSUnifiedDeploy } from "./RNSUnifiedDeploy.s.sol";
 import { NameChecker, NameCheckerDeploy } from "./NameCheckerDeploy.s.sol";
 import { RNSDomainPrice, RNSDomainPriceDeploy } from "./RNSDomainPriceDeploy.s.sol";

script/interfaces/ISharedArgument.sol

@@ -2,16 +2,16 @@
 pragma solidity ^0.8.19;
 
 import { IGeneralConfig } from "@fdk/interfaces/IGeneralConfig.sol";
-import { IPyth, INSDomainPrice, PeriodScaler } from "@rns-contracts/RNSDomainPrice.sol";
-import { NameChecker } from "@rns-contracts/NameChecker.sol";
-import { PublicResolver } from "@rns-contracts/resolvers/PublicResolver.sol";
-import { RNSAuction } from "@rns-contracts/RNSAuction.sol";
-import { RNSReverseRegistrar } from "@rns-contracts/RNSReverseRegistrar.sol";
-import { RNSUnified } from "@rns-contracts/RNSUnified.sol";
-import { RNSDomainPrice } from "@rns-contracts/RNSDomainPrice.sol";
-import { RNSOperation } from "@rns-contracts/utils/RNSOperation.sol";
-import { OwnedMulticaller } from "@rns-contracts/utils/OwnedMulticaller.sol";
-import { RNSCommission, INSCommission } from "@rns-contracts/RNSCommission.sol";
+import { IPyth, INSDomainPrice, PeriodScaler } from "src/RNSDomainPrice.sol";
+import { NameChecker } from "src/NameChecker.sol";
+import { PublicResolver } from "src/resolvers/PublicResolver.sol";
+import { RNSAuction } from "src/RNSAuction.sol";
+import { RNSReverseRegistrar } from "src/RNSReverseRegistrar.sol";
+import { RNSUnified } from "src/RNSUnified.sol";
+import { RNSDomainPrice } from "src/RNSDomainPrice.sol";
+import { RNSOperation } from "src/utils/RNSOperation.sol";
+import { OwnedMulticaller } from "src/utils/OwnedMulticaller.sol";
+import { RNSCommission, INSCommission } from "src/RNSCommission.sol";
 
 interface ISharedArgument is IGeneralConfig {
   struct NameCheckerParam {

soldeer.lock

@@ -1,17 +1,20 @@
 [[dependencies]]
-name = "@fdk"
-version = "0.3.0-beta"
-source = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.0-beta.zip"
-checksum = "aabeda6cc1fe02227d26f3edd86d4af6c91e2167e8b9f1971cc1ea7ce33d34f9"
+name = "fdk"
+version = "0.3.1-beta"
+source = "https://github.com/axieinfinity/foundry-deployment-kit/archive/refs/tags/v0.3.1-beta.zip"
+checksum = "53cb5bf15abdc909d177c64e78070387af24ef39b2a4b408651836ac9de059c4"
+integrity = "967cb0aee7c770a82c4708ff50b2b6ffc529aaa1c800bca250cb96eeb98f806b"
 
 [[dependencies]]
-name = "@pythnetwork-pyth-sdk-solidity"
-version = "2.2.0"
-source = "https://soldeer-revisions.s3.amazonaws.com/@pythnetwork-pyth-sdk-solidity/2_2_0_15-04-2024_18:50:54_pyth-sdk-solidity.zip"
-checksum = "54e3bda3b27467f84c1605722f58e1d2b5a19d6ca3c24840550f1d6cf3bc2231"
+name = "openzeppelin"
+version = "4.9.3"
+source = "https://github.com/OpenZeppelin/openzeppelin-contracts/archive/refs/tags/v4.9.3.zip"
+checksum = "94270990c32ff2d00c06a9dabaf5b7a8e36773e017254acbb39d13733eb82960"
+integrity = "5cca086987dbce97760f8a337c0d29e6383fcafaffa9662897695f17566756d0"
 
 [[dependencies]]
-name = "@openzeppelin-contracts"
-version = "4.9.3"
-source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_3_22-01-2024_13:13:53_contracts.zip"
-checksum = "95886307069cf73310b41396c49df51801a73f31f18f62e7d05adfc2031e7725"
+name = "pyth-sdk-solidity"
+version = "2.2.0"
+source = "https://github.com/pyth-network/pyth-sdk-solidity/archive/refs/tags/v2.2.0.zip"
+checksum = "71431ac3fe4e61ce2b8abd649d3e741277ca4dba287c2a4291d040190b8fb8da"
+integrity = "845f9e662935eb347e9189da9b156f0062bcab1d372c7397777dbda609776a5c"

src/resolvers/DNSResolvable.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
-import "@ensdomains/ens-contracts/dnssec-oracle/RRUtils.sol";
+import "@ens-contracts/dnssec-oracle/RRUtils.sol";
 import "../interfaces/resolvers/IDNSRecordResolver.sol";
 import "../interfaces/resolvers/IDNSZoneResolver.sol";
 import "./BaseVersion.sol";