@ensdomains/ethers-patch-v6 0.0.1

package/dist/index.cjs

@@ -0,0 +1,151 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// index.ts
+var index_exports = {};
+module.exports = __toCommonJS(index_exports);
+var import_ethers = require("ethers");
+
+// ../../src/shared.ts
+var UR_PROXY = "0xeEeEEEeE14D718C2B47D9923Deab1335E144EeEe";
+var ABI_FRAGMENTS = [
+  // AbstractUniversalResolver
+  "function requireResolver(bytes) view returns ((bytes name, uint256 offset, bytes32 node, address resolver, bool extended))",
+  // IExtendedResolver
+  "function resolve(bytes, bytes) view returns (bytes)",
+  // INameResolver
+  "function name(bytes32) view returns (string)",
+  // IAddrResolver
+  "function addr(bytes32) view returns (address)",
+  // IAddressResolver
+  "function addr(bytes32, uint256) view returns (bytes)"
+];
+var COIN_TYPE_ETH = 60n;
+var COIN_TYPE_DEFAULT = 1n << 31n;
+function isEVMCoinType(coinType) {
+  return coinType === COIN_TYPE_ETH || coinType >= 0n && (coinType ^ COIN_TYPE_DEFAULT) < COIN_TYPE_DEFAULT;
+}
+function getReverseName(lowerAddress, coinType) {
+  return `${lowerAddress.slice(2)}.${coinType === COIN_TYPE_ETH ? "addr" : coinType === COIN_TYPE_DEFAULT ? "default" : coinType.toString(16)}.reverse`;
+}
+
+// index.ts
+__reExport(index_exports, require("ethers"), module.exports);
+var ABI = new import_ethers.Interface(ABI_FRAGMENTS);
+import_ethers.EnsResolver.fromNameOld = import_ethers.EnsResolver.fromName;
+import_ethers.EnsResolver.fromName = async function(provider, name) {
+  if (!name) return null;
+  const dns = (0, import_ethers.dnsEncode)(name, 255);
+  const UR = new import_ethers.Contract(UR_PROXY, ABI, provider);
+  try {
+    const result = await UR.requireResolver(dns);
+    const resolver = new import_ethers.EnsResolver(provider, result.resolver, name);
+    const extended = Promise.resolve(result.extended);
+    resolver.supportsWildcard = () => extended;
+    return resolver;
+  } catch (err) {
+    return null;
+  }
+};
+var { resolveName, lookupAddress } = import_ethers.AbstractProvider.prototype;
+import_ethers.AbstractProvider.prototype.resolveName = async function(name, coinType = COIN_TYPE_ETH) {
+  if (coinType === "old") return resolveName.call(this, name);
+  coinType = (0, import_ethers.getBigInt)(coinType, "coinType");
+  const fwd = await this.getResolver(name);
+  if (!fwd) return null;
+  return fetchAddress(fwd, coinType).catch(() => null);
+};
+import_ethers.AbstractProvider.prototype.lookupAddress = async function(address, coinType = COIN_TYPE_ETH) {
+  if (coinType === "old") return lookupAddress.call(this, address);
+  (0, import_ethers.assertArgument)(
+    (0, import_ethers.isHexString)(address) && address !== "0x",
+    "invalid address",
+    "address",
+    address
+  );
+  address = address.toLowerCase();
+  coinType = (0, import_ethers.getBigInt)(coinType, "coinType");
+  const reverseName = getReverseName(address, coinType);
+  try {
+    const rev = await this.getResolver(reverseName);
+    if (rev) {
+      const name = await callResolver(rev, "name");
+      if (name && (0, import_ethers.ensNormalize)(name) === name) {
+        const fwd = await this.getResolver(name);
+        if (fwd) {
+          const checked = await fetchAddress(fwd, coinType).then(
+            (x) => x.toLowerCase(),
+            () => {
+            }
+          );
+          if (checked) {
+            (0, import_ethers.assert)(
+              address === checked,
+              "address->name->address mismatch",
+              "BAD_DATA",
+              { value: [address, checked] }
+            );
+            return name;
+          }
+        }
+      }
+    }
+    return null;
+  } catch (error) {
+    if ((0, import_ethers.isError)(error, "BAD_DATA") && error.value === "0x") {
+      return null;
+    }
+    if ((0, import_ethers.isError)(error, "CALL_EXCEPTION")) {
+      return null;
+    }
+    throw error;
+  }
+};
+async function fetchAddress(resolver, coinType) {
+  if (coinType === COIN_TYPE_ETH) {
+    return callResolver(resolver, "addr(bytes32)");
+  } else {
+    const a = await callResolver(
+      resolver,
+      "addr(bytes32,uint256)",
+      coinType
+    );
+    return isEVMCoinType(coinType) ? a === "0x" ? a.padEnd(42) : (0, import_ethers.getAddress)(a) : a;
+  }
+}
+async function callResolver(resolver, fragment, ...args) {
+  const f = ABI.getFunction(fragment);
+  const r = new import_ethers.Contract(resolver.address, ABI, resolver.provider);
+  if (await resolver.supportsWildcard()) {
+    const res = ABI.decodeFunctionResult(
+      f,
+      await r.resolve(
+        (0, import_ethers.dnsEncode)(resolver.name, 255),
+        ABI.encodeFunctionData(f, [(0, import_ethers.namehash)(resolver.name), ...args]),
+        { enableCcipRead: true }
+      )
+    );
+    return f.outputs.length === 1 ? res[0] : res;
+  } else {
+    return r[f.format()]((0, import_ethers.namehash)(resolver.name), ...args, {
+      enableCcipRead: true
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("ethers")
+});

package/dist/index.d.cts

@@ -0,0 +1,12 @@
+import { BigNumberish } from 'ethers';
+export * from 'ethers';
+
+declare module "ethers" {
+    namespace EnsResolver {
+        function fromNameOld(provider: AbstractProvider, name: string): Promise<EnsResolver | null>;
+    }
+    interface AbstractProvider {
+        resolveName(name: string, coinType?: BigNumberish): Promise<string | null>;
+        lookupAddress(address: string, coinType?: BigNumberish): Promise<string | null>;
+    }
+}

package/dist/index.d.ts

@@ -0,0 +1,12 @@
+import { BigNumberish } from 'ethers';
+export * from 'ethers';
+
+declare module "ethers" {
+    namespace EnsResolver {
+        function fromNameOld(provider: AbstractProvider, name: string): Promise<EnsResolver | null>;
+    }
+    interface AbstractProvider {
+        resolveName(name: string, coinType?: BigNumberish): Promise<string | null>;
+        lookupAddress(address: string, coinType?: BigNumberish): Promise<string | null>;
+    }
+}

package/dist/index.js

@@ -0,0 +1,143 @@
+// index.ts
+import {
+  EnsResolver,
+  AbstractProvider,
+  Contract,
+  dnsEncode,
+  assert,
+  isHexString,
+  assertArgument,
+  getBigInt,
+  Interface,
+  isError,
+  namehash,
+  getAddress,
+  ensNormalize
+} from "ethers";
+
+// ../../src/shared.ts
+var UR_PROXY = "0xeEeEEEeE14D718C2B47D9923Deab1335E144EeEe";
+var ABI_FRAGMENTS = [
+  // AbstractUniversalResolver
+  "function requireResolver(bytes) view returns ((bytes name, uint256 offset, bytes32 node, address resolver, bool extended))",
+  // IExtendedResolver
+  "function resolve(bytes, bytes) view returns (bytes)",
+  // INameResolver
+  "function name(bytes32) view returns (string)",
+  // IAddrResolver
+  "function addr(bytes32) view returns (address)",
+  // IAddressResolver
+  "function addr(bytes32, uint256) view returns (bytes)"
+];
+var COIN_TYPE_ETH = 60n;
+var COIN_TYPE_DEFAULT = 1n << 31n;
+function isEVMCoinType(coinType) {
+  return coinType === COIN_TYPE_ETH || coinType >= 0n && (coinType ^ COIN_TYPE_DEFAULT) < COIN_TYPE_DEFAULT;
+}
+function getReverseName(lowerAddress, coinType) {
+  return `${lowerAddress.slice(2)}.${coinType === COIN_TYPE_ETH ? "addr" : coinType === COIN_TYPE_DEFAULT ? "default" : coinType.toString(16)}.reverse`;
+}
+
+// index.ts
+export * from "ethers";
+var ABI = new Interface(ABI_FRAGMENTS);
+EnsResolver.fromNameOld = EnsResolver.fromName;
+EnsResolver.fromName = async function(provider, name) {
+  if (!name) return null;
+  const dns = dnsEncode(name, 255);
+  const UR = new Contract(UR_PROXY, ABI, provider);
+  try {
+    const result = await UR.requireResolver(dns);
+    const resolver = new EnsResolver(provider, result.resolver, name);
+    const extended = Promise.resolve(result.extended);
+    resolver.supportsWildcard = () => extended;
+    return resolver;
+  } catch (err) {
+    return null;
+  }
+};
+var { resolveName, lookupAddress } = AbstractProvider.prototype;
+AbstractProvider.prototype.resolveName = async function(name, coinType = COIN_TYPE_ETH) {
+  if (coinType === "old") return resolveName.call(this, name);
+  coinType = getBigInt(coinType, "coinType");
+  const fwd = await this.getResolver(name);
+  if (!fwd) return null;
+  return fetchAddress(fwd, coinType).catch(() => null);
+};
+AbstractProvider.prototype.lookupAddress = async function(address, coinType = COIN_TYPE_ETH) {
+  if (coinType === "old") return lookupAddress.call(this, address);
+  assertArgument(
+    isHexString(address) && address !== "0x",
+    "invalid address",
+    "address",
+    address
+  );
+  address = address.toLowerCase();
+  coinType = getBigInt(coinType, "coinType");
+  const reverseName = getReverseName(address, coinType);
+  try {
+    const rev = await this.getResolver(reverseName);
+    if (rev) {
+      const name = await callResolver(rev, "name");
+      if (name && ensNormalize(name) === name) {
+        const fwd = await this.getResolver(name);
+        if (fwd) {
+          const checked = await fetchAddress(fwd, coinType).then(
+            (x) => x.toLowerCase(),
+            () => {
+            }
+          );
+          if (checked) {
+            assert(
+              address === checked,
+              "address->name->address mismatch",
+              "BAD_DATA",
+              { value: [address, checked] }
+            );
+            return name;
+          }
+        }
+      }
+    }
+    return null;
+  } catch (error) {
+    if (isError(error, "BAD_DATA") && error.value === "0x") {
+      return null;
+    }
+    if (isError(error, "CALL_EXCEPTION")) {
+      return null;
+    }
+    throw error;
+  }
+};
+async function fetchAddress(resolver, coinType) {
+  if (coinType === COIN_TYPE_ETH) {
+    return callResolver(resolver, "addr(bytes32)");
+  } else {
+    const a = await callResolver(
+      resolver,
+      "addr(bytes32,uint256)",
+      coinType
+    );
+    return isEVMCoinType(coinType) ? a === "0x" ? a.padEnd(42) : getAddress(a) : a;
+  }
+}
+async function callResolver(resolver, fragment, ...args) {
+  const f = ABI.getFunction(fragment);
+  const r = new Contract(resolver.address, ABI, resolver.provider);
+  if (await resolver.supportsWildcard()) {
+    const res = ABI.decodeFunctionResult(
+      f,
+      await r.resolve(
+        dnsEncode(resolver.name, 255),
+        ABI.encodeFunctionData(f, [namehash(resolver.name), ...args]),
+        { enableCcipRead: true }
+      )
+    );
+    return f.outputs.length === 1 ? res[0] : res;
+  } else {
+    return r[f.format()](namehash(resolver.name), ...args, {
+      enableCcipRead: true
+    });
+  }
+}

package/package.json

@@ -0,0 +1,26 @@
+{
+	"name": "@ensdomains/ethers-patch-v6",
+	"version": "0.0.1",
+	"type": "module",
+	"main": "dist/index.cjs",
+	"module": "dist/index.js",
+	"types": "dist/index.d.ts",
+	"files": [
+		"./dist"
+	],
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/index.cjs"
+		}
+	},
+	"peerDependencies": {
+		"typescript": "^5"
+	},
+	"dependencies": {
+		"ethers": "6"
+	},
+	"publishConfig": {
+		"access": "public"
+	}
+}