Merge branch 'master' into master

sx-network · Jun 27, 2022 · bcadd6d · bcadd6d
2 parents 65fb4cf + 524fb67
commit bcadd6d
Show file tree

Hide file tree

Showing 28 changed files with 18,009 additions and 3,090 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.3.97",
+  "version": "0.4.2",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",
@@ -10,9 +10,9 @@
   "dependencies": {
     "@ensdomains/eth-ens-namehash": "^2.0.15",
     "@ethersproject/abi": "^5.0.4",
-    "@ethersproject/bytes": "^5.0.8",
+    "@ethersproject/bytes": "^5.6.1",
     "@ethersproject/contracts": "^5.0.3",
-    "@ethersproject/hash": "^5.0.9",
+    "@ethersproject/hash": "^5.6.1",
     "@ethersproject/providers": "^5.3.1",
     "@ethersproject/wallet": "^5.4.0",
     "ajv": "^8.6.0",
@@ -22,18 +22,16 @@
     "lodash.set": "^4.3.2"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
+    "@rollup/plugin-commonjs": "^18.1.0",
     "@rollup/plugin-node-resolve": "^11.0.1",
-    "@types/jest": "^26.0.23",
     "@types/node": "^13.9.5",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
+    "@typescript-eslint/parser": "^4.33.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.1.0",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-prettier": "^3.4.0",
-    "jest": "^26.6.3",
-    "prettier": "2.2.0",
+    "prettier": "2.7.1",
     "rollup": "^2.35.1",
     "rollup-plugin-filesize": "^9.1.0",
     "rollup-plugin-json": "^4.0.0",
@@ -42,16 +40,16 @@
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^7.0.0",
     "rollup-plugin-typescript2": "^0.27.0",
-    "typescript": "^3.8.3"
+    "typescript": "^3.8.3",
+    "vitest": "^0.15.1"
   },
   "scripts": {
     "build": "rollup -c",
     "build:cjs": "rollup -c rollup.cjs.config.js",
+    "test": "vitest",
     "dev": "rollup -c -w",
-    "test:validation": "npm run build:cjs && jest test/validation.spec.ts --runInBand",
-    "pretest": "npm run build:cjs",
     "lint": "eslint . --ext .ts --fix",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "yarn build"
   },
   "engines": {
     "node": ">=14"

diff --git a/src/networks.json b/src/networks.json
@@ -252,8 +252,8 @@
     "network": "mainnet",
     "multicall": "0x1ee38d535d541c55c9dae27b12edf090c608e6fb",
     "rpc": [
-      "https://rpc.ankr.com/bsc",
       "https://speedy-nodes-nyc.moralis.io/b9aed21e7bb7bdeb35972c9a/bsc/mainnet/archive",
+      "https://rpc.ankr.com/bsc",
       "https://bsc.getblock.io/mainnet/?api_key=91f8195f-bf46-488f-846a-73d6853790e7",
       "https://bsc-private-dataseed1.nariox.org",
       "https://bsc-dataseed1.ninicoin.io",
@@ -770,6 +770,20 @@
     "start": 366482,
     "logo": "ipfs://QmZLQVsUqHBDXutu6ywTvcYXDZG2xBstMfHkfJSzUNpZsc"
   },
+  "595": {
+    "key": "595",
+    "name": "Acala Mandala Testnet",
+    "chainId": 595,
+    "network": "testnet",
+    "testnet": true,
+    "multicall": "0x8ce86f733024c1ccae2224f05c11fd50713d6f81",
+    "rpc": [
+      "https://tc7-eth.aca-dev.network"
+    ],
+    "explorer": "https://blockscout.mandala.acala.network",
+    "start": 1335512,
+    "logo": "ipfs://QmY1ZYBUzb46Mto7G1GitQWfaqq6n8Q4WArxFBzhNdLqvg"
+  },
   "888": {
     "key": "888",
     "name": "Wanchain",
@@ -1206,8 +1220,8 @@
     "testnet": true,
     "multicall": "0x08411ADd0b5AA8ee47563b146743C13b3556c9Cc",
     "rpc": [
-      "https://rpc-mumbai.matic.today",
-      "https://speedy-nodes-nyc.moralis.io/f2963e29bec0de5787da3164/polygon/mumbai/archive"
+      "https://speedy-nodes-nyc.moralis.io/9e03baabdc27be2a35bdec4a/polygon/mumbai/archive",
+      "https://rpc-mumbai.matic.today"
     ],
     "ws": [
       "wss://ws-mumbai.matic.today"

diff --git a/src/schemas/space.json b/src/schemas/space.json
@@ -185,11 +185,11 @@
           "type": "object",
           "properties": {
             "delay": {
-              "type": "number",
+              "type": "integer",
               "minimum": 0
             },
             "period": {
-              "type": "number",
+              "type": "integer",
               "minimum": 0
             },
             "type": {
@@ -205,6 +205,13 @@
             },
             "hideAbstain": {
               "type": "boolean"
+            },
+            "privacy": {
+              "type": "string",
+              "enum": [
+                "",
+                "shutter"
+              ]
             }
           },
           "additionalProperties": false
@@ -226,6 +233,37 @@
             ]
           }
         },
