@tradetrust-tt/dnsprove 2.15.0 → 2.17.0

package/dist/index.js

@@ -16,12 +16,10 @@ Object.defineProperty(exports, "OpenAttestationDnsDidRecord", {
   }
 });
 exports.queryDns = exports.parseOpenAttestationRecord = exports.parseDocumentStoreResults = exports.parseDnsDidResults = exports.getDocumentStoreRecords = exports.getDnsDidRecords = exports.defaultDnsResolvers = void 0;
-var _axios = _interopRequireDefault(require("axios"));
 var _dnsTxt = require("./records/dnsTxt");
 var _dnsDid = require("./records/dnsDid");
 var _logger = require("./util/logger");
 var _error = require("./common/error");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -39,29 +37,25 @@ const _getLogger = (0, _logger.getLogger)("index"),
   trace = _getLogger.trace;
 const defaultDnsResolvers = exports.defaultDnsResolvers = [( /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (domain) {
-    const _yield$axios = yield (0, _axios.default)({
-        method: "GET",
-        url: `https://dns.google/resolve?name=${domain}&type=TXT`
-      }),
-      data = _yield$axios.data;
-    return data;
+    const data = yield fetch(`https://dns.google/resolve?name=${domain}&type=TXT`, {
+      method: "GET"
+    });
+    return data.json();
   });
   return function (_x) {
     return _ref.apply(this, arguments);
   };
 }()), ( /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (domain) {
-    const _yield$axios2 = yield (0, _axios.default)({
-        method: "GET",
-        url: `https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`,
-        headers: {
-          accept: "application/dns-json",
-          contentType: "application/json",
-          connection: "keep-alive"
-        }
-      }),
-      data = _yield$axios2.data;
-    return data;
+    const data = yield fetch(`https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`, {
+      method: "GET",
+      headers: {
+        accept: "application/dns-json",
+        contentType: "application/json",
+        connection: "keep-alive"
+      }
+    });
+    return data.json();
   });
   return function (_x2) {
     return _ref2.apply(this, arguments);

package/dist/records/dnsTxt.js

@@ -24,9 +24,10 @@ let EthereumNetworks = exports.EthereumNetworks = void 0;
   EthereumNetworks["xdcapothem"] = "51";
   EthereumNetworks["stabilityTestnet"] = "20180427";
   EthereumNetworks["stability"] = "101010";
+  EthereumNetworks["astronTestnet"] = "21002";
   EthereumNetworks["astron"] = "1338";
 })(EthereumNetworks || (exports.EthereumNetworks = EthereumNetworks = {}));
