@tradetrust-tt/dnsprove 2.19.0 → 2.20.0

package/dist/records/dnsTxt.js

@@ -3,31 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RecordTypesT = exports.OpenAttestationDNSTextRecordT = exports.EthereumNetworks = exports.EthereumNetworkIdT = exports.EthereumAddressT = exports.BlockchainNetworkT = void 0;
+exports.RecordTypesT = exports.OpenAttestationDNSTextRecordT = exports.EthereumNetworkIdT = exports.EthereumAddressT = exports.BlockchainNetworkT = void 0;
 var _runtypes = require("runtypes");
 const RecordTypesT = exports.RecordTypesT = (0, _runtypes.Literal)("openatts");
 const BlockchainNetworkT = exports.BlockchainNetworkT = (0, _runtypes.Literal)("ethereum");
 const EthereumAddressT = exports.EthereumAddressT = _runtypes.String.withConstraint(maybeAddress => {
   return /0x[a-fA-F0-9]{40}/.test(maybeAddress) || `${maybeAddress} is not a valid ethereum address`;
 });
-let EthereumNetworks = exports.EthereumNetworks = void 0;
-(function (EthereumNetworks) {
-  EthereumNetworks["homestead"] = "1";
-  EthereumNetworks["ropsten"] = "3";
-  EthereumNetworks["rinkeby"] = "4";
-  EthereumNetworks["goerli"] = "5";
-  EthereumNetworks["sepolia"] = "11155111";
-  EthereumNetworks["polygon"] = "137";
-  EthereumNetworks["polygonAmoy"] = "80002";
-  EthereumNetworks["local"] = "1337";
-  EthereumNetworks["xdc"] = "50";
-  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.astronTestnet), (0, _runtypes.Literal)(EthereumNetworks.astron));
+const EthereumNetworkIdT = exports.EthereumNetworkIdT = _runtypes.String.withConstraint(maybeNetId => /^\d+$/.test(maybeNetId) || `${maybeNetId} is not a valid numeric network id`);
 const OpenAttestationDNSTextRecordT = exports.OpenAttestationDNSTextRecordT = (0, _runtypes.Record)({
   type: RecordTypesT,
   net: BlockchainNetworkT,

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

@@ -1,28 +1,12 @@
-import { Static, Boolean, String, Literal, Record, Union, Partial } from "runtypes";
+import { Static, Boolean, String, Literal, Record, Partial } from "runtypes";
 export declare const RecordTypesT: Literal<"openatts">;
 export declare const BlockchainNetworkT: Literal<"ethereum">;
 export declare const EthereumAddressT: import("runtypes").Constraint<String, string, unknown>;
-export declare enum EthereumNetworks {
-    homestead = "1",
-    ropsten = "3",
-    rinkeby = "4",
-    goerli = "5",
-    sepolia = "11155111",
-    polygon = "137",
-    polygonAmoy = "80002",
-    local = "1337",
-    xdc = "50",
-    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.astronTestnet>, Literal<EthereumNetworks.astron>]>;
+export declare const EthereumNetworkIdT: import("runtypes").Constraint<String, string, unknown>;
 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.astronTestnet>, Literal<EthereumNetworks.astron>]>;
+    netId: import("runtypes").Constraint<String, string, unknown>;
     addr: import("runtypes").Constraint<String, string, unknown>;
 }, false>, Partial<{
     dnssec: Boolean;

package/package.json

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

package/src/index.test.ts

@@ -173,6 +173,76 @@ describe("parseDocumentStoreResults", () => {
     ];
     expect(parseDocumentStoreResults(sampleRecord, true)).toStrictEqual([]);
   });
+
+  test("it should accept any numeric netId (e.g. Mantle mainnet 5000)", () => {
+    const addr = "0x2f60375e8144e16Adf1979936301D8341D58C36C";
+    const sampleRecord = [
+      {
+        name: "example.example.com.",
+        type: 16,
+        TTL: 110,
+        data: `"openatts net=ethereum netId=5000 addr=${addr}"`,
+        dnssec: false,
+      },
+    ];
+    expect(parseDocumentStoreResults(sampleRecord, false)).toStrictEqual([
+      {
+        type: "openatts",
+        net: "ethereum",
+        netId: "5000",
+        addr,
+        dnssec: false,
+      },
+    ]);
+  });
+
+  test("it should accept an arbitrary previously-unknown numeric netId", () => {
+    const addr = "0x2f60375e8144e16Adf1979936301D8341D58C36C";
+    const sampleRecord = [
+      {
+        name: "example.example.com.",
+        type: 16,
+        TTL: 110,
+        data: `"openatts net=ethereum netId=99999 addr=${addr}"`,
+        dnssec: false,
+      },
+    ];
+    expect(parseDocumentStoreResults(sampleRecord, false)).toStrictEqual([
+      {
+        type: "openatts",
+        net: "ethereum",
+        netId: "99999",
+        addr,
+        dnssec: false,
+      },
+    ]);
+  });
+
+  test("it should reject a non-numeric netId", () => {
+    const sampleRecord = [
+      {
+        name: "example.example.com.",
+        type: 16,
+        TTL: 110,
+        data: '"openatts net=ethereum netId=abc addr=0x2f60375e8144e16Adf1979936301D8341D58C36C"',
+        dnssec: false,
+      },
+    ];
+    expect(parseDocumentStoreResults(sampleRecord, false)).toStrictEqual([]);
+  });
+
+  test("it should reject an alphanumeric netId", () => {
+    const sampleRecord = [
+      {
+        name: "example.example.com.",
+        type: 16,
+        TTL: 110,
+        data: '"openatts net=ethereum netId=1abc addr=0x2f60375e8144e16Adf1979936301D8341D58C36C"',
+        dnssec: false,
+      },
+    ];
+    expect(parseDocumentStoreResults(sampleRecord, false)).toStrictEqual([]);
+  });
 });
 
 describe("queryDns", () => {

package/src/records/dnsTxt.ts

@@ -1,4 +1,4 @@
-import { Static, Boolean, String, Literal, Record, Union, Partial } from "runtypes";
+import { Static, Boolean, String, Literal, Record, Partial } from "runtypes";
 
 export const RecordTypesT = Literal("openatts");
 
@@ -8,38 +8,8 @@ export const EthereumAddressT = String.withConstraint((maybeAddress: string) =>
   return /0x[a-fA-F0-9]{40}/.test(maybeAddress) || `${maybeAddress} is not a valid ethereum address`;
 });
 
-export enum EthereumNetworks {
-  homestead = "1",
-  ropsten = "3",
-  rinkeby = "4",
-  goerli = "5",
-  sepolia = "11155111",
-  polygon = "137",
-  polygonAmoy = "80002",
-  local = "1337",
-  xdc = "50",
-  xdcapothem = "51",
-  stabilityTestnet = "20180427",
-  stability = "101010",
-  astronTestnet = "21002",
-  astron = "1338",
-}
-
-export 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 const EthereumNetworkIdT = String.withConstraint(
+  (maybeNetId: string) => /^\d+$/.test(maybeNetId) || `${maybeNetId} is not a valid numeric network id`
 );
 
 export const OpenAttestationDNSTextRecordT = Record({