Merge branch 'master' into feat-support-variables-in-subgraphRequest

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",

src/delegationSubgraphs.json

@@ -5,6 +5,7 @@
   "100": "https://subgrapher.snapshot.org/delegation/100",
   "137": "https://subgrapher.snapshot.org/delegation/137",
   "250": "https://subgrapher.snapshot.org/delegation/250",
+  "8453": "https://subgrapher.snapshot.org/delegation/8453",
   "42161": "https://subgrapher.snapshot.org/delegation/42161",
   "11155111": "https://subgrapher.snapshot.org/delegation/11155111"
 }

src/schemas/proposal.json

@@ -31,7 +31,10 @@
           "type": "array",
           "title": "choices",
           "minItems": 1,
-          "maxItems": 500
+          "maxLengthWithSpaceType": {
+            "default": 500,
+            "turbo": 1000
+          }
         },
         "type": {
           "type": "string",

src/schemas/update-proposal.json

@@ -35,7 +35,10 @@
           "type": "array",
           "title": "choices",
           "minItems": 1,
-          "maxItems": 500
+          "maxLengthWithSpaceType": {
+            "default": 500,
+            "turbo": 1000
+          }
         },
         "type": {
           "enum": [

src/utils.spec.js

@@ -5,7 +5,9 @@ import {
   validateSchema,
   getScores,
   getVp,
-  getFormattedAddress
+  getFormattedAddress,
+  getEnsOwner,
+  getEnsTextRecord
 } from './utils';
 
 vi.mock('cross-fetch', async () => {
@@ -611,4 +613,18 @@ describe('utils', () => {
       expect(result).not.toBe(true);
     });
   });
+
+  describe('getEnsOwner', () => {
+    test('should return null when the ENS is not valid', () => {
+      // special hidden characters after the k
+      expect(getEnsOwner('elonmusk‍‍.eth')).resolves.toBe(null);
+    });
+  });
+
+  describe('getEnsTextRecord', () => {
+    test('should return null when the ENS is not valid', () => {
+      // special hidden characters after the k
+      expect(getEnsTextRecord('elonmusk‍‍.eth')).resolves.toBe(null);
+    });
+  });
 });

src/utils.ts

@@ -155,7 +155,7 @@ ajv.addKeyword({
       validate.errors = [
         {
           keyword: 'maxLengthWithSpaceType',
-          message: `must NOT have more than ${schema[spaceType]} characters`,
+          message: `must not have more than ${schema[spaceType]}`,
           params: { limit: schema[spaceType] }
         }
       ];
@@ -546,7 +546,14 @@ export async function getEnsTextRecord(
     ...multicallOptions
   } = options;
 
-  const ensHash = namehash(ensNormalize(ens));
+  let ensHash: string;
+
+  try {
+    ensHash = namehash(ensNormalize(ens));
+  } catch (e: any) {
+    return null;
+  }
+
   const provider = getProvider(network, { broviderUrl });
 
   const calls = [
@@ -594,9 +601,17 @@ export async function getEnsOwner(
     ['function owner(bytes32) view returns (address)'],
     provider
   );
+
+  let ensHash: string;
+
+  try {
+    ensHash = namehash(ensNormalize(ens));
+  } catch (e: any) {
+    return null;
+  }
+
   const ensNameWrapper =
     options.ensNameWrapper || networks[network].ensNameWrapper;
-  const ensHash = namehash(ensNormalize(ens));
   let owner = await ensRegistry.owner(ensHash);
   // If owner is the ENSNameWrapper contract, resolve the owner of the name
   if (owner === ensNameWrapper) {

test/examples/proposal-maxLengthWithSpaceType-error.json

@@ -2,10 +2,19 @@
   {
     "instancePath": "/body",
     "keyword": "maxLengthWithSpaceType",
-    "message": "must NOT have more than 10000 characters",
+    "message": "must not have more than 10000",
     "params": {
       "limit": 10000
     },
     "schemaPath": "#/properties/body/maxLengthWithSpaceType"
+  },
+  {
+    "instancePath": "/choices",
+    "keyword": "maxLengthWithSpaceType",
+    "message": "must not have more than 500",
+    "params": {
+      "limit": 500
+    },
+    "schemaPath": "#/properties/choices/maxLengthWithSpaceType"
   }
 ]

test/schema.spec.ts

@@ -12,6 +12,7 @@ import schemas from '../src/schemas';
 import proposalMaxLengthWithSpaceTypeError from './examples/proposal-maxLengthWithSpaceType-error.json';
 import spaceMaxItemsWithSpaceTypeError from './examples/space-maxItemsWithSpaceType-error.json';
 
+// Tests for default spaces
 describe.each([
   { schemaType: 'space', schema: schemas.space, example: space },
   { schemaType: 'proposal', schema: schemas.proposal, example: proposal },
@@ -30,7 +31,6 @@ describe.each([
 });
 
 // Tests for turbo spaces
-
 describe.each([
   { schemaType: 'space', schema: schemas.space, example: spaceTurbo },
   { schemaType: 'proposal', schema: schemas.proposal, example: proposalTurbo }
@@ -44,6 +44,7 @@ describe.each([
   });
 });
 
+// tests for default schema with turbo example, should fail
 describe.each([
   {
     schemaType: 'space',