-const EthereumNetworkIdT = exports.EthereumNetworkIdT = (0, _runtypes.Union)((0, _runtypes.Literal)(EthereumNetworks.homestead), (0, _runtypes.Literal)(EthereumNetworks.ropsten), (0, _runtypes.Literal)(EthereumNetworks.rinkeby), (0, _runtypes.Literal)(EthereumNetworks.goerli), (0, _runtypes.Literal)(EthereumNetworks.sepolia), (0, _runtypes.Literal)(EthereumNetworks.polygon), (0, _runtypes.Literal)(EthereumNetworks.polygonAmoy), (0, _runtypes.Literal)(EthereumNetworks.xdc), (0, _runtypes.Literal)(EthereumNetworks.xdcapothem), (0, _runtypes.Literal)(EthereumNetworks.stabilityTestnet), (0, _runtypes.Literal)(EthereumNetworks.stability), (0, _runtypes.Literal)(EthereumNetworks.local), (0, _runtypes.Literal)(EthereumNetworks.astron));
+const EthereumNetworkIdT = exports.EthereumNetworkIdT = (0, _runtypes.Union)((0, _runtypes.Literal)(EthereumNetworks.homestead), (0, _runtypes.Literal)(EthereumNetworks.ropsten), (0, _runtypes.Literal)(EthereumNetworks.rinkeby), (0, _runtypes.Literal)(EthereumNetworks.goerli), (0, _runtypes.Literal)(EthereumNetworks.sepolia), (0, _runtypes.Literal)(EthereumNetworks.polygon), (0, _runtypes.Literal)(EthereumNetworks.polygonAmoy), (0, _runtypes.Literal)(EthereumNetworks.xdc), (0, _runtypes.Literal)(EthereumNetworks.xdcapothem), (0, _runtypes.Literal)(EthereumNetworks.stabilityTestnet), (0, _runtypes.Literal)(EthereumNetworks.stability), (0, _runtypes.Literal)(EthereumNetworks.local), (0, _runtypes.Literal)(EthereumNetworks.astronTestnet), (0, _runtypes.Literal)(EthereumNetworks.astron));
 const OpenAttestationDNSTextRecordT = exports.OpenAttestationDNSTextRecordT = (0, _runtypes.Record)({
   type: RecordTypesT,
   net: BlockchainNetworkT,

package/dist/ts/records/dnsTxt.d.ts

@@ -15,13 +15,14 @@ export declare enum EthereumNetworks {
     xdcapothem = "51",
     stabilityTestnet = "20180427",
     stability = "101010",
+    astronTestnet = "21002",
     astron = "1338"
 }
-export declare const EthereumNetworkIdT: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.astron>]>;
+export declare const EthereumNetworkIdT: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.astronTestnet>, Literal<EthereumNetworks.astron>]>;
 export declare const OpenAttestationDNSTextRecordT: import("runtypes").Intersect<[Record<{
     type: Literal<"openatts">;
     net: Literal<"ethereum">;
-    netId: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.astron>]>;
+    netId: Union<[Literal<EthereumNetworks.homestead>, Literal<EthereumNetworks.ropsten>, Literal<EthereumNetworks.rinkeby>, Literal<EthereumNetworks.goerli>, Literal<EthereumNetworks.sepolia>, Literal<EthereumNetworks.polygon>, Literal<EthereumNetworks.polygonAmoy>, Literal<EthereumNetworks.xdc>, Literal<EthereumNetworks.xdcapothem>, Literal<EthereumNetworks.stabilityTestnet>, Literal<EthereumNetworks.stability>, Literal<EthereumNetworks.local>, Literal<EthereumNetworks.astronTestnet>, Literal<EthereumNetworks.astron>]>;
     addr: import("runtypes").Constraint<String, string, unknown>;
 }, false>, Partial<{
     dnssec: Boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradetrust-tt/dnsprove",
-  "version": "2.15.0",
+  "version": "2.17.0",
   "description": "Helper utility for retrieving OpenAttestations document store address records from DNS",
   "license": "Apache-2.0",
   "repository": {

package/src/index.test.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { setupServer, SetupServerApi } from "msw/node";
 import { http, HttpResponse } from "msw";
 import { CustomDnsResolver, getDocumentStoreRecords, queryDns, parseDocumentStoreResults, getDnsDidRecords } from ".";
@@ -211,20 +210,18 @@ describe("queryDns", () => {
 
   const testDnsResolvers: CustomDnsResolver[] = [
     async (domain) => {
-      const { data } = await axios({
+      const data = await fetch(`https://dns.google/resolve?name=${domain}&type=TXT`, {
         method: "GET",
-        url: `https://dns.google/resolve?name=${domain}&type=TXT`,
       });
 
-      return data;
+      return data.json();
     },
     async (domain) => {
-      const { data } = await axios({
+      const data = await fetch(`https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`, {
         method: "GET",
-        url: `https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`,
         headers: { accept: "application/dns-json", contentType: "application/json", connection: "keep-alive" },
       });
-      return data;
+      return data.json();
     },
   ];
 
@@ -244,7 +241,7 @@ describe("queryDns", () => {
 
     const records = await queryDns("https://donotuse.openattestation.com", testDnsResolvers);
     const sortedAnswer = records?.Answer.sort((a, b) => a.data.localeCompare(b.data));
-    expect(sortedAnswer).toStrictEqual(sampleResponse.Answer);
+    expect(sortedAnswer).toMatchObject(sampleResponse.Answer);
   });
 
   test("Should fallback to second dns when first dns is down", async () => {
@@ -262,7 +259,7 @@ describe("queryDns", () => {
     const records = await queryDns("https://donotuse.openattestation.com", testDnsResolvers);
 
     const sortedAnswer = records?.Answer.sort((a, b) => a.data.localeCompare(b.data));
-    expect(sortedAnswer).toStrictEqual(sampleResponse.Answer);
+    expect(sortedAnswer).toMatchObject(sampleResponse.Answer);
   });
 
   test("Should throw error when all dns provided are down", async () => {
@@ -284,6 +281,37 @@ describe("queryDns", () => {
   });
 });
 
+describe("getDocumentStoreRecords for AstronTestnet", () => {
+  const sampleDnsTextRecord = [
+    {
+      type: "openatts",
+      net: "ethereum",
+      netId: "21002",
+      addr: "0xb1Bf514b3893357813F366282E887eE221D5C2dA",
+      dnssec: false,
+    },
+    {
+      type: "openatts",
+      net: "ethereum",
+      netId: "21002",
+      addr: "0xdAEe89A37fEEBCBFAc94aBA63Fb163808dAc38Fb",
+      dnssec: false,
+    },
+  ];
+
+  test("it should work with dev-astronlayer2.bitfactory.cn", async () => {
+    const records = (await getDocumentStoreRecords("dev-astronlayer2.bitfactory.cn")).sort((a, b) => {
+      if (a.netId < b.netId) return -1;
+      if (a.netId > b.netId) return 1;
+      if (a.addr < b.addr) return -1;
+      if (a.addr > b.addr) return 1;
+      return 0;
+    });
+
+    expect(records).toStrictEqual(sampleDnsTextRecord);
+  });
+});
+
 describe("getDocumentStoreRecords for Astron", () => {
   const sampleDnsTextRecord = [
     {

package/src/index.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { OpenAttestationDNSTextRecord, OpenAttestationDNSTextRecordT } from "./records/dnsTxt";
 import { OpenAttestationDnsDidRecord, OpenAttestationDnsDidRecordT } from "./records/dnsDid";
 import { getLogger } from "./util/logger";
@@ -26,20 +25,18 @@ export type CustomDnsResolver = (domain: string) => Promise<IDNSQueryResponse>;
 
 export const defaultDnsResolvers: CustomDnsResolver[] = [
   async (domain) => {
-    const { data } = await axios({
+    const data = await fetch(`https://dns.google/resolve?name=${domain}&type=TXT`, {
       method: "GET",
-      url: `https://dns.google/resolve?name=${domain}&type=TXT`,
     });
 
-    return data;
+    return data.json();
   },
   async (domain) => {
-    const { data } = await axios({
+    const data = await fetch(`https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`, {
       method: "GET",
-      url: `https://cloudflare-dns.com/dns-query?name=${domain}&type=TXT`,
       headers: { accept: "application/dns-json", contentType: "application/json", connection: "keep-alive" },
     });
-    return data;
+    return data.json();
   },
 ];
 

package/src/records/dnsTxt.ts

@@ -21,6 +21,7 @@ export enum EthereumNetworks {
   xdcapothem = "51",
   stabilityTestnet = "20180427",
   stability = "101010",
+  astronTestnet = "21002",
   astron = "1338",
 }
 
@@ -37,6 +38,7 @@ export const EthereumNetworkIdT = Union(
   Literal(EthereumNetworks.stabilityTestnet),
   Literal(EthereumNetworks.stability),
   Literal(EthereumNetworks.local),
+  Literal(EthereumNetworks.astronTestnet),
   Literal(EthereumNetworks.astron)
 );