+        "treasuries": {
+          "type": "array",
+          "maxItems": 10,
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "title": "Name",
+                "examples": ["e.g. Balancer DAO 1"],
+                "minLength": 1,
+                "maxLength": 64
+              },
+              "address": {
+                "type": "string",
+                "title": "Contract address",
+                "examples": ["e.g. 0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984"],
+                "pattern": "^0x[a-fA-F0-9]{40}$",
+                "minLength": 42,
+                "maxLength": 42
+              },
+              "network": {
+                "type": "string",
+                "title": "Network",
+                "maxLength": 12
+              }
+            },
+            "required": ["name", "address", "network"],
+            "additionalProperties": false
+          }
+        },
         "parent": {
           "type": "string",
           "title": "parent"

diff --git a/src/sign/eip1271.ts b/src/sign/eip1271.ts
@@ -50,7 +50,7 @@ export async function verifyOldVersion(
 }
 
 export async function verify(address, sig, hash, network = '1') {
-  const provider = getProvider(network);
+  const provider = getProvider(network, 'brovider');
   if (await verifyDefault(address, sig, hash, provider)) return true;
   return await verifyOldVersion(address, sig, hash, provider);
 }
diff --git a/src/sign/index.ts b/src/sign/index.ts
@@ -115,7 +115,9 @@ export default class Client {
       type = type2 ? voteString2Types : voteStringTypes;
       message.choice = JSON.stringify(message.choice);
     }
-    // @ts-ignore
+    if (message?.privacy === 'shutter')
+      type = type2 ? voteString2Types : voteStringTypes;
+    delete message.privacy;
     delete message.type;
     return await this.sign(web3, address, message, type);
   }

diff --git a/src/sign/types.ts b/src/sign/types.ts
@@ -34,6 +34,7 @@ export interface Vote {
   proposal: string;
   type: string;
   choice: number | number[] | string;
+  privacy?: string;
 }
 
 export interface Follow {

diff --git a/src/sign/utils.ts b/src/sign/utils.ts
@@ -7,7 +7,7 @@ export function getHash(data) {
   return _TypedDataEncoder.hash(domain, types, message);
 }
 
-export async function verify(address, sig, data) {
+export async function verify(address, sig, data, network = '1') {
   const { domain, types, message } = data;
 
   const hash = getHash(data);
@@ -23,5 +23,5 @@ export async function verify(address, sig, data) {
   }
 
   console.log('Check EIP1271 signature');
-  return await verifyEIP1271(address, sig, hash);
+  return await verifyEIP1271(address, sig, hash, network);
 }
diff --git a/src/utils.ts b/src/utils.ts
@@ -211,7 +211,7 @@ export function validateSchema(schema, data) {
 export function getEnsTextRecord(ens: string, record: string, network = '1') {
   const address = networks[network].ensResolver || networks['1'].ensResolver;
   const ensHash = hash(normalize(ens));
-  const provider = getProvider(network);
+  const provider = getProvider(network, 'brovider');
   return call(provider, ENS_RESOLVER_ABI, [address, 'text', [ensHash, record]]);
